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

package/src/idkey.ts

@@ -2,16 +2,16 @@ import {
     CharacterSetCreator,
     type CharacterSetValidation,
     Exclusion,
-    IteratorProxy,
     NUMERIC_CREATOR,
     RegExpValidator,
     type StringValidation,
     type StringValidator,
     type TransformerInput,
-    type TransformerOutput
+    type TransformerOutput,
+    transformIterable
 } from "@aidc-toolkit/utility";
 import { Mixin } from "ts-mixer";
-import { AI39_CREATOR, AI82_CREATOR } from "./character_set.js";
+import { AI39_CREATOR, AI82_CREATOR } from "./character-set.js";
 import {
     checkCharacterPair,
     checkDigit,
@@ -19,7 +19,7 @@ import {
     hasValidCheckCharacterPair,
     hasValidCheckDigit
 } from "./check.js";
-import i18next, { gs1NS } from "./locale/i18n.js";
+import { i18nextGS1 } from "./locale/i18n.js";
 
 /**
  * Identification key type.
@@ -409,8 +409,7 @@ abstract class AbstractNumericIdentificationKeyValidator extends AbstractIdentif
 
         // Validate the length.
         if (identificationKey.length !== this.length) {
-            throw new RangeError(i18next.t("IdentificationKey.identificationKeyTypeLength", {
-                ns: gs1NS,
+            throw new RangeError(i18nextGS1.t("IdentificationKey.identificationKeyTypeLength", {
                 identificationKeyType: this.identificationKeyType,
                 length: this.length
             }));
@@ -418,9 +417,7 @@ abstract class AbstractNumericIdentificationKeyValidator extends AbstractIdentif
 
         // Validating the check digit will also validate the characters.
         if (!hasValidCheckDigit(this.padIdentificationKey(identificationKey, validation))) {
-            throw new RangeError(i18next.t("IdentificationKey.invalidCheckDigit", {
-                ns: gs1NS
-            }));
+            throw new RangeError(i18nextGS1.t("IdentificationKey.invalidCheckDigit"));
         }
     }
 }
@@ -560,9 +557,7 @@ export class GTINValidator extends AbstractNumericIdentificationKeyValidator {
         }
 
         if (gtin12 === undefined) {
-            throw new RangeError(i18next.t("IdentificationKey.invalidZeroSuppressedGTIN12", {
-                ns: gs1NS
-            }));
+            throw new RangeError(i18nextGS1.t("IdentificationKey.invalidZeroSuppressedGTIN12"));
         }
 
         // Make sure that resulting GTIN-12 is valid.
@@ -589,9 +584,7 @@ export class GTINValidator extends AbstractNumericIdentificationKeyValidator {
         switch (gtin.length) {
             case GTINType.GTIN13 as number:
                 if (gtin.startsWith("0")) {
-                    throw new RangeError(i18next.t("IdentificationKey.invalidGTIN13AtRetail", {
-                        ns: gs1NS
-                    }));
+                    throw new RangeError(i18nextGS1.t("IdentificationKey.invalidGTIN13AtRetail"));
                 }
 
                 // Validate prefix requiring exact match for prefix type.
@@ -627,23 +620,17 @@ export class GTINValidator extends AbstractNumericIdentificationKeyValidator {
                 break;
 
             default:
-                throw new RangeError(i18next.t("IdentificationKey.invalidGTINLength", {
-                    ns: gs1NS
-                }));
+                throw new RangeError(i18nextGS1.t("IdentificationKey.invalidGTINLength"));
         }
 
         // Validating the check digit will also validate the characters.
         if (!hasValidCheckDigit(lengthValidatedGTIN)) {
-            throw new RangeError(i18next.t("IdentificationKey.invalidCheckDigit", {
-                ns: gs1NS
-            }));
+            throw new RangeError(i18nextGS1.t("IdentificationKey.invalidCheckDigit"));
         }
 
         // Validate against level if required.
         if (gtinLevel !== GTINLevel.Any && gtinLevelRestriction !== GTINLevel.Any && gtinLevelRestriction !== gtinLevel) {
-            throw new RangeError(i18next.t(gtinLevel === GTINLevel.RetailConsumer ? "IdentificationKey.invalidGTINAtRetail" : "IdentificationKey.invalidGTINAtOtherThanRetail", {
-                ns: gs1NS
-            }));
+            throw new RangeError(i18nextGS1.t(gtinLevel === GTINLevel.RetailConsumer ? "IdentificationKey.invalidGTINAtRetail" : "IdentificationKey.invalidGTINAtOtherThanRetail"));
         }
     }
 
@@ -655,9 +642,7 @@ export class GTINValidator extends AbstractNumericIdentificationKeyValidator {
      */
     static validateGTIN14(gtin14: string): void {
         if (gtin14.length as GTINType !== GTINType.GTIN14) {
-            throw new RangeError(i18next.t("IdentificationKey.invalidGTIN14Length", {
-                ns: gs1NS
-            }));
+            throw new RangeError(i18nextGS1.t("IdentificationKey.invalidGTIN14Length"));
         }
 
         GTINCreator.validateAny(gtin14);
@@ -734,9 +719,7 @@ export class SerializableNumericIdentificationKeyValidator extends NonGTINNumeri
         this._serialComponentValidation = {
             minimumLength: 1,
             maximumLength: serialComponentLength,
-            component: () => i18next.t("IdentificationKey.serialComponent", {
-                ns: gs1NS
-            })
+            component: () => i18nextGS1.t("IdentificationKey.serialComponent")
         };
 
         this._serialComponentCreator = SerializableNumericIdentificationKeyValidator.creatorFor(serialComponentCharacterSet);
@@ -805,9 +788,7 @@ export class NonNumericIdentificationKeyValidator extends AbstractIdentification
          * @inheritDoc
          */
         protected override createErrorMessage(_s: string): string {
-            return i18next.t("IdentificationKey.referenceCantBeAllNumeric", {
-                ns: gs1NS
-            });
+            return i18nextGS1.t("IdentificationKey.referenceCantBeAllNumeric");
         }
     }(/\D/);
 
@@ -865,9 +846,7 @@ export class NonNumericIdentificationKeyValidator extends AbstractIdentification
             });
         // Validating the check character pair will also validate the characters.
         } else if (!hasValidCheckCharacterPair(this.padIdentificationKey(identificationKey, validation))) {
-            throw new RangeError(i18next.t("IdentificationKey.invalidCheckCharacterPair", {
-                ns: gs1NS
-            }));
+            throw new RangeError(i18nextGS1.t("IdentificationKey.invalidCheckCharacterPair"));
         }
 
         // Check for all-numeric identification key (minus check character pair) if excluded.
