@aidc-toolkit/core 0.9.7-beta → 0.9.9-beta

package/LICENSE

@@ -172,30 +172,3 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright © 2024 Dolphin Data Development Ltd.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

package/README.md

@@ -1,3 +1,20 @@
+# Core Package
+
+**Copyright © 2024-2025 Dolphin Data Development Ltd. and AIDC Toolkit contributors**
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+License. You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+## Overview
+
+⚠️ **This software is in beta**, with production release is scheduled for 2024Q4. To follow the status of that and other
+projects, go to the AIDC Toolkit [projects](https://github.com/orgs/aidc-toolkit/projects) page.
+
 The AIDC Toolkit `core` package contains artefacts to support other AIDC Toolkit packages; it does not itself provide
 any of the functionality of the AIDC Toolkit. It is a required dependency for all AIDC Toolkit packages.
 
@@ -5,29 +22,81 @@ any of the functionality of the AIDC Toolkit. It is a required dependency for al
 
 All AIDC Toolkit packages require localization. The localization functionality in this package simplifies initialization
 and allows packages to share a common internationalization engine, whose initialization is the responsibility of the
-client application. Packages install their resources as follows in `i18n.ts` or similar:
+client application. Each package requires its own internationalization object and each is responsible for initializing
+those of its dependencies.
+
+Packages install their resources as follows in `i18n.ts` or similar:
 
 ```typescript
-import { i18nAddResourceBundle, i18next } from "@aidc-toolkit/core";
-import { localeStrings as enLocaleStrings } from "./en/locale_strings.js";
+import { i18nAssertValidResources, i18nCoreInit, type I18NEnvironment } from "@aidc-toolkit/core";
+import { i18nDependency1Init, dependency1Resources } from "@aidc-toolkit/dependency1";
+import { i18nDependency2Init, dependency2Resources } from "@aidc-toolkit/dependency2";
+import i18next from "i18next";
+import { localeStrings as enLocaleStrings } from "./en/locale-strings.js";
+import { localeStrings as frLocaleStrings } from "./fr/locale-strings.js";
 
 export const packageNS = "aidct_package";
 
-i18nAddResourceBundle("en", packageNS, enLocaleStrings);
+/**
+ * Locale strings type is extracted from the English locale strings object.
+ */
+export type PackageLocaleStrings = typeof enLocaleStrings;
+
+i18nAssertValidResources(enLocaleStrings, "fr", frLocaleStrings);
+
+/**
+ * Package resources.
+ */
+export const packageResources = {
+    en: {
+        aidct_package: enLocaleStrings
+    },
+    fr: {
+        aidct_package: frLocaleStrings
+    }
+};
+
+export const i18nextPackage = i18next.createInstance();
 
-export default i18next;
+/**
+ * Initialize internationalization.
+ *
+ * @param environment
+ * Environment in which the application is running.
+ *
+ * @param debug
+ * Debug setting.
+ *
+ * @returns
+ * Void promise.
+ */
+export async function i18nPackageInit(environment: I18NEnvironment, debug = false): Promise<void> {
+    await i18nDependency1Init(environment, debug);
+    await i18nDependency2Init(environment, debug);
+    await i18nCoreInit(i18nextPackage, environment, debug, packageNS, dependency1Resources, dependency2Resources, packageResources);
+}
 ```
 
 The resource types are declared in `i18next.d.ts` or similar:
 
 ```typescript
-import type { localeStrings } from "./en/locale_strings.js";
+import type { Dependency1LocaleStrings } from "@aidc-toolkit/dependency1";
+import type { Dependency2LocaleStrings } from "@aidc-toolkit/dependency2";
+import type { PackageLocaleStrings } from "./i18n.js";
 
+/**
+ * Internationalization module.
+ */
 declare module "i18next" {
+    /**
+     * Custom type options for this package.
+     */
     interface CustomTypeOptions {
+        defaultNS: "aidct_package";
         resources: {
-            // Extract the type from the English locale strings object.
-            aidct_package: typeof localeStrings;
+            aidct_dependency1: Dependency1LocaleStrings;
+            aidct_dependency2: Dependency2LocaleStrings;
+            aidct_package: PackageLocaleStrings;
         };
     }
 }

package/dist/index.cjs

@@ -28,74 +28,23 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   I18NEnvironment: () => I18NEnvironment,
-  i18nAddResourceBundle: () => i18nAddResourceBundle,
   i18nAssertValidResources: () => i18nAssertValidResources,
-  i18nInit: () => i18nInit,
-  i18next: () => i18n_default
+  i18nCoreInit: () => i18nCoreInit
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/locale/i18n.ts
-var import_i18next = __toESM(require("i18next"), 1);
 var import_i18next_browser_languagedetector = __toESM(require("i18next-browser-languagedetector"), 1);
 var import_i18next_cli_language_detector = __toESM(require("i18next-cli-language-detector"), 1);
-var i18n_default = import_i18next.default;
-var pendingResourceBundles = [];
 var I18NEnvironment = /* @__PURE__ */ ((I18NEnvironment2) => {
   I18NEnvironment2[I18NEnvironment2["CLI"] = 0] = "CLI";
   I18NEnvironment2[I18NEnvironment2["Server"] = 1] = "Server";
   I18NEnvironment2[I18NEnvironment2["Browser"] = 2] = "Browser";
   return I18NEnvironment2;
 })(I18NEnvironment || {});
-function toLowerCase(s) {
-  return s.split(" ").map((word) => /[a-z]/.test(word) ? word.toLowerCase() : word).join(" ");
-}
-async function i18nInit(environment, debug = false) {
-  let initialized;
-  if (pendingResourceBundles !== void 0) {
-    initialized = true;
-    let module2;
-    switch (environment) {
-      case 0 /* CLI */:
-        module2 = import_i18next_cli_language_detector.default;
-        break;
-      case 2 /* Browser */:
-        module2 = import_i18next_browser_languagedetector.default;
-        break;
-      default:
-        throw new Error("Not supported");
-    }
-    const initResourceBundles = pendingResourceBundles;
-    pendingResourceBundles = void 0;
-    await import_i18next.default.use(module2).init({
-      fallbackLng: "en",
-      debug,
-      resources: {}
-    }).then(() => {
-      import_i18next.default.services.formatter?.add("toLowerCase", (value) => typeof value === "string" ? toLowerCase(value) : String(value));
-      for (const initResourceBundle of initResourceBundles) {
-        i18nAddResourceBundle(initResourceBundle.lng, initResourceBundle.ns, initResourceBundle.resources);
-      }
-    });
-  } else {
-    initialized = false;
-  }
-  return initialized;
-}
-function i18nAddResourceBundle(lng, ns, resources) {
-  if (pendingResourceBundles !== void 0) {
-    pendingResourceBundles.push({
-      lng,
-      ns,
-      resources
-    });
-  } else {
-    import_i18next.default.addResourceBundle(lng, ns, resources);
-  }
-}
 function i18nAssertValidResources(enResources, lng, lngResources, parent) {
   const enResourcesMap = new Map(Object.entries(enResources));
   const lngResourcesMap = new Map(Object.entries(lngResources));
@@ -121,11 +70,63 @@ function i18nAssertValidResources(enResources, lng, lngResources, parent) {
     }
   }
 }
+function toLowerCase(s) {
+  return s.split(" ").map((word) => /[a-z]/.test(word) ? word.toLowerCase() : word).join(" ");
+}
+async function i18nCoreInit(i18next, environment, debug, defaultNS, ...resources) {
+  if (!i18next.isInitialized) {
+    const mergedResource = {};
+    for (const resource of resources) {
+      for (const [language, resourceLanguage] of Object.entries(resource)) {
+        if (!(language in mergedResource)) {
+          mergedResource[language] = {};
+        }
+        const mergedResourceLanguage = mergedResource[language];
+        for (const [namespace, resourceKey] of Object.entries(resourceLanguage)) {
+          mergedResourceLanguage[namespace] = resourceKey;
+        }
+      }
+    }
+    let module2;
+    switch (environment) {
+      case 0 /* CLI */:
+        module2 = import_i18next_cli_language_detector.default;
+        break;
+      case 2 /* Browser */:
+        module2 = import_i18next_browser_languagedetector.default;
+        break;
+      default:
+        throw new Error("Not supported");
+    }
+    await i18next.use(module2).init({
+      debug,
+      resources: mergedResource,
+      fallbackLng: "en",
+      defaultNS
+    }).then(() => {
+      i18next.services.formatter?.add("toLowerCase", (value) => typeof value === "string" ? toLowerCase(value) : String(value));
+    });
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   I18NEnvironment,
-  i18nAddResourceBundle,
   i18nAssertValidResources,
-  i18nInit,
-  i18next
+  i18nCoreInit
 });
+/*!
+ * Copyright © 2024-2025 Dolphin Data Development Ltd. and AIDC Toolkit
+ * contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

package/dist/index.d.cts

@@ -1,5 +1,4 @@
-import i18next from 'i18next';
-export { default as i18next } from 'i18next';
+import { i18n, Resource } from 'i18next';
 
 /**
  * Internationalization operating environment.
@@ -18,32 +17,6 @@ declare enum I18NEnvironment {
      */
     Browser = 2
 }
-/**
- * Initialize internationalization.
- *
- * @param environment
- * Environment in which the application is running.
- *
- * @param debug
- * Debug setting.
- *
- * @returns
- * True if initialization was completed, false if skipped (already initialized).
- */
-declare function i18nInit(environment: I18NEnvironment, debug?: boolean): Promise<boolean>;
-/**
- * Add a resource bundle.
- *
- * @param lng
- * Language.
- *
- * @param ns
- * Namespace.
- *
- * @param resources
- * Resources.
- */
-declare function i18nAddResourceBundle(lng: string, ns: string, resources: object): void;
 /**
  * Assert that language resources are a type match for English (default) resources.
  *
@@ -60,5 +33,28 @@ declare function i18nAddResourceBundle(lng: string, ns: string, resources: objec
  * Parent key name (set recursively).
  */
 declare function i18nAssertValidResources(enResources: object, lng: string, lngResources: object, parent?: string): void;
+/**
+ * Initialize internationalization.
+ *
+ * @param i18next
+ * Internationalization object. As multiple objects exists, this parameter represents the one for the module for which
+ * internationalization is being initialized.
+ *
+ * @param environment
+ * Environment in which the application is running.
+ *
+ * @param debug
+ * Debug setting.
+ *
+ * @param defaultNS
+ * Default namespace.
+ *
+ * @param resources
+ * Resources.
+ *
+ * @returns
+ * Void promise.
+ */
+declare function i18nCoreInit(i18next: i18n, environment: I18NEnvironment, debug: boolean, defaultNS: string, ...resources: Resource[]): Promise<void>;
 
-export { I18NEnvironment, i18nAddResourceBundle, i18nAssertValidResources, i18nInit };
+export { I18NEnvironment, i18nAssertValidResources, i18nCoreInit };

package/dist/index.d.ts

@@ -1,5 +1,4 @@
-import i18next from 'i18next';
-export { default as i18next } from 'i18next';
+import { i18n, Resource } from 'i18next';
 
 /**
  * Internationalization operating environment.
@@ -18,32 +17,6 @@ declare enum I18NEnvironment {
      */
     Browser = 2
 }
-/**
- * Initialize internationalization.
- *
- * @param environment
- * Environment in which the application is running.
- *
- * @param debug
- * Debug setting.
- *
- * @returns
- * True if initialization was completed, false if skipped (already initialized).
- */
-declare function i18nInit(environment: I18NEnvironment, debug?: boolean): Promise<boolean>;
-/**
- * Add a resource bundle.
- *
- * @param lng
- * Language.
- *
- * @param ns
- * Namespace.
- *
- * @param resources
- * Resources.
- */
-declare function i18nAddResourceBundle(lng: string, ns: string, resources: object): void;
 /**
  * Assert that language resources are a type match for English (default) resources.
  *
@@ -60,5 +33,28 @@ declare function i18nAddResourceBundle(lng: string, ns: string, resources: objec
  * Parent key name (set recursively).
  */
 declare function i18nAssertValidResources(enResources: object, lng: string, lngResources: object, parent?: string): void;
+/**
+ * Initialize internationalization.
+ *
+ * @param i18next
+ * Internationalization object. As multiple objects exists, this parameter represents the one for the module for which
+ * internationalization is being initialized.
+ *
+ * @param environment
+ * Environment in which the application is running.
+ *
+ * @param debug
+ * Debug setting.
+ *
+ * @param defaultNS
+ * Default namespace.
+ *
+ * @param resources
+ * Resources.
+ *
+ * @returns
+ * Void promise.
+ */
+declare function i18nCoreInit(i18next: i18n, environment: I18NEnvironment, debug: boolean, defaultNS: string, ...resources: Resource[]): Promise<void>;
 
-export { I18NEnvironment, i18nAddResourceBundle, i18nAssertValidResources, i18nInit };
+export { I18NEnvironment, i18nAssertValidResources, i18nCoreInit };

package/dist/index.js

@@ -1,61 +1,12 @@
 // src/locale/i18n.ts
-import i18next from "i18next";
 import I18nextBrowserLanguageDetector from "i18next-browser-languagedetector";
 import I18nextCLILanguageDetector from "i18next-cli-language-detector";
-var i18n_default = i18next;
-var pendingResourceBundles = [];
 var I18NEnvironment = /* @__PURE__ */ ((I18NEnvironment2) => {
   I18NEnvironment2[I18NEnvironment2["CLI"] = 0] = "CLI";
   I18NEnvironment2[I18NEnvironment2["Server"] = 1] = "Server";
   I18NEnvironment2[I18NEnvironment2["Browser"] = 2] = "Browser";
   return I18NEnvironment2;
 })(I18NEnvironment || {});
-function toLowerCase(s) {
-  return s.split(" ").map((word) => /[a-z]/.test(word) ? word.toLowerCase() : word).join(" ");
-}
-async function i18nInit(environment, debug = false) {
-  let initialized;
-  if (pendingResourceBundles !== void 0) {
-    initialized = true;
-    let module;
-    switch (environment) {
-      case 0 /* CLI */:
-        module = I18nextCLILanguageDetector;
-        break;
-      case 2 /* Browser */:
-        module = I18nextBrowserLanguageDetector;
-        break;
-      default:
-        throw new Error("Not supported");
-    }
-    const initResourceBundles = pendingResourceBundles;
-    pendingResourceBundles = void 0;
-    await i18next.use(module).init({
-      fallbackLng: "en",
-      debug,
-      resources: {}
-    }).then(() => {
-      i18next.services.formatter?.add("toLowerCase", (value) => typeof value === "string" ? toLowerCase(value) : String(value));
-      for (const initResourceBundle of initResourceBundles) {
-        i18nAddResourceBundle(initResourceBundle.lng, initResourceBundle.ns, initResourceBundle.resources);
-      }
-    });
-  } else {
-    initialized = false;
-  }
-  return initialized;
-}
-function i18nAddResourceBundle(lng, ns, resources) {
-  if (pendingResourceBundles !== void 0) {
-    pendingResourceBundles.push({
-      lng,
-      ns,
-      resources
-    });
-  } else {
-    i18next.addResourceBundle(lng, ns, resources);
-  }
-}
 function i18nAssertValidResources(enResources, lng, lngResources, parent) {
   const enResourcesMap = new Map(Object.entries(enResources));
   const lngResourcesMap = new Map(Object.entries(lngResources));
@@ -81,10 +32,62 @@ function i18nAssertValidResources(enResources, lng, lngResources, parent) {
     }
   }
 }
+function toLowerCase(s) {
+  return s.split(" ").map((word) => /[a-z]/.test(word) ? word.toLowerCase() : word).join(" ");
+}
+async function i18nCoreInit(i18next, environment, debug, defaultNS, ...resources) {
+  if (!i18next.isInitialized) {
+    const mergedResource = {};
+    for (const resource of resources) {
+      for (const [language, resourceLanguage] of Object.entries(resource)) {
+        if (!(language in mergedResource)) {
+          mergedResource[language] = {};
+        }
+        const mergedResourceLanguage = mergedResource[language];
+        for (const [namespace, resourceKey] of Object.entries(resourceLanguage)) {
+          mergedResourceLanguage[namespace] = resourceKey;
+        }
+      }
+    }
+    let module;
+    switch (environment) {
+      case 0 /* CLI */:
+        module = I18nextCLILanguageDetector;
+        break;
+      case 2 /* Browser */:
+        module = I18nextBrowserLanguageDetector;
+        break;
+      default:
+        throw new Error("Not supported");
+    }
+    await i18next.use(module).init({
+      debug,
+      resources: mergedResource,
+      fallbackLng: "en",
+      defaultNS
+    }).then(() => {
+      i18next.services.formatter?.add("toLowerCase", (value) => typeof value === "string" ? toLowerCase(value) : String(value));
+    });
+  }
+}
 export {
   I18NEnvironment,
-  i18nAddResourceBundle,
   i18nAssertValidResources,
-  i18nInit,
-  i18n_default as i18next
+  i18nCoreInit
 };
+/*!
+ * Copyright © 2024-2025 Dolphin Data Development Ltd. and AIDC Toolkit
+ * contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aidc-toolkit/core",
-  "version": "0.9.7-beta",
+  "version": "0.9.9-beta",
   "description": "Core functionality for AIDC Toolkit",
   "type": "module",
   "main": "dist/index.js",
@@ -20,19 +20,19 @@
   },
   "scripts": {
     "lint": "eslint .",
-    "build": "tsup src/index.ts --clean --format cjs,esm --dts",
-    "build-doc": "npm run build && tsc src/index.ts --outDir dist --target esnext --moduleResolution nodenext --module nodenext --emitDeclarationOnly --declaration --declarationMap"
+    "build-dist": "tsup src/index.ts --clean --format cjs,esm --dts",
+    "build-doc": "npm run build-dist && tsc src/index.ts --outDir dist --target esnext --moduleResolution nodenext --module nodenext --emitDeclarationOnly --declaration --declarationMap"
   },
   "devDependencies": {
-    "@aidc-toolkit/dev": "^0.9.7-beta",
-    "eslint": "^9.16.0",
+    "@aidc-toolkit/dev": "^0.9.9-beta",
+    "eslint": "^9.17.0",
     "ts-node": "^10.9.2",
     "tsup": "^8.3.5",
     "typescript": "^5.7.2"
   },
   "dependencies": {
-    "@rollup/rollup-linux-x64-gnu": "^4.28.1",
-    "i18next": "^24.0.5",
+    "@rollup/rollup-linux-x64-gnu": "^4.29.1",
+    "i18next": "^24.2.0",
     "i18next-browser-languagedetector": "^8.0.2",
     "i18next-cli-language-detector": "^1.1.8"
   }

package/src/index.ts

@@ -1,2 +1,17 @@
+/*!
+ * Copyright © 2024-2025 Dolphin Data Development Ltd. and AIDC Toolkit
+ * contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 export * from "./locale/i18n.js";
-export { default as i18next } from "./locale/i18n.js";

package/src/locale/i18n.ts

@@ -1,23 +1,7 @@
-import i18next, { type LanguageDetectorModule } from "i18next";
+import type { i18n, LanguageDetectorModule, Resource } from "i18next";
 import I18nextBrowserLanguageDetector from "i18next-browser-languagedetector";
 import I18nextCLILanguageDetector from "i18next-cli-language-detector";
 
-export default i18next;
-
-/**
- * Internal type to maintain resource bundles added before initialization.
- */
-interface ResourceBundle {
-    lng: string;
-    ns: string;
-    resources: object;
-}
-
-/**
- * Internal array to maintain resource bundles added before initialization.
- */
-let pendingResourceBundles: ResourceBundle[] | undefined = [];
-
 /**
  * Internationalization operating environment.
  */
@@ -38,6 +22,54 @@ export enum I18NEnvironment {
     Browser
 }
 
+/**
+ * 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`);
+        }
+    }
+}
+
 /**
  * Convert a string to lower case, skipping words that are all upper case.
  *
@@ -55,27 +87,53 @@ function toLowerCase(s: string): string {
 /**
  * Initialize internationalization.
  *
+ * @param i18next
+ * Internationalization object. As multiple objects exists, this parameter represents the one for the module for which
+ * internationalization is being initialized.
+ *
  * @param environment
  * Environment in which the application is running.
  *
  * @param debug
  * Debug setting.
  *
+ * @param defaultNS
+ * Default namespace.
+ *
+ * @param resources
+ * Resources.
+ *
  * @returns
- * True if initialization was completed, false if skipped (already initialized).
+ * Void promise.
  */
