@kontent-ai/delivery-sdk 14.6.0 → 14.7.0

package/dist/bundles/kontent-delivery.umd.js

@@ -566,8 +566,10 @@ function runWithRetryAsync(data) {
                 _http_debugger__WEBPACK_IMPORTED_MODULE_1__.httpDebugger.debugRetryHttpRequest();
                 // wait time before retrying
                 yield new Promise((resolve) => setTimeout(resolve, retryResult.retryInMs));
+                if (data.functionsConfig.logErrorsToConsole) {
+                    console.warn(`Retry attempt '${data.retryAttempt + 1}' from a maximum of '${retryResult.maxRetries}' retries. Request url: '${data.url}'`);
+                }
                 // retry request
-                console.warn(`Retry attempt '${data.retryAttempt + 1}' from a maximum of '${retryResult.maxRetries}' retries. Request url: '${data.url}'`);
                 return yield runWithRetryAsync({
                     call: data.call,
                     retryStrategy: data.retryStrategy,
@@ -1689,7 +1691,7 @@ class ElementMapper {
     }
     mapElements(data) {
         // return processed item to avoid infinite recursion
-        const processedItem = data.processedItems[data.dataToMap.item.system.codename];
+        const processedItem = data.processedItems[utilities_1.codenameHelper.escapeCodenameInCodenameIndexer(data.dataToMap.item.system.codename)];
         if (processedItem) {
             // item was already resolved
             return {
@@ -1699,7 +1701,7 @@ class ElementMapper {
                 processingStartedForCodenames: data.processingStartedForCodenames
             };
         }
-        const preparedItem = data.preparedItems[data.dataToMap.item.system.codename];
+        const preparedItem = data.preparedItems[utilities_1.codenameHelper.escapeCodenameInCodenameIndexer(data.dataToMap.item.system.codename)];
         const itemInstance = preparedItem === null || preparedItem === void 0 ? void 0 : preparedItem.item;
         if (!itemInstance) {
             // item is not present in response
@@ -1925,13 +1927,14 @@ class ElementMapper {
         return Object.assign(Object.assign({}, this.buildElement(data.elementWrapper, elements_1.ElementType.ModularContent, () => linkedItemCodenames)), { linkedItems: linkedItems });
     }
     getOrSaveLinkedItemForElement(codename, element, processedItems, mappingStartedForCodenames, preparedItems) {
+        const escapedCodename = utilities_1.codenameHelper.escapeCodenameInCodenameIndexer(codename);
         // first check if item was already resolved and return it if it was
-        const processedItem = processedItems[codename];
+        const processedItem = processedItems[escapedCodename];
         if (processedItem) {
             // item was already resolved
             return processedItem;
         }
-        const preparedItem = preparedItems[codename];
+        const preparedItem = preparedItems[escapedCodename];
         if (mappingStartedForCodenames.includes(codename)) {
             return preparedItem === null || preparedItem === void 0 ? void 0 : preparedItem.item;
         }
@@ -1951,7 +1954,7 @@ class ElementMapper {
         if (mappedLinkedItemResult) {
             mappedLinkedItem = mappedLinkedItemResult.item;
             // add to processed items
-            processedItems[codename] = mappedLinkedItem;
+            processedItems[escapedCodename] = mappedLinkedItem;
         }
         return mappedLinkedItem;
     }
@@ -2108,6 +2111,7 @@ __exportStar(__webpack_require__(/*! ./sync.mapper */ "./lib/mappers/sync.mapper
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ItemMapper = void 0;
+const utilities_1 = __webpack_require__(/*! ../utilities */ "./lib/utilities/index.ts");
 const element_mapper_1 = __webpack_require__(/*! ./element.mapper */ "./lib/mappers/element.mapper.ts");
 class ItemMapper {
     constructor(config) {
@@ -2153,29 +2157,30 @@ class ItemMapper {
         const itemsToResolve = [...data.mainItems, ...data.linkedItems];
         // first prepare reference for all items
         for (const item of itemsToResolve) {
-            preparedItems[item.system.codename] = {
+            preparedItems[utilities_1.codenameHelper.escapeCodenameInCodenameIndexer(item.system.codename)] = {
                 item: this.createContentItem(item),
                 rawItem: item
             };
         }
-        // then resolve items
+        // then resolve main items
         for (const item of data.mainItems) {
             const itemResult = this.mapItem({
-                item: preparedItems[item.system.codename],
+                item: preparedItems[utilities_1.codenameHelper.escapeCodenameInCodenameIndexer(item.system.codename)],
                 processedItems: processedItems,
                 preparedItems: preparedItems,
                 processingStartedForCodenames: processingStartedForCodenames
             });
             mappedMainItems.push(itemResult.item);
         }
+        // and linked items
         for (const item of data.linkedItems) {
             const itemResult = this.mapItem({
-                item: preparedItems[item.system.codename],
+                item: preparedItems[utilities_1.codenameHelper.escapeCodenameInCodenameIndexer(item.system.codename)],
                 processedItems: processedItems,
                 preparedItems: preparedItems,
                 processingStartedForCodenames: processingStartedForCodenames
             });
-            mappedLinkedItems[item.system.codename] = itemResult.item;
+            mappedLinkedItems[(item.system.codename)] = itemResult.item;
         }
         return {
             items: mappedMainItems,
@@ -5400,7 +5405,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.sdkInfo = void 0;
 exports.sdkInfo = {
     host: 'npmjs.com',
-    version: '14.6.0',
+    version: '14.7.0',
     name: '@kontent-ai/delivery-sdk'
 };
 
@@ -6095,6 +6100,29 @@ class MappingService {
 exports.MappingService = MappingService;
 
 
+/***/ }),
+
+/***/ "./lib/utilities/codename.helper.ts":
+/*!******************************************!*\
+  !*** ./lib/utilities/codename.helper.ts ***!
+  \******************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.codenameHelper = exports.CodenameHelper = void 0;
+class CodenameHelper {
+    /**
+     * This is used to prevent errors caused by reserved names in content item codename (e.g. 'constructor')
+     */
+    escapeCodenameInCodenameIndexer(codename) {
+        return `_${codename}`;
+    }
+}
+exports.CodenameHelper = CodenameHelper;
+exports.codenameHelper = new CodenameHelper();
+
+
 /***/ }),
 
 /***/ "./lib/utilities/delivery-url.helper.ts":
@@ -6234,6 +6262,7 @@ __exportStar(__webpack_require__(/*! ./guid.helper */ "./lib/utilities/guid.help
 __exportStar(__webpack_require__(/*! ./delivery-url.helper */ "./lib/utilities/delivery-url.helper.ts"), exports);
 __exportStar(__webpack_require__(/*! ./text.helper */ "./lib/utilities/text.helper.ts"), exports);
 __exportStar(__webpack_require__(/*! ./enum.helper */ "./lib/utilities/enum.helper.ts"), exports);
+__exportStar(__webpack_require__(/*! ./codename.helper */ "./lib/utilities/codename.helper.ts"), exports);
 
 
 /***/ }),
@@ -8640,7 +8669,31 @@ class Axios {
    *
    * @returns {Promise} The Promise to be fulfilled
    */
-  request(configOrUrl, config) {
+  async request(configOrUrl, config) {
+    try {
+      return await this._request(configOrUrl, config);
+    } catch (err) {
+      if (err instanceof Error) {
+        let dummy;
+
+        Error.captureStackTrace ? Error.captureStackTrace(dummy = {}) : (dummy = new Error());
+
+        // slice off the Error: ... line
+        const stack = dummy.stack ? dummy.stack.replace(/^.+\n/, '') : '';
+
+        if (!err.stack) {
+          err.stack = stack;
+          // match without the 2 top stack lines
+        } else if (stack && !String(err.stack).endsWith(stack.replace(/^.+\n.+\n/, ''))) {
+          err.stack += '\n' + stack
+        }
+      }
+
+      throw err;
+    }
+  }
+
+  _request(configOrUrl, config) {
     /*eslint no-param-reassign:0*/
     // Allow for axios('example/url'[, config]) a la fetch API
     if (typeof configOrUrl === 'string') {
@@ -9740,9 +9793,6 @@ const defaults = {
     const isFormData = _utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].isFormData(data);
 
     if (isFormData) {
-      if (!hasJSONContentType) {
-        return data;
-      }
       return hasJSONContentType ? JSON.stringify((0,_helpers_formDataToJSON_js__WEBPACK_IMPORTED_MODULE_2__["default"])(data)) : data;
     }
 
@@ -9881,7 +9931,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   VERSION: () => (/* binding */ VERSION)
 /* harmony export */ });
-const VERSION = "1.6.2";
+const VERSION = "1.6.7";
 
 /***/ }),
 
@@ -10165,7 +10215,7 @@ __webpack_require__.r(__webpack_exports__);
  */
 function combineURLs(baseURL, relativeURL) {
   return relativeURL
-    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
+    ? baseURL.replace(/\/?\/$/, '') + '/' + relativeURL.replace(/^\/+/, '')
     : baseURL;
 }
 
@@ -10292,6 +10342,9 @@ function arrayToObject(arr) {
 function formDataToJSON(formData) {
   function buildPath(path, value, target, index) {
     let name = path[index++];
+
+    if (name === '__proto__') return true;
+
     const isNumericKey = Number.isFinite(+name);
     const isLast = index >= path.length;
     name = !name && _utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].isArray(target) ? target.length : name;