@aidc-toolkit/gs1 1.0.26-beta → 1.0.27-beta

package/src/prefix-manager.ts

@@ -1,13 +1,13 @@
-import { type IdentifierCreatorsRecord, isNumericIdentifierCreator } from "./creators.js";
 import { GTINCreator } from "./gtin-creator.js";
-import { GTIN_BASE_TYPES } from "./gtin-type.js";
+import { GTIN_BASE_TYPES } from "./gtin-length.js";
 import type { IdentifierCreator } from "./identifier-creator.js";
+import { type IdentifierCreatorsRecord, isNumericIdentifierCreator } from "./identifier-creators.js";
 import { type IdentifierType, IdentifierTypes } from "./identifier-type.js";
 import { i18nextGS1 } from "./locale/i18n.js";
-import { NonGTINNumericIdentifierCreator } from "./non-gtin-numeric-identifier-creator.js";
-import type { NonGTINNumericIdentifierType } from "./non-gtin-numeric-identifier-type.js";
 import { NonNumericIdentifierCreator } from "./non-numeric-identifier-creator.js";
 import type { NonNumericIdentifierType } from "./non-numeric-identifier-type.js";
+import { NonSerializableNumericIdentifierCreator } from "./non-serializable-numeric-identifier-creator.js";
+import type { NonSerializableNumericIdentifierType } from "./non-serializable-numeric-identifier-type.js";
 import type { NumericIdentifierType } from "./numeric-identifier-type.js";
 import type { PrefixProvider } from "./prefix-provider.js";
 import { type PrefixType, PrefixTypes } from "./prefix-type.js";
