contentful-import 9.2.0 → 9.2.2

package/bin/contentful-import

@@ -3,7 +3,7 @@ const runContentfulImport = require('../dist/index')
 const usageParams = require('../dist/usageParams')
 console.log('We moved the CLI version of this tool into our Contentful CLI.\nThis allows our users to use and install only one single CLI tool to get the full Contentful experience.\nFor more info please visit https://github.com/contentful/contentful-cli/tree/master/docs/space/import')
 runContentfulImport(usageParams)
-  .then((result) => {
+  .then(() => {
     process.exit(0)
   })
   .catch(function (err) {

package/dist/index.js

@@ -43,7 +43,7 @@ var import_p_queue = __toESM(require("p-queue"));
 var import_logging7 = require("contentful-batch-libs/dist/logging");
 var import_listr4 = require("contentful-batch-libs/dist/listr");
 
-// lib/tasks/init-client.js
+// lib/tasks/init-client.ts
 var import_contentful_management = require("contentful-management");
 var import_logging = require("contentful-batch-libs/dist/logging");
 function logHandler(level, data) {
@@ -61,7 +61,7 @@ function initClient(opts) {
   return (0, import_contentful_management.createClient)(config);
 }
 
-// lib/tasks/get-destination-data.js
+// lib/tasks/get-destination-data.ts
 var import_bluebird = __toESM(require("bluebird"));
 var import_logging2 = require("contentful-batch-libs/dist/logging");
 var BATCH_CHAR_LIMIT = 1990;
@@ -150,7 +150,7 @@ async function getDestinationData({
       });
     }
   }
-  result.tags = environment.getTags().then((response) => response.items).catch((e) => {
+  result.tags = environment.getTags().then((response) => response.items).catch(() => {
     delete result.tags;
   });
   if (contentModelOnly) {
@@ -174,18 +174,30 @@ async function getDestinationData({
   return import_bluebird.default.props(result);
 }
 
-// lib/tasks/push-to-space/push-to-space.js
+// lib/tasks/push-to-space/push-to-space.ts
 var import_listr = __toESM(require("listr"));
 var import_listr_verbose_renderer = __toESM(require("listr-verbose-renderer"));
 var import_logging6 = require("contentful-batch-libs/dist/logging");
 var import_listr2 = require("contentful-batch-libs/dist/listr");
 
-// lib/tasks/push-to-space/assets.js
+// lib/tasks/push-to-space/assets.ts
 var import_fs = __toESM(require("fs"));
 var import_path = require("path");
 var import_util = require("util");
 var import_get_entity_name = __toESM(require("contentful-batch-libs/dist/get-entity-name"));
 var import_logging3 = require("contentful-batch-libs/dist/logging");
+
+// lib/utils/errors.ts
+var ContentfulAssetError = class extends Error {
+  constructor(message, filePath) {
+    super(message);
+    this.filePath = filePath;
+  }
+};
+var ContentfulMultiError = class extends Error {
+};
+
+// lib/tasks/push-to-space/assets.ts
 var stat = (0, import_util.promisify)(import_fs.default.stat);
 async function getAssetStreamForURL(url, assetsDirectory) {
   const [, assetPath] = url.split("//");
@@ -194,8 +206,7 @@ async function getAssetStreamForURL(url, assetsDirectory) {
     await stat(filePath);
     return import_fs.default.createReadStream(filePath);
   } catch (err) {
-    const error = new Error("Cannot open asset from filesystem");
-    error.filePath = filePath;
+    const error = new ContentfulAssetError("Cannot open asset from filesystem", filePath);
     throw error;
   }
 }
@@ -253,7 +264,7 @@ async function processAssets({
   return potentiallyProcessedAssets.filter((asset) => asset);
 }
 
-// lib/tasks/push-to-space/creation.js
+// lib/tasks/push-to-space/creation.ts
 var import_collection = require("lodash/collection");
 var import_object = require("lodash/object");
 var import_get_entity_name2 = __toESM(require("contentful-batch-libs/dist/get-entity-name"));
@@ -389,7 +400,7 @@ function getPlainData(entity) {
   return (0, import_object.omit)(data, "sys");
 }
 
-// lib/tasks/push-to-space/publishing.js
+// lib/tasks/push-to-space/publishing.ts
 var import_get_entity_name3 = __toESM(require("contentful-batch-libs/dist/get-entity-name"));
 var import_logging5 = require("contentful-batch-libs/dist/logging");
 async function publishEntities({ entities, requestQueue }) {
@@ -472,7 +483,7 @@ async function runQueue(queue, result = [], requestQueue) {
   return result;
 }
 
-// lib/tasks/push-to-space/push-to-space.js
+// lib/tasks/push-to-space/push-to-space.ts
 var DEFAULT_CONTENT_STRUCTURE = {
   entries: [],
   assets: [],
@@ -521,7 +532,7 @@ function pushToSpace({
   return new import_listr.default([
     {
       title: "Connecting to space",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const space = await client.getSpace(spaceId);
         const environment = await space.getEnvironment(environmentId);
         ctx.space = space;
@@ -530,7 +541,7 @@ function pushToSpace({
     },
     {
       title: "Importing Locales",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const locales2 = await createLocales({
           context: { target: ctx.environment, type: "Locale" },
           entities: sourceData.locales,
@@ -543,7 +554,7 @@ function pushToSpace({
     },
     {
       title: "Importing Content Types",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const contentTypes2 = await createEntities({
           context: { target: ctx.environment, type: "ContentType" },
           entities: sourceData.contentTypes,
@@ -556,7 +567,7 @@ function pushToSpace({
     },
     {
       title: "Publishing Content Types",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const publishedContentTypes = await publishEntities2({
           entities: ctx.data.contentTypes,
           sourceEntities: sourceData.contentTypes,
@@ -564,11 +575,11 @@ function pushToSpace({
         });
         ctx.data.contentTypes = publishedContentTypes;
       }),
-      skip: (ctx) => skipContentModel
+      skip: () => skipContentModel
     },
     {
       title: "Importing Tags",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const tags2 = await createEntities({
           context: { target: ctx.environment, type: "Tag" },
           entities: sourceData.tags,
@@ -583,7 +594,7 @@ function pushToSpace({
     },
     {
       title: "Importing Editor Interfaces",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const allEditorInterfacesBeingFetched = ctx.data.contentTypes.map(async (contentType) => {
           const editorInterface = sourceData.editorInterfaces.find((editorInterface2) => {
             return editorInterface2.sys.contentType.sys.id === contentType.sys.id;
@@ -612,7 +623,7 @@ function pushToSpace({
     },
     {
       title: "Uploading Assets",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const allPendingUploads = [];
         for (const asset of sourceData.assets) {
           for (const file of Object.values(asset.transformed.fields.file)) {
@@ -642,11 +653,11 @@ function pushToSpace({
         const uploads = await Promise.all(allPendingUploads);
         ctx.data.uploadedAssetFiles = uploads;
       }),
-      skip: (ctx) => !uploadAssets || !sourceData.assets.length
+      skip: () => !uploadAssets || !sourceData.assets.length
     },
     {
       title: "Importing Assets",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const assetsToProcess = await createEntities({
           context: { target: ctx.environment, type: "Asset" },
           entities: sourceData.assets,
@@ -661,11 +672,11 @@ function pushToSpace({
         });
         ctx.data.assets = processedAssets;
       }),
-      skip: (ctx) => contentModelOnly
+      skip: () => contentModelOnly
     },
     {
       title: "Publishing Assets",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const publishedAssets = await publishEntities2({
           entities: ctx.data.assets,
           sourceEntities: sourceData.assets,
@@ -673,11 +684,11 @@ function pushToSpace({
         });
         ctx.data.publishedAssets = publishedAssets;
       }),
-      skip: (ctx) => contentModelOnly || skipContentPublishing
+      skip: () => contentModelOnly || skipContentPublishing
     },
     {
       title: "Archiving Assets",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const archivedAssets = await archiveEntities2({
           entities: ctx.data.assets,
           sourceEntities: sourceData.assets,
@@ -685,11 +696,11 @@ function pushToSpace({
         });
         ctx.data.archivedAssets = archivedAssets;
       }),
-      skip: (ctx) => contentModelOnly || skipContentPublishing
+      skip: () => contentModelOnly || skipContentPublishing
     },
     {
       title: "Importing Content Entries",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const entries2 = await createEntries({
           context: { target: ctx.environment, skipContentModel },
           entities: sourceData.entries,
@@ -698,11 +709,11 @@ function pushToSpace({
         });
         ctx.data.entries = entries2;
       }),
-      skip: (ctx) => contentModelOnly
+      skip: () => contentModelOnly
     },
     {
       title: "Publishing Content Entries",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const publishedEntries = await publishEntities2({
           entities: ctx.data.entries,
           sourceEntities: sourceData.entries,
@@ -710,11 +721,11 @@ function pushToSpace({
         });
         ctx.data.publishedEntries = publishedEntries;
       }),
-      skip: (ctx) => contentModelOnly || skipContentPublishing
+      skip: () => contentModelOnly || skipContentPublishing
     },
     {
       title: "Archiving Entries",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const archivedEntries = await archiveEntities2({
           entities: ctx.data.entries,
           sourceEntities: sourceData.entries,
@@ -722,11 +733,11 @@ function pushToSpace({
         });
         ctx.data.archivedEntries = archivedEntries;
       }),
-      skip: (ctx) => contentModelOnly || skipContentPublishing
+      skip: () => contentModelOnly || skipContentPublishing
     },
     {
       title: "Creating Web Hooks",
-      task: (0, import_listr2.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
         const webhooks2 = await createEntities({
           context: { target: ctx.space, type: "Webhook" },
           entities: sourceData.webhooks,
@@ -735,7 +746,7 @@ function pushToSpace({
         });
         ctx.data.webhooks = webhooks2;
       }),
-      skip: (ctx) => contentModelOnly || environmentId !== "master" && "Webhooks can only be imported in master environment"
+      skip: () => contentModelOnly || environmentId !== "master" && "Webhooks can only be imported in master environment"
     }
   ], listrOptions);
 }
@@ -750,10 +761,10 @@ function publishEntities2({ entities, sourceEntities, requestQueue }) {
   return publishEntities({ entities: entitiesToPublish, requestQueue });
 }
 
-// lib/transform/transform-space.js
+// lib/transform/transform-space.ts
 var import_object3 = require("lodash/object");
 
-// lib/transform/transformers.js
+// lib/transform/transformers.ts
 var transformers_exports = {};
 __export(transformers_exports, {
   assets: () => assets,
@@ -818,7 +829,7 @@ function removeMetadataTags(entity, tagsEnabled = false) {
   return entity;
 }
 
-// lib/utils/sort-entries.js
+// lib/utils/sort-entries.ts
 var import_collection3 = require("lodash/collection");
 var _o = __toESM(require("lodash/object"));
 var import_array = require("lodash/array");
@@ -888,13 +899,13 @@ function merge(left, right, compareFn) {
     }
   }
   if (left.length)
-    result.push.apply(result, left);
+    result.push(...left);
   if (right.length)
-    result.push.apply(result, right);
+    result.push(...right);
   return result;
 }
 
-// lib/utils/sort-locales.js
+// lib/utils/sort-locales.ts
 function sortLocales(locales2) {
   const localeByFallback = {};
   locales2.forEach((locale) => {
@@ -924,7 +935,7 @@ function sortByFallbackKey(localeByFallback, key) {
   return sortedLocales;
 }
 
-// lib/transform/transform-space.js
+// lib/transform/transform-space.ts
 var spaceEntities = [
   "contentTypes",
   "entries",
@@ -949,7 +960,7 @@ function transform_space_default(sourceData, destinationData, customTransformers
   }, baseSpaceData);
 }
 
-// lib/utils/schema.js
+// lib/utils/schema.ts
 var import_joi = __toESM(require("joi"));
 var entrySchema = {
   sys: import_joi.default.object(),
@@ -1021,7 +1032,7 @@ var payloadSchema = import_joi.default.object({
   webhooks: import_joi.default.array().items(webhookSchema)
 });
 
-// lib/utils/validations.js
+// lib/utils/validations.ts
 var import_get_entity_name4 = __toESM(require("contentful-batch-libs/dist/get-entity-name"));
 var attachEntityName = (details, payload) => {
   details.map((detail) => {
@@ -1048,7 +1059,7 @@ var assertPayload = (payload) => {
     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;
+    delete result.error._original;
     throw result.error;
   }
 };
@@ -1070,7 +1081,7 @@ var assertDefaultLocale = (source, destination) => {
   }
 };
 
-// lib/parseOptions.js
+// lib/parseOptions.ts
 var import_fs2 = __toESM(require("fs"));
 var import_path2 = require("path");
 var import_format = __toESM(require("date-fns/format"));
@@ -1078,7 +1089,7 @@ var import_format = __toESM(require("date-fns/format"));
 // package.json
 var version = "0.0.0-determined-by-semantic-release";
 
-// lib/utils/headers.js
+// lib/utils/headers.ts
 function getHeadersConfig(value) {
   if (!value) {
     return {};
@@ -1099,7 +1110,7 @@ function getHeadersConfig(value) {
   }, {});
 }
 
-// lib/parseOptions.js
+// lib/parseOptions.ts
 var import_proxy = require("contentful-batch-libs/dist/proxy");
 var import_add_sequence_header = __toESM(require("contentful-batch-libs/dist/add-sequence-header"));
 var import_json_ext = require("@discoveryjs/json-ext");
@@ -1222,7 +1233,7 @@ async function runContentfulImport(params) {
   const tasks = new import_listr3.default([
     {
       title: "Validating content-file",
-      task: (ctx) => {
+      task: () => {
         assertPayload(options.content);
       }
     },
@@ -1234,7 +1245,7 @@ async function runContentfulImport(params) {
     },
     {
       title: "Checking if destination space already has any content and retrieving it",
-      task: (0, import_listr4.wrapTask)(async (ctx, task) => {
+      task: (0, import_listr4.wrapTask)(async (ctx) => {
         const destinationData = await getDestinationData({
           client: ctx.client,
           spaceId: options.spaceId,
@@ -1258,7 +1269,7 @@ async function runContentfulImport(params) {
     },
     {
       title: "Push content to destination space",
-      task: (ctx, task) => {
+      task: (ctx) => {
         return pushToSpace({
           sourceData: ctx.sourceData,
           destinationData: ctx.destinationData,
@@ -1311,7 +1322,7 @@ async function runContentfulImport(params) {
     (0, import_logging7.displayErrorLog)(displayLog);
     if (errorLog.length) {
       return (0, import_logging7.writeErrorLogFile)(options.errorLogFile, errorLog).then(() => {
-        const multiError = new Error("Errors occurred");
+        const multiError = new ContentfulMultiError("Errors occurred");
         multiError.name = "ContentfulMultiError";
         multiError.errors = errorLog;
         throw multiError;

package/dist/index.mjs

@@ -23,7 +23,7 @@ import PQueue from "p-queue";
 import { displayErrorLog, setupLogging, writeErrorLogFile } from "contentful-batch-libs/dist/logging";
 import { wrapTask as wrapTask2 } from "contentful-batch-libs/dist/listr";
 
-// lib/tasks/init-client.js
+// lib/tasks/init-client.ts
 import { createClient } from "contentful-management";
 import { logEmitter } from "contentful-batch-libs/dist/logging";
 function logHandler(level, data) {
@@ -41,7 +41,7 @@ function initClient(opts) {
   return createClient(config);
 }
 
-// lib/tasks/get-destination-data.js
+// lib/tasks/get-destination-data.ts
 import Promise2 from "bluebird";
 import { logEmitter as logEmitter2 } from "contentful-batch-libs/dist/logging";
 var BATCH_CHAR_LIMIT = 1990;
@@ -130,7 +130,7 @@ async function getDestinationData({
       });
     }
   }
-  result.tags = environment.getTags().then((response) => response.items).catch((e) => {
+  result.tags = environment.getTags().then((response) => response.items).catch(() => {
     delete result.tags;
   });
   if (contentModelOnly) {
@@ -154,18 +154,30 @@ async function getDestinationData({
   return Promise2.props(result);
 }
 
-// lib/tasks/push-to-space/push-to-space.js
+// lib/tasks/push-to-space/push-to-space.ts
 import Listr from "listr";
 import verboseRenderer from "listr-verbose-renderer";
 import { logEmitter as logEmitter6 } from "contentful-batch-libs/dist/logging";
 import { wrapTask } from "contentful-batch-libs/dist/listr";
 
-// lib/tasks/push-to-space/assets.js
+// lib/tasks/push-to-space/assets.ts
 import fs from "fs";
 import { join } from "path";
 import { promisify } from "util";
 import getEntityName from "contentful-batch-libs/dist/get-entity-name";
 import { logEmitter as logEmitter3 } from "contentful-batch-libs/dist/logging";
+
+// lib/utils/errors.ts
+var ContentfulAssetError = class extends Error {
+  constructor(message, filePath) {
+    super(message);
+    this.filePath = filePath;
+  }
+};
+var ContentfulMultiError = class extends Error {
+};
+
+// lib/tasks/push-to-space/assets.ts
 var stat = promisify(fs.stat);
 async function getAssetStreamForURL(url, assetsDirectory) {
   const [, assetPath] = url.split("//");
@@ -174,8 +186,7 @@ async function getAssetStreamForURL(url, assetsDirectory) {
     await stat(filePath);
     return fs.createReadStream(filePath);
   } catch (err) {
-    const error = new Error("Cannot open asset from filesystem");
-    error.filePath = filePath;
+    const error = new ContentfulAssetError("Cannot open asset from filesystem", filePath);
     throw error;
   }
 }
@@ -233,7 +244,7 @@ async function processAssets({
   return potentiallyProcessedAssets.filter((asset) => asset);
 }
 
-// lib/tasks/push-to-space/creation.js
+// lib/tasks/push-to-space/creation.ts
 import { find } from "lodash/collection";
 import { assign, get, omitBy, omit } from "lodash/object";
 import getEntityName2 from "contentful-batch-libs/dist/get-entity-name";
@@ -369,7 +380,7 @@ function getPlainData(entity) {
   return omit(data, "sys");
 }
 
-// lib/tasks/push-to-space/publishing.js
+// lib/tasks/push-to-space/publishing.ts
 import getEntityName3 from "contentful-batch-libs/dist/get-entity-name";
 import { logEmitter as logEmitter5 } from "contentful-batch-libs/dist/logging";
 async function publishEntities({ entities, requestQueue }) {
@@ -452,7 +463,7 @@ async function runQueue(queue, result = [], requestQueue) {
   return result;
 }
 
-// lib/tasks/push-to-space/push-to-space.js
+// lib/tasks/push-to-space/push-to-space.ts
 var DEFAULT_CONTENT_STRUCTURE = {
   entries: [],
   assets: [],
@@ -501,7 +512,7 @@ function pushToSpace({
   return new Listr([
     {
       title: "Connecting to space",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const space = await client.getSpace(spaceId);
         const environment = await space.getEnvironment(environmentId);
         ctx.space = space;
@@ -510,7 +521,7 @@ function pushToSpace({
     },
     {
       title: "Importing Locales",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const locales2 = await createLocales({
           context: { target: ctx.environment, type: "Locale" },
           entities: sourceData.locales,
@@ -523,7 +534,7 @@ function pushToSpace({
     },
     {
       title: "Importing Content Types",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const contentTypes2 = await createEntities({
           context: { target: ctx.environment, type: "ContentType" },
           entities: sourceData.contentTypes,
@@ -536,7 +547,7 @@ function pushToSpace({
     },
     {
       title: "Publishing Content Types",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const publishedContentTypes = await publishEntities2({
           entities: ctx.data.contentTypes,
           sourceEntities: sourceData.contentTypes,
@@ -544,11 +555,11 @@ function pushToSpace({
         });
         ctx.data.contentTypes = publishedContentTypes;
       }),
-      skip: (ctx) => skipContentModel
+      skip: () => skipContentModel
     },
     {
       title: "Importing Tags",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const tags2 = await createEntities({
           context: { target: ctx.environment, type: "Tag" },
           entities: sourceData.tags,
@@ -563,7 +574,7 @@ function pushToSpace({
     },
     {
       title: "Importing Editor Interfaces",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const allEditorInterfacesBeingFetched = ctx.data.contentTypes.map(async (contentType) => {
           const editorInterface = sourceData.editorInterfaces.find((editorInterface2) => {
             return editorInterface2.sys.contentType.sys.id === contentType.sys.id;
@@ -592,7 +603,7 @@ function pushToSpace({
     },
     {
       title: "Uploading Assets",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const allPendingUploads = [];
         for (const asset of sourceData.assets) {
           for (const file of Object.values(asset.transformed.fields.file)) {
@@ -622,11 +633,11 @@ function pushToSpace({
         const uploads = await Promise.all(allPendingUploads);
         ctx.data.uploadedAssetFiles = uploads;
       }),
-      skip: (ctx) => !uploadAssets || !sourceData.assets.length
+      skip: () => !uploadAssets || !sourceData.assets.length
     },
     {
       title: "Importing Assets",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const assetsToProcess = await createEntities({
           context: { target: ctx.environment, type: "Asset" },
           entities: sourceData.assets,
@@ -641,11 +652,11 @@ function pushToSpace({
         });
         ctx.data.assets = processedAssets;
       }),
-      skip: (ctx) => contentModelOnly
+      skip: () => contentModelOnly
     },
     {
       title: "Publishing Assets",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const publishedAssets = await publishEntities2({
           entities: ctx.data.assets,
           sourceEntities: sourceData.assets,
@@ -653,11 +664,11 @@ function pushToSpace({
         });
         ctx.data.publishedAssets = publishedAssets;
       }),
-      skip: (ctx) => contentModelOnly || skipContentPublishing
+      skip: () => contentModelOnly || skipContentPublishing
     },
     {
       title: "Archiving Assets",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const archivedAssets = await archiveEntities2({
           entities: ctx.data.assets,
           sourceEntities: sourceData.assets,
@@ -665,11 +676,11 @@ function pushToSpace({
         });
         ctx.data.archivedAssets = archivedAssets;
       }),
-      skip: (ctx) => contentModelOnly || skipContentPublishing
+      skip: () => contentModelOnly || skipContentPublishing
     },
     {
       title: "Importing Content Entries",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const entries2 = await createEntries({
           context: { target: ctx.environment, skipContentModel },
           entities: sourceData.entries,
@@ -678,11 +689,11 @@ function pushToSpace({
         });
         ctx.data.entries = entries2;
       }),
-      skip: (ctx) => contentModelOnly
+      skip: () => contentModelOnly
     },
     {
       title: "Publishing Content Entries",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const publishedEntries = await publishEntities2({
           entities: ctx.data.entries,
           sourceEntities: sourceData.entries,
@@ -690,11 +701,11 @@ function pushToSpace({
         });
         ctx.data.publishedEntries = publishedEntries;
       }),
-      skip: (ctx) => contentModelOnly || skipContentPublishing
+      skip: () => contentModelOnly || skipContentPublishing
     },
     {
       title: "Archiving Entries",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const archivedEntries = await archiveEntities2({
           entities: ctx.data.entries,
           sourceEntities: sourceData.entries,
@@ -702,11 +713,11 @@ function pushToSpace({
         });
         ctx.data.archivedEntries = archivedEntries;
       }),
-      skip: (ctx) => contentModelOnly || skipContentPublishing
+      skip: () => contentModelOnly || skipContentPublishing
     },
     {
       title: "Creating Web Hooks",
-      task: wrapTask(async (ctx, task) => {
+      task: wrapTask(async (ctx) => {
         const webhooks2 = await createEntities({
           context: { target: ctx.space, type: "Webhook" },
           entities: sourceData.webhooks,
@@ -715,7 +726,7 @@ function pushToSpace({
         });
         ctx.data.webhooks = webhooks2;
       }),
-      skip: (ctx) => contentModelOnly || environmentId !== "master" && "Webhooks can only be imported in master environment"
+      skip: () => contentModelOnly || environmentId !== "master" && "Webhooks can only be imported in master environment"
     }
   ], listrOptions);
 }
@@ -730,10 +741,10 @@ function publishEntities2({ entities, sourceEntities, requestQueue }) {
   return publishEntities({ entities: entitiesToPublish, requestQueue });
 }
 
-// lib/transform/transform-space.js
+// lib/transform/transform-space.ts
 import { omit as omit3, defaults } from "lodash/object";
 
-// lib/transform/transformers.js
+// lib/transform/transformers.ts
 var transformers_exports = {};
 __export(transformers_exports, {
   assets: () => assets,
@@ -798,7 +809,7 @@ function removeMetadataTags(entity, tagsEnabled = false) {
   return entity;
 }
 
-// lib/utils/sort-entries.js
+// lib/utils/sort-entries.ts
 import { some, filter, map } from "lodash/collection";
 import * as _o from "lodash/object";
 import { flatten } from "lodash/array";
@@ -868,13 +879,13 @@ function merge(left, right, compareFn) {
     }
   }
   if (left.length)
-    result.push.apply(result, left);
+    result.push(...left);
   if (right.length)
-    result.push.apply(result, right);
+    result.push(...right);
   return result;
 }
 
-// lib/utils/sort-locales.js
+// lib/utils/sort-locales.ts
 function sortLocales(locales2) {
   const localeByFallback = {};
   locales2.forEach((locale) => {
@@ -904,7 +915,7 @@ function sortByFallbackKey(localeByFallback, key) {
   return sortedLocales;
 }
 
-// lib/transform/transform-space.js
+// lib/transform/transform-space.ts
 var spaceEntities = [
   "contentTypes",
   "entries",
@@ -929,7 +940,7 @@ function transform_space_default(sourceData, destinationData, customTransformers
   }, baseSpaceData);
 }
 
-// lib/utils/schema.js
+// lib/utils/schema.ts
 import Joi from "joi";
 var entrySchema = {
   sys: Joi.object(),
@@ -1001,7 +1012,7 @@ var payloadSchema = Joi.object({
   webhooks: Joi.array().items(webhookSchema)
 });
 
-// lib/utils/validations.js
+// lib/utils/validations.ts
 import getEntityName4 from "contentful-batch-libs/dist/get-entity-name";
 var attachEntityName = (details, payload) => {
   details.map((detail) => {
@@ -1028,7 +1039,7 @@ var assertPayload = (payload) => {
     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;
+    delete result.error._original;
     throw result.error;
   }
 };
@@ -1050,7 +1061,7 @@ var assertDefaultLocale = (source, destination) => {
   }
 };
 
-// lib/parseOptions.js
+// lib/parseOptions.ts
 import fs2 from "fs";
 import { resolve } from "path";
 import format from "date-fns/format";
@@ -1058,7 +1069,7 @@ import format from "date-fns/format";
 // package.json
 var version = "0.0.0-determined-by-semantic-release";
 
-// lib/utils/headers.js
+// lib/utils/headers.ts
 function getHeadersConfig(value) {
   if (!value) {
     return {};
@@ -1079,7 +1090,7 @@ function getHeadersConfig(value) {
   }, {});
 }
 
-// lib/parseOptions.js
+// lib/parseOptions.ts
 import { proxyStringToObject, agentFromProxy } from "contentful-batch-libs/dist/proxy";
 import addSequenceHeader from "contentful-batch-libs/dist/add-sequence-header";
 import { parseChunked } from "@discoveryjs/json-ext";
@@ -1202,7 +1213,7 @@ async function runContentfulImport(params) {
   const tasks = new Listr2([
     {
       title: "Validating content-file",
-      task: (ctx) => {
+      task: () => {
         assertPayload(options.content);
       }
     },
@@ -1214,7 +1225,7 @@ async function runContentfulImport(params) {
     },
     {
       title: "Checking if destination space already has any content and retrieving it",
-      task: wrapTask2(async (ctx, task) => {
+      task: wrapTask2(async (ctx) => {
         const destinationData = await getDestinationData({
           client: ctx.client,
           spaceId: options.spaceId,
@@ -1238,7 +1249,7 @@ async function runContentfulImport(params) {
     },
     {
       title: "Push content to destination space",
-      task: (ctx, task) => {
+      task: (ctx) => {
         return pushToSpace({
           sourceData: ctx.sourceData,
           destinationData: ctx.destinationData,
@@ -1291,7 +1302,7 @@ async function runContentfulImport(params) {
     displayErrorLog(displayLog);
     if (errorLog.length) {
       return writeErrorLogFile(options.errorLogFile, errorLog).then(() => {
-        const multiError = new Error("Errors occurred");
+        const multiError = new ContentfulMultiError("Errors occurred");
         multiError.name = "ContentfulMultiError";
         multiError.errors = errorLog;
         throw multiError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentful-import",
-  "version": "9.2.0",
+  "version": "9.2.2",
   "description": "this tool allows you to import JSON dump exported by contentful-export",
   "main": "dist/index.mjs",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
     "build": "tsup",
     "build:watch": "babel lib --out-dir dist --watch",
     "clean": "rimraf dist && rimraf coverage",
-    "lint": "eslint lib bin/contentful-import test",
+    "lint": "eslint lib bin/contentful-import test && tsc",
     "pretest": "npm run lint && npm run build",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "jest --testPathPattern=test/unit --runInBand --coverage",
@@ -73,11 +73,11 @@
     "bluebird": "^3.5.1",
     "cli-table3": "^0.6.0",
     "contentful-batch-libs": "^9.5.0",
-    "contentful-management": "^10.46.2",
+    "contentful-management": "^10.46.4",
     "date-fns": "^2.30.0",
     "eslint": "^8.50.0",
     "eslint-config-standard": "^17.1.0",
-    "joi": "^17.10.2",
+    "joi": "^17.11.0",
     "listr": "^0.14.1",
     "listr-update-renderer": "^0.5.0",
     "listr-verbose-renderer": "^0.6.0",
@@ -92,20 +92,20 @@
     "@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",
+    "@typescript-eslint/eslint-plugin": "^6.7.4",
+    "@typescript-eslint/parser": "^6.7.4",
     "babel-jest": "^29.7.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-preset-env": "^1.7.0",
     "cz-conventional-changelog": "^3.1.0",
     "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jest": "^27.4.0",
+    "eslint-plugin-jest": "^27.4.2",
     "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",
+    "rimraf": "^5.0.5",
     "semantic-release": "^19.0.5",
     "ts-jest": "^29.1.1",
     "tsup": "^7.2.0",