@aidc-toolkit/app-extension 1.0.49-beta → 1.0.50-beta

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

@@ -70,21 +70,21 @@ class LocaleResourcesGenerator extends Generator {
     readonly #parametersSequencer: ParametersSequencer = {};
 
     /**
-     * Parameters locale resources.
+     * Template parameters locale resources.
      */
-    readonly #parametersLocaleResources: LocaleResources = {};
+    readonly #templateParametersLocaleResources: LocaleResources = {};
 
     /**
-     * Functions locale resources.
+     * Template functions locale resources.
      */
-    readonly #functionsLocaleResources: LocaleResources = {};
+    readonly #templateFunctionsLocaleResources: LocaleResources = {};
 
     /**
-     * Locale resources.
+     * Template locale resources.
      */
-    readonly #LocaleResources: LocaleResources = {
-        Parameters: this.#parametersLocaleResources,
-        Functions: this.#functionsLocaleResources
+    readonly #templateLocaleResources: LocaleResources = {
+        Parameters: this.#templateParametersLocaleResources,
+        Functions: this.#templateFunctionsLocaleResources
     };
 
     /**
@@ -201,7 +201,7 @@ class LocaleResourcesGenerator extends Generator {
                 this.#saveParameterSequence(parameterDescriptor, true);
             }
 
-            let functionsLocaleResources = this.#functionsLocaleResources;
+            let functionsLocaleResources = this.#templateFunctionsLocaleResources;
 
             const namespace = classDescriptor.namespace;
 
@@ -234,68 +234,92 @@ class LocaleResourcesGenerator extends Generator {
     }
 
     /**
-     * Merge source locale resources into existing destination locale resources.
+     * Merge template locale resources into existing import locale resources.
+     *
+     * @param mergedLocaleResources
+     * Merged locale resources.
      *
-     * @param logChanges
-     * If true, changes are logged. Limits output when processing multiple sources.
+     * @param isDefaultLocale
+     * If true, locale being merged is the default.
      *
      * @param parentKey
      * Parent key for logging purposes.
      *
-     * @param sourceLocaleResources
-     * Source locale resources.
+     * @param templateLocaleResources
+     * Template locale resources.
      *
-     * @param destinationLocaleResources
-     * Destination locale resources.
+     * @param importLocaleResources
+     * Import locale resources.
      *
      * @param addMissing
      * Add missing if true; applies to locale resources that are not regional.
      *
      * @returns
-     * Merged locale resources.
+     * True if any changes.
      */
-    #merge(logChanges: boolean, parentKey: string, sourceLocaleResources: LocaleResources, destinationLocaleResources: LocaleResources, addMissing: boolean): LocaleResources {
+    #merge(mergedLocaleResources: LocaleResources, isDefaultLocale: boolean, parentKey: string, templateLocaleResources: LocaleResources, importLocaleResources: LocaleResources, addMissing: boolean): boolean {
+        let anyChanges = false;
+
         // Some entries at the root are not part of the generator output.
         const atRoot = parentKey === "";
 
-        const atFunction = parentKey.startsWith("Functions.");
+        if (parentKey.startsWith("Functions.") && "titleCaseName" in importLocaleResources && !("titleCaseName" in templateLocaleResources)) {
+            const description = templateLocaleResources["description"];
+
+            const patchTemplateLocaleResources = templateLocaleResources;
+
+            // Patch template locale resources to preserve required position of titleCaseName.
+            delete patchTemplateLocaleResources["description"];
+            patchTemplateLocaleResources["titleCaseName"] = undefined;
+            patchTemplateLocaleResources["description"] = description;
+        }
+
+        const patchMergedLocaleResources = mergedLocaleResources;
 
