@aidc-toolkit/gs1 1.0.28-beta → 1.0.32-beta

package/src/gtin-validator.ts

@@ -1,5 +1,6 @@
 import { type CharacterSetValidation, NUMERIC_CREATOR } from "@aidc-toolkit/utility";
-import { checkDigit, hasValidCheckDigit, isValidPriceOrWeightCheckDigit } from "./check.js";
+import type { ParseKeys } from "i18next";
+import { checkDigit, hasValidCheckDigit } from "./check.js";
 import type { GTINDescriptor } from "./gtin-descriptor.js";
 import { type GTINBaseLength, GTINLengths } from "./gtin-length.js";
 import type { GTINType } from "./gtin-type.js";
@@ -39,21 +40,6 @@ export type GTINLevelKey = keyof typeof GTINLevels;
  */
 export type GTINLevel = typeof GTINLevels[GTINLevelKey];
 
-/**
- * Restricted Circulation Number reference.
- */
-export interface RCNReference {
-    /**
-     * Item reference.
-     */
-    itemReference: number;
-
-    /**
-     * Price or weight (whole number only).
-     */
-    priceOrWeight: number;
-}
-
 /**
  * GTIN validator.
  */
@@ -75,6 +61,12 @@ export class GTINValidator extends NumericIdentifierValidator<GTINType> implemen
         maximumLength: 8
     };
 
+    static readonly #ERROR_MESSAGE_PARSE_KEYS: Record<GTINLevel, ParseKeys | undefined> = {
+        [GTINLevels.Any]: undefined,
+        [GTINLevels.RetailConsumer]: "Identifier.invalidGTINAtRetail",
+        [GTINLevels.OtherThanRetailConsumer]: "Identifier.invalidGTINAtOtherThanRetail"
+    };
+
     /**
      * Prefix type.
      */
@@ -104,9 +96,9 @@ export class GTINValidator extends NumericIdentifierValidator<GTINType> implemen
     /**
      * @inheritDoc
      */