@@ -1074,13 +1053,14 @@ export interface NumericIdentificationKeyCreator extends NumericIdentificationKe
     /**
      * Create all identification keys for the prefix from `0` to `capacity - 1`.
      *
-     * The implementation creates the strings as needed using an internal generator function, so the values are created
-     * only as needed.
+     * The implementation creates the strings only as needed using an internal generator function. Although the result
+     * is equivalent to calling `creator.create(new Sequence(0, creator.capacity))`, this method is significantly
+     * faster.
      *
      * @returns
-     * Iterable iterator over created identification keys.
+     * All identification keys for the prefix.
      */
-    createAll: () => IterableIterator<string>;
+    createAll: () => Iterable<string>;
 }
 
 /**
@@ -1213,15 +1193,21 @@ abstract class AbstractNumericIdentificationKeyCreator extends AbstractIdentific
     /**
      * @inheritDoc
      */
-    createAll(): IterableIterator<string> {
+    createAll(): Iterable<string> {
         const hasExtensionDigit = this.leaderType === LeaderType.ExtensionDigit;
         const prefix = this.prefix;
+        const length = this.length;
         const referenceLength = this.referenceLength;
 
         // Start weight is for reference excluding extension digit, which has its weight calculated separately.
         const startWeight = 3 - 2 * ((referenceLength + 1 - Number(hasExtensionDigit)) % 2);
 
-        return AbstractNumericIdentificationKeyCreator.createAllPartial(prefix, referenceLength, hasExtensionDigit ? 3 - 2 * this.length % 2 : 0, startWeight, checkDigitSum(startWeight === 3, prefix));
+        // Returning separate Iterable object makes iteration repeatable.
+        return {
+            [Symbol.iterator]() {
+                return AbstractNumericIdentificationKeyCreator.createAllPartial(prefix, referenceLength, hasExtensionDigit ? 3 - 2 * length % 2 : 0, startWeight, checkDigitSum(startWeight === 3, prefix));
+            }
+        };
     }
 }
 