-        const newDestinationLocaleResources: LocaleResources = {};
+        // Copy over or delete any import keys that are not in template.
+        for (const [key, importValue] of Object.entries(importLocaleResources)) {
+            if (!(key in templateLocaleResources)) {
+                if (atRoot) {
+                    patchMergedLocaleResources[key] = importValue;
+                } else {
+                    if (isDefaultLocale) {
+                        this.logger.info(`Deleting ${parentKey}${key}...`);
+                    }
 
-        // Copy over or delete any destination keys that are not in source.
-        for (const [key, destinationValue] of Object.entries(destinationLocaleResources)) {
-            if (!(key in sourceLocaleResources)) {
-                if (atRoot || (atFunction && key === "titleCaseName")) {
-                    newDestinationLocaleResources[key] = destinationValue;
-                } else if (logChanges) {
-                    this.logger.info(`Deleting ${parentKey}${key}...`);
+                    anyChanges = true;
                 }
             }
         }
 
-        for (const [key, sourceValue] of Object.entries(sourceLocaleResources)) {
-            if (!(key in destinationLocaleResources)) {
+        for (const [key, templateValue] of Object.entries(templateLocaleResources)) {
+            if (!(key in importLocaleResources)) {
                 if (addMissing) {
-                    if (logChanges) {
+                    if (isDefaultLocale) {
                         this.logger.info(`Adding ${parentKey}${key}...`);
                     }
 
-                    newDestinationLocaleResources[key] = sourceValue;
+                    patchMergedLocaleResources[key] = templateValue;
+
+                    anyChanges = true;
                 }
             } else {
-                const destinationValue = destinationLocaleResources[key];
+                const importValue = importLocaleResources[key];
 
-                if (typeof sourceValue === "object" && typeof destinationValue === "object") {
-                    newDestinationLocaleResources[key] = this.#merge(logChanges, `${parentKey}${key}.`, sourceValue, destinationValue, addMissing);
-                } else if (typeof sourceValue === "string" && typeof destinationValue === "string") {
-                    newDestinationLocaleResources[key] = destinationValue;
+                if (typeof templateValue === "object" && typeof importValue === "object") {
+                    patchMergedLocaleResources[key] = {};
+
+                    if (this.#merge(patchMergedLocaleResources[key], isDefaultLocale, `${parentKey}${key}.`, templateValue, importValue, addMissing)) {
+                        anyChanges = true;
+                    }
+                } else if ((typeof templateValue === "string" || typeof templateValue === "undefined") && (typeof importValue === "string" || typeof importValue === "undefined" || typeof importValue === "object")) {
+                    patchMergedLocaleResources[key] = importValue;
                 } else {
                     throw new Error(`Mismatched types at ${parentKey}${key}`);
                 }
             }
         }
 
-        return newDestinationLocaleResources;
+        return anyChanges;
     }
 
     /**
@@ -336,7 +360,7 @@ class LocaleResourcesGenerator extends Generator {
 
         for (const [parameterName, parametersSequencerEntry] of entries) {
             if (parametersSequencerEntry.isUsed) {
-                this.#parametersLocaleResources[parameterName] = {
+                this.#templateParametersLocaleResources[parameterName] = {
                     name: parameterName,
                     description: "*** LOCALIZATION REQUIRED ***"
                 };
@@ -363,13 +387,14 @@ class LocaleResourcesGenerator extends Generator {
      * @returns
      * Output string.
      */
-    static #buildOutput(prefix: string, value: LocaleResources | string, indentLevel: number): string {
-        return `${"    ".repeat(indentLevel)}${prefix} ${typeof value === "object" ?
-            `{\n${
-                Object.entries(value).map(entry => LocaleResourcesGenerator.#buildOutput(`${entry[0]}:`, entry[1], indentLevel + 1)).join(",\n")
-            }\n${"    ".repeat(indentLevel)}}` :
-            // JSON.stringify() will apply quotes as appropriate.
-            JSON.stringify(value)
+    static #buildOutput(prefix: string, value: LocaleResources | string | undefined, indentLevel: number): string {
+        return `${"    ".repeat(indentLevel)}${prefix} ${
+            typeof value === "object" ?
+                `{\n${
+                    Object.entries(value).map(entry => LocaleResourcesGenerator.#buildOutput(`${entry[0]}:`, entry[1], indentLevel + 1)).join(",\n")
+                }\n${"    ".repeat(indentLevel)}}` :
+                // JSON.stringify() will apply quotes as appropriate.
+                JSON.stringify(value)
         }`;
     }
 
@@ -380,18 +405,20 @@ class LocaleResourcesGenerator extends Generator {
         if (success) {
             this.#buildParametersLocaleResources(this.#parametersSequencer);
 
-            await Promise.all(fs.readdirSync(LocaleResourcesGenerator.#IMPORT_PATH, {
+            await Promise.all(await fs.promises.readdir(LocaleResourcesGenerator.#IMPORT_PATH, {
                 withFileTypes: true
-            }).filter(entry => entry.isDirectory()).map(async (entry) => {
+            }).then(entries => entries.filter(entry => entry.isDirectory()).map(async (entry) => {
                 const localeResourcesSource = path.resolve(LocaleResourcesGenerator.#IMPORT_PATH, entry.name, "locale-resources.ts");
 
-                return import(localeResourcesSource).then((module) => {
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Module format is known.
-                    const localeResources = this.#merge(entry.name === "en", "", this.#LocaleResources, (module as LocaleResourcesModule).default, !entry.name.includes("-"));
+                return import(localeResourcesSource).then(async (module) => {
+                    const mergedLocaleResources: LocaleResources = {};
 
-                    fs.writeFileSync(localeResourcesSource, `${LocaleResourcesGenerator.#buildOutput("export default", localeResources, 0)};\n`);
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Module format is known.
+                    return this.#merge(mergedLocaleResources, entry.name === "en", "", this.#templateLocaleResources, (module as LocaleResourcesModule).default, !entry.name.includes("-")) ?
+                        fs.promises.writeFile(localeResourcesSource, `${LocaleResourcesGenerator.#buildOutput("export default", mergedLocaleResources, 0)};\n`) :
+                        undefined;
                 });
-            }));
+            })));
         }
     }
 }

