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

package/test/gtin-validator.test.ts

@@ -1,122 +1,214 @@
 import { describe, expect, test } from "vitest";
-import {
-    type GTINBaseLength,
-    GTINLengths,
-    GTINLevels,
-    GTINValidator,
-    IdentifierTypes,
-    LeaderTypes,
-    type PrefixType,
-    PrefixTypes
-} from "../src/index.js";
-import { validateNumericIdentifierValidator } from "./numeric-identifier-validator.js";
-
-export function validateGTINValidator(validator: GTINValidator, isCreator: boolean, gtinBaseLength: GTINBaseLength): void {
-    let prefixType: PrefixType;
-
-    switch (gtinBaseLength) {
-        case GTINLengths.GTIN13:
-            prefixType = PrefixTypes.GS1CompanyPrefix;
-            break;
-
-        case GTINLengths.GTIN12:
-            prefixType = PrefixTypes.UPCCompanyPrefix;
-            break;
-
-        case GTINLengths.GTIN8:
-            prefixType = PrefixTypes.GS18Prefix;
-            break;
-    }
+import { type GTINLevel, GTINLevels, GTINValidator } from "../src/index.js";
 
-    validateNumericIdentifierValidator(validator, IdentifierTypes.GTIN, prefixType, gtinBaseLength, LeaderTypes.IndicatorDigit);
+interface GTINValidation {
+    gtin: string;
+    
+    errorMessages: Record<GTINLevel, string | null>;
 }
 
+const GTIN_VALIDATIONS: GTINValidation[] = [
+    // GTIN-13.
+    {
+        gtin: "9521873000122",
+        errorMessages: {
+            [GTINLevels.Any]: null,
+            [GTINLevels.RetailConsumer]: null,
+            [GTINLevels.OtherThanRetailConsumer]: null
+        }
+    },
+
+    // GTIN-13 as GTIN-14.
+    {
+        gtin: "09521873000122",
+        errorMessages: {
+            [GTINLevels.Any]: null,
+            [GTINLevels.RetailConsumer]: "GTIN not supported at retail consumer trade item level",
+            [GTINLevels.OtherThanRetailConsumer]: null
+        }
+    },
+
+    // GTIN-12.
+    {
+        gtin: "614141773985",
+        errorMessages: {
+            [GTINLevels.Any]: null,
+            [GTINLevels.RetailConsumer]: null,
+            [GTINLevels.OtherThanRetailConsumer]: null
+        }
+    },
+
+    // GTIN-12 as GTIN-13.
+    {
+        gtin: "0614141773985",
+        errorMessages: {
+            [GTINLevels.Any]: null,
+            [GTINLevels.RetailConsumer]: "GTIN not supported at retail consumer trade item level",
+            [GTINLevels.OtherThanRetailConsumer]: null
+        }
+    },
+
+    // GTIN-12 as GTIN-14.
+    {
+        gtin: "00614141773985",
+        errorMessages: {
+            [GTINLevels.Any]: null,
+            [GTINLevels.RetailConsumer]: "GTIN not supported at retail consumer trade item level",
+            [GTINLevels.OtherThanRetailConsumer]: null
+        }
+    },
+
+    // Zero-suppressed GTIN-12.
+    {
+        gtin: "09867539",
+        errorMessages: {
+            [GTINLevels.Any]: null,
+            [GTINLevels.RetailConsumer]: null,
+            [GTINLevels.OtherThanRetailConsumer]: "GTIN not supported at other than retail consumer trade item level"
+        }
+    },
+
+    // GTIN-8.
+    {
+        gtin: "95216843",
+        errorMessages: {
+            [GTINLevels.Any]: null,
+            [GTINLevels.RetailConsumer]: null,
+            [GTINLevels.OtherThanRetailConsumer]: "GTIN not supported at other than retail consumer trade item level"
+        }
+    },
+
+    // GTIN-8 as GTIN-12.
+    {
+        gtin: "000095216843",
+        errorMessages: {
+            [GTINLevels.Any]: "U.P.C. Company Prefix can't start with \"0000\"",
+            [GTINLevels.RetailConsumer]: "U.P.C. Company Prefix can't start with \"0000\"",
+            [GTINLevels.OtherThanRetailConsumer]: "U.P.C. Company Prefix can't start with \"0000\""
+        }
+    },
+
+    // GTIN-8 as GTIN-13.
+    {
+        gtin: "0000095216843",
+        errorMessages: {
+            [GTINLevels.Any]: null,
+            [GTINLevels.RetailConsumer]: "GTIN not supported at retail consumer trade item level",
+            [GTINLevels.OtherThanRetailConsumer]: "GTIN not supported at other than retail consumer trade item level"
+        }
+    },
+
+    // GTIN-8 as GTIN-14.
+    {
+        gtin: "00000095216843",
+        errorMessages: {
+            [GTINLevels.Any]: null,
+            [GTINLevels.RetailConsumer]: "GTIN not supported at retail consumer trade item level",
+            [GTINLevels.OtherThanRetailConsumer]: "GTIN not supported at other than retail consumer trade item level"
+        }
+    },
+
+    // GTIN-14 from GTIN-13.
+    {
+        gtin: "19521873000129",
+        errorMessages: {
+            [GTINLevels.Any]: null,
+            [GTINLevels.RetailConsumer]: "GTIN not supported at retail consumer trade item level",
+            [GTINLevels.OtherThanRetailConsumer]: null
+        }
+    },
+
+    // GTIN-14 from GTIN-12.
+    {
+        gtin: "20614141773989",
+        errorMessages: {
+            [GTINLevels.Any]: null,
+            [GTINLevels.RetailConsumer]: "GTIN not supported at retail consumer trade item level",
+            [GTINLevels.OtherThanRetailConsumer]: null
+        }
+    },
+
+    // GTIN-14 from GTIN-8.
+    {
+        gtin: "30000095216844",
+        errorMessages: {
+            [GTINLevels.Any]: null,
+            [GTINLevels.RetailConsumer]: "GTIN not supported at retail consumer trade item level",
+            [GTINLevels.OtherThanRetailConsumer]: null
+        }
+    },
+
+    // Invalid character in GTIN-13.
+    {
+        gtin: "9521873000l22",
+        errorMessages: {
+            [GTINLevels.Any]: "Invalid character 'l' at position 11",
+            [GTINLevels.RetailConsumer]: "Invalid character 'l' at position 11",
+            [GTINLevels.OtherThanRetailConsumer]: "Invalid character 'l' at position 11"
+        }
+    },
+
+    // Invalid character in GTIN-14.
+    {
+        gtin: "30000O95216844",
+        errorMessages: {
+            [GTINLevels.Any]: "Invalid character 'O' at position 6",
+            [GTINLevels.RetailConsumer]: "Invalid character 'O' at position 6",
+            [GTINLevels.OtherThanRetailConsumer]: "Invalid character 'O' at position 6"
+        }
+    },
+
+    // Invalid length.
+    {
+        gtin: "95217800031",
+        errorMessages: {
+            [GTINLevels.Any]: "GTIN must be 13, 12, 8, or 14 digits long",
+            [GTINLevels.RetailConsumer]: "GTIN must be 13, 12, 8, or 14 digits long",
+            [GTINLevels.OtherThanRetailConsumer]: "GTIN must be 13, 12, 8, or 14 digits long"
+        }
+    },
+
+    // Invalid check digit.
+    {
+        gtin: "614141773991",
+        errorMessages: {
+            [GTINLevels.Any]: "Invalid check digit",
+            [GTINLevels.RetailConsumer]: "Invalid check digit",
+            [GTINLevels.OtherThanRetailConsumer]: "Invalid check digit"
+        }
+    },
+
+    // Invalid zero-suppressed GTIN-12.
+    {
+        gtin: "09800037",
+        errorMessages: {
+            [GTINLevels.Any]: "Invalid zero-suppressed GTIN-12",
+            [GTINLevels.RetailConsumer]: "Invalid zero-suppressed GTIN-12",
+            [GTINLevels.OtherThanRetailConsumer]: "Invalid zero-suppressed GTIN-12"
+        }
+    }
+];
+
 describe("GTIN validation and normalization", () => {
     test("Validation", () => {
-        expect(() => {
-            GTINValidator.validateAny("9521873000122", GTINLevels.Any);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("19521873000129", GTINLevels.Any);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("9521873000160", GTINLevels.Any);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("95216843", GTINLevels.Any);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("95217800031", GTINLevels.Any);
-        }).toThrow("GTIN must be 13, 12, 8, or 14 digits long");
-        expect(() => {
-            GTINValidator.validateAny("614141773985", GTINLevels.Any);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("614141773991", GTINLevels.Any);
-        }).toThrow("Invalid check digit");
-        expect(() => {
-            GTINValidator.validateAny("09867539", GTINLevels.Any);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("09800037", GTINLevels.Any);
-        }).toThrow("Invalid zero-suppressed GTIN-12");
-        expect(() => {
-            GTINValidator.validateAny("9521873000122", GTINLevels.RetailConsumer);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("19521873000129", GTINLevels.RetailConsumer);
-        }).toThrow("GTIN not supported at retail consumer trade item level");
-        expect(() => {
-            GTINValidator.validateAny("9521873000160", GTINLevels.RetailConsumer);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("95216843", GTINLevels.RetailConsumer);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("95217800031", GTINLevels.RetailConsumer);
-        }).toThrow("GTIN must be 13, 12, 8, or 14 digits long");
-        expect(() => {
-            GTINValidator.validateAny("614141773985", GTINLevels.RetailConsumer);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("0614141773985", GTINLevels.RetailConsumer);
-        }).toThrow("GTIN-13 at retail consumer trade item level can't start with zero");
-        expect(() => {
-            GTINValidator.validateAny("614141773991", GTINLevels.RetailConsumer);
-        }).toThrow("Invalid check digit");
-        expect(() => {
-            GTINValidator.validateAny("09867539", GTINLevels.RetailConsumer);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("09800037", GTINLevels.RetailConsumer);
-        }).toThrow("Invalid zero-suppressed GTIN-12");
-        expect(() => {
-            GTINValidator.validateAny("9521873000122", GTINLevels.OtherThanRetailConsumer);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("19521873000129", GTINLevels.OtherThanRetailConsumer);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("9521873000160", GTINLevels.OtherThanRetailConsumer);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("95216843", GTINLevels.OtherThanRetailConsumer);
-        }).toThrow("GTIN not supported at other than retail consumer trade item level");
-        expect(() => {
-            GTINValidator.validateAny("95217800031", GTINLevels.OtherThanRetailConsumer);
-        }).toThrow("GTIN must be 13, 12, 8, or 14 digits long");
-        expect(() => {
-            GTINValidator.validateAny("614141773985", GTINLevels.OtherThanRetailConsumer);
-        }).not.toThrow(RangeError);
-        expect(() => {
-            GTINValidator.validateAny("614141773991", GTINLevels.OtherThanRetailConsumer);
-        }).toThrow("Invalid check digit");
-        expect(() => {
-            GTINValidator.validateAny("09867539", GTINLevels.OtherThanRetailConsumer);
-        }).toThrow("GTIN not supported at other than retail consumer trade item level");
-        expect(() => {
-            GTINValidator.validateAny("09800037", GTINLevels.OtherThanRetailConsumer);
-        }).toThrow("Invalid zero-suppressed GTIN-12");
+        for (const gtinValidation of GTIN_VALIDATIONS) {
+            const gtin = gtinValidation.gtin;
+
+            for (const gtinLevel of Object.values(GTINLevels)) {
+                const expectMessage = `${gtin}:${gtinLevel}`;
+                const errorMessage = gtinValidation.errorMessages[gtinLevel];
+
+                if (errorMessage === null) {
+                    expect(() => {
+                        GTINValidator.validateAny(gtin, gtinLevel);
+                    }, expectMessage).not.toThrow(RangeError);
+                } else {
+                    expect(() => {
+                        GTINValidator.validateAny(gtin, gtinLevel);
+                    }, expectMessage).toThrow(errorMessage);
+                }
+            }
+        }
     });
 
     test("Normalization", () => {

package/test/gtin-validator.ts

@@ -0,0 +1,30 @@
+import {
+    type GTINBaseLength,
+    GTINLengths,
+    type GTINValidator,
+    IdentifierTypes,
+    LeaderTypes,
+    type PrefixType,
+    PrefixTypes
+} from "../src/index.js";
+import { validateNumericIdentifierValidator } from "./numeric-identifier-validator.js";
+
+export function validateGTINValidator(validator: GTINValidator, isCreator: boolean, gtinBaseLength: GTINBaseLength): void {
+    let prefixType: PrefixType;
+
+    switch (gtinBaseLength) {
+        case GTINLengths.GTIN13:
+            prefixType = PrefixTypes.GS1CompanyPrefix;
+            break;
+
+        case GTINLengths.GTIN12:
+            prefixType = PrefixTypes.UPCCompanyPrefix;
+            break;
+
+        case GTINLengths.GTIN8:
+            prefixType = PrefixTypes.GS18Prefix;
+            break;
+    }
+
+    validateNumericIdentifierValidator(validator, IdentifierTypes.GTIN, prefixType, gtinBaseLength, LeaderTypes.IndicatorDigit);
+}

package/test/identifier-creator.ts

@@ -8,9 +8,9 @@ import {
     type PrefixManager,
     PrefixTypes
 } from "../src/index.js";
-import { validateGTINValidator } from "./gtin-validator.test.js";
-import { validateNonGTINNumericIdentifierValidator } from "./non-gtin-numeric-identifier-validator.js";
+import { validateGTINValidator } from "./gtin-validator.js";
 import { validateNonNumericIdentifierValidator } from "./non-numeric-identifier-validator.js";
+import { validateNonSerializableNumericIdentifierValidator } from "./non-serializable-numeric-identifier-validator.js";
 import { validateSerializableNumericIdentifierValidator } from "./serializable-numeric-identifier-validator.js";
 
 export function validateIdentifierCreators(prefixManager: PrefixManager): void {
@@ -52,14 +52,14 @@ export function validateIdentifierCreators(prefixManager: PrefixManager): void {
         expect(prefixManager.cpidCreator).toBe(prefixManager.cpidCreator);
         expect(prefixManager.gmnCreator).toBe(prefixManager.gmnCreator);
 
-        validateNonGTINNumericIdentifierValidator(prefixManager.glnCreator, true, IdentifierTypes.GLN, 13, LeaderTypes.None);
-        validateNonGTINNumericIdentifierValidator(prefixManager.ssccCreator, true, IdentifierTypes.SSCC, 18, LeaderTypes.ExtensionDigit);
+        validateNonSerializableNumericIdentifierValidator(prefixManager.glnCreator, true, IdentifierTypes.GLN, 13, LeaderTypes.None);
+        validateNonSerializableNumericIdentifierValidator(prefixManager.ssccCreator, true, IdentifierTypes.SSCC, 18, LeaderTypes.ExtensionDigit);
         validateSerializableNumericIdentifierValidator(prefixManager.graiCreator, true, IdentifierTypes.GRAI, 13, LeaderTypes.None, 16, ContentCharacterSets.AI82);
         validateNonNumericIdentifierValidator(prefixManager.giaiCreator, true, IdentifierTypes.GIAI, 30, ContentCharacterSets.AI82, false);
-        validateNonGTINNumericIdentifierValidator(prefixManager.gsrnCreator, true, IdentifierTypes.GSRN, 18, LeaderTypes.None);
+        validateNonSerializableNumericIdentifierValidator(prefixManager.gsrnCreator, true, IdentifierTypes.GSRN, 18, LeaderTypes.None);
         validateSerializableNumericIdentifierValidator(prefixManager.gdtiCreator, true, IdentifierTypes.GDTI, 13, LeaderTypes.None, 17, ContentCharacterSets.AI82);
         validateNonNumericIdentifierValidator(prefixManager.gincCreator, true, IdentifierTypes.GINC, 30, ContentCharacterSets.AI82, false);
-        validateNonGTINNumericIdentifierValidator(prefixManager.gsinCreator, true, IdentifierTypes.GSIN, 17, LeaderTypes.None);
+        validateNonSerializableNumericIdentifierValidator(prefixManager.gsinCreator, true, IdentifierTypes.GSIN, 17, LeaderTypes.None);
         validateSerializableNumericIdentifierValidator(prefixManager.gcnCreator, true, IdentifierTypes.GCN, 13, LeaderTypes.None, 12, ContentCharacterSets.Numeric);
         validateNonNumericIdentifierValidator(prefixManager.cpidCreator, true, IdentifierTypes.CPID, 30, ContentCharacterSets.AI39, false);
         validateNonNumericIdentifierValidator(prefixManager.gmnCreator, true, IdentifierTypes.GMN, 25, ContentCharacterSets.AI82, true);

package/test/non-numeric-identifier-creator.ts

@@ -68,14 +68,6 @@ export function testNonNumericIdentifierCreator(creator: NonNumericIdentifierCre
             expect(index).toBe(referenceCount);
         });
 
-        test("Position offset", () => {
-            expect(() => {
-                creator.validate(creator.create("ABC123"), {
-                    positionOffset: 4
-                });
-            }).not.toThrow(RangeError);
-        });
-
         test("Not all numeric", () => {
             expect(() => {
                 creator.validate(creator.create("01234"), {

package/test/non-serializable-numeric-identifier-creator.ts

@@ -1,64 +1,14 @@
 import { expect, test } from "vitest";
 import {
-    ContentCharacterSets,
-    isSerializableNumericIdentifierCreator,
-    type SerializableNumericIdentifierCreator
+    isNonSerializableNumericIdentifierCreator,
+    type NonSerializableNumericIdentifierCreator
 } from "../src/index.js";
 import { testNonGTINNumericIdentifierCreator } from "./non-gtin-numeric-identifier-creator.js";
 
-export function testSerializableNumericIdentifierCreator(creator: SerializableNumericIdentifierCreator): void {
+export function testNonSerializableNumericIdentifierCreator(creator: NonSerializableNumericIdentifierCreator): void {
     testNonGTINNumericIdentifierCreator(creator, () => {
         test("Mapping", () => {
-            expect(isSerializableNumericIdentifierCreator(creator)).toBe(true);
-        });
-    }, () => {
-        test("Serialization", () => {
-            const identifier = creator.create(0, true);
-            const serial = "12345678";
-            const serializedIdentifier = identifier + serial;
-            const serials = [serial, "23456789", "34567890", "456789012"];
-            const serializedIdentifiers = serials.map(serial => identifier + serial);
-
-            expect(creator.createSerialized(0, serial, true)).toBe(serializedIdentifier);
-            expect(creator.concatenate(identifier, serial)).toBe(serializedIdentifier);
-            expect(Array.from(creator.createSerialized(0, serials, true))).toStrictEqual(serializedIdentifiers);
-            expect(Array.from(creator.concatenate(identifier, serials))).toStrictEqual(serializedIdentifiers);
-
-            const fullLengthSerial = "0".repeat(creator.serialComponentLength);
-            const fullLengthPlusOneSerial = fullLengthSerial + "0";
-            const fullLengthPlusOneSerialErrorMessage = `Length ${creator.serialComponentLength + 1} of serial component must be less than or equal to ${creator.serialComponentLength}`;
-
-            expect(() => creator.createSerialized(0, fullLengthSerial, true)).not.toThrow(RangeError);
-            expect(() => creator.concatenate(identifier, fullLengthSerial)).not.toThrow(RangeError);
-            expect(() => Array.from(creator.createSerialized(0, [...serials, fullLengthSerial], true))).not.toThrow(RangeError);
-            expect(() => Array.from(creator.concatenate(identifier, [...serials, fullLengthSerial]))).not.toThrow(RangeError);
-            expect(() => creator.createSerialized(0, fullLengthPlusOneSerial, true)).toThrow(fullLengthPlusOneSerialErrorMessage);
-            expect(() => creator.concatenate(identifier, fullLengthPlusOneSerial)).toThrow(fullLengthPlusOneSerialErrorMessage);
-            expect(() => Array.from(creator.createSerialized(0, [...serials, fullLengthPlusOneSerial], true))).toThrow(fullLengthPlusOneSerialErrorMessage);
-            expect(() => Array.from(creator.concatenate(identifier, [...serials, fullLengthPlusOneSerial]))).toThrow(fullLengthPlusOneSerialErrorMessage);
-
-            let invalidSerial: string;
-
-            switch (creator.serialComponentCharacterSet) {
-                case ContentCharacterSets.Numeric:
-                    invalidSerial = "1234A5678";
-                    break;
-
-                case ContentCharacterSets.AI82:
-                    invalidSerial = "ABCD~1234";
-                    break;
-
-                case ContentCharacterSets.AI39:
-                    invalidSerial = "ABCD%1234";
-                    break;
-            }
-
-            const invalidSerialErrorMessage = `Invalid character '${invalidSerial.charAt(4)}' at position 5 of serial component`;
-
-            expect(() => creator.createSerialized(0, invalidSerial, true)).toThrow(invalidSerialErrorMessage);
-            expect(() => creator.concatenate(identifier, invalidSerial)).toThrow(invalidSerialErrorMessage);
-            expect(() => Array.from(creator.createSerialized(0, [...serials, invalidSerial], true))).toThrow(invalidSerialErrorMessage);
-            expect(() => Array.from(creator.concatenate(identifier, [...serials, invalidSerial]))).toThrow(invalidSerialErrorMessage);
+            expect(isNonSerializableNumericIdentifierCreator(creator)).toBe(true);
         });
     });
 }

package/test/numeric-identifier-creator.ts

@@ -62,8 +62,8 @@ export function testNumericIdentifierCreator<TNumericIdentifierType extends Nume
             expect(index).toBe(referenceCount);
             expect(sequenceIterator.next().value).toBeUndefined();
 
-            const randomValues = new Array<number>();
-            const identifiers = new Array<string>();
+            const randomValues: number[] = [];
+            const identifiers: string[] = [];
 
             for (let i = 0; i < 1000; i++) {
                 const randomValue = Math.floor(Math.random() * creator.capacity);
@@ -99,8 +99,8 @@ export function testNumericIdentifierCreator<TNumericIdentifierType extends Nume
             expect(sequential).toBe(false);
             expect(index).toBe(sparseReferenceCount);
 
-            const randomValues = new Array<number>();
-            const identifiers = new Array<string>();
+            const randomValues: number[] = [];
+            const identifiers: string[] = [];
 
             for (let i = 0; i < 1000; i++) {
                 const randomValue = Math.floor(Math.random() * creator.capacity);

package/test/prefix-manager.test.ts

@@ -15,7 +15,7 @@ describe("Prefix manager", () => {
 
         const gtin14 = prefixManager.gtinCreator.createGTIN14("5", 0);
 
-        expect(gtin14.startsWith("5" + prefixManager.gs1CompanyPrefix)).toBe(true);
+        expect(gtin14.startsWith(`5${prefixManager.gs1CompanyPrefix}`)).toBe(true);
         expect(gtin14.length).toBe(14);
     }
 
@@ -64,7 +64,7 @@ describe("Prefix manager", () => {
 
         expect(prefixManager.prefixType).toBe(PrefixTypes.UPCCompanyPrefix);
         expect(prefixManager.prefix).toBe("614141");
-        expect(prefixManager.gs1CompanyPrefix).toBe("0" + prefixManager.prefix);
+        expect(prefixManager.gs1CompanyPrefix).toBe(`0${prefixManager.prefix}`);
         expect(prefixManager.upcCompanyPrefix).toBe(prefixManager.prefix);
         expect(prefixManager.gs18Prefix).toBeUndefined();
 
@@ -79,7 +79,7 @@ describe("Prefix manager", () => {
 
         expect(prefixManager.prefixType).toBe(PrefixTypes.GS18Prefix);
         expect(prefixManager.prefix).toBe("952");
-        expect(prefixManager.gs1CompanyPrefix).toBe("00000" + prefixManager.prefix);
+        expect(prefixManager.gs1CompanyPrefix).toBe(`00000${prefixManager.prefix}`);
         expect(prefixManager.upcCompanyPrefix).toBeUndefined();
         expect(prefixManager.gs18Prefix).toBe(prefixManager.prefix);
 
@@ -96,8 +96,8 @@ describe("Prefix manager", () => {
 
         expect(() => PrefixManager.get(PrefixTypes.GS1CompanyPrefix, "952123A56789")).toThrow("Invalid character 'A' at position 7 of GS1 Company Prefix");
 
-        expect(() => PrefixManager.get(PrefixTypes.UPCCompanyPrefix, "61414")).toThrow("Length 5 of U.P.C. Company Prefix must be greater than or equal to 6");
-        expect(() => PrefixManager.get(PrefixTypes.UPCCompanyPrefix, "614141")).not.toThrow(RangeError);
+        expect(() => PrefixManager.get(PrefixTypes.UPCCompanyPrefix, "6141")).toThrow("Length 4 of U.P.C. Company Prefix must be greater than or equal to 5");
+        expect(() => PrefixManager.get(PrefixTypes.UPCCompanyPrefix, "61414")).not.toThrow(RangeError);
         expect(() => PrefixManager.get(PrefixTypes.UPCCompanyPrefix, "61414112345")).not.toThrow(RangeError);
         expect(() => PrefixManager.get(PrefixTypes.UPCCompanyPrefix, "614141123456")).toThrow("Length 12 of U.P.C. Company Prefix must be less than or equal to 11");
         expect(() => PrefixManager.get(PrefixTypes.UPCCompanyPrefix, "000614")).not.toThrow(RangeError);

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

@@ -13,29 +13,42 @@ export function testSerializableNumericIdentifierCreator(creator: SerializableNu
         });
     }, () => {
         test("Serialization", () => {
-            const identifier = creator.create(0, true);
-            const serial = "12345678";
-            const serializedIdentifier = identifier + serial;
-            const serials = [serial, "23456789", "34567890", "456789012"];
-            const serializedIdentifiers = serials.map(serial => identifier + serial);
+            const baseIdentifier = creator.create(0, true);
+            const serialComponent = "12345678";
+            const serializedIdentifier = baseIdentifier + serialComponent;
+            const serialComponents = [serialComponent, "23456789", "34567890", "456789012"];
+            const serializedIdentifiers = serialComponents.map(serial => baseIdentifier + serial);
 
-            expect(creator.createSerialized(0, serial, true)).toBe(serializedIdentifier);
-            expect(creator.concatenate(identifier, serial)).toBe(serializedIdentifier);
-            expect(Array.from(creator.createSerialized(0, serials, true))).toStrictEqual(serializedIdentifiers);
-            expect(Array.from(creator.concatenate(identifier, serials))).toStrictEqual(serializedIdentifiers);
+            expect(creator.split(baseIdentifier)).toStrictEqual({
+                baseIdentifier,
+                serialComponent: ""
+            });
+
+            expect(creator.createSerialized(0, serialComponent, true)).toBe(serializedIdentifier);
+            expect(creator.split(creator.createSerialized(0, serialComponent, true))).toStrictEqual({
+                baseIdentifier,
+                serialComponent
+            });
+            expect(creator.concatenate(baseIdentifier, serialComponent)).toBe(serializedIdentifier);
+            expect(creator.split(creator.concatenate(baseIdentifier, serialComponent))).toStrictEqual({
+                baseIdentifier,
+                serialComponent
+            });
+            expect(Array.from(creator.createSerialized(0, serialComponents, true))).toStrictEqual(serializedIdentifiers);
+            expect(Array.from(creator.concatenate(baseIdentifier, serialComponents))).toStrictEqual(serializedIdentifiers);
 
             const fullLengthSerial = "0".repeat(creator.serialComponentLength);
-            const fullLengthPlusOneSerial = fullLengthSerial + "0";
+            const fullLengthPlusOneSerial = `${fullLengthSerial}0`;
             const fullLengthPlusOneSerialErrorMessage = `Length ${creator.serialComponentLength + 1} of serial component must be less than or equal to ${creator.serialComponentLength}`;
 
             expect(() => creator.createSerialized(0, fullLengthSerial, true)).not.toThrow(RangeError);
-            expect(() => creator.concatenate(identifier, fullLengthSerial)).not.toThrow(RangeError);
-            expect(() => Array.from(creator.createSerialized(0, [...serials, fullLengthSerial], true))).not.toThrow(RangeError);
-            expect(() => Array.from(creator.concatenate(identifier, [...serials, fullLengthSerial]))).not.toThrow(RangeError);
+            expect(() => creator.concatenate(baseIdentifier, fullLengthSerial)).not.toThrow(RangeError);
+            expect(() => Array.from(creator.createSerialized(0, [...serialComponents, fullLengthSerial], true))).not.toThrow(RangeError);
+            expect(() => Array.from(creator.concatenate(baseIdentifier, [...serialComponents, fullLengthSerial]))).not.toThrow(RangeError);
             expect(() => creator.createSerialized(0, fullLengthPlusOneSerial, true)).toThrow(fullLengthPlusOneSerialErrorMessage);
-            expect(() => creator.concatenate(identifier, fullLengthPlusOneSerial)).toThrow(fullLengthPlusOneSerialErrorMessage);
-            expect(() => Array.from(creator.createSerialized(0, [...serials, fullLengthPlusOneSerial], true))).toThrow(fullLengthPlusOneSerialErrorMessage);
-            expect(() => Array.from(creator.concatenate(identifier, [...serials, fullLengthPlusOneSerial]))).toThrow(fullLengthPlusOneSerialErrorMessage);
+            expect(() => creator.concatenate(baseIdentifier, fullLengthPlusOneSerial)).toThrow(fullLengthPlusOneSerialErrorMessage);
+            expect(() => Array.from(creator.createSerialized(0, [...serialComponents, fullLengthPlusOneSerial], true))).toThrow(fullLengthPlusOneSerialErrorMessage);
+            expect(() => Array.from(creator.concatenate(baseIdentifier, [...serialComponents, fullLengthPlusOneSerial]))).toThrow(fullLengthPlusOneSerialErrorMessage);
 
             let invalidSerial: string;
 
@@ -56,9 +69,9 @@ export function testSerializableNumericIdentifierCreator(creator: SerializableNu
             const invalidSerialErrorMessage = `Invalid character '${invalidSerial.charAt(4)}' at position 5 of serial component`;
 
             expect(() => creator.createSerialized(0, invalidSerial, true)).toThrow(invalidSerialErrorMessage);
-            expect(() => creator.concatenate(identifier, invalidSerial)).toThrow(invalidSerialErrorMessage);
-            expect(() => Array.from(creator.createSerialized(0, [...serials, invalidSerial], true))).toThrow(invalidSerialErrorMessage);
-            expect(() => Array.from(creator.concatenate(identifier, [...serials, invalidSerial]))).toThrow(invalidSerialErrorMessage);
+            expect(() => creator.concatenate(baseIdentifier, invalidSerial)).toThrow(invalidSerialErrorMessage);
+            expect(() => Array.from(creator.createSerialized(0, [...serialComponents, invalidSerial], true))).toThrow(invalidSerialErrorMessage);
+            expect(() => Array.from(creator.concatenate(baseIdentifier, [...serialComponents, invalidSerial]))).toThrow(invalidSerialErrorMessage);
         });
     });
 }

package/test/validator.test.ts

@@ -17,9 +17,9 @@ import {
     isSerializableNumericIdentifierValidator,
     LeaderTypes
 } from "../src/index.js";
-import { validateGTINValidator } from "./gtin-validator.test.js";
-import { validateNonGTINNumericIdentifierValidator } from "./non-gtin-numeric-identifier-validator.js";
+import { validateGTINValidator } from "./gtin-validator.js";
 import { validateNonNumericIdentifierValidator } from "./non-numeric-identifier-validator.js";
+import { validateNonSerializableNumericIdentifierValidator } from "./non-serializable-numeric-identifier-validator.js";
 import { validateSerializableNumericIdentifierValidator } from "./serializable-numeric-identifier-validator.js";
 
 describe("Validators", () => {
@@ -62,14 +62,14 @@ describe("Validators", () => {
         validateGTINValidator(IdentifierValidators.GTIN[GTINLengths.GTIN13], false, GTINLengths.GTIN13);
         validateGTINValidator(IdentifierValidators.GTIN[GTINLengths.GTIN12], false, GTINLengths.GTIN12);
         validateGTINValidator(IdentifierValidators.GTIN[GTINLengths.GTIN8], false, GTINLengths.GTIN8);
-        validateNonGTINNumericIdentifierValidator(IdentifierValidators.GLN, false, IdentifierTypes.GLN, 13, LeaderTypes.None);
-        validateNonGTINNumericIdentifierValidator(IdentifierValidators.SSCC, false, IdentifierTypes.SSCC, 18, LeaderTypes.ExtensionDigit);
+        validateNonSerializableNumericIdentifierValidator(IdentifierValidators.GLN, false, IdentifierTypes.GLN, 13, LeaderTypes.None);
+        validateNonSerializableNumericIdentifierValidator(IdentifierValidators.SSCC, false, IdentifierTypes.SSCC, 18, LeaderTypes.ExtensionDigit);
         validateSerializableNumericIdentifierValidator(IdentifierValidators.GRAI, false, IdentifierTypes.GRAI, 13, LeaderTypes.None, 16, ContentCharacterSets.AI82);
         validateNonNumericIdentifierValidator(IdentifierValidators.GIAI, false, IdentifierTypes.GIAI, 30, ContentCharacterSets.AI82, false);
-        validateNonGTINNumericIdentifierValidator(IdentifierValidators.GSRN, false, IdentifierTypes.GSRN, 18, LeaderTypes.None);
+        validateNonSerializableNumericIdentifierValidator(IdentifierValidators.GSRN, false, IdentifierTypes.GSRN, 18, LeaderTypes.None);
         validateSerializableNumericIdentifierValidator(IdentifierValidators.GDTI, false, IdentifierTypes.GDTI, 13, LeaderTypes.None, 17, ContentCharacterSets.AI82);
         validateNonNumericIdentifierValidator(IdentifierValidators.GINC, false, IdentifierTypes.GINC, 30, ContentCharacterSets.AI82, false);
-        validateNonGTINNumericIdentifierValidator(IdentifierValidators.GSIN, false, IdentifierTypes.GSIN, 17, LeaderTypes.None);
+        validateNonSerializableNumericIdentifierValidator(IdentifierValidators.GSIN, false, IdentifierTypes.GSIN, 17, LeaderTypes.None);
         validateSerializableNumericIdentifierValidator(IdentifierValidators.GCN, false, IdentifierTypes.GCN, 13, LeaderTypes.None, 12, ContentCharacterSets.Numeric);
         validateNonNumericIdentifierValidator(IdentifierValidators.CPID, false, IdentifierTypes.CPID, 30, ContentCharacterSets.AI39, false);
         validateNonNumericIdentifierValidator(IdentifierValidators.GMN, false, IdentifierTypes.GMN, 25, ContentCharacterSets.AI82, true);