contentful-import 9.4.55 → 9.4.57

package/README.md

@@ -130,6 +130,10 @@ Skip importing of content types and locales
 
 Skip importing of locales
 
+#### `skipContentUpdates` [boolean] [default: false]
+
+Skip updating existing content
+
 #### `skipContentPublishing` [boolean] [default: false]
 
 Skips content publishing. Creates content but does not publish it
@@ -140,6 +144,10 @@ Skips content publishing. Creates content but does not publish it
 
 Upload local asset files downloaded via the [downloadAssets](https://github.com/contentful/contentful-export#downloadassets-boolean) option of the export. Requires `assetsDirectory`
 
+#### `skipAssetUpdates` [boolean] [default: false]
+
+Skip updating existing assets
+
 #### `assetsDirectory` [string]
 
 Path to a directory with an asset export made using the [downloadAssets](https://github.com/contentful/contentful-export#downloadassets-boolean) option of the export. Requires `uploadAssets`

package/dist/index.d.mts

@@ -8,6 +8,8 @@ type RunContentfulImportParams = {
     skipContentModel?: boolean;
     skipLocales?: boolean;
     skipContentPublishing?: boolean;
+    skipAssetUpdates?: boolean;
+    skipContentUpdates?: boolean;
     uploadAssets?: boolean;
     assetsDirectory?: string;
     host?: string;

package/dist/index.d.ts

@@ -8,6 +8,8 @@ type RunContentfulImportParams = {
     skipContentModel?: boolean;
     skipLocales?: boolean;
     skipContentPublishing?: boolean;
+    skipAssetUpdates?: boolean;
+    skipContentUpdates?: boolean;
     uploadAssets?: boolean;
     assetsDirectory?: string;
     host?: string;

package/dist/index.js

@@ -284,16 +284,21 @@ 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"));
 var import_logging4 = require("contentful-batch-libs/dist/logging");
-function createEntities({ context, entities, destinationEntitiesById, requestQueue }) {
-  return createEntitiesWithConcurrency({ context, entities, destinationEntitiesById, requestQueue });
+function createEntities({ context, entities, destinationEntitiesById, skipUpdates, requestQueue }) {
+  return createEntitiesWithConcurrency({ context, entities, destinationEntitiesById, skipUpdates, requestQueue });
 }
 function createLocales({ context, entities, destinationEntitiesById, requestQueue }) {
   return createEntitiesInSequence({ context, entities, destinationEntitiesById, requestQueue });
 }
-async function createEntitiesWithConcurrency({ context, entities, destinationEntitiesById, requestQueue }) {
+async function createEntitiesWithConcurrency({ context, entities, destinationEntitiesById, skipUpdates, requestQueue }) {
   const pendingCreatedEntities = entities.map((entity) => {
     const destinationEntity = getDestinationEntityForSourceEntity(destinationEntitiesById, entity.transformed);
-    const operation = destinationEntity ? "update" : "create";
+    const updateOperation = skipUpdates ? "skip" : "update";
+    const operation = destinationEntity ? updateOperation : "create";
+    if (destinationEntity && skipUpdates) {
+      creationSuccessNotifier(operation, entity.transformed);
+      return;
+    }
     return requestQueue.add(async () => {
       try {
         const createdEntity = await (destinationEntity ? updateDestinationWithSourceData(destinationEntity, entity.transformed) : createInDestination(context, entity.transformed));
@@ -328,19 +333,24 @@ async function createEntitiesInSequence({ context, entities, destinationEntities
   }
   return createdEntities;
 }
-async function createEntries({ context, entities, destinationEntitiesById, requestQueue }) {
+async function createEntries({ context, entities, destinationEntitiesById, skipUpdates, requestQueue }) {
   const createdEntries = await Promise.all(entities.map((entry) => {
-    return createEntry({ entry, target: context.target, skipContentModel: context.skipContentModel, destinationEntitiesById, requestQueue });
+    return createEntry({ entry, target: context.target, skipContentModel: context.skipContentModel, destinationEntitiesById, skipUpdates, requestQueue });
   }));
   return createdEntries.filter((entry) => entry);
 }
-async function createEntry({ entry, target, skipContentModel, destinationEntitiesById, requestQueue }) {
+async function createEntry({ entry, target, skipContentModel, destinationEntitiesById, skipUpdates, requestQueue }) {
   const contentTypeId = entry.original.sys.contentType.sys.id;
   const destinationEntry = getDestinationEntityForSourceEntity(
     destinationEntitiesById,
     entry.transformed
   );
-  const operation = destinationEntry ? "update" : "create";
+  const updateOperation = skipUpdates ? "skip" : "update";
+  const operation = destinationEntry ? updateOperation : "create";
+  if (destinationEntry && skipUpdates) {
+    creationSuccessNotifier(operation, entry.transformed);
+    return entry.transformed;
+  }
   try {
     const createdOrUpdatedEntry = await requestQueue.add(() => {
       return destinationEntry ? updateDestinationWithSourceData(destinationEntry, entry.transformed) : createEntryInDestination(target, contentTypeId, entry.transformed);
@@ -352,7 +362,7 @@ async function createEntry({ entry, target, skipContentModel, destinationEntitie
       if (skipContentModel && err.name === "UnknownField") {
         const errors = (0, import_object.get)(JSON.parse(err.message), "details.errors");
         entry.transformed.fields = cleanupUnknownFields(entry.transformed.fields, errors);
-        return createEntry({ entry, target, skipContentModel, destinationEntitiesById, requestQueue });
+        return createEntry({ entry, target, skipContentModel, destinationEntitiesById, skipUpdates, requestQueue });
       }
     }
     if (err instanceof ContentfulEntityError) {
@@ -410,8 +420,7 @@ function getDestinationEntityForSourceEntity(destinationEntitiesById, sourceEnti
   return destinationEntitiesById.get((0, import_object.get)(sourceEntity, "sys.id")) || null;
 }
 function creationSuccessNotifier(method, createdEntity) {
-  const verb = method[0].toUpperCase() + method.substr(1, method.length) + "d";
-  import_logging4.logEmitter.emit("info", `${verb} ${createdEntity.sys.type} ${(0, import_get_entity_name2.default)(createdEntity)}`);
+  import_logging4.logEmitter.emit("info", `${method.toUpperCase()} ${createdEntity.sys.type} ${(0, import_get_entity_name2.default)(createdEntity)}`);
   return createdEntity;
 }
 function getPlainData(entity) {
@@ -524,12 +533,14 @@ function pushToSpace({
   environmentId,
   contentModelOnly,
   skipContentModel,
+  skipContentUpdates,
   skipLocales,
   skipContentPublishing,
   timeout,
   retryLimit,
   listrOptions,
   uploadAssets,
+  skipAssetUpdates,
   assetsDirectory,
   requestQueue
 }) {
@@ -588,6 +599,7 @@ function pushToSpace({
           context: { target: ctx.environment, type: "ContentType" },
           entities: sourceData.contentTypes,
           destinationEntitiesById: destinationDataById.contentTypes,
+          skipUpdates: false,
           requestQueue
         });
         ctx.data.contentTypes = contentTypes2;
@@ -614,6 +626,7 @@ function pushToSpace({
             context: { target: ctx.environment, type: "Tag" },
             entities: sourceData.tags,
             destinationEntitiesById: destinationDataById.tags,
+            skipUpdates: false,
             requestQueue
           });
           ctx.data.tags = tags2;
@@ -703,6 +716,7 @@ function pushToSpace({
           context: { target: ctx.environment, type: "Asset" },
           entities: sourceData.assets,
           destinationEntitiesById: destinationDataById.assets,
+          skipUpdates: skipAssetUpdates,
           requestQueue
         });
         const processedAssets = await processAssets({
@@ -746,6 +760,7 @@ function pushToSpace({
           context: { target: ctx.environment, skipContentModel },
           entities: sourceData.entries,
           destinationEntitiesById: destinationDataById.entries,
+          skipUpdates: skipContentUpdates,
           requestQueue
         });
         ctx.data.entries = entries2;
@@ -1173,6 +1188,8 @@ async function parseOptions(params) {
     skipContentModel: false,
     skipLocales: false,
     skipContentPublishing: false,
+    skipAssetUpdates: false,
+    skipContentUpdates: false,
     useVerboseRenderer: false,
     environmentId: "master",
     rawProxy: false,
@@ -1329,6 +1346,8 @@ async function runContentfulImport(params) {
           skipLocales: options.skipLocales,
           skipContentModel: options.skipContentModel,
           skipContentPublishing: options.skipContentPublishing,
+          skipAssetUpdates: options.skipAssetUpdates,
+          skipContentUpdates: options.skipContentUpdates,
           timeout: options.timeout,
           retryLimit: options.retryLimit,
           uploadAssets: options.uploadAssets,

package/dist/index.mjs

@@ -257,16 +257,21 @@ import { find } from "lodash/collection";
 import { assign, get, omitBy, omit } from "lodash/object";
 import getEntityName2 from "contentful-batch-libs/dist/get-entity-name";
 import { logEmitter as logEmitter4 } from "contentful-batch-libs/dist/logging";
-function createEntities({ context, entities, destinationEntitiesById, requestQueue }) {
-  return createEntitiesWithConcurrency({ context, entities, destinationEntitiesById, requestQueue });
+function createEntities({ context, entities, destinationEntitiesById, skipUpdates, requestQueue }) {
+  return createEntitiesWithConcurrency({ context, entities, destinationEntitiesById, skipUpdates, requestQueue });
 }
 function createLocales({ context, entities, destinationEntitiesById, requestQueue }) {
   return createEntitiesInSequence({ context, entities, destinationEntitiesById, requestQueue });
 }
-async function createEntitiesWithConcurrency({ context, entities, destinationEntitiesById, requestQueue }) {
+async function createEntitiesWithConcurrency({ context, entities, destinationEntitiesById, skipUpdates, requestQueue }) {
   const pendingCreatedEntities = entities.map((entity) => {
     const destinationEntity = getDestinationEntityForSourceEntity(destinationEntitiesById, entity.transformed);
-    const operation = destinationEntity ? "update" : "create";
+    const updateOperation = skipUpdates ? "skip" : "update";
+    const operation = destinationEntity ? updateOperation : "create";
+    if (destinationEntity && skipUpdates) {
+      creationSuccessNotifier(operation, entity.transformed);
+      return;
+    }
     return requestQueue.add(async () => {
       try {
         const createdEntity = await (destinationEntity ? updateDestinationWithSourceData(destinationEntity, entity.transformed) : createInDestination(context, entity.transformed));
@@ -301,19 +306,24 @@ async function createEntitiesInSequence({ context, entities, destinationEntities
   }
   return createdEntities;
 }
-async function createEntries({ context, entities, destinationEntitiesById, requestQueue }) {
+async function createEntries({ context, entities, destinationEntitiesById, skipUpdates, requestQueue }) {
   const createdEntries = await Promise.all(entities.map((entry) => {
-    return createEntry({ entry, target: context.target, skipContentModel: context.skipContentModel, destinationEntitiesById, requestQueue });
+    return createEntry({ entry, target: context.target, skipContentModel: context.skipContentModel, destinationEntitiesById, skipUpdates, requestQueue });
   }));
   return createdEntries.filter((entry) => entry);
 }
-async function createEntry({ entry, target, skipContentModel, destinationEntitiesById, requestQueue }) {
+async function createEntry({ entry, target, skipContentModel, destinationEntitiesById, skipUpdates, requestQueue }) {
   const contentTypeId = entry.original.sys.contentType.sys.id;
   const destinationEntry = getDestinationEntityForSourceEntity(
     destinationEntitiesById,
     entry.transformed
   );
-  const operation = destinationEntry ? "update" : "create";
+  const updateOperation = skipUpdates ? "skip" : "update";
+  const operation = destinationEntry ? updateOperation : "create";
+  if (destinationEntry && skipUpdates) {
+    creationSuccessNotifier(operation, entry.transformed);
+    return entry.transformed;
+  }
   try {
     const createdOrUpdatedEntry = await requestQueue.add(() => {
       return destinationEntry ? updateDestinationWithSourceData(destinationEntry, entry.transformed) : createEntryInDestination(target, contentTypeId, entry.transformed);
@@ -325,7 +335,7 @@ async function createEntry({ entry, target, skipContentModel, destinationEntitie
       if (skipContentModel && err.name === "UnknownField") {
         const errors = get(JSON.parse(err.message), "details.errors");
         entry.transformed.fields = cleanupUnknownFields(entry.transformed.fields, errors);
-        return createEntry({ entry, target, skipContentModel, destinationEntitiesById, requestQueue });
+        return createEntry({ entry, target, skipContentModel, destinationEntitiesById, skipUpdates, requestQueue });
       }
     }
     if (err instanceof ContentfulEntityError) {
@@ -383,8 +393,7 @@ function getDestinationEntityForSourceEntity(destinationEntitiesById, sourceEnti
   return destinationEntitiesById.get(get(sourceEntity, "sys.id")) || null;
 }
 function creationSuccessNotifier(method, createdEntity) {
-  const verb = method[0].toUpperCase() + method.substr(1, method.length) + "d";
-  logEmitter4.emit("info", `${verb} ${createdEntity.sys.type} ${getEntityName2(createdEntity)}`);
+  logEmitter4.emit("info", `${method.toUpperCase()} ${createdEntity.sys.type} ${getEntityName2(createdEntity)}`);
   return createdEntity;
 }
 function getPlainData(entity) {
@@ -497,12 +506,14 @@ function pushToSpace({
   environmentId,
   contentModelOnly,
   skipContentModel,
+  skipContentUpdates,
   skipLocales,
   skipContentPublishing,
   timeout,
   retryLimit,
   listrOptions,
   uploadAssets,
+  skipAssetUpdates,
   assetsDirectory,
   requestQueue
 }) {
@@ -561,6 +572,7 @@ function pushToSpace({
           context: { target: ctx.environment, type: "ContentType" },
           entities: sourceData.contentTypes,
           destinationEntitiesById: destinationDataById.contentTypes,
+          skipUpdates: false,
           requestQueue
         });
         ctx.data.contentTypes = contentTypes2;
@@ -587,6 +599,7 @@ function pushToSpace({
             context: { target: ctx.environment, type: "Tag" },
             entities: sourceData.tags,
             destinationEntitiesById: destinationDataById.tags,
+            skipUpdates: false,
             requestQueue
           });
           ctx.data.tags = tags2;
@@ -676,6 +689,7 @@ function pushToSpace({
           context: { target: ctx.environment, type: "Asset" },
           entities: sourceData.assets,
           destinationEntitiesById: destinationDataById.assets,
+          skipUpdates: skipAssetUpdates,
           requestQueue
         });
         const processedAssets = await processAssets({
@@ -719,6 +733,7 @@ function pushToSpace({
           context: { target: ctx.environment, skipContentModel },
           entities: sourceData.entries,
           destinationEntitiesById: destinationDataById.entries,
+          skipUpdates: skipContentUpdates,
           requestQueue
         });
         ctx.data.entries = entries2;
@@ -1143,6 +1158,8 @@ async function parseOptions(params) {
     skipContentModel: false,
     skipLocales: false,
     skipContentPublishing: false,
+    skipAssetUpdates: false,
+    skipContentUpdates: false,
     useVerboseRenderer: false,
     environmentId: "master",
     rawProxy: false,
@@ -1299,6 +1316,8 @@ async function runContentfulImport(params) {
           skipLocales: options.skipLocales,
           skipContentModel: options.skipContentModel,
           skipContentPublishing: options.skipContentPublishing,
+          skipAssetUpdates: options.skipAssetUpdates,
+          skipContentUpdates: options.skipContentUpdates,
           timeout: options.timeout,
           retryLimit: options.retryLimit,
           uploadAssets: options.uploadAssets,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentful-import",
-  "version": "9.4.55",
+  "version": "9.4.57",
   "description": "this tool allows you to import JSON dump exported by contentful-export",
   "main": "dist/index.mjs",
   "typings": "dist/index.d.ts",
@@ -62,13 +62,13 @@
   "dependencies": {
     "@discoveryjs/json-ext": "^0.5.7",
     "bluebird": "^3.7.2",
-    "cli-table3": "^0.6.4",
+    "cli-table3": "^0.6.5",
     "contentful-batch-libs": "^9.6.0",
-    "contentful-management": "^11.24.3",
+    "contentful-management": "^11.26.1",
     "date-fns": "^2.30.0",
     "eslint": "^8.57.0",
     "eslint-config-standard": "^17.1.0",
-    "joi": "^17.12.3",
+    "joi": "^17.13.1",
     "listr": "^0.14.1",
     "listr-update-renderer": "^0.5.0",
     "listr-verbose-renderer": "^0.6.0",
@@ -87,16 +87,16 @@
     "babel-preset-env": "^1.7.0",
     "cz-conventional-changelog": "^3.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^27.9.0",
+    "eslint-plugin-jest": "^28.5.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-standard": "^5.0.0",
     "jest": "^29.7.0",
-    "rimraf": "^5.0.5",
-    "semantic-release": "^22.0.12",
-    "ts-jest": "^29.1.2",
+    "rimraf": "^5.0.7",
+    "semantic-release": "^23.1.1",
+    "ts-jest": "^29.1.3",
     "tsup": "^8.0.2",
-    "typescript": "^5.4.4"
+    "typescript": "^5.4.5"
   },
   "files": [
     "bin",