contentful-resolve-response 1.9.9 → 2.0.0

package/dist/cjs/index.js

@@ -6,36 +6,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _fastCopy = _interopRequireDefault(require("fast-copy"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-var UNRESOLVED_LINK = {}; // unique object to avoid polyfill bloat using Symbol()
+const UNRESOLVED_LINK = {}; // unique object to avoid polyfill bloat using Symbol()
 
 /**
  * isLink Function
  * Checks if the object has sys.type "Link"
  * @param object
  */
-var isLink = function isLink(object) {
-  return object && object.sys && object.sys.type === 'Link';
-};
+const isLink = object => object && object.sys && object.sys.type === 'Link';
 
 /**
  * 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';
-};
+const isResourceLink = object => object && object.sys && object.sys.type === 'ResourceLink';
 
 /**
  * Creates a key with spaceId and a key without for entityMap
@@ -48,7 +33,7 @@ var isResourceLink = function isResourceLink(object) {
  * @param {String} sys.space.id
  * @return {string[]}
  */
-var makeEntityMapKeys = function makeEntityMapKeys(sys) {
+const makeEntityMapKeys = sys => {
   if (sys.space && sys.environment) {
     return [`${sys.type}!${sys.id}`, `${sys.space.sys.id}!${sys.environment.sys.id}!${sys.type}!${sys.id}`];
   }
@@ -66,30 +51,26 @@ var makeEntityMapKeys = function makeEntityMapKeys(sys) {
  * @param {String} linkData.urn
  * @return {String}
  */
-var lookupInEntityMap = function lookupInEntityMap(entityMap, linkData) {
-  var entryId = linkData.entryId,
-    linkType = linkData.linkType,
-    spaceId = linkData.spaceId,
-    environmentId = linkData.environmentId;
+const lookupInEntityMap = (entityMap, linkData) => {
+  const {
+    entryId,
+    linkType,
+    spaceId,
+    environmentId
+  } = linkData;
   if (spaceId && environmentId) {
     return entityMap.get(`${spaceId}!${environmentId}!${linkType}!${entryId}`);
   }
   return entityMap.get(`${linkType}!${entryId}`);
 };
-var getIdsFromUrn = function getIdsFromUrn(urn) {
-  var regExp = /.*:spaces\/([^/]+)(?:\/environments\/([^/]+))?\/entries\/([^/]+)$/;
+const getIdsFromUrn = urn => {
+  const regExp = /.*:spaces\/([^/]+)(?:\/environments\/([^/]+))?\/entries\/([^/]+)$/;
   if (!regExp.test(urn)) {
     return undefined;
   }
 
   // eslint-disable-next-line no-unused-vars
-  var _urn$match = urn.match(regExp),
-    _urn$match2 = _slicedToArray(_urn$match, 4),
-    _ = _urn$match2[0],
-    spaceId = _urn$match2[1],
-    _urn$match2$ = _urn$match2[2],
-    environmentId = _urn$match2$ === void 0 ? 'master' : _urn$match2$,
-    entryId = _urn$match2[3];
+  const [_, spaceId, environmentId = 'master', entryId] = urn.match(regExp);
   return {
     spaceId,
     environmentId,
@@ -104,28 +85,34 @@ var getIdsFromUrn = function getIdsFromUrn(urn) {
  * @param link
  * @return {undefined}
  */
-var getResolvedLink = function getResolvedLink(entityMap, link) {
-  var _link$sys = link.sys,
-    type = _link$sys.type,
-    linkType = _link$sys.linkType;
+const getResolvedLink = (entityMap, link) => {
+  const {
+    type,
+    linkType
+  } = link.sys;
   if (type === 'ResourceLink') {
     if (!linkType.startsWith('Contentful:')) {
       return link;
     }
-    var urn = link.sys.urn;
-    var _getIdsFromUrn = getIdsFromUrn(urn),
-      spaceId = _getIdsFromUrn.spaceId,
-      environmentId = _getIdsFromUrn.environmentId,
-      _entryId = _getIdsFromUrn.entryId;
-    var extractedLinkType = linkType.split(':')[1];
+    const {
+      urn
+    } = link.sys;
+    const {
+      spaceId,
+      environmentId,
+      entryId
+    } = getIdsFromUrn(urn);
+    const extractedLinkType = linkType.split(':')[1];
     return lookupInEntityMap(entityMap, {
       linkType: extractedLinkType,
-      entryId: _entryId,
+      entryId,
       spaceId,
       environmentId
     }) || UNRESOLVED_LINK;
   }
-  var entryId = link.sys.id;
+  const {
+    id: entryId
+  } = link.sys;
   return lookupInEntityMap(entityMap, {
     linkType,
     entryId
@@ -138,13 +125,11 @@ var getResolvedLink = function getResolvedLink(entityMap, link) {
  *
  * @param {Object[]|Object} input
  */
-var cleanUpLinks = function cleanUpLinks(input) {
+const cleanUpLinks = input => {
   if (Array.isArray(input)) {
-    return input.filter(function (val) {
-      return val !== UNRESOLVED_LINK;
-    });
+    return input.filter(val => val !== UNRESOLVED_LINK);
   }
-  for (var key in input) {
+  for (const key in input) {
     if (input[key] === UNRESOLVED_LINK) {
       delete input[key];
     }
@@ -160,15 +145,15 @@ var cleanUpLinks = function cleanUpLinks(input) {
  * @param removeUnresolved
  * @return {*}
  */
-var _walkMutate = function walkMutate(input, predicate, mutator, removeUnresolved) {
+const walkMutate = (input, predicate, mutator, removeUnresolved) => {
   if (predicate(input)) {
     return mutator(input);
   }
-  if (input && _typeof(input) === 'object') {
-    for (var key in input) {
+  if (input && typeof input === 'object') {
+    for (const key in input) {
       // eslint-disable-next-line no-prototype-builtins
       if (input.hasOwnProperty(key)) {
-        input[key] = _walkMutate(input[key], predicate, mutator, removeUnresolved);
+        input[key] = walkMutate(input[key], predicate, mutator, removeUnresolved);
       }
     }
     if (removeUnresolved) {
@@ -177,21 +162,19 @@ var _walkMutate = function walkMutate(input, predicate, mutator, removeUnresolve
   }
   return input;
 };
-var normalizeLink = function normalizeLink(entityMap, link, removeUnresolved) {
-  var resolvedLink = getResolvedLink(entityMap, link);
+const normalizeLink = (entityMap, link, removeUnresolved) => {
+  const resolvedLink = getResolvedLink(entityMap, link);
   if (resolvedLink === UNRESOLVED_LINK) {
     return removeUnresolved ? resolvedLink : link;
   }
   return resolvedLink;
 };
-var makeEntryObject = function makeEntryObject(item, itemEntryPoints) {
+const makeEntryObject = (item, itemEntryPoints) => {
   if (!Array.isArray(itemEntryPoints)) {
     return item;
   }
-  var entryPoints = Object.keys(item).filter(function (ownKey) {
-    return itemEntryPoints.indexOf(ownKey) !== -1;
-  });
-  return entryPoints.reduce(function (entryObj, entryPoint) {
+  const entryPoints = Object.keys(item).filter(ownKey => itemEntryPoints.indexOf(ownKey) !== -1);
+  return entryPoints.reduce((entryObj, entryPoint) => {
     entryObj[entryPoint] = item[entryPoint];
     return entryObj;
   }, {});
@@ -206,32 +189,22 @@ var makeEntryObject = function makeEntryObject(item, itemEntryPoints) {
  * @param {Array<String>} options.itemEntryPoints - Resolve links only in those item properties
  * @return {Object}
  */
-var resolveResponse = function resolveResponse(response, options) {
+const resolveResponse = (response, options) => {
   options = options || {};
   if (!response.items) {
     return [];
   }
-  var responseClone = (0, _fastCopy.default)(response);
-  var allIncludes = Object.keys(responseClone.includes || {}).reduce(function (all, type) {
-    return [].concat(_toConsumableArray(all), _toConsumableArray(responseClone.includes[type]));
-  }, []);
-  var allEntries = [].concat(_toConsumableArray(responseClone.items), _toConsumableArray(allIncludes)).filter(function (entity) {
-    return Boolean(entity.sys);
-  });
-  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));
+  const responseClone = (0, _fastCopy.default)(response);
+  const allIncludes = Object.keys(responseClone.includes || {}).reduce((all, type) => [...all, ...responseClone.includes[type]], []);
+  const allEntries = [...responseClone.items, ...allIncludes].filter(entity => Boolean(entity.sys));
+  const entityMap = new Map(allEntries.reduce((acc, entity) => {
+    const entries = makeEntityMapKeys(entity.sys).map(key => [key, entity]);
+    acc.push(...entries);
     return acc;
   }, []));
-  allEntries.forEach(function (item) {
-    var entryObject = makeEntryObject(item, options.itemEntryPoints);
-    Object.assign(item, _walkMutate(entryObject, function (x) {
-      return isLink(x) || isResourceLink(x);
-    }, function (link) {
-      return normalizeLink(entityMap, link, options.removeUnresolved);
-    }, options.removeUnresolved));
+  allEntries.forEach(item => {
+    const entryObject = makeEntryObject(item, options.itemEntryPoints);
+    Object.assign(item, walkMutate(entryObject, x => isLink(x) || isResourceLink(x), link => normalizeLink(entityMap, link, options.removeUnresolved), options.removeUnresolved));
   });
   return responseClone.items;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentful-resolve-response",
-  "version": "1.9.9",
+  "version": "2.0.0",
   "description": "",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -20,7 +20,7 @@
     "url": "git@github.com:contentful/contentful-resolve-response.git"
   },
   "engines": {
-    "node": ">=4.7.2"
+    "node": ">=22"
   },
   "dependencies": {
     "fast-copy": "^3.0.2"
@@ -87,6 +87,10 @@
         "@semantic-release/commit-analyzer",
         {
           "releaseRules": [
+            {
+              "breaking": true,
+              "release": "major"
+            },
             {
               "type": "build",
               "scope": "deps",