-    protected override validatePrefix(partialIdentifier: string, positionOffset?: number): void {
+    protected override validatePrefix(partialIdentifier: string): void {
         // Delegate to prefix validator requiring exact match for prefix type.
-        PrefixValidator.validate(this.prefixType, false, false, partialIdentifier, true, true, positionOffset);
+        PrefixValidator.validate(this.prefixType, false, false, partialIdentifier, true, true);
     }
 
     /**
@@ -199,18 +191,16 @@ export class GTINValidator extends NumericIdentifierValidator<GTINType> implemen
      * GTIN-14.
      */
     static convertToGTIN14(indicatorDigit: string, gtin: string): string {
-        GTINValidator.validateAny(gtin);
-
         NUMERIC_CREATOR.validate(indicatorDigit, GTINValidator.#OPTIONAL_INDICATOR_DIGIT_VALIDATION);
 
         // Check digit doesn't change by prepending zeros.
-        let gtin14 = gtin.padStart(GTINLengths.GTIN14, "0");
+        let gtin14 = GTINValidator.normalize(gtin).padStart(GTINLengths.GTIN14, "0");
 
         // If indicator digit provided and is different, recalculate the check digit.
-        if (indicatorDigit.length !== 0 && indicatorDigit !== gtin14.charAt(0)) {
-            const partialGTIN14 = indicatorDigit + gtin14.substring(1, GTINLengths.GTIN14 - 1);
+        if (indicatorDigit.length !== 0 && !gtin14.startsWith(indicatorDigit)) {
+            const partialGTIN14 = `${indicatorDigit}${gtin14.substring(1, GTINLengths.GTIN14 - 1)}`;
 
-            gtin14 = partialGTIN14 + checkDigit(partialGTIN14);
+            gtin14 = `${partialGTIN14}${checkDigit(partialGTIN14)}`;
         }
 
         return gtin14;
@@ -235,7 +225,7 @@ export class GTINValidator extends NumericIdentifierValidator<GTINType> implemen
         let normalizedGTIN: string;
 
         switch (gtinLength) {
-            case GTINLengths.GTIN13 as number:
+            case GTINLengths.GTIN13:
                 if (!gtin.startsWith("0")) {
                     // GTIN is GTIN-13.
                     normalizedGTIN = gtin;
@@ -250,12 +240,12 @@ export class GTINValidator extends NumericIdentifierValidator<GTINType> implemen
                 }
                 break;
 
-            case GTINLengths.GTIN12 as number:
+            case GTINLengths.GTIN12:
                 // GTIN is GTIN-12.
                 normalizedGTIN = gtin;
                 break;
 
-            case GTINLengths.GTIN8 as number:
+            case GTINLengths.GTIN8:
                 if (!gtin.startsWith("0")) {
                     // GTIN is GTIN-8.
                     normalizedGTIN = gtin;
@@ -265,7 +255,7 @@ export class GTINValidator extends NumericIdentifierValidator<GTINType> implemen
                 }
                 break;
 
-            case GTINLengths.GTIN14 as number:
+            case GTINLengths.GTIN14:
                 if (!gtin.startsWith("0")) {
                     // GTIN is GTIN-14.
                     normalizedGTIN = gtin;
@@ -306,43 +296,46 @@ export class GTINValidator extends NumericIdentifierValidator<GTINType> implemen
         // Assume length-validated GTIN is the GTIN (true for all except zero-suppressed GTIN-12).
         let lengthValidatedGTIN = gtin;
 
+        let prefixType: PrefixType | undefined;
+        let allowUPCCompanyPrefix = false;
+        let allowGS18Prefix = false;
+        let validatePrefix = gtin;
         let gtinLevelRestriction: GTINLevel;
 
         switch (gtin.length) {
-            case GTINLengths.GTIN13 as number:
-                if (gtin.startsWith("0")) {
-                    throw new RangeError(i18nextGS1.t("Identifier.invalidGTIN13AtRetail"));
-                }
-
-                // Validate prefix requiring exact match for prefix type.
-                PrefixValidator.validate(PrefixTypes.GS1CompanyPrefix, false, false, gtin, true, true);
-
+            case GTINLengths.GTIN13:
+                // Validate prefix with restrictions on prefix type depending on GTIN level.
+                prefixType = PrefixTypes.GS1CompanyPrefix;
+                allowUPCCompanyPrefix = gtinLevel !== GTINLevels.RetailConsumer;
+                allowGS18Prefix = gtinLevel === GTINLevels.Any;
                 gtinLevelRestriction = GTINLevels.Any;
                 break;
 
-            case GTINLengths.GTIN12 as number:
+            case GTINLengths.GTIN12:
                 // Validate prefix requiring exact match for prefix type.
-                PrefixValidator.validate(PrefixTypes.UPCCompanyPrefix, false, false, gtin, true, true);
-
+                prefixType = PrefixTypes.UPCCompanyPrefix;
                 gtinLevelRestriction = GTINLevels.Any;
                 break;
 
-            case GTINLengths.GTIN8 as number:
+            case GTINLengths.GTIN8:
                 // Zero-suppressed GTIN-12 always starts with 0.
                 if (!gtin.startsWith("0")) {
                     // Validate prefix requiring exact match for prefix type.
-                    PrefixValidator.validate(PrefixTypes.GS18Prefix, false, false, gtin, true, true);
+                    prefixType = PrefixTypes.GS18Prefix;
                 } else {
                     lengthValidatedGTIN = GTINValidator.zeroExpand(gtin);
+                    prefixType = undefined;
                 }
 
                 gtinLevelRestriction = GTINLevels.RetailConsumer;
                 break;
 
-            case GTINLengths.GTIN14 as number:
-                // Validate prefix supporting any prefix type.
-                PrefixValidator.validate(PrefixTypes.GS1CompanyPrefix, true, true, gtin.substring(1), true, true);
-
+            case GTINLengths.GTIN14:
+                // Validate prefix with restrictions on prefix type depending on GTIN level.
+                prefixType = PrefixTypes.GS1CompanyPrefix;
+                allowUPCCompanyPrefix = true;
+                allowGS18Prefix = gtinLevel !== GTINLevels.OtherThanRetailConsumer || !gtin.startsWith("0");
+                validatePrefix = gtin.substring(1);
                 gtinLevelRestriction = GTINLevels.OtherThanRetailConsumer;
                 break;
 
@@ -350,6 +343,10 @@ export class GTINValidator extends NumericIdentifierValidator<GTINType> implemen
                 throw new RangeError(i18nextGS1.t("Identifier.invalidGTINLength"));
         }
 
+        if (prefixType !== undefined) {
+            PrefixValidator.validate(prefixType, allowUPCCompanyPrefix, allowGS18Prefix, validatePrefix, true, true, GTINValidator.#ERROR_MESSAGE_PARSE_KEYS[gtinLevel]);
+        }
+
         // Validating the check digit will also validate the characters.
         if (!hasValidCheckDigit(lengthValidatedGTIN)) {
             throw new RangeError(i18nextGS1.t("Identifier.invalidCheckDigit"));
@@ -374,134 +371,6 @@ export class GTINValidator extends NumericIdentifierValidator<GTINType> implemen
 
         GTINValidator.validateAny(gtin14);
     }
-
-    /**
-     * Parse a Restricted Circulation Number (RCN) using a variable measure trade item format. The format is a 12- or
-     * 13-character string (for RCN-12 or RCN-13 respectively), containing the following:
-     *
-     * - '2' - The first character of the RCN.
-     * - '0'-'9' - The second character of the RCN (RCN-13 only).
-     * - 'I' - One or more, in sequence, for the item reference.
-     * - 'P' - One or more, in sequence, for the price or weight.
-     * - 'V' - Zero or one, for the price or weight check digit.
-     * - 'C' - The check digit of the entire RCN.
-     *
-     * The 'I', 'P', and 'V' formats may be in any order.
-     *
-     * Some examples:
-     *
-     * - 2IIIIIVPPPPC - RCN-12 with a five-digit item reference, a price or weight check digit, and a four-digit price
-     * or weight.
-     * - 23IIIIVPPPPPC - RCN-13 with a four-digit item reference, a price or weight check digit, and a five-digit price
-     * or weight.
-     * - 2IIIIIIPPPPC - RCN-12 with a six-digit item reference and a four-digit price or eight.
-     * - 29IIIIIPPPPPC - RCN-13 with a five-digit item reference and a five-digit price or weight.
-     *
-     * @param format
-     * Format.
-     *
-     * @param rcn
-     * RCN.
-     *
-     * @returns
-     * RCN reference.
-     */
-    static parseVariableMeasureRCN(format: string, rcn: string): RCNReference {
-        const formatLength = format.length;
-
-        if (rcn.length !== formatLength) {
-            throw new RangeError(i18nextGS1.t("Identifier.invalidRCNLength"));
-        }
-
-        let validFormat = formatLength === 12 || formatLength === 13;
-        let validRCNPrefix = true;
-
-        let buildingItemReference = false;
-        let itemReference = "";
-
-        let buildingPriceOrWeight = false;
-        let priceOrWeight = "";
-
-        let priceOrWeightCheckDigit = "";
-
-        for (let index = 0; validFormat && index < formatLength; index++) {
-            const formatChar = format.charAt(index);
-            const rcnChar = rcn.charAt(index);
-
-            if (index === 0) {
-                validFormat = formatChar === "2";
-                validRCNPrefix = rcnChar === "2";
-            } else if (formatLength === 13 && index === 1) {
-                validFormat = NUMERIC_CREATOR.characterIndex(formatChar) !== undefined;
-                validRCNPrefix = rcnChar === formatChar;
-            } else if (index === formatLength - 1) {
-                validFormat = formatChar === "C";
-            } else {
-                switch (formatChar) {
-                    case "I":
-                        if (!buildingItemReference) {
-                            // Item reference can't appear more than once.
-                            validFormat = itemReference === "";
-
-                            buildingItemReference = true;
-                            buildingPriceOrWeight = false;
-                        }
-
-                        itemReference += rcnChar;
-                        break;
-
-                    case "P":
-                        if (!buildingPriceOrWeight) {
-                            // Price or weight can't appear more than once.
-                            validFormat = priceOrWeight === "";
-
-                            buildingPriceOrWeight = true;
-                            buildingItemReference = false;
-                        }
-
-                        priceOrWeight += rcnChar;
-                        break;
-
-                    case "V":
-                        // Price or weight check digit can't appear more than once.
-                        validFormat = priceOrWeightCheckDigit === "";
-
-                        buildingItemReference = false;
-                        buildingPriceOrWeight = false;
-
-                        priceOrWeightCheckDigit = rcnChar;
-                        break;
-
-                    default:
-                        validFormat = false;
-                        break;
-                }
-            }
-        }
-
-        validFormat &&= itemReference !== "" && priceOrWeight !== "";
-
-        if (!validFormat) {
-            throw new RangeError(i18nextGS1.t("Identifier.invalidVariableMeasureRCNFormat"));
-        }
-
-        if (!validRCNPrefix) {
-            throw new RangeError(i18nextGS1.t("Identifier.invalidVariableMeasureRCNPrefix"));
-        }
-
-        if (priceOrWeightCheckDigit !== "" && !isValidPriceOrWeightCheckDigit(priceOrWeight, priceOrWeightCheckDigit)) {
-            throw new RangeError(i18nextGS1.t("Identifier.invalidVariableMeasurePriceOrWeight"));
-        }
-
-        if (!hasValidCheckDigit(rcn)) {
-            throw new RangeError(i18nextGS1.t("Identifier.invalidCheckDigit"));
-        }
-
-        return {
-            itemReference: Number(itemReference),
-            priceOrWeight: Number(priceOrWeight)
-        };
-    }
 }
 
 /**

package/src/identifier-validator.ts

@@ -120,13 +120,10 @@ export abstract class IdentifierValidator<TIdentifierType extends IdentifierType
      *
      * @param partialIdentifier
      * Partial identifier.
-     *
-     * @param positionOffset
-     * Position offset within a larger string.
      */
-    protected validatePrefix(partialIdentifier: string, positionOffset?: number): void {
+    protected validatePrefix(partialIdentifier: string): void {
         // Delegate to prefix validator with support for U.P.C. Company Prefix but not GS1-8 Prefix.
-        PrefixValidator.validate(this.prefixType, true, false, partialIdentifier, true, this.referenceCharacterSet === ContentCharacterSets.Numeric, positionOffset);
+        PrefixValidator.validate(this.prefixType, true, false, partialIdentifier, true, this.referenceCharacterSet === ContentCharacterSets.Numeric);
     }
 
     /**

package/src/index.ts

@@ -47,13 +47,15 @@ export * from "./identifier-descriptors.js";
 
 export * from "./identifier-validator.js";
 export * from "./numeric-identifier-validator.js";
-export { GTINLevels, type GTINLevelKey, type GTINLevel, type RCNReference, GTINValidator } from "./gtin-validator.js";
+export { GTINLevels, type GTINLevelKey, type GTINLevel, GTINValidator } from "./gtin-validator.js";
 export * from "./non-gtin-numeric-identifier-validator.js";
 export * from "./non-serializable-numeric-identifier-validator.js";
 export * from "./serializable-numeric-identifier-validator.js";
 export * from "./non-numeric-identifier-validator.js";
 export * from "./identifier-validators.js";
 
+export * from "./verified-by-gs1.js";
+
 export type * from "./identifier-creator.js";
 export type * from "./numeric-identifier-creator.js";
 export * from "./gtin-creator.js";
@@ -63,4 +65,8 @@ export * from "./serializable-numeric-identifier-creator.js";
 export * from "./non-numeric-identifier-creator.js";
 export * from "./identifier-creators.js";
 
+export * from "./variable-measure.js";
+
+export * from "./gcp-length-data.js";
+export * from "./gcp-length-cache.js";
 export * from "./prefix-manager.js";

package/src/locale/en/locale-resources.ts

@@ -13,7 +13,6 @@ export default {
         invalidZeroSuppressibleGTIN12: "GTIN-12 not zero-suppressible",
         invalidZeroSuppressedGTIN12AsGTIN13: "Invalid zero-suppressed GTIN-12 as GTIN-13",
         invalidZeroSuppressedGTIN12AsGTIN14: "Invalid zero-suppressed GTIN-12 as GTIN-14",
-        invalidGTIN13AtRetail: "GTIN-13 at retail consumer trade item level can't start with zero",
         invalidGTINAtRetail: "GTIN not supported at retail consumer trade item level",
         invalidGTINAtOtherThanRetail: "GTIN not supported at other than retail consumer trade item level",
         invalidRCNLength: "RCN length must match format length",
@@ -35,6 +34,8 @@ export default {
         gs1CompanyPrefixCantStartWith000000: "GS1 Company Prefix can't start with \"000000\"",
         upcCompanyPrefixCantStartWith0000: "U.P.C. Company Prefix can't start with \"0000\"",
         gs18PrefixCantStartWith0: "GS1-8 Prefix can't start with \"0\"",
-        identifierTypeNotSupportedByGS18Prefix: "{{identifierType}} not supported by GS1-8 Prefix"
+        identifierTypeNotSupportedByGS18Prefix: "{{identifierType}} not supported by GS1-8 Prefix",
+        gs1CompanyPrefixLengthDataHTTPError: "HTTP error {{status, number}} loading GS1 Company Prefix length data",
+        gs1CompanyPrefixLengthDataNotLoaded: "GS1 Company Prefix length data not loaded"
     }
 } as const;

package/src/locale/fr/locale-resources.ts

@@ -13,7 +13,6 @@ export default {
         invalidZeroSuppressibleGTIN12: "Le GTIN-12 ne peut pas être supprimé par zéro",
         invalidZeroSuppressedGTIN12AsGTIN13: "GTIN-12 non valide avec zéro supprimé en tant que GTIN-13",
         invalidZeroSuppressedGTIN12AsGTIN14: "GTIN-12 non valide avec zéro supprimé en tant que GTIN-14",
-        invalidGTIN13AtRetail: "Le GTIN-13 au niveau des articles de consommation au détail ne peut pas commencer par zéro",
         invalidGTINAtRetail: "Le GTIN n'est pas pris en charge au niveau des articles de consommation au détail",
         invalidGTINAtOtherThanRetail: "Le GTIN n'est pas pris en charge à d'autres niveaux que ceux des articles de consommation au détail",
         invalidRCNLength: "La longueur du RCN doit correspondre à la longueur du format",
@@ -35,6 +34,8 @@ export default {
         gs1CompanyPrefixCantStartWith000000: "Le préfixe de l'entreprise GS1 ne peut pas commencer par \"000000\"",
         upcCompanyPrefixCantStartWith0000: "Le préfixe de l'entreprise U.P.C. ne peut pas commencer par \"0000\"",
         gs18PrefixCantStartWith0: "Le préfixe GS1-8 ne peut pas commencer par \"0\"",
-        identifierTypeNotSupportedByGS18Prefix: "{{identifierType}} non pris en charge par le préfixe GS1-8"
+        identifierTypeNotSupportedByGS18Prefix: "{{identifierType}} non pris en charge par le préfixe GS1-8",
+        gs1CompanyPrefixLengthDataHTTPError: "Erreur HTTP {{status, number}} lors du chargement des données de longueur du préfixe d'entreprise GS1",
+        gs1CompanyPrefixLengthDataNotLoaded: "Les données relatives à la longueur du préfixe d'entreprise GS1 n'ont pas été chargées"
     }
 } as const;

package/src/locale/i18n.ts

@@ -1,4 +1,4 @@
-import { i18nCoreInit, type I18nEnvironment } from "@aidc-toolkit/core";
+import { type I18nEnvironment, i18nFinalizeInit } from "@aidc-toolkit/core";
 import { i18nUtilityInit, utilityResources } from "@aidc-toolkit/utility";
 import i18next, { type i18n, type Resource } from "i18next";
 import enLocaleResources from "./en/locale-resources.js";
@@ -34,11 +34,8 @@ export const i18nextGS1: i18n = i18next.createInstance();
  *
  * @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);
+    await i18nFinalizeInit(i18nextGS1, environment, debug, gs1NS, utilityResources, gs1Resources);
 }

package/src/non-numeric-identifier-validator.ts

@@ -30,7 +30,7 @@ export class NonNumericIdentifierValidator extends IdentifierValidator<NonNumeri
         protected override createErrorMessage(_s: string): string {
             return i18nextGS1.t("Identifier.referenceCantBeAllNumeric");
         }
-    }(/\D/);
+    }(/\D/u);
 
     /**
      * True if the identifier requires a check character pair.

package/src/numeric-identifier-validator.ts

@@ -59,9 +59,9 @@ export abstract class NumericIdentifierValidator<TNumericIdentifierType extends
     validate(identifier: string, validation?: NumericIdentifierValidation): void {
         // Validate the prefix, with care taken for its position within the identifier.
         if (this.#prefixPosition === 0) {
-            super.validatePrefix(identifier, validation?.positionOffset);
+            super.validatePrefix(identifier);
         } else {
-            super.validatePrefix(identifier.substring(this.#prefixPosition), validation?.positionOffset === undefined ? this.#prefixPosition : validation.positionOffset + this.#prefixPosition);
+            super.validatePrefix(identifier.substring(this.#prefixPosition));
         }
 
         // Validate the length.

package/src/prefix-manager.ts

@@ -1,3 +1,4 @@
+import * as GCPLength from "./gcp-length.js";
 import type { GTINCreator } from "./gtin-creator.js";
 import { GTIN_BASE_TYPES } from "./gtin-length.js";
 import type { GTINType } from "./gtin-type.js";
@@ -17,6 +18,7 @@ import type { PrefixProvider } from "./prefix-provider.js";
 import { type PrefixType, PrefixTypes } from "./prefix-type.js";
 import { PrefixValidator } from "./prefix-validator.js";
 import type { SerializableNumericIdentifierCreator } from "./serializable-numeric-identifier-creator.js";
+import type { GCPLengthCache } from "./gcp-length-cache.js";
 
 /**
  * Prefix manager. This is the core class for identifier creation.
@@ -99,6 +101,11 @@ export class PrefixManager implements PrefixProvider {
      */
     readonly #identifierCreators: Partial<IdentifierCreatorsRecord> = {};
 
+    /**
+     * GS1 Company Prefix length root.
+     */
+    static #gcpLengthRoot: GCPLength.Root | undefined = undefined;
+
     /**
      * Constructor.
      *
@@ -350,4 +357,62 @@ export class PrefixManager implements PrefixProvider {
     get gmnCreator(): NonNumericIdentifierCreator {
         return this.getIdentifierCreator(IdentifierTypes.GMN);
     }
+
+    /**
+     * Load GS1 Company Prefix length data.
+     *
+     * @param gcpLengthCache
+     * GS1 Company Prefix length cache.
+     */
+    static async loadGCPLengthData(gcpLengthCache: GCPLengthCache): Promise<void> {
+        PrefixManager.#gcpLengthRoot = await GCPLength.loadData(gcpLengthCache);
+    }
+
+    /**
+     * Get the length of a GS1 Company Prefix for an identifier.
+     *
+     * @param identifierType
+     * Identifier type.
+     *
+     * @param identifier
+     * Identifier.
+     *
+     * @returns
+     * Length of GS1 Company Prefix, 0 if not a GS1 Company Prefix, or -1 if not found.
+     */
+    static gcpLength(identifierType: IdentifierType, identifier: string): number {
+        if (PrefixManager.#gcpLengthRoot === undefined) {
+            throw new RangeError(i18nextGS1.t("Prefix.gs1CompanyPrefixLengthDataNotLoaded"));
+        }
+
+        return GCPLength.getFor(PrefixManager.#gcpLengthRoot, identifierType, identifier);
+    }
+
+    /**
+     * Get the date/time the GS1 Company Prefix length data was last updated.
+     *
+     * @returns
+     * Date/time the GS1 Company Prefix length data was last updated.
+     */
+    static gcpLengthDateTime(): Date {
+        if (PrefixManager.#gcpLengthRoot === undefined) {
+            throw new RangeError(i18nextGS1.t("Prefix.gs1CompanyPrefixLengthDataNotLoaded"));
+        }
+
+        return PrefixManager.#gcpLengthRoot.dateTime;
+    }
+
+    /**
+     * Get the disclaimer for the GS1 Company Prefix length data.
+     *
+     * @returns
+     * Disclaimer for the GS1 Company Prefix length data.
+     */
+    static gcpLengthDisclaimer(): string {
+        if (PrefixManager.#gcpLengthRoot === undefined) {
+            throw new RangeError(i18nextGS1.t("Prefix.gs1CompanyPrefixLengthDataNotLoaded"));
+        }
+
+        return PrefixManager.#gcpLengthRoot.disclaimer;
+    }
 }

package/src/prefix-validator.ts

@@ -2,6 +2,7 @@ import { type CharacterSetValidation, NUMERIC_CREATOR } from "@aidc-toolkit/util
 import { i18nextGS1 } from "./locale/i18n.js";
 import type { PrefixProvider } from "./prefix-provider.js";
 import { type PrefixType, PrefixTypes } from "./prefix-type.js";
+import type { ParseKeys } from "i18next";
 
 /**
  * Prefix validation parameters.
@@ -36,7 +37,7 @@ const GS1_COMPANY_PREFIX_MAXIMUM_LENGTH = 12;
 /**
  * U.P.C. Company Prefix minimum length.
  */
-const UPC_COMPANY_PREFIX_MINIMUM_LENGTH = 6;
+const UPC_COMPANY_PREFIX_MINIMUM_LENGTH = 5;
 
 /**
  * U.P.C. Company Prefix maximum length.
@@ -130,31 +131,31 @@ export const PrefixValidator = {
      * @param isNumericIdentifier
      * If true, the prefix is from a numeric identifier and its character set will be validated by the caller.
      *
-     * @param positionOffset
-     * Position offset within a larger string.
+     * @param errorMessageParseKey
+     * Parse key for error message when validating GS1 Company Prefix type.
      */
-    validate(prefixType: PrefixType, allowUPCCompanyPrefix: boolean, allowGS18Prefix: boolean, prefix: string, isFromIdentifier = false, isNumericIdentifier = false, positionOffset?: number): void {
-        let baseValidation: PrefixValidation;
+    validate(prefixType: PrefixType, allowUPCCompanyPrefix: boolean, allowGS18Prefix: boolean, prefix: string, isFromIdentifier = false, isNumericIdentifier = false, errorMessageParseKey?: ParseKeys): void {
+        let validation: PrefixValidation;
 
         // Validate the prefix type and determine the prefix validation parameters.
         switch (prefixType) {
             case PrefixTypes.GS1CompanyPrefix:
                 if (!prefix.startsWith("0")) {
-                    baseValidation = GS1_COMPANY_PREFIX_VALIDATION;
+                    validation = GS1_COMPANY_PREFIX_VALIDATION;
                 } else if (!prefix.startsWith("00000")) {
                     if (!allowUPCCompanyPrefix) {
-                        throw new RangeError(i18nextGS1.t("Prefix.gs1CompanyPrefixCantStartWith0"));
+                        throw new RangeError(i18nextGS1.t(errorMessageParseKey ?? "Prefix.gs1CompanyPrefixCantStartWith0"));
                     }
 
-                    baseValidation = UPC_COMPANY_PREFIX_AS_GS1_COMPANY_PREFIX_VALIDATION;
+                    validation = UPC_COMPANY_PREFIX_AS_GS1_COMPANY_PREFIX_VALIDATION;
                 } else if (!prefix.startsWith("000000")) {
                     if (!allowGS18Prefix) {
-                        throw new RangeError(i18nextGS1.t("Prefix.gs1CompanyPrefixCantStartWith00000"));
+                        throw new RangeError(i18nextGS1.t(errorMessageParseKey ?? "Prefix.gs1CompanyPrefixCantStartWith00000"));
                     }
 
-                    baseValidation = GS1_8_PREFIX_AS_GS1_COMPANY_PREFIX_VALIDATION;
+                    validation = GS1_8_PREFIX_AS_GS1_COMPANY_PREFIX_VALIDATION;
                 } else {
-                    throw new RangeError(i18nextGS1.t("Prefix.gs1CompanyPrefixCantStartWith000000"));
+                    throw new RangeError(i18nextGS1.t(errorMessageParseKey ?? "Prefix.gs1CompanyPrefixCantStartWith000000"));
                 }
                 break;
 
@@ -163,7 +164,7 @@ export const PrefixValidator = {
                     throw new RangeError(i18nextGS1.t("Prefix.upcCompanyPrefixCantStartWith0000"));
                 }
 
-                baseValidation = UPC_COMPANY_PREFIX_VALIDATION;
+                validation = UPC_COMPANY_PREFIX_VALIDATION;
                 break;
 
             case PrefixTypes.GS18Prefix:
@@ -171,21 +172,16 @@ export const PrefixValidator = {
                     throw new RangeError(i18nextGS1.t("Prefix.gs18PrefixCantStartWith0"));
                 }
 
-                baseValidation = GS1_8_PREFIX_VALIDATION;
+                validation = GS1_8_PREFIX_VALIDATION;
                 break;
         }
 
-        const mergedValidation: PrefixValidation = {
-            ...baseValidation,
-            positionOffset
-        };
-
-        // If from key and numeric, key validation will take care of character set validation.
+        // If from identifier and numeric, identifier validation will take care of character set validation.
         if (!isFromIdentifier) {
-            NUMERIC_CREATOR.validate(prefix, mergedValidation);
+            NUMERIC_CREATOR.validate(prefix, validation);
         } else if (!isNumericIdentifier) {
             // Validate only the minimum length, allowing at least one character for the (possibly non-numeric) reference.
-            NUMERIC_CREATOR.validate(prefix.substring(0, Math.min(mergedValidation.minimumLength, prefix.length - 1)), mergedValidation);
+            NUMERIC_CREATOR.validate(prefix.substring(0, Math.min(validation.minimumLength, prefix.length - 1)), validation);
         }
     },
 
@@ -214,11 +210,11 @@ export const PrefixValidator = {
                 break;
 
             case PrefixTypes.UPCCompanyPrefix:
-                gs1CompanyPrefix = "0" + prefix;
+                gs1CompanyPrefix = `0${prefix}`;
                 break;
 
             case PrefixTypes.GS18Prefix:
-                gs1CompanyPrefix = "00000" + prefix;
+                gs1CompanyPrefix = `00000${prefix}`;
                 break;
         }