contentful-import 10.0.18 → 10.1.0-exo.2

package/dist/index.d.mts

@@ -19,6 +19,7 @@ type RunContentfulImportParams = {
     headers?: object;
     errorLogFile?: string;
     useVerboseRenderer?: boolean;
+    includeExperienceOrchestration?: boolean;
     timeout?: number;
     retryLimit?: number;
     config?: string;

package/dist/index.d.ts

@@ -19,6 +19,7 @@ type RunContentfulImportParams = {
     headers?: object;
     errorLogFile?: string;
     useVerboseRenderer?: boolean;
+    includeExperienceOrchestration?: boolean;
     timeout?: number;
     retryLimit?: number;
     config?: string;

package/dist/index.js

@@ -60,6 +60,13 @@ function initClient(opts) {
   };
   return (0, import_contentful_management.createClient)(config, { type: "legacy" });
 }
+function initPlainClient(opts) {
+  return (0, import_contentful_management.createClient)({
+    accessToken: opts.managementToken,
+    host: opts.host,
+    logHandler
+  });
+}
 
 // lib/tasks/get-destination-data.ts
 var import_bluebird = __toESM(require("bluebird"));
@@ -570,8 +577,10 @@ function pushToSpace({
   sourceData,
   destinationData = {},
   client,
+  plainClient,
   spaceId,
   environmentId,
+  includeExperienceOrchestration,
   contentModelOnly,
   skipContentModel,
   skipContentUpdates,
@@ -847,9 +856,108 @@ function pushToSpace({
         ctx.data.webhooks = webhooks2;
       }),
       skip: () => contentModelOnly || environmentId !== "master" && "Webhooks can only be imported in master environment"
+    },
+    {
+      title: "Importing Component Types",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const results = await Promise.all((sourceData.componentTypes || []).map(async (entity) => {
+          try {
+            const result = await plainClient.componentType.upsert({ spaceId, environmentId, componentTypeId: entity.sys.id }, omitSys(entity));
+            import_logging6.logEmitter.emit("info", `UPSERT ComponentType ${entity.sys.id}`);
+            return result;
+          } catch (err) {
+            import_logging6.logEmitter.emit("error", err);
+            return null;
+          }
+        }));
+        ctx.data.componentTypes = results.filter(Boolean);
+      }),
+      skip: () => !includeExperienceOrchestration || !(sourceData.componentTypes || []).length
+    },
+    {
+      title: "Importing Templates",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const results = await Promise.all((sourceData.templates || []).map(async (entity) => {
+          try {
+            const result = await plainClient.template.upsert({ spaceId, environmentId, templateId: entity.sys.id }, omitSys(entity));
+            import_logging6.logEmitter.emit("info", `UPSERT Template ${entity.sys.id}`);
+            return result;
+          } catch (err) {
+            import_logging6.logEmitter.emit("error", err);
+            return null;
+          }
+        }));
+        ctx.data.templates = results.filter(Boolean);
+      }),
+      skip: () => !includeExperienceOrchestration || !(sourceData.templates || []).length
+    },
+    {
+      title: "Importing Fragments",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const results = await Promise.all((sourceData.fragments || []).map(async (entity) => {
+          try {
+            const result = await plainClient.fragment.upsert({ spaceId, environmentId, fragmentId: entity.sys.id }, omitSys(entity));
+            import_logging6.logEmitter.emit("info", `UPSERT Fragment ${entity.sys.id}`);
+            return result;
+          } catch (err) {
+            import_logging6.logEmitter.emit("error", err);
+            return null;
+          }
+        }));
+        ctx.data.fragments = results.filter(Boolean);
+      }),
+      skip: () => !includeExperienceOrchestration || !(sourceData.fragments || []).length
+    },
+    {
+      title: "Importing Data Assemblies",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const results = await Promise.all((sourceData.dataAssemblies || []).map(async (entity) => {
+          try {
+            let result;
+            try {
+              const existing = await plainClient.dataAssembly.get({ spaceId, environmentId, dataAssemblyId: entity.sys.id });
+              result = await plainClient.dataAssembly.update({ spaceId, environmentId, dataAssemblyId: entity.sys.id }, { ...omitSys(entity), sys: { version: existing.sys.version } });
+            } catch (getErr) {
+              if (getErr.status === 404) {
+                result = await plainClient.dataAssembly.create({ spaceId, environmentId }, omitSys(entity));
+              } else {
+                throw getErr;
+              }
+            }
+            import_logging6.logEmitter.emit("info", `UPSERT DataAssembly ${entity.sys.id}`);
+            return result;
+          } catch (err) {
+            import_logging6.logEmitter.emit("error", err);
+            return null;
+          }
+        }));
+        ctx.data.dataAssemblies = results.filter(Boolean);
+      }),
+      skip: () => !includeExperienceOrchestration || !(sourceData.dataAssemblies || []).length
+    },
+    {
+      title: "Importing Experiences",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const results = await Promise.all((sourceData.experiences || []).map(async (entity) => {
+          try {
+            const result = await plainClient.experience.upsert({ spaceId, environmentId, experienceId: entity.sys.id }, omitSys(entity));
+            import_logging6.logEmitter.emit("info", `UPSERT Experience ${entity.sys.id}`);
+            return result;
+          } catch (err) {
+            import_logging6.logEmitter.emit("error", err);
+            return null;
+          }
+        }));
+        ctx.data.experiences = results.filter(Boolean);
+      }),
+      skip: () => !includeExperienceOrchestration || !(sourceData.experiences || []).length
     }
   ], listrOptions);
 }