@@ -39,13 +39,13 @@ export class PrefixManager implements PrefixProvider {
     /**
      * Cached prefix managers, keyed by GS1 Company Prefix.
      */
-    private static readonly PREFIX_MANAGERS_MAP = new Map<string, PrefixManager>();
+    static readonly #PREFIX_MANAGERS_MAP = new Map<string, PrefixManager>();
 
     /**
      * Creator tweak factors. Different numeric identifier types have different tweak factors so that sparse creation
      * generates different sequences for each.
      */
-    private static readonly CREATOR_TWEAK_FACTORS: Readonly<Record<NumericIdentifierType, bigint>> = {
+    static readonly #CREATOR_TWEAK_FACTORS: Readonly<Record<NumericIdentifierType, bigint>> = {
         GTIN: 1987n,
         GLN: 4241n,
         SSCC: 8087n,
@@ -59,42 +59,42 @@ export class PrefixManager implements PrefixProvider {
     /**
      * Normalized prefix type.
      */
-    private readonly _prefixType: PrefixType;
+    readonly #prefixType: PrefixType;
 
     /**
      * Normalized prefix.
      */
-    private readonly _prefix: string;
+    readonly #prefix: string;
 
     /**
      * Prefix as GS1 Company Prefix.
      */
-    private readonly _gs1CompanyPrefix: string;
+    readonly #gs1CompanyPrefix: string;
 
     /**
      * U.P.C. Company Prefix if prefix type is {@linkcode PrefixTypes.UPCCompanyPrefix}.
      */
-    private readonly _upcCompanyPrefix: string | undefined;
+    readonly #upcCompanyPrefix: string | undefined;
 
     /**
      * GS1-8 Prefix if prefix type is {@linkcode PrefixTypes.GS18Prefix}.
      */
-    private readonly _gs18Prefix: string | undefined;
+    readonly #gs18Prefix: string | undefined;
 
     /**
      * Default tweak factor.
      */
-    private readonly _defaultTweakFactor: bigint;
+    readonly #defaultTweakFactor: bigint;
 
     /**
      * Tweak factor.
      */
-    private _tweakFactor = 0n;
+    #tweakFactor = 0n;
 
     /**
      * Cached identifier creators.
      */
-    private readonly _identifierCreators: Partial<IdentifierCreatorsRecord> = {};
+    readonly #identifierCreators: Partial<IdentifierCreatorsRecord> = {};
 
     /**
      * Constructor.
@@ -108,14 +108,14 @@ export class PrefixManager implements PrefixProvider {
     constructor(prefixType: PrefixType, prefix: string) {
         const normalizedPrefixProvider = PrefixValidator.normalize(prefixType, prefix);
 
-        this._prefixType = normalizedPrefixProvider.prefixType;
-        this._prefix = normalizedPrefixProvider.prefix;
-        this._gs1CompanyPrefix = normalizedPrefixProvider.gs1CompanyPrefix;
-        this._upcCompanyPrefix = normalizedPrefixProvider.upcCompanyPrefix;
-        this._gs18Prefix = normalizedPrefixProvider.gs18Prefix;
+        this.#prefixType = normalizedPrefixProvider.prefixType;
+        this.#prefix = normalizedPrefixProvider.prefix;
+        this.#gs1CompanyPrefix = normalizedPrefixProvider.gs1CompanyPrefix;
+        this.#upcCompanyPrefix = normalizedPrefixProvider.upcCompanyPrefix;
+        this.#gs18Prefix = normalizedPrefixProvider.gs18Prefix;
 
         // Default tweak factor is the numeric value of the GS1 Company Prefix preceded by '1'.
-        this._defaultTweakFactor = BigInt(`1${this.gs1CompanyPrefix}`);
+        this.#defaultTweakFactor = BigInt(`1${this.gs1CompanyPrefix}`);
 
         this.resetTweakFactor();
     }
@@ -124,35 +124,35 @@ export class PrefixManager implements PrefixProvider {
      * Get the prefix type.
      */
     get prefixType(): PrefixType {
-        return this._prefixType;
+        return this.#prefixType;
     }
 
     /**
      * Get the prefix.
      */
     get prefix(): string {
-        return this._prefix;
+        return this.#prefix;
     }
 
     /**
      * Get the GS1 Company Prefix.
      */
     get gs1CompanyPrefix(): string {
-        return this._gs1CompanyPrefix;
+        return this.#gs1CompanyPrefix;
     }
 
     /**
      * Get the U.P.C. Company Prefix if prefix type is {@linkcode PrefixTypes.UPCCompanyPrefix} or undefined if not.
      */
     get upcCompanyPrefix(): string | undefined {
-        return this._upcCompanyPrefix;
+        return this.#upcCompanyPrefix;
     }
 
     /**
      * Get the GS1-8 Prefix if prefix type is {@linkcode PrefixTypes.GS18Prefix} or undefined if not.
      */
     get gs18Prefix(): string | undefined {
-        return this._gs18Prefix;
+        return this.#gs18Prefix;
     }
 
     /**
@@ -161,10 +161,10 @@ export class PrefixManager implements PrefixProvider {
      * @param identifierCreator
      * Identifier creator.
      */
-    private setCreatorTweak(identifierCreator: IdentifierCreator): void {
+    #setCreatorTweak(identifierCreator: IdentifierCreator): void {
         if (isNumericIdentifierCreator(identifierCreator)) {
             // eslint-disable-next-line no-param-reassign -- Method purpose is to set the tweak.
-            identifierCreator.tweak = this.tweakFactor * PrefixManager.CREATOR_TWEAK_FACTORS[identifierCreator.identifierType];
+            identifierCreator.tweak = this.tweakFactor * PrefixManager.#CREATOR_TWEAK_FACTORS[identifierCreator.identifierType];
         }
     }
 
@@ -172,7 +172,7 @@ export class PrefixManager implements PrefixProvider {
      * Get the tweak factor.
      */
     get tweakFactor(): bigint {
-        return this._tweakFactor;
+        return this.#tweakFactor;
     }
 
     /**
@@ -184,11 +184,11 @@ export class PrefixManager implements PrefixProvider {
     set tweakFactor(value: number | bigint) {
         const tweakFactor = BigInt(value);
 
-        if (this._tweakFactor !== tweakFactor) {
-            this._tweakFactor = tweakFactor;
+        if (this.#tweakFactor !== tweakFactor) {
+            this.#tweakFactor = tweakFactor;
 
-            for (const creator of Object.values(this._identifierCreators)) {
-                this.setCreatorTweak(creator);
+            for (const creator of Object.values(this.#identifierCreators)) {
+                this.#setCreatorTweak(creator);
             }
         }
     }
@@ -197,7 +197,7 @@ export class PrefixManager implements PrefixProvider {
      * Reset the tweak factor to its default (numeric value of the GS1 Company Prefix preceded by '1').
      */
     resetTweakFactor(): void {
-        this.tweakFactor = this._defaultTweakFactor;
+        this.tweakFactor = this.#defaultTweakFactor;
     }
 
     /**
@@ -216,11 +216,11 @@ export class PrefixManager implements PrefixProvider {
         // Normalization will occur in constructor as well, but it's necessary here for the map.
         const normalizedPrefixProvider = PrefixValidator.normalize(prefixType, prefix);
 
-        let prefixManager = PrefixManager.PREFIX_MANAGERS_MAP.get(normalizedPrefixProvider.gs1CompanyPrefix);
+        let prefixManager = PrefixManager.#PREFIX_MANAGERS_MAP.get(normalizedPrefixProvider.gs1CompanyPrefix);
 
         if (prefixManager === undefined) {
             prefixManager = new PrefixManager(normalizedPrefixProvider.prefixType, normalizedPrefixProvider.prefix);
-            PrefixManager.PREFIX_MANAGERS_MAP.set(normalizedPrefixProvider.gs1CompanyPrefix, prefixManager);
+            PrefixManager.#PREFIX_MANAGERS_MAP.set(normalizedPrefixProvider.gs1CompanyPrefix, prefixManager);
         }
 
         return prefixManager;
@@ -232,11 +232,14 @@ export class PrefixManager implements PrefixProvider {
      * @template TIdentifierType
      * Identifier type type.
      *
+     * @template TConstructorArgument
+     * Second constructor argument type.
+     *
      * @param identifierType
      * Identifier type used to construct identifier creator.
      *
-     * @param constructorParameter
-     * Second constructor parameter passed to constructor callback alongside this.
+     * @param constructorArgument
+     * Second constructor argument passed to constructor callback alongside this.
      *
      * @param ConstructorCallback
      * Constructor callback.
@@ -244,8 +247,8 @@ export class PrefixManager implements PrefixProvider {
      * @returns
      * Identifier creator.
      */
-    private getIdentifierCreator<TIdentifierType extends IdentifierType, TConstructorParameter>(identifierType: TIdentifierType, constructorParameter: TConstructorParameter, ConstructorCallback: new (prefixProvider: PrefixProvider, constructorParameter: TConstructorParameter) => IdentifierCreatorsRecord[TIdentifierType]): IdentifierCreatorsRecord[TIdentifierType] {
-        let creator: IdentifierCreatorsRecord[TIdentifierType] | undefined = this._identifierCreators[identifierType];
+    #getIdentifierCreator<TIdentifierType extends IdentifierType, TConstructorArgument>(identifierType: TIdentifierType, constructorArgument: TConstructorArgument, ConstructorCallback: new (prefixProvider: PrefixProvider, constructorParameter: TConstructorArgument) => IdentifierCreatorsRecord[TIdentifierType]): IdentifierCreatorsRecord[TIdentifierType] {
+        let creator: IdentifierCreatorsRecord[TIdentifierType] | undefined = this.#identifierCreators[identifierType];
 
         if (creator === undefined) {
             if (this.prefixType === PrefixTypes.GS18Prefix && identifierType !== IdentifierTypes.GTIN) {
@@ -254,11 +257,11 @@ export class PrefixManager implements PrefixProvider {
                 }));
             }
 
-            creator = new ConstructorCallback(this, constructorParameter);
+            creator = new ConstructorCallback(this, constructorArgument);
 
-            this.setCreatorTweak(creator);
+            this.#setCreatorTweak(creator);
 
-            this._identifierCreators[identifierType] = creator;
+            this.#identifierCreators[identifierType] = creator;
         }
 
         return creator;
@@ -273,8 +276,8 @@ export class PrefixManager implements PrefixProvider {
      * @returns
      * Identifier creator.
      */
-    private getNonGTINNumericIdentifierCreator(identifierType: Exclude<NonGTINNumericIdentifierType, SerializableNumericIdentifierType>): NonGTINNumericIdentifierCreator {
-        return this.getIdentifierCreator(identifierType, identifierType, NonGTINNumericIdentifierCreator);
+    #getNonGTINNumericIdentifierCreator(identifierType: NonSerializableNumericIdentifierType): NonSerializableNumericIdentifierCreator {
+        return this.#getIdentifierCreator(identifierType, identifierType, NonSerializableNumericIdentifierCreator);
     }
 
     /**
@@ -286,8 +289,8 @@ export class PrefixManager implements PrefixProvider {
      * @returns
      * Identifier creator.
      */
-    private getSerializableNumericIdentifierCreator(identifierType: SerializableNumericIdentifierType): SerializableNumericIdentifierCreator {
-        return this.getIdentifierCreator(identifierType, identifierType, SerializableNumericIdentifierCreator);
+    #getSerializableNumericIdentifierCreator(identifierType: SerializableNumericIdentifierType): SerializableNumericIdentifierCreator {
+        return this.#getIdentifierCreator(identifierType, identifierType, SerializableNumericIdentifierCreator);
     }
 
     /**
@@ -299,91 +302,91 @@ export class PrefixManager implements PrefixProvider {
      * @returns
      * Identifier creator.
      */
-    private getNonNumericIdentifierCreator(identifierType: NonNumericIdentifierType): NonNumericIdentifierCreator {
-        return this.getIdentifierCreator(identifierType, identifierType, NonNumericIdentifierCreator);
+    #getNonNumericIdentifierCreator(identifierType: NonNumericIdentifierType): NonNumericIdentifierCreator {
+        return this.#getIdentifierCreator(identifierType, identifierType, NonNumericIdentifierCreator);
     }
 
     /**
      * Get GTIN creator.
      */
     get gtinCreator(): GTINCreator {
-        return this.getIdentifierCreator(IdentifierTypes.GTIN, GTIN_BASE_TYPES[this.prefixType], GTINCreator);
+        return this.#getIdentifierCreator(IdentifierTypes.GTIN, GTIN_BASE_TYPES[this.prefixType], GTINCreator);
     }
 
     /**
      * Get GLN creator.
      */
-    get glnCreator(): NonGTINNumericIdentifierCreator {
-        return this.getNonGTINNumericIdentifierCreator(IdentifierTypes.GLN);
+    get glnCreator(): NonSerializableNumericIdentifierCreator {
+        return this.#getNonGTINNumericIdentifierCreator(IdentifierTypes.GLN);
     }
 
     /**
      * Get SSCC creator.
      */
-    get ssccCreator(): NonGTINNumericIdentifierCreator {
-        return this.getNonGTINNumericIdentifierCreator(IdentifierTypes.SSCC);
+    get ssccCreator(): NonSerializableNumericIdentifierCreator {
+        return this.#getNonGTINNumericIdentifierCreator(IdentifierTypes.SSCC);
     }
 
     /**
      * Get GRAI creator.
      */
     get graiCreator(): SerializableNumericIdentifierCreator {
-        return this.getSerializableNumericIdentifierCreator(IdentifierTypes.GRAI);
+        return this.#getSerializableNumericIdentifierCreator(IdentifierTypes.GRAI);
     }
 
     /**
      * Get GIAI creator.
      */
     get giaiCreator(): NonNumericIdentifierCreator {
-        return this.getNonNumericIdentifierCreator(IdentifierTypes.GIAI);
+        return this.#getNonNumericIdentifierCreator(IdentifierTypes.GIAI);
     }
 
     /**
      * Get GSRN creator.
      */
-    get gsrnCreator(): NonGTINNumericIdentifierCreator {
-        return this.getNonGTINNumericIdentifierCreator(IdentifierTypes.GSRN);
+    get gsrnCreator(): NonSerializableNumericIdentifierCreator {
+        return this.#getNonGTINNumericIdentifierCreator(IdentifierTypes.GSRN);
     }
 
     /**
      * Get GDTI creator.
      */
     get gdtiCreator(): SerializableNumericIdentifierCreator {
-        return this.getSerializableNumericIdentifierCreator(IdentifierTypes.GDTI);
+        return this.#getSerializableNumericIdentifierCreator(IdentifierTypes.GDTI);
     }
 
     /**
      * Get GINC creator.
      */
     get gincCreator(): NonNumericIdentifierCreator {
-        return this.getNonNumericIdentifierCreator(IdentifierTypes.GINC);
+        return this.#getNonNumericIdentifierCreator(IdentifierTypes.GINC);
     }
 
     /**
      * Get GSIN creator.
      */
-    get gsinCreator(): NonGTINNumericIdentifierCreator {
-        return this.getNonGTINNumericIdentifierCreator(IdentifierTypes.GSIN);
+    get gsinCreator(): NonSerializableNumericIdentifierCreator {
+        return this.#getNonGTINNumericIdentifierCreator(IdentifierTypes.GSIN);
     }
 
     /**
      * Get GCN creator.
      */
     get gcnCreator(): SerializableNumericIdentifierCreator {
-        return this.getSerializableNumericIdentifierCreator(IdentifierTypes.GCN);
+        return this.#getSerializableNumericIdentifierCreator(IdentifierTypes.GCN);
     }
 
     /**
      * Get CPID creator.
      */
     get cpidCreator(): NonNumericIdentifierCreator {
-        return this.getNonNumericIdentifierCreator(IdentifierTypes.CPID);
+        return this.#getNonNumericIdentifierCreator(IdentifierTypes.CPID);
     }
 
     /**
      * Get GMN creator.
      */
     get gmnCreator(): NonNumericIdentifierCreator {
-        return this.getNonNumericIdentifierCreator(IdentifierTypes.GMN);
+        return this.#getNonNumericIdentifierCreator(IdentifierTypes.GMN);
     }
 }

package/src/serializable-numeric-identifier-creator.ts

@@ -1,30 +1,16 @@
-import { mapIterable, type TransformerInput, type TransformerOutput } from "@aidc-toolkit/utility";
-import { Mixin } from "ts-mixer";
-import { AbstractNumericIdentifierCreator } from "./abstract-numeric-identifier-creator.js";
-import type { PrefixProvider } from "./prefix-provider.js";
+// eslint-disable-next-line @typescript-eslint/no-unused-vars -- Used in JSDoc.
+import { mapIterable, NUMERIC_CREATOR, type TransformerInput, type TransformerOutput } from "@aidc-toolkit/utility";
+import { MixinAbstractNonGTINNumericIdentifierCreator } from "./abstract-non-gtin-numeric-identifier-creator.js";
 import type { SerializableNumericIdentifierType } from "./serializable-numeric-identifier-type.js";
 import { SerializableNumericIdentifierValidator } from "./serializable-numeric-identifier-validator.js";
 
 /**
  * Serializable numeric identifier creator.
  */
-export class SerializableNumericIdentifierCreator extends Mixin(SerializableNumericIdentifierValidator, AbstractNumericIdentifierCreator) {
-    /**
-     * Constructor. Typically called internally by a prefix manager but may be called by other code with another prefix
-     * provider type.
-     *
-     * @param prefixProvider
-     * Prefix provider.
-     *
-     * @param identifierType
-     * Identifier type.
-     */
-    constructor(prefixProvider: PrefixProvider, identifierType: SerializableNumericIdentifierType) {
-        super(identifierType);
-
-        this.init(prefixProvider, prefixProvider.gs1CompanyPrefix);
-    }
-
+export class SerializableNumericIdentifierCreator extends MixinAbstractNonGTINNumericIdentifierCreator<
+    SerializableNumericIdentifierType,
+    typeof SerializableNumericIdentifierValidator
+>(SerializableNumericIdentifierValidator) {
     /**
      * Concatenate a validated base identifier with serial component(s).
      *
@@ -40,7 +26,7 @@ export class SerializableNumericIdentifierCreator extends Mixin(SerializableNume
      * @returns
      * Serialized identifier(s).
      */
-    private concatenateValidated<TTransformerInput extends TransformerInput<string>>(baseIdentifier: string, serialComponentOrComponents: TTransformerInput): TransformerOutput<TTransformerInput, string> {
+    #concatenateValidated<TTransformerInput extends TransformerInput<string>>(baseIdentifier: string, serialComponentOrComponents: TTransformerInput): TransformerOutput<TTransformerInput, string> {
         // TODO Refactor type when https://github.com/microsoft/TypeScript/pull/56941 released.
         let result: string | Iterable<string>;
 
@@ -74,7 +60,7 @@ export class SerializableNumericIdentifierCreator extends Mixin(SerializableNume
 
     /**
      * Create serialized identifier(s) with a reference based on a numeric value concatenated with serial component(s).
-     * The value is converted to a reference of the appropriate length using a numeric creator.
+     * The value is converted to a reference of the appropriate length using {@linkcode NUMERIC_CREATOR}.
      *
      * @template TTransformerInput
      * Transformer input type.
@@ -92,7 +78,7 @@ export class SerializableNumericIdentifierCreator extends Mixin(SerializableNume
      * Serialized identifiers.
      */
     createSerialized<TTransformerInput extends TransformerInput<string>>(value: number, serialComponentOrComponents: TTransformerInput, sparse?: boolean): TransformerOutput<TTransformerInput, string> {
-        return this.concatenateValidated(this.create(value, sparse), serialComponentOrComponents);
+        return this.#concatenateValidated(this.create(value, sparse), serialComponentOrComponents);
     }
 
     /**
@@ -113,6 +99,6 @@ export class SerializableNumericIdentifierCreator extends Mixin(SerializableNume
     concatenate<TTransformerInput extends TransformerInput<string>>(baseIdentifier: string, serialComponentOrComponents: TTransformerInput): TransformerOutput<TTransformerInput, string> {
         this.validate(baseIdentifier);
 
-        return this.concatenateValidated(baseIdentifier, serialComponentOrComponents);
+        return this.#concatenateValidated(baseIdentifier, serialComponentOrComponents);
     }
 }

package/src/serializable-numeric-identifier-descriptor.ts

@@ -1,6 +1,6 @@
 import type { ContentCharacterSet } from "./content-character-set.js";
+import type { LeaderTypes } from "./leader-type.js";
 import type { NonGTINNumericIdentifierDescriptor } from "./non-gtin-numeric-identifier-descriptor.js";
-import type { LeaderTypes } from "./numeric-identifier-type.js";
 import type { SerializableNumericIdentifierType } from "./serializable-numeric-identifier-type.js";
 
 /**

package/src/serializable-numeric-identifier-type.ts

@@ -1,9 +1,18 @@
-import type { IdentifierTypes } from "./identifier-type.js";
+import { exclude } from "@aidc-toolkit/core";
+import { NonGTINNumericIdentifierTypes } from "./non-gtin-numeric-identifier-type.js";
+import { NonSerializableNumericIdentifierTypes } from "./non-serializable-numeric-identifier-type.js";
+
+/**
+ * Serializable numeric identifier types.
+ */
+export const SerializableNumericIdentifierTypes = exclude(NonGTINNumericIdentifierTypes, NonSerializableNumericIdentifierTypes);
+
+/**
+ * Serializable numeric identifier type key.
+ */
+export type SerializableNumericIdentifierTypeKey = keyof typeof SerializableNumericIdentifierTypes;
 
 /**
  * Serializable numeric identifier type.
  */
-export type SerializableNumericIdentifierType =
-    typeof IdentifierTypes.GRAI |
-    typeof IdentifierTypes.GDTI |
-    typeof IdentifierTypes.GCN;
+export type SerializableNumericIdentifierType = typeof SerializableNumericIdentifierTypes[SerializableNumericIdentifierTypeKey];

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

@@ -1,9 +1,10 @@
 import type { CharacterSetCreator, CharacterSetValidation } from "@aidc-toolkit/utility";
-import { AbstractNumericIdentifierValidator } from "./abstract-numeric-identifier-validator.js";
+import { CONTENT_CHARACTER_SET_CREATORS } from "./content-character-set-creators.js";
 import type { ContentCharacterSet } from "./content-character-set.js";
-import { IdentifierDescriptors } from "./descriptors.js";
+import { IdentifierDescriptors } from "./identifier-descriptors.js";
 import type { IdentifierValidation } from "./identifier-validator.js";
 import { i18nextGS1 } from "./locale/i18n.js";
+import { NonGTINNumericIdentifierValidator } from "./non-gtin-numeric-identifier-validator.js";
 import type { SerializableNumericIdentifierDescriptor } from "./serializable-numeric-identifier-descriptor.js";
 import type { SerializableNumericIdentifierType } from "./serializable-numeric-identifier-type.js";
 
@@ -11,26 +12,26 @@ import type { SerializableNumericIdentifierType } from "./serializable-numeric-i
  * Serializable numeric identifier validator. Validates both serialized and non-serialized forms of numeric identifiers
  * that support serialization.
  */
-export class SerializableNumericIdentifierValidator extends AbstractNumericIdentifierValidator<SerializableNumericIdentifierDescriptor> {
+export class SerializableNumericIdentifierValidator extends NonGTINNumericIdentifierValidator<SerializableNumericIdentifierType> implements SerializableNumericIdentifierDescriptor {
     /**
      * Serial component length.
      */
-    private readonly _serialComponentLength: number;
+    readonly #serialComponentLength: number;
 
     /**
      * Serial component character set.
      */
-    private readonly _serialComponentCharacterSet: ContentCharacterSet;
+    readonly #serialComponentCharacterSet: ContentCharacterSet;
 
     /**
      * Serial component validation parameters.
      */
-    private readonly _serialComponentValidation: CharacterSetValidation;
+    readonly #serialComponentValidation: CharacterSetValidation;
 
     /**
      * Serial component creator.
      */
-    private readonly _serialComponentCreator: CharacterSetCreator;
+    readonly #serialComponentCreator: CharacterSetCreator;
 
     /**
      * Constructor.
@@ -43,44 +44,44 @@ export class SerializableNumericIdentifierValidator extends AbstractNumericIdent
 
         super(identifierDescriptor);
 
-        this._serialComponentLength = identifierDescriptor.serialComponentLength;
-        this._serialComponentCharacterSet = identifierDescriptor.serialComponentCharacterSet;
+        this.#serialComponentLength = identifierDescriptor.serialComponentLength;
+        this.#serialComponentCharacterSet = identifierDescriptor.serialComponentCharacterSet;
 
-        this._serialComponentValidation = {
+        this.#serialComponentValidation = {
             minimumLength: 1,
             maximumLength: identifierDescriptor.serialComponentLength,
             component: () => i18nextGS1.t("Identifier.serialComponent")
         };
 
-        this._serialComponentCreator = SerializableNumericIdentifierValidator.creatorFor(identifierDescriptor.serialComponentCharacterSet);
+        this.#serialComponentCreator = CONTENT_CHARACTER_SET_CREATORS[identifierDescriptor.serialComponentCharacterSet];
     }
 
     /**
      * Get the serial component length.
      */
     get serialComponentLength(): number {
-        return this._serialComponentLength;
+        return this.#serialComponentLength;
     }
 
     /**
      * Get the serial component character set.
      */
     get serialComponentCharacterSet(): ContentCharacterSet {
-        return this._serialComponentCharacterSet;
+        return this.#serialComponentCharacterSet;
     }
 
     /**
      * Get the serial component validation parameters.
      */
     protected get serialComponentValidation(): CharacterSetValidation {
-        return this._serialComponentValidation;
+        return this.#serialComponentValidation;
     }
 
     /**
      * Get the serial component creator.
      */
     get serialComponentCreator(): CharacterSetCreator {
-        return this._serialComponentCreator;
+        return this.#serialComponentCreator;
     }
 
     /**
@@ -90,7 +91,7 @@ export class SerializableNumericIdentifierValidator extends AbstractNumericIdent
         super.validate(identifier.substring(0, this.length), validation);
 
         if (identifier.length > this.length) {
-            this.serialComponentCreator.validate(identifier.substring(this.length), this._serialComponentValidation);
+            this.serialComponentCreator.validate(identifier.substring(this.length), this.#serialComponentValidation);
         }
     }
 }

package/test/gtin-creator.ts

@@ -1,6 +1,13 @@
 import { CharacterSetCreator, Sequence } from "@aidc-toolkit/utility";
 import { expect, test } from "vitest";
-import { type GTINCreator, GTINTypes, GTINValidator, hasValidCheckDigit, isGTINCreator, PrefixTypes } from "../src/index.js";
+import {
+    type GTINCreator,
+    GTINLengths,
+    GTINValidator,
+    hasValidCheckDigit,
+    isGTINCreator,
+    PrefixTypes
+} from "../src/index.js";
 import { testNumericIdentifierCreator } from "./numeric-identifier-creator.js";
 
 export function testGTINCreator(creator: GTINCreator): void {
@@ -111,7 +118,7 @@ export function testGTINCreator(creator: GTINCreator): void {
             expect(Array.from(creator.createGTIN14("5", randomValues, true))).toStrictEqual(identifiers);
         });
 
-        if (creator.gtinType === GTINTypes.GTIN12) {
+        if (creator.length === GTINLengths.GTIN12) {
             test("Zero-suppress GTIN-12 rule 1", () => {
                 expect(GTINValidator.zeroSuppress("012345000058")).toBe("01234558");
                 expect(GTINValidator.zeroSuppress("012345000065")).toBe("01234565");

package/test/gtin-validator.test.ts

@@ -1,8 +1,8 @@
 import { describe, expect, test } from "vitest";
 import {
-    type GTINBaseType,
+    type GTINBaseLength,
+    GTINLengths,
     GTINLevels,
-    GTINTypes,
     GTINValidator,
     IdentifierTypes,
     LeaderTypes,
@@ -11,26 +11,24 @@ import {
 } from "../src/index.js";
 import { validateNumericIdentifierValidator } from "./numeric-identifier-validator.js";
 
-export function validateGTINValidator(validator: GTINValidator, isCreator: boolean, gtinBaseType: GTINBaseType): void {
+export function validateGTINValidator(validator: GTINValidator, isCreator: boolean, gtinBaseLength: GTINBaseLength): void {
     let prefixType: PrefixType;
 
-    switch (gtinBaseType) {
-        case GTINTypes.GTIN13:
+    switch (gtinBaseLength) {
+        case GTINLengths.GTIN13:
             prefixType = PrefixTypes.GS1CompanyPrefix;
             break;
 
-        case GTINTypes.GTIN12:
+        case GTINLengths.GTIN12:
             prefixType = PrefixTypes.UPCCompanyPrefix;
             break;
 
-        case GTINTypes.GTIN8:
+        case GTINLengths.GTIN8:
             prefixType = PrefixTypes.GS18Prefix;
             break;
     }
 
-    validateNumericIdentifierValidator(validator, IdentifierTypes.GTIN, prefixType, gtinBaseType, LeaderTypes.IndicatorDigit);
-
-    expect(validator.gtinType).toBe(gtinBaseType);
+    validateNumericIdentifierValidator(validator, IdentifierTypes.GTIN, prefixType, gtinBaseLength, LeaderTypes.IndicatorDigit);
 }
 
 describe("GTIN validation and normalization", () => {