@aidc-toolkit/app-extension 1.0.28-beta → 1.0.31-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aidc-toolkit/app-extension",
-  "version": "1.0.28-beta",
+  "version": "1.0.31-beta",
   "description": "Application extension framework for AIDC Toolkit",
   "type": "module",
   "main": "dist/index.js",
@@ -28,12 +28,12 @@
     "build:doc": "npm run build:dev"
   },
   "devDependencies": {
-    "@aidc-toolkit/dev": "1.0.28-beta"
+    "@aidc-toolkit/dev": "1.0.31-beta"
   },
   "dependencies": {
-    "@aidc-toolkit/core": "1.0.28-beta",
-    "@aidc-toolkit/gs1": "1.0.28-beta",
-    "@aidc-toolkit/utility": "1.0.28-beta",
+    "@aidc-toolkit/core": "1.0.31-beta",
+    "@aidc-toolkit/gs1": "1.0.31-beta",
+    "@aidc-toolkit/utility": "1.0.31-beta",
     "i18next": "^25.7.2"
   }
 }

package/src/generator/generator.ts

@@ -195,20 +195,23 @@ export abstract class Generator {
      * @param localizedKeyPrefix
      * Localized key prefix.
      *
+     * @param namespacePrefix
+     * Namespace prefix to be appended to name.
+     *
      * @param localizationCallback
      * Callback to finalize localization.
      *
      * @returns
      * Localization.
      */
-    #generateLocalization<TLocalization extends Localization>(locale: string, localizedKeyPrefix: string, localizationCallback: (locale: string, localization: Localization) => TLocalization): TLocalization {
+    #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: i18nextAppExtension.t(`${localizedKeyPrefix}name` as ParseKeys, lngOption),
+            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)
         });
@@ -231,19 +234,20 @@ export abstract class Generator {
         try {
             for (const [_namespaceClassName, classDescriptor] of proxy.classDescriptorsMap.entries()) {
                 const namespace = classDescriptor.namespace;
+                const namespacePrefix = namespace === undefined ? "" : `${namespace}.`;
+                const namespacePath = namespace === undefined ? "" : `${namespace}/`;
 
                 this.createProxyObject(classDescriptor);
 
                 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}.`, (locale, localization) => ({
+                        [locale, this.#generateLocalization<FunctionLocalization>(locale, `Functions.${namespaceFunctionName}.`, namespacePrefix, (locale, localization) => ({
                             ...localization,
-                            documentationURL: `${Generator.#DOCUMENTATION_BASE_URL}${locale === this.defaultLocale ? "" : `${locale}/`}${Generator.#DOCUMENTATION_PATH}${namespace === undefined ? "" : `${namespace}/`}${localization.name}.html`,
+                            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)]
+                                [parameterDescriptor.name, this.#generateLocalization(locale, `Parameters.${parameterDescriptor.name}.`, "", (_locale, localization) => localization)]
                             ))
                         }))]
                     ));

package/src/proxy.ts

@@ -2,6 +2,7 @@ import {
     type AbstractConstructor,
     type Constructor,
     getLogger,
+    type LogLevel,
     LogLevels,
     omit,
     type TypedAbstractConstructor
@@ -146,6 +147,9 @@ interface TargetLogger {
     /**
      * Log a method call.
      *
+     * @param logLevel
+     * Log level.
+     *
      * @param methodName
      * Method name.
      *
@@ -155,7 +159,7 @@ interface TargetLogger {
      * @param result
      * Output result.
      */
-    log: (methodName: string, args: unknown[], result: unknown) => void;
+    log: (logLevel: LogLevel, methodName: string, args: unknown[], result: unknown) => void;
 }
 
 /**
@@ -165,6 +169,8 @@ export class Proxy {
     /**
      * Logger.
      */
+    // TODO Add configuration parameter to output JSON.
+    // TODO Change this to LogLevels.Trace when configuration available.
     readonly #logger: Logger<unknown> = getLogger(LogLevels.Info);
 
     /**
@@ -419,14 +425,14 @@ export class Proxy {
                 /**
                  * @inheritDoc
                  */
-                log(methodName: string, args: unknown[], result: unknown): void {
+                log(logLevel: LogLevel, methodName: string, args: unknown[], result: unknown): void {
                     // // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Type hierarchy is known.
                     // const appExtension = (this as unknown as T).appExtension;
 
                     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- Method name is known to be valid at this point.
                     const methodDescriptor = methodDescriptorsMap.get(methodName)!;
 
-                    logger.info(JSON.stringify({
+                    logger.log(logLevel, "", JSON.stringify({
                         namespace: decoratorClassDescriptor.namespace,
                         className: name,
                         methodName,
@@ -485,10 +491,21 @@ export class Proxy {
             });
 
             return function methodProxy(this: TThis, ...args: TArguments): TReturn {
-                const result = target.call(this, ...args);
-
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Class has been modified to add log method.
-                (this as TargetLogger).log(name, args, result);
+                const targetLogger = this as TargetLogger;
+
+                let result: TReturn;
+
+                try {
+                    result = target.call(this, ...args);
+
+                    // TODO Change this to LogLevels.Trace when configuration available.
+                    targetLogger.log(LogLevels.Info, name, args, result);
+                } catch (e: unknown) {
+                    targetLogger.log(LogLevels.Error, name, args, e instanceof Error ? `${e.name}: ${e.message}` : `Unknown exception: ${String(e)}`);
+
+                    throw e;
+                }
 
                 return result;
             };

package/tsconfig.json

@@ -1,4 +1,5 @@
 {
+  "extends": "@aidc-toolkit/dev/tsconfig-template.json",
   "include": [],
   "references": [
     {