@ama-sdk/core 11.6.0-prerelease.2 → 11.6.0-prerelease.21

package/esm2015/plugins/timeout/timeout.fetch.js

@@ -59,6 +59,13 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
 function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
@@ -163,22 +170,22 @@ import { ResponseTimeoutError } from '../../fwk/errors';
  * Check if a message can be cast as an {@link ImpervaCaptchaMessage}
  * @param message
  */ function isImpervaCaptchaMessage(message) {
-    return !!message && Object.prototype.hasOwnProperty.call(message, 'impervaChallenge') && Object.prototype.hasOwnProperty.call(message.impervaChallenge, 'status') && Object.prototype.hasOwnProperty.call(message.impervaChallenge, 'type') && message.impervaChallenge.type === 'captcha';
+    var impervaCaptchaMessage = message;
+    return !!impervaCaptchaMessage && Object.prototype.hasOwnProperty.call(impervaCaptchaMessage, 'impervaChallenge') && Object.prototype.hasOwnProperty.call(impervaCaptchaMessage.impervaChallenge, 'status') && Object.prototype.hasOwnProperty.call(impervaCaptchaMessage.impervaChallenge, 'type') && impervaCaptchaMessage.impervaChallenge.type === 'captcha';
 }
 /**
  * Captures Imperva captcha events and calls the event callback
  * It can only be used for browser's integrating imperva captcha
- * @param config: list of host names that can trigger a captcha event
- * @param config
+ * @param config list of host names that can trigger a captcha event
  * @returns removeEventListener
  */ export var impervaCaptchaEventHandlerFactory = function(config) {
     return function(timeoutPauseCallback) {
         var onImpervaCaptcha = function(event) {
             var originHostname = new URL(event.origin).hostname;
-            if (originHostname !== location.hostname && ((config === null || config === void 0 ? void 0 : config.whiteListedHostNames) || []).indexOf(originHostname) === -1) {
+            if (originHostname !== location.hostname && !((config === null || config === void 0 ? void 0 : config.whiteListedHostNames) || []).includes(originHostname)) {
                 return;
             }
-            var message = event.data;
+            /* eslint-disable @typescript-eslint/no-unsafe-assignment -- type is checked below */ var message = event.data;
             if (typeof event.data === 'string') {
                 try {
                     message = JSON.parse(event.data);
@@ -189,7 +196,7 @@ import { ResponseTimeoutError } from '../../fwk/errors';
             if ((typeof message === "undefined" ? "undefined" : _type_of(message)) === 'object' && isImpervaCaptchaMessage(message)) {
                 timeoutPauseCallback(message.impervaChallenge.status === 'started' ? 'timeoutStopped' : 'timeoutStarted');
             }
-        };
+        /* eslint-enable @typescript-eslint/no-unsafe-assignment */ };
         addEventListener('message', onImpervaCaptcha);
         return function() {
             removeEventListener('message', onImpervaCaptcha);
@@ -228,7 +235,7 @@ import { ResponseTimeoutError } from '../../fwk/errors';
                 var _this = this;
                 return {
                     transform: function(fetchCall) {
-                        return(// eslint-disable-next-line no-async-promise-executor
+                        return(// eslint-disable-next-line no-async-promise-executor -- all await are handled with a try-catch block
                         new Promise(/*#__PURE__*/ function() {
                             var _ref = _async_to_generator(function(resolve, reject) {
                                 var timeoutCallback, timer, timerCallback, _context_controller, response, ex;
@@ -276,7 +283,7 @@ import { ResponseTimeoutError } from '../../fwk/errors';
                                             ];
                                         case 3:
                                             ex = _state.sent();
-                                            reject(ex);
+                                            reject(_instanceof(ex, Error) ? ex : new Error(ex.toString()));
                                             return [
                                                 3,
                                                 5

package/esm2015/plugins/wait-for/wait-for.fetch.js

@@ -251,11 +251,11 @@ function _ts_generator(thisArg, body) {
                 var data;
                 var _this = this;
                 return {
-                    // eslint-disable-next-line no-async-promise-executor
+                    // eslint-disable-next-line no-async-promise-executor -- all await are handled with a try-catch block
                     canStart: function() {
                         return new Promise(/*#__PURE__*/ function() {
                             var _ref = _async_to_generator(function(resolve) {
-                                var didTimeOut, timer, canStartCondition, canStart, ex;
+                                var didTimeOut, timer, canStartCondition, canStart, e;
                                 return _ts_generator(this, function(_state) {
                                     switch(_state.label){
                                         case 0:
@@ -295,7 +295,7 @@ function _ts_generator(thisArg, body) {
                                                 6
                                             ];
                                         case 4:
-                                            ex = _state.sent();
+                                            e = _state.sent();
                                             if (!didTimeOut) {
                                                 resolve(false);
                                             }

package/esm2015/plugins/wait-for/wait-for.spec.js

@@ -343,7 +343,7 @@ describe('Wait For Fetch Plugin', function() {
                     response = {
                         test: true
                     };
-                    fetchCall = Promise.reject(response);
+                    fetchCall = Promise.reject(new Error(JSON.stringify(response)));
                     _state.label = 1;
                 case 1:
                     _state.trys.push([

package/esm2015/utils/crypto.js

@@ -233,18 +233,18 @@ function _encryptPayload() {
                     if (additionalAuthenticatedData) {
                         aesParams.additionalData = additionalAuthenticatedData;
                     }
-                    if (!(typeof window.msCrypto !== 'undefined')) return [
+                    if (!(typeof window.msCrypto === 'undefined')) return [
                         3,
                         2
                     ];
                     return [
                         4,
-                        promisifyMsCrypto(window.msCrypto.subtle.encrypt(aesParams, key, payload))
+                        window.crypto.subtle.encrypt(aesParams, key, payload)
                     ];
                 case 1:
                     aesOutput = _state.sent();
-                    ciphertext = aesOutput.ciphertext;
-                    authenticationTag = aesOutput.tag;
+                    ciphertext = aesOutput.slice(0, -authenticationTagLength / 8);
+                    authenticationTag = aesOutput.slice(-authenticationTagLength / 8);
                     return [
                         3,
                         4
@@ -252,12 +252,12 @@ function _encryptPayload() {
                 case 2:
                     return [
                         4,
-                        window.crypto.subtle.encrypt(aesParams, key, payload)
+                        promisifyMsCrypto(window.msCrypto.subtle.encrypt(aesParams, key, payload))
                     ];
                 case 3:
                     aesOutput1 = _state.sent();
-                    ciphertext = aesOutput1.slice(0, -authenticationTagLength / 8);
-                    authenticationTag = aesOutput1.slice(-authenticationTagLength / 8);
+                    ciphertext = aesOutput1.ciphertext;
+                    authenticationTag = aesOutput1.tag;
                     _state.label = 4;
                 case 4:
                     return [

package/esm2015/utils/encoder.js

@@ -1,4 +1,4 @@
-// The content of this file is inspired from https://github.com/inexorabletash/text-encoding/blob/master/lib/encoding.js
+/* eslint-disable @stylistic/brace-style -- explication with inline comments */ /* eslint-disable no-bitwise -- working on bytes */ // The content of this file is inspired from https://github.com/inexorabletash/text-encoding/blob/master/lib/encoding.js
 // in order to support UTF8 strings encoding in case TextEncoder is not available
 /**
  * Represents a byte stream to be processed by and Encoder
@@ -64,7 +64,7 @@ var Stream = /*#__PURE__*/ function() {
     function Stream(tokens) {
         _class_call_check(this, Stream);
         _define_property(this, "tokens", void 0);
-        this.tokens = [].slice.call(tokens);
+        this.tokens = _to_consumable_array(tokens);
         // Reversed as push/pop is more efficient than shift/unshift.
         this.tokens.reverse();
     }
@@ -72,9 +72,9 @@ var Stream = /*#__PURE__*/ function() {
         {
             key: "endOfStream",
             get: /**
-   * @returns True if end-of-stream has been hit.
+   * True if end-of-stream has been hit.
    */ function get() {
-                return !this.tokens.length;
+                return this.tokens.length === 0;
             }
         },
         {
@@ -86,7 +86,7 @@ var Stream = /*#__PURE__*/ function() {
    * @returns Get the next token from the stream, or
    * end_of_stream.
    */ function read() {
-                if (!this.tokens.length) {
+                if (this.tokens.length === 0) {
                     return Stream.END_OF_STREAM;
                 }
                 return this.tokens.pop();
@@ -102,7 +102,7 @@ var Stream = /*#__PURE__*/ function() {
    * stream.
    */ function prepend(token) {
                 if (Array.isArray(token)) {
-                    while(token.length){
+                    while(token.length > 0){
                         this.tokens.push(token.pop());
                     }
                 } else {
@@ -120,7 +120,7 @@ var Stream = /*#__PURE__*/ function() {
    * stream.
    */ function push(token) {
                 if (Array.isArray(token)) {
-                    while(token.length){
+                    while(token.length > 0){
                         this.tokens.unshift(token.shift());
                     }
                 } else {
@@ -134,8 +134,7 @@ var Stream = /*#__PURE__*/ function() {
 _define_property(Stream, "END_OF_STREAM", -1);
 /**
  * Returns the byte equivalent given a string
- * @param string Input string of UTF-16 code units.
- * @param s
+ * @param s Input string of UTF-16 code units.
  * @returns Code points.
  */ function stringToCodePoints(s) {
     // https://heycam.github.io/webidl/#dfn-obtain-unicode
@@ -169,14 +168,11 @@ _define_property(Stream, "END_OF_STREAM", -1);
                 // 2. If 0xDC00 ≤ d ≤ 0xDFFF, then:
                 if (0xDC00 <= d && d <= 0xDFFF) {
                     // 1. Let a be c & 0x3FF.
-                    // eslint-disable-next-line no-bitwise
                     var a = c & 0x3FF;
                     // 2. Let b be d & 0x3FF.
-                    // eslint-disable-next-line no-bitwise
                     var b = d & 0x3FF;
                     // 3. Append to U the Unicode character with code point
                     // 2^16+2^10*a+b.
-                    // eslint-disable-next-line no-bitwise
                     u.push(0x10000 + (a << 10) + b);
                     // 4. Set i to i+1.
                     i += 1;
@@ -212,10 +208,10 @@ _define_property(Stream, "END_OF_STREAM", -1);
         {
             key: "inRange",
             value: /**
+   * True if a >= min and a <= max.
    * @param a The number to test.
    * @param min The minimum value in the range, inclusive.
    * @param max The maximum value in the range, inclusive.
-   * @returns {boolean} True if a >= min and a <= max.
    */ function inRange(a, min, max) {
                 return min <= a && a <= max;
             }
@@ -248,17 +244,14 @@ _define_property(Stream, "END_OF_STREAM", -1);
                 }
                 // 4. Let bytes be a byte sequence whose first byte is (code
                 // point >> (6 × count)) + offset.
-                // eslint-disable-next-line @typescript-eslint/restrict-plus-operands,no-bitwise
                 var bytes = [
                     (codePoint >> 6 * count) + offset
                 ];
                 // 5. Run these substeps while count is greater than 0:
                 while(count > 0){
                     // 1. Set temp to code point >> (6 × (count − 1)).
-                    // eslint-disable-next-line no-bitwise
                     var temp = codePoint >> 6 * (count - 1);
                     // 2. Append to bytes 0x80 | (temp & 0x3F).
-                    // eslint-disable-next-line no-bitwise
                     bytes.push(0x80 | temp & 0x3F);
                     // 3. Decrease count by one.
                     count -= 1;
@@ -276,7 +269,6 @@ _define_property(Stream, "END_OF_STREAM", -1);
                 var output = [];
                 var result;
                 // 3. While true, run these substeps:
-                // eslint-disable-next-line no-constant-condition
                 while(true){
                     // 1. Let token be the result of reading from input.
                     var token = input.read();

package/esm2015/utils/generic-api.js

@@ -195,10 +195,9 @@ import { ApiTypes } from '../fwk';
                             case 0:
                                 metadataHeaderAccept = ((_requestOptions_metadata = requestOptions.metadata) === null || _requestOptions_metadata === void 0 ? void 0 : _requestOptions_metadata.headerAccept) || 'application/json';
                                 headers = _object_spread({
-                                    // eslint-disable-next-line @typescript-eslint/naming-convention
                                     'Content-Type': ((_requestOptions_metadata1 = requestOptions.metadata) === null || _requestOptions_metadata1 === void 0 ? void 0 : _requestOptions_metadata1.headerContentType) || 'application/json'
                                 }, metadataHeaderAccept ? {
-                                    'Accept': metadataHeaderAccept
+                                    Accept: metadataHeaderAccept
                                 } : {});
                                 requestParameters = _object_spread({
                                     api: _this,

package/esm2015/utils/ie11.js

@@ -6,6 +6,7 @@
         cryptoOutput.oncomplete = function(e) {
             return resolve(e.target.result);
         };
+        // eslint-disable-next-line unicorn/prefer-add-event-listener -- false positive
         cryptoOutput.onerror = function(e) {
             return reject(e);
         };

package/esm2015/utils/index.js

@@ -1,6 +1,6 @@
 export * from './crypto';
 export * from './encoder';
+export * from './generic-api';
 export * from './ie11';
 export * from './json-token';
 export * from './mime-types';
-export * from './generic-api';

package/esm2015/utils/json-token.js

@@ -132,12 +132,12 @@ import { Encoder } from './encoder';
     // then we convert the percent encodings into raw bytes, and finally feed it to btoa() function.
     // encodeURI escape all non-ASCII characters but we don't want to escape latin non-ascii characters
     // (charCode between 128 and 255).
-    return window.btoa(encodeURI(str).replace(/%C2%([89AB][0-9A-F])/g, function(_match, p1) {
-        return String.fromCharCode(parseInt('0x' + p1, 16));
-    }).replace(/%C3%([89AB][0-9A-F])/g, function(_match, p1) {
-        return String.fromCharCode(parseInt('0xc0', 16) + parseInt('0x' + p1, 16) - parseInt('0x80', 16));
-    }).replace(/%([0-9A-F]{2})/g, function(_match, p1) {
-        return String.fromCharCode(parseInt('0x' + p1, 16));
+    return window.btoa(encodeURI(str).replace(/%C2%([89AB][\dA-F])/g, function(_match, p1) {
+        return String.fromCharCode(Number.parseInt('0x' + p1, 16));
+    }).replace(/%C3%([89AB][\dA-F])/g, function(_match, p1) {
+        return String.fromCharCode(Number.parseInt('0xc0', 16) + Number.parseInt('0x' + p1, 16) - Number.parseInt('0x80', 16));
+    }).replace(/%([\dA-F]{2})/g, function(_match, p1) {
+        return String.fromCharCode(Number.parseInt('0x' + p1, 16));
     }));
 }
 /**
@@ -257,7 +257,7 @@ import { Encoder } from './encoder';
  */ export function createJweEncoder() {
     var aesTagLengthInBits = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 128, useHeaderAsAAD = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
     var base64Encoder = createBase64UrlEncoder();
-    var stringEncoder = typeof window.TextEncoder !== 'undefined' ? new TextEncoder() : new Encoder();
+    var stringEncoder = typeof window.TextEncoder === 'undefined' ? new Encoder() : new TextEncoder();
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(param, jwePayload, publicProperties) {
             var publicKey, keyId, jweHeader, cek, wrappedCek, iv, serializedHeader, _ref, ciphertext, authenticationTag;

package/esm2015/utils/json-token.spec.js

@@ -168,7 +168,7 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-var crypto = require('node:crypto');
+import crypto from 'node:crypto';
 import { base64DecodeUrl, createBase64Decoder, createBase64Encoder, createBase64UrlDecoder, createBase64UrlEncoder, createJweEncoder } from './json-token';
 describe('JSON token utils', function() {
     it('should encode and decode in base64 properly a string that contains characters occupying more than 1 byte', function() {
@@ -194,7 +194,7 @@ describe('JSON Web Encryption Token', function() {
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    /* eslint-disable @typescript-eslint/naming-convention */ expectedJwePayload = {
+                    expectedJwePayload = {
                         iat: 0,
                         exp: 3600,
                         iss: 'DEMO_JWE',
@@ -204,7 +204,7 @@ describe('JSON Web Encryption Token', function() {
                             '{lastName}': 'Doe'
                         }
                     };
-                    /* eslint-enable @typescript-eslint/naming-convention */ expectedJweHeader = {
+                    expectedJweHeader = {
                         alg: 'RSA-OAEP-256',
                         enc: 'A256GCM',
                         typ: 'JWE',
@@ -260,8 +260,7 @@ describe('JSON Web Encryption Token', function() {
                         167,
                         206
                     ]);
-                    // eslint-disable-next-line max-len
-                    expectedJweEncryptedKey = new Uint8Array([
+                    /* eslint-disable @stylistic/max-len -- keep the buffer on the same line */ expectedJweEncryptedKey = new Uint8Array([
                         37,
                         70,
                         170,
@@ -519,7 +518,6 @@ describe('JSON Web Encryption Token', function() {
                         239,
                         108
                     ]);
-                    // eslint-disable-next-line max-len
                     outputAesGcm = new Uint8Array([
                         179,
                         46,
@@ -638,7 +636,7 @@ describe('JSON Web Encryption Token', function() {
                         126,
                         8
                     ]);
-                    global.window = {
+                    /* eslint-enable @stylistic/max-len */ global.window = {
                         btoa: function(data) {
                             return Buffer.from(data, 'ascii').toString('base64');
                         },
@@ -672,9 +670,9 @@ describe('JSON Web Encryption Token', function() {
                         authTagLength: 12
                     });
                     decipher.setAuthTag(Buffer.from(base64DecodeUrl(authenticationTag), 'base64'));
-                    decrypted = decipher.update(Buffer.from(base64DecodeUrl(cipherContent), 'base64'));
-                    decrypted += decipher.final();
-                    expect(decrypted.toString()).toEqual(JSON.stringify(expectedJwePayload));
+                    decrypted = decipher.update(Buffer.from(base64DecodeUrl(cipherContent), 'base64')).toString();
+                    decrypted += decipher.final().toString();
+                    expect(decrypted).toEqual(JSON.stringify(expectedJwePayload));
                     return [
                         2
                     ];

package/esm2015/utils/mime-types.js

@@ -1,4 +1,4 @@
-export var jsonRegex = /^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$/i;
+export var jsonRegex = /^(:?application\/json|[^\t /;]+\/[^\t /;]+\+json)[\t ]*(:?;.*)?$/i;
 /**
  * Return true if the input corresponds to a JSON MIME type
  * @param mime

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/core",
-  "version": "11.6.0-prerelease.2",
+  "version": "11.6.0-prerelease.21",
   "publishConfig": {
     "access": "public"
   },
@@ -90,7 +90,7 @@
     "@angular-devkit/schematics": "~18.2.0",
     "@angular/cli": "~18.2.0",
     "@angular/common": "~18.2.0",
-    "@o3r/schematics": "^11.6.0-prerelease.2",
+    "@o3r/schematics": "^11.6.0-prerelease.21",
     "@schematics/angular": "~18.2.0",
     "isomorphic-fetch": "^3.0.0",
     "rxjs": "^7.8.1",
@@ -125,31 +125,36 @@
   "devDependencies": {
     "@angular-devkit/core": "~18.2.0",
     "@angular-devkit/schematics": "~18.2.0",
-    "@angular-eslint/eslint-plugin": "~18.3.0",
     "@angular/common": "~18.2.0",
     "@angular/core": "~18.2.0",
+    "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
     "@nx/eslint-plugin": "~19.5.0",
     "@nx/jest": "~19.5.0",
-    "@o3r/build-helpers": "^11.6.0-prerelease.2",
-    "@o3r/eslint-plugin": "^11.6.0-prerelease.2",
-    "@o3r/test-helpers": "^11.6.0-prerelease.2",
+    "@o3r/build-helpers": "^11.6.0-prerelease.21",
+    "@o3r/eslint-plugin": "^11.6.0-prerelease.21",
+    "@o3r/schematics": "^11.6.0-prerelease.21",
+    "@o3r/test-helpers": "^11.6.0-prerelease.21",
     "@schematics/angular": "~18.2.0",
-    "@stylistic/eslint-plugin-ts": "~2.4.0",
+    "@stylistic/eslint-plugin": "~2.7.0",
     "@swc/cli": "~0.5.0",
     "@swc/core": "~1.9.0",
     "@types/jest": "~29.5.2",
     "@types/node": "^20.0.0",
     "@types/uuid": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
-    "@typescript-eslint/parser": "^7.14.1",
-    "@typescript-eslint/utils": "^7.14.1",
+    "@typescript-eslint/parser": "~8.16.0",
+    "angular-eslint": "~18.4.0",
     "cpy-cli": "^5.0.0",
-    "eslint": "^8.57.0",
+    "eslint": "~9.14.0",
     "eslint-import-resolver-node": "^0.3.9",
+    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-import-newlines": "^1.4.0",
     "eslint-plugin-jest": "~28.8.0",
-    "eslint-plugin-jsdoc": "~48.11.0",
+    "eslint-plugin-jsdoc": "~50.2.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "^54.0.0",
+    "eslint-plugin-unicorn": "^56.0.0",
+    "eslint-plugin-unused-imports": "^4.1.4",
+    "globals": "^15.9.0",
     "isomorphic-fetch": "~3.0.0",
     "jest": "~29.7.0",
     "jest-junit": "~16.0.0",
@@ -163,6 +168,7 @@
     "ts-node": "~10.9.2",
     "type-fest": "^4.10.2",
     "typescript": "~5.5.4",
+    "typescript-eslint": "~8.16.0",
     "zone.js": "~0.14.2"
   },
   "engines": {

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,EAAS,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAI9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAuEtD;;;;GAIG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAKpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAoElB;;;;GAIG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}

package/schematics/ng-add/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
+const path = require("node:path");
 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.
@@ -11,43 +11,41 @@ const reportMissingSchematicsDep = (logger) => (reason) => {
       Otherwise, use the error message as guidance.`);
     throw reason;
 };
+const removeImports = async () => {
+    const { removePackages } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    return removePackages(['@dapi/sdk-core']);
+};
+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)
+            && !!/["']@dapi\/sdk-core["']/.test(node.moduleSpecifier.getText()));
+        if (dapiSdkCodeImports.length > 0) {
+            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;
+    });
+};
 /**
  * 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 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) => {
-        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 workingDirectory = (options?.projectName && getWorkspaceConfig(tree)?.projects[options.projectName]?.root) || '.';
         const peerDepToInstall = getPeerDepWithPattern(path.resolve(__dirname, '..', '..', 'package.json'));
         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,

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC"}

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

@@ -1,11 +1,11 @@
 import type { HttpClient } from '@angular/common/http';
-import type { RequestOptions, TokenizedOptions } from '../plugins/core/index';
 import { ApiTypes } from '../fwk/api';
 import type { 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';
+import { ReviverType } from '../fwk/reviver';
 import type { AngularPlugin } from '../plugins/core/angular-plugin';
+import type { RequestOptions, TokenizedOptions } from '../plugins/core/index';
 /**
  * @see BaseApiClientOptions
  * @deprecated Use the one exposed by {@link @ama-sdk/client-angular}, will be removed in v13

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":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAgB,MAAM,sBAAsB,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,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;AAC7C,OAAO,KAAK,EAAe,aAAa,EAA0B,MAAM,gCAAgC,CAAC;AAEzG;;;GAGG;AACH,MAAM,WAAW,2BAA4B,SAAQ,oBAAoB;IACvE,2BAA2B;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB;;;OAGG;IACH,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC;AAED;;;GAGG;AACH,MAAM,WAAW,+BAAgC,SAAQ,aAAa,CAAC,2BAA2B,EAAE,UAAU,GAAG,YAAY,CAAC;CAC7H;AAUD;;;GAGG;AACH,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;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;CA2FpC"}
+{"version":3,"file":"api-angular-client.d.ts","sourceRoot":"","sources":["../../../src/clients/api-angular-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EAEX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,QAAQ,EACT,MAAM,YAAY,CAAC;AASpB,OAAO,KAAK,EACV,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACV,SAAS,EACT,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,oBAAoB,EACrB,MAAM,kCAAkC,CAAC;AAI1C,OAAO,EACL,WAAW,EACZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAEV,aAAa,EAEd,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAQ/B;;;GAGG;AACH,MAAM,WAAW,2BAA4B,SAAQ,oBAAoB;IACvE,2BAA2B;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB;;;OAGG;IACH,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC;AAED;;;GAGG;AACH,MAAM,WAAW,+BAAgC,SAAQ,aAAa,CAAC,2BAA2B,EAAE,UAAU,GAAG,YAAY,CAAC;CAC7H;AAUD;;;GAGG;AACH,qBAAa,gBAAiB,YAAW,SAAS;IAChD,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;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;CA4FpC"}

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

@@ -1,7 +1,7 @@
-import { ExceptionReply } from '../plugins/exception';
-import { ReviverReply } from '../plugins/reviver';
-import { extractQueryParams, filterUndefinedValues, getResponseReviver, prepareUrl, processFormData, tokenizeRequestOptions } from '../fwk/api.helpers';
-import { EmptyResponseError } from '../fwk/errors';
+import { extractQueryParams, filterUndefinedValues, getResponseReviver, prepareUrl, processFormData, tokenizeRequestOptions, } from '../fwk/api.helpers';
+import { EmptyResponseError, } from '../fwk/errors';
+import { ExceptionReply, } from '../plugins/exception';
+import { ReviverReply, } from '../plugins/reviver';
 const DEFAULT_OPTIONS = {
     replyPlugins: [new ReviverReply(), new ExceptionReply()],
     angularPlugins: [],
@@ -90,13 +90,14 @@ export class ApiAngularClient {
                 }
                 const subscription = httpRequest.subscribe({
                     next: (res) => data = res,
+                    // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors -- subscription forwards the error from the httpRequest to asyncResponse promise
                     error: (err) => reject(err),
                     complete: () => resolve(data)
                 });
                 metadataSignal?.throwIfAborted();
                 metadataSignal?.addEventListener('abort', () => {
                     subscription.unsubscribe();
-                    reject(metadataSignal.reason);
+                    reject(metadataSignal.reason instanceof Error ? metadataSignal.reason : new Error(metadataSignal.reason.toString()));
                 });
             });
             response = await asyncResponse;
@@ -105,10 +106,10 @@ export class ApiAngularClient {
         catch (e) {
             exception = new EmptyResponseError(e.message || 'Fail to Fetch', undefined, { apiName, operationId, url, origin });
         }
-        // eslint-disable-next-line no-console
+        // eslint-disable-next-line no-console -- `console.error` is supposed to be the default value if the `options` argument is not provided, can be removed in Otter v12.
         const reviver = getResponseReviver(revivers, response, operationId, { disableFallback: this.options.disableFallback, log: console.error });
-        const replyPlugins = this.options.replyPlugins ?
-            this.options.replyPlugins.map((plugin) => plugin.load({
+        const replyPlugins = this.options.replyPlugins
+            ? this.options.replyPlugins.map((plugin) => plugin.load({
                 dictionaries: root && root.dictionaries,
                 response: response && {
                     ...response,
@@ -123,7 +124,8 @@ export class ApiAngularClient {
                 url,
                 origin,
                 logger: this.options.logger
-            })) : [];
+            }))
+            : [];
         let parsedData = root;
         for (const pluginRunner of replyPlugins) {
             parsedData = await pluginRunner.transform(parsedData);