@aidc-toolkit/app-extension 0.9.20-beta → 1.0.22-beta

package/dist/gs1/{idkey-proxy.js → identifier-proxy.js}

@@ -7,27 +7,27 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-import { CPID_VALIDATOR, GCN_VALIDATOR, GDTI_VALIDATOR, GIAI_VALIDATOR, GINC_VALIDATOR, GLN_VALIDATOR, GMN_VALIDATOR, GRAI_VALIDATOR, GSIN_VALIDATOR, GSRN_VALIDATOR, GTIN12_VALIDATOR, GTIN13_VALIDATOR, GTIN8_VALIDATOR, GTINCreator, GTINValidator, PrefixManager, PrefixType, SSCC_VALIDATOR } from "@aidc-toolkit/gs1";
+import { CPID_VALIDATOR, GCN_VALIDATOR, GDTI_VALIDATOR, GIAI_VALIDATOR, GINC_VALIDATOR, GLN_VALIDATOR, GMN_VALIDATOR, GRAI_VALIDATOR, GSIN_VALIDATOR, GSRN_VALIDATOR, GTIN12_VALIDATOR, GTIN13_VALIDATOR, GTIN8_VALIDATOR, GTINCreator, GTINValidator, PrefixManager, PrefixTypes, PrefixValidator, SSCC_VALIDATOR } from "@aidc-toolkit/gs1";
 import { Sequence } from "@aidc-toolkit/utility";
-import { expandParameterDescriptor, ProxyClass, ProxyMethod, ProxyParameter, Type } from "../descriptor.js";
+import { expandParameterDescriptor, ProxyClass, ProxyMethod, ProxyParameter, Types } from "../descriptor.js";
 import { LibProxy } from "../lib-proxy.js";
 import { i18nextAppExtension } from "../locale/i18n.js";
 import { isNullish } from "../types.js";
 import { exclusionAllNumericParameterDescriptor } from "../utility/character-set-descriptor.js";
 import { StringProxy } from "../utility/string-proxy.js";
 import { countParameterDescriptor, startValueParameterDescriptor, valueParameterDescriptor } from "../utility/transformer-descriptor.js";