package/src/gs1/character-set-proxy.ts

@@ -1,7 +1,6 @@
 import { AI39_CREATOR, AI64_VALIDATOR, AI82_CREATOR } from "@aidc-toolkit/gs1";
 import type { AppExtension } from "../app-extension.js";
 import { expandParameterDescriptor, proxy } from "../proxy.js";
-import type { ErrorExtends } from "../type.js";
 import {
     exclusionAllNumericParameterDescriptor,
     exclusionNoneParameterDescriptor
@@ -18,8 +17,8 @@ import { CharacterSetCreatorProxy, CharacterSetValidatorProxy } from "../utility
         }
     ]
 })
-export class AI82Proxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends CharacterSetCreatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
-    constructor(appExtension: AppExtension<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt>) {
+export class AI82Proxy extends CharacterSetCreatorProxy {
+    constructor(appExtension: AppExtension) {
         super(appExtension, AI82_CREATOR);
     }
 }
@@ -34,8 +33,8 @@ export class AI82Proxy<ThrowError extends boolean, TError extends ErrorExtends<T
         }
     ]
 })
-export class AI39Proxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends CharacterSetCreatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
-    constructor(appExtension: AppExtension<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt>) {
+export class AI39Proxy extends CharacterSetCreatorProxy {
+    constructor(appExtension: AppExtension) {
         super(appExtension, AI39_CREATOR);
     }
 }
@@ -44,8 +43,8 @@ export class AI39Proxy<ThrowError extends boolean, TError extends ErrorExtends<T
     namespace: "GS1",
     methodInfix: "AI64"
 })
-export class AI64Proxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends CharacterSetValidatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
-    constructor(appExtension: AppExtension<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt>) {
+export class AI64Proxy extends CharacterSetValidatorProxy {
+    constructor(appExtension: AppExtension) {
         super(appExtension, AI64_VALIDATOR);
     }
 }

package/src/gs1/check-proxy.ts

@@ -9,7 +9,7 @@ import {
 import { type ExtendsParameterDescriptor, Multiplicities, type ParameterDescriptor, Types } from "../descriptor.js";
 import { LibProxy } from "../lib-proxy.js";
 import { proxy } from "../proxy.js";
-import type { ErrorExtends, Matrix, MatrixResult, SingletonResult } from "../type.js";
+import type { Matrix, MatrixResult, SingletonResult } from "../type.js";
 
 const checkSParameterDescriptor: ParameterDescriptor = {
     name: "checkS",
@@ -56,13 +56,13 @@ const ai82SWithCheckCharacterPairParameterDescriptor: ExtendsParameterDescriptor
     namespace: "GS1",
     category: "checkCharacter"
 })
-export class CheckProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends LibProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
+export class CheckProxy extends LibProxy {
     @proxy.describeMethod({
         type: Types.String,
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [numericSParameterDescriptor]
     })
-    checkDigit(matrixSs: Matrix<string>): MatrixResult<string, ThrowError, TError> {
+    checkDigit(matrixSs: Matrix<string>): MatrixResult<string> {
         return this.matrixResult(matrixSs, s => checkDigit(s));
     }
 
@@ -71,7 +71,7 @@ export class CheckProxy<ThrowError extends boolean, TError extends ErrorExtends<
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [numericSWithCheckDigitParameterDescriptor]
     })
-    hasValidCheckDigit(matrixSs: Matrix<string>): MatrixResult<boolean, ThrowError, TError> {
+    hasValidCheckDigit(matrixSs: Matrix<string>): MatrixResult<boolean> {
         return this.matrixResult(matrixSs, s => hasValidCheckDigit(s));
     }
 
@@ -80,7 +80,7 @@ export class CheckProxy<ThrowError extends boolean, TError extends ErrorExtends<
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [numericSFourOrFiveDigitsParameterDescriptor]
     })
