contentful-import 10.5.0 → 10.5.2

package/dist/index.js

@@ -4861,7 +4861,7 @@ var startCase_default = startCase;
 
 // lib/index.ts
 var import_p_queue = __toESM(require("p-queue"));
-var import_logging14 = __toESM(require_logging());
+var import_logging15 = __toESM(require_logging());
 var import_listr4 = __toESM(require_listr());
 
 // lib/tasks/init-client.ts
@@ -5984,6 +5984,29 @@ var PARENT_FOLDER_GROUP_IDS = {
   fragment: "contentful.folder-group-fragment",
   experience: "contentful.folder-group-experience"
 };
+var VERSION_CONFLICT_MAX_ATTEMPTS = 5;
+var VERSION_CONFLICT_RETRY_DELAY_MS = 250;
+var MissingExoFolderGroupSchemesError = class extends Error {
+  constructor(missingSchemeIds) {
+    super(`Missing ExO folder-group concept scheme(s) in the destination organization: ${missingSchemeIds.join(", ")}`);
+    this.name = "MissingExoFolderGroupSchemesError";
+    this.missingSchemeIds = missingSchemeIds;
+  }
+};
+var SourceExoFolderConceptReadError = class extends Error {
+  constructor(sourceConceptId, error) {
+    const reason = error instanceof Error ? error.message : String(error);
+    super(`Unable to read source ExO folder concept ${sourceConceptId}: ${reason}`);
+    this.name = "SourceExoFolderConceptReadError";
+    this.sourceConceptId = sourceConceptId;
+  }
+};
+var SourceOrganizationResolutionError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "SourceOrganizationResolutionError";
+  }
+};
 var ENTITY_TYPE_TO_PARENT_GROUP_ID = {
   designTokens: PARENT_FOLDER_GROUP_IDS.designToken,
   components: PARENT_FOLDER_GROUP_IDS.componentType,
@@ -6000,19 +6023,44 @@ function getSourceSpaceId(sourceEntities) {
   }
   return void 0;
 }