-const identificationKeyParameterDescriptor = {
-    name: "identificationKey",
-    type: Type.String,
+const identifierParameterDescriptor = {
+    name: "identifier",
+    type: Types.String,
     isMatrix: true,
     isRequired: true
 };
-const validateIdentificationKeyParameterDescriptor = {
-    extendsDescriptor: identificationKeyParameterDescriptor,
+const validateIdentifierParameterDescriptor = {
+    extendsDescriptor: identifierParameterDescriptor,
     sortOrder: 0,
-    name: "validateIdentificationKey"
+    name: "validateIdentifier"
 };
-class IdentificationKeyValidatorProxy extends StringProxy {
+class IdentifierValidatorProxy extends StringProxy {
     _validator;
     constructor(appExtension, validator) {
         super(appExtension);
@@ -37,39 +37,39 @@ class IdentificationKeyValidatorProxy extends StringProxy {
         return this._validator;
     }
 }
-class NumericIdentificationKeyValidatorProxy extends IdentificationKeyValidatorProxy {
-    validate(matrixIdentificationKeys) {
-        return this.validateString(this.validator, matrixIdentificationKeys);
+class NumericIdentifierValidatorProxy extends IdentifierValidatorProxy {
+    validate(matrixIdentifiers) {
+        return this.validateString(this.validator, matrixIdentifiers);
     }
 }
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
-    __param(0, ProxyParameter(validateIdentificationKeyParameterDescriptor))
-], NumericIdentificationKeyValidatorProxy.prototype, "validate", null);
-class GTINValidatorProxy extends NumericIdentificationKeyValidatorProxy {
+    __param(0, ProxyParameter(validateIdentifierParameterDescriptor))
+], NumericIdentifierValidatorProxy.prototype, "validate", null);
+class GTINValidatorProxy extends NumericIdentifierValidatorProxy {
 }
-class NonGTINNumericIdentificationKeyValidatorProxy extends NumericIdentificationKeyValidatorProxy {
+class NonGTINNumericIdentifierValidatorProxy extends NumericIdentifierValidatorProxy {
 }
-class SerializableNumericIdentificationKeyValidatorProxy extends NonGTINNumericIdentificationKeyValidatorProxy {
+class SerializableNumericIdentifierValidatorProxy extends NonGTINNumericIdentifierValidatorProxy {
 }
-class NonNumericIdentificationKeyValidatorProxy extends IdentificationKeyValidatorProxy {
-    validate(matrixIdentificationKeys, exclusion) {
-        return this.validateString(this.validator, matrixIdentificationKeys, {
+class NonNumericIdentifierValidatorProxy extends IdentifierValidatorProxy {
+    validate(matrixIdentifiers, exclusion) {
+        return this.validateString(this.validator, matrixIdentifiers, {
             exclusion: exclusion ?? undefined
         });
     }
 }
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
-    __param(0, ProxyParameter(validateIdentificationKeyParameterDescriptor)),
+    __param(0, ProxyParameter(validateIdentifierParameterDescriptor)),
     __param(1, ProxyParameter(exclusionAllNumericParameterDescriptor))
-], NonNumericIdentificationKeyValidatorProxy.prototype, "validate", null);
+], NonNumericIdentifierValidatorProxy.prototype, "validate", null);
 let GTIN13ValidatorProxy = class GTIN13ValidatorProxy extends GTINValidatorProxy {
     constructor(appExtension) {
         super(appExtension, GTIN13_VALIDATOR);
@@ -107,62 +107,62 @@ GTIN8ValidatorProxy = __decorate([
 ], GTIN8ValidatorProxy);
 export { GTIN8ValidatorProxy };
 const zeroSuppressibleGTIN12ParameterDescriptor = {
-    extendsDescriptor: identificationKeyParameterDescriptor,
+    extendsDescriptor: identifierParameterDescriptor,
     name: "zeroSuppressibleGTIN12"
 };
 const zeroSuppressedGTIN12ParameterDescriptor = {
-    extendsDescriptor: identificationKeyParameterDescriptor,
+    extendsDescriptor: identifierParameterDescriptor,
     name: "zeroSuppressedGTIN12"
 };
 const indicatorDigitParameterDescriptor = {
     name: "indicatorDigit",
-    type: Type.String,
+    type: Types.String,
     isMatrix: false,
     isRequired: true
 };
 const convertGTINParameterDescriptor = {
-    extendsDescriptor: identificationKeyParameterDescriptor,
+    extendsDescriptor: identifierParameterDescriptor,
     name: "convertGTIN"
 };
 const normalizeGTINParameterDescriptor = {
-    extendsDescriptor: identificationKeyParameterDescriptor,
+    extendsDescriptor: identifierParameterDescriptor,
     name: "normalizeGTIN"
 };
 const validateGTINParameterDescriptor = {
-    extendsDescriptor: identificationKeyParameterDescriptor,
+    extendsDescriptor: identifierParameterDescriptor,
     name: "validateGTIN"
 };
 const gtinLevelParameterDescriptor = {
     name: "gtinLevel",
-    type: Type.Number,
+    type: Types.Number,
     isMatrix: false,
     isRequired: false
 };
 const validateGTIN14ParameterDescriptor = {
-    extendsDescriptor: identificationKeyParameterDescriptor,
+    extendsDescriptor: identifierParameterDescriptor,
     name: "validateGTIN14"
 };
 const rcnFormatParameterDescriptor = {
     name: "rcnFormat",
-    type: Type.String,
+    type: Types.String,
     isMatrix: false,
     isRequired: true
 };
 const rcnParameterDescriptor = {
     name: "rcn",
-    type: Type.String,
+    type: Types.String,
     isMatrix: true,
     isRequired: true
 };
 const rcnItemReferenceParameterDescriptor = {
     name: "rcnItemReference",
-    type: Type.Number,
+    type: Types.Number,
     isMatrix: false,
     isRequired: true
 };
 const rcnPriceOrWeightParameterDescriptor = {
     name: "rcnPriceOrWeight",
-    type: Type.Number,
+    type: Types.Number,
     isMatrix: true,
     isRequired: true
 };
@@ -199,21 +199,21 @@ let GTINValidatorStaticProxy = class GTINValidatorStaticProxy extends LibProxy {
 };
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
     __param(0, ProxyParameter(zeroSuppressibleGTIN12ParameterDescriptor))
 ], GTINValidatorStaticProxy.prototype, "zeroSuppressGTIN12", null);
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
     __param(0, ProxyParameter(zeroSuppressedGTIN12ParameterDescriptor))
 ], GTINValidatorStaticProxy.prototype, "zeroExpandGTIN12", null);
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
     __param(0, ProxyParameter(indicatorDigitParameterDescriptor)),
@@ -221,14 +221,14 @@ __decorate([
 ], GTINValidatorStaticProxy.prototype, "convertToGTIN14", null);
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
     __param(0, ProxyParameter(normalizeGTINParameterDescriptor))
 ], GTINValidatorStaticProxy.prototype, "normalizeGTIN", null);
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
     __param(0, ProxyParameter(validateGTINParameterDescriptor)),
@@ -236,14 +236,14 @@ __decorate([
 ], GTINValidatorStaticProxy.prototype, "validateGTIN", null);
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
     __param(0, ProxyParameter(validateGTIN14ParameterDescriptor))
 ], GTINValidatorStaticProxy.prototype, "validateGTIN14", null);
 __decorate([
     ProxyMethod({
-        type: Type.Number,
+        type: Types.Number,
         isMatrix: true
     }),
     __param(0, ProxyParameter(rcnFormatParameterDescriptor)),
@@ -255,7 +255,7 @@ GTINValidatorStaticProxy = __decorate([
     })
 ], GTINValidatorStaticProxy);
 export { GTINValidatorStaticProxy };
