contentful 9.3.3 → 9.3.4

package/dist/contentful.node.js

@@ -4347,6 +4347,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var fast_copy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! fast-copy */ "../node_modules/fast-copy/dist/fast-copy.esm.js");
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+
 function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
 
 
@@ -4363,32 +4365,83 @@ var isLink = function isLink(object) {
 };
 
 /**
- * Creates a string key for lookup in entityMap
+ * isResourceLink Function
+ * Checks if the object has sys.type "ResourceLink"
+ * @param object
+ */
+var isResourceLink = function isResourceLink(object) {
+  return object && object.sys && object.sys.type === 'ResourceLink';
+};
+
+/**
+ * Creates a key with spaceId and a key without for entityMap
  *
  * @param {*} sys
  * @param {String} sys.type
  * @param {String} sys.id
+ * @param {*} sys.space
+ * @param {*} sys.space.sys
+ * @param {String} sys.space.id
+ * @return {string[]}
+ */
+var makeEntityMapKeys = function makeEntityMapKeys(sys) {
+  return sys.space ? [sys.type + '!' + sys.id, sys.space.sys.id + '!' + sys.type + '!' + sys.id] : [sys.type + '!' + sys.id];
+};
+
+/**
+ * Looks up in entityMap
+ *
+ * @param entityMap
+ * @param {*} linkData
+ * @param {String} linkData.type
+ * @param {String} linkData.linkType
+ * @param {String} linkData.id
+ * @param {String} linkData.urn
  * @return {String}
  */
-var makeLookupKey = function makeLookupKey(sys) {
-  return sys.type + '!' + sys.id;
+var lookupInEntityMap = function lookupInEntityMap(entityMap, linkData) {
+  var entryId = linkData.entryId,
+      linkType = linkData.linkType,
+      spaceId = linkData.spaceId;
+
+  if (spaceId) {
+    return entityMap.get(spaceId + '!' + linkType + '!' + entryId);
+  }
+  return entityMap.get(linkType + '!' + entryId);
 };
 
 /**
- * getLink Function
+ * getResolvedLink Function
  *
- * @param response
+ * @param entityMap
  * @param link
  * @return {undefined}
  */
-var getLink = function getLink(entityMap, link) {
+var getResolvedLink = function getResolvedLink(entityMap, link) {
   var _link$sys = link.sys,
-      type = _link$sys.linkType,
-      id = _link$sys.id;
+      type = _link$sys.type,
+      linkType = _link$sys.linkType;
+
+  if (type === 'ResourceLink') {
+    var urn = link.sys.urn;
+
+    var regExp = /.*:spaces\/([A-Za-z0-9]*)\/entries\/([A-Za-z0-9]*)/;
+    if (!regExp.test(urn)) {
+      return UNRESOLVED_LINK;
+    }
 
-  var lookupKey = makeLookupKey({ type: type, id: id });
+    var _urn$match = urn.match(regExp),
+        _urn$match2 = _slicedToArray(_urn$match, 3),
+        _ = _urn$match2[0],
+        spaceId = _urn$match2[1],
+        _entryId = _urn$match2[2];
 
-  return entityMap.get(lookupKey) || UNRESOLVED_LINK;
+    var extractedLinkType = linkType.split(':')[1];
+    return lookupInEntityMap(entityMap, { linkType: extractedLinkType, entryId: _entryId, spaceId: spaceId }) || UNRESOLVED_LINK;
+  }
+  var entryId = link.sys.id;
+
+  return lookupInEntityMap(entityMap, { linkType: linkType, entryId: entryId }) || UNRESOLVED_LINK;
 };
 
 /**
@@ -4416,6 +4469,7 @@ var cleanUpLinks = function cleanUpLinks(input) {
  * @param input
  * @param predicate
  * @param mutator
+ * @param removeUnresolved
  * @return {*}
  */
 var walkMutate = function walkMutate(input, predicate, mutator, removeUnresolved) {
@@ -4438,7 +4492,7 @@ var walkMutate = function walkMutate(input, predicate, mutator, removeUnresolved
 };
 
 var normalizeLink = function normalizeLink(entityMap, link, removeUnresolved) {
-  var resolvedLink = getLink(entityMap, link);
+  var resolvedLink = getResolvedLink(entityMap, link);
   if (resolvedLink === UNRESOLVED_LINK) {
     return removeUnresolved ? resolvedLink : link;
   }
@@ -4479,16 +4533,24 @@ var resolveResponse = function resolveResponse(response, options) {
     return [].concat(_toConsumableArray(all), _toConsumableArray(response.includes[type]));
   }, []);
 
-  var allEntries = [].concat(_toConsumableArray(responseClone.items), _toConsumableArray(allIncludes));
+  var allEntries = [].concat(_toConsumableArray(responseClone.items), _toConsumableArray(allIncludes)).filter(function (entity) {
+    return Boolean(entity.sys);
+  });
 
-  var entityMap = new Map(allEntries.map(function (entity) {
-    return [makeLookupKey(entity.sys), entity];
-  }));
+  var entityMap = new Map(allEntries.reduce(function (acc, entity) {
+    var entries = makeEntityMapKeys(entity.sys).map(function (key) {
+      return [key, entity];
+    });
+    acc.push.apply(acc, _toConsumableArray(entries));
+    return acc;
+  }, []));
 
   allEntries.forEach(function (item) {
     var entryObject = makeEntryObject(item, options.itemEntryPoints);
 
-    Object.assign(item, walkMutate(entryObject, isLink, function (link) {
+    Object.assign(item, walkMutate(entryObject, function (x) {
+      return isLink(x) || isResourceLink(x);
+    }, function (link) {
       return normalizeLink(entityMap, link, options.removeUnresolved);
     }, options.removeUnresolved));
   });
@@ -10079,7 +10141,7 @@ function createClient(params) {
     environment: 'master'
   };
   const config = _objectSpread(_objectSpread({}, defaultConfig), params);
-  const userAgentHeader = Object(contentful_sdk_core__WEBPACK_IMPORTED_MODULE_1__["getUserAgentHeader"])(`contentful.js/${"9.3.3"}`, config.application, config.integration);
+  const userAgentHeader = Object(contentful_sdk_core__WEBPACK_IMPORTED_MODULE_1__["getUserAgentHeader"])(`contentful.js/${"9.3.4"}`, config.application, config.integration);
   config.headers = _objectSpread(_objectSpread({}, config.headers), {}, {
     'Content-Type': 'application/vnd.contentful.delivery.v1+json',
     'X-Contentful-User-Agent': userAgentHeader