+function omitSys(entity) {
+  const { sys: _sys, ...rest } = entity;
+  return rest;
+}
 function archiveEntities2({ entities, sourceEntities, requestQueue }) {
   const entityIdsToArchive = sourceEntities.filter(({ original }) => original.sys.archivedVersion).map(({ original }) => original.sys.id);
   const entitiesToArchive = entities.filter((entity) => entityIdsToArchive.indexOf(entity.sys.id) !== -1);
@@ -1218,7 +1326,12 @@ var SUPPORTED_ENTITY_TYPES = [
   "assets",
   "locales",
   "webhooks",
-  "editorInterfaces"
+  "editorInterfaces",
+  "componentTypes",
+  "templates",
+  "dataAssemblies",
+  "fragments",
+  "experiences"
 ];
 async function parseOptions(params) {
   const defaultOptions = {
@@ -1231,7 +1344,8 @@ async function parseOptions(params) {
     environmentId: "master",
     rawProxy: false,
     uploadAssets: false,
-    rateLimit: 7
+    rateLimit: 7,
+    includeExperienceOrchestration: false
   };
   const configFile = params.config ? require((0, import_path2.resolve)(process.cwd(), params.config)) : {};
   const options = {
@@ -1344,6 +1458,7 @@ async function runContentfulImport(params) {
       title: "Initialize client",
       task: (0, import_listr4.wrapTask)(async (ctx) => {
         ctx.client = initClient({ ...options, content: void 0 });
+        ctx.plainClient = initPlainClient({ ...options, content: void 0 });
       })
     },
     {
@@ -1377,7 +1492,9 @@ async function runContentfulImport(params) {
           sourceData: ctx.sourceData,
           destinationData: ctx.destinationData,
           client: ctx.client,
+          plainClient: ctx.plainClient,
           spaceId: options.spaceId,
+          includeExperienceOrchestration: options.includeExperienceOrchestration,
           environmentId: options.environmentId,
           contentModelOnly: options.contentModelOnly,
           skipLocales: options.skipLocales,

package/dist/index.mjs

@@ -33,6 +33,13 @@ function initClient(opts) {
   };
   return createClient(config, { type: "legacy" });
 }
+function initPlainClient(opts) {
+  return createClient({
+    accessToken: opts.managementToken,
+    host: opts.host,
+    logHandler
+  });
+}
 
 // lib/tasks/get-destination-data.ts
 import Promise2 from "bluebird";
@@ -543,8 +550,10 @@ function pushToSpace({
   sourceData,
   destinationData = {},
   client,
+  plainClient,
   spaceId,
   environmentId,
+  includeExperienceOrchestration,
   contentModelOnly,
   skipContentModel,
   skipContentUpdates,
@@ -820,9 +829,108 @@ function pushToSpace({
         ctx.data.webhooks = webhooks2;
       }),
       skip: () => contentModelOnly || environmentId !== "master" && "Webhooks can only be imported in master environment"
+    },
+    {
+      title: "Importing Component Types",
+      task: wrapTask(async (ctx) => {
+        const results = await Promise.all((sourceData.componentTypes || []).map(async (entity) => {
+          try {
+            const result = await plainClient.componentType.upsert({ spaceId, environmentId, componentTypeId: entity.sys.id }, omitSys(entity));
+            logEmitter6.emit("info", `UPSERT ComponentType ${entity.sys.id}`);
+            return result;
+          } catch (err) {
+            logEmitter6.emit("error", err);
+            return null;
+          }
+        }));
+        ctx.data.componentTypes = results.filter(Boolean);
+      }),
+      skip: () => !includeExperienceOrchestration || !(sourceData.componentTypes || []).length
+    },
+    {
+      title: "Importing Templates",
+      task: wrapTask(async (ctx) => {
+        const results = await Promise.all((sourceData.templates || []).map(async (entity) => {
+          try {
+            const result = await plainClient.template.upsert({ spaceId, environmentId, templateId: entity.sys.id }, omitSys(entity));
+            logEmitter6.emit("info", `UPSERT Template ${entity.sys.id}`);
+            return result;
+          } catch (err) {
+            logEmitter6.emit("error", err);
+            return null;
+          }
+        }));
+        ctx.data.templates = results.filter(Boolean);
+      }),
+      skip: () => !includeExperienceOrchestration || !(sourceData.templates || []).length
+    },
+    {
+      title: "Importing Fragments",
+      task: wrapTask(async (ctx) => {
+        const results = await Promise.all((sourceData.fragments || []).map(async (entity) => {
+          try {
+            const result = await plainClient.fragment.upsert({ spaceId, environmentId, fragmentId: entity.sys.id }, omitSys(entity));
+            logEmitter6.emit("info", `UPSERT Fragment ${entity.sys.id}`);
+            return result;
+          } catch (err) {
+            logEmitter6.emit("error", err);
+            return null;
+          }
+        }));
+        ctx.data.fragments = results.filter(Boolean);
+      }),
+      skip: () => !includeExperienceOrchestration || !(sourceData.fragments || []).length
+    },
+    {
+      title: "Importing Data Assemblies",
+      task: wrapTask(async (ctx) => {
+        const results = await Promise.all((sourceData.dataAssemblies || []).map(async (entity) => {
+          try {
+            let result;
+            try {
+              const existing = await plainClient.dataAssembly.get({ spaceId, environmentId, dataAssemblyId: entity.sys.id });
+              result = await plainClient.dataAssembly.update({ spaceId, environmentId, dataAssemblyId: entity.sys.id }, { ...omitSys(entity), sys: { version: existing.sys.version } });
+            } catch (getErr) {
+              if (getErr.status === 404) {
+                result = await plainClient.dataAssembly.create({ spaceId, environmentId }, omitSys(entity));
+              } else {
+                throw getErr;
+              }
+            }
+            logEmitter6.emit("info", `UPSERT DataAssembly ${entity.sys.id}`);
+            return result;
+          } catch (err) {
+            logEmitter6.emit("error", err);
+            return null;
+          }
+        }));
+        ctx.data.dataAssemblies = results.filter(Boolean);
+      }),
+      skip: () => !includeExperienceOrchestration || !(sourceData.dataAssemblies || []).length
+    },
+    {
+      title: "Importing Experiences",
+      task: wrapTask(async (ctx) => {
+        const results = await Promise.all((sourceData.experiences || []).map(async (entity) => {
+          try {
+            const result = await plainClient.experience.upsert({ spaceId, environmentId, experienceId: entity.sys.id }, omitSys(entity));
+            logEmitter6.emit("info", `UPSERT Experience ${entity.sys.id}`);
+            return result;
+          } catch (err) {
+            logEmitter6.emit("error", err);
+            return null;
+          }
+        }));
+        ctx.data.experiences = results.filter(Boolean);
+      }),
+      skip: () => !includeExperienceOrchestration || !(sourceData.experiences || []).length
     }
   ], listrOptions);
 }
+function omitSys(entity) {
+  const { sys: _sys, ...rest } = entity;
+  return rest;
+}
 function archiveEntities2({ entities, sourceEntities, requestQueue }) {
   const entityIdsToArchive = sourceEntities.filter(({ original }) => original.sys.archivedVersion).map(({ original }) => original.sys.id);
   const entitiesToArchive = entities.filter((entity) => entityIdsToArchive.indexOf(entity.sys.id) !== -1);
@@ -1188,7 +1296,12 @@ var SUPPORTED_ENTITY_TYPES = [
   "assets",
   "locales",
   "webhooks",
-  "editorInterfaces"
+  "editorInterfaces",
+  "componentTypes",
+  "templates",
+  "dataAssemblies",
+  "fragments",
+  "experiences"
 ];
 async function parseOptions(params) {
   const defaultOptions = {
@@ -1201,7 +1314,8 @@ async function parseOptions(params) {
     environmentId: "master",
     rawProxy: false,
     uploadAssets: false,
-    rateLimit: 7
+    rateLimit: 7,
+    includeExperienceOrchestration: false
   };
   const configFile = params.config ? __require(resolve(process.cwd(), params.config)) : {};
   const options = {
@@ -1314,6 +1428,7 @@ async function runContentfulImport(params) {
       title: "Initialize client",
       task: wrapTask2(async (ctx) => {
         ctx.client = initClient({ ...options, content: void 0 });
+        ctx.plainClient = initPlainClient({ ...options, content: void 0 });
       })
     },
     {
@@ -1347,7 +1462,9 @@ async function runContentfulImport(params) {
           sourceData: ctx.sourceData,
           destinationData: ctx.destinationData,
           client: ctx.client,
+          plainClient: ctx.plainClient,
           spaceId: options.spaceId,
+          includeExperienceOrchestration: options.includeExperienceOrchestration,
           environmentId: options.environmentId,
           contentModelOnly: options.contentModelOnly,
           skipLocales: options.skipLocales,

package/dist/usageParams.d.mts

@@ -29,6 +29,8 @@ declare const _default: {
     "rate-limit": number;
     rateLimit: number;
     header: string | undefined;
+    "include-experience-orchestration": boolean;
+    includeExperienceOrchestration: boolean;
     _: (string | number)[];
     $0: string;
 } | Promise<{
@@ -62,6 +64,8 @@ declare const _default: {
     "rate-limit": number;
     rateLimit: number;
     header: string | undefined;
+    "include-experience-orchestration": boolean;
+    includeExperienceOrchestration: boolean;
     _: (string | number)[];
     $0: string;
 }>;

package/dist/usageParams.d.ts

@@ -29,6 +29,8 @@ declare const _default: {
     "rate-limit": number;
     rateLimit: number;
     header: string | undefined;
+    "include-experience-orchestration": boolean;
+    includeExperienceOrchestration: boolean;
     _: (string | number)[];
     $0: string;
 } | Promise<{
@@ -62,6 +64,8 @@ declare const _default: {
     "rate-limit": number;
     rateLimit: number;
     header: string | undefined;
+    "include-experience-orchestration": boolean;
+    includeExperienceOrchestration: boolean;
     _: (string | number)[];
     $0: string;
 }>;

package/dist/usageParams.js

@@ -99,4 +99,8 @@ var usageParams_default = import_yargs.default.version(version || "Version only
   alias: "H",
   type: "string",
   describe: "Pass an additional HTTP Header"
+}).option("include-experience-orchestration", {
+  describe: "Import Experience Orchestration entities (componentTypes, templates, fragments, dataAssemblies, experiences). Requires a space with ExO enabled.",
+  type: "boolean",
+  default: true
 }).config("config", "An optional configuration JSON file containing all the options for a single run").argv;

package/dist/usageParams.mjs

@@ -65,6 +65,10 @@ var usageParams_default = yargs.version(version || "Version only available on in
   alias: "H",
   type: "string",
   describe: "Pass an additional HTTP Header"
+}).option("include-experience-orchestration", {
+  describe: "Import Experience Orchestration entities (componentTypes, templates, fragments, dataAssemblies, experiences). Requires a space with ExO enabled.",
+  type: "boolean",
+  default: true
 }).config("config", "An optional configuration JSON file containing all the options for a single run").argv;
 export {
   usageParams_default as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentful-import",
-  "version": "10.0.18",
+  "version": "10.1.0-exo.2",
   "description": "this tool allows you to import JSON dump exported by contentful-export",
   "main": "dist/index.mjs",
   "typings": "dist/index.d.ts",
@@ -64,7 +64,7 @@
     "bluebird": "^3.7.2",
     "cli-table3": "^0.6.5",
     "contentful-batch-libs": "^9.7.0",
-    "contentful-management": "^12.8.0",
+    "contentful-management": "^12.6.0-dev.4",
     "date-fns": "^2.30.0",
     "joi": "^18.2.3",
     "listr": "^0.14.3",
@@ -145,6 +145,6 @@
     ]
   },
   "overrides": {
-    "undici": "^8.0.0"
+    "undici": "^6.27.0"
   }
 }