contentful-import 10.3.0 → 10.4.0

package/README.md

@@ -227,6 +227,10 @@ Path to a JSON file with the configuration options. This file will be merged wit
 
 Flag controlling whether Experience Orchestration (ExO) entities — Design Tokens, Components, Experience Templates, Experience Fragments, Data Assemblies, and Experiences — are imported when present in the source content. Requires the `exoM1` entitlement on the destination space's organization. Set to `false` to opt out. See the "Experience Orchestration (ExO) entities" section below for what happens when the destination isn't entitled.
 
+#### `skipExoVariants` [boolean] [default: false]
+
+Skip importing nested Experience and Experience Fragment Optimization Variants. This can be useful when re-importing the same export because the upstream API generates new variant IDs on every create and cannot upsert by the source variant ID.
+
 ## :rescue_worker_helmet: Troubleshooting
 
 ### Proxy
@@ -292,6 +296,8 @@ The `designTokens`, `components`, `experienceTemplates`, `dataAssemblies`, `expe
 
 ExO import is on by default (`includeExperienceOrchestration: true`) — for the CLI and the module API alike. Pass `includeExperienceOrchestration: false` (`--include-experience-orchestration=false` on the CLI) to opt out.
 
+Optimization Variant import is on automatically when the source contains nested variants. Pass `skipExoVariants: true` (or `--skip-exo-variants`) to leave them out of the import. When variants are imported, a warning is logged because each run creates fresh destination variant IDs and re-importing can create duplicates.
+
 ```javascript
 import contentfulImport from 'contentful-import'
 
@@ -322,10 +328,21 @@ ExO entities are created and published in dependency order, then unpublished in
 4. Experience Templates — create, then publish
 5. Experience Fragments — create, then publish
 6. Experiences — create, then publish
-7. Unpublish pass, in reverse: Experiences → Experience Fragments → Experience Templates → Components → Data Assemblies
+7. Experience Optimization Variants — create, then publish/archive (only if the source has any; see below)
+8. Experience Fragment Optimization Variants — create, then publish/archive (only if the source has any; see below)
+9. Unpublish pass, in reverse: Experiences → Experience Fragments → Experience Templates → Components → Data Assemblies
 
 An entity that's published in the source is published in the destination on import. An entity that's unpublished (or removed) in the source but still published in the destination is unpublished on re-import — this propagates in both directions, so reverting a published ExO entity back to draft in the source and re-running the import will unpublish it in the destination too.
 