-let GLNValidatorProxy = class GLNValidatorProxy extends NonGTINNumericIdentificationKeyValidatorProxy {
+let GLNValidatorProxy = class GLNValidatorProxy extends NonGTINNumericIdentifierValidatorProxy {
     constructor(appExtension) {
         super(appExtension, GLN_VALIDATOR);
     }
@@ -267,7 +267,7 @@ GLNValidatorProxy = __decorate([
     })
 ], GLNValidatorProxy);
 export { GLNValidatorProxy };
-let SSCCValidatorProxy = class SSCCValidatorProxy extends NonGTINNumericIdentificationKeyValidatorProxy {
+let SSCCValidatorProxy = class SSCCValidatorProxy extends NonGTINNumericIdentifierValidatorProxy {
     constructor(appExtension) {
         super(appExtension, SSCC_VALIDATOR);
     }
@@ -279,7 +279,7 @@ SSCCValidatorProxy = __decorate([
     })
 ], SSCCValidatorProxy);
 export { SSCCValidatorProxy };
-let GRAIValidatorProxy = class GRAIValidatorProxy extends SerializableNumericIdentificationKeyValidatorProxy {
+let GRAIValidatorProxy = class GRAIValidatorProxy extends SerializableNumericIdentifierValidatorProxy {
     constructor(appExtension) {
         super(appExtension, GRAI_VALIDATOR);
     }
@@ -291,7 +291,7 @@ GRAIValidatorProxy = __decorate([
     })
 ], GRAIValidatorProxy);
 export { GRAIValidatorProxy };
-let GIAIValidatorProxy = class GIAIValidatorProxy extends NonNumericIdentificationKeyValidatorProxy {
+let GIAIValidatorProxy = class GIAIValidatorProxy extends NonNumericIdentifierValidatorProxy {
     constructor(appExtension) {
         super(appExtension, GIAI_VALIDATOR);
     }
@@ -303,7 +303,7 @@ GIAIValidatorProxy = __decorate([
     })
 ], GIAIValidatorProxy);
 export { GIAIValidatorProxy };
-let GSRNValidatorProxy = class GSRNValidatorProxy extends NonGTINNumericIdentificationKeyValidatorProxy {
+let GSRNValidatorProxy = class GSRNValidatorProxy extends NonGTINNumericIdentifierValidatorProxy {
     constructor(appExtension) {
         super(appExtension, GSRN_VALIDATOR);
     }
@@ -315,7 +315,7 @@ GSRNValidatorProxy = __decorate([
     })
 ], GSRNValidatorProxy);
 export { GSRNValidatorProxy };
