@aidc-toolkit/core 0.9.1 → 0.9.3

package/eslint.config.js

@@ -1,18 +1,3 @@
-import tseslint from "typescript-eslint";
-import js from "@eslint/js";
-import stylistic from "@stylistic/eslint-plugin";
-import jsdoc from "eslint-plugin-jsdoc";
-import esLintConfigLove from "eslint-config-love";
 import { esLintConfigAIDCToolkit } from "@aidc-toolkit/dev";
 
-export default tseslint.config(
-    {
-        ignores: ["eslint.config.js", "dist"]
-    },
-    js.configs.recommended,
-    ...tseslint.configs.strictTypeChecked,
-    stylistic.configs["recommended-flat"],
-    jsdoc.configs["flat/recommended-typescript"],
-    esLintConfigLove,
-    esLintConfigAIDCToolkit
-);
+export default esLintConfigAIDCToolkit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aidc-toolkit/core",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "Core functionality for AIDC Toolkit",
   "type": "module",
   "main": "dist/index.js",
@@ -21,21 +21,17 @@
   "scripts": {
     "eslint": "eslint .",
     "build": "tsup src/index.ts --clean --format cjs,esm --dts",
-    "build-dev": "npm run build && tsc src/index.ts --outDir dist --target esnext --moduleResolution nodenext --module nodenext --emitDeclarationOnly --declaration --declarationMap"
+    "build-doc": "npm run build && tsc src/index.ts --outDir dist --target esnext --moduleResolution nodenext --module nodenext --emitDeclarationOnly --declaration --declarationMap"
   },
   "devDependencies": {
-    "@aidc-toolkit/dev": "^0.9.1",
-    "@eslint/js": "^9.11.1",
-    "@stylistic/eslint-plugin": "^2.8.0",
-    "eslint-config-love": "^71.0.0",
-    "eslint-plugin-jsdoc": "^50.3.0",
+    "@aidc-toolkit/dev": "^0.9.3",
+    "eslint": "^9.14.0",
     "ts-node": "^10.9.2",
-    "tsup": "^8.3.0",
-    "typescript": "^5.6.2",
-    "typescript-eslint": "^8.7.0"
+    "tsup": "^8.3.5",
+    "typescript": "^5.6.3"
   },
   "dependencies": {
-    "i18next": "^23.15.1",
+    "i18next": "^23.16.5",
     "i18next-browser-languagedetector": "^8.0.0",
     "i18next-cli-language-detector": "^1.1.8"
   }

package/src/locale/i18n.ts

@@ -38,8 +38,6 @@ export enum I18NEnvironment {
     Browser
 }
 
-let i18nInitPending = true;
-
 /**
  * Initialize internationalization.
  *
@@ -53,11 +51,11 @@ let i18nInitPending = true;
  * True if initialization was completed, false if skipped (already initialized).
  */
 export async function i18nInit(environment: I18NEnvironment, debug = false): Promise<boolean> {
-    const initialized = i18nInitPending;
+    let initialized: boolean;
 
     // Skip if initialization is not pending.
-    if (i18nInitPending) {
-        i18nInitPending = false;
+    if (pendingResourceBundles !== undefined) {
+        initialized = true;
 
         let module: object;
 
@@ -74,22 +72,26 @@ export async function i18nInit(environment: I18NEnvironment, debug = false): Pro
                 throw new Error("Not supported");
         }
 
+        const initResourceBundles = pendingResourceBundles;
+
+        // No need to manage pending resource bundles past this point.
+        pendingResourceBundles = undefined;
+
         await i18next.use(module as never).init({
             fallbackLng: "en",
             debug,
             resources: {}
         }).then(() => {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const initResourceBundles = pendingResourceBundles!;
-
-            // No need to manage pending resource bundles past this point.
-            pendingResourceBundles = undefined;
+            // Add toLowerCase function.
+            i18next.services.formatter?.add("toLowerCase", value => (value as string).toLowerCase());
 
             // Add pending resource bundles.
             for (const initResourceBundle of initResourceBundles) {
                 i18nAddResourceBundle(initResourceBundle.lng, initResourceBundle.ns, initResourceBundle.resources);
             }
         });
+    } else {
+        initialized = false;
     }
 
     return initialized;
@@ -115,6 +117,55 @@ export function i18nAddResourceBundle(lng: string, ns: string, resources: object
             resources
         });
     } else {
+        // Already initialized; add resource bundle directly.
         i18next.addResourceBundle(lng, ns, resources);
     }
 }
+
+/**
+ * Assert that language resources are a type match for English (default) resources.
+ *
+ * @param enResources
+ * English resources.
+ *
+ * @param lng
+ * Language.
+ *
+ * @param lngResources
+ * Language resources.
+ *
+ * @param parent
+ * Parent key name (set recursively).
+ */
+export function i18nAssertValidResources(enResources: object, lng: string, lngResources: object, parent?: string): void {
+    const enResourcesMap = new Map<string, object>(Object.entries(enResources));
+    const lngResourcesMap = new Map<string, object>(Object.entries(lngResources));
+
+    const isLocale = lng.includes("-");
+
+    for (const [enKey, enValue] of enResourcesMap) {
+        const lngValue = lngResourcesMap.get(enKey);
+
+        if (lngValue !== undefined) {
+            const enValueType = typeof enValue;
+            const lngValueType = typeof lngValue;
+
+            if (lngValueType !== enValueType) {
+                throw new Error(`Invalid value type ${lngValueType} for key ${parent === undefined ? "" : `${parent}.`}${enKey} in ${lng} resources`);
+            }
+
+            if (enValueType === "object") {
+                i18nAssertValidResources(enValue, lng, lngValue, `${parent === undefined ? "" : `${parent}.`}${enKey}`);
+            }
+        // Locale falls back to raw language so ignore if missing.
+        } else if (!isLocale) {
+            throw new Error(`Missing key ${parent === undefined ? "" : `${parent}.`}${enKey} from ${lng} resources`);
+        }
+    }
+
+    for (const [lngKey] of lngResourcesMap) {
+        if (!enResourcesMap.has(lngKey)) {
+            throw new Error(`Extraneous key ${parent === undefined ? "" : `${parent}.`}${lngKey} in ${lng} resources`);
+        }
+    }
+}