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

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

@@ -8,10 +8,10 @@ Object.defineProperty(exports, "ApiAngularClient", {
         return ApiAngularClient;
     }
 });
-var _exception = require("../plugins/exception");
-var _reviver = require("../plugins/reviver");
 var _apihelpers = require("../fwk/api.helpers");
 var _errors = require("../fwk/errors");
+var _exception = require("../plugins/exception");
+var _reviver = require("../plugins/reviver");
 function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
@@ -81,6 +81,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 _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -427,6 +434,7 @@ var ApiAngularClient = /*#__PURE__*/ function() {
                                         next: function(res) {
                                             return data = res;
                                         },
+                                        // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors -- subscription forwards the error from the httpRequest to asyncResponse promise
                                         error: function(err) {
                                             return reject(err);
                                         },
@@ -437,7 +445,7 @@ var ApiAngularClient = /*#__PURE__*/ function() {
                                     metadataSignal === null || metadataSignal === void 0 ? void 0 : metadataSignal.throwIfAborted();
                                     metadataSignal === null || metadataSignal === void 0 ? void 0 : metadataSignal.addEventListener('abort', function() {
                                         subscription.unsubscribe();
-                                        reject(metadataSignal.reason);
+                                        reject(_instanceof(metadataSignal.reason, Error) ? metadataSignal.reason : new Error(metadataSignal.reason.toString()));
                                     });
                                 });
                                 return [
@@ -464,7 +472,7 @@ var ApiAngularClient = /*#__PURE__*/ function() {
                                     4
                                 ];
                             case 4:
-                                // 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.
                                 reviver = (0, _apihelpers.getResponseReviver)(revivers, response, operationId, {
                                     disableFallback: _this.options.disableFallback,
                                     log: console.error

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

@@ -96,8 +96,7 @@ var DEFAULT_OPTIONS = {
  * Determine if the given value is a promise
  * @deprecated Use the one exposed by {@link @ama-sdk/client-beacon}, will be removed in v13
  * @param value The value to test
- */ // NOTE: the `extends unknown` is required for ESM build with TSC
-// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
+ */ // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint -- the `extends unknown` is required for ESM build with TSC
 var isPromise = function(value) {
     return _instanceof(value, Promise);
 };

package/cjs/clients/api-fetch-client.js

@@ -8,10 +8,10 @@ Object.defineProperty(exports, "ApiFetchClient", {
         return ApiFetchClient;
     }
 });
-var _exception = require("../plugins/exception");
-var _reviver = require("../plugins/reviver");
 var _apihelpers = require("../fwk/api.helpers");
 var _errors = require("../fwk/errors");
+var _exception = require("../plugins/exception");
+var _reviver = require("../plugins/reviver");
 function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
@@ -417,17 +417,12 @@ var ApiFetchClient = /*#__PURE__*/ function() {
                             case 2:
                                 canStart = _state.sent();
                                 isCanceledBy = canStart.indexOf(false);
-                                if (isCanceledBy >= 0) {
-                                    // One of the fetch plugins cancelled the execution of the call
-                                    asyncResponse = Promise.reject(new _errors.CanceledCallError("Is canceled by the plugin ".concat(isCanceledBy), isCanceledBy, _this.options.fetchPlugins[isCanceledBy], {
-                                        apiName: apiName,
-                                        operationId: operationId,
-                                        url: url,
-                                        origin: origin
-                                    }));
-                                } else {
-                                    asyncResponse = fetch(url, options);
-                                }
+                                asyncResponse = isCanceledBy === -1 ? fetch(url, options) : Promise.reject(new _errors.CanceledCallError("Is canceled by the plugin ".concat(isCanceledBy), isCanceledBy, _this.options.fetchPlugins[isCanceledBy], {
+                                    apiName: apiName,
+                                    operationId: operationId,
+                                    url: url,
+                                    origin: origin
+                                }));
                                 _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                                 try {
                                     for(_iterator = loadedPlugins[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
@@ -466,16 +461,12 @@ var ApiFetchClient = /*#__PURE__*/ function() {
                                 ];
                             case 5:
                                 e = _state.sent();
-                                if (_instanceof(e, _errors.CanceledCallError)) {
-                                    exception = e;
-                                } else {
-                                    exception = new _errors.EmptyResponseError(e.message || 'Fail to Fetch', undefined, {
-                                        apiName: apiName,
-                                        operationId: operationId,
-                                        url: url,
-                                        origin: origin
-                                    });
-                                }
+                                exception = _instanceof(e, _errors.CanceledCallError) ? e : new _errors.EmptyResponseError(e.message || 'Fail to Fetch', undefined, {
+                                    apiName: apiName,
+                                    operationId: operationId,
+                                    url: url,
+                                    origin: origin
+                                });
                                 return [
                                     3,
                                     6
@@ -491,7 +482,7 @@ var ApiFetchClient = /*#__PURE__*/ function() {
                                         origin: 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.
                                 reviver = (0, _apihelpers.getResponseReviver)(revivers, response, operationId, {
                                     disableFallback: _this.options.disableFallback,
                                     log: console.error

package/cjs/fwk/api.helper.spec.js

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-console */ "use strict";
+/* eslint-disable no-console -- only using the reference */ "use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
 });

package/cjs/fwk/api.helpers.js

@@ -112,8 +112,8 @@ function prepareUrl(url) {
     }).map(function(name) {
         return "".concat(name, "=").concat(queryParameters[name]);
     }).join('&');
-    var paramsPrefix = url.indexOf('?') > -1 ? '&' : '?';
-    return url + (!queryPart ? '' : paramsPrefix + queryPart);
+    var paramsPrefix = url.includes('?') ? '&' : '?';
+    return url + (queryPart ? paramsPrefix + queryPart : '');
 }
 function extractQueryParams(data, names) {
     return names.filter(function(name) {
@@ -125,29 +125,29 @@ function extractQueryParams(data, names) {
     }, {});
 }
 function filterUndefinedValues(object) {
-    return !object ? {} : Object.keys(object).filter(function(objectKey) {
+    return object ? Object.keys(object).filter(function(objectKey) {
         return typeof object[objectKey] !== 'undefined';
     }).reduce(function(acc, objectKey) {
         acc[objectKey] = object[objectKey];
         return acc;
-    }, {});
+    }, {}) : {};
 }
 function processFormData(data, type) {
     var encodedData;
-    /* eslint-disable guard-for-in */ if (type === 'multipart/form-data') {
+    if (type === 'multipart/form-data') {
         var formData = new FormData();
-        for(var i in data){
-            formData.append(i, data[i]);
-        }
+        Object.entries(data).forEach(function(param) {
+            var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
+            return formData.append(key, value);
+        });
         encodedData = formData;
     } else {
-        var formData1 = [];
-        for(var i1 in data){
-            formData1.push("".concat(i1, "=").concat(encodeURIComponent(data[i1])));
-        }
-        encodedData = formData1.join('&');
+        encodedData = Object.entries(data).map(function(param) {
+            var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
+            return "".concat(key, "=").concat(encodeURIComponent(value));
+        }).join('&');
     }
-    /* eslint-enable guard-for-in */ return encodedData;
+    return encodedData;
 }
 function computePiiParameterTokens(piiParameterNames) {
     return piiParameterNames.reduce(function(tokens, parameterName) {
@@ -174,24 +174,20 @@ function tokenizeRequestOptions(tokenizedUrl, queryParameters, piiParamTokens, d
         queryParams: tokenizedQueryParams
     };
 }
-function getResponseReviver(revivers, response, // eslint-disable-next-line no-console
-endpoint) {
-    var options = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {
-        disableFallback: false,
-        log: console.error
-    };
+function getResponseReviver(revivers, response, endpoint, options) {
+    // eslint-disable-next-line no-console -- set as default value
+    var _ref = options !== null && options !== void 0 ? options : {}, _ref_disableFallback = _ref.disableFallback, disableFallback = _ref_disableFallback === void 0 ? false : _ref_disableFallback, tmp = _ref.log, logMsg = tmp === void 0 ? options ? function() {} : console.error : tmp;
     var logPrefix = "API status code error for ".concat(endpoint || 'unknown', " endpoint");
-    var logMsg = options.log || function() {};
     if (!response || !response.ok) {
         return undefined;
     }
     if (typeof revivers === 'function' || typeof revivers === 'undefined') {
         return revivers;
     }
-    if (response.status && Object.keys(revivers).indexOf("".concat(response.status)) > -1) {
+    if (response.status && Object.keys(revivers).includes("".concat(response.status))) {
         return revivers[response.status];
     }
-    if (options === null || options === void 0 ? void 0 : options.disableFallback) {
+    if (disableFallback) {
         logMsg("".concat(logPrefix, " - Missing ").concat(response.status, " from API specification - fallback is deactivated, no revive will run on this response"));
         return undefined;
     }
@@ -211,7 +207,7 @@ endpoint) {
         statusCode: Number.MAX_SAFE_INTEGER,
         reviver: undefined
     });
-    var fallbackLog = Number.MAX_SAFE_INTEGER !== fallback.statusCode ? "Fallback to ".concat(fallback.statusCode, "'s reviver") : 'No fallback found';
+    var fallbackLog = Number.MAX_SAFE_INTEGER === fallback.statusCode ? 'No fallback found' : "Fallback to ".concat(fallback.statusCode, "'s reviver");
     logMsg("".concat(logPrefix, " - Unknown ").concat(response.status || 'undefined', " code returned by the API - ").concat(fallbackLog));
     return fallback.reviver;
 }

package/cjs/fwk/core/api-client.js

@@ -9,5 +9,6 @@ Object.defineProperty(exports, "isApiClient", {
     }
 });
 function isApiClient(client) {
-    return client && !!client.options && typeof client.extractQueryParams === 'function' && typeof client.getRequestOptions === 'function' && typeof client.prepareUrl === 'function' && typeof client.processFormData === 'function' && typeof client.processCall === 'function';
+    var apiClient = client;
+    return !!apiClient && !!apiClient.options && typeof apiClient.extractQueryParams === 'function' && typeof apiClient.getRequestOptions === 'function' && typeof apiClient.prepareUrl === 'function' && typeof apiClient.processFormData === 'function' && typeof apiClient.processCall === 'function';
 }

package/cjs/fwk/core/index.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-_export_star(require("./base-api-constructor"), exports);
 _export_star(require("./api-client"), exports);
+_export_star(require("./base-api-constructor"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {

package/cjs/fwk/date.js

@@ -1,4 +1,5 @@
-/* eslint-disable */ "use strict";
+// eslint-disable-next-line @typescript-eslint/naming-convention -- keep to not introduce breaking change
+"use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
@@ -187,27 +188,23 @@ var CommonDate = /*#__PURE__*/ function(Date1) {
             args[_key] = arguments[_key];
         }
         _class_call_check(this, CommonDate);
-        if (args) {
-            if (typeof args[0] === 'string') {
-                var idxT = args[0].lastIndexOf('T');
-                // TZD  = time zone designator (Z or +hh:mm or -hh:mm)
-                var idx = args[0].lastIndexOf('Z');
-                if (idx < 0) {
-                    idx = args[0].lastIndexOf('+');
-                }
-                if (idx < 0 && idxT > 0) {
-                    var relativeIdx = args[0].substring(idxT).lastIndexOf('-');
-                    idx = relativeIdx > 0 ? relativeIdx + idxT : relativeIdx;
-                }
-                if (idx > 0) {
-                    args[0] = args[0].substring(0, idx);
-                }
-                var TIME_ZONE_OFFSET = _construct(Date, _to_consumable_array(args)).getTimezoneOffset();
-                if (idxT > 0) {
-                    args[0] += "".concat(TIME_ZONE_OFFSET < 0 ? '+' : '-').concat(pad(Math.floor(Math.abs(TIME_ZONE_OFFSET / 60))), ":").concat(pad(Math.abs(TIME_ZONE_OFFSET % 60)));
-                }
-            } else if (_instanceof(args[0], CommonDate)) {
-                args[0] = args[0];
+        if (args && typeof args[0] === 'string') {
+            var idxT = args[0].lastIndexOf('T');
+            // TZD  = time zone designator (Z or +hh:mm or -hh:mm)
+            var idx = args[0].lastIndexOf('Z');
+            if (idx < 0) {
+                idx = args[0].lastIndexOf('+');
+            }
+            if (idx < 0 && idxT > 0) {
+                var relativeIdx = args[0].substring(idxT).lastIndexOf('-');
+                idx = relativeIdx > 0 ? relativeIdx + idxT : relativeIdx;
+            }
+            if (idx > 0) {
+                args[0] = args[0].substring(0, idx);
+            }
+            var TIME_ZONE_OFFSET = _construct(Date, _to_consumable_array(args)).getTimezoneOffset();
+            if (idxT > 0) {
+                args[0] += "".concat(TIME_ZONE_OFFSET < 0 ? '+' : '-').concat(pad(Math.floor(Math.abs(TIME_ZONE_OFFSET / 60))), ":").concat(pad(Math.abs(TIME_ZONE_OFFSET % 60)));
             }
         }
         return _call_super(this, CommonDate, _to_consumable_array(args));
@@ -233,7 +230,7 @@ var CommonDate = /*#__PURE__*/ function(Date1) {
                 args[_key] = arguments[_key];
             }
             _class_call_check(this, Date1);
-            if (args && typeof args[0] === 'string' && args[0].lastIndexOf('T') < 0) {
+            if (args && typeof args[0] === 'string' && !args[0].includes('T')) {
                 args[0] = "".concat(args[0], "T00:00:00Z");
             } else if (_instanceof(args[0], _NativeDateClass)) {
                 args[0] = "".concat(args[0].getFullYear(), "-").concat(pad(args[0].getMonth() + 1), "-").concat(pad(args[0].getDate()), "T00:00:00Z");
@@ -245,7 +242,8 @@ var CommonDate = /*#__PURE__*/ function(Date1) {
                 key: "_Date",
                 value: /**
      * To ensure that users cannot use a standard Date instead of utils.Date
-     */ function _Date() {}
+     */ // eslint-disable-next-line @typescript-eslint/naming-convention -- keep to not introduce breaking change
+                function _Date() {}
             },
             {
                 key: "toJSON",
@@ -259,9 +257,8 @@ var CommonDate = /*#__PURE__*/ function(Date1) {
                 key: "equals",
                 value: /**
      * Compare if two dates are equals.
-     *
      * @param  {Date}    date the date to compare
-     * @return {boolean}      true if the dates are equals.
+     * @returns {boolean}      true if the dates are equals.
      */ function equals(date) {
                     if (!date) {
                         return false;
@@ -280,6 +277,7 @@ var CommonDate = /*#__PURE__*/ function(Date1) {
                 args[_key] = arguments[_key];
             }
             _class_call_check(this, DateTime);
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument -- type is explicitly `any`
             return _call_super(this, DateTime, _to_consumable_array(args));
         }
         _create_class(DateTime, [
@@ -287,7 +285,8 @@ var CommonDate = /*#__PURE__*/ function(Date1) {
                 key: "_DateTime",
                 value: /**
      * To ensure that users cannot use a standard Date instead of utils.DateTime
-     */ function _DateTime() {}
+     */ // eslint-disable-next-line @typescript-eslint/naming-convention -- keep to not introduce breaking change
+                function _DateTime() {}
             }
         ]);
         return DateTime;

package/cjs/fwk/date.spec.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 var _date = require("./date");
 describe('DateTime', function() {
     it('should support timestamp', function() {
-        var ts = new Date().getTime();
+        var ts = Date.now();
         var dateUtils = new _date.utils.DateTime(ts);
         expect(dateUtils.getTime()).toEqual(ts);
     });
@@ -19,6 +19,7 @@ describe('DateTime', function() {
     });
     it('should support json conversions', function() {
         var originalDate = new _date.utils.DateTime(new Date());
+        // eslint-disable-next-line unicorn/prefer-structured-clone -- we test the JSON conversion
         var jsonDate = JSON.parse(JSON.stringify(originalDate));
         expect(new _date.utils.DateTime(jsonDate)).toEqual(originalDate);
     });
@@ -56,7 +57,7 @@ describe('DateTime', function() {
 });
 describe('Date', function() {
     it('should support timestamp', function() {
-        var ts = new Date().getTime();
+        var ts = Date.now();
         var dateUtils = new _date.utils.Date(ts);
         expect(dateUtils.getTime()).toEqual(ts);
     });
@@ -70,6 +71,7 @@ describe('Date', function() {
     });
     it('should support json conversions', function() {
         var originalDate = new _date.utils.Date(new Date());
+        // eslint-disable-next-line unicorn/prefer-structured-clone -- we test the JSON conversion
         var jsonDate = JSON.parse(JSON.stringify(originalDate));
         expect(new _date.utils.Date(jsonDate)).toEqual(originalDate);
     });

package/cjs/fwk/ignore-enum.type.js

@@ -1,5 +1,4 @@
-/** Type helper to ignore the constraint on literal union type (enum) of an SDK model */ // eslint-disable-next-line @typescript-eslint/ban-types
-"use strict";
+/** Type helper to ignore the constraint on literal union type (enum) of an SDK model */ "use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
 });

package/cjs/fwk/index.js

@@ -11,7 +11,7 @@ _export_star(require("./errors"), exports);
 _export_star(require("./ignore-enum.type"), exports);
 _export_star(require("./logger"), exports);
 _export_star(require("./mocks/index"), exports);
-_export_star(require("./Reviver"), exports);
+_export_star(require("./reviver"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {

package/cjs/fwk/mocks/alf-mock-adapter.js

@@ -188,19 +188,19 @@ function _ts_generator(thisArg, body) {
 }
 /**
  * a new call is detected thanks to the timestamp printed by ALF on a new line, ex: "2021/12/16 18:21:28.312472 "
- */ var logNewCallRegex = RegExp(/^\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2}\.\d{6}\b/gm);
+ */ var logNewCallRegex = new RegExp(/^\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2}\.\d{6}\b/gm);
 /**
  * the correlation Id is printed this way by ALF, ex: CorrID=0001W37ZH480AJ,
- */ var correlationIdRegex = RegExp(/CorrID=([^,]*),/);
+ */ var correlationIdRegex = new RegExp(/CorrID=([^,]*),/);
 /**
  * a request is logged with its HTTP method and the path targetted on a new line, ex: "GET /1ASIUAIRFAC/v2/shopping..."
- */ var requestRegex = RegExp(/^(POST|GET|PATCH|DELETE) \/([^\s]*)/m);
+ */ var requestRegex = new RegExp(/^(POST|GET|PATCH|DELETE) \/(\S*)/m);
 /**
  * a request is logged with its HTTP version and the HTTP status on a new line, ex: "HTTP/1.1 200 OK"
- */ var responseRegex = RegExp(/^(HTTP\/1.1 \d{3})/m);
+ */ var responseRegex = new RegExp(/^(HTTP\/1.1 \d{3})/m);
 /**
  * the response data is logged with its JSON content on a new line
- */ var requestResponseJsonRegexp = RegExp(/(^{.*}$)/m);
+ */ var requestResponseJsonRegexp = new RegExp(/(^{.*}$)/m);
 /**
  * Split the logs
  * @param log alf log
@@ -220,7 +220,7 @@ function _ts_generator(thisArg, body) {
     if (match && match[1] && match[2]) {
         // the match looks like this 1ASIUAIRFAC/v2/shopping/carts/19DXNCKB931CYX3S?refresh=true
         // so we remove the SAP information at the beginning and URL parameters at the end if any
-        var requestUrl = match[2].substring(match[2].indexOf('/'), match[2].indexOf('?') > -1 ? match[2].indexOf('?') : match[2].length);
+        var requestUrl = match[2].substring(match[2].indexOf('/'), match[2].includes('?') ? match[2].indexOf('?') : match[2].length);
         var method = match[1];
         var pathObject = (0, _helpers.getPath)(requestUrl, operationAdapter, method);
         if (pathObject) {
@@ -327,6 +327,7 @@ function _ts_generator(thisArg, body) {
             mockMap[alfCall.operationId] = [];
         }
         mockMap[alfCall.operationId].push({
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- type is explicitly `any`
             mockData: alfCall.response ? JSON.parse(alfCall.response) : ''
         });
         return mockMap;

package/cjs/fwk/mocks/base-mock-adapter.js

@@ -174,10 +174,10 @@ var BaseMockAdapter = /*#__PURE__*/ function() {
         _define_property(this, "mockFactory", void 0);
         this.pathObjects = pathObjects;
         this.mocks = {};
-        if (typeof mockMap !== 'function') {
-            this.mocks = mockMap;
-        } else {
+        if (typeof mockMap === 'function') {
             this.mockFactory = mockMap;
+        } else {
+            this.mocks = mockMap;
         }
     }
     _create_class(BaseMockAdapter, [

package/cjs/fwk/mocks/helpers.js

@@ -45,12 +45,12 @@ function getPath(requestUrl, pathObjects, method) {
         return newMatches;
     }, []);
     var lastIndex = -1;
-    var nextIndex = -1;
     while(matches.length > 1){
-        matches = matches.reduce(function(newMatches, match) {
+        var result = matches.reduce(function(param, match) {
+            var newMatches = param.matches, nextIndex = param.nextIndex;
             var newIndex = match.segments.findIndex(function(segment) {
                 return segment.startsWith('{') && segment.endsWith('}');
-            }, lastIndex + 1);
+            });
             // Complete static match so use some value that can't be exceeded
             if (newIndex === -1) {
                 newIndex = Infinity;
@@ -63,11 +63,19 @@ function getPath(requestUrl, pathObjects, method) {
             } else if (newIndex === nextIndex) {
                 newMatches.push(match);
             }
-            return newMatches;
-        }, []);
+            return {
+                matches: newMatches,
+                nextIndex: nextIndex
+            };
+        }, {
+            matches: [],
+            nextIndex: -1
+        });
+        var next = result.nextIndex;
+        matches = result.matches;
         // At this point we have tried to filter the matches but there are multiple matches that are identical and cannot
         // be filtered further. Trying to filter on the HTTP method if provided, then choose the first match.
-        if (lastIndex === nextIndex) {
+        if (lastIndex === next) {
             if (method) {
                 // Try to filter the multiple matches based on the HTTP method
                 matches.splice(0, matches.findIndex(function(match) {
@@ -76,7 +84,7 @@ function getPath(requestUrl, pathObjects, method) {
             }
             matches.splice(1);
         }
-        lastIndex = nextIndex;
+        lastIndex = next;
     }
     return matches.length > 0 ? pathObjects[matches[0].index] : undefined;
 }

package/cjs/fwk/mocks/index.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 _export_star(require("./alf-mock-adapter"), exports);
+_export_star(require("./base-mock-adapter"), exports);
 _export_star(require("./encoded-api-request"), exports);
-_export_star(require("./mock-adapter"), exports);
+_export_star(require("./helpers"), exports);
 _export_star(require("./mock"), exports);
+_export_star(require("./mock-adapter"), exports);
 _export_star(require("./operation"), exports);
 _export_star(require("./path-object"), exports);
-_export_star(require("./base-mock-adapter"), exports);
-_export_star(require("./helpers"), exports);
 _export_star(require("./random-mock-adapter"), exports);
 _export_star(require("./sequential-mock-adapter"), exports);
 function _export_star(from, to) {

package/cjs/fwk/{Reviver.js → reviver.js}

@@ -26,8 +26,7 @@ function reviveMap(data) {
     }
     var revived = {};
     for(var key in data){
-        // eslint-disable-next-line no-prototype-builtins
-        if (data.hasOwnProperty(key)) {
+        if (Object.prototype.hasOwnProperty.call(data, key)) {
             revived[key] = reviver(data[key], dictionaries, options);
         }
     }

package/cjs/fwk/reviver.spec.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-var _Reviver = require("./Reviver");
+var _reviver = require("./reviver");
 describe('Revivers :', function() {
     it('reviveDictionarizedArray', function() {
         var dictionary = {
@@ -13,13 +13,13 @@ describe('Revivers :', function() {
                 p2: 'v2'
             }
         };
-        expect((0, _Reviver.reviveDictionarizedArray)(undefined, {}, function(data) {
+        expect((0, _reviver.reviveDictionarizedArray)(undefined, {}, function(data) {
             return data;
         })).toBeUndefined();
-        expect((0, _Reviver.reviveDictionarizedArray)([], {}, function(data) {
+        expect((0, _reviver.reviveDictionarizedArray)([], {}, function(data) {
             return data;
         })).toEqual({});
-        expect((0, _Reviver.reviveDictionarizedArray)([
+        expect((0, _reviver.reviveDictionarizedArray)([
             'id1',
             'id2'
         ], {}, function(data) {
@@ -28,10 +28,10 @@ describe('Revivers :', function() {
             id1: undefined,
             id2: undefined
         });
-        expect((0, _Reviver.reviveDictionarizedArray)([], dictionary, function(data) {
+        expect((0, _reviver.reviveDictionarizedArray)([], dictionary, function(data) {
             return data;
         })).toEqual({});
-        var result = (0, _Reviver.reviveDictionarizedArray)([
+        var result = (0, _reviver.reviveDictionarizedArray)([
             'id1',
             'id2'
         ], dictionary, function(data) {
@@ -49,7 +49,7 @@ describe('Revivers :', function() {
         var options = {
             logger: jest.fn()
         };
-        (0, _Reviver.reviveArray)([
+        (0, _reviver.reviveArray)([
             1
         ], null, reviver, options);
         expect(reviver).toHaveBeenCalledWith(1, null, options);
@@ -62,7 +62,7 @@ describe('Revivers :', function() {
         var dictionary = {
             key: 'test'
         };
-        (0, _Reviver.reviveDictionarizedArray)([
+        (0, _reviver.reviveDictionarizedArray)([
             'key'
         ], dictionary, reviver, options);
         expect(reviver).toHaveBeenCalledWith('test', dictionary, options);
@@ -75,7 +75,7 @@ describe('Revivers :', function() {
         var dictionary = {
             key: 'test'
         };
-        (0, _Reviver.reviveMap)([
+        (0, _reviver.reviveMap)([
             'key'
         ], dictionary, reviver, options);
         expect(reviver).toHaveBeenCalledWith('key', dictionary, options);

package/cjs/plugins/additional-params/index.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-_export_star(require("./additional-params.request"), exports);
 _export_star(require("./additional-params-sync.request"), exports);
+_export_star(require("./additional-params.request"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {