contentful-import 9.0.21 → 9.1.0

package/dist/utils/sort-entries.js

@@ -1,14 +1,31 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
-exports.default = sortEntries;
-var _collection = require("lodash/collection");
-var _o = _interopRequireWildcard(require("lodash/object"));
-var _array = require("lodash/array");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const collection_1 = require("lodash/collection");
+const _o = __importStar(require("lodash/object"));
+const array_1 = require("lodash/array");
 /**
  * Given a list of entries, this function reorders them so that entries which
  * are linked from other entries always come first in the order. This ensures
@@ -16,49 +33,51 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * links to other entries which haven't been published yet.
  */
 function sortEntries(entries) {
-  const linkedEntries = getLinkedEntries(entries);
-  const mergedLinkedEntries = mergeSort(linkedEntries, a => {
-    return hasLinkedIndexesInFront(a);
-  });
-  return (0, _collection.map)(mergedLinkedEntries, linkInfo => entries[linkInfo.index]);
-  function hasLinkedIndexesInFront(item) {
-    if (hasLinkedIndexes(item)) {
-      return (0, _collection.some)(item.linkIndexes, index => index > item.index) ? 1 : -1;
+    const linkedEntries = getLinkedEntries(entries);
+    const mergedLinkedEntries = mergeSort(linkedEntries, (a) => {
+        return hasLinkedIndexesInFront(a);
+    });
+    return (0, collection_1.map)(mergedLinkedEntries, (linkInfo) => entries[linkInfo.index]);
+    function hasLinkedIndexesInFront(item) {
+        if (hasLinkedIndexes(item)) {
+            return (0, collection_1.some)(item.linkIndexes, (index) => index > item.index) ? 1 : -1;
+        }
+        return 0;
+    }
+    function hasLinkedIndexes(item) {
+        return item.linkIndexes.length > 0;
     }
-    return 0;
-  }
-  function hasLinkedIndexes(item) {
-    return item.linkIndexes.length > 0;
-  }
 }
+exports.default = sortEntries;
 function getLinkedEntries(entries) {
-  return (0, _collection.map)(entries, function (entry) {
-    const entryIndex = entries.indexOf(entry);
-    const rawLinks = (0, _collection.map)(entry.fields, field => {
-      field = _o.values(field)[0];
-      if (isEntryLink(field)) {
-        return getFieldEntriesIndex(field, entries);
-      } else if (isEntityArray(field) && isEntryLink(field[0])) {
-        return (0, _collection.map)(field, item => getFieldEntriesIndex(item, entries));
-      }
+    return (0, collection_1.map)(entries, function (entry) {
+        const entryIndex = entries.indexOf(entry);
+        const rawLinks = (0, collection_1.map)(entry.fields, (field) => {
+            field = _o.values(field)[0];
+            if (isEntryLink(field)) {
+                return getFieldEntriesIndex(field, entries);
+            }
+            else if (isEntityArray(field) && isEntryLink(field[0])) {
+                return (0, collection_1.map)(field, (item) => getFieldEntriesIndex(item, entries));
+            }
+        });
+        return {
+            index: entryIndex,
+            linkIndexes: (0, collection_1.filter)((0, array_1.flatten)(rawLinks), (index) => index >= 0)
+        };
     });
-    return {
-      index: entryIndex,
-      linkIndexes: (0, _collection.filter)((0, _array.flatten)(rawLinks), index => index >= 0)
-    };
-  });
 }
 function getFieldEntriesIndex(field, entries) {
-  const id = _o.get(field, 'sys.id');
-  return entries.findIndex(entry => entry.sys.id === id);
+    const id = _o.get(field, 'sys.id');
+    return entries.findIndex((entry) => entry.sys.id === id);
 }
 function isEntryLink(item) {
-  return _o.get(item, 'sys.type') === 'Entry' || _o.get(item, 'sys.linkType') === 'Entry';
+    return _o.get(item, 'sys.type') === 'Entry' ||
+        _o.get(item, 'sys.linkType') === 'Entry';
 }
 function isEntityArray(item) {
-  return Array.isArray(item) && item.length > 0 && _o.has(item[0], 'sys');
+    return Array.isArray(item) && item.length > 0 && _o.has(item[0], 'sys');
 }
-
 /**
  * From https://github.com/millermedeiros/amd-utils/blob/master/src/array/sort.js
  * MIT Licensed
@@ -66,28 +85,32 @@ function isEntityArray(item) {
  * @version 0.1.0 (2012/05/23)
  */
 function mergeSort(arr, compareFn) {
-  if (arr.length < 2) return arr;
-  if (compareFn == null) compareFn = defaultCompare;
-  const mid = ~~(arr.length / 2);
-  const left = mergeSort(arr.slice(0, mid), compareFn);
-  const right = mergeSort(arr.slice(mid, arr.length), compareFn);
-  return merge(left, right, compareFn);
+    if (arr.length < 2)
+        return arr;
+    if (compareFn == null)
+        compareFn = defaultCompare;
+    const mid = ~~(arr.length / 2);
+    const left = mergeSort(arr.slice(0, mid), compareFn);
+    const right = mergeSort(arr.slice(mid, arr.length), compareFn);
+    return merge(left, right, compareFn);
 }
 function defaultCompare(a, b) {
-  return a < b ? -1 : a > b ? 1 : 0;
+    return a < b ? -1 : (a > b ? 1 : 0);
 }
 function merge(left, right, compareFn) {
-  const result = [];
-  while (left.length && right.length) {
-    if (compareFn(left[0], right[0]) <= 0) {
-      // if 0 it should preserve same order (stable)
-      result.push(left.shift());
-    } else {
-      result.push(right.shift());
+    const result = [];
+    while (left.length && right.length) {
+        if (compareFn(left[0], right[0]) <= 0) {
+            // if 0 it should preserve same order (stable)
+            result.push(left.shift());
+        }
+        else {
+            result.push(right.shift());
+        }
     }
-  }
-  if (left.length) result.push.apply(result, left);
-  if (right.length) result.push.apply(result, right);
-  return result;
+    if (left.length)
+        result.push.apply(result, left);
+    if (right.length)
+        result.push.apply(result, right);
+    return result;
 }
-module.exports = exports.default;

package/dist/utils/sort-locales.js

@@ -1,42 +1,37 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = sortLocales;
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Given a list of locales, this utility will sort them by `fallback` order, i.e. the locales without fallbacks first,
  * then the locales having them as fallbacks, and then recursively.
  */
 function sortLocales(locales) {
-  const localeByFallback = {};
-  locales.forEach(locale => {
-    if (locale.fallbackCode === null) {
-      locale.fallbackCode = undefined;
-    }
-    if (!localeByFallback[locale.fallbackCode]) {
-      localeByFallback[locale.fallbackCode] = [];
-    }
-    localeByFallback[locale.fallbackCode].push(locale);
-  });
-  return sortByFallbackKey(localeByFallback);
+    const localeByFallback = {};
+    locales.forEach(locale => {
+        if (locale.fallbackCode === null) {
+            locale.fallbackCode = undefined;
+        }
+        if (!localeByFallback[locale.fallbackCode]) {
+            localeByFallback[locale.fallbackCode] = [];
+        }
+        localeByFallback[locale.fallbackCode].push(locale);
+    });
+    return sortByFallbackKey(localeByFallback);
 }
+exports.default = sortLocales;
 function sortByFallbackKey(localeByFallback, key) {
-  if (!localeByFallback[key]) {
-    return [];
-  }
-  const sortedLocales = localeByFallback[key];
-  sortedLocales.forEach(locale => {
-    sortByFallbackKey(localeByFallback, locale.code).forEach(x => sortedLocales.push(x));
-  });
-
-  // We have to reset the undefined fallback code to null so that the locales are properly created without fallback and
-  // not the default (en-US)
-  sortedLocales.forEach(locale => {
-    if (!locale.fallbackCode) {
-      locale.fallbackCode = null;
+    if (!localeByFallback[key]) {
+        return [];
     }
-  });
-  return sortedLocales;
+    const sortedLocales = localeByFallback[key];
+    sortedLocales.forEach((locale) => {
+        sortByFallbackKey(localeByFallback, locale.code).forEach((x) => sortedLocales.push(x));
+    });
+    // We have to reset the undefined fallback code to null so that the locales are properly created without fallback and
+    // not the default (en-US)
+    sortedLocales.forEach((locale) => {
+        if (!locale.fallbackCode) {
+            locale.fallbackCode = null;
+        }
+    });
+    return sortedLocales;
 }
-module.exports = exports.default;

package/dist/utils/validations.js

@@ -1,57 +1,54 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.assertPayload = exports.assertDefaultLocale = void 0;
-var _schema = require("./schema");
-var _getEntityName = _interopRequireDefault(require("contentful-batch-libs/dist/get-entity-name"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertDefaultLocale = exports.assertPayload = void 0;
+const schema_1 = require("./schema");
+const get_entity_name_1 = __importDefault(require("contentful-batch-libs/dist/get-entity-name"));
 const attachEntityName = (details, payload) => {
-  details.map(detail => {
-    if (detail.path.length >= 2) {
-      detail.entity = (0, _getEntityName.default)(payload[detail.path[0]][detail.path[1]]);
-    }
-    return detail;
-  });
+    details.map((detail) => {
+        if (detail.path.length >= 2) {
+            detail.entity = (0, get_entity_name_1.default)(payload[detail.path[0]][detail.path[1]]);
+        }
+        return detail;
+    });
 };
-const countInvalidEntities = validationData => {
-  const entityCount = validationData.reduce((entities, currentDetail) => {
-    if (!entities[currentDetail.path[0]]) {
-      entities[currentDetail.path[0]] = 1;
-    } else {
-      entities[currentDetail.path[0]]++;
-    }
-    return entities;
-  }, {});
-  return Object.keys(entityCount).map(key => `${key}:${entityCount[key]}`);
+const countInvalidEntities = (validationData) => {
+    const entityCount = validationData.reduce((entities, currentDetail) => {
+        if (!entities[currentDetail.path[0]]) {
+            entities[currentDetail.path[0]] = 1;
+        }
+        else {
+            entities[currentDetail.path[0]]++;
+        }
+        return entities;
+    }, {});
+    return Object.keys(entityCount).map((key) => `${key}:${entityCount[key]}`);
 };
-const assertPayload = payload => {
-  const result = _schema.payloadSchema.validate(payload, {
-    allowUnknown: true,
-    abortEarly: false
-  });
-  if (result.error) {
-    attachEntityName(result.error.details, payload);
-    const invalidEntityCount = countInvalidEntities(result.error.details).join(', ');
-    result.error.message = `${invalidEntityCount} - Get further details in the error log file`;
-    delete result.error._object;
-    throw result.error;
-  }
+const assertPayload = (payload) => {
+    const result = schema_1.payloadSchema.validate(payload, { allowUnknown: true, abortEarly: false });
+    if (result.error) {
+        attachEntityName(result.error.details, payload);
+        const invalidEntityCount = countInvalidEntities(result.error.details).join(', ');
+        result.error.message = `${invalidEntityCount} - Get further details in the error log file`;
+        delete result.error._object;
+        throw result.error;
+    }
 };
 exports.assertPayload = assertPayload;
 const assertDefaultLocale = (source, destination) => {
-  const sourceDefaultLocale = source.locales.find(locale => locale.default === true);
-  const destinationDefaultLocale = destination.locales.find(locale => locale.default === true);
-  if (!sourceDefaultLocale || !destinationDefaultLocale) {
-    return;
-  }
-  if (sourceDefaultLocale.code !== destinationDefaultLocale.code) {
-    throw new Error(`
+    const sourceDefaultLocale = source.locales.find((locale) => locale.default === true);
+    const destinationDefaultLocale = destination.locales.find((locale) => locale.default === true);
+    if (!sourceDefaultLocale || !destinationDefaultLocale) {
+        return;
+    }
+    if (sourceDefaultLocale.code !== destinationDefaultLocale.code) {
+        throw new Error(`
       Please make sure the destination space have the same default locale as the source\n
       Default locale for source space : ${sourceDefaultLocale.code}\n
       Default locale for destination space: ${destinationDefaultLocale.code}\n
     `);
-  }
+    }
 };
-exports.assertDefaultLocale = assertDefaultLocale;
+exports.assertDefaultLocale = assertDefaultLocale;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentful-import",
-  "version": "9.0.21",
+  "version": "9.1.0",
   "description": "this tool allows you to import JSON dump exported by contentful-export",
   "main": "dist/index.js",
   "engines": {
@@ -10,7 +10,7 @@
     "contentful-import": "./bin/contentful-import"
   },
   "scripts": {
-    "build": "npm run clean && babel lib --out-dir dist",
+    "build": "npm run clean && tsc",
     "build:watch": "babel lib --out-dir dist --watch",
     "clean": "rimraf dist && rimraf coverage",
     "lint": "eslint lib bin/contentful-import test",
@@ -50,7 +50,6 @@
     "url": "https://github.com/contentful/contentful-import/issues"
   },
   "dependencies": {
-    "@babel/eslint-parser": "^7.22.15",
     "@discoveryjs/json-ext": "^0.5.7",
     "bluebird": "^3.5.1",
     "cli-table3": "^0.6.0",
@@ -68,10 +67,14 @@
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.22.15",
-    "@babel/core": "^7.22.20",
+    "@babel/cli": "^7.23.0",
+    "@babel/core": "^7.23.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
     "@babel/preset-env": "^7.22.20",
+    "@types/jest": "^29.5.5",
+    "@types/node": "^20.6.3",
+    "@typescript-eslint/eslint-plugin": "^6.7.2",
+    "@typescript-eslint/parser": "^6.7.2",
     "babel-jest": "^29.7.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-preset-env": "^1.7.0",
@@ -80,10 +83,13 @@
     "eslint-plugin-jest": "^27.4.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-standard": "^5.0.0",
     "husky": "^8.0.3",
     "jest": "^29.7.0",
     "rimraf": "^5.0.0",
-    "semantic-release": "^19.0.5"
+    "semantic-release": "^19.0.5",
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.2.2"
   },
   "files": [
     "bin",
@@ -113,17 +119,5 @@
       "@semantic-release/npm",
       "@semantic-release/github"
     ]
-  },
-  "jest": {
-    "testEnvironment": "node",
-    "collectCoverageFrom": [
-      "lib/**/*.js"
-    ],
-    "coveragePathIgnorePatterns": [
-      "usageParams.js"
-    ],
-    "transformIgnorePatterns": [
-      "node_modules/(?!(contentful-batch-libs)/)"
-    ]
   }
 }