-export async function i18nInit(environment: I18NEnvironment, debug = false): Promise<boolean> {
-    let initialized: boolean;
+export async function i18nCoreInit(i18next: i18n, environment: I18NEnvironment, debug: boolean, defaultNS: string, ...resources: Resource[]): Promise<void> {
+    // Initialization may be called more than once.
+    if (!i18next.isInitialized) {
+        const mergedResource: Resource = {};
+
+        // Merge resources.
+        for (const resource of resources) {
+            // Merge languages.
+            for (const [language, resourceLanguage] of Object.entries(resource)) {
+                if (!(language in mergedResource)) {
+                    mergedResource[language] = {};
+                }
+
+                const mergedResourceLanguage = mergedResource[language];
+
+                // Merge namespaces.
+                for (const [namespace, resourceKey] of Object.entries(resourceLanguage)) {
+                    mergedResourceLanguage[namespace] = resourceKey;
+                }
+            }
+        }
 
-    // Skip if initialization is not pending.
-    if (pendingResourceBundles !== undefined) {
-        initialized = true;
-        
         let module: Parameters<typeof i18next.use>[0];
 
         switch (environment) {
             case I18NEnvironment.CLI:
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Pending resolution of https://github.com/neet/i18next-cli-language-detector/issues/281.
+                // TODO Refactor when https://github.com/neet/i18next-cli-language-detector/issues/281 resolved.
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Per above.
                 module = I18nextCLILanguageDetector as unknown as LanguageDetectorModule;
                 break;
 
@@ -87,100 +145,14 @@ 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).init({
-            fallbackLng: "en",
             debug,
-            resources: {}
+            resources: mergedResource,
+            fallbackLng: "en",
+            defaultNS
         }).then(() => {
             // Add toLowerCase function.
             i18next.services.formatter?.add("toLowerCase", value => typeof value === "string" ? toLowerCase(value) : String(value));
-
-            // Add pending resource bundles.
-            for (const initResourceBundle of initResourceBundles) {
-                i18nAddResourceBundle(initResourceBundle.lng, initResourceBundle.ns, initResourceBundle.resources);
-            }
-        });
-    } else {
-        initialized = false;
-    }
-
-    return initialized;
-}
-
-/**
- * Add a resource bundle.
- *
- * @param lng
- * Language.
- *
- * @param ns
- * Namespace.
- *
- * @param resources
- * Resources.
- */
-export function i18nAddResourceBundle(lng: string, ns: string, resources: object): void {
-    if (pendingResourceBundles !== undefined) {
-        pendingResourceBundles.push({
-            lng,
-            ns,
-            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`);
-        }
     }
 }