@aidc-toolkit/app-extension 1.0.32-beta → 1.0.34-beta

package/src/generator/generator.ts

@@ -1,9 +1,11 @@
-import { I18nEnvironments, type Promisable } from "@aidc-toolkit/core";
-import type { ParseKeys } from "i18next";
-import { AppUtilityProxy } from "../app-utility-proxy.js";
+import { getLogger, I18nEnvironments, phaseURL, type Promisable } from "@aidc-toolkit/core";
+import type { DefaultNamespace, ParseKeys } from "i18next";
+import type { Logger } from "tslog";
+import packageConfiguration from "../../package.json" with { type: "json" };
+import { AppHelperProxy } from "../app-helper-proxy.js";
 import type { ClassDescriptor, MethodDescriptor } from "../descriptor.js";
 import * as GS1 from "../gs1/index.js";
-import { appExtensionResources, i18nAppExtensionInit, i18nextAppExtension } from "../locale/i18n.js";
+import { appExtensionResourceBundle, i18nAppExtensionInit, i18nextAppExtension } from "../locale/i18n.js";
 import { proxy } from "../proxy.js";
 import * as Utility from "../utility/index.js";
 
@@ -16,7 +18,7 @@ import * as Utility from "../utility/index.js";
 function registerProxies(..._proxies: unknown[]): void {
 }
 
-registerProxies(AppUtilityProxy, Utility, GS1);
+registerProxies(AppHelperProxy, Utility, GS1);
 
 /**
  * Localization.
@@ -25,27 +27,32 @@ export interface Localization {
     /**
      * Name.
      */
-    name: string;
+    readonly name: string;
 
     /**
      * Description.
      */
