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

package/dist/serializable-numeric-identifier-creator.js

@@ -1,25 +1,11 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars -- Used in JSDoc.
 import { mapIterable } from "@aidc-toolkit/utility";
-import { Mixin } from "ts-mixer";
-import { AbstractNumericIdentifierCreator } from "./abstract-numeric-identifier-creator.js";
+import { MixinAbstractNonGTINNumericIdentifierCreator } from "./abstract-non-gtin-numeric-identifier-creator.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, identifierType) {
-        super(identifierType);
-        this.init(prefixProvider, prefixProvider.gs1CompanyPrefix);
-    }
+export class SerializableNumericIdentifierCreator extends MixinAbstractNonGTINNumericIdentifierCreator(SerializableNumericIdentifierValidator) {
     /**
      * Concatenate a validated base identifier with serial component(s).
      *
@@ -35,7 +21,7 @@ export class SerializableNumericIdentifierCreator extends Mixin(SerializableNume
      * @returns
      * Serialized identifier(s).
      */
-    concatenateValidated(baseIdentifier, serialComponentOrComponents) {
+    #concatenateValidated(baseIdentifier, serialComponentOrComponents) {
         // TODO Refactor type when https://github.com/microsoft/TypeScript/pull/56941 released.
         let result;
         const serialComponentCreator = this.serialComponentCreator;
@@ -64,7 +50,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.
@@ -82,7 +68,7 @@ export class SerializableNumericIdentifierCreator extends Mixin(SerializableNume
      * Serialized identifiers.
      */
     createSerialized(value, serialComponentOrComponents, sparse) {
-        return this.concatenateValidated(this.create(value, sparse), serialComponentOrComponents);
+        return this.#concatenateValidated(this.create(value, sparse), serialComponentOrComponents);
     }
     /**
      * Concatenate a base identifier with serial component(s).
@@ -101,7 +87,7 @@ export class SerializableNumericIdentifierCreator extends Mixin(SerializableNume
      */
     concatenate(baseIdentifier, serialComponentOrComponents) {
         this.validate(baseIdentifier);
-        return this.concatenateValidated(baseIdentifier, serialComponentOrComponents);
+        return this.#concatenateValidated(baseIdentifier, serialComponentOrComponents);
     }
 }
 //# sourceMappingURL=serializable-numeric-identifier-creator.js.map

package/dist/serializable-numeric-identifier-creator.js.map

@@ -1 +1 @@
-{"version":3,"file":"serializable-numeric-identifier-creator.js","sourceRoot":"","sources":["../src/serializable-numeric-identifier-creator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAiD,MAAM,uBAAuB,CAAC;AACnG,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,gCAAgC,EAAE,MAAM,0CAA0C,CAAC;AAG5F,OAAO,EAAE,sCAAsC,EAAE,MAAM,gDAAgD,CAAC;AAExG;;GAEG;AACH,MAAM,OAAO,oCAAqC,SAAQ,KAAK,CAAC,sCAAsC,EAAE,gCAAgC,CAAC;IACrI;;;;;;;;;OASG;IACH,YAAY,cAA8B,EAAE,cAAiD;QACzF,KAAK,CAAC,cAAc,CAAC,CAAC;QAEtB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,gBAAgB,CAAC,CAAC;IAC/D,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACK,oBAAoB,CAAqD,cAAsB,EAAE,2BAA8C;QACnJ,uFAAuF;QACvF,IAAI,MAAiC,CAAC;QAEtC,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC;QAC3D,MAAM,yBAAyB,GAAG,IAAI,CAAC,yBAAyB,CAAC;QAEjE;;;;;;;;WAQG;QACH,SAAS,sBAAsB,CAAC,eAAuB;YACnD,sBAAsB,CAAC,QAAQ,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;YAE5E,OAAO,cAAc,GAAG,eAAe,CAAC;QAC5C,CAAC;QAED,IAAI,OAAO,2BAA2B,KAAK,QAAQ,EAAE,CAAC;YAClD,MAAM,GAAG,sBAAsB,CAAC,2BAA2B,CAAC,CAAC;QACjE,CAAC;aAAM,CAAC;YACJ,MAAM,GAAG,WAAW,CAAC,2BAA2B,EAAE,sBAAsB,CAAC,CAAC;QAC9E,CAAC;QAED,+GAA+G;QAC/G,OAAO,MAAsD,CAAC;IAClE,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,gBAAgB,CAAqD,KAAa,EAAE,2BAA8C,EAAE,MAAgB;QAChJ,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,2BAA2B,CAAC,CAAC;IAC9F,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAqD,cAAsB,EAAE,2BAA8C;QAClI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAE9B,OAAO,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAE,2BAA2B,CAAC,CAAC;IAClF,CAAC;CACJ"}
+{"version":3,"file":"serializable-numeric-identifier-creator.js","sourceRoot":"","sources":["../src/serializable-numeric-identifier-creator.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,OAAO,EAAE,WAAW,EAAkE,MAAM,uBAAuB,CAAC;AACpH,OAAO,EAAE,4CAA4C,EAAE,MAAM,mDAAmD,CAAC;AAEjH,OAAO,EAAE,sCAAsC,EAAE,MAAM,gDAAgD,CAAC;AAExG;;GAEG;AACH,MAAM,OAAO,oCAAqC,SAAQ,4CAA4C,CAEpG,sCAAsC,CAAC;IACrC;;;;;;;;;;;;;;OAcG;IACH,qBAAqB,CAAqD,cAAsB,EAAE,2BAA8C;QAC5I,uFAAuF;QACvF,IAAI,MAAiC,CAAC;QAEtC,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC;QAC3D,MAAM,yBAAyB,GAAG,IAAI,CAAC,yBAAyB,CAAC;QAEjE;;;;;;;;WAQG;QACH,SAAS,sBAAsB,CAAC,eAAuB;YACnD,sBAAsB,CAAC,QAAQ,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;YAE5E,OAAO,cAAc,GAAG,eAAe,CAAC;QAC5C,CAAC;QAED,IAAI,OAAO,2BAA2B,KAAK,QAAQ,EAAE,CAAC;YAClD,MAAM,GAAG,sBAAsB,CAAC,2BAA2B,CAAC,CAAC;QACjE,CAAC;aAAM,CAAC;YACJ,MAAM,GAAG,WAAW,CAAC,2BAA2B,EAAE,sBAAsB,CAAC,CAAC;QAC9E,CAAC;QAED,+GAA+G;QAC/G,OAAO,MAAsD,CAAC;IAClE,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,gBAAgB,CAAqD,KAAa,EAAE,2BAA8C,EAAE,MAAgB;QAChJ,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,2BAA2B,CAAC,CAAC;IAC/F,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAqD,cAAsB,EAAE,2BAA8C;QAClI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAE9B,OAAO,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,2BAA2B,CAAC,CAAC;IACnF,CAAC;CACJ"}

package/dist/serializable-numeric-identifier-descriptor.d.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";
 /**
  * Serializable numeric identifier descriptor.

package/dist/serializable-numeric-identifier-descriptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serializable-numeric-identifier-descriptor.d.ts","sourceRoot":"","sources":["../src/serializable-numeric-identifier-descriptor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,6CAA6C,CAAC;AACtG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,2CAA2C,CAAC;AAEnG;;GAEG;AACH,MAAM,WAAW,uCAAwC,SAAQ,kCAAkC;IAC/F;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,iCAAiC,CAAC;IAE3D;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,OAAO,WAAW,CAAC,IAAI,CAAC;IAE7C;;OAEG;IACH,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAEvC;;OAEG;IACH,QAAQ,CAAC,2BAA2B,EAAE,mBAAmB,CAAC;CAC7D"}
+{"version":3,"file":"serializable-numeric-identifier-descriptor.d.ts","sourceRoot":"","sources":["../src/serializable-numeric-identifier-descriptor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,6CAA6C,CAAC;AACtG,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,2CAA2C,CAAC;AAEnG;;GAEG;AACH,MAAM,WAAW,uCAAwC,SAAQ,kCAAkC;IAC/F;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,iCAAiC,CAAC;IAE3D;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,OAAO,WAAW,CAAC,IAAI,CAAC;IAE7C;;OAEG;IACH,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAEvC;;OAEG;IACH,QAAQ,CAAC,2BAA2B,EAAE,mBAAmB,CAAC;CAC7D"}

package/dist/serializable-numeric-identifier-type.d.ts

@@ -1,6 +1,26 @@
-import type { IdentifierTypes } from "./identifier-type.js";
+/**
+ * Serializable numeric identifier types.
+ */
+export declare const SerializableNumericIdentifierTypes: Omit<Omit<Pick<{
+    readonly GTIN: "GTIN";
+    readonly GLN: "GLN";
+    readonly SSCC: "SSCC";
+    readonly GRAI: "GRAI";
+    readonly GIAI: "GIAI";
+    readonly GSRN: "GSRN";
+    readonly GDTI: "GDTI";
+    readonly GINC: "GINC";
+    readonly GSIN: "GSIN";
+    readonly GCN: "GCN";
+    readonly CPID: "CPID";
+    readonly GMN: "GMN";
+}, "GTIN" | "GLN" | "SSCC" | "GRAI" | "GSRN" | "GDTI" | "GSIN" | "GCN">, "GTIN">, "GLN" | "SSCC" | "GSRN" | "GSIN">;
+/**
+ * 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];
 //# sourceMappingURL=serializable-numeric-identifier-type.d.ts.map

package/dist/serializable-numeric-identifier-type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serializable-numeric-identifier-type.d.ts","sourceRoot":"","sources":["../src/serializable-numeric-identifier-type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;GAEG;AACH,MAAM,MAAM,iCAAiC,GACzC,OAAO,eAAe,CAAC,IAAI,GAC3B,OAAO,eAAe,CAAC,IAAI,GAC3B,OAAO,eAAe,CAAC,GAAG,CAAC"}
+{"version":3,"file":"serializable-numeric-identifier-type.d.ts","sourceRoot":"","sources":["../src/serializable-numeric-identifier-type.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,eAAO,MAAM,kCAAkC;;;;;;;;;;;;;mHAAgF,CAAC;AAEhI;;GAEG;AACH,MAAM,MAAM,oCAAoC,GAAG,MAAM,OAAO,kCAAkC,CAAC;AAEnG;;GAEG;AACH,MAAM,MAAM,iCAAiC,GAAG,OAAO,kCAAkC,CAAC,oCAAoC,CAAC,CAAC"}

package/dist/serializable-numeric-identifier-type.js

@@ -1,2 +1,8 @@
-export {};
+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);
 //# sourceMappingURL=serializable-numeric-identifier-type.js.map

package/dist/serializable-numeric-identifier-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"serializable-numeric-identifier-type.js","sourceRoot":"","sources":["../src/serializable-numeric-identifier-type.ts"],"names":[],"mappings":""}
+{"version":3,"file":"serializable-numeric-identifier-type.js","sourceRoot":"","sources":["../src/serializable-numeric-identifier-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,6BAA6B,EAAE,MAAM,uCAAuC,CAAC;AACtF,OAAO,EAAE,qCAAqC,EAAE,MAAM,+CAA+C,CAAC;AAEtG;;GAEG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,OAAO,CAAC,6BAA6B,EAAE,qCAAqC,CAAC,CAAC"}

package/dist/serializable-numeric-identifier-validator.d.ts

@@ -1,30 +1,15 @@
 import type { CharacterSetCreator, CharacterSetValidation } from "@aidc-toolkit/utility";
-import { AbstractNumericIdentifierValidator } from "./abstract-numeric-identifier-validator.js";
 import type { ContentCharacterSet } from "./content-character-set.js";
 import type { IdentifierValidation } from "./identifier-validator.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";
 /**
  * Serializable numeric identifier validator. Validates both serialized and non-serialized forms of numeric identifiers
  * that support serialization.
  */
-export declare class SerializableNumericIdentifierValidator extends AbstractNumericIdentifierValidator<SerializableNumericIdentifierDescriptor> {
-    /**
-     * Serial component length.
-     */
-    private readonly _serialComponentLength;
-    /**
-     * Serial component character set.
-     */
-    private readonly _serialComponentCharacterSet;
-    /**
-     * Serial component validation parameters.
-     */
-    private readonly _serialComponentValidation;
-    /**
-     * Serial component creator.
-     */
-    private readonly _serialComponentCreator;
+export declare class SerializableNumericIdentifierValidator extends NonGTINNumericIdentifierValidator<SerializableNumericIdentifierType> implements SerializableNumericIdentifierDescriptor {
+    #private;
     /**
      * Constructor.
      *

package/dist/serializable-numeric-identifier-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serializable-numeric-identifier-validator.d.ts","sourceRoot":"","sources":["../src/serializable-numeric-identifier-validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACzF,OAAO,EAAE,kCAAkC,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,KAAK,EAAE,uCAAuC,EAAE,MAAM,iDAAiD,CAAC;AAC/G,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,2CAA2C,CAAC;AAEnG;;;GAGG;AACH,qBAAa,sCAAuC,SAAQ,kCAAkC,CAAC,uCAAuC,CAAC;IACnI;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAS;IAEhD;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAsB;IAEnE;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAyB;IAEpE;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAsB;IAE9D;;;;;OAKG;gBACS,cAAc,EAAE,iCAAiC;IAiB7D;;OAEG;IACH,IAAI,qBAAqB,IAAI,MAAM,CAElC;IAED;;OAEG;IACH,IAAI,2BAA2B,IAAI,mBAAmB,CAErD;IAED;;OAEG;IACH,SAAS,KAAK,yBAAyB,IAAI,sBAAsB,CAEhE;IAED;;OAEG;IACH,IAAI,sBAAsB,IAAI,mBAAmB,CAEhD;IAED;;OAEG;IACM,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,oBAAoB,GAAG,IAAI;CAOjF"}
+{"version":3,"file":"serializable-numeric-identifier-validator.d.ts","sourceRoot":"","sources":["../src/serializable-numeric-identifier-validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAEzF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAE,iCAAiC,EAAE,MAAM,4CAA4C,CAAC;AAC/F,OAAO,KAAK,EAAE,uCAAuC,EAAE,MAAM,iDAAiD,CAAC;AAC/G,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,2CAA2C,CAAC;AAEnG;;;GAGG;AACH,qBAAa,sCAAuC,SAAQ,iCAAiC,CAAC,iCAAiC,CAAE,YAAW,uCAAuC;;IAqB/K;;;;;OAKG;gBACS,cAAc,EAAE,iCAAiC;IAiB7D;;OAEG;IACH,IAAI,qBAAqB,IAAI,MAAM,CAElC;IAED;;OAEG;IACH,IAAI,2BAA2B,IAAI,mBAAmB,CAErD;IAED;;OAEG;IACH,SAAS,KAAK,yBAAyB,IAAI,sBAAsB,CAEhE;IAED;;OAEG;IACH,IAAI,sBAAsB,IAAI,mBAAmB,CAEhD;IAED;;OAEG;IACM,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,oBAAoB,GAAG,IAAI;CAOjF"}

package/dist/serializable-numeric-identifier-validator.js

@@ -1,27 +1,28 @@
-import { AbstractNumericIdentifierValidator } from "./abstract-numeric-identifier-validator.js";
-import { IdentifierDescriptors } from "./descriptors.js";
+import { CONTENT_CHARACTER_SET_CREATORS } from "./content-character-set-creators.js";
+import { IdentifierDescriptors } from "./identifier-descriptors.js";
 import { i18nextGS1 } from "./locale/i18n.js";
+import { NonGTINNumericIdentifierValidator } from "./non-gtin-numeric-identifier-validator.js";
 /**
  * Serializable numeric identifier validator. Validates both serialized and non-serialized forms of numeric identifiers
  * that support serialization.
  */
-export class SerializableNumericIdentifierValidator extends AbstractNumericIdentifierValidator {
+export class SerializableNumericIdentifierValidator extends NonGTINNumericIdentifierValidator {
     /**
      * Serial component length.
      */
-    _serialComponentLength;
+    #serialComponentLength;
     /**
      * Serial component character set.
      */
-    _serialComponentCharacterSet;
+    #serialComponentCharacterSet;
     /**
      * Serial component validation parameters.
      */
-    _serialComponentValidation;
+    #serialComponentValidation;
     /**
      * Serial component creator.
      */
-    _serialComponentCreator;
+    #serialComponentCreator;
     /**
      * Constructor.
      *
@@ -31,38 +32,38 @@ export class SerializableNumericIdentifierValidator extends AbstractNumericIdent
     constructor(identifierType) {
         const identifierDescriptor = IdentifierDescriptors[identifierType];
         super(identifierDescriptor);
-        this._serialComponentLength = identifierDescriptor.serialComponentLength;
-        this._serialComponentCharacterSet = identifierDescriptor.serialComponentCharacterSet;
-        this._serialComponentValidation = {
+        this.#serialComponentLength = identifierDescriptor.serialComponentLength;
+        this.#serialComponentCharacterSet = identifierDescriptor.serialComponentCharacterSet;
+        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() {
-        return this._serialComponentLength;
+        return this.#serialComponentLength;
     }
     /**
      * Get the serial component character set.
      */
     get serialComponentCharacterSet() {
-        return this._serialComponentCharacterSet;
+        return this.#serialComponentCharacterSet;
     }
     /**
      * Get the serial component validation parameters.
      */
     get serialComponentValidation() {
-        return this._serialComponentValidation;
+        return this.#serialComponentValidation;
     }
     /**
      * Get the serial component creator.
      */
     get serialComponentCreator() {
-        return this._serialComponentCreator;
+        return this.#serialComponentCreator;
     }
     /**
      * @inheritDoc
@@ -70,7 +71,7 @@ export class SerializableNumericIdentifierValidator extends AbstractNumericIdent
     validate(identifier, validation) {
         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/dist/serializable-numeric-identifier-validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"serializable-numeric-identifier-validator.js","sourceRoot":"","sources":["../src/serializable-numeric-identifier-validator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kCAAkC,EAAE,MAAM,4CAA4C,CAAC;AAEhG,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAI9C;;;GAGG;AACH,MAAM,OAAO,sCAAuC,SAAQ,kCAA2E;IACnI;;OAEG;IACc,sBAAsB,CAAS;IAEhD;;OAEG;IACc,4BAA4B,CAAsB;IAEnE;;OAEG;IACc,0BAA0B,CAAyB;IAEpE;;OAEG;IACc,uBAAuB,CAAsB;IAE9D;;;;;OAKG;IACH,YAAY,cAAiD;QACzD,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,cAAc,CAAC,CAAC;QAEnE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAE5B,IAAI,CAAC,sBAAsB,GAAG,oBAAoB,CAAC,qBAAqB,CAAC;QACzE,IAAI,CAAC,4BAA4B,GAAG,oBAAoB,CAAC,2BAA2B,CAAC;QAErF,IAAI,CAAC,0BAA0B,GAAG;YAC9B,aAAa,EAAE,CAAC;YAChB,aAAa,EAAE,oBAAoB,CAAC,qBAAqB;YACzD,SAAS,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,4BAA4B,CAAC;SAC9D,CAAC;QAEF,IAAI,CAAC,uBAAuB,GAAG,sCAAsC,CAAC,UAAU,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,CAAC;IACvI,CAAC;IAED;;OAEG;IACH,IAAI,qBAAqB;QACrB,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACvC,CAAC;IAED;;OAEG;IACH,IAAI,2BAA2B;QAC3B,OAAO,IAAI,CAAC,4BAA4B,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,IAAc,yBAAyB;QACnC,OAAO,IAAI,CAAC,0BAA0B,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,IAAI,sBAAsB;QACtB,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACxC,CAAC;IAED;;OAEG;IACM,QAAQ,CAAC,UAAkB,EAAE,UAAiC;QACnE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC;QAEjE,IAAI,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YAClC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC7G,CAAC;IACL,CAAC;CACJ"}
+{"version":3,"file":"serializable-numeric-identifier-validator.js","sourceRoot":"","sources":["../src/serializable-numeric-identifier-validator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAErF,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iCAAiC,EAAE,MAAM,4CAA4C,CAAC;AAI/F;;;GAGG;AACH,MAAM,OAAO,sCAAuC,SAAQ,iCAAoE;IAC5H;;OAEG;IACM,sBAAsB,CAAS;IAExC;;OAEG;IACM,4BAA4B,CAAsB;IAE3D;;OAEG;IACM,0BAA0B,CAAyB;IAE5D;;OAEG;IACM,uBAAuB,CAAsB;IAEtD;;;;;OAKG;IACH,YAAY,cAAiD;QACzD,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,cAAc,CAAC,CAAC;QAEnE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAE5B,IAAI,CAAC,sBAAsB,GAAG,oBAAoB,CAAC,qBAAqB,CAAC;QACzE,IAAI,CAAC,4BAA4B,GAAG,oBAAoB,CAAC,2BAA2B,CAAC;QAErF,IAAI,CAAC,0BAA0B,GAAG;YAC9B,aAAa,EAAE,CAAC;YAChB,aAAa,EAAE,oBAAoB,CAAC,qBAAqB;YACzD,SAAS,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,4BAA4B,CAAC;SAC9D,CAAC;QAEF,IAAI,CAAC,uBAAuB,GAAG,8BAA8B,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,CAAC;IACpH,CAAC;IAED;;OAEG;IACH,IAAI,qBAAqB;QACrB,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACvC,CAAC;IAED;;OAEG;IACH,IAAI,2BAA2B;QAC3B,OAAO,IAAI,CAAC,4BAA4B,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,IAAc,yBAAyB;QACnC,OAAO,IAAI,CAAC,0BAA0B,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,IAAI,sBAAsB;QACtB,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACxC,CAAC;IAED;;OAEG;IACM,QAAQ,CAAC,UAAkB,EAAE,UAAiC;QACnE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC;QAEjE,IAAI,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YAClC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC7G,CAAC;IACL,CAAC;CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aidc-toolkit/gs1",
-  "version": "1.0.26-beta",
+  "version": "1.0.28-beta",
   "description": "GS1 AIDC Toolkit",
   "type": "module",
   "main": "dist/index.js",
@@ -27,12 +27,11 @@
     "test": "vitest run"
   },
   "devDependencies": {
-    "@aidc-toolkit/dev": "1.0.26-beta",
+    "@aidc-toolkit/dev": "1.0.28-beta",
     "vitest": "^4.0.15"
   },
   "dependencies": {
-    "@aidc-toolkit/core": "1.0.26-beta",
-    "@aidc-toolkit/utility": "1.0.26-beta",
-    "ts-mixer": "^6.0.4"
+    "@aidc-toolkit/core": "1.0.28-beta",
+    "@aidc-toolkit/utility": "1.0.28-beta"
   }
 }

package/src/abstract-identifier-creator.ts

@@ -1,97 +1,126 @@
-import type { CharacterSetCreator } from "@aidc-toolkit/utility";
+import type { AbstractConstructor } from "@aidc-toolkit/core";
 import type { IdentifierCreator } from "./identifier-creator.js";
-import type { IdentifierDescriptor } from "./identifier-descriptor.js";
-import type { IdentifierValidation } from "./identifier-validator.js";
+import type { IdentifierType } from "./identifier-type.js";
+import type { IdentifierValidation, IdentifierValidator } from "./identifier-validator.js";
+import type { IdentifierTypeValidator, IdentifierValidatorConstructorsEntry } from "./identifier-validators.js";
 import type { PrefixProvider } from "./prefix-provider.js";
 
 /**
- * Abstract identifier creator. Implements common functionality for an identifier creator, bound to a {@link
- * PrefixProvider | prefix provider}.
+ * Identifier creator constructor type, which delegates to an identifier validator constructor.
  *
- * @template TIdentifierDescriptor
- * Identifier descriptor type.
+ * @template TIdentifierType
+ * Identifier type type.
  *
  * @template TIdentifierValidation
  * Identifier validation type.
+ *
+ * @template TIdentifierValidator
+ * Identifier validator type.
  */
-export abstract class AbstractIdentifierCreator<TIdentifierDescriptor extends IdentifierDescriptor, TIdentifierValidation extends IdentifierValidation> implements IdentifierCreator<TIdentifierDescriptor, TIdentifierValidation> {
-    /**
-     * Prefix provider.
-     */
-    private _prefixProvider!: PrefixProvider;
+export type IdentifierCreatorConstructor<
+    TIdentifierType extends IdentifierType,
+    TIdentifierValidation extends IdentifierValidation,
+    TIdentifierValidator extends IdentifierValidator<TIdentifierType, TIdentifierValidation>
+> = AbstractConstructor<
+    [prefixProvider: PrefixProvider, prefix: string, checkAllowance: number, ...args: ConstructorParameters<IdentifierValidatorConstructorsEntry<TIdentifierType>>],
+    TIdentifierValidator & IdentifierCreator<TIdentifierType, TIdentifierValidation>
+>;
 
+/**
+ * Mixin implementation of {@linkcode IdentifierCreator} with an appropriate identifier validator base.
+ *
+ * @template TIdentifierType
+ * Identifier type type.
+ *
+ * @template TIdentifierValidation
+ * Identifier validation type.
+ *
+ * @param IdentifierValidatorConstructor
+ * Identifier validator base.
+ *
+ * @returns
+ * Identifier creator class.
+ */
+export function MixinAbstractIdentifierCreator<
+    TIdentifierType extends IdentifierType,
+    TIdentifierValidation extends IdentifierValidation
+>(IdentifierValidatorConstructor: AbstractConstructor<
+    ConstructorParameters<IdentifierValidatorConstructorsEntry<TIdentifierType>>,
+    IdentifierTypeValidator<TIdentifierType>
+>): IdentifierCreatorConstructor<
+    TIdentifierType,
+    TIdentifierValidation,
+    IdentifierTypeValidator<TIdentifierType>
+> {
     /**
-     * Reference length.
+     * Abstract numeric identifier creator. Implements common functionality for a numeric identifier creator, mixed in
+     * with a matching numeric identifier validator.
      */
-    private _referenceLength!: number;
+    abstract class AbstractIdentifierCreator extends (
+        IdentifierValidatorConstructor as AbstractConstructor<
+            ConstructorParameters<IdentifierValidatorConstructorsEntry<TIdentifierType>>,
+            IdentifierValidator<TIdentifierType>
+        >
+    ) implements IdentifierCreator<TIdentifierType, TIdentifierValidation> {
+        /**
+         * Prefix provider.
+         */
+        readonly #prefixProvider: PrefixProvider;
 
-    /**
-     * Initialize the prefix provider. This method is in lieu of a constructor due to the mixin architecture.
-     *
-     * @param prefixProvider
-     * Prefix provider.
-     *
-     * @param prefix
-     * Prefix within prefix provider to use to calculate reference length.
-     *
-     * @param checkAllowance
-     * Number of characters to allow for check digit or check character pair.
-     */
-    protected init(prefixProvider: PrefixProvider, prefix: string, checkAllowance: number): void {
-        this._prefixProvider = prefixProvider;
+        /**
+         * Reference length.
+         */
+        readonly #referenceLength: number;
 
-        // Reference length allows for prefix and optionally check digit or check character pair.
-        this._referenceLength = this.length - prefix.length - checkAllowance;
-    }
+        /**
+         * Constructor.
+         *
+         * @param prefixProvider
+         * Prefix provider.
+         *
+         * @param prefix
+         * Prefix within prefix provider to use to calculate reference length.
+         *
+         * @param checkAllowance
+         * Number of characters to allow for check digit or check character pair.
+         * 
+         * @param args
+         * Originating constructor arguments.
+         */
+        constructor(prefixProvider: PrefixProvider, prefix: string, checkAllowance: number, ...args: ConstructorParameters<IdentifierValidatorConstructorsEntry<TIdentifierType>>) {
+            super(...args);
 
-    /**
-     * @inheritDoc
-     */
-    abstract get identifierType(): TIdentifierDescriptor["identifierType"];
+            this.#prefixProvider = prefixProvider;
 
-    /**
-     * @inheritDoc
-     */
-    abstract get prefixType(): TIdentifierDescriptor["prefixType"];
+            // Reference length allows for prefix and optionally check digit or check character pair.
+            this.#referenceLength = this.length - prefix.length - checkAllowance;
+        }
 
-    /**
-     * @inheritDoc
-     */
-    abstract get length(): number;
-
-    /**
-     * @inheritDoc
-     */
-    abstract get referenceCharacterSet(): TIdentifierDescriptor["referenceCharacterSet"];
-
-    /**
-     * @inheritDoc
-     */
-    abstract get referenceCreator(): CharacterSetCreator;
-
-    /**
-     * @inheritDoc
-     */
-    get prefixProvider(): PrefixProvider {
-        return this._prefixProvider;
-    }
+        /**
+         * @inheritDoc
+         */
+        get prefixProvider(): PrefixProvider {
+            return this.#prefixProvider;
+        }
 
-    /**
-     * @inheritDoc
-     */
-    get prefix(): string {
-        return this.prefixProvider.gs1CompanyPrefix;
-    }
+        /**
+         * @inheritDoc
+         */
+        get prefix(): string {
+            return this.prefixProvider.gs1CompanyPrefix;
+        }
 
-    /**
-     * @inheritDoc
-     */
-    get referenceLength(): number {
-        return this._referenceLength;
+        /**
+         * @inheritDoc
+         */
+        get referenceLength(): number {
+            return this.#referenceLength;
+        }
     }
 
-    /**
-     * @inheritDoc
-     */
-    abstract validate(identifier: string, validation?: TIdentifierValidation): void;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Base class was upcast to type with statically known members for mixin, downcast result.
+    return AbstractIdentifierCreator as AbstractConstructor<
+        ConstructorParameters<typeof AbstractIdentifierCreator>,
+        IdentifierTypeValidator<TIdentifierType> & AbstractIdentifierCreator
+    >;
 }

package/src/abstract-non-gtin-numeric-identifier-creator.ts

@@ -0,0 +1,81 @@
+import type { AbstractConstructor } from "@aidc-toolkit/core";
+import {
+    MixinAbstractNumericIdentifierCreator,
+    type NumericIdentifierCreatorConstructor
+} from "./abstract-numeric-identifier-creator.js";
+import type { IdentifierTypeValidator, IdentifierValidatorConstructorsEntry } from "./identifier-validators.js";
+import type { NonGTINNumericIdentifierCreator } from "./non-gtin-numeric-identifier-creator.js";
+import type { NonGTINNumericIdentifierType } from "./non-gtin-numeric-identifier-type.js";
+import type { NonGTINNumericIdentifierValidator } from "./non-gtin-numeric-identifier-validator.js";
+import type { PrefixProvider } from "./prefix-provider.js";
+
+/**
+ * Non-GTIN numeric identifier creator constructor type, which delegates to a non-GTIN numeric identifier validator
+ * constructor.
+ *
+ * @template TNonGTINNumericIdentifierType
+ * Non-GTIN numeric identifier type type.
+ *
+ * @template TNonGTINNumericIdentifierValidator
+ * Non-GTIN numeric identifier validator type.
+ */
+type NonGTINNumericIdentifierCreatorConstructor<
+    TNonGTINNumericIdentifierType extends NonGTINNumericIdentifierType,
+    TNonGTINNumericIdentifierValidator extends NonGTINNumericIdentifierValidator<TNonGTINNumericIdentifierType>
+> = AbstractConstructor<
+    [prefixProvider: PrefixProvider, ...args: ConstructorParameters<IdentifierValidatorConstructorsEntry<TNonGTINNumericIdentifierType>>],
+    TNonGTINNumericIdentifierValidator & NonGTINNumericIdentifierCreator<TNonGTINNumericIdentifierType>
+>;
+
+/**
+ * Mixin implementation of {@linkcode NonGTINNumericIdentifierCreator} with an appropriate non-GTIN numeric identifier
+ * validator base.
+ *
+ * @template TNonGTINNumericIdentifierType
+ * Non-GTIN numeric identifier type type.
+ *
+ * @param NonGTINNumericIdentifierValidatorConstructor
+ * Non-GTIN numeric identifier validator constructor.
+ *
+ * @returns
+ * Non-GTIN numeric identifier creator class.
+ */
+export function MixinAbstractNonGTINNumericIdentifierCreator<
+    TNonGTINNumericIdentifierType extends NonGTINNumericIdentifierType
+>(NonGTINNumericIdentifierValidatorConstructor: AbstractConstructor<
+    ConstructorParameters<IdentifierValidatorConstructorsEntry<TNonGTINNumericIdentifierType>>,
+    IdentifierTypeValidator<TNonGTINNumericIdentifierType>
+>): NonGTINNumericIdentifierCreatorConstructor<
+    TNonGTINNumericIdentifierType,
+    IdentifierTypeValidator<TNonGTINNumericIdentifierType>
+> {
+    /**
+     * Abstract non-GTIN numeric identifier creator. Implements common functionality for a non-GTIN numeric identifier
+     * creator, mixed in with a matching non-GTIN numeric identifier validator.
+     */
+    abstract class AbstractNonGTINNumericIdentifierCreator extends (
+        MixinAbstractNumericIdentifierCreator(NonGTINNumericIdentifierValidatorConstructor) as NumericIdentifierCreatorConstructor<
+            TNonGTINNumericIdentifierType,
+            NonGTINNumericIdentifierValidator<TNonGTINNumericIdentifierType>
+        >
+    ) implements NonGTINNumericIdentifierCreator<TNonGTINNumericIdentifierType> {
+        /**
+         * Constructor.
+         *
+         * @param prefixProvider
+         * Prefix provider.
+         *
+         * @param args
+         * Originating constructor arguments.
+         */
+        constructor(prefixProvider: PrefixProvider, ...args: ConstructorParameters<IdentifierValidatorConstructorsEntry<TNonGTINNumericIdentifierType>>) {
+            super(prefixProvider, prefixProvider.gs1CompanyPrefix, ...args);
+        }
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Base class was upcast to type with statically known members for mixin, downcast result.
+    return AbstractNonGTINNumericIdentifierCreator as AbstractConstructor<
+        ConstructorParameters<typeof AbstractNonGTINNumericIdentifierCreator>,
+        IdentifierTypeValidator<TNonGTINNumericIdentifierType> & AbstractNonGTINNumericIdentifierCreator
+    >;
+}