-    priceOrWeightCheckDigit(matrixSs: Matrix<string>): MatrixResult<string, ThrowError, TError> {
+    priceOrWeightCheckDigit(matrixSs: Matrix<string>): MatrixResult<string> {
         return this.matrixResult(matrixSs, s => priceOrWeightCheckDigit(s));
     }
 
@@ -92,7 +92,7 @@ export class CheckProxy<ThrowError extends boolean, TError extends ErrorExtends<
             multiplicity: Multiplicities.Singleton
         }, checkDigitParameterDescriptor]
     })
-    isValidPriceOrWeightCheckDigit(s: string, checkDigit: string): SingletonResult<boolean, ThrowError, TError> {
+    isValidPriceOrWeightCheckDigit(s: string, checkDigit: string): SingletonResult<boolean> {
         return this.singletonResult(() => isValidPriceOrWeightCheckDigit(s, checkDigit));
     }
 
@@ -101,7 +101,7 @@ export class CheckProxy<ThrowError extends boolean, TError extends ErrorExtends<
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [ai82SParameterDescriptor]
     })
-    checkCharacterPair(matrixSs: Matrix<string>): MatrixResult<string, ThrowError, TError> {
+    checkCharacterPair(matrixSs: Matrix<string>): MatrixResult<string> {
         return this.matrixResult(matrixSs, s => checkCharacterPair(s));
     }
 
@@ -110,7 +110,7 @@ export class CheckProxy<ThrowError extends boolean, TError extends ErrorExtends<
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [ai82SWithCheckCharacterPairParameterDescriptor]
     })
-    hasValidCheckCharacterPair(matrixSs: Matrix<string>): MatrixResult<boolean, ThrowError, TError> {
+    hasValidCheckCharacterPair(matrixSs: Matrix<string>): MatrixResult<boolean> {
         return this.matrixResult(matrixSs, s => hasValidCheckCharacterPair(s));
     }
 }

package/src/gs1/gcp-length-proxy.ts

@@ -4,7 +4,7 @@ import type { AppExtension } from "../app-extension.js";
 import { type ExtendsParameterDescriptor, Multiplicities, Types } from "../descriptor.js";
 import { LibProxy } from "../lib-proxy.js";
 import { proxy } from "../proxy.js";
-import type { ErrorExtends, Matrix, MatrixResult, SingletonResult } from "../type.js";
+import type { Matrix, MatrixResult, SingletonResult } from "../type.js";
 import { identifierParameterDescriptor, identifierTypeParameterDescriptor } from "./identifier-descriptor.js";
 import { validateIdentifierType } from "./identifier-type.js";
 
