contentful-import 10.5.0 → 10.5.1

package/dist/index.js

@@ -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}`);
         }
       }),

package/dist/index.mjs

@@ -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}`);
         }
       }),

package/package.json

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