+### Optimization Variants
+
+Experiences and Experience Fragments each support **Optimization Variants** — alternate personalization versions nested onto their parent (`experience.optimizationVariants` / `experienceFragment.optimizationVariants`), not a flat top-level array like the other six ExO entity types. A variant's `sys.id` is borrowed from its parent rather than being globally unique — see the export tool's own doc ([contentful-export's ExO doc](https://github.com/contentful/contentful-export/blob/main/docs/exo-export.md#optimization-variants)) for the full rationale.
+
+Two behaviors are worth calling out explicitly because they differ from every other ExO entity type:
+
+- **No ID preservation.** Every other ExO entity is created via upsert-with-known-ID. Variants can't be: the upstream API's create endpoint always server-generates a fresh ID, and its update endpoint 404s on an unknown ID instead of creating one. Every import run creates brand-new destination variants — re-running an import with variants in the source data creates additional variants rather than updating existing ones.
+- **The API's synthetic "default" entry is filtered out.** The upstream list endpoint always leads with an entry representing the parent's own base view (`sys.variantType: 'default'`) — not a real variant. `contentful-export` already excludes it; `contentful-import` filters it again defensively for older export files.
+
 ### URN rewriting / backward compatibility
 
 - Export files taken before the ExO entity rename (`ComponentType` → `Component`, `Fragment` → `ExperienceFragment`, `Template` → `ExperienceTemplate`) are upgraded automatically on import, including the corresponding resource-link `linkType`s and URN path segments. This upgrade is upgrade-only (there's no downgrade path) and idempotent, so it's safe to run against already-upgraded data.

package/dist/index.d.mts

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

package/dist/index.d.ts

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

package/dist/index.js

@@ -263,7 +263,7 @@ var require_logging = __commonJS({
         throw new Error("Unable to extract API error data");
       }
     }
-    function formatLogMessageOneLine(logMessage) {
+    function formatLogMessageOneLine2(logMessage) {
       const { level } = logMessage;
       if (!level) {
         return logMessage.toString().replace(/\s+/g, " ");
@@ -299,7 +299,7 @@ var require_logging = __commonJS({
         return logMessage.error.toString().replace(/\s+/g, " ");
       }
     }
-    exports2.formatLogMessageOneLine = formatLogMessageOneLine;
+    exports2.formatLogMessageOneLine = formatLogMessageOneLine2;
     function formatLogMessageLogfile(logMessage) {
       const { level } = logMessage;
       if (level === "info" || level === "warning") {
@@ -338,7 +338,7 @@ var require_logging = __commonJS({
 
 The following ${count.errors} errors and ${count.warnings} warnings occurred:
 `);
-        errorLog.map((logMessage) => `${(0, format_1.default)((0, parseISO_1.default)(logMessage.ts), "HH:mm:ss")} - ${formatLogMessageOneLine(logMessage)}`).map((logMessage) => console.log(logMessage));
+        errorLog.map((logMessage) => `${(0, format_1.default)((0, parseISO_1.default)(logMessage.ts), "HH:mm:ss")} - ${formatLogMessageOneLine2(logMessage)}`).map((logMessage) => console.log(logMessage));
         return;
       }
       console.log("No errors or warnings occurred");
@@ -385,7 +385,7 @@ The following ${count.errors} errors and ${count.warnings} warnings occurred:
     exports2.setupLogging = setupLogging2;
     function logToTaskOutput(task) {
       function logToTask(logMessage) {
-        const content = formatLogMessageOneLine(logMessage);
+        const content = formatLogMessageOneLine2(logMessage);
         const symbols = {
           info: figures_1.default.tick,
           warning: figures_1.default.warning,
@@ -598,12 +598,12 @@ var require_common = __commonJS({
             args.unshift("%O");
           }
           let index = 0;
-          args[0] = args[0].replace(/%([a-zA-Z%])/g, (match, format2) => {
+          args[0] = args[0].replace(/%([a-zA-Z%])/g, (match, format3) => {
             if (match === "%%") {
               return "%";
             }
             index++;
-            const formatter = createDebug.formatters[format2];
+            const formatter = createDebug.formatters[format3];
             if (typeof formatter === "function") {
               const val = args[index];
               match = formatter.call(self2, val);
@@ -2047,7 +2047,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_cli_table3 = __toESM(require("cli-table3"));
-var import_date_fns2 = require("date-fns");
+var import_date_fns3 = require("date-fns");
 var import_listr3 = __toESM(require("listr"));
 var import_listr_update_renderer = __toESM(require("listr-update-renderer"));
 var import_listr_verbose_renderer2 = __toESM(require("listr-verbose-renderer"));
@@ -4889,7 +4889,7 @@ var startCase_default = startCase;
 
 // lib/index.ts
 var import_p_queue = __toESM(require("p-queue"));
-var import_logging12 = __toESM(require_logging());
+var import_logging13 = __toESM(require_logging());
 var import_listr4 = __toESM(require_listr());
 
 // lib/tasks/init-client.ts
@@ -4955,6 +4955,34 @@ async function unpublishExoEntity(type, entity, unpublish) {
     return null;
   }
 }
+function filterVariantsToPublish(variants) {
+  return variants.filter((v) => v.sys.publishedVersion);
+}
+function filterVariantsToArchive(variants) {
+  return variants.filter((v) => v.sys.archivedVersion && !v.sys.publishedVersion);
+}
+async function publishVariant(type, entity, publish) {
+  try {
+    const result = await publish();
+    import_logging2.logEmitter.emit("info", `PUBLISH ${type} ${entity.sys.variant}`);
+    return result;
+  } catch (err) {
+    err.entity = entity;
+    import_logging2.logEmitter.emit("error", err);
+    return null;
+  }
+}
+async function archiveVariant(type, entity, archive) {
+  try {
+    const result = await archive();
+    import_logging2.logEmitter.emit("info", `ARCHIVE ${type} ${entity.sys.variant}`);
+    return result;
+  } catch (err) {
+    err.entity = entity;
+    import_logging2.logEmitter.emit("error", err);
+    return null;
+  }
+}
 function isExoEntitlementError(err) {
   if (!(err instanceof Error)) {
     return false;
@@ -6165,6 +6193,7 @@ function pushToSpace({
   spaceId,
   environmentId,
   includeExperienceOrchestration,
+  skipExoVariants,
   contentModelOnly,
   skipContentModel,
   skipContentUpdates,
@@ -6187,6 +6216,13 @@ function pushToSpace({
     ...DEFAULT_CONTENT_STRUCTURE,
     ...destinationData
   };
+  const hasOptimizationVariants = [
+    ...sourceData.experiences || [],
+    ...sourceData.experienceFragments || []
+  ].some((parent2) => (parent2.optimizationVariants || []).some(isRealOptimizationVariant));
+  if (includeExperienceOrchestration && !skipExoVariants && hasOptimizationVariants) {
+    import_logging11.logEmitter.emit("warning", "Optimization Variants are imported with new destination IDs and can be duplicated by re-imports. Set skipExoVariants to true to skip them.");
+  }
   listrOptions = listrOptions || {
     renderer: import_listr_verbose_renderer.default
   };
@@ -6651,12 +6687,12 @@ function pushToSpace({
           try {
             const existing = destinationDataById.experienceFragments?.get(entity.sys.id);
             if (existing) {
-              const payload = { ...entity, sys: { id: entity.sys.id, type: "ExperienceFragment", version: existing.sys.version } };
+              const payload = { ...omitSysAndOptimizationVariants(entity), sys: { id: entity.sys.id, type: "ExperienceFragment", version: existing.sys.version } };
               const result = await client.experienceFragment.upsert({ spaceId, environmentId, experienceFragmentId: entity.sys.id }, payload);
               import_logging11.logEmitter.emit("info", `UPDATE ExperienceFragment ${entity.sys.id}`);
               results.push(result);
             } else {
-              const payload = { ...omitSys(entity), component: entity.sys.component, sys: { id: entity.sys.id, type: "ExperienceFragment" } };
+              const payload = { ...omitSysAndOptimizationVariants(entity), component: entity.sys.component, sys: { id: entity.sys.id, type: "ExperienceFragment" } };
               const result = await client.experienceFragment.upsert({ spaceId, environmentId, experienceFragmentId: entity.sys.id }, payload);
               import_logging11.logEmitter.emit("info", `CREATE ExperienceFragment ${entity.sys.id}`);
               results.push(result);
@@ -6693,12 +6729,12 @@ function pushToSpace({
           try {
             const existing = destinationDataById.experiences?.get(entity.sys.id);
             if (existing) {
-              const payload = { ...entity, sys: { id: entity.sys.id, type: "Experience", version: existing.sys.version } };
+              const payload = { ...omitSysAndOptimizationVariants(entity), sys: { id: entity.sys.id, type: "Experience", version: existing.sys.version } };
               const result = await client.experience.upsert({ spaceId, environmentId, experienceId: entity.sys.id }, payload);
               import_logging11.logEmitter.emit("info", `UPDATE Experience ${entity.sys.id}`);
               return result;
             } else {
-              const payload = { ...omitSys(entity), experienceTemplate: entity.sys.experienceTemplate, sys: { id: entity.sys.id, type: "Experience" } };
+              const payload = { ...omitSysAndOptimizationVariants(entity), experienceTemplate: entity.sys.experienceTemplate, sys: { id: entity.sys.id, type: "Experience" } };
               const result = await client.experience.upsert({ spaceId, environmentId, experienceId: entity.sys.id }, payload);
               import_logging11.logEmitter.emit("info", `CREATE Experience ${entity.sys.id}`);
               return result;
@@ -6726,6 +6762,85 @@ function pushToSpace({
       }),
       skip: () => !includeExperienceOrchestration || skipContentPublishing || !(sourceData.experiences || []).length
     },
+    // Optimization Variants are sub-resources nested on their parent Experience/ExperienceFragment
+    // (sourceData.experiences[].optimizationVariants), not a flat top-level array. A variant's
+    // sys.id is borrowed from its parent, not unique, so variant creation/publish/archive is
+    // handled by new, self-contained functions (importVariantsForParents, filterVariantsToPublish,
+    // filterVariantsToArchive, publishVariant, archiveVariant) rather than by generalizing
+    // destinationDataById / filterExoEntitiesToPublish / filterExoEntitiesToUnpublish, which all
+    // assume sys.id uniqueness.
+    //
+    // Unlike the base Experience/Fragment create/update, there is no upsert-by-known-ID for
+    // variants: the upstream API's create endpoint always server-generates a fresh variantId
+    // (crypto.randomUUID()) and its update endpoint 404s on an unknown variantId rather than
+    // creating one. So every import run creates fresh destination variants via POST rather than
+    // matching against any existing destination variant.
+    {
+      title: "Importing Experience Optimization Variants",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const results = await importVariantsForParents({
+          parents: ctx.data.experiences || [],
+          sourceParents: sourceData.experiences || [],
+          client,
+          spaceId,
+          environmentId,
+          kind: "experience"
+        });
+        ctx.data.experienceVariants = results.flatMap((r) => r.created);
+      }),
+      skip: () => !includeExperienceOrchestration || skipExoVariants || !(sourceData.experiences || []).some((e) => (e.optimizationVariants || []).some(isRealOptimizationVariant))
+    },
+    {
+      title: "Publishing Experience Optimization Variants",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const toPublish = filterVariantsToPublish(ctx.data.experienceVariants || []);
+        await Promise.all(toPublish.map(
+          (v) => publishVariant("ExperienceVariant", v, () => client.experienceVariant.publish(
+            { spaceId, environmentId, experienceId: v.sys.id, variantId: v.sys.variant, version: v.sys.version }
+          ))
+        ));
+        const toArchive = filterVariantsToArchive(ctx.data.experienceVariants || []);
+        await Promise.all(toArchive.map(
+          (v) => archiveVariant("ExperienceVariant", v, () => client.experienceVariant.archive(
+            { spaceId, environmentId, experienceId: v.sys.id, variantId: v.sys.variant, version: v.sys.version }
+          ))
+        ));
+      }),
+      skip: () => !includeExperienceOrchestration || skipExoVariants || skipContentPublishing || !(sourceData.experiences || []).some((e) => (e.optimizationVariants || []).some(isRealOptimizationVariant))
+    },
+    {
+      title: "Importing Experience Fragment Optimization Variants",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const results = await importVariantsForParents({
+          parents: ctx.data.experienceFragments || [],
+          sourceParents: sourceData.experienceFragments || [],
+          client,
+          spaceId,
+          environmentId,
+          kind: "experienceFragment"
+        });
+        ctx.data.experienceFragmentVariants = results.flatMap((r) => r.created);
+      }),
+      skip: () => !includeExperienceOrchestration || skipExoVariants || !(sourceData.experienceFragments || []).some((f) => (f.optimizationVariants || []).some(isRealOptimizationVariant))
+    },
+    {
+      title: "Publishing Experience Fragment Optimization Variants",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const toPublish = filterVariantsToPublish(ctx.data.experienceFragmentVariants || []);
+        await Promise.all(toPublish.map(
+          (v) => publishVariant("ExperienceFragmentVariant", v, () => client.experienceFragmentVariant.publish(
+            { spaceId, environmentId, experienceFragmentId: v.sys.id, variantId: v.sys.variant, version: v.sys.version }
+          ))
+        ));
+        const toArchive = filterVariantsToArchive(ctx.data.experienceFragmentVariants || []);
+        await Promise.all(toArchive.map(
+          (v) => archiveVariant("ExperienceFragmentVariant", v, () => client.experienceFragmentVariant.archive(
+            { spaceId, environmentId, experienceFragmentId: v.sys.id, variantId: v.sys.variant, version: v.sys.version }
+          ))
+        ));
+      }),
+      skip: () => !includeExperienceOrchestration || skipExoVariants || skipContentPublishing || !(sourceData.experienceFragments || []).some((f) => (f.optimizationVariants || []).some(isRealOptimizationVariant))
+    },
     // Unpublishing runs after all Importing/Publishing tasks, in reverse dependency order
     // (Experience first, DataAssembly last) - the API rejects unpublishing an entity that a
     // still-published parent references, so parents must unpublish before the children they embed.
@@ -6797,6 +6912,48 @@ function omitSys(entity) {
   const { sys: _sys, ...rest } = entity;
   return rest;
 }
+function omitSysAndOptimizationVariants(entity) {
+  const { sys: _sys, optimizationVariants: _variants, ...rest } = entity;
+  return rest;
+}
+function omitVariantSys(variant) {
+  const { sys: _sys, ...rest } = variant;
+  return rest;
+}
+function isRealOptimizationVariant(variant) {
+  return Boolean(variant?.sys) && variant.sys.variantType !== "default";
+}
+async function importVariantsForParents({
+  parents,
+  sourceParents,
+  client,
+  spaceId,
+  environmentId,
+  kind
+}) {
+  const ns = kind === "experience" ? client.experienceVariant : client.experienceFragmentVariant;
+  const idParam = kind === "experience" ? "experienceId" : "experienceFragmentId";
+  const label = kind === "experience" ? "ExperienceVariant" : "ExperienceFragmentVariant";
+  const parentRefField = kind === "experience" ? "experienceTemplate" : "component";
+  const sourceParentsById = new Map(sourceParents.map((sourceParent) => [sourceParent.sys.id, sourceParent]));
+  return Promise.all(parents.map(async (parent2) => {
+    const sourceParent = sourceParentsById.get(parent2.sys.id);
+    const sourceVariants = (sourceParent?.optimizationVariants ?? []).filter(isRealOptimizationVariant);
+    const created = [];
+    for (const variant of sourceVariants) {
+      try {
+        const payload = { ...omitVariantSys(variant), [parentRefField]: variant.sys[parentRefField] };
+        const result = await ns.create({ spaceId, environmentId, [idParam]: parent2.sys.id }, payload);
+        import_logging11.logEmitter.emit("info", `CREATE ${label} ${result.sys.variant} (parent ${parent2.sys.id})`);
+        created.push({ ...result, sys: { ...result.sys, publishedVersion: variant.sys.publishedVersion, archivedVersion: variant.sys.archivedVersion } });
+      } catch (err) {
+        err.entity = variant;
+        import_logging11.logEmitter.emit("error", err);
+      }
+    }
+    return { parentId: parent2.sys.id, created };
+  }));
+}
 function archiveEntities2({ entities, sourceEntities, client, spaceId, environmentId, 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);
@@ -7385,6 +7542,7 @@ async function parseOptions(params) {
     uploadAssets: false,
     rateLimit: 7,
     includeExperienceOrchestration: true,
+    skipExoVariants: false,
     host: "api.contentful.com"
   };
   const configFile = params.config ? require((0, import_path2.resolve)(process.cwd(), params.config)) : {};
@@ -7459,6 +7617,29 @@ async function parseOptions(params) {
   return options;
 }
 
+// lib/utils/display-error-log.ts
+var import_date_fns2 = require("date-fns");
+var import_logging12 = __toESM(require_logging());
+function displayErrorLog(errorLog) {
+  if (errorLog.length) {
+    const count = errorLog.reduce((count2, curr) => {
+      if (Object.prototype.hasOwnProperty.call(curr, "warning")) {
+        count2.warnings++;
+      } else if (Object.prototype.hasOwnProperty.call(curr, "error")) {
+        count2.errors++;
+      }
+      return count2;
+    }, { warnings: 0, errors: 0 });
+    console.log(`
+
+The following ${count.errors} errors and ${count.warnings} warnings occurred:
+`);
+    errorLog.map((logMessage) => `${(0, import_date_fns2.format)((0, import_date_fns2.parseISO)(logMessage.ts), "HH:mm:ss")} - ${(0, import_logging12.formatLogMessageOneLine)(logMessage)}`).map((logMessage) => console.log(logMessage));
+    return;
+  }
+  console.log("No errors or warnings occurred");
+}
+
 // lib/index.ts
 var ONE_SECOND = 1e3;
 var tableOptions = {
@@ -7485,7 +7666,7 @@ async function runContentfulImport(params) {
     intervalCap: options.rateLimit,
     carryoverConcurrencyCount: true
   });
-  (0, import_logging12.setupLogging)(log);
+  (0, import_logging13.setupLogging)(log);
   const infoTable = new import_cli_table3.default(tableOptions);
   infoTable.push([{ colSpan: 2, content: "The following entities are going to be imported:" }]);
   Object.keys(options.content).forEach((type) => {
@@ -7500,6 +7681,20 @@ async function runContentfulImport(params) {
     }
     infoTable.push([startCase_default(type), options.content[type].length]);
   });
+  const experienceVariantCount = (options.content.experiences || []).reduce(
+    (sum, e) => sum + (e.optimizationVariants?.length ?? 0),
+    0
+  );
+  if (!options.skipExoVariants && experienceVariantCount > 0) {
+    infoTable.push(["Experience Optimization Variants", experienceVariantCount]);
+  }
+  const experienceFragmentVariantCount = (options.content.experienceFragments || []).reduce(
+    (sum, f) => sum + (f.optimizationVariants?.length ?? 0),
+    0
+  );
+  if (!options.skipExoVariants && experienceFragmentVariantCount > 0) {
+    infoTable.push(["Experience Fragment Optimization Variants", experienceFragmentVariantCount]);
+  }
   console.log(infoTable.toString());
   const tasks = new import_listr3.default([
     {
@@ -7548,6 +7743,7 @@ async function runContentfulImport(params) {
           client: ctx.client,
           spaceId: options.spaceId,
           includeExperienceOrchestration: options.includeExperienceOrchestration,
+          skipExoVariants: options.skipExoVariants,
           environmentId: options.environmentId,
           contentModelOnly: options.contentModelOnly,
           skipLocales: options.skipLocales,
@@ -7582,8 +7778,8 @@ async function runContentfulImport(params) {
       console.log("No data was imported");
     }
     const endTime = /* @__PURE__ */ new Date();
-    const durationHuman = (0, import_date_fns2.formatDistance)(endTime, options.startTime);
-    const durationSeconds = (0, import_date_fns2.differenceInSeconds)(endTime, options.startTime);
+    const durationHuman = (0, import_date_fns3.formatDistance)(endTime, options.startTime);
+    const durationSeconds = (0, import_date_fns3.differenceInSeconds)(endTime, options.startTime);
     console.log(`The import took ${durationHuman} (${durationSeconds}s)`);
     return ctx.data;
   }).catch((err) => {
@@ -7595,9 +7791,9 @@ async function runContentfulImport(params) {
   }).then((data) => {
     const errorLog = log.filter((logMessage) => logMessage.level !== "info" && logMessage.level !== "warning");
     const displayLog = log.filter((logMessage) => logMessage.level !== "info");
-    (0, import_logging12.displayErrorLog)(displayLog);
+    displayErrorLog(displayLog);
     if (errorLog.length) {
-      return (0, import_logging12.writeErrorLogFile)(options.errorLogFile, errorLog).then(() => {
+      return (0, import_logging13.writeErrorLogFile)(options.errorLogFile, errorLog).then(() => {
         const multiError = new ContentfulMultiError("Errors occurred");
         multiError.name = "ContentfulMultiError";
         multiError.errors = errorLog;

package/dist/index.mjs

@@ -235,7 +235,7 @@ var require_logging = __commonJS({
         throw new Error("Unable to extract API error data");
       }
     }
-    function formatLogMessageOneLine(logMessage) {
+    function formatLogMessageOneLine2(logMessage) {
       const { level } = logMessage;
       if (!level) {
         return logMessage.toString().replace(/\s+/g, " ");
@@ -271,7 +271,7 @@ var require_logging = __commonJS({
         return logMessage.error.toString().replace(/\s+/g, " ");
       }
     }
-    exports2.formatLogMessageOneLine = formatLogMessageOneLine;
+    exports2.formatLogMessageOneLine = formatLogMessageOneLine2;
     function formatLogMessageLogfile(logMessage) {
       const { level } = logMessage;
       if (level === "info" || level === "warning") {
@@ -310,7 +310,7 @@ var require_logging = __commonJS({
 
 The following ${count.errors} errors and ${count.warnings} warnings occurred:
 `);
-        errorLog.map((logMessage) => `${(0, format_1.default)((0, parseISO_1.default)(logMessage.ts), "HH:mm:ss")} - ${formatLogMessageOneLine(logMessage)}`).map((logMessage) => console.log(logMessage));
+        errorLog.map((logMessage) => `${(0, format_1.default)((0, parseISO_1.default)(logMessage.ts), "HH:mm:ss")} - ${formatLogMessageOneLine2(logMessage)}`).map((logMessage) => console.log(logMessage));
         return;
       }
       console.log("No errors or warnings occurred");
@@ -357,7 +357,7 @@ The following ${count.errors} errors and ${count.warnings} warnings occurred:
     exports2.setupLogging = setupLogging2;
     function logToTaskOutput(task) {
       function logToTask(logMessage) {
-        const content = formatLogMessageOneLine(logMessage);
+        const content = formatLogMessageOneLine2(logMessage);
         const symbols = {
           info: figures_1.default.tick,
           warning: figures_1.default.warning,
@@ -570,12 +570,12 @@ var require_common = __commonJS({
             args.unshift("%O");
           }
           let index = 0;
-          args[0] = args[0].replace(/%([a-zA-Z%])/g, (match, format2) => {
+          args[0] = args[0].replace(/%([a-zA-Z%])/g, (match, format3) => {
             if (match === "%%") {
               return "%";
             }
             index++;
-            const formatter = createDebug.formatters[format2];
+            const formatter = createDebug.formatters[format3];
             if (typeof formatter === "function") {
               const val = args[index];
               match = formatter.call(self2, val);
@@ -4855,7 +4855,7 @@ var startCase = createCompounder_default(function(result, word, index) {
 var startCase_default = startCase;
 
 // lib/index.ts
-var import_logging12 = __toESM(require_logging());
+var import_logging13 = __toESM(require_logging());
 var import_listr4 = __toESM(require_listr());
 import PQueue from "p-queue";
 
@@ -4922,6 +4922,34 @@ async function unpublishExoEntity(type, entity, unpublish) {
     return null;
   }
 }
+function filterVariantsToPublish(variants) {
+  return variants.filter((v) => v.sys.publishedVersion);
+}
+function filterVariantsToArchive(variants) {
+  return variants.filter((v) => v.sys.archivedVersion && !v.sys.publishedVersion);
+}
+async function publishVariant(type, entity, publish) {
+  try {
+    const result = await publish();
+    import_logging2.logEmitter.emit("info", `PUBLISH ${type} ${entity.sys.variant}`);
+    return result;
+  } catch (err) {
+    err.entity = entity;
+    import_logging2.logEmitter.emit("error", err);
+    return null;
+  }
+}
+async function archiveVariant(type, entity, archive) {
+  try {
+    const result = await archive();
+    import_logging2.logEmitter.emit("info", `ARCHIVE ${type} ${entity.sys.variant}`);
+    return result;
+  } catch (err) {
+    err.entity = entity;
+    import_logging2.logEmitter.emit("error", err);
+    return null;
+  }
+}
 function isExoEntitlementError(err) {
   if (!(err instanceof Error)) {
     return false;
@@ -6132,6 +6160,7 @@ function pushToSpace({
   spaceId,
   environmentId,
   includeExperienceOrchestration,
+  skipExoVariants,
   contentModelOnly,
   skipContentModel,
   skipContentUpdates,
@@ -6154,6 +6183,13 @@ function pushToSpace({
     ...DEFAULT_CONTENT_STRUCTURE,
     ...destinationData
   };
+  const hasOptimizationVariants = [
+    ...sourceData.experiences || [],
+    ...sourceData.experienceFragments || []
+  ].some((parent2) => (parent2.optimizationVariants || []).some(isRealOptimizationVariant));
+  if (includeExperienceOrchestration && !skipExoVariants && hasOptimizationVariants) {
+    import_logging11.logEmitter.emit("warning", "Optimization Variants are imported with new destination IDs and can be duplicated by re-imports. Set skipExoVariants to true to skip them.");
+  }
   listrOptions = listrOptions || {
     renderer: verboseRenderer
   };
@@ -6618,12 +6654,12 @@ function pushToSpace({
           try {
             const existing = destinationDataById.experienceFragments?.get(entity.sys.id);
             if (existing) {
-              const payload = { ...entity, sys: { id: entity.sys.id, type: "ExperienceFragment", version: existing.sys.version } };
+              const payload = { ...omitSysAndOptimizationVariants(entity), sys: { id: entity.sys.id, type: "ExperienceFragment", version: existing.sys.version } };
               const result = await client.experienceFragment.upsert({ spaceId, environmentId, experienceFragmentId: entity.sys.id }, payload);
               import_logging11.logEmitter.emit("info", `UPDATE ExperienceFragment ${entity.sys.id}`);
               results.push(result);
             } else {
-              const payload = { ...omitSys(entity), component: entity.sys.component, sys: { id: entity.sys.id, type: "ExperienceFragment" } };
+              const payload = { ...omitSysAndOptimizationVariants(entity), component: entity.sys.component, sys: { id: entity.sys.id, type: "ExperienceFragment" } };
               const result = await client.experienceFragment.upsert({ spaceId, environmentId, experienceFragmentId: entity.sys.id }, payload);
               import_logging11.logEmitter.emit("info", `CREATE ExperienceFragment ${entity.sys.id}`);
               results.push(result);
@@ -6660,12 +6696,12 @@ function pushToSpace({
           try {
             const existing = destinationDataById.experiences?.get(entity.sys.id);
             if (existing) {
-              const payload = { ...entity, sys: { id: entity.sys.id, type: "Experience", version: existing.sys.version } };
+              const payload = { ...omitSysAndOptimizationVariants(entity), sys: { id: entity.sys.id, type: "Experience", version: existing.sys.version } };
               const result = await client.experience.upsert({ spaceId, environmentId, experienceId: entity.sys.id }, payload);
               import_logging11.logEmitter.emit("info", `UPDATE Experience ${entity.sys.id}`);
               return result;
             } else {
-              const payload = { ...omitSys(entity), experienceTemplate: entity.sys.experienceTemplate, sys: { id: entity.sys.id, type: "Experience" } };
+              const payload = { ...omitSysAndOptimizationVariants(entity), experienceTemplate: entity.sys.experienceTemplate, sys: { id: entity.sys.id, type: "Experience" } };
               const result = await client.experience.upsert({ spaceId, environmentId, experienceId: entity.sys.id }, payload);
               import_logging11.logEmitter.emit("info", `CREATE Experience ${entity.sys.id}`);
               return result;
@@ -6693,6 +6729,85 @@ function pushToSpace({
       }),
       skip: () => !includeExperienceOrchestration || skipContentPublishing || !(sourceData.experiences || []).length
     },
+    // Optimization Variants are sub-resources nested on their parent Experience/ExperienceFragment
+    // (sourceData.experiences[].optimizationVariants), not a flat top-level array. A variant's
+    // sys.id is borrowed from its parent, not unique, so variant creation/publish/archive is
+    // handled by new, self-contained functions (importVariantsForParents, filterVariantsToPublish,
+    // filterVariantsToArchive, publishVariant, archiveVariant) rather than by generalizing
+    // destinationDataById / filterExoEntitiesToPublish / filterExoEntitiesToUnpublish, which all
+    // assume sys.id uniqueness.
+    //
+    // Unlike the base Experience/Fragment create/update, there is no upsert-by-known-ID for
+    // variants: the upstream API's create endpoint always server-generates a fresh variantId
+    // (crypto.randomUUID()) and its update endpoint 404s on an unknown variantId rather than
+    // creating one. So every import run creates fresh destination variants via POST rather than
+    // matching against any existing destination variant.
+    {
+      title: "Importing Experience Optimization Variants",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const results = await importVariantsForParents({
+          parents: ctx.data.experiences || [],
+          sourceParents: sourceData.experiences || [],
+          client,
+          spaceId,
+          environmentId,
+          kind: "experience"
+        });
+        ctx.data.experienceVariants = results.flatMap((r) => r.created);
+      }),
+      skip: () => !includeExperienceOrchestration || skipExoVariants || !(sourceData.experiences || []).some((e) => (e.optimizationVariants || []).some(isRealOptimizationVariant))
+    },
+    {
+      title: "Publishing Experience Optimization Variants",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const toPublish = filterVariantsToPublish(ctx.data.experienceVariants || []);
+        await Promise.all(toPublish.map(
+          (v) => publishVariant("ExperienceVariant", v, () => client.experienceVariant.publish(
+            { spaceId, environmentId, experienceId: v.sys.id, variantId: v.sys.variant, version: v.sys.version }
+          ))
+        ));
+        const toArchive = filterVariantsToArchive(ctx.data.experienceVariants || []);
+        await Promise.all(toArchive.map(
+          (v) => archiveVariant("ExperienceVariant", v, () => client.experienceVariant.archive(
+            { spaceId, environmentId, experienceId: v.sys.id, variantId: v.sys.variant, version: v.sys.version }
+          ))
+        ));
+      }),
+      skip: () => !includeExperienceOrchestration || skipExoVariants || skipContentPublishing || !(sourceData.experiences || []).some((e) => (e.optimizationVariants || []).some(isRealOptimizationVariant))
+    },
+    {
+      title: "Importing Experience Fragment Optimization Variants",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const results = await importVariantsForParents({
+          parents: ctx.data.experienceFragments || [],
+          sourceParents: sourceData.experienceFragments || [],
+          client,
+          spaceId,
+          environmentId,
+          kind: "experienceFragment"
+        });
+        ctx.data.experienceFragmentVariants = results.flatMap((r) => r.created);
+      }),
+      skip: () => !includeExperienceOrchestration || skipExoVariants || !(sourceData.experienceFragments || []).some((f) => (f.optimizationVariants || []).some(isRealOptimizationVariant))
+    },
+    {
+      title: "Publishing Experience Fragment Optimization Variants",
+      task: (0, import_listr2.wrapTask)(async (ctx) => {
+        const toPublish = filterVariantsToPublish(ctx.data.experienceFragmentVariants || []);
+        await Promise.all(toPublish.map(
+          (v) => publishVariant("ExperienceFragmentVariant", v, () => client.experienceFragmentVariant.publish(
+            { spaceId, environmentId, experienceFragmentId: v.sys.id, variantId: v.sys.variant, version: v.sys.version }
+          ))
+        ));
+        const toArchive = filterVariantsToArchive(ctx.data.experienceFragmentVariants || []);
+        await Promise.all(toArchive.map(
+          (v) => archiveVariant("ExperienceFragmentVariant", v, () => client.experienceFragmentVariant.archive(
+            { spaceId, environmentId, experienceFragmentId: v.sys.id, variantId: v.sys.variant, version: v.sys.version }
+          ))
+        ));
+      }),
+      skip: () => !includeExperienceOrchestration || skipExoVariants || skipContentPublishing || !(sourceData.experienceFragments || []).some((f) => (f.optimizationVariants || []).some(isRealOptimizationVariant))
+    },
     // Unpublishing runs after all Importing/Publishing tasks, in reverse dependency order
     // (Experience first, DataAssembly last) - the API rejects unpublishing an entity that a
     // still-published parent references, so parents must unpublish before the children they embed.
@@ -6764,6 +6879,48 @@ function omitSys(entity) {
   const { sys: _sys, ...rest } = entity;
   return rest;
 }
+function omitSysAndOptimizationVariants(entity) {
+  const { sys: _sys, optimizationVariants: _variants, ...rest } = entity;
+  return rest;
+}
+function omitVariantSys(variant) {
+  const { sys: _sys, ...rest } = variant;
+  return rest;
+}
+function isRealOptimizationVariant(variant) {
+  return Boolean(variant?.sys) && variant.sys.variantType !== "default";
+}
+async function importVariantsForParents({
+  parents,
+  sourceParents,
+  client,
+  spaceId,
+  environmentId,
+  kind
+}) {
+  const ns = kind === "experience" ? client.experienceVariant : client.experienceFragmentVariant;
+  const idParam = kind === "experience" ? "experienceId" : "experienceFragmentId";
+  const label = kind === "experience" ? "ExperienceVariant" : "ExperienceFragmentVariant";
+  const parentRefField = kind === "experience" ? "experienceTemplate" : "component";
+  const sourceParentsById = new Map(sourceParents.map((sourceParent) => [sourceParent.sys.id, sourceParent]));
+  return Promise.all(parents.map(async (parent2) => {
+    const sourceParent = sourceParentsById.get(parent2.sys.id);
+    const sourceVariants = (sourceParent?.optimizationVariants ?? []).filter(isRealOptimizationVariant);
+    const created = [];
+    for (const variant of sourceVariants) {
+      try {
+        const payload = { ...omitVariantSys(variant), [parentRefField]: variant.sys[parentRefField] };
+        const result = await ns.create({ spaceId, environmentId, [idParam]: parent2.sys.id }, payload);
+        import_logging11.logEmitter.emit("info", `CREATE ${label} ${result.sys.variant} (parent ${parent2.sys.id})`);
+        created.push({ ...result, sys: { ...result.sys, publishedVersion: variant.sys.publishedVersion, archivedVersion: variant.sys.archivedVersion } });
+      } catch (err) {
+        err.entity = variant;
+        import_logging11.logEmitter.emit("error", err);
+      }
+    }
+    return { parentId: parent2.sys.id, created };
+  }));
+}
 function archiveEntities2({ entities, sourceEntities, client, spaceId, environmentId, 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);
@@ -7349,6 +7506,7 @@ async function parseOptions(params) {
     uploadAssets: false,
     rateLimit: 7,
     includeExperienceOrchestration: true,
+    skipExoVariants: false,
     host: "api.contentful.com"
   };
   const configFile = params.config ? __require(resolve(process.cwd(), params.config)) : {};
@@ -7423,6 +7581,29 @@ async function parseOptions(params) {
   return options;
 }
 
+// lib/utils/display-error-log.ts
+var import_logging12 = __toESM(require_logging());
+import { format as format2, parseISO } from "date-fns";
+function displayErrorLog(errorLog) {
+  if (errorLog.length) {
+    const count = errorLog.reduce((count2, curr) => {
+      if (Object.prototype.hasOwnProperty.call(curr, "warning")) {
+        count2.warnings++;
+      } else if (Object.prototype.hasOwnProperty.call(curr, "error")) {
+        count2.errors++;
+      }
+      return count2;
+    }, { warnings: 0, errors: 0 });
+    console.log(`
+
+The following ${count.errors} errors and ${count.warnings} warnings occurred:
+`);
+    errorLog.map((logMessage) => `${format2(parseISO(logMessage.ts), "HH:mm:ss")} - ${(0, import_logging12.formatLogMessageOneLine)(logMessage)}`).map((logMessage) => console.log(logMessage));
+    return;
+  }
+  console.log("No errors or warnings occurred");
+}
+
 // lib/index.ts
 var ONE_SECOND = 1e3;
 var tableOptions = {
@@ -7449,7 +7630,7 @@ async function runContentfulImport(params) {
     intervalCap: options.rateLimit,
     carryoverConcurrencyCount: true
   });
-  (0, import_logging12.setupLogging)(log);
+  (0, import_logging13.setupLogging)(log);
   const infoTable = new Table(tableOptions);
   infoTable.push([{ colSpan: 2, content: "The following entities are going to be imported:" }]);
   Object.keys(options.content).forEach((type) => {
@@ -7464,6 +7645,20 @@ async function runContentfulImport(params) {
     }
     infoTable.push([startCase_default(type), options.content[type].length]);
   });
+  const experienceVariantCount = (options.content.experiences || []).reduce(
+    (sum, e) => sum + (e.optimizationVariants?.length ?? 0),
+    0
+  );
+  if (!options.skipExoVariants && experienceVariantCount > 0) {
+    infoTable.push(["Experience Optimization Variants", experienceVariantCount]);
+  }
+  const experienceFragmentVariantCount = (options.content.experienceFragments || []).reduce(
+    (sum, f) => sum + (f.optimizationVariants?.length ?? 0),
+    0
+  );
+  if (!options.skipExoVariants && experienceFragmentVariantCount > 0) {
+    infoTable.push(["Experience Fragment Optimization Variants", experienceFragmentVariantCount]);
+  }
   console.log(infoTable.toString());
   const tasks = new Listr2([
     {
@@ -7512,6 +7707,7 @@ async function runContentfulImport(params) {
           client: ctx.client,
           spaceId: options.spaceId,
           includeExperienceOrchestration: options.includeExperienceOrchestration,
+          skipExoVariants: options.skipExoVariants,
           environmentId: options.environmentId,
           contentModelOnly: options.contentModelOnly,
           skipLocales: options.skipLocales,
@@ -7559,9 +7755,9 @@ async function runContentfulImport(params) {
   }).then((data) => {
     const errorLog = log.filter((logMessage) => logMessage.level !== "info" && logMessage.level !== "warning");
     const displayLog = log.filter((logMessage) => logMessage.level !== "info");
-    (0, import_logging12.displayErrorLog)(displayLog);
+    displayErrorLog(displayLog);
     if (errorLog.length) {
-      return (0, import_logging12.writeErrorLogFile)(options.errorLogFile, errorLog).then(() => {
+      return (0, import_logging13.writeErrorLogFile)(options.errorLogFile, errorLog).then(() => {
         const multiError = new ContentfulMultiError("Errors occurred");
         multiError.name = "ContentfulMultiError";
         multiError.errors = errorLog;

package/dist/usageParams.d.mts

@@ -36,6 +36,8 @@ declare const _default: {
     header: string | undefined;
     "include-experience-orchestration": boolean;
     includeExperienceOrchestration: boolean;
+    "skip-exo-variants": boolean;
+    skipExoVariants: boolean;
     _: (string | number)[];
     $0: string;
 } | Promise<{
@@ -76,6 +78,8 @@ declare const _default: {
     header: string | undefined;
     "include-experience-orchestration": boolean;
     includeExperienceOrchestration: boolean;
+    "skip-exo-variants": boolean;
+    skipExoVariants: boolean;
     _: (string | number)[];
     $0: string;
 }>;

package/dist/usageParams.d.ts

@@ -36,6 +36,8 @@ declare const _default: {
     header: string | undefined;
     "include-experience-orchestration": boolean;
     includeExperienceOrchestration: boolean;
+    "skip-exo-variants": boolean;
+    skipExoVariants: boolean;
     _: (string | number)[];
     $0: string;
 } | Promise<{
@@ -76,6 +78,8 @@ declare const _default: {
     header: string | undefined;
     "include-experience-orchestration": boolean;
     includeExperienceOrchestration: boolean;
+    "skip-exo-variants": boolean;
+    skipExoVariants: boolean;
     _: (string | number)[];
     $0: string;
 }>;

package/dist/usageParams.js

@@ -118,5 +118,9 @@ var usageParams_default = import_yargs.default.version(version || "Version only
   describe: "Import Experience Orchestration entities (designTokens, components, experienceTemplates, experienceFragments, dataAssemblies, experiences). Requires a space with ExO enabled.",
   type: "boolean",
   default: true
+}).option("skip-exo-variants", {
+  describe: "Skip importing Experience and Experience Fragment Optimization Variants",
+  type: "boolean",
+  default: false
 }).config("config", "An optional configuration JSON file containing all the options for a single run").argv;
 module.exports = module.exports.default || module.exports;

package/dist/usageParams.mjs

@@ -80,6 +80,10 @@ var usageParams_default = yargs.version(version || "Version only available on in
   describe: "Import Experience Orchestration entities (designTokens, components, experienceTemplates, experienceFragments, dataAssemblies, experiences). Requires a space with ExO enabled.",
   type: "boolean",
   default: true
+}).option("skip-exo-variants", {
+  describe: "Skip importing Experience and Experience Fragment Optimization Variants",
+  type: "boolean",
+  default: false
 }).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.3.0",
+  "version": "10.4.0",
   "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.13.0",
+    "contentful-management": "^12.17.0",
     "date-fns": "^4.4.0",
     "joi": "^18.2.3",
     "listr": "^0.14.3",