@ama-sdk/core 11.0.0-next.0 → 11.0.0-next.1

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@ama-sdk/core",
-  "version": "11.0.0-next.0",
+  "version": "11.0.0-next.1",
+  "publishConfig": {
+    "access": "public"
+  },
   "description": "Digital API - SDK Core",
-  "module": "./src/public_api.js",
-  "esm2015": "./esm2015/public_api.js",
-  "esm2020": "./src/public_api.js",
-  "typings": "./src/public_api.d.ts",
+  "module": "src/public_api.js",
+  "esm2015": "esm2015/public_api.js",
+  "esm2020": "src/public_api.js",
+  "typings": "src/public_api.d.ts",
   "sideEffects": false,
   "exports": {
     "./package.json": {
@@ -32,14 +35,35 @@
       "import": "./src/clients/*.js",
       "node": "./cjs/clients/*.js",
       "require": "./cjs/clients/*.js"
+    },
+    "./plugins/*": {
+      "module": "./src/plugins/*/index.js",
+      "esm2020": "./src/plugins/*/index.js",
+      "esm2015": "./esm2015/plugins/*/index.js",
+      "es2020": "./cjs/plugins/*/index.js",
+      "default": "./cjs/plugins/*/index.js",
+      "typings": "./src/plugins/*/index.d.ts",
+      "import": "./src/plugins/*/index.js",
+      "node": "./cjs/plugins/*/index.js",
+      "require": "./cjs/plugins/*/index.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "clients/*": [
+        "src/clients/*.d.ts"
+      ],
+      "plugins/*": [
+        "src/plugins/*/index.d.ts"
+      ]
     }
   },
   "scripts": {
     "nx": "nx",
     "ng": "yarn nx",
     "build": "yarn nx build ama-sdk-core",
-    "build:cjs": "swc src -d dist/cjs -C module.type=commonjs -q",
-    "build:esm2015": "swc src -d dist/esm2015 -C module.type=es6 -q",
+    "build:cjs": "swc src -d dist/cjs -C module.type=commonjs -q --strip-leading-paths",
+    "build:esm2015": "swc src -d dist/esm2015 -C module.type=es6 -q --strip-leading-paths",
     "build:esm2020": "tsc -b tsconfig.build.json",
     "postbuild": "yarn cpy './package.json' dist && patch-package-json-main",
     "prepare:build:builders": "yarn cpy 'schematics/**/*.json' dist/schematics && yarn cpy 'collection.json' dist",
@@ -49,22 +73,21 @@
   },
   "dependencies": {
     "@swc/helpers": "^0.5.0",
-    "tslib": "^2.5.3",
+    "tslib": "^2.6.2",
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "~17.0.0",
-    "@angular/cli": "~17.0.0",
-    "@angular/common": "~17.0.2",
-    "@o3r/schematics": "^11.0.0-next.0",
-    "@schematics/angular": "~17.0.0",
+    "@angular-devkit/schematics": "~17.3.0",
+    "@angular/cli": "~17.3.0",
+    "@angular/common": "~17.3.0",
+    "@o3r/schematics": "^11.0.0-next.1",
+    "@schematics/angular": "~17.3.0",
     "chokidar": "^3.5.2",
-    "cpy": "~11.0.0",
     "globby": "^11.1.0",
     "isomorphic-fetch": "^3.0.0",
     "minimist": "^1.2.6",
     "rxjs": "^7.8.1",
-    "typescript": "~5.2.2"
+    "typescript": "~5.4.2"
   },
   "peerDependenciesMeta": {
     "@angular-devkit/schematics": {
@@ -82,6 +105,9 @@
     "@schematics/angular": {
       "optional": true
     },
+    "chokidar": {
+      "optional": true
+    },
     "isomorphic-fetch": {
       "optional": true
     },
@@ -93,34 +119,35 @@
     }
   },
   "devDependencies": {
-    "@angular-devkit/core": "~17.0.3",
-    "@angular-devkit/schematics": "~17.0.3",
-    "@angular-eslint/eslint-plugin": "~17.1.0",
-    "@angular/common": "~17.0.4",
-    "@angular/core": "~17.0.4",
-    "@nx/eslint-plugin": "~17.1.1",
-    "@nx/jest": "~17.1.1",
-    "@o3r/build-helpers": "^11.0.0-next.0",
-    "@o3r/eslint-plugin": "^11.0.0-next.0",
-    "@schematics/angular": "~17.0.3",
-    "@swc/cli": "^0.1.57",
+    "@angular-devkit/core": "~17.3.0",
+    "@angular-devkit/schematics": "~17.3.0",
+    "@angular-eslint/eslint-plugin": "~17.3.0",
+    "@angular/common": "~17.3.0",
+    "@angular/core": "~17.3.0",
+    "@nx/eslint-plugin": "~18.3.0",
+    "@nx/jest": "~18.3.0",
+    "@o3r/build-helpers": "^11.0.0-next.1",
+    "@o3r/eslint-plugin": "^11.0.0-next.1",
+    "@o3r/test-helpers": "^11.0.0-next.1",
+    "@schematics/angular": "~17.3.0",
+    "@stylistic/eslint-plugin-ts": "^1.5.4",
+    "@swc/cli": "^0.3.0",
     "@swc/core": "^1.3.85",
     "@types/jest": "~29.5.2",
     "@types/minimist": "^1.2.2",
     "@types/node": "^20.0.0",
     "@types/uuid": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "6.11.0",
-    "@typescript-eslint/parser": "^6.11.0",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
     "chokidar": "^3.5.2",
     "copyfiles": "^2.4.1",
-    "cpy": "~11.0.0",
     "cpy-cli": "^5.0.0",
-    "eslint": "^8.42.0",
-    "eslint-import-resolver-node": "^0.3.4",
-    "eslint-plugin-jest": "~27.6.0",
-    "eslint-plugin-jsdoc": "~48.0.0",
+    "eslint": "^8.57.0",
+    "eslint-import-resolver-node": "^0.3.9",
+    "eslint-plugin-jest": "~27.9.0",
+    "eslint-plugin-jsdoc": "~48.2.1",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "^50.0.0",
+    "eslint-plugin-unicorn": "^51.0.1",
     "globby": "^11.1.0",
     "isomorphic-fetch": "~3.0.0",
     "jest": "~29.7.0",
@@ -129,10 +156,10 @@
     "minimist": "^1.2.6",
     "rimraf": "^5.0.1",
     "rxjs": "^7.8.1",
-    "ts-jest": "~29.1.1",
-    "ts-node": "~10.9.1",
-    "type-fest": "^4.3.1",
-    "typescript": "~5.2.2",
+    "ts-jest": "~29.1.2",
+    "ts-node": "~10.9.2",
+    "type-fest": "^4.10.2",
+    "typescript": "~5.4.2",
     "zone.js": "~0.14.2"
   },
   "engines": {
@@ -140,8 +167,8 @@
   },
   "schematics": "./collection.json",
   "bin": {
-    "amasdk-clear-index": "cli/clear-index.cjs",
-    "amasdk-files-pack": "cli/files-pack.cjs"
+    "amasdk-clear-index": "./cli/clear-index.cjs",
+    "amasdk-files-pack": "./cli/files-pack.cjs"
   },
   "contributors": [
     {

package/schematics/ng-add/index.d.ts

@@ -1,7 +1,9 @@
-import { Rule } from '@angular-devkit/schematics';
+import { type Rule } from '@angular-devkit/schematics';
+import type { NgAddSchematicsSchema } from './schema';
 /**
  * Rule to import all the necessary dependency to run an @ama-sdk based application
  * Helps to migrate from previous versions with an import replacement
+ * @param options
  */
-export declare function ngAdd(): Rule;
+export declare const ngAdd: (options: NgAddSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,IAAI,EAAyB,MAAM,4BAA4B,CAAC;AAG/E;;;GAGG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAqD5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAI9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA0EtD;;;;GAIG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}

package/schematics/ng-add/index.js

@@ -2,57 +2,75 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const path = require("node:path");
 const ts = require("typescript");
+const reportMissingSchematicsDep = (logger) => (reason) => {
+    logger.error(`[ERROR]: Adding @ama-sdk/core has failed.
+      If the error is related to missing @o3r dependencies you need to install '@o3r/schematics' to be able to use the @ama-sdk/core ng add. Please run 'ng add @o3r/schematics' .
+      Otherwise, use the error message as guidance.`);
+    throw reason;
+};
 /**
  * Rule to import all the necessary dependency to run an @ama-sdk based application
  * Helps to migrate from previous versions with an import replacement
+ * @param options schema options
  */
-function ngAdd() {
-    const removeImports = async (_, context) => {
-        try {
-            const { removePackages } = await Promise.resolve().then(() => require('@o3r/schematics'));
-            return removePackages(['@dapi/sdk-core']);
-        }
-        catch (e) {
-            // o3r extractors needs o3r/core as peer dep. o3r/core will install o3r/schematics
-            context.logger.error(`[ERROR]: Adding @ama-sdk/core has failed.
-      If the error is related to missing @o3r dependencies you need to install '@o3r/schematics' to be able to use the @ama-sdk/core ng add. Please run 'ng add @o3r/schematics' .
-      Otherwise, use the error message as guidance.`);
-            throw (e);
-        }
+function ngAddFn(options) {
+    const removeImports = async () => {
+        const { removePackages } = await Promise.resolve().then(() => require('@o3r/schematics'));
+        return removePackages(['@dapi/sdk-core']);
     };
     /* ng add rules */
-    const updateImports = async (tree, context) => {
-        try {
-            const { getFilesInFolderFromWorkspaceProjectsInTree } = await Promise.resolve().then(() => require('@o3r/schematics'));
-            const files = getFilesInFolderFromWorkspaceProjectsInTree(tree, '', 'ts');
-            files.forEach((file) => {
-                const sourceFile = ts.createSourceFile(file, tree.readText(file), ts.ScriptTarget.ES2015, true);
-                const dapiSdkCodeImports = sourceFile.statements.filter((node) => ts.isImportDeclaration(node)
-                    && !!node.moduleSpecifier.getText().match(/['"]@dapi\/sdk-core['"]/));
-                if (dapiSdkCodeImports.length) {
-                    const recorder = tree.beginUpdate(file);
-                    dapiSdkCodeImports.forEach((imp) => {
-                        recorder.remove(imp.moduleSpecifier.getStart(), imp.moduleSpecifier.getWidth());
-                        recorder.insertRight(imp.moduleSpecifier.getStart(), '\'@ama-sdk/core\'');
-                    });
-                    tree.commitUpdate(recorder);
-                }
-                return tree;
-            });
-        }
-        catch (e) {
-            // o3r extractors needs o3r/core as peer dep. o3r/core will install o3r/schematics
-            context.logger.error(`[ERROR]: Adding @ama-sdk/core has failed.
-      If the error is related to missing @o3r dependencies you need to install '@o3r/schematics' to be able to use the @ama-sdk/core ng add. Please run 'ng add @o3r/schematics' .
-      Otherwise, use the error message as guidance.`);
-            throw (e);
-        }
+    const updateImports = async (tree) => {
+        const { getFilesInFolderFromWorkspaceProjectsInTree } = await Promise.resolve().then(() => require('@o3r/schematics'));
+        const files = getFilesInFolderFromWorkspaceProjectsInTree(tree, '', 'ts');
+        files.forEach((file) => {
+            const sourceFile = ts.createSourceFile(file, tree.readText(file), ts.ScriptTarget.ES2015, true);
+            const dapiSdkCodeImports = sourceFile.statements.filter((node) => ts.isImportDeclaration(node)
+                && !!node.moduleSpecifier.getText().match(/['"]@dapi\/sdk-core['"]/));
+            if (dapiSdkCodeImports.length) {
+                const recorder = tree.beginUpdate(file);
+                dapiSdkCodeImports.forEach((imp) => {
+                    recorder.remove(imp.moduleSpecifier.getStart(), imp.moduleSpecifier.getWidth());
+                    recorder.insertRight(imp.moduleSpecifier.getStart(), '\'@ama-sdk/core\'');
+                });
+                tree.commitUpdate(recorder);
+            }
+            return tree;
+        });
+    };
+    const addMandatoryPeerDeps = async (tree, context) => {
+        const { getPeerDepWithPattern, getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
+        const workingDirectory = options?.projectName && getWorkspaceConfig(tree)?.projects[options.projectName]?.root || '.';
+        const peerDepToInstall = getPeerDepWithPattern(path.resolve(__dirname, '..', '..', 'package.json'), [
+            'chokidar',
+            'minimist'
+        ]);
+        context.addTask(new tasks_1.NodePackageInstallTask({
+            workingDirectory,
+            packageName: Object.entries(peerDepToInstall.matchingPackagesVersions)
+                // eslint-disable-next-line @typescript-eslint/no-base-to-string, @typescript-eslint/restrict-template-expressions
+                .map(([dependency, version]) => `${dependency}@${version || 'latest'}`)
+                .join(' '),
+            hideOutput: false,
+            quiet: false
+        }));
     };
     return (0, schematics_1.chain)([
         removeImports,
-        updateImports
+        updateImports,
+        addMandatoryPeerDeps
     ]);
 }
+/**
+ * Rule to import all the necessary dependency to run an @ama-sdk based application
+ * Helps to migrate from previous versions with an import replacement
+ * @param options
+ */
+const ngAdd = (options) => async (_, context) => {
+    const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => require('@o3r/schematics')).catch(reportMissingSchematicsDep(context.logger));
+    return createSchematicWithMetricsIfInstalled(ngAddFn)(options);
+};
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

package/schematics/ng-add/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAA+E;AAC/E,iCAAiC;AAEjC;;;GAGG;AACH,SAAgB,KAAK;IAEnB,MAAM,aAAa,GAAG,KAAK,EAAE,CAAO,EAAE,OAAyB,EAAE,EAAE;QACjE,IAAI;YACF,MAAM,EAAC,cAAc,EAAC,GAAG,2CAAa,iBAAiB,EAAC,CAAC;YACzD,OAAO,cAAc,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;SAC3C;QAAC,OAAO,CAAC,EAAE;YACV,kFAAkF;YAClF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;;oDAEyB,CAAC,CAAC;YAChD,MAAM,CAAC,CAAC,CAAC,CAAC;SACX;IACH,CAAC,CAAC;IAEF,kBAAkB;IAClB,MAAM,aAAa,GAAG,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACpE,IAAI;YACF,MAAM,EAAC,2CAA2C,EAAC,GAAG,2CAAa,iBAAiB,EAAC,CAAC;YACtF,MAAM,KAAK,GAAG,2CAA2C,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC1E,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACrB,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,IAAI,EACJ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EACnB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;gBACF,MAAM,kBAAkB,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAgC,EAAE,CAC7F,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC;uBACzB,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,yBAAyB,CAAC,CACrE,CAAC;gBACF,IAAI,kBAAkB,CAAC,MAAM,EAAE;oBAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oBACxC,kBAAkB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;wBACjC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAChF,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,mBAAmB,CAAC,CAAC;oBAC5E,CAAC,CAAC,CAAC;oBACH,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;iBAC7B;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,kFAAkF;YAClF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;;oDAEyB,CAAC,CAAC;YAChD,MAAM,CAAC,CAAC,CAAC,CAAC;SACX;IACH,CAAC,CAAC;IACF,OAAO,IAAA,kBAAK,EAAC;QACX,aAAa;QACb,aAAa;KACd,CAAC,CAAC;AACL,CAAC;AArDD,sBAqDC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}

package/src/clients/api-angular-client.d.ts

@@ -1,8 +1,8 @@
 import type { HttpClient } from '@angular/common/http';
 import { RequestBody, RequestMetadata, RequestOptions, TokenizedOptions } from '../plugins/core/index';
 import { ApiTypes } from '../fwk/api';
-import type { PartialExcept } from '../fwk/api.interface';
-import { ApiClient } from '../fwk/core/api-client';
+import type { Api, PartialExcept } from '../fwk/api.interface';
+import type { ApiClient, RequestOptionsParameters } from '../fwk/core/api-client';
 import { BaseApiClientOptions } from '../fwk/core/base-api-constructor';
 import { ReviverType } from '../fwk/Reviver';
 /** @see BaseApiClientOptions */
@@ -27,11 +27,14 @@ export declare class ApiAngularClient implements ApiClient {
     }>(data: T, names: (keyof T)[]): {
         [p in keyof T]: string;
     };
+    /** @inheritdoc */
+    getRequestOptions(requestOptionsParameters: RequestOptionsParameters): Promise<RequestOptions>;
+    /** @inheritdoc */
     prepareOptions(url: string, method: string, queryParams: {
         [key: string]: string | undefined;
     }, headers: {
         [key: string]: string | undefined;
-    }, body?: RequestBody | undefined, tokenizedOptions?: TokenizedOptions | undefined, metadata?: RequestMetadata<string, string> | undefined): Promise<RequestOptions>;
+    }, body?: RequestBody, tokenizedOptions?: TokenizedOptions, metadata?: RequestMetadata, api?: Api): Promise<RequestOptions>;
     /** @inheritdoc */
     prepareUrl(url: string, queryParameters?: {
         [key: string]: string | undefined;

package/src/clients/api-angular-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-angular-client.d.ts","sourceRoot":"","sources":["../../../src/clients/api-angular-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-angular-client.d.ts","sourceRoot":"","sources":["../../../src/clients/api-angular-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAgB,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGvG,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAC,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,gCAAgC;AAChC,MAAM,WAAW,2BAA4B,SAAQ,oBAAoB;IACvE,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,8BAA8B;AAC9B,MAAM,WAAW,+BAAgC,SAAQ,aAAa,CAAC,2BAA2B,EAAE,UAAU,GAAG,YAAY,CAAC;CAC7H;AAUD,8DAA8D;AAC9D,qBAAa,gBAAiB,YAAW,SAAS;IAEhD,kBAAkB;IACX,OAAO,EAAE,2BAA2B,CAAC;IAE5C;;;OAGG;gBACS,OAAO,EAAE,+BAA+B;IAOpD,kBAAkB;IACX,kBAAkB,CAAC,CAAC,SAAS;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG;SAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM;KAAG;IAIrH,kBAAkB;IACL,iBAAiB,CAAC,wBAAwB,EAAE,wBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC;IAkB3G,kBAAkB;IACL,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,EAAE,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,EAAE,IAAI,CAAC,EAAE,WAAW,EAC7K,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,GAAG;IAa5E,kBAAkB;IACX,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAO;IAI1F,kBAAkB;IACX,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM;IAI9C,kBAAkB;IACX,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,cAAc,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,IAAI,EAAE,GAAG,GAAG,gBAAgB,GAAG,SAAS;IAI1K,kBAAkB;IACL,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IACzJ,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;KAAE,EACnL,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;CAwEpC"}

package/src/clients/api-angular-client.js

@@ -25,25 +25,37 @@ export class ApiAngularClient {
     extractQueryParams(data, names) {
         return extractQueryParams(data, names);
     }
-    async prepareOptions(url, method, queryParams, headers, body, tokenizedOptions, metadata) {
-        const options = {
-            method,
-            headers: new Headers(filterUndefinedValues(headers)),
-            body,
-            queryParams: filterUndefinedValues(queryParams),
-            basePath: url,
-            tokenizedOptions,
-            metadata
+    /** @inheritdoc */
+    async getRequestOptions(requestOptionsParameters) {
+        let opts = {
+            ...requestOptionsParameters,
+            headers: new Headers(filterUndefinedValues(requestOptionsParameters.headers)),
+            queryParams: filterUndefinedValues(requestOptionsParameters.queryParams)
         };
-        let opts = options;
         if (this.options.requestPlugins) {
             for (const plugin of this.options.requestPlugins) {
-                opts = await plugin.load({ logger: this.options.logger }).transform(opts);
+                opts = await plugin.load({
+                    logger: this.options.logger,
+                    apiName: requestOptionsParameters.api?.apiName
+                }).transform(opts);
             }
         }
         return opts;
     }
     /** @inheritdoc */
+    async prepareOptions(url, method, queryParams, headers, body, tokenizedOptions, metadata, api) {
+        return this.getRequestOptions({
+            headers,
+            method,
+            basePath: url,
+            queryParams,
+            body,
+            metadata,
+            tokenizedOptions,
+            api
+        });
+    }
+    /** @inheritdoc */
     prepareUrl(url, queryParameters = {}) {
         return prepareUrl(url, queryParameters);
     }
@@ -63,13 +75,11 @@ export class ApiAngularClient {
         // Execute call
         try {
             const headers = Object.fromEntries(options.headers.entries());
-            const controller = typeof AbortController !== 'undefined' ? new AbortController() : undefined;
-            if (controller) {
-                options.signal = controller.signal;
-            }
             const asyncResponse = new Promise((resolve, reject) => {
                 let data;
-                this.options.httpClient.request(options.method, url, {
+                const metadataSignal = options.metadata?.signal;
+                metadataSignal?.throwIfAborted();
+                const subscription = this.options.httpClient.request(options.method, url, {
                     ...options,
                     observe: 'response',
                     headers
@@ -78,6 +88,11 @@ export class ApiAngularClient {
                     error: (err) => reject(err),
                     complete: () => resolve(data)
                 });
+                metadataSignal?.throwIfAborted();
+                metadataSignal?.addEventListener('abort', () => {
+                    subscription.unsubscribe();
+                    reject(metadataSignal.reason);
+                });
             });
             response = await asyncResponse;
             root = response.body;

package/src/clients/api-angular-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-angular-client.js","sourceRoot":"","sources":["../../../src/clients/api-angular-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-angular-client.js","sourceRoot":"","sources":["../../../src/clients/api-angular-client.ts"],"names":[],"mappings":"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"}

package/src/clients/api-beacon-client.d.ts

@@ -1,7 +1,7 @@
 import type { RequestBody, RequestMetadata, RequestOptions, TokenizedOptions } from '../plugins';
 import type { ApiTypes } from '../fwk/api';
-import type { PartialExcept } from '../fwk/api.interface';
-import type { ApiClient } from '../fwk/core/api-client';
+import type { Api, PartialExcept } from '../fwk/api.interface';
+import type { ApiClient, RequestOptionsParameters } from '../fwk/core/api-client';
 import type { BaseApiClientOptions } from '../fwk/core/base-api-constructor';
 /** @see BaseApiClientOptions */
 export interface BaseApiBeaconClientOptions extends BaseApiClientOptions {
@@ -30,11 +30,13 @@ export declare class ApiBeaconClient implements ApiClient {
         [p in keyof T]: string;
     };
     /** @inheritdoc */
+    getRequestOptions(options: RequestOptionsParameters): Promise<RequestOptions>;
+    /** @inheritdoc */
     prepareOptions(url: string, method: string, queryParams: {
-        [key: string]: string;
+        [key: string]: string | undefined;
     }, headers: {
-        [key: string]: string;
-    }, body?: RequestBody, tokenizedOptions?: TokenizedOptions, metadata?: RequestMetadata): Promise<RequestOptions>;
+        [key: string]: string | undefined;
+    }, body?: RequestBody, tokenizedOptions?: TokenizedOptions, metadata?: RequestMetadata, api?: Api): Promise<RequestOptions>;
     /** @inheritdoc */
     prepareUrl(url: string, queryParameters?: {
         [key: string]: string;

package/src/clients/api-beacon-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-beacon-client.d.ts","sourceRoot":"","sources":["../../../src/clients/api-beacon-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACjG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,gCAAgC;AAChC,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE,kBAAkB;IAClB,YAAY,EAAE,KAAK,EAAE,CAAC;CACvB;AAED,8BAA8B;AAC9B,MAAM,WAAW,8BAA+B,SAAQ,aAAa,CAAC,IAAI,CAAC,0BAA0B,EAAE,cAAc,CAAC,EAAE,UAAU,CAAC;CAClI;AAcD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAE/C,kBAAkB;IACX,OAAO,EAAE,0BAA0B,CAAC;IAE3C;;;OAGG;gBACS,OAAO,EAAE,8BAA8B;IAYnD,kBAAkB;IACX,kBAAkB,CAAC,CAAC,SAAS;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG;SAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM;KAAG;IAIrH,kBAAkB;IACX,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,IAAI,CAAC,EAAE,WAAW,EAC/I,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;IA+B3F,kBAAkB;IACX,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM;IAInF,kBAAkB;IACX,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,cAAc,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,IAAI,EAAE,GAAG,GAAG,gBAAgB,GAAG,SAAS;IAI1K,kBAAkB;IACX,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW;IAI5D,kBAAkB;IACX,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;CAanK"}
+{"version":3,"file":"api-beacon-client.d.ts","sourceRoot":"","sources":["../../../src/clients/api-beacon-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACjG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,gCAAgC;AAChC,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE,kBAAkB;IAClB,YAAY,EAAE,KAAK,EAAE,CAAC;CACvB;AAED,8BAA8B;AAC9B,MAAM,WAAW,8BAA+B,SAAQ,aAAa,CAAC,IAAI,CAAC,0BAA0B,EAAE,cAAc,CAAC,EAAE,UAAU,CAAC;CAClI;AAgBD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAE/C,kBAAkB;IACX,OAAO,EAAE,0BAA0B,CAAC;IAE3C;;;OAGG;gBACS,OAAO,EAAE,8BAA8B;IAYnD,kBAAkB;IACX,kBAAkB,CAAC,CAAC,SAAS;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG;SAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM;KAAG;IAIrH,kBAAkB;IACX,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC;IAyBpF,kBAAkB;IACX,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,EAAE,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,EAAE,IAAI,CAAC,EAAE,WAAW,EACvK,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,GAAG;IAa5E,kBAAkB;IACX,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM;IAInF,kBAAkB;IACX,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,cAAc,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,IAAI,EAAE,GAAG,GAAG,gBAAgB,GAAG,SAAS;IAI1K,kBAAkB;IACX,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW;IAI5D,kBAAkB;IACX,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;CAanK"}

package/src/clients/api-beacon-client.js

@@ -8,7 +8,9 @@ const DEFAULT_OPTIONS = {
  * Determine if the given value is a promise
  * @param value The value to test
  */
-const isPromise = (value) => value && typeof value.then === 'function';
+// NOTE: the `extends unknown` is required for ESM build with TSC
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
+const isPromise = (value) => value instanceof Promise;
 /**
  * The Beacon API client is an implementation of the API Client using the Navigator Beacon API.
  * The Beacon API is a low-level API that allows you to send message synchronously. It can be used to send request on window unload or before unload events.
@@ -32,23 +34,18 @@ export class ApiBeaconClient {
         return extractQueryParams(data, names);
     }
     /** @inheritdoc */
-    prepareOptions(url, method, queryParams, headers, body, tokenizedOptions, metadata) {
-        if (method.toUpperCase() !== 'POST') {
-            throw new Error(`Unsupported method: ${method}. The beacon API only supports POST.`);
+    getRequestOptions(options) {
+        if (options.method.toUpperCase() !== 'POST') {
+            throw new Error(`Unsupported method: ${options.method}. The beacon API only supports POST.`);
         }
-        const options = {
-            method,
-            headers: new Headers(filterUndefinedValues(headers)),
-            body,
-            queryParams: filterUndefinedValues(queryParams),
-            basePath: url,
-            tokenizedOptions,
-            metadata
+        let opts = {
+            ...options,
+            headers: new Headers(filterUndefinedValues(options.headers)),
+            queryParams: filterUndefinedValues(options.queryParams)
         };
-        let opts = options;
         if (this.options.requestPlugins) {
             for (const plugin of this.options.requestPlugins) {
-                const changedOpt = plugin.load({ logger: this.options.logger }).transform(opts);
+                const changedOpt = plugin.load({ logger: this.options.logger, apiName: options.api?.apiName }).transform(opts);
                 if (isPromise(changedOpt)) {
                     throw new Error(`Request plugin ${plugin.constructor.name} has async transform method. Only sync methods are supported with the Beacon client.`);
                 }
@@ -60,6 +57,19 @@ export class ApiBeaconClient {
         return Promise.resolve(opts);
     }
     /** @inheritdoc */
+    prepareOptions(url, method, queryParams, headers, body, tokenizedOptions, metadata, api) {
+        return this.getRequestOptions({
+            headers,
+            method,
+            basePath: url,
+            queryParams,
+            body,
+            metadata,
+            tokenizedOptions,
+            api
+        });
+    }
+    /** @inheritdoc */
     prepareUrl(url, queryParameters) {
         return prepareUrl(url, queryParameters);
     }

package/src/clients/api-beacon-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-beacon-client.js","sourceRoot":"","sources":["../../../src/clients/api-beacon-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-beacon-client.js","sourceRoot":"","sources":["../../../src/clients/api-beacon-client.ts"],"names":[],"mappings":"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"}

package/src/clients/api-fetch-client.d.ts

@@ -1,7 +1,7 @@
 import { FetchPlugin, RequestBody, RequestMetadata, RequestOptions, TokenizedOptions } from '../plugins/core/index';
 import { ApiTypes } from '../fwk/api';
-import type { PartialExcept } from '../fwk/api.interface';
-import { ApiClient } from '../fwk/core/api-client';
+import type { Api, PartialExcept } from '../fwk/api.interface';
+import type { ApiClient, RequestOptionsParameters } from '../fwk/core/api-client';
 import { BaseApiClientOptions } from '../fwk/core/base-api-constructor';
 import { ReviverType } from '../fwk/Reviver';
 /** @see BaseApiClientOptions */
@@ -34,11 +34,13 @@ export declare class ApiFetchClient implements ApiClient {
         [key: string]: string;
     }, data: any): TokenizedOptions | undefined;
     /** @inheritdoc */
+    getRequestOptions(requestOptionsParameters: RequestOptionsParameters): Promise<RequestOptions>;
+    /** @inheritdoc */
     prepareOptions(url: string, method: string, queryParams: {
         [key: string]: string | undefined;
     }, headers: {
         [key: string]: string | undefined;
-    }, body?: RequestBody, tokenizedOptions?: TokenizedOptions, metadata?: RequestMetadata): Promise<RequestOptions>;
+    }, body?: RequestBody, tokenizedOptions?: TokenizedOptions, metadata?: RequestMetadata, api?: Api): Promise<RequestOptions>;
     /** @inheritdoc */
     prepareUrl(url: string, queryParameters?: {
         [key: string]: string | undefined;