-    description: string;
+    readonly description: string;
 }
 
 /**
  * Function localization.
  */
 export interface FunctionLocalization extends Localization {
+    /**
+     * Namespace function name.
+     */
+    readonly namespaceFunctionName: string;
+
     /**
      * Documentation URL.
      */
-    documentationURL: string;
+    readonly documentationURL: string;
 
     /**
      * Parameters map.
      */
-    parametersMap: Map<string, Localization>;
+    readonly parametersMap: ReadonlyMap<string, Localization>;
 }
 
 /**
@@ -53,14 +60,19 @@ export interface FunctionLocalization extends Localization {
  */
 export abstract class Generator {
     /**
-     * Documentation base URL.
+     * Documentation path, optionally preceded by locale.
      */
-    static readonly #DOCUMENTATION_BASE_URL = "https://aidc-toolkit.com/";
+    static readonly #DOCUMENTATION_PATH = "app-extension/";
 
     /**
-     * Documentation path, optionally preceded by locale.
+     * Logger.
      */
-    static readonly #DOCUMENTATION_PATH = "app-extension/";
+    readonly #logger = getLogger();
+
+    /**
+     * Base URL.
+     */
+    readonly #baseURL: string;
 
     /**
      * Locales.
@@ -72,11 +84,6 @@ export abstract class Generator {
      */
     readonly #defaultLocale: string;
 
-    /**
-     * Map of function localizations maps by namespace function name.
-     */
-    readonly #functionLocalizationsMapsMap = new Map<string, ReadonlyMap<string, FunctionLocalization>>();
-
     /**
      * Constructor.
      *
@@ -84,10 +91,18 @@ export abstract class Generator {
      * Include localizations if true.
      */
     constructor(includeLocalizations = true) {
-        this.#locales = includeLocalizations ? Object.keys(appExtensionResources) : [];
+        this.#baseURL = phaseURL(packageConfiguration.version, "http://10.211.55.2:5173");
+        this.#locales = includeLocalizations ? Object.keys(appExtensionResourceBundle) : [];
         this.#defaultLocale = this.#locales[0] ?? "";
     }
 
+    /**
+     * Get the logger.
+     */
+    get logger(): Logger<object> {
+        return this.#logger;
+    }
+
     /**
      * Get the locales.
      */
@@ -103,56 +118,31 @@ export abstract class Generator {
     }
 
     /**
-     * Get function localization.
-     *
-     * @param locale
-     * Locale.
-     *
-     * @param namespaceFunctionName
-     * Namespace function name.
-     *
-     * @returns
-     * Function localization.
+     * Initialize the generation of the output.
      */
-    protected getFunctionLocalization(locale: string, namespaceFunctionName: string): FunctionLocalization {
-        const functionLocalization = this.#functionLocalizationsMapsMap.get(namespaceFunctionName)?.get(locale);
-
-        if (functionLocalization === undefined) {
-            throw new Error(`${locale} localization for function ${namespaceFunctionName} not found`);
-        }
-
-        return functionLocalization;
-    }
+    protected abstract initialize(): void;
 
     /**
-     * Get parameter localization.
+     * Create a namespace.
      *
-     * @param locale
-     * Locale.
-     *
-     * @param namespaceFunctionName
-     * Namespace function name.
-     *
-     * @param parameterName
-     * Parameter name.
-     *
-     * @returns
-     * Parameter localization.
+     * @param namespace
+     * Namespace.
      */
-    protected getParameterLocalization(locale: string, namespaceFunctionName: string, parameterName: string): Localization {
-        const parameterLocalization = this.getFunctionLocalization(locale, namespaceFunctionName).parametersMap.get(parameterName);
-
-        if (parameterLocalization === undefined) {
-            throw new Error(`${locale} localization for function ${namespaceFunctionName} parameter ${parameterName} not found`);
-        }
-
-        return parameterLocalization;
-    }
+    protected abstract createNamespace(namespace: string | undefined): void;
 
     /**
-     * Initialize the generation of the output.
+     * Create a category.
+     *
+     * @param namespace
+     * Namespace.
+     *
+     * @param category
+     * Category.
+     *
+     * @param categoryLocalizationsMap
+     * Category localizations map.
      */
-    protected abstract initialize(): void;
+    protected abstract createCategory(namespace: string | undefined, category: string, categoryLocalizationsMap: ReadonlyMap<string, string>): void;
 
     /**
      * Create a proxy object for a class.
@@ -172,7 +162,7 @@ export abstract class Generator {
      * Method descriptor.
      *
      * @param functionLocalizationsMap
-     * Localizations map.
+     * Function localizations map.
      */
     protected abstract createProxyFunction(classDescriptor: ClassDescriptor, methodDescriptor: MethodDescriptor, functionLocalizationsMap: ReadonlyMap<string, FunctionLocalization>): void;
 
@@ -193,11 +183,8 @@ export abstract class Generator {
      * @param locale
      * Locale.
      *
-     * @param localizedKeyPrefix
-     * Localized key prefix.
-     *
-     * @param namespacePrefix
-     * Namespace prefix to be appended to name.
+     * @param key
+     * Key.
      *
      * @param localizationCallback
      * Callback to finalize localization.
@@ -205,17 +192,14 @@ export abstract class Generator {
      * @returns
      * Localization.
      */
-    #generateLocalization<TLocalization extends Localization>(locale: string, localizedKeyPrefix: string, namespacePrefix: string, localizationCallback: (locale: string, localization: Localization) => TLocalization): TLocalization {
-        const lngOption = {
-            lng: locale
-        };
-
-        return localizationCallback(locale, {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Localized key exists.
-            name: `${namespacePrefix}${i18nextAppExtension.t(`${localizedKeyPrefix}name` as ParseKeys, lngOption)}`,
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Localized key exists.
-            description: i18nextAppExtension.t(`${localizedKeyPrefix}description` as ParseKeys, lngOption)
-        });
+    static #generateLocalization<TLocalization extends Localization>(locale: string, key: string, localizationCallback: (locale: string, localization: Localization) => TLocalization): TLocalization {
+        const lngReturnObjectsOption = {
+            lng: locale,
+            returnObjects: true
+        } as const;
+
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Localized key exists and return type is Localization.
+        return localizationCallback(locale, i18nextAppExtension.t(key as ParseKeys<DefaultNamespace, typeof lngReturnObjectsOption>, lngReturnObjectsOption) as Localization);
     }
 
     /**
@@ -228,30 +212,73 @@ export abstract class Generator {
 
         this.initialize();
 
+        const namespaceHierarchy = new Map<string | undefined, Map<string, ClassDescriptor[]>>();
+
+        // Organize class descriptors by namespace and category.
+        for (const classDescriptor of proxy.classDescriptors) {
+            const namespace = classDescriptor.namespace;
+            const category = classDescriptor.category;
+
+            let categoryHierarchy = namespaceHierarchy.get(namespace);
+
+            if (categoryHierarchy === undefined) {
+                categoryHierarchy = new Map();
+                namespaceHierarchy.set(namespace, categoryHierarchy);
+            }
+
+            let classDescriptors = categoryHierarchy.get(category);
+
+            if (classDescriptors === undefined) {
+                classDescriptors = [];
+                categoryHierarchy.set(category, classDescriptors);
+            }
+
+            classDescriptors.push(classDescriptor);
+        }
+
         try {
-            for (const [_namespaceClassName, classDescriptor] of proxy.classDescriptorsMap.entries()) {
-                const namespace = classDescriptor.namespace;
+            for (const [namespace, categoryHierarchy] of namespaceHierarchy) {
                 const namespacePrefix = namespace === undefined ? "" : `${namespace}.`;
                 const namespacePath = namespace === undefined ? "" : `${namespace}/`;
 
-                this.createProxyObject(classDescriptor);
+                this.createNamespace(namespace);
+
+                for (const [category, classDescriptors] of categoryHierarchy) {
+                    const namespaceCategory = `${namespacePrefix}${category}`;
+
+                    const categoriesKey = `Categories.${category}`;
+                    const namespaceCategoriesKey = `Categories.${namespaceCategory}`;
+
+                    const categoryLocalizationsMap = new Map(this.locales.map((locale) => {
+                        const lngOption = {
+                            lng: locale
+                        } as const;
+
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Localized key exists.
+                        return [locale, i18nextAppExtension.t((i18nextAppExtension.exists(namespaceCategoriesKey, lngOption) ? namespaceCategoriesKey : categoriesKey) as ParseKeys, lngOption)];
+                    }));
+
+                    this.createCategory(namespace, category, categoryLocalizationsMap);
 
-                for (const methodDescriptor of classDescriptor.methodDescriptors) {
-                    const namespaceFunctionName = methodDescriptor.namespaceFunctionName;
-                    const functionLocalizationsMap = new Map(this.#locales.map(locale =>
-                        [locale, this.#generateLocalization<FunctionLocalization>(locale, `Functions.${namespaceFunctionName}.`, namespacePrefix, (locale, localization) => ({
-                            ...localization,
-                            documentationURL: `${Generator.#DOCUMENTATION_BASE_URL}${locale === this.defaultLocale ? "" : `${locale}/`}${Generator.#DOCUMENTATION_PATH}${namespacePath}${localization.name}.html`,
-                            parametersMap: new Map(methodDescriptor.parameterDescriptors.map(parameterDescriptor =>
-                                // eslint-disable-next-line max-nested-callbacks -- Callback is empty.
-                                [parameterDescriptor.name, this.#generateLocalization(locale, `Parameters.${parameterDescriptor.name}.`, "", (_locale, localization) => localization)]
-                            ))
-                        }))]
-                    ));
+                    for (const classDescriptor of classDescriptors) {
+                        this.createProxyObject(classDescriptor);
 
-                    this.#functionLocalizationsMapsMap.set(namespaceFunctionName, functionLocalizationsMap);
+                        for (const methodDescriptor of classDescriptor.methodDescriptors) {
+                            const functionLocalizationsMap = new Map(this.locales.map(locale =>
+                                [locale, Generator.#generateLocalization<FunctionLocalization>(locale, `Functions.${methodDescriptor.namespaceFunctionName}`, (locale, localization) => ({
+                                    ...localization,
+                                    namespaceFunctionName: `${namespacePrefix}${localization.name}`,
+                                    documentationURL: `${this.#baseURL}/${locale === this.defaultLocale ? "" : `${locale}/`}${Generator.#DOCUMENTATION_PATH}${namespacePath}${localization.name}.html`,
+                                    parametersMap: new Map(methodDescriptor.parameterDescriptors.map(parameterDescriptor =>
+                                        // eslint-disable-next-line max-nested-callbacks -- Callback is empty.
+                                        [parameterDescriptor.name, Generator.#generateLocalization(locale, `Parameters.${parameterDescriptor.name}`, (_locale, localization) => localization)]
+                                    ))
+                                }))]
+                            ));
 
-                    this.createProxyFunction(classDescriptor, methodDescriptor, functionLocalizationsMap);
+                            this.createProxyFunction(classDescriptor, methodDescriptor, functionLocalizationsMap);
+                        }
+                    }
                 }
             }
 

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

@@ -1,4 +1,4 @@
-import { getLogger, type LocaleResources } from "@aidc-toolkit/core";
+import type { LocaleResources } from "@aidc-toolkit/core";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import type {
@@ -63,11 +63,6 @@ class LocaleResourcesGenerator extends Generator {
      */
     static readonly #IMPORT_PATH = "../app-extension/src/locale";
 
-    /**
-     * Logger.
-     */
-    readonly #logger = getLogger();
-
     /**
      * Parameters sequencer.
      */
@@ -101,13 +96,25 @@ class LocaleResourcesGenerator extends Generator {
     /**
      * @inheritDoc
      */
-    protected initialize(): void {
+    protected override initialize(): void {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected override createNamespace(): void {
     }
 
     /**
      * @inheritDoc
      */
-    protected createProxyObject(): void {
+    protected override createCategory(): void {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected override createProxyObject(): void {
     }
 
     /**
@@ -185,7 +192,7 @@ class LocaleResourcesGenerator extends Generator {
     /**
      * @inheritDoc
      */
-    protected createProxyFunction(classDescriptor: ClassDescriptor, methodDescriptor: MethodDescriptor): void {
+    protected override createProxyFunction(classDescriptor: ClassDescriptor, methodDescriptor: MethodDescriptor): void {
         // Hidden functions aren't localized.
         if (!(methodDescriptor.isHidden ?? false)) {
             // Add any parameters that are not already known.
@@ -258,7 +265,7 @@ class LocaleResourcesGenerator extends Generator {
                 if (!deleteMissing) {
                     newDestinationLocaleResources[key] = destinationValue;
                 } else if (logChanges) {
-                    this.#logger.info(`Deleting ${parentKey}${key}...`);
+                    this.logger.info(`Deleting ${parentKey}${key}...`);
                 }
             }
         }
@@ -267,7 +274,7 @@ class LocaleResourcesGenerator extends Generator {
             if (!(key in destinationLocaleResources)) {
                 if (addMissing) {
                     if (logChanges) {
-                        this.#logger.info(`Adding ${parentKey}${key}...`);
+                        this.logger.info(`Adding ${parentKey}${key}...`);
                     }
 
                     newDestinationLocaleResources[key] = sourceValue;
@@ -366,7 +373,7 @@ class LocaleResourcesGenerator extends Generator {
     /**
      * @inheritDoc
      */
-    protected async finalize(success: boolean): Promise<void> {
+    protected override async finalize(success: boolean): Promise<void> {
         if (success) {
             this.#buildParametersLocaleResources(this.#parametersSequencer);
 
@@ -375,7 +382,7 @@ class LocaleResourcesGenerator extends Generator {
             }).filter(entry => entry.isDirectory()).map(async (entry) => {
                 const localeResourcesSource = path.resolve(LocaleResourcesGenerator.#IMPORT_PATH, entry.name, "locale-resources.ts");
 
-                await import(localeResourcesSource).then((module) => {
+                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("-"));
 
@@ -386,4 +393,9 @@ class LocaleResourcesGenerator extends Generator {
     }
 }
 
-await new LocaleResourcesGenerator().generate();
+const generator = new LocaleResourcesGenerator();
+
+generator.generate().catch((e: unknown) => {
+    generator.logger.error(e);
+    process.exit(1);
+});

package/src/gs1/check-proxy.ts

@@ -6,7 +6,7 @@ import {
     isValidPriceOrWeightCheckDigit,
     priceOrWeightCheckDigit
 } from "@aidc-toolkit/gs1";
-import { type ExtendsParameterDescriptor, type ParameterDescriptor, Types } from "../descriptor.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, SingletonResult } from "../type.js";
@@ -14,7 +14,7 @@ import type { ErrorExtends, Matrix, MatrixResult, SingletonResult } from "../typ
 const checkSParameterDescriptor: ParameterDescriptor = {
     name: "checkS",
     type: Types.String,
-    isMatrix: true,
+    multiplicity: Multiplicities.Matrix,
     isRequired: true
 };
 
@@ -39,7 +39,7 @@ const checkDigitParameterDescriptor: ExtendsParameterDescriptor = {
     extendsDescriptor: numericSParameterDescriptor,
     sortOrder: 2,
     name: "checkDigit",
-    isMatrix: false
+    multiplicity: Multiplicities.Singleton
 };
 
 const ai82SParameterDescriptor: ExtendsParameterDescriptor = {
@@ -53,12 +53,13 @@ const ai82SWithCheckCharacterPairParameterDescriptor: ExtendsParameterDescriptor
 };
 
 @proxy.describeClass(false, {
-    namespace: "GS1"
+    namespace: "GS1",
+    category: "checkCharacter"
 })
 export class CheckProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends LibProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [numericSParameterDescriptor]
     })
     checkDigit(matrixSs: Matrix<string>): MatrixResult<string, ThrowError, TError> {
@@ -67,7 +68,7 @@ export class CheckProxy<ThrowError extends boolean, TError extends ErrorExtends<
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [numericSWithCheckDigitParameterDescriptor]
     })
     hasValidCheckDigit(matrixSs: Matrix<string>): MatrixResult<boolean, ThrowError, TError> {
@@ -76,7 +77,7 @@ export class CheckProxy<ThrowError extends boolean, TError extends ErrorExtends<
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [numericSFourOrFiveDigitsParameterDescriptor]
     })
     priceOrWeightCheckDigit(matrixSs: Matrix<string>): MatrixResult<string, ThrowError, TError> {
@@ -85,10 +86,10 @@ export class CheckProxy<ThrowError extends boolean, TError extends ErrorExtends<
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: false,
+        multiplicity: Multiplicities.Singleton,
         parameterDescriptors: [{
             ...numericSFourOrFiveDigitsParameterDescriptor,
-            isMatrix: false
+            multiplicity: Multiplicities.Singleton
         }, checkDigitParameterDescriptor]
     })
     isValidPriceOrWeightCheckDigit(s: string, checkDigit: string): SingletonResult<boolean, ThrowError, TError> {
@@ -97,7 +98,7 @@ export class CheckProxy<ThrowError extends boolean, TError extends ErrorExtends<
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [ai82SParameterDescriptor]
     })
     checkCharacterPair(matrixSs: Matrix<string>): MatrixResult<string, ThrowError, TError> {
@@ -106,7 +107,7 @@ export class CheckProxy<ThrowError extends boolean, TError extends ErrorExtends<
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [ai82SWithCheckCharacterPairParameterDescriptor]
     })
     hasValidCheckCharacterPair(matrixSs: Matrix<string>): MatrixResult<boolean, ThrowError, TError> {

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

@@ -1,7 +1,7 @@
 import type { Nullishable } from "@aidc-toolkit/core";
 import type { GTINCreator, GTINType } from "@aidc-toolkit/gs1";
 import type { AppExtension } from "../app-extension.js";
-import { Types } from "../descriptor.js";
+import { Multiplicities, Types } from "../descriptor.js";
 import { expandParameterDescriptor, proxy } from "../proxy.js";
 import type { ErrorExtends, Matrix, MatrixResult } from "../type.js";
 import { valueParameterDescriptor } from "../utility/transformer-descriptor.js";
@@ -13,7 +13,6 @@ import {
 } from "./prefix-definition-descriptor.js";
 
 @proxy.describeClass(false, {
-    namespace: "GS1",
     methodInfix: "GTIN",
     replacementParameterDescriptors: [
         {
@@ -29,7 +28,7 @@ export class GTINCreatorProxy<ThrowError extends boolean, TError extends ErrorEx
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         ignoreInfix: true,
         parameterDescriptors: [indicatorDigitParameterDescriptor, prefixDefinitionAnyParameterDescriptor, valueParameterDescriptor, sparseParameterDescriptor]
     })

package/src/gs1/gtin-descriptor.ts

@@ -1,8 +1,8 @@
-import { type ParameterDescriptor, Types } from "../descriptor.js";
+import { Multiplicities, type ParameterDescriptor, Types } from "../descriptor.js";
 
 export const indicatorDigitParameterDescriptor: ParameterDescriptor = {
     name: "indicatorDigit",
     type: Types.String,
-    isMatrix: false,
+    multiplicity: Multiplicities.Singleton,
     isRequired: true
 };

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

@@ -1,7 +1,7 @@
 import type { Nullishable } from "@aidc-toolkit/core";
 import { GTINLengths, type GTINLevel, GTINValidator, IdentifierValidators } from "@aidc-toolkit/gs1";
 import type { AppExtension } from "../app-extension.js";
-import { type ExtendsParameterDescriptor, type ParameterDescriptor, Types } from "../descriptor.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";
@@ -10,7 +10,6 @@ import { identifierParameterDescriptor } from "./identifier-descriptor.js";
 import { GTINValidatorProxy } from "./identifier-validator-proxy.js";
 
 @proxy.describeClass(false, {
-    namespace: "GS1",
     methodInfix: "GTIN13"
 })
 export class GTIN13ValidatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends GTINValidatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
@@ -20,7 +19,6 @@ export class GTIN13ValidatorProxy<ThrowError extends boolean, TError extends Err
 }
 
 @proxy.describeClass(false, {
-    namespace: "GS1",
     methodInfix: "GTIN12"
 })
 export class GTIN12ValidatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends GTINValidatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
@@ -30,7 +28,6 @@ export class GTIN12ValidatorProxy<ThrowError extends boolean, TError extends Err
 }
 
 @proxy.describeClass(false, {
-    namespace: "GS1",
     methodInfix: "GTIN8"
 })
 export class GTIN8ValidatorProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends GTINValidatorProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
@@ -67,7 +64,7 @@ const validateGTINParameterDescriptor: ExtendsParameterDescriptor = {
 const gtinLevelParameterDescriptor: ParameterDescriptor = {
     name: "gtinLevel",
     type: Types.Number,
-    isMatrix: false,
+    multiplicity: Multiplicities.Singleton,
     isRequired: false
 };
 
@@ -77,12 +74,13 @@ const validateGTIN14ParameterDescriptor: ExtendsParameterDescriptor = {
 };
 
 @proxy.describeClass(false, {
-    namespace: "GS1"
+    namespace: "GS1",
+    category: "identifierValidation"
 })
 export class GTINValidatorStaticProxy<ThrowError extends boolean, TError extends ErrorExtends<ThrowError>, TInvocationContext, TStreamingInvocationContext, TBigInt> extends LibProxy<ThrowError, TError, TInvocationContext, TStreamingInvocationContext, TBigInt> {
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [zeroSuppressibleGTIN12ParameterDescriptor]
     })
     zeroSuppressGTIN12(matrixGTIN12s: Matrix<string>): MatrixResult<string, ThrowError, TError> {
@@ -91,7 +89,7 @@ export class GTINValidatorStaticProxy<ThrowError extends boolean, TError extends
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [zeroSuppressedGTIN12ParameterDescriptor]
     })
     zeroExpandGTIN12(matrixZeroSuppressedGTIN12s: Matrix<string>): MatrixResult<string, ThrowError, TError> {
@@ -100,7 +98,7 @@ export class GTINValidatorStaticProxy<ThrowError extends boolean, TError extends
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [indicatorDigitParameterDescriptor, convertGTINParameterDescriptor]
     })
     convertToGTIN14(indicatorDigit: string, matrixGTINs: Matrix<string>): MatrixResult<string, ThrowError, TError> {
@@ -109,7 +107,7 @@ export class GTINValidatorStaticProxy<ThrowError extends boolean, TError extends
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [normalizeGTINParameterDescriptor]
     })
     normalizeGTIN(matrixGTINs: Matrix<string>): MatrixResult<string, ThrowError, TError> {
@@ -118,7 +116,7 @@ export class GTINValidatorStaticProxy<ThrowError extends boolean, TError extends
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [validateGTINParameterDescriptor, gtinLevelParameterDescriptor]
     })
     validateGTIN(matrixGTINs: Matrix<string>, gtinLevel: Nullishable<GTINLevel>): Matrix<string> {
@@ -131,7 +129,7 @@ export class GTINValidatorStaticProxy<ThrowError extends boolean, TError extends
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [validateGTINParameterDescriptor, gtinLevelParameterDescriptor]
     })
     isValidGTIN(matrixGTINs: Matrix<string>, gtinLevel: Nullishable<GTINLevel>): Matrix<boolean> {
@@ -140,7 +138,7 @@ export class GTINValidatorStaticProxy<ThrowError extends boolean, TError extends
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [validateGTIN14ParameterDescriptor]
     })
     validateGTIN14(matrixGTIN14s: Matrix<string>): Matrix<string> {
@@ -151,7 +149,7 @@ export class GTINValidatorStaticProxy<ThrowError extends boolean, TError extends
 
     @proxy.describeMethod({
         type: Types.String,
-        isMatrix: true,
+        multiplicity: Multiplicities.Matrix,
         parameterDescriptors: [validateGTIN14ParameterDescriptor]
     })
     isValidGTIN14(matrixGTIN14s: Matrix<string>): Matrix<boolean> {