@postman-cse/onboarding-repo-sync 2.1.2 → 2.1.3

package/dist/action.cjs

@@ -128699,10 +128699,33 @@ function writeJsonFile(path9, content, normalize3 = false) {
   const data = normalize3 ? stripVolatileFields(content) : content;
   (0, import_node_fs3.writeFileSync)(path9, JSON.stringify(data, null, 2));
 }
-function buildResourcesManifest(workspaceId, collectionMap, envMap, artifactDir, localSpecRefs, mappedSpecRef, specId) {
-  const manifest = {
-    workspace: { id: workspaceId }
-  };
+function buildMappedSpecCloudKey(mappedSource, specSyncMode, releaseLabel) {
+  if (specSyncMode !== "version") {
+    return mappedSource;
+  }
+  const normalized = normalizeReleaseLabel(releaseLabel || "");
+  if (!normalized) {
+    return void 0;
+  }
+  return `${mappedSource}#release=${normalized}`;
+}
+function resolveDurableWorkspaceId(options) {
+  const { candidateId, priorId, workspaceLinkEnabled, workspaceLinkStatus } = options;
+  const candidate = candidateId.trim();
+  const prior = priorId?.trim() || void 0;
+  if (!workspaceLinkEnabled) {
+    return candidate || prior;
+  }
+  if (workspaceLinkStatus === "success") {
+    return candidate || void 0;
+  }
+  return prior === candidate ? prior : void 0;
+}
+function buildResourcesManifest(workspaceId, collectionMap, envMap, artifactDir, localSpecRefs, mappedSpecRef, specId, existingSpecs) {
+  const manifest = {};
+  if (workspaceId) {
+    manifest.workspace = { id: workspaceId };
+  }
   const localResources = {};
   const cloudResources = {};
   const collectionKeys = Object.keys(collectionMap);
@@ -128723,8 +128746,12 @@ function buildResourcesManifest(workspaceId, collectionMap, envMap, artifactDir,
   if (localSpecRefs.length > 0) {
     localResources.specs = localSpecRefs;
   }
+  const specs = { ...existingSpecs || {} };
   if (mappedSpecRef && specId) {
-    cloudResources.specs = { [mappedSpecRef]: specId };
+    specs[mappedSpecRef] = specId;
+  }
+  if (Object.keys(specs).length > 0) {
+    cloudResources.specs = specs;
   }
   if (Object.keys(localResources).length > 0) {
     manifest.localResources = localResources;
@@ -128791,7 +128818,7 @@ function assertPathWithinCwd(targetPath, fieldName) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
   }
 }
-async function exportArtifacts(inputs, dependencies, envUids, assetProjectName) {
+async function exportArtifacts(inputs, dependencies, envUids, assetProjectName, options) {
   if (!inputs.workspaceId) {
     return;
   }
@@ -128825,6 +128852,11 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
   const manifestCollections = {};
   const discoveredSpecs = scanLocalSpecReferences();
   const mappedSpec = resolveMappedSpecReference(inputs.specPath, discoveredSpecs);
+  const mappedSpecCloudKey = mappedSpec && inputs.specId ? buildMappedSpecCloudKey(
+    mappedSpec.configRelativePath,
+    inputs.specSyncMode,
+    options.releaseLabel
+  ) : void 0;
   if (inputs.baselineCollectionId) {
     const col = await dependencies.postman.getCollection(inputs.baselineCollectionId);
     const dirName = getCollectionDirectoryName("Baseline", assetProjectName);
@@ -128850,14 +128882,21 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
       true
     );
   }
+  const durableWorkspaceId = resolveDurableWorkspaceId({
+    candidateId: inputs.workspaceId,
+    priorId: options.priorWorkspaceId,
+    workspaceLinkEnabled: inputs.workspaceLinkEnabled,
+    workspaceLinkStatus: options.workspaceLinkStatus
+  });
   (0, import_node_fs3.writeFileSync)(".postman/resources.yaml", buildResourcesManifest(
-    inputs.workspaceId,
+    durableWorkspaceId,
     manifestCollections,
     envUids,
     inputs.artifactDir,
     discoveredSpecs.map((spec) => spec.configRelativePath),
-    mappedSpec?.configRelativePath,
-    inputs.specId || void 0
+    mappedSpecCloudKey,
+    inputs.specId || void 0,
+    options.existingSpecs
   ));
   if (mappedSpec && Object.keys(manifestCollections).length > 0) {
     (0, import_node_fs3.writeFileSync)(
@@ -129116,7 +129155,12 @@ async function runRepoSyncInner(inputs, dependencies) {
       );
     }
   }
-  await exportArtifacts(inputs, dependencies, envUids, assetProjectName);
+  await exportArtifacts(inputs, dependencies, envUids, assetProjectName, {
+    workspaceLinkStatus: outputs["workspace-link-status"],
+    priorWorkspaceId: resourcesState?.workspace?.id,
+    existingSpecs: resourcesState?.cloudResources?.specs,
+    releaseLabel
+  });
   const commit = await commitAndPushGeneratedFiles(inputs, dependencies);
   outputs["commit-sha"] = commit.commitSha;
   if (commit.resolvedCurrentRef) {

package/dist/cli.cjs

@@ -126613,10 +126613,33 @@ function writeJsonFile(path5, content, normalize3 = false) {
   const data = normalize3 ? stripVolatileFields(content) : content;
   (0, import_node_fs3.writeFileSync)(path5, JSON.stringify(data, null, 2));
 }
-function buildResourcesManifest(workspaceId, collectionMap, envMap, artifactDir, localSpecRefs, mappedSpecRef, specId) {
-  const manifest = {
-    workspace: { id: workspaceId }
-  };
+function buildMappedSpecCloudKey(mappedSource, specSyncMode, releaseLabel) {
+  if (specSyncMode !== "version") {
+    return mappedSource;
+  }
+  const normalized = normalizeReleaseLabel(releaseLabel || "");
+  if (!normalized) {
+    return void 0;
+  }
+  return `${mappedSource}#release=${normalized}`;
+}
+function resolveDurableWorkspaceId(options) {
+  const { candidateId, priorId, workspaceLinkEnabled, workspaceLinkStatus } = options;
+  const candidate = candidateId.trim();
+  const prior = priorId?.trim() || void 0;
+  if (!workspaceLinkEnabled) {
+    return candidate || prior;
+  }
+  if (workspaceLinkStatus === "success") {
+    return candidate || void 0;
+  }
+  return prior === candidate ? prior : void 0;
+}
+function buildResourcesManifest(workspaceId, collectionMap, envMap, artifactDir, localSpecRefs, mappedSpecRef, specId, existingSpecs) {
+  const manifest = {};
+  if (workspaceId) {
+    manifest.workspace = { id: workspaceId };
+  }
   const localResources = {};
   const cloudResources = {};
   const collectionKeys = Object.keys(collectionMap);
@@ -126637,8 +126660,12 @@ function buildResourcesManifest(workspaceId, collectionMap, envMap, artifactDir,
   if (localSpecRefs.length > 0) {
     localResources.specs = localSpecRefs;
   }
+  const specs = { ...existingSpecs || {} };
   if (mappedSpecRef && specId) {
-    cloudResources.specs = { [mappedSpecRef]: specId };
+    specs[mappedSpecRef] = specId;
+  }
+  if (Object.keys(specs).length > 0) {
+    cloudResources.specs = specs;
   }
   if (Object.keys(localResources).length > 0) {
     manifest.localResources = localResources;
@@ -126705,7 +126732,7 @@ function assertPathWithinCwd(targetPath, fieldName) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
   }
 }
-async function exportArtifacts(inputs, dependencies, envUids, assetProjectName) {
+async function exportArtifacts(inputs, dependencies, envUids, assetProjectName, options) {
   if (!inputs.workspaceId) {
     return;
   }
@@ -126739,6 +126766,11 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
   const manifestCollections = {};
   const discoveredSpecs = scanLocalSpecReferences();
   const mappedSpec = resolveMappedSpecReference(inputs.specPath, discoveredSpecs);
+  const mappedSpecCloudKey = mappedSpec && inputs.specId ? buildMappedSpecCloudKey(
+    mappedSpec.configRelativePath,
+    inputs.specSyncMode,
+    options.releaseLabel
+  ) : void 0;
   if (inputs.baselineCollectionId) {
     const col = await dependencies.postman.getCollection(inputs.baselineCollectionId);
     const dirName = getCollectionDirectoryName("Baseline", assetProjectName);
@@ -126764,14 +126796,21 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
       true
     );
   }
+  const durableWorkspaceId = resolveDurableWorkspaceId({
+    candidateId: inputs.workspaceId,
+    priorId: options.priorWorkspaceId,
+    workspaceLinkEnabled: inputs.workspaceLinkEnabled,
+    workspaceLinkStatus: options.workspaceLinkStatus
+  });
   (0, import_node_fs3.writeFileSync)(".postman/resources.yaml", buildResourcesManifest(
-    inputs.workspaceId,
+    durableWorkspaceId,
     manifestCollections,
     envUids,
     inputs.artifactDir,
     discoveredSpecs.map((spec) => spec.configRelativePath),
-    mappedSpec?.configRelativePath,
-    inputs.specId || void 0
+    mappedSpecCloudKey,
+    inputs.specId || void 0,
+    options.existingSpecs
   ));
   if (mappedSpec && Object.keys(manifestCollections).length > 0) {
     (0, import_node_fs3.writeFileSync)(
@@ -127030,7 +127069,12 @@ async function runRepoSyncInner(inputs, dependencies) {
       );
     }
   }
-  await exportArtifacts(inputs, dependencies, envUids, assetProjectName);
+  await exportArtifacts(inputs, dependencies, envUids, assetProjectName, {
+    workspaceLinkStatus: outputs["workspace-link-status"],
+    priorWorkspaceId: resourcesState?.workspace?.id,
+    existingSpecs: resourcesState?.cloudResources?.specs,
+    releaseLabel
+  });
   const commit = await commitAndPushGeneratedFiles(inputs, dependencies);
   outputs["commit-sha"] = commit.commitSha;
   if (commit.resolvedCurrentRef) {

package/dist/index.cjs

@@ -128714,10 +128714,33 @@ function writeJsonFile(path9, content, normalize3 = false) {
   const data = normalize3 ? stripVolatileFields(content) : content;
   (0, import_node_fs3.writeFileSync)(path9, JSON.stringify(data, null, 2));
 }
-function buildResourcesManifest(workspaceId, collectionMap, envMap, artifactDir, localSpecRefs, mappedSpecRef, specId) {
-  const manifest = {
-    workspace: { id: workspaceId }
-  };
+function buildMappedSpecCloudKey(mappedSource, specSyncMode, releaseLabel) {
+  if (specSyncMode !== "version") {
+    return mappedSource;
+  }
+  const normalized = normalizeReleaseLabel(releaseLabel || "");
+  if (!normalized) {
+    return void 0;
+  }
+  return `${mappedSource}#release=${normalized}`;
+}
+function resolveDurableWorkspaceId(options) {
+  const { candidateId, priorId, workspaceLinkEnabled, workspaceLinkStatus } = options;
+  const candidate = candidateId.trim();
+  const prior = priorId?.trim() || void 0;
+  if (!workspaceLinkEnabled) {
+    return candidate || prior;
+  }
+  if (workspaceLinkStatus === "success") {
+    return candidate || void 0;
+  }
+  return prior === candidate ? prior : void 0;
+}
+function buildResourcesManifest(workspaceId, collectionMap, envMap, artifactDir, localSpecRefs, mappedSpecRef, specId, existingSpecs) {
+  const manifest = {};
+  if (workspaceId) {
+    manifest.workspace = { id: workspaceId };
+  }
   const localResources = {};
   const cloudResources = {};
   const collectionKeys = Object.keys(collectionMap);
@@ -128738,8 +128761,12 @@ function buildResourcesManifest(workspaceId, collectionMap, envMap, artifactDir,
   if (localSpecRefs.length > 0) {
     localResources.specs = localSpecRefs;
   }
+  const specs = { ...existingSpecs || {} };
   if (mappedSpecRef && specId) {
-    cloudResources.specs = { [mappedSpecRef]: specId };
+    specs[mappedSpecRef] = specId;
+  }
+  if (Object.keys(specs).length > 0) {
+    cloudResources.specs = specs;
   }
   if (Object.keys(localResources).length > 0) {
     manifest.localResources = localResources;
@@ -128806,7 +128833,7 @@ function assertPathWithinCwd(targetPath, fieldName) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
   }
 }
-async function exportArtifacts(inputs, dependencies, envUids, assetProjectName) {
+async function exportArtifacts(inputs, dependencies, envUids, assetProjectName, options) {
   if (!inputs.workspaceId) {
     return;
   }
@@ -128840,6 +128867,11 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
   const manifestCollections = {};
   const discoveredSpecs = scanLocalSpecReferences();
   const mappedSpec = resolveMappedSpecReference(inputs.specPath, discoveredSpecs);
+  const mappedSpecCloudKey = mappedSpec && inputs.specId ? buildMappedSpecCloudKey(
+    mappedSpec.configRelativePath,
+    inputs.specSyncMode,
+    options.releaseLabel
+  ) : void 0;
   if (inputs.baselineCollectionId) {
     const col = await dependencies.postman.getCollection(inputs.baselineCollectionId);
     const dirName = getCollectionDirectoryName("Baseline", assetProjectName);
@@ -128865,14 +128897,21 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
       true
     );
   }
+  const durableWorkspaceId = resolveDurableWorkspaceId({
+    candidateId: inputs.workspaceId,
+    priorId: options.priorWorkspaceId,
+    workspaceLinkEnabled: inputs.workspaceLinkEnabled,
+    workspaceLinkStatus: options.workspaceLinkStatus
+  });
   (0, import_node_fs3.writeFileSync)(".postman/resources.yaml", buildResourcesManifest(
-    inputs.workspaceId,
+    durableWorkspaceId,
     manifestCollections,
     envUids,
     inputs.artifactDir,
     discoveredSpecs.map((spec) => spec.configRelativePath),
-    mappedSpec?.configRelativePath,
-    inputs.specId || void 0
+    mappedSpecCloudKey,
+    inputs.specId || void 0,
+    options.existingSpecs
   ));
   if (mappedSpec && Object.keys(manifestCollections).length > 0) {
     (0, import_node_fs3.writeFileSync)(
@@ -129131,7 +129170,12 @@ async function runRepoSyncInner(inputs, dependencies) {
       );
     }
   }
-  await exportArtifacts(inputs, dependencies, envUids, assetProjectName);
+  await exportArtifacts(inputs, dependencies, envUids, assetProjectName, {
+    workspaceLinkStatus: outputs["workspace-link-status"],
+    priorWorkspaceId: resourcesState?.workspace?.id,
+    existingSpecs: resourcesState?.cloudResources?.specs,
+    releaseLabel
+  });
   const commit = await commitAndPushGeneratedFiles(inputs, dependencies);
   outputs["commit-sha"] = commit.commitSha;
   if (commit.resolvedCurrentRef) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postman-cse/onboarding-repo-sync",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Postman repo sync GitHub Action.",
   "type": "module",
   "main": "dist/index.cjs",
@@ -21,7 +21,7 @@
     "docs:tables": "node scripts/render-action-tables.mjs",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "test": "vitest run",
+    "test": "vitest run && node --test .github/scripts/wait-for-e2e-gate.test.mjs",
     "typecheck": "tsc --noEmit -p tsconfig.json"
   },
   "keywords": [