@@ -16,7 +16,7 @@ const gcpLengthIdentifierParameterDescriptor: ExtendsParameterDescriptor = {
 /**
  * Application extension GCP length cache. Data is stored in application extension shared data.
  */
-class AppExtensionGCPLengthCache<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends RemoteGCPLengthCache {
+class AppExtensionGCPLengthCache extends RemoteGCPLengthCache {
     /**
      * Logger.
      */
@@ -28,7 +28,7 @@ class AppExtensionGCPLengthCache<ThrowError extends boolean, TError extends Erro
      * @param appExtension
      * Application extension.
      */
-    constructor(appExtension: AppExtension<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt>) {
+    constructor(appExtension: AppExtension) {
         super(appExtension.sharedAppDataStorage, RemoteGCPLengthCache.DEFAULT_BASE_URL, appExtension.httpFetch);
 
         this.#logger = appExtension.logger;
@@ -100,10 +100,10 @@ class AppExtensionGCPLengthCache<ThrowError extends boolean, TError extends Erro
     namespace: "GS1",
     category: "service"
 })
-export class GCPLengthProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends LibProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
+export class GCPLengthProxy extends LibProxy {
     readonly #gcpLength: GCPLength;
     
-    constructor(appExtension: AppExtension<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt>) {
+    constructor(appExtension: AppExtension) {
         super(appExtension);
         
         this.#gcpLength = new GCPLength(new AppExtensionGCPLengthCache(appExtension));
@@ -128,7 +128,7 @@ export class GCPLengthProxy<ThrowError extends boolean, TError extends ErrorExte
         isAsync: true,
         parameterDescriptors: [identifierTypeParameterDescriptor, gcpLengthIdentifierParameterDescriptor]
     })
-    async gcpLengthOf(identifierType: string, matrixIdentifiers: Matrix<string>): Promise<MatrixResult<number, ThrowError, TError>> {
+    async gcpLengthOf(identifierType: string, matrixIdentifiers: Matrix<string>): Promise<MatrixResult<number>> {
         return this.#loadGCPLengthData().then(() => this.setUpMatrixResult(
             () => validateIdentifierType(identifierType),
             matrixIdentifiers,
@@ -142,7 +142,7 @@ export class GCPLengthProxy<ThrowError extends boolean, TError extends ErrorExte
         isAsync: true,
         parameterDescriptors: []
     })
-    async gcpLengthDateTime(): Promise<SingletonResult<string, ThrowError, TError>> {
+    async gcpLengthDateTime(): Promise<SingletonResult<string>> {
         return this.#loadGCPLengthData().then(() =>
             this.singletonResult(() => this.#gcpLength.dateTime.toISOString())
         );
@@ -154,7 +154,7 @@ export class GCPLengthProxy<ThrowError extends boolean, TError extends ErrorExte
         isAsync: true,
         parameterDescriptors: []
     })
-    async gcpLengthDisclaimer(): Promise<SingletonResult<string, ThrowError, TError>> {
+    async gcpLengthDisclaimer(): Promise<SingletonResult<string>> {
         return this.#loadGCPLengthData().then(() =>
             this.singletonResult(() => this.#gcpLength.disclaimer)
         );

package/src/gs1/gtin-creator-proxy.ts

@@ -3,7 +3,7 @@ import type { GTINCreator, GTINType } from "@aidc-toolkit/gs1";
 import type { AppExtension } from "../app-extension.js";
 import { Multiplicities, Types } from "../descriptor.js";
 import { expandParameterDescriptor, proxy } from "../proxy.js";
-import type { ErrorExtends, Matrix, MatrixResult } from "../type.js";
+import type { Matrix, MatrixResult } from "../type.js";
 import { valueParameterDescriptor } from "../utility/transformer-descriptor.js";
 import { indicatorDigitParameterDescriptor } from "./gtin-descriptor.js";
 import { NumericIdentifierCreatorProxy, sparseParameterDescriptor } from "./identifier-creator-proxy.js";
@@ -21,8 +21,8 @@ import {
         }
     ]
 })
-export class GTINCreatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends NumericIdentifierCreatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt, GTINType, GTINCreator> {
-    constructor(appExtension: AppExtension<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt>) {
+export class GTINCreatorProxy extends NumericIdentifierCreatorProxy<GTINType, GTINCreator> {
+    constructor(appExtension: AppExtension) {
         super(appExtension, prefixManager => prefixManager.gtinCreator);
     }
 
@@ -32,7 +32,7 @@ export class GTINCreatorProxy<ThrowError extends boolean, TError extends ErrorEx
         ignoreInfix: true,
         parameterDescriptors: [indicatorDigitParameterDescriptor, prefixDefinitionAnyParameterDescriptor, valueParameterDescriptor, sparseParameterDescriptor]
     })
-    createGTIN14(indicatorDigit: string, prefixDefinition: Matrix<unknown>, matrixValues: Matrix<number | bigint>, sparse: Nullishable<boolean>): MatrixResult<string, ThrowError, TError> {
+    createGTIN14(indicatorDigit: string, prefixDefinition: Matrix<unknown>, matrixValues: Matrix<number | bigint>, sparse: Nullishable<boolean>): MatrixResult<string> {
         const sparseOrUndefined = sparse ?? undefined;
 
         return this.setUpMatrixResult(() =>

package/src/gs1/gtin-validator-proxy.ts

@@ -4,7 +4,7 @@ import type { AppExtension } from "../app-extension.js";
 import { type ExtendsParameterDescriptor, Multiplicities, type ParameterDescriptor, Types } from "../descriptor.js";
 import { LibProxy } from "../lib-proxy.js";
 import { proxy } from "../proxy.js";
-import type { ErrorExtends, Matrix, MatrixResult } from "../type.js";
+import type { Matrix, MatrixResult } from "../type.js";
 import { indicatorDigitParameterDescriptor } from "./gtin-descriptor.js";
 import { identifierParameterDescriptor } from "./identifier-descriptor.js";
 import { GTINValidatorProxy } from "./identifier-validator-proxy.js";
@@ -12,8 +12,8 @@ import { GTINValidatorProxy } from "./identifier-validator-proxy.js";
 @proxy.describeClass(false, {
     methodInfix: "GTIN13"
 })
-export class GTIN13ValidatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends GTINValidatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
-    constructor(appExtension: AppExtension<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt>) {
+export class GTIN13ValidatorProxy extends GTINValidatorProxy {
+    constructor(appExtension: AppExtension) {
         super(appExtension, IdentifierValidators.GTIN[GTINLengths.GTIN13]);
     }
 }
@@ -21,8 +21,8 @@ export class GTIN13ValidatorProxy<ThrowError extends boolean, TError extends Err
 @proxy.describeClass(false, {
     methodInfix: "GTIN12"
 })
-export class GTIN12ValidatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends GTINValidatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
-    constructor(appExtension: AppExtension<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt>) {
+export class GTIN12ValidatorProxy extends GTINValidatorProxy {
+    constructor(appExtension: AppExtension) {
         super(appExtension, IdentifierValidators.GTIN[GTINLengths.GTIN12]);
     }
 }
@@ -30,8 +30,8 @@ export class GTIN12ValidatorProxy<ThrowError extends boolean, TError extends Err
 @proxy.describeClass(false, {
     methodInfix: "GTIN8"
 })
-export class GTIN8ValidatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends GTINValidatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
-    constructor(appExtension: AppExtension<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt>) {
+export class GTIN8ValidatorProxy extends GTINValidatorProxy {
+    constructor(appExtension: AppExtension) {
         super(appExtension, IdentifierValidators.GTIN[GTINLengths.GTIN8]);
     }
 }
@@ -77,13 +77,13 @@ const validateGTIN14ParameterDescriptor: ExtendsParameterDescriptor = {
     namespace: "GS1",
     category: "identifierValidation"
 })
-export class GTINValidatorStaticProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends LibProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
+export class GTINValidatorStaticProxy extends LibProxy {
     @proxy.describeMethod({
         type: Types.String,
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [zeroSuppressibleGTIN12ParameterDescriptor]
     })
-    zeroSuppressGTIN12(matrixGTIN12s: Matrix<string>): MatrixResult<string, ThrowError, TError> {
+    zeroSuppressGTIN12(matrixGTIN12s: Matrix<string>): MatrixResult<string> {
         return this.matrixResult(matrixGTIN12s, gtin12 => GTINValidator.zeroSuppress(gtin12));
     }
 
@@ -92,7 +92,7 @@ export class GTINValidatorStaticProxy<ThrowError extends boolean, TError extends
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [zeroSuppressedGTIN12ParameterDescriptor]
     })
-    zeroExpandGTIN12(matrixZeroSuppressedGTIN12s: Matrix<string>): MatrixResult<string, ThrowError, TError> {
+    zeroExpandGTIN12(matrixZeroSuppressedGTIN12s: Matrix<string>): MatrixResult<string> {
         return this.matrixResult(matrixZeroSuppressedGTIN12s, zeroSuppressedGTIN12 => GTINValidator.zeroExpand(zeroSuppressedGTIN12));
     }
 
@@ -101,7 +101,7 @@ export class GTINValidatorStaticProxy<ThrowError extends boolean, TError extends
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [indicatorDigitParameterDescriptor, convertGTINParameterDescriptor]
     })
-    convertToGTIN14(indicatorDigit: string, matrixGTINs: Matrix<string>): MatrixResult<string, ThrowError, TError> {
+    convertToGTIN14(indicatorDigit: string, matrixGTINs: Matrix<string>): MatrixResult<string> {
         return this.matrixResult(matrixGTINs, gtin => GTINValidator.convertToGTIN14(indicatorDigit, gtin));
     }
 
@@ -110,7 +110,7 @@ export class GTINValidatorStaticProxy<ThrowError extends boolean, TError extends
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [normalizeGTINParameterDescriptor]
     })
-    normalizeGTIN(matrixGTINs: Matrix<string>): MatrixResult<string, ThrowError, TError> {
+    normalizeGTIN(matrixGTINs: Matrix<string>): MatrixResult<string> {
         return this.matrixResult(matrixGTINs, gtin => GTINValidator.normalize(gtin));
     }
 

package/src/gs1/identifier-creator-proxy.ts

@@ -25,7 +25,7 @@ import { type ExtendsParameterDescriptor, Multiplicities, type ParameterDescript
 import { LibProxy } from "../lib-proxy.js";
 import { i18nextAppExtension } from "../locale/i18n.js";
 import { proxy } from "../proxy.js";
-import type { ErrorExtends, Matrix, MatrixResult } from "../type.js";
+import type { Matrix, MatrixResult } from "../type.js";
 import {
     countParameterDescriptor,
     startValueParameterDescriptor,
@@ -38,12 +38,12 @@ import { prefixDefinitionGS1UPCParameterDescriptor } from "./prefix-definition-d
     namespace: "GS1",
     category: "identifierCreation"
 })
-abstract class IdentifierCreatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt, TIdentifierType extends IdentifierType, TIdentifierValidation extends IdentifierValidation, TIdentifierCreator extends IdentifierCreator<TIdentifierType, TIdentifierValidation>> extends LibProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
+abstract class IdentifierCreatorProxy<TIdentifierType extends IdentifierType, TIdentifierValidation extends IdentifierValidation, TIdentifierCreator extends IdentifierCreator<TIdentifierType, TIdentifierValidation>> extends LibProxy {
     static readonly #PREFIX_TYPES: Array<PrefixType | undefined> = [PrefixTypes.GS1CompanyPrefix, PrefixTypes.UPCCompanyPrefix, PrefixTypes.GS18Prefix];
 
     readonly #getCreator: (prefixManager: PrefixManager) => TIdentifierCreator;
 
-    constructor(appExtension: AppExtension<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt>, getCreator: (prefixManager: PrefixManager) => TIdentifierCreator) {
+    constructor(appExtension: AppExtension, getCreator: (prefixManager: PrefixManager) => TIdentifierCreator) {
         super(appExtension);
 
         this.#getCreator = getCreator;
@@ -131,13 +131,13 @@ export const sparseParameterDescriptor: ParameterDescriptor = {
 };
 
 @proxy.describeClass(true)
-export abstract class NumericIdentifierCreatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt, TNumericIdentifierType extends NumericIdentifierType, TNumericIdentifierCreator extends NumericIdentifierCreator<TNumericIdentifierType>> extends IdentifierCreatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt, TNumericIdentifierType, NumericIdentifierValidation, TNumericIdentifierCreator> {
+export abstract class NumericIdentifierCreatorProxy<TNumericIdentifierType extends NumericIdentifierType, TNumericIdentifierCreator extends NumericIdentifierCreator<TNumericIdentifierType>> extends IdentifierCreatorProxy<TNumericIdentifierType, NumericIdentifierValidation, TNumericIdentifierCreator> {
     @proxy.describeMethod({
         type: Types.String,
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [prefixDefinitionGS1UPCParameterDescriptor, valueParameterDescriptor, sparseParameterDescriptor]
     })
-    create(prefixDefinition: Matrix<unknown>, matrixValues: Matrix<number | bigint>, sparse: Nullishable<boolean>): MatrixResult<string, ThrowError, TError> {
+    create(prefixDefinition: Matrix<unknown>, matrixValues: Matrix<number | bigint>, sparse: Nullishable<boolean>): MatrixResult<string> {
         const sparseOrUndefined = sparse ?? undefined;
 
         return this.setUpMatrixResult(() =>
@@ -153,7 +153,7 @@ export abstract class NumericIdentifierCreatorProxy<ThrowError extends boolean,
         multiplicity: Multiplicities.Array,
         parameterDescriptors: [prefixDefinitionGS1UPCParameterDescriptor, startValueParameterDescriptor, countParameterDescriptor, sparseParameterDescriptor]
     })
-    createSequence(prefixDefinition: Matrix<unknown>, startValue: number, count: number, sparse: Nullishable<boolean>): MatrixResult<string, ThrowError, TError> {
+    createSequence(prefixDefinition: Matrix<unknown>, startValue: number, count: number, sparse: Nullishable<boolean>): MatrixResult<string> {
         return this.iterableResult(() => {
             this.appExtension.validateSequenceCount(count);
 
@@ -166,7 +166,7 @@ export abstract class NumericIdentifierCreatorProxy<ThrowError extends boolean,
         multiplicity: Multiplicities.Array,
         parameterDescriptors: [prefixDefinitionGS1UPCParameterDescriptor]
     })
-    createAll(prefixDefinition: Matrix<unknown>): MatrixResult<string, ThrowError, TError> {
+    createAll(prefixDefinition: Matrix<unknown>): MatrixResult<string> {
         return this.iterableResult(() => {
             const creator = this.getCreator(prefixDefinition);
 
@@ -177,10 +177,10 @@ export abstract class NumericIdentifierCreatorProxy<ThrowError extends boolean,
     }
 }
 
-abstract class NonGTINNumericIdentifierCreatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt, TNonGTINNumericIdentifierType extends NonGTINNumericIdentifierType, TNonGTINNumericIdentifierCreator extends NonGTINNumericIdentifierCreator> extends NumericIdentifierCreatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt, TNonGTINNumericIdentifierType, TNonGTINNumericIdentifierCreator> {
+abstract class NonGTINNumericIdentifierCreatorProxy<TNonGTINNumericIdentifierType extends NonGTINNumericIdentifierType, TNonGTINNumericIdentifierCreator extends NonGTINNumericIdentifierCreator> extends NumericIdentifierCreatorProxy<TNonGTINNumericIdentifierType, TNonGTINNumericIdentifierCreator> {
 }
 
-export abstract class NonSerializableNumericIdentifierCreatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt, TNonSerializableNumericIdentifierType extends NonSerializableNumericIdentifierType, TNonGTINNumericIdentifierCreator extends NonGTINNumericIdentifierCreator> extends NonGTINNumericIdentifierCreatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt, TNonSerializableNumericIdentifierType, TNonGTINNumericIdentifierCreator> {
+export abstract class NonSerializableNumericIdentifierCreatorProxy<TNonSerializableNumericIdentifierType extends NonSerializableNumericIdentifierType, TNonGTINNumericIdentifierCreator extends NonGTINNumericIdentifierCreator> extends NonGTINNumericIdentifierCreatorProxy<TNonSerializableNumericIdentifierType, TNonGTINNumericIdentifierCreator> {
 }
 
 const singleValueParameterDescriptor: ExtendsParameterDescriptor = {
@@ -202,13 +202,13 @@ const serialComponentParameterDescriptor: ParameterDescriptor = {
 };
 
 @proxy.describeClass(true)
-export abstract class SerializableNumericIdentifierCreatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends NonGTINNumericIdentifierCreatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt, SerializableNumericIdentifierType, SerializableNumericIdentifierCreator> {
+export abstract class SerializableNumericIdentifierCreatorProxy extends NonGTINNumericIdentifierCreatorProxy<SerializableNumericIdentifierType, SerializableNumericIdentifierCreator> {
     @proxy.describeMethod({
         type: Types.String,
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [prefixDefinitionGS1UPCParameterDescriptor, singleValueParameterDescriptor, serialComponentParameterDescriptor, sparseParameterDescriptor]
     })
-    createSerialized(prefixDefinition: Matrix<unknown>, value: number, matrixSerialComponents: Matrix<string>, sparse: Nullishable<boolean>): MatrixResult<string, ThrowError, TError> {
+    createSerialized(prefixDefinition: Matrix<unknown>, value: number | bigint, matrixSerialComponents: Matrix<string>, sparse: Nullishable<boolean>): MatrixResult<string> {
         const sparseOrUndefined = sparse ?? undefined;
 
         return this.setUpMatrixResult(() =>
@@ -223,7 +223,7 @@ export abstract class SerializableNumericIdentifierCreatorProxy<ThrowError exten
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [baseIdentifierParameterDescriptor, serialComponentParameterDescriptor]
     })
-    concatenate(baseIdentifier: string, matrixSerialComponents: Matrix<string>): MatrixResult<string, ThrowError, TError> {
+    concatenate(baseIdentifier: string, matrixSerialComponents: Matrix<string>): MatrixResult<string> {
         return this.setUpMatrixResult(() =>
             this.getCreator([[baseIdentifier.substring(0, !baseIdentifier.startsWith("0") ? PrefixValidator.GS1_COMPANY_PREFIX_MINIMUM_LENGTH : PrefixValidator.UPC_COMPANY_PREFIX_MINIMUM_LENGTH + 1), PrefixTypes.GS1CompanyPrefix]]),
         matrixSerialComponents, (creator, serialComponent) =>
@@ -240,13 +240,13 @@ const referenceParameterDescriptor: ParameterDescriptor = {
 };
 
 @proxy.describeClass(true)
-export abstract class NonNumericIdentifierCreatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends IdentifierCreatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt, NonNumericIdentifierType, NonNumericIdentifierValidation, NonNumericIdentifierCreator> {
+export abstract class NonNumericIdentifierCreatorProxy extends IdentifierCreatorProxy<NonNumericIdentifierType, NonNumericIdentifierValidation, NonNumericIdentifierCreator> {
     @proxy.describeMethod({
         type: Types.String,
         multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [prefixDefinitionGS1UPCParameterDescriptor, referenceParameterDescriptor]
     })
-    create(prefixDefinition: Matrix<unknown>, matrixReferences: Matrix<string>): MatrixResult<string, ThrowError, TError> {
+    create(prefixDefinition: Matrix<unknown>, matrixReferences: Matrix<string>): MatrixResult<string> {
         return this.setUpMatrixResult(() =>
             this.getCreator(prefixDefinition),
         matrixReferences, (creator, reference) =>