-async function ensureParentFolderGroupsExist(client, organizationId) {
+function isVersionMismatchError(err) {
+  return err?.error?.sys?.id === "VersionMismatch";
+}
+async function waitForVersionConflictRetry(attempt) {
+  await new Promise((resolve2) => setTimeout(resolve2, VERSION_CONFLICT_RETRY_DELAY_MS * attempt));
+}
+async function resolveSourceOrganizationId(client, sourceSpaceId) {
+  if (!sourceSpaceId) {
+    throw new SourceOrganizationResolutionError(
+      "Unable to resolve the source organization because the exported ExO entity does not include a source space ID"
+    );
+  }
+  try {
+    const sourceSpace = await client.space.get({ spaceId: sourceSpaceId });
+    const sourceOrganizationId = sourceSpace?.sys?.organization?.sys?.id;
+    if (!sourceOrganizationId) {
+      throw new Error(`source space ${sourceSpaceId} has no organization link`);
+    }
+    return sourceOrganizationId;
+  } catch (err) {
+    if (err instanceof SourceOrganizationResolutionError) throw err;
+    const reason = err instanceof Error ? err.message : String(err);
+    throw new SourceOrganizationResolutionError(
+      `Unable to resolve the source organization for space ${sourceSpaceId}: ${reason}`
+    );
+  }
+}
+async function ensureParentFolderGroupsExist(client, destinationOrganizationId, requiredParentGroupIds) {
+  if (requiredParentGroupIds.size === 0) return /* @__PURE__ */ new Map();
   const { items } = await client.conceptScheme.getMany({
-    organizationId,
+    organizationId: destinationOrganizationId,
     query: { purpose: "internal" }
   });
   const existingIds = new Set(items.map((s) => s.sys.id));
-  const allParentFolderGroupsExist = Object.values(PARENT_FOLDER_GROUP_IDS).every((id) => existingIds.has(id));
-  if (!allParentFolderGroupsExist) {
-    return /* @__PURE__ */ new Map();
-  }
-  const parentGroupIdSet = new Set(Object.values(PARENT_FOLDER_GROUP_IDS));
+  const missingSchemeIds = [...requiredParentGroupIds].filter((id) => !existingIds.has(id));
+  if (missingSchemeIds.length > 0) throw new MissingExoFolderGroupSchemesError(missingSchemeIds);
   return new Map(
-    items.filter((s) => parentGroupIdSet.has(s.sys.id)).map((s) => [s.sys.id, s])
+    items.filter((s) => requiredParentGroupIds.has(s.sys.id)).map((s) => [s.sys.id, s])
   );
 }
 function deriveChildConceptMap(sourceEntities, destinationSpaceId) {
@@ -6031,27 +6079,48 @@ function deriveChildConceptMap(sourceEntities, destinationSpaceId) {
   }
   return childConceptMap;
 }
-async function createOrPatchChildConcepts(client, organizationId, destinationSpaceId, childConceptMap) {
+async function createOrPatchChildConcepts(client, sourceOrganizationId, destinationOrganizationId, destinationSpaceId, childConceptMap) {
   const spaceLink = { sys: { type: "Link", linkType: "Space", id: destinationSpaceId } };
+  const existingDestinationConcepts = /* @__PURE__ */ new Map();
   for (const [sourceConceptId, { destConceptId }] of childConceptMap) {
-    let prefLabel = { "en-US": destConceptId };
-    try {
-      const sourceConcept = await client.concept.get({ organizationId, conceptId: sourceConceptId });
-      if (sourceConcept?.prefLabel) prefLabel = sourceConcept.prefLabel;
-    } catch {
-    }
     let existing = null;
     try {
-      existing = await client.concept.get({ organizationId, conceptId: destConceptId });
+      existing = await client.concept.get({
+        organizationId: destinationOrganizationId,
+        conceptId: destConceptId
+      });
     } catch (err) {
       if (err?.name !== "NotFound") {
         import_logging10.logEmitter.emit("warning", `Could not fetch destination child concept ${destConceptId}: ${err?.message ?? err}`);
       }
     }
+    existingDestinationConcepts.set(sourceConceptId, existing);
+  }
+  const sourceConceptLabels = /* @__PURE__ */ new Map();
+  for (const [sourceConceptId] of childConceptMap) {
+    if (existingDestinationConcepts.get(sourceConceptId)) {
+      continue;
+    }
+    try {
+      const sourceConcept = await client.concept.get({
+        organizationId: sourceOrganizationId,
+        conceptId: sourceConceptId
+      });
+      if (!sourceConcept?.prefLabel) {
+        throw new Error("source concept has no prefLabel");
+      }
+      sourceConceptLabels.set(sourceConceptId, sourceConcept.prefLabel);
+    } catch (err) {
+      throw new SourceExoFolderConceptReadError(sourceConceptId, err);
+    }
+  }
+  for (const [sourceConceptId, { destConceptId }] of childConceptMap) {
+    const existing = existingDestinationConcepts.get(sourceConceptId);
     if (!existing) {
+      const prefLabel = sourceConceptLabels.get(sourceConceptId);
       try {
         await client.concept.createWithId(
-          { organizationId, conceptId: destConceptId },
+          { organizationId: destinationOrganizationId, conceptId: destConceptId },
           // @ts-expect-error - CMA.js type needs to be updated to be aware of purpose: 'internal'
           { purpose: "internal", prefLabel, metadata: { spaces: [spaceLink] } }
         );
@@ -6068,7 +6137,7 @@ async function createOrPatchChildConcepts(client, organizationId, destinationSpa
       if (patches.length > 0) {
         try {
           await client.concept.patch(
-            { organizationId, conceptId: destConceptId, version: existing.sys.version },
+            { organizationId: destinationOrganizationId, conceptId: destConceptId, version: existing.sys.version },
             patches
           );
           import_logging10.logEmitter.emit("info", `Patched child folder concept ${destConceptId} (${patches.map((p) => p.path).join(", ")})`);
@@ -6079,21 +6148,33 @@ async function createOrPatchChildConcepts(client, organizationId, destinationSpa
     }
   }
 }
-async function linkChildConceptsToParentGroups(client, organizationId, childConceptMap, parentGroups) {
+async function linkChildConceptsToParentGroups(client, destinationOrganizationId, childConceptMap, parentGroups) {
   for (const [, { destConceptId, parentGroupId }] of childConceptMap) {
-    const parentGroup = parentGroups.get(parentGroupId);
-    if (!parentGroup) continue;
-    const alreadyLinked = (parentGroup.concepts ?? []).some((c) => c.sys.id === destConceptId);
-    if (alreadyLinked) continue;
-    try {
-      const updated = await client.conceptScheme.patch(
-        { organizationId, conceptSchemeId: parentGroupId, version: parentGroup.sys.version },
-        [{ op: "add", path: "/concepts/-", value: { sys: { type: "Link", linkType: "TaxonomyConcept", id: destConceptId } } }]
-      );
-      parentGroups.set(parentGroupId, updated);
-      import_logging10.logEmitter.emit("info", `Linked child concept ${destConceptId} to parent group ${parentGroupId}`);
-    } catch (err) {
-      import_logging10.logEmitter.emit("error", `Failed to link child concept ${destConceptId} to parent group ${parentGroupId}: ${err?.message ?? err}`);
+    let parentGroup = parentGroups.get(parentGroupId);
+    for (let attempt = 1; parentGroup && attempt <= VERSION_CONFLICT_MAX_ATTEMPTS; attempt++) {
+      const alreadyLinked = (parentGroup.concepts ?? []).some((c) => c.sys.id === destConceptId);
+      if (alreadyLinked) break;
+      try {
+        const updated = await client.conceptScheme.patch(
+          { organizationId: destinationOrganizationId, conceptSchemeId: parentGroupId, version: parentGroup.sys.version },
+          [{ op: "add", path: "/concepts/-", value: { sys: { type: "Link", linkType: "TaxonomyConcept", id: destConceptId } } }]
+        );
+        parentGroups.set(parentGroupId, updated);
+        import_logging10.logEmitter.emit("info", `Linked child concept ${destConceptId} to parent group ${parentGroupId}`);
+        break;
+      } catch (err) {
+        if (!isVersionMismatchError(err) || attempt === VERSION_CONFLICT_MAX_ATTEMPTS) {
+          import_logging10.logEmitter.emit("error", `Failed to link child concept ${destConceptId} to parent group ${parentGroupId}: ${err?.message ?? err}`);
+          break;
+        }
+        import_logging10.logEmitter.emit("warning", `Version mismatch linking child concept ${destConceptId} to parent group ${parentGroupId}; retrying`);
+        await waitForVersionConflictRetry(attempt);
+        parentGroup = await client.conceptScheme.get({
+          organizationId: destinationOrganizationId,
+          conceptSchemeId: parentGroupId
+        });
+        parentGroups.set(parentGroupId, parentGroup);
+      }
     }
   }
 }
@@ -6109,7 +6190,7 @@ function rewriteEntityFolderConcepts(entities2, childConceptMap) {
 }
 async function importExoFolders({
   client,
-  organizationId,
+  destinationOrganizationId,
   destinationSpaceId,
   sourceEntities
 }) {
@@ -6118,16 +6199,22 @@ async function importExoFolders({
     import_logging10.logEmitter.emit("info", "Source and destination space are the same \u2014 skipping ExO folder import");
     return;
   }
-  const parentGroups = await ensureParentFolderGroupsExist(client, organizationId);
-  if (parentGroups.size === 0) {
-    import_logging10.logEmitter.emit("warn", "One or more Experience Orchestration folder group concept schemes are missing in the destination organization. Please create them before importing.");
-    return;
-  }
   const childConceptMap = deriveChildConceptMap(sourceEntities, destinationSpaceId);
   if (childConceptMap.size === 0) return;
+  const requiredParentGroupIds = new Set(
+    [...childConceptMap.values()].map(({ parentGroupId }) => parentGroupId)
+  );
+  const sourceOrganizationId = await resolveSourceOrganizationId(client, sourceSpaceId);
+  const parentGroups = await ensureParentFolderGroupsExist(client, destinationOrganizationId, requiredParentGroupIds);
   import_logging10.logEmitter.emit("info", `Importing ${childConceptMap.size} ExO folder concept(s) into destination space ${destinationSpaceId}`);
-  await createOrPatchChildConcepts(client, organizationId, destinationSpaceId, childConceptMap);
-  await linkChildConceptsToParentGroups(client, organizationId, childConceptMap, parentGroups);
+  await createOrPatchChildConcepts(
+    client,
+    sourceOrganizationId,
+    destinationOrganizationId,
+    destinationSpaceId,
+    childConceptMap
+  );
+  await linkChildConceptsToParentGroups(client, destinationOrganizationId, childConceptMap, parentGroups);
   const allEntities = [
     ...sourceEntities.designTokens ?? [],
     ...sourceEntities.components ?? [],
@@ -6557,7 +6644,7 @@ function pushToSpace({
           const space = await client.space.get({ spaceId });
           await importExoFolders({
             client,
-            organizationId: space.sys.organization.sys.id,
+            destinationOrganizationId: space.sys.organization.sys.id,
             destinationSpaceId: spaceId,
             sourceEntities: {
               designTokens: sourceData.designTokens,
@@ -6568,6 +6655,9 @@ function pushToSpace({
             }
           });
         } catch (error) {
+          if (error instanceof MissingExoFolderGroupSchemesError || error instanceof SourceOrganizationResolutionError || error instanceof SourceExoFolderConceptReadError) {
+            throw error;
+          }
           import_logging12.logEmitter.emit("warning", `Unable to create Experience Orchestration (ExO) folders, error: ${error}`);
         }
       }),
@@ -7060,6 +7150,9 @@ async function publishEntities2({ entities: entities2, sourceEntities, client, s
   });
 }
 
+// lib/transform/transform-space.ts
+var import_logging13 = __toESM(require_logging());
+
 // lib/transform/transformers.ts
 var transformers_exports = {};
 __export(transformers_exports, {
@@ -7068,6 +7161,7 @@ __export(transformers_exports, {
   entries: () => entries,
   locales: () => locales,
   releases: () => releases,
+  removeMetadataTags: () => removeMetadataTags,
   tags: () => tags,
   webhooks: () => webhooks
 });
@@ -7118,10 +7212,14 @@ function locales(locale, destinationLocales) {
   return transformedLocale;
 }
 function removeMetadataTags(entity, tagsEnabled = false) {
-  if (!tagsEnabled) {
-    delete entity.metadata;
+  if (tagsEnabled || !entity.metadata) {
+    return entity;
   }
-  return entity;
+  const restMetadata = omit_default(entity.metadata, "tags");
+  return {
+    ...omit_default(entity, "metadata"),
+    ...Object.keys(restMetadata).length > 0 ? { metadata: restMetadata } : {}
+  };
 }
 function releases(release) {
   return release;
@@ -7363,14 +7461,20 @@ function upgradeExperience(entity) {
     ...entity.slots !== void 0 ? { slots: upgradeNodeMap(entity.slots) } : {}
   };
 }
-function upgradeExoResources(resources) {
+function upgradeEntityArray(key, resources, upgrade, tagsEnabled) {
+  const items = resources[key];
+  if (!Array.isArray(items)) return {};
+  const upgraded = items.map((entity) => removeMetadataTags(upgrade(entity), tagsEnabled));
+  return { [key]: upgraded };
+}
+function upgradeExoResources(resources, tagsEnabled = false) {
   if (!resources) return resources;
   return {
     ...resources,
-    ...Array.isArray(resources.components) ? { components: resources.components.map(upgradeComponent) } : {},
-    ...Array.isArray(resources.experienceTemplates) ? { experienceTemplates: resources.experienceTemplates.map(upgradeExperienceTemplate) } : {},
-    ...Array.isArray(resources.experienceFragments) ? { experienceFragments: resources.experienceFragments.map(upgradeExperienceFragment) } : {},
-    ...Array.isArray(resources.experiences) ? { experiences: resources.experiences.map(upgradeExperience) } : {}
+    ...upgradeEntityArray("components", resources, upgradeComponent, tagsEnabled),
+    ...upgradeEntityArray("experienceTemplates", resources, upgradeExperienceTemplate, tagsEnabled),
+    ...upgradeEntityArray("experienceFragments", resources, upgradeExperienceFragment, tagsEnabled),
+    ...upgradeEntityArray("experiences", resources, upgradeExperience, tagsEnabled)
   };
 }
 
@@ -7384,10 +7488,46 @@ var entities = [
   "tags",
   "releases"
 ];
+var TAG_SCRUBBED_ENTITY_TYPES = [
+  "entries",
+  "assets",
+  "components",
+  "experienceTemplates",
+  "experienceFragments",
+  "experiences",
+  "dataAssemblies",
+  "designTokens"
+];
+function countEntitiesWithTags(sourceData) {
+  return TAG_SCRUBBED_ENTITY_TYPES.reduce((count, type) => {
+    const entitiesOfType = sourceData[type] ?? [];
+    return count + entitiesOfType.filter((entity) => entity.metadata?.tags?.length).length;
+  }, 0);
+}
+function warnIfTagsWillBeStripped(sourceData, tagsEnabled) {
+  if (tagsEnabled) return;
+  const strippedCount = countEntitiesWithTags(sourceData);
+  if (strippedCount === 0) return;
+  import_logging13.logEmitter.emit("warning", `The destination space/environment does not have access to the Tags feature. metadata.tags was removed from ${strippedCount} ${strippedCount === 1 ? "entity" : "entities"} during import.`);
+}
+function stripTagsFromDataAssembliesAndDesignTokens(spaceData, tagsEnabled) {
+  if (tagsEnabled) return;
+  if (Array.isArray(spaceData.dataAssemblies)) {
+    spaceData.dataAssemblies = spaceData.dataAssemblies.map((entity) => ({
+      ...entity,
+      metadata: { ...entity.metadata, tags: [] }
+    }));
+  }
+  if (Array.isArray(spaceData.designTokens)) {
+    spaceData.designTokens = spaceData.designTokens.map((entity) => removeMetadataTags(entity, false));
+  }
+}
 function transform_space_default(sourceData, destinationData) {
-  const baseSpaceData = upgradeExoResources(omit_default(sourceData, ...entities));
-  sourceData.locales = sortLocales(sourceData.locales);
   const tagsEnabled = !!destinationData.tags;
+  warnIfTagsWillBeStripped(sourceData, tagsEnabled);
+  const baseSpaceData = upgradeExoResources(omit_default(sourceData, ...entities), tagsEnabled);
+  stripTagsFromDataAssembliesAndDesignTokens(baseSpaceData, tagsEnabled);
+  sourceData.locales = sortLocales(sourceData.locales);
   return entities.reduce((transformedSpaceData, type) => {
     const sortedEntities = type === "tags" || type === "releases" ? sourceData[type] ?? [] : sortEntries(sourceData[type] ?? []);
     const transformedEntities = sortedEntities.map((entity) => ({
@@ -7688,7 +7828,7 @@ async function parseOptions(params) {
 
 // lib/utils/display-error-log.ts
 var import_date_fns2 = require("date-fns");
-var import_logging13 = __toESM(require_logging());
+var import_logging14 = __toESM(require_logging());
 function displayErrorLog(errorLog) {
   if (errorLog.length) {
     const count = errorLog.reduce((count2, curr) => {
@@ -7703,7 +7843,7 @@ function displayErrorLog(errorLog) {
 
 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_logging13.formatLogMessageOneLine)(logMessage)}`).map((logMessage) => console.log(logMessage));
+    errorLog.map((logMessage) => `${(0, import_date_fns2.format)((0, import_date_fns2.parseISO)(logMessage.ts), "HH:mm:ss")} - ${(0, import_logging14.formatLogMessageOneLine)(logMessage)}`).map((logMessage) => console.log(logMessage));
     return;
   }
   console.log("No errors or warnings occurred");
@@ -7735,7 +7875,7 @@ async function runContentfulImport(params) {
     intervalCap: options.rateLimit,
     carryoverConcurrencyCount: true
   });
-  (0, import_logging14.setupLogging)(log);
+  (0, import_logging15.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) => {
@@ -7862,7 +8002,7 @@ async function runContentfulImport(params) {
     const displayLog = log.filter((logMessage) => logMessage.level !== "info");
     displayErrorLog(displayLog);
     if (errorLog.length) {
-      return (0, import_logging14.writeErrorLogFile)(options.errorLogFile, errorLog).then(() => {
+      return (0, import_logging15.writeErrorLogFile)(options.errorLogFile, errorLog).then(() => {
         const multiError = new ContentfulMultiError("Errors occurred");
         multiError.name = "ContentfulMultiError";
         multiError.errors = errorLog;

package/dist/index.mjs

@@ -4827,7 +4827,7 @@ var startCase = createCompounder_default(function(result, word, index) {
 var startCase_default = startCase;
 
 // lib/index.ts
-var import_logging14 = __toESM(require_logging());
+var import_logging15 = __toESM(require_logging());
 var import_listr4 = __toESM(require_listr());
 import PQueue from "p-queue";
 
@@ -5951,6 +5951,29 @@ var PARENT_FOLDER_GROUP_IDS = {
   fragment: "contentful.folder-group-fragment",
   experience: "contentful.folder-group-experience"
 };
+var VERSION_CONFLICT_MAX_ATTEMPTS = 5;
+var VERSION_CONFLICT_RETRY_DELAY_MS = 250;
+var MissingExoFolderGroupSchemesError = class extends Error {
+  constructor(missingSchemeIds) {
+    super(`Missing ExO folder-group concept scheme(s) in the destination organization: ${missingSchemeIds.join(", ")}`);
+    this.name = "MissingExoFolderGroupSchemesError";
+    this.missingSchemeIds = missingSchemeIds;
+  }
+};
+var SourceExoFolderConceptReadError = class extends Error {
+  constructor(sourceConceptId, error) {
+    const reason = error instanceof Error ? error.message : String(error);
+    super(`Unable to read source ExO folder concept ${sourceConceptId}: ${reason}`);
+    this.name = "SourceExoFolderConceptReadError";
+    this.sourceConceptId = sourceConceptId;
+  }
+};
+var SourceOrganizationResolutionError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "SourceOrganizationResolutionError";
+  }
+};
 var ENTITY_TYPE_TO_PARENT_GROUP_ID = {
   designTokens: PARENT_FOLDER_GROUP_IDS.designToken,
   components: PARENT_FOLDER_GROUP_IDS.componentType,
@@ -5967,19 +5990,44 @@ function getSourceSpaceId(sourceEntities) {
   }
   return void 0;
 }
-async function ensureParentFolderGroupsExist(client, organizationId) {
+function isVersionMismatchError(err) {
+  return err?.error?.sys?.id === "VersionMismatch";
+}
+async function waitForVersionConflictRetry(attempt) {
+  await new Promise((resolve2) => setTimeout(resolve2, VERSION_CONFLICT_RETRY_DELAY_MS * attempt));
+}
+async function resolveSourceOrganizationId(client, sourceSpaceId) {
+  if (!sourceSpaceId) {
+    throw new SourceOrganizationResolutionError(
+      "Unable to resolve the source organization because the exported ExO entity does not include a source space ID"
+    );
+  }
+  try {
+    const sourceSpace = await client.space.get({ spaceId: sourceSpaceId });
+    const sourceOrganizationId = sourceSpace?.sys?.organization?.sys?.id;
+    if (!sourceOrganizationId) {
+      throw new Error(`source space ${sourceSpaceId} has no organization link`);
+    }
+    return sourceOrganizationId;
+  } catch (err) {
+    if (err instanceof SourceOrganizationResolutionError) throw err;
+    const reason = err instanceof Error ? err.message : String(err);
+    throw new SourceOrganizationResolutionError(
+      `Unable to resolve the source organization for space ${sourceSpaceId}: ${reason}`
+    );
+  }
+}
+async function ensureParentFolderGroupsExist(client, destinationOrganizationId, requiredParentGroupIds) {
+  if (requiredParentGroupIds.size === 0) return /* @__PURE__ */ new Map();
   const { items } = await client.conceptScheme.getMany({
-    organizationId,
+    organizationId: destinationOrganizationId,
     query: { purpose: "internal" }
   });
   const existingIds = new Set(items.map((s) => s.sys.id));
-  const allParentFolderGroupsExist = Object.values(PARENT_FOLDER_GROUP_IDS).every((id) => existingIds.has(id));
-  if (!allParentFolderGroupsExist) {
-    return /* @__PURE__ */ new Map();
-  }
-  const parentGroupIdSet = new Set(Object.values(PARENT_FOLDER_GROUP_IDS));
+  const missingSchemeIds = [...requiredParentGroupIds].filter((id) => !existingIds.has(id));
+  if (missingSchemeIds.length > 0) throw new MissingExoFolderGroupSchemesError(missingSchemeIds);
   return new Map(
-    items.filter((s) => parentGroupIdSet.has(s.sys.id)).map((s) => [s.sys.id, s])
+    items.filter((s) => requiredParentGroupIds.has(s.sys.id)).map((s) => [s.sys.id, s])
   );
 }
 function deriveChildConceptMap(sourceEntities, destinationSpaceId) {
@@ -5998,27 +6046,48 @@ function deriveChildConceptMap(sourceEntities, destinationSpaceId) {
   }
   return childConceptMap;
 }
-async function createOrPatchChildConcepts(client, organizationId, destinationSpaceId, childConceptMap) {
+async function createOrPatchChildConcepts(client, sourceOrganizationId, destinationOrganizationId, destinationSpaceId, childConceptMap) {
   const spaceLink = { sys: { type: "Link", linkType: "Space", id: destinationSpaceId } };
+  const existingDestinationConcepts = /* @__PURE__ */ new Map();
   for (const [sourceConceptId, { destConceptId }] of childConceptMap) {
-    let prefLabel = { "en-US": destConceptId };
-    try {
-      const sourceConcept = await client.concept.get({ organizationId, conceptId: sourceConceptId });
-      if (sourceConcept?.prefLabel) prefLabel = sourceConcept.prefLabel;
-    } catch {
-    }
     let existing = null;
     try {
-      existing = await client.concept.get({ organizationId, conceptId: destConceptId });
+      existing = await client.concept.get({
+        organizationId: destinationOrganizationId,
+        conceptId: destConceptId
+      });
     } catch (err) {
       if (err?.name !== "NotFound") {
         import_logging10.logEmitter.emit("warning", `Could not fetch destination child concept ${destConceptId}: ${err?.message ?? err}`);
       }
     }
+    existingDestinationConcepts.set(sourceConceptId, existing);
+  }
+  const sourceConceptLabels = /* @__PURE__ */ new Map();
+  for (const [sourceConceptId] of childConceptMap) {
+    if (existingDestinationConcepts.get(sourceConceptId)) {
+      continue;
+    }
+    try {
+      const sourceConcept = await client.concept.get({
+        organizationId: sourceOrganizationId,
+        conceptId: sourceConceptId
+      });
+      if (!sourceConcept?.prefLabel) {
+        throw new Error("source concept has no prefLabel");
+      }
+      sourceConceptLabels.set(sourceConceptId, sourceConcept.prefLabel);
+    } catch (err) {
+      throw new SourceExoFolderConceptReadError(sourceConceptId, err);
+    }
+  }
+  for (const [sourceConceptId, { destConceptId }] of childConceptMap) {
+    const existing = existingDestinationConcepts.get(sourceConceptId);
     if (!existing) {
+      const prefLabel = sourceConceptLabels.get(sourceConceptId);
       try {
         await client.concept.createWithId(
-          { organizationId, conceptId: destConceptId },
+          { organizationId: destinationOrganizationId, conceptId: destConceptId },
           // @ts-expect-error - CMA.js type needs to be updated to be aware of purpose: 'internal'
           { purpose: "internal", prefLabel, metadata: { spaces: [spaceLink] } }
         );
@@ -6035,7 +6104,7 @@ async function createOrPatchChildConcepts(client, organizationId, destinationSpa
       if (patches.length > 0) {
         try {
           await client.concept.patch(
-            { organizationId, conceptId: destConceptId, version: existing.sys.version },
+            { organizationId: destinationOrganizationId, conceptId: destConceptId, version: existing.sys.version },
             patches
           );
           import_logging10.logEmitter.emit("info", `Patched child folder concept ${destConceptId} (${patches.map((p) => p.path).join(", ")})`);
@@ -6046,21 +6115,33 @@ async function createOrPatchChildConcepts(client, organizationId, destinationSpa
     }
   }
 }
-async function linkChildConceptsToParentGroups(client, organizationId, childConceptMap, parentGroups) {
+async function linkChildConceptsToParentGroups(client, destinationOrganizationId, childConceptMap, parentGroups) {
   for (const [, { destConceptId, parentGroupId }] of childConceptMap) {
-    const parentGroup = parentGroups.get(parentGroupId);
-    if (!parentGroup) continue;
-    const alreadyLinked = (parentGroup.concepts ?? []).some((c) => c.sys.id === destConceptId);
-    if (alreadyLinked) continue;
-    try {
-      const updated = await client.conceptScheme.patch(
-        { organizationId, conceptSchemeId: parentGroupId, version: parentGroup.sys.version },
-        [{ op: "add", path: "/concepts/-", value: { sys: { type: "Link", linkType: "TaxonomyConcept", id: destConceptId } } }]
-      );
-      parentGroups.set(parentGroupId, updated);
-      import_logging10.logEmitter.emit("info", `Linked child concept ${destConceptId} to parent group ${parentGroupId}`);
-    } catch (err) {
-      import_logging10.logEmitter.emit("error", `Failed to link child concept ${destConceptId} to parent group ${parentGroupId}: ${err?.message ?? err}`);
+    let parentGroup = parentGroups.get(parentGroupId);
+    for (let attempt = 1; parentGroup && attempt <= VERSION_CONFLICT_MAX_ATTEMPTS; attempt++) {
+      const alreadyLinked = (parentGroup.concepts ?? []).some((c) => c.sys.id === destConceptId);
+      if (alreadyLinked) break;
+      try {
+        const updated = await client.conceptScheme.patch(
+          { organizationId: destinationOrganizationId, conceptSchemeId: parentGroupId, version: parentGroup.sys.version },
+          [{ op: "add", path: "/concepts/-", value: { sys: { type: "Link", linkType: "TaxonomyConcept", id: destConceptId } } }]
+        );
+        parentGroups.set(parentGroupId, updated);
+        import_logging10.logEmitter.emit("info", `Linked child concept ${destConceptId} to parent group ${parentGroupId}`);
+        break;
+      } catch (err) {
+        if (!isVersionMismatchError(err) || attempt === VERSION_CONFLICT_MAX_ATTEMPTS) {
+          import_logging10.logEmitter.emit("error", `Failed to link child concept ${destConceptId} to parent group ${parentGroupId}: ${err?.message ?? err}`);
+          break;
+        }
+        import_logging10.logEmitter.emit("warning", `Version mismatch linking child concept ${destConceptId} to parent group ${parentGroupId}; retrying`);
+        await waitForVersionConflictRetry(attempt);
+        parentGroup = await client.conceptScheme.get({
+          organizationId: destinationOrganizationId,
+          conceptSchemeId: parentGroupId
+        });
+        parentGroups.set(parentGroupId, parentGroup);
+      }
     }
   }
 }
@@ -6076,7 +6157,7 @@ function rewriteEntityFolderConcepts(entities2, childConceptMap) {
 }
 async function importExoFolders({
   client,
-  organizationId,
+  destinationOrganizationId,
   destinationSpaceId,
   sourceEntities
 }) {
@@ -6085,16 +6166,22 @@ async function importExoFolders({
     import_logging10.logEmitter.emit("info", "Source and destination space are the same \u2014 skipping ExO folder import");
     return;
   }
-  const parentGroups = await ensureParentFolderGroupsExist(client, organizationId);
-  if (parentGroups.size === 0) {
-    import_logging10.logEmitter.emit("warn", "One or more Experience Orchestration folder group concept schemes are missing in the destination organization. Please create them before importing.");
-    return;
-  }
   const childConceptMap = deriveChildConceptMap(sourceEntities, destinationSpaceId);
   if (childConceptMap.size === 0) return;
+  const requiredParentGroupIds = new Set(
+    [...childConceptMap.values()].map(({ parentGroupId }) => parentGroupId)
+  );
+  const sourceOrganizationId = await resolveSourceOrganizationId(client, sourceSpaceId);
+  const parentGroups = await ensureParentFolderGroupsExist(client, destinationOrganizationId, requiredParentGroupIds);
   import_logging10.logEmitter.emit("info", `Importing ${childConceptMap.size} ExO folder concept(s) into destination space ${destinationSpaceId}`);
-  await createOrPatchChildConcepts(client, organizationId, destinationSpaceId, childConceptMap);
-  await linkChildConceptsToParentGroups(client, organizationId, childConceptMap, parentGroups);
+  await createOrPatchChildConcepts(
+    client,
+    sourceOrganizationId,
+    destinationOrganizationId,
+    destinationSpaceId,
+    childConceptMap
+  );
+  await linkChildConceptsToParentGroups(client, destinationOrganizationId, childConceptMap, parentGroups);
   const allEntities = [
     ...sourceEntities.designTokens ?? [],
     ...sourceEntities.components ?? [],
@@ -6524,7 +6611,7 @@ function pushToSpace({
           const space = await client.space.get({ spaceId });
           await importExoFolders({
             client,
-            organizationId: space.sys.organization.sys.id,
+            destinationOrganizationId: space.sys.organization.sys.id,
             destinationSpaceId: spaceId,
             sourceEntities: {
               designTokens: sourceData.designTokens,
@@ -6535,6 +6622,9 @@ function pushToSpace({
             }
           });
         } catch (error) {
+          if (error instanceof MissingExoFolderGroupSchemesError || error instanceof SourceOrganizationResolutionError || error instanceof SourceExoFolderConceptReadError) {
+            throw error;
+          }
           import_logging12.logEmitter.emit("warning", `Unable to create Experience Orchestration (ExO) folders, error: ${error}`);
         }
       }),
@@ -7027,6 +7117,9 @@ async function publishEntities2({ entities: entities2, sourceEntities, client, s
   });
 }
 
+// lib/transform/transform-space.ts
+var import_logging13 = __toESM(require_logging());
+
 // lib/transform/transformers.ts
 var transformers_exports = {};
 __export(transformers_exports, {
@@ -7035,6 +7128,7 @@ __export(transformers_exports, {
   entries: () => entries,
   locales: () => locales,
   releases: () => releases,
+  removeMetadataTags: () => removeMetadataTags,
   tags: () => tags,
   webhooks: () => webhooks
 });
@@ -7085,10 +7179,14 @@ function locales(locale, destinationLocales) {
   return transformedLocale;
 }
 function removeMetadataTags(entity, tagsEnabled = false) {
-  if (!tagsEnabled) {
-    delete entity.metadata;
+  if (tagsEnabled || !entity.metadata) {
+    return entity;
   }
-  return entity;
+  const restMetadata = omit_default(entity.metadata, "tags");
+  return {
+    ...omit_default(entity, "metadata"),
+    ...Object.keys(restMetadata).length > 0 ? { metadata: restMetadata } : {}
+  };
 }
 function releases(release) {
   return release;
@@ -7330,14 +7428,20 @@ function upgradeExperience(entity) {
     ...entity.slots !== void 0 ? { slots: upgradeNodeMap(entity.slots) } : {}
   };
 }
-function upgradeExoResources(resources) {
+function upgradeEntityArray(key, resources, upgrade, tagsEnabled) {
+  const items = resources[key];
+  if (!Array.isArray(items)) return {};
+  const upgraded = items.map((entity) => removeMetadataTags(upgrade(entity), tagsEnabled));
+  return { [key]: upgraded };
+}
+function upgradeExoResources(resources, tagsEnabled = false) {
   if (!resources) return resources;
   return {
     ...resources,
-    ...Array.isArray(resources.components) ? { components: resources.components.map(upgradeComponent) } : {},
-    ...Array.isArray(resources.experienceTemplates) ? { experienceTemplates: resources.experienceTemplates.map(upgradeExperienceTemplate) } : {},
-    ...Array.isArray(resources.experienceFragments) ? { experienceFragments: resources.experienceFragments.map(upgradeExperienceFragment) } : {},
-    ...Array.isArray(resources.experiences) ? { experiences: resources.experiences.map(upgradeExperience) } : {}
+    ...upgradeEntityArray("components", resources, upgradeComponent, tagsEnabled),
+    ...upgradeEntityArray("experienceTemplates", resources, upgradeExperienceTemplate, tagsEnabled),
+    ...upgradeEntityArray("experienceFragments", resources, upgradeExperienceFragment, tagsEnabled),
+    ...upgradeEntityArray("experiences", resources, upgradeExperience, tagsEnabled)
   };
 }
 
@@ -7351,10 +7455,46 @@ var entities = [
   "tags",
   "releases"
 ];
+var TAG_SCRUBBED_ENTITY_TYPES = [
+  "entries",
+  "assets",
+  "components",
+  "experienceTemplates",
+  "experienceFragments",
+  "experiences",
+  "dataAssemblies",
+  "designTokens"
+];
+function countEntitiesWithTags(sourceData) {
+  return TAG_SCRUBBED_ENTITY_TYPES.reduce((count, type) => {
+    const entitiesOfType = sourceData[type] ?? [];
+    return count + entitiesOfType.filter((entity) => entity.metadata?.tags?.length).length;
+  }, 0);
+}
+function warnIfTagsWillBeStripped(sourceData, tagsEnabled) {
+  if (tagsEnabled) return;
+  const strippedCount = countEntitiesWithTags(sourceData);
+  if (strippedCount === 0) return;
+  import_logging13.logEmitter.emit("warning", `The destination space/environment does not have access to the Tags feature. metadata.tags was removed from ${strippedCount} ${strippedCount === 1 ? "entity" : "entities"} during import.`);
+}
+function stripTagsFromDataAssembliesAndDesignTokens(spaceData, tagsEnabled) {
+  if (tagsEnabled) return;
+  if (Array.isArray(spaceData.dataAssemblies)) {
+    spaceData.dataAssemblies = spaceData.dataAssemblies.map((entity) => ({
+      ...entity,
+      metadata: { ...entity.metadata, tags: [] }
+    }));
+  }
+  if (Array.isArray(spaceData.designTokens)) {
+    spaceData.designTokens = spaceData.designTokens.map((entity) => removeMetadataTags(entity, false));
+  }
+}
 function transform_space_default(sourceData, destinationData) {
-  const baseSpaceData = upgradeExoResources(omit_default(sourceData, ...entities));
-  sourceData.locales = sortLocales(sourceData.locales);
   const tagsEnabled = !!destinationData.tags;
+  warnIfTagsWillBeStripped(sourceData, tagsEnabled);
+  const baseSpaceData = upgradeExoResources(omit_default(sourceData, ...entities), tagsEnabled);
+  stripTagsFromDataAssembliesAndDesignTokens(baseSpaceData, tagsEnabled);
+  sourceData.locales = sortLocales(sourceData.locales);
   return entities.reduce((transformedSpaceData, type) => {
     const sortedEntities = type === "tags" || type === "releases" ? sourceData[type] ?? [] : sortEntries(sourceData[type] ?? []);
     const transformedEntities = sortedEntities.map((entity) => ({
@@ -7651,7 +7791,7 @@ async function parseOptions(params) {
 }
 
 // lib/utils/display-error-log.ts
-var import_logging13 = __toESM(require_logging());
+var import_logging14 = __toESM(require_logging());
 import { format as format2, parseISO } from "date-fns";
 function displayErrorLog(errorLog) {
   if (errorLog.length) {
@@ -7667,7 +7807,7 @@ function displayErrorLog(errorLog) {
 
 The following ${count.errors} errors and ${count.warnings} warnings occurred:
 `);
-    errorLog.map((logMessage) => `${format2(parseISO(logMessage.ts), "HH:mm:ss")} - ${(0, import_logging13.formatLogMessageOneLine)(logMessage)}`).map((logMessage) => console.log(logMessage));
+    errorLog.map((logMessage) => `${format2(parseISO(logMessage.ts), "HH:mm:ss")} - ${(0, import_logging14.formatLogMessageOneLine)(logMessage)}`).map((logMessage) => console.log(logMessage));
     return;
   }
   console.log("No errors or warnings occurred");
@@ -7699,7 +7839,7 @@ async function runContentfulImport(params) {
     intervalCap: options.rateLimit,
     carryoverConcurrencyCount: true
   });
-  (0, import_logging14.setupLogging)(log);
+  (0, import_logging15.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) => {
@@ -7826,7 +7966,7 @@ async function runContentfulImport(params) {
     const displayLog = log.filter((logMessage) => logMessage.level !== "info");
     displayErrorLog(displayLog);
     if (errorLog.length) {
-      return (0, import_logging14.writeErrorLogFile)(options.errorLogFile, errorLog).then(() => {
+      return (0, import_logging15.writeErrorLogFile)(options.errorLogFile, errorLog).then(() => {
         const multiError = new ContentfulMultiError("Errors occurred");
         multiError.name = "ContentfulMultiError";
         multiError.errors = errorLog;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentful-import",
-  "version": "10.5.0",
+  "version": "10.5.2",
   "description": "this tool allows you to import JSON dump exported by contentful-export",
   "main": "dist/index.mjs",
   "typings": "dist/index.d.ts",