@@ -1235,9 +1221,7 @@ export class GTINCreator extends Mixin(GTINValidator, AbstractNumericIdentificat
     private static readonly REQUIRED_INDICATOR_DIGIT_VALIDATION: CharacterSetValidation = {
         minimumLength: 1,
         maximumLength: 1,
-        component: () => i18next.t("IdentificationKey.indicatorDigit", {
-            ns: gs1NS
-        })
+        component: () => i18nextGS1.t("IdentificationKey.indicatorDigit")
     };
 
     /**
@@ -1246,9 +1230,7 @@ export class GTINCreator extends Mixin(GTINValidator, AbstractNumericIdentificat
     private static readonly OPTIONAL_INDICATOR_DIGIT_VALIDATION: CharacterSetValidation = {
         minimumLength: 0,
         maximumLength: 1,
-        component: () => i18next.t("IdentificationKey.indicatorDigit", {
-            ns: gs1NS
-        })
+        component: () => i18nextGS1.t("IdentificationKey.indicatorDigit")
     };
 
     /**
@@ -1330,9 +1312,7 @@ export class GTINCreator extends Mixin(GTINValidator, AbstractNumericIdentificat
         }
 
         if (zeroSuppressedGTIN12 === undefined) {
-            throw new RangeError(i18next.t("IdentificationKey.invalidZeroSuppressibleGTIN12", {
-                ns: gs1NS
-            }));
+            throw new RangeError(i18nextGS1.t("IdentificationKey.invalidZeroSuppressibleGTIN12"));
         }
 
         return zeroSuppressedGTIN12;
@@ -1400,9 +1380,7 @@ export class GTINCreator extends Mixin(GTINValidator, AbstractNumericIdentificat
                     // GTIN is GTIN-8.
                     normalizedGTIN = gtin.substring(5);
                 } else {
-                    throw new RangeError(i18next.t("IdentificationKey.invalidZeroSuppressedGTIN12AsGTIN13", {
-                        ns: gs1NS
-                    }));
+                    throw new RangeError(i18nextGS1.t("IdentificationKey.invalidZeroSuppressedGTIN12AsGTIN13"));
                 }
                 break;
 
@@ -1435,16 +1413,12 @@ export class GTINCreator extends Mixin(GTINValidator, AbstractNumericIdentificat
                     // GTIN is GTIN-8.
                     normalizedGTIN = gtin.substring(6);
                 } else {
-                    throw new RangeError(i18next.t("IdentificationKey.invalidZeroSuppressedGTIN12AsGTIN14", {
-                        ns: gs1NS
-                    }));
+                    throw new RangeError(i18nextGS1.t("IdentificationKey.invalidZeroSuppressedGTIN12AsGTIN14"));
                 }
                 break;
 
             default:
-                throw new RangeError(i18next.t("IdentificationKey.invalidGTINLength", {
-                    ns: gs1NS
-                }));
+                throw new RangeError(i18nextGS1.t("IdentificationKey.invalidGTINLength"));
         }
 
         // Validation applies to the normalized GTIN.
@@ -1524,7 +1498,7 @@ export class SerializableNumericIdentificationKeyCreator extends Mixin(Serializa
      */
     private concatenateValidated<T extends TransformerInput<string>>(baseIdentificationKey: string, serialComponentOrComponents: T): TransformerOutput<T, string> {
         // TODO Refactor type when https://github.com/microsoft/TypeScript/pull/56941 released.
-        let result: string | IterableIterator<string>;
+        let result: string | Iterable<string>;
 
         const serialComponentCreator = this.serialComponentCreator;
         const serialComponentValidation = this.serialComponentValidation;
@@ -1547,9 +1521,10 @@ export class SerializableNumericIdentificationKeyCreator extends Mixin(Serializa
         if (typeof serialComponentOrComponents !== "object") {
             result = validateAndConcatenate(serialComponentOrComponents);
         } else {
-            result = IteratorProxy.from(serialComponentOrComponents).map(validateAndConcatenate);
+            result = transformIterable(serialComponentOrComponents, validateAndConcatenate);
         }
 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Type determination is handled above.
         return result as TransformerOutput<T, string>;
     }
 
@@ -1629,9 +1604,7 @@ export class NonNumericIdentificationKeyCreator extends Mixin(NonNumericIdentifi
             minimumLength: 1,
             // Maximum reference length has to account for prefix and check character pair.
             maximumLength: this.referenceLength,
-            component: () => i18next.t("IdentificationKey.reference", {
-                ns: gs1NS
-            })
+            component: () => i18nextGS1.t("IdentificationKey.reference")
         };
     }
 
@@ -1653,7 +1626,7 @@ export class NonNumericIdentificationKeyCreator extends Mixin(NonNumericIdentifi
      */
     create<T extends TransformerInput<string>>(referenceOrReferences: T): TransformerOutput<T, string> {
         // TODO Refactor type when https://github.com/microsoft/TypeScript/pull/56941 released.
-        let result: string | IterableIterator<string>;
+        let result: string | Iterable<string>;
 
         const referenceCreator = this.referenceCreator;
         const referenceValidation = this.referenceValidation;
@@ -1680,9 +1653,10 @@ export class NonNumericIdentificationKeyCreator extends Mixin(NonNumericIdentifi
         if (typeof referenceOrReferences !== "object") {
             result = validateAndCreate(referenceOrReferences);
         } else {
-            result = IteratorProxy.from(referenceOrReferences).map(validateAndCreate);
+            result = transformIterable(referenceOrReferences, validateAndCreate);
         }
 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Type determination is handled above.
         return result as TransformerOutput<T, string>;
     }
 }
@@ -1770,9 +1744,7 @@ export class PrefixManager {
     private static readonly GS1_COMPANY_PREFIX_VALIDATION: PrefixValidation = {
         minimumLength: PrefixManager.GS1_COMPANY_PREFIX_MINIMUM_LENGTH,
         maximumLength: PrefixManager.GS1_COMPANY_PREFIX_MAXIMUM_LENGTH,
-        component: () => i18next.t("Prefix.gs1CompanyPrefix", {
-            ns: gs1NS
-        })
+        component: () => i18nextGS1.t("Prefix.gs1CompanyPrefix")
     };
 
     /**
@@ -1781,9 +1753,7 @@ export class PrefixManager {
     private static readonly UPC_COMPANY_PREFIX_AS_GS1_COMPANY_PREFIX_VALIDATION: PrefixValidation = {
         minimumLength: PrefixManager.UPC_COMPANY_PREFIX_MINIMUM_LENGTH + 1,
         maximumLength: PrefixManager.UPC_COMPANY_PREFIX_MAXIMUM_LENGTH + 1,
-        component: () => i18next.t("Prefix.gs1CompanyPrefix", {
-            ns: gs1NS
-        })
+        component: () => i18nextGS1.t("Prefix.gs1CompanyPrefix")
     };
 
     /**
@@ -1792,9 +1762,7 @@ export class PrefixManager {
     private static readonly GS1_8_PREFIX_AS_GS1_COMPANY_PREFIX_VALIDATION: PrefixValidation = {
         minimumLength: PrefixManager.GS1_8_PREFIX_MINIMUM_LENGTH + 5,
         maximumLength: PrefixManager.GS1_8_PREFIX_MAXIMUM_LENGTH + 5,
-        component: () => i18next.t("Prefix.gs1CompanyPrefix", {
-            ns: gs1NS
-        })
+        component: () => i18nextGS1.t("Prefix.gs1CompanyPrefix")
     };
 
     /**
@@ -1803,9 +1771,7 @@ export class PrefixManager {
     private static readonly UPC_COMPANY_PREFIX_VALIDATION: PrefixValidation = {
         minimumLength: PrefixManager.UPC_COMPANY_PREFIX_MINIMUM_LENGTH,
         maximumLength: PrefixManager.UPC_COMPANY_PREFIX_MAXIMUM_LENGTH,
-        component: () => i18next.t("Prefix.upcCompanyPrefix", {
-            ns: gs1NS
-        })
+        component: () => i18nextGS1.t("Prefix.upcCompanyPrefix")
     };
 
     /**
@@ -1814,9 +1780,7 @@ export class PrefixManager {
     private static readonly GS1_8_PREFIX_VALIDATION: PrefixValidation = {
         minimumLength: PrefixManager.GS1_8_PREFIX_MINIMUM_LENGTH,
         maximumLength: PrefixManager.GS1_8_PREFIX_MAXIMUM_LENGTH,
-        component: () => i18next.t("Prefix.gs18Prefix", {
-            ns: gs1NS
-        })
+        component: () => i18nextGS1.t("Prefix.gs18Prefix")
     };
 
     /**
@@ -2054,32 +2018,24 @@ export class PrefixManager {
                     baseValidation = PrefixManager.GS1_COMPANY_PREFIX_VALIDATION;
                 } else if (!prefix.startsWith("00000")) {
                     if (!allowUPCCompanyPrefix) {
-                        throw new RangeError(i18next.t("Prefix.gs1CompanyPrefixCantStartWith0", {
-                            ns: gs1NS
-                        }));
+                        throw new RangeError(i18nextGS1.t("Prefix.gs1CompanyPrefixCantStartWith0"));
                     }
 
                     baseValidation = PrefixManager.UPC_COMPANY_PREFIX_AS_GS1_COMPANY_PREFIX_VALIDATION;
                 } else if (!prefix.startsWith("000000")) {
                     if (!allowGS18Prefix) {
-                        throw new RangeError(i18next.t("Prefix.gs1CompanyPrefixCantStartWith00000", {
-                            ns: gs1NS
-                        }));
+                        throw new RangeError(i18nextGS1.t("Prefix.gs1CompanyPrefixCantStartWith00000"));
                     }
 
                     baseValidation = PrefixManager.GS1_8_PREFIX_AS_GS1_COMPANY_PREFIX_VALIDATION;
                 } else {
-                    throw new RangeError(i18next.t("Prefix.gs1CompanyPrefixCantStartWith000000", {
-                        ns: gs1NS
-                    }));
+                    throw new RangeError(i18nextGS1.t("Prefix.gs1CompanyPrefixCantStartWith000000"));
                 }
                 break;
 
             case PrefixType.UPCCompanyPrefix:
                 if (prefix.startsWith("0000")) {
-                    throw new RangeError(i18next.t("Prefix.upcCompanyPrefixCantStartWith0000", {
-                        ns: gs1NS
-                    }));
+                    throw new RangeError(i18nextGS1.t("Prefix.upcCompanyPrefixCantStartWith0000"));
                 }
 
                 baseValidation = PrefixManager.UPC_COMPANY_PREFIX_VALIDATION;
@@ -2087,9 +2043,7 @@ export class PrefixManager {
 
             case PrefixType.GS18Prefix:
                 if (prefix.startsWith("0")) {
-                    throw new RangeError(i18next.t("Prefix.gs18PrefixCantStartWith0", {
-                        ns: gs1NS
-                    }));
+                    throw new RangeError(i18nextGS1.t("Prefix.gs18PrefixCantStartWith0"));
                 }
 
                 baseValidation = PrefixManager.GS1_8_PREFIX_VALIDATION;
@@ -2123,12 +2077,12 @@ export class PrefixManager {
      * Identification key creator.
      */
     private getIdentificationKeyCreator<T extends IdentificationKeyCreator>(identificationKeyType: IdentificationKeyType, constructorCallback: () => T): T {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Type is paired with constructor callback.
         let creator = this._identificationKeyCreatorsMap.get(identificationKeyType) as (T | undefined);
 
         if (creator === undefined) {
             if (this.prefixType === PrefixType.GS18Prefix && identificationKeyType !== IdentificationKeyType.GTIN) {
-                throw new RangeError(i18next.t("Prefix.identificationKeyTypeNotSupportedByGS18Prefix", {
-                    ns: gs1NS,
+                throw new RangeError(i18nextGS1.t("Prefix.identificationKeyTypeNotSupportedByGS18Prefix", {
                     identificationKeyType
                 }));
             }

package/src/index.ts

@@ -1,4 +1,20 @@
-export { gs1NS } from "./locale/i18n.js";
-export * from "./character_set.js";
+/*!
+ * 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 * from "./character-set.js";
 export * from "./check.js";
 export * from "./idkey.js";

package/src/locale/en/{locale_strings.ts → locale-strings.ts}

@@ -1,5 +1,7 @@
 export const localeStrings = {
     Check: {
+        lengthOfStringForPriceOrWeightMustBeExactly: "Length {{length}} of string for price or weight sum must be exactly {{exactLength}}",
+        priceOrWeightComponent: "price or weight",
         lengthOfStringForCheckCharacterPairMustBeLessThanOrEqualTo: "Length {{length}} of string for check character pair must be less than or equal to {{maximumLength}}"
     },
     IdentificationKey: {

package/src/locale/fr/{locale_strings.ts → locale-strings.ts}

@@ -1,5 +1,7 @@
 export const localeStrings = {
     Check: {
+        lengthOfStringForPriceOrWeightMustBeExactly: "La longueur {{longueur}} de la chaîne pour le prix ou la somme du poids doit être exactement {{exactLength}}",
+        priceOrWeightComponent: "prix ou poids",
         lengthOfStringForCheckCharacterPairMustBeLessThanOrEqualTo: "La longueur {{length}} de la chaîne pour la paire de caractères de vérification doit être inférieure ou égale à {{maximum Length}}"
     },
     IdentificationKey: {

package/src/locale/i18n.ts

@@ -1,12 +1,46 @@
-import { i18nAddResourceBundle, i18nAssertValidResources, i18next } from "@aidc-toolkit/core";
-import { localeStrings as enLocaleStrings } from "./en/locale_strings.js";
-import { localeStrings as frLocaleStrings } from "./fr/locale_strings.js";
+import { i18nAssertValidResources, i18nCoreInit, type I18NEnvironment } from "@aidc-toolkit/core";
+import { i18nUtilityInit, utilityResources } from "@aidc-toolkit/utility";
+import i18next, { type i18n } from "i18next";
+import { localeStrings as enLocaleStrings } from "./en/locale-strings.js";
+import { localeStrings as frLocaleStrings } from "./fr/locale-strings.js";
 
 export const gs1NS = "aidct_gs1";
 
+/**
+ * Locale strings type is extracted from the English locale strings object.
+ */
+export type GS1LocaleStrings = typeof enLocaleStrings;
+
 i18nAssertValidResources(enLocaleStrings, "fr", frLocaleStrings);
 
-i18nAddResourceBundle("en", gs1NS, enLocaleStrings);
-i18nAddResourceBundle("fr", gs1NS, frLocaleStrings);
+/**
+ * GS1 resources.
+ */
+export const gs1Resources = {
+    en: {
+        aidct_gs1: enLocaleStrings
+    },
+    fr: {
+        aidct_gs1: frLocaleStrings
+    }
+};
+
+// Explicit type is necessary to work around bug in type discovery with linked packages.
+export const i18nextGS1: i18n = 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 i18nGS1Init(environment: I18NEnvironment, debug = false): Promise<void> {
+    await i18nUtilityInit(environment, debug);
+    await i18nCoreInit(i18nextGS1, environment, debug, gs1NS, utilityResources, gs1Resources);
+}

package/src/locale/i18next.d.ts

@@ -1,4 +1,5 @@
-import type { localeStrings } from "./en/locale_strings.js";
+import type { UtilityLocaleStrings } from "@aidc-toolkit/utility";
+import type { GS1LocaleStrings } from "./i18n.js";
 
 /**
  * Internationalization module.
@@ -8,9 +9,10 @@ declare module "i18next" {
      * Custom type options for this package.
      */
     interface CustomTypeOptions {
+        defaultNS: "aidct_gs1";
         resources: {
-            // Extract the type from the English locale strings object.
-            aidct_gs1: typeof localeStrings;
+            aidct_utility: UtilityLocaleStrings;
+            aidct_gs1: GS1LocaleStrings;
         };
     }
 }

package/test/check.test.ts

@@ -1,4 +1,4 @@
-import { I18NEnvironment, i18nInit } from "@aidc-toolkit/core";
+import { I18NEnvironment } from "@aidc-toolkit/core";
 import { NUMERIC_CREATOR } from "@aidc-toolkit/utility";
 import { describe, expect, test } from "vitest";
 import {
@@ -8,10 +8,11 @@ import {
     fiveDigitPriceWeightCheckDigit,
     fourDigitPriceWeightCheckDigit,
     hasValidCheckCharacterPair,
-    hasValidCheckDigit
+    hasValidCheckDigit,
+    i18nGS1Init
 } from "../src/index.js";
 
-await i18nInit(I18NEnvironment.CLI);
+await i18nGS1Init(I18NEnvironment.CLI, true);
 
 describe("Check digit", () => {
     const testNumericString = "1234567890";
@@ -93,8 +94,8 @@ describe("Price/weight check digit", () => {
         testFourDigitPriceWeightCheckDigit("9012");
 
         expect(() => fourDigitPriceWeightCheckDigit("l234")).toThrow("Invalid character 'l' at position 1");
-        expect(() => fourDigitPriceWeightCheckDigit("123")).toThrow("String for price or weight sum must be exactly 4 characters");
-        expect(() => fourDigitPriceWeightCheckDigit("12345")).toThrow("String for price or weight sum must be exactly 4 characters");
+        expect(() => fourDigitPriceWeightCheckDigit("123")).toThrow("Length 3 of string for price or weight sum must be exactly 4");
+        expect(() => fourDigitPriceWeightCheckDigit("12345")).toThrow("Length 5 of string for price or weight sum must be exactly 4");
     });
 
     test("Five-digit", () => {
@@ -109,9 +110,9 @@ describe("Price/weight check digit", () => {
         testFiveDigitPriceWeightCheckDigit("89012");
         testFiveDigitPriceWeightCheckDigit("90123");
 
-        expect(() => fiveDigitPriceWeightCheckDigit("l2345")).toThrow("Invalid character 'l' at position 1");
-        expect(() => fiveDigitPriceWeightCheckDigit("1234")).toThrow("String for price or weight sum must be exactly 5 characters");
-        expect(() => fiveDigitPriceWeightCheckDigit("123456")).toThrow("String for price or weight sum must be exactly 5 characters");
+        expect(() => fiveDigitPriceWeightCheckDigit("l2345")).toThrow("Invalid character 'l' at position 1 of price or weight");
+        expect(() => fiveDigitPriceWeightCheckDigit("1234")).toThrow("Length 4 of string for price or weight sum must be exactly 5");
+        expect(() => fiveDigitPriceWeightCheckDigit("123456")).toThrow("Length 6 of string for price or weight sum must be exactly 5");
     });
 });