-let GDTIValidatorProxy = class GDTIValidatorProxy extends SerializableNumericIdentificationKeyValidatorProxy {
+let GDTIValidatorProxy = class GDTIValidatorProxy extends SerializableNumericIdentifierValidatorProxy {
     constructor(appExtension) {
         super(appExtension, GDTI_VALIDATOR);
     }
@@ -327,7 +327,7 @@ GDTIValidatorProxy = __decorate([
     })
 ], GDTIValidatorProxy);
 export { GDTIValidatorProxy };
-let GINCValidatorProxy = class GINCValidatorProxy extends NonNumericIdentificationKeyValidatorProxy {
+let GINCValidatorProxy = class GINCValidatorProxy extends NonNumericIdentifierValidatorProxy {
     constructor(appExtension) {
         super(appExtension, GINC_VALIDATOR);
     }
@@ -339,7 +339,7 @@ GINCValidatorProxy = __decorate([
     })
 ], GINCValidatorProxy);
 export { GINCValidatorProxy };
-let GSINValidatorProxy = class GSINValidatorProxy extends NonGTINNumericIdentificationKeyValidatorProxy {
+let GSINValidatorProxy = class GSINValidatorProxy extends NonGTINNumericIdentifierValidatorProxy {
     constructor(appExtension) {
         super(appExtension, GSIN_VALIDATOR);
     }
@@ -351,7 +351,7 @@ GSINValidatorProxy = __decorate([
     })
 ], GSINValidatorProxy);
 export { GSINValidatorProxy };
-let GCNValidatorProxy = class GCNValidatorProxy extends SerializableNumericIdentificationKeyValidatorProxy {
+let GCNValidatorProxy = class GCNValidatorProxy extends SerializableNumericIdentifierValidatorProxy {
     constructor(appExtension) {
         super(appExtension, GCN_VALIDATOR);
     }
@@ -363,7 +363,7 @@ GCNValidatorProxy = __decorate([
     })
 ], GCNValidatorProxy);
 export { GCNValidatorProxy };
-let CPIDValidatorProxy = class CPIDValidatorProxy extends NonNumericIdentificationKeyValidatorProxy {
+let CPIDValidatorProxy = class CPIDValidatorProxy extends NonNumericIdentifierValidatorProxy {
     constructor(appExtension) {
         super(appExtension, CPID_VALIDATOR);
     }
@@ -375,7 +375,7 @@ CPIDValidatorProxy = __decorate([
     })
 ], CPIDValidatorProxy);
 export { CPIDValidatorProxy };
-let GMNValidatorProxy = class GMNValidatorProxy extends NonNumericIdentificationKeyValidatorProxy {
+let GMNValidatorProxy = class GMNValidatorProxy extends NonNumericIdentifierValidatorProxy {
     constructor(appExtension) {
         super(appExtension, GMN_VALIDATOR);
     }
@@ -389,25 +389,25 @@ GMNValidatorProxy = __decorate([
 export { GMNValidatorProxy };
 const prefixParameterDescriptor = {
     name: "prefix",
-    type: Type.String,
+    type: Types.String,
     isMatrix: false,
     isRequired: true
 };
 const prefixTypeParameterDescriptor = {
     name: "prefixType",
-    type: Type.Number,
+    type: Types.Number,
     isMatrix: false,
     isRequired: false
 };
 const tweakFactorParameterDescriptor = {
     name: "tweakFactor",
-    type: Type.Number,
+    type: Types.Number,
     isMatrix: false,
     isRequired: false
 };
 const prefixDefinitionParameterDescriptor = {
     name: "prefixDefinition",
-    type: Type.Any,
+    type: Types.Any,
     isMatrix: true,
     isRequired: true
 };
@@ -421,13 +421,13 @@ const prefixDefinitionAnyParameterDescriptor = {
 };
 let PrefixManagerProxy = class PrefixManagerProxy extends LibProxy {
     definePrefix(prefix, prefixType, tweakFactor) {
-        // Parameters will be validated by IdentificationKeyCreatorProxy.getCreator().
+        // Parameters will be validated by IdentifierCreatorProxy.getCreator().
         return [[prefix, prefixType, tweakFactor]];
     }
 };
 __decorate([
     ProxyMethod({
-        type: Type.Any,
+        type: Types.Any,
         isMatrix: true
     }),
     __param(0, ProxyParameter(prefixParameterDescriptor)),
@@ -440,7 +440,8 @@ PrefixManagerProxy = __decorate([
     })
 ], PrefixManagerProxy);
 export { PrefixManagerProxy };
-class IdentificationKeyCreatorProxy extends LibProxy {
+class IdentifierCreatorProxy extends LibProxy {
+    static PREFIX_TYPES = [PrefixTypes.GS1CompanyPrefix, PrefixTypes.UPCCompanyPrefix, PrefixTypes.GS18Prefix];
     _getCreator;
     constructor(appExtension, getCreator) {
         super(appExtension);
@@ -453,26 +454,28 @@ class IdentificationKeyCreatorProxy extends LibProxy {
             // Prefix definition is vertical.
             prefixDefinition.map((prefixDefinitionRow) => {
                 if (prefixDefinitionRow.length !== 1) {
-                    throw new RangeError(i18nextAppExtension.t("IdentificationKeyCreatorProxy.prefixDefinitionMustBeOneDimensional"));
+                    throw new RangeError(i18nextAppExtension.t("IdentifierCreatorProxy.prefixDefinitionMustBeOneDimensional"));
                 }
                 return prefixDefinitionRow[0];
             });
         if (reducedPrefixDefinition.length > 3) {
-            throw new RangeError(i18nextAppExtension.t("IdentificationKeyCreatorProxy.prefixDefinitionMustHaveMaximumThreeElements"));
+            throw new RangeError(i18nextAppExtension.t("IdentifierCreatorProxy.prefixDefinitionMustHaveMaximumThreeElements"));
         }
         const prefix = reducedPrefixDefinition[0];
         if (typeof prefix !== "string") {
-            throw new RangeError(i18nextAppExtension.t("IdentificationKeyCreatorProxy.prefixMustBeString"));
+            throw new RangeError(i18nextAppExtension.t("IdentifierCreatorProxy.prefixMustBeString"));
         }
-        const prefixType = reducedPrefixDefinition[1] ?? PrefixType.GS1CompanyPrefix;
-        if (typeof prefixType !== "number") {
-            throw new RangeError(i18nextAppExtension.t("IdentificationKeyCreatorProxy.prefixTypeMustBeNumber"));
+        const prefixTypeIndex = reducedPrefixDefinition[1] ?? 0;
+        if (typeof prefixTypeIndex !== "number" || prefixTypeIndex < 0 || prefixTypeIndex >= IdentifierCreatorProxy.PREFIX_TYPES.length) {
+            throw new RangeError(i18nextAppExtension.t("IdentifierCreatorProxy.prefixTypeMustBeNumber", {
+                maximumPrefixType: IdentifierCreatorProxy.PREFIX_TYPES.length - 1
+            }));
         }
-        const prefixManager = PrefixManager.get(prefixType, prefix);
+        const prefixManager = PrefixManager.get(IdentifierCreatorProxy.PREFIX_TYPES[prefixTypeIndex], prefix);
         const tweakFactor = reducedPrefixDefinition[2];
         if (!isNullish(tweakFactor)) {
             if (typeof tweakFactor !== "number") {
-                throw new RangeError(i18nextAppExtension.t("IdentificationKeyCreatorProxy.tweakFactorMustBeNumber"));
+                throw new RangeError(i18nextAppExtension.t("IdentifierCreatorProxy.tweakFactorMustBeNumber"));
             }
             prefixManager.tweakFactor = tweakFactor;
         }
@@ -484,11 +487,11 @@ class IdentificationKeyCreatorProxy extends LibProxy {
 }
 const sparseParameterDescriptor = {
     name: "sparse",
-    type: Type.Boolean,
+    type: Types.Boolean,
     isMatrix: false,
     isRequired: false
 };
-class NumericIdentificationKeyCreatorProxy extends IdentificationKeyCreatorProxy {
+class NumericIdentifierCreatorProxy extends IdentifierCreatorProxy {
     create(prefixDefinition, matrixValues, sparse) {
         const creator = this.getCreator(prefixDefinition);
         const sparseOrUndefined = sparse ?? undefined;
@@ -506,84 +509,84 @@ class NumericIdentificationKeyCreatorProxy extends IdentificationKeyCreatorProxy
 }
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
     __param(0, ProxyParameter(prefixDefinitionGS1UPCParameterDescriptor)),
     __param(1, ProxyParameter(valueParameterDescriptor)),
     __param(2, ProxyParameter(sparseParameterDescriptor))
-], NumericIdentificationKeyCreatorProxy.prototype, "create", null);
+], NumericIdentifierCreatorProxy.prototype, "create", null);
 __decorate([
     ProxyMethod({
         infixBefore: "Sequence",
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
     __param(0, ProxyParameter(prefixDefinitionGS1UPCParameterDescriptor)),
     __param(1, ProxyParameter(startValueParameterDescriptor)),
     __param(2, ProxyParameter(countParameterDescriptor)),
     __param(3, ProxyParameter(sparseParameterDescriptor))
-], NumericIdentificationKeyCreatorProxy.prototype, "createSequence", null);
+], NumericIdentifierCreatorProxy.prototype, "createSequence", null);
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
     __param(0, ProxyParameter(prefixDefinitionGS1UPCParameterDescriptor))
-], NumericIdentificationKeyCreatorProxy.prototype, "createAll", null);
-class NonGTINNumericIdentificationKeyCreatorProxy extends NumericIdentificationKeyCreatorProxy {
+], NumericIdentifierCreatorProxy.prototype, "createAll", null);
+class NonGTINNumericIdentifierCreatorProxy extends NumericIdentifierCreatorProxy {
 }
 const singleValueParameterDescriptor = {
     extendsDescriptor: valueParameterDescriptor,
     isMatrix: false
 };
-const baseIdentificationKeyParameterDescriptor = {
-    extendsDescriptor: identificationKeyParameterDescriptor,
-    name: "baseIdentificationKey",
+const baseIdentifierParameterDescriptor = {
+    extendsDescriptor: identifierParameterDescriptor,
+    name: "baseIdentifier",
     isMatrix: false
 };
 const serialComponentParameterDescriptor = {
     name: "serialComponent",
-    type: Type.String,
+    type: Types.String,
     isMatrix: true,
     isRequired: true
 };
-class SerializableNumericIdentificationKeyCreatorProxy extends NonGTINNumericIdentificationKeyCreatorProxy {
+class SerializableNumericIdentifierCreatorProxy extends NonGTINNumericIdentifierCreatorProxy {
     createSerialized(prefixDefinition, value, matrixSerialComponents, sparse) {
         const creator = this.getCreator(prefixDefinition);
         const sparseOrUndefined = sparse ?? undefined;
         return this.mapMatrix(matrixSerialComponents, serialComponent => creator.createSerialized(value, serialComponent, sparseOrUndefined));
     }
-    concatenate(baseIdentificationKey, matrixSerialComponents) {
-        const creator = this.getCreator([[baseIdentificationKey.substring(0, !baseIdentificationKey.startsWith("0") ? PrefixManager.GS1_COMPANY_PREFIX_MINIMUM_LENGTH : PrefixManager.UPC_COMPANY_PREFIX_MINIMUM_LENGTH + 1), PrefixType.GS1CompanyPrefix]]);
-        return this.mapMatrix(matrixSerialComponents, serialComponent => creator.concatenate(baseIdentificationKey, serialComponent));
+    concatenate(baseIdentifier, matrixSerialComponents) {
+        const creator = this.getCreator([[baseIdentifier.substring(0, !baseIdentifier.startsWith("0") ? PrefixValidator.GS1_COMPANY_PREFIX_MINIMUM_LENGTH : PrefixValidator.UPC_COMPANY_PREFIX_MINIMUM_LENGTH + 1), PrefixTypes.GS1CompanyPrefix]]);
+        return this.mapMatrix(matrixSerialComponents, serialComponent => creator.concatenate(baseIdentifier, serialComponent));
     }
 }
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
     __param(0, ProxyParameter(prefixDefinitionGS1UPCParameterDescriptor)),
     __param(1, ProxyParameter(singleValueParameterDescriptor)),
     __param(2, ProxyParameter(serialComponentParameterDescriptor)),
     __param(3, ProxyParameter(sparseParameterDescriptor))
-], SerializableNumericIdentificationKeyCreatorProxy.prototype, "createSerialized", null);
+], SerializableNumericIdentifierCreatorProxy.prototype, "createSerialized", null);
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
-    __param(0, ProxyParameter(baseIdentificationKeyParameterDescriptor)),
+    __param(0, ProxyParameter(baseIdentifierParameterDescriptor)),
     __param(1, ProxyParameter(serialComponentParameterDescriptor))
-], SerializableNumericIdentificationKeyCreatorProxy.prototype, "concatenate", null);
+], SerializableNumericIdentifierCreatorProxy.prototype, "concatenate", null);
 const referenceParameterDescriptor = {
     name: "reference",
-    type: Type.String,
+    type: Types.String,
     isMatrix: true,
     isRequired: true
 };
-class NonNumericIdentificationKeyCreatorProxy extends IdentificationKeyCreatorProxy {
+class NonNumericIdentifierCreatorProxy extends IdentifierCreatorProxy {
     create(prefixDefinition, matrixReferences) {
         const creator = this.getCreator(prefixDefinition);
         return this.mapMatrix(matrixReferences, reference => creator.create(reference));
@@ -591,13 +594,13 @@ class NonNumericIdentificationKeyCreatorProxy extends IdentificationKeyCreatorPr
 }
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true
     }),
     __param(0, ProxyParameter(prefixDefinitionGS1UPCParameterDescriptor)),
     __param(1, ProxyParameter(referenceParameterDescriptor))
-], NonNumericIdentificationKeyCreatorProxy.prototype, "create", null);
-let GTINCreatorProxy = class GTINCreatorProxy extends NumericIdentificationKeyCreatorProxy {
+], NonNumericIdentifierCreatorProxy.prototype, "create", null);
+let GTINCreatorProxy = class GTINCreatorProxy extends NumericIdentifierCreatorProxy {
     constructor(appExtension) {
         super(appExtension, prefixManager => prefixManager.gtinCreator);
     }
@@ -612,7 +615,7 @@ let GTINCreatorProxy = class GTINCreatorProxy extends NumericIdentificationKeyCr
 };
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true,
         ignoreInfix: true
     }),
@@ -623,7 +626,7 @@ __decorate([
 ], GTINCreatorProxy.prototype, "createGTIN14", null);
 __decorate([
     ProxyMethod({
-        type: Type.String,
+        type: Types.String,
         isMatrix: true,
         ignoreInfix: true
     }),
@@ -644,7 +647,7 @@ GTINCreatorProxy = __decorate([
     })
 ], GTINCreatorProxy);
 export { GTINCreatorProxy };
-let GLNCreatorProxy = class GLNCreatorProxy extends NonGTINNumericIdentificationKeyCreatorProxy {
+let GLNCreatorProxy = class GLNCreatorProxy extends NonGTINNumericIdentifierCreatorProxy {
     constructor(appExtension) {
         super(appExtension, prefixManager => prefixManager.glnCreator);
     }
@@ -656,7 +659,7 @@ GLNCreatorProxy = __decorate([
     })
 ], GLNCreatorProxy);
 export { GLNCreatorProxy };
-let SSCCCreatorProxy = class SSCCCreatorProxy extends NonGTINNumericIdentificationKeyCreatorProxy {
+let SSCCCreatorProxy = class SSCCCreatorProxy extends NonGTINNumericIdentifierCreatorProxy {
     constructor(appExtension) {
         super(appExtension, prefixManager => prefixManager.ssccCreator);
     }
@@ -668,7 +671,7 @@ SSCCCreatorProxy = __decorate([
     })
 ], SSCCCreatorProxy);
 export { SSCCCreatorProxy };
-let GRAICreatorProxy = class GRAICreatorProxy extends SerializableNumericIdentificationKeyCreatorProxy {
+let GRAICreatorProxy = class GRAICreatorProxy extends SerializableNumericIdentifierCreatorProxy {
     constructor(appExtension) {
         super(appExtension, prefixManager => prefixManager.graiCreator);
     }
@@ -680,7 +683,7 @@ GRAICreatorProxy = __decorate([
     })
 ], GRAICreatorProxy);
 export { GRAICreatorProxy };
-let GIAICreatorProxy = class GIAICreatorProxy extends NonNumericIdentificationKeyCreatorProxy {
+let GIAICreatorProxy = class GIAICreatorProxy extends NonNumericIdentifierCreatorProxy {
     constructor(appExtension) {
         super(appExtension, prefixManager => prefixManager.giaiCreator);
     }
@@ -692,7 +695,7 @@ GIAICreatorProxy = __decorate([
     })
 ], GIAICreatorProxy);
 export { GIAICreatorProxy };
-let GSRNCreatorProxy = class GSRNCreatorProxy extends NonGTINNumericIdentificationKeyCreatorProxy {
+let GSRNCreatorProxy = class GSRNCreatorProxy extends NonGTINNumericIdentifierCreatorProxy {
     constructor(appExtension) {
         super(appExtension, prefixManager => prefixManager.gsrnCreator);
     }
@@ -704,7 +707,7 @@ GSRNCreatorProxy = __decorate([
     })
 ], GSRNCreatorProxy);
 export { GSRNCreatorProxy };
-let GDTICreatorProxy = class GDTICreatorProxy extends SerializableNumericIdentificationKeyCreatorProxy {
+let GDTICreatorProxy = class GDTICreatorProxy extends SerializableNumericIdentifierCreatorProxy {
     constructor(appExtension) {
         super(appExtension, prefixManager => prefixManager.gdtiCreator);
     }
@@ -716,7 +719,7 @@ GDTICreatorProxy = __decorate([
     })
 ], GDTICreatorProxy);
 export { GDTICreatorProxy };
-let GINCCreatorProxy = class GINCCreatorProxy extends NonNumericIdentificationKeyCreatorProxy {
+let GINCCreatorProxy = class GINCCreatorProxy extends NonNumericIdentifierCreatorProxy {
     constructor(appExtension) {
         super(appExtension, prefixManager => prefixManager.gincCreator);
     }
@@ -728,7 +731,7 @@ GINCCreatorProxy = __decorate([
     })
 ], GINCCreatorProxy);
 export { GINCCreatorProxy };
-let GSINCreatorProxy = class GSINCreatorProxy extends NonGTINNumericIdentificationKeyCreatorProxy {
+let GSINCreatorProxy = class GSINCreatorProxy extends NonGTINNumericIdentifierCreatorProxy {
     constructor(appExtension) {
         super(appExtension, prefixManager => prefixManager.gsinCreator);
     }
@@ -740,7 +743,7 @@ GSINCreatorProxy = __decorate([
     })
 ], GSINCreatorProxy);
 export { GSINCreatorProxy };
-let GCNCreatorProxy = class GCNCreatorProxy extends SerializableNumericIdentificationKeyCreatorProxy {
+let GCNCreatorProxy = class GCNCreatorProxy extends SerializableNumericIdentifierCreatorProxy {
     constructor(appExtension) {
         super(appExtension, prefixManager => prefixManager.gcnCreator);
     }
@@ -752,7 +755,7 @@ GCNCreatorProxy = __decorate([
     })
 ], GCNCreatorProxy);
 export { GCNCreatorProxy };
-let CPIDCreatorProxy = class CPIDCreatorProxy extends NonNumericIdentificationKeyCreatorProxy {
+let CPIDCreatorProxy = class CPIDCreatorProxy extends NonNumericIdentifierCreatorProxy {
     constructor(appExtension) {
         super(appExtension, prefixManager => prefixManager.cpidCreator);
     }
@@ -764,7 +767,7 @@ CPIDCreatorProxy = __decorate([
     })
 ], CPIDCreatorProxy);
 export { CPIDCreatorProxy };
-let GMNCreatorProxy = class GMNCreatorProxy extends NonNumericIdentificationKeyCreatorProxy {
+let GMNCreatorProxy = class GMNCreatorProxy extends NonNumericIdentifierCreatorProxy {
     constructor(appExtension) {
         super(appExtension, prefixManager => prefixManager.gmnCreator);
     }
@@ -776,4 +779,4 @@ GMNCreatorProxy = __decorate([
     })
 ], GMNCreatorProxy);
 export { GMNCreatorProxy };
-//# sourceMappingURL=idkey-proxy.js.map
+//# sourceMappingURL=identifier-proxy.js.map