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

package/dist/cli.cjs

@@ -58522,10 +58522,10 @@ var require_internet = __commonJS({
           }
         }
       };
-      self2.mac = function(sep2) {
+      self2.mac = function(sep3) {
         var i, mac = "", validSep = ":";
-        if (["-", ""].indexOf(sep2) !== -1) {
-          validSep = sep2;
+        if (["-", ""].indexOf(sep3) !== -1) {
+          validSep = sep3;
         }
         for (i = 0; i < 12; i++) {
           mac += faker.datatype.number(15).toString(16);
@@ -104277,10 +104277,10 @@ var require_resolve_block_map = __commonJS({
       let offset = bm.offset;
       let commentEnd = null;
       for (const collItem of bm.items) {
-        const { start, key, sep: sep2, value } = collItem;
+        const { start, key, sep: sep3, value } = collItem;
         const keyProps = resolveProps.resolveProps(start, {
           indicator: "explicit-key-ind",
-          next: key ?? sep2?.[0],
+          next: key ?? sep3?.[0],
           offset,
           onError,
           parentIndent: bm.indent,
@@ -104294,7 +104294,7 @@ var require_resolve_block_map = __commonJS({
             else if ("indent" in key && key.indent !== bm.indent)
               onError(offset, "BAD_INDENT", startColMsg);
           }
-          if (!keyProps.anchor && !keyProps.tag && !sep2) {
+          if (!keyProps.anchor && !keyProps.tag && !sep3) {
             commentEnd = keyProps.end;
             if (keyProps.comment) {
               if (map.comment)
@@ -104318,7 +104318,7 @@ var require_resolve_block_map = __commonJS({
         ctx.atKey = false;
         if (utilMapIncludes.mapIncludes(ctx, map.items, keyNode))
           onError(keyStart, "DUPLICATE_KEY", "Map keys must be unique");
-        const valueProps = resolveProps.resolveProps(sep2 ?? [], {
+        const valueProps = resolveProps.resolveProps(sep3 ?? [], {
           indicator: "map-value-ind",
           next: value,
           offset: keyNode.range[2],
@@ -104334,7 +104334,7 @@ var require_resolve_block_map = __commonJS({
             if (ctx.options.strict && keyProps.start < valueProps.found.offset - 1024)
               onError(keyNode.range, "KEY_OVER_1024_CHARS", "The : indicator must be at most 1024 chars after the start of an implicit block mapping key");
           }
-          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : composeEmptyNode(ctx, offset, sep2, null, valueProps, onError);
+          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : composeEmptyNode(ctx, offset, sep3, null, valueProps, onError);
           if (ctx.schema.compat)
             utilFlowIndentCheck.flowIndentCheck(bm.indent, value, onError);
           offset = valueNode.range[2];
@@ -104425,7 +104425,7 @@ var require_resolve_end = __commonJS({
       let comment = "";
       if (end) {
         let hasSpace = false;
-        let sep2 = "";
+        let sep3 = "";
         for (const token of end) {
           const { source, type } = token;
           switch (type) {
@@ -104439,13 +104439,13 @@ var require_resolve_end = __commonJS({
               if (!comment)
                 comment = cb;
               else
-                comment += sep2 + cb;
-              sep2 = "";
+                comment += sep3 + cb;
+              sep3 = "";
               break;
             }
             case "newline":
               if (comment)
-                sep2 += source;
+                sep3 += source;
               hasSpace = true;
               break;
             default:
@@ -104488,18 +104488,18 @@ var require_resolve_flow_collection = __commonJS({
       let offset = fc.offset + fc.start.source.length;
       for (let i = 0; i < fc.items.length; ++i) {
         const collItem = fc.items[i];
-        const { start, key, sep: sep2, value } = collItem;
+        const { start, key, sep: sep3, value } = collItem;
         const props = resolveProps.resolveProps(start, {
           flow: fcName,
           indicator: "explicit-key-ind",
-          next: key ?? sep2?.[0],
+          next: key ?? sep3?.[0],
           offset,
           onError,
           parentIndent: fc.indent,
           startOnNewline: false
         });
         if (!props.found) {
-          if (!props.anchor && !props.tag && !sep2 && !value) {
+          if (!props.anchor && !props.tag && !sep3 && !value) {
             if (i === 0 && props.comma)
               onError(props.comma, "UNEXPECTED_TOKEN", `Unexpected , in ${fcName}`);
             else if (i < fc.items.length - 1)
@@ -104553,8 +104553,8 @@ var require_resolve_flow_collection = __commonJS({
             }
           }
         }
-        if (!isMap && !sep2 && !props.found) {
-          const valueNode = value ? composeNode(ctx, value, props, onError) : composeEmptyNode(ctx, props.end, sep2, null, props, onError);
+        if (!isMap && !sep3 && !props.found) {
+          const valueNode = value ? composeNode(ctx, value, props, onError) : composeEmptyNode(ctx, props.end, sep3, null, props, onError);
           coll.items.push(valueNode);
           offset = valueNode.range[2];
           if (isBlock(value))
@@ -104566,7 +104566,7 @@ var require_resolve_flow_collection = __commonJS({
           if (isBlock(key))
             onError(keyNode.range, "BLOCK_IN_FLOW", blockMsg);
           ctx.atKey = false;
-          const valueProps = resolveProps.resolveProps(sep2 ?? [], {
+          const valueProps = resolveProps.resolveProps(sep3 ?? [], {
             flow: fcName,
             indicator: "map-value-ind",
             next: value,
@@ -104577,8 +104577,8 @@ var require_resolve_flow_collection = __commonJS({
           });
           if (valueProps.found) {
             if (!isMap && !props.found && ctx.options.strict) {
-              if (sep2)
-                for (const st of sep2) {
+              if (sep3)
+                for (const st of sep3) {
                   if (st === valueProps.found)
                     break;
                   if (st.type === "newline") {
@@ -104595,7 +104595,7 @@ var require_resolve_flow_collection = __commonJS({
             else
               onError(valueProps.start, "MISSING_CHAR", `Missing , or : between ${fcName} items`);
           }
-          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : valueProps.found ? composeEmptyNode(ctx, valueProps.end, sep2, null, valueProps, onError) : null;
+          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : valueProps.found ? composeEmptyNode(ctx, valueProps.end, sep3, null, valueProps, onError) : null;
           if (valueNode) {
             if (isBlock(value))
               onError(valueNode.range, "BLOCK_IN_FLOW", blockMsg);
@@ -104775,7 +104775,7 @@ var require_resolve_block_scalar = __commonJS({
           chompStart = i + 1;
       }
       let value = "";
-      let sep2 = "";
+      let sep3 = "";
       let prevMoreIndented = false;
       for (let i = 0; i < contentStart; ++i)
         value += lines[i][0].slice(trimIndent) + "\n";
@@ -104792,24 +104792,24 @@ var require_resolve_block_scalar = __commonJS({
           indent = "";
         }
         if (type === Scalar.Scalar.BLOCK_LITERAL) {
-          value += sep2 + indent.slice(trimIndent) + content;
-          sep2 = "\n";
+          value += sep3 + indent.slice(trimIndent) + content;
+          sep3 = "\n";
         } else if (indent.length > trimIndent || content[0] === "	") {
-          if (sep2 === " ")
-            sep2 = "\n";
-          else if (!prevMoreIndented && sep2 === "\n")
-            sep2 = "\n\n";
-          value += sep2 + indent.slice(trimIndent) + content;
-          sep2 = "\n";
+          if (sep3 === " ")
+            sep3 = "\n";
+          else if (!prevMoreIndented && sep3 === "\n")
+            sep3 = "\n\n";
+          value += sep3 + indent.slice(trimIndent) + content;
+          sep3 = "\n";
           prevMoreIndented = true;
         } else if (content === "") {
-          if (sep2 === "\n")
+          if (sep3 === "\n")
             value += "\n";
           else
-            sep2 = "\n";
+            sep3 = "\n";
         } else {
-          value += sep2 + content;
-          sep2 = " ";
+          value += sep3 + content;
+          sep3 = " ";
           prevMoreIndented = false;
         }
       }
@@ -104991,25 +104991,25 @@ var require_resolve_flow_scalar = __commonJS({
       if (!match)
         return source;
       let res = match[1];
-      let sep2 = " ";
+      let sep3 = " ";
       let pos = first.lastIndex;
       line.lastIndex = pos;
       while (match = line.exec(source)) {
         if (match[1] === "") {
-          if (sep2 === "\n")
-            res += sep2;
+          if (sep3 === "\n")
+            res += sep3;
           else
-            sep2 = "\n";
+            sep3 = "\n";
         } else {
-          res += sep2 + match[1];
-          sep2 = " ";
+          res += sep3 + match[1];
+          sep3 = " ";
         }
         pos = line.lastIndex;
       }
       const last = /[ \t]*(.*)/sy;
       last.lastIndex = pos;
       match = last.exec(source);
-      return res + sep2 + (match?.[1] ?? "");
+      return res + sep3 + (match?.[1] ?? "");
     }
     function doubleQuotedValue(source, onError) {
       let res = "";
@@ -105819,14 +105819,14 @@ var require_cst_stringify = __commonJS({
         }
       }
     }
-    function stringifyItem({ start, key, sep: sep2, value }) {
+    function stringifyItem({ start, key, sep: sep3, value }) {
       let res = "";
       for (const st of start)
         res += st.source;
       if (key)
         res += stringifyToken(key);
-      if (sep2)
-        for (const st of sep2)
+      if (sep3)
+        for (const st of sep3)
           res += st.source;
       if (value)
         res += stringifyToken(value);
@@ -106993,18 +106993,18 @@ var require_parser2 = __commonJS({
         if (this.type === "map-value-ind") {
           const prev = getPrevProps(this.peek(2));
           const start = getFirstKeyStartProps(prev);
-          let sep2;
+          let sep3;
           if (scalar.end) {
-            sep2 = scalar.end;
-            sep2.push(this.sourceToken);
+            sep3 = scalar.end;
+            sep3.push(this.sourceToken);
             delete scalar.end;
           } else
-            sep2 = [this.sourceToken];
+            sep3 = [this.sourceToken];
           const map = {
             type: "block-map",
             offset: scalar.offset,
             indent: scalar.indent,
-            items: [{ start, key: scalar, sep: sep2 }]
+            items: [{ start, key: scalar, sep: sep3 }]
           };
           this.onKeyLine = true;
           this.stack[this.stack.length - 1] = map;
@@ -107157,15 +107157,15 @@ var require_parser2 = __commonJS({
                 } else if (isFlowToken(it.key) && !includesToken(it.sep, "newline")) {
                   const start2 = getFirstKeyStartProps(it.start);
                   const key = it.key;
-                  const sep2 = it.sep;
-                  sep2.push(this.sourceToken);
+                  const sep3 = it.sep;
+                  sep3.push(this.sourceToken);
                   delete it.key;
                   delete it.sep;
                   this.stack.push({
                     type: "block-map",
                     offset: this.offset,
                     indent: this.indent,
-                    items: [{ start: start2, key, sep: sep2 }]
+                    items: [{ start: start2, key, sep: sep3 }]
                   });
                 } else if (start.length > 0) {
                   it.sep = it.sep.concat(start, this.sourceToken);
@@ -107359,13 +107359,13 @@ var require_parser2 = __commonJS({
             const prev = getPrevProps(parent);
             const start = getFirstKeyStartProps(prev);
             fixFlowSeqItems(fc);
-            const sep2 = fc.end.splice(1, fc.end.length);
-            sep2.push(this.sourceToken);
+            const sep3 = fc.end.splice(1, fc.end.length);
+            sep3.push(this.sourceToken);
             const map = {
               type: "block-map",
               offset: fc.offset,
               indent: fc.indent,
-              items: [{ start, key: fc, sep: sep2 }]
+              items: [{ start, key: fc, sep: sep3 }]
             };
             this.onKeyLine = true;
             this.stack[this.stack.length - 1] = map;
@@ -122882,8 +122882,8 @@ function writeFlowMapping(state, level, node) {
     if (explicitPair) pairBuffer += "? ";
     else if (state.quoteFlowKeys) pairBuffer += '"';
     const valueText = writeNode(state, level, value, {});
-    const sep2 = state.flowSkipColonSpace || valueText === "" ? "" : " ";
-    pairBuffer += `${keyText}${state.quoteFlowKeys && !explicitPair ? '"' : ""}:${sep2}${valueText}`;
+    const sep3 = state.flowSkipColonSpace || valueText === "" ? "" : " ";
+    pairBuffer += `${keyText}${state.quoteFlowKeys && !explicitPair ? '"' : ""}:${sep3}${valueText}`;
     result += pairBuffer;
   }
   const pad = state.flowBracketPadding && result !== "" ? " " : "";
@@ -122980,8 +122980,8 @@ function writeNode(state, level, node, ctx) {
       if (anchor !== null) props.push(anchor);
       if (tag !== null) props.push(tag);
     }
-    const sep2 = body === "" || body.charCodeAt(0) === CHAR_LINE_FEED ? "" : " ";
-    body = `${props.join(" ")}${sep2}${body}`;
+    const sep3 = body === "" || body.charCodeAt(0) === CHAR_LINE_FEED ? "" : " ";
+    body = `${props.join(" ")}${sep3}${body}`;
   }
   return body;
 }
@@ -123026,8 +123026,8 @@ function present(documents, options) {
         block: true,
         compact: true
       });
-      const sep2 = body === "" ? "" : hasDirectives || rootStartsOwnLine(doc.contents) ? "\n" : " ";
-      result += `---${sep2}${body}
+      const sep3 = body === "" ? "" : hasDirectives || rootStartsOwnLine(doc.contents) ? "\n" : " ";
+      result += `---${sep3}${body}
 `;
     } else result += writeNode(state, 0, doc.contents, {
       block: true,
@@ -123152,9 +123152,47 @@ function structuredCloneSafe(value) {
   if (typeof structuredClone === "function") return structuredClone(value);
   return JSON.parse(JSON.stringify(value));
 }
+async function listFilesRelative(dir, base) {
+  let entries;
+  try {
+    entries = await fs2.readdir(dir, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  const out = [];
+  for (const entry of entries) {
+    const abs = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      out.push(...await listFilesRelative(abs, base));
+    } else if (entry.isFile()) {
+      out.push(path.relative(base, abs).split(path.sep).join("/"));
+    }
+  }
+  return out;
+}
+async function pruneEmptyDirs(dir) {
+  let entries;
+  try {
+    entries = await fs2.readdir(dir, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    if (entry.isDirectory()) {
+      const child = path.join(dir, entry.name);
+      await pruneEmptyDirs(child);
+      try {
+        await fs2.rmdir(child);
+      } catch {
+      }
+    }
+  }
+}
 async function writeSplitCollection(v32, outputDir) {
   const { files, rootPath } = await (0, import_v32.splitCollection)(v32);
   await fs2.mkdir(outputDir, { recursive: true });
+  const preexisting = new Set(await listFilesRelative(outputDir, outputDir));
+  const written = /* @__PURE__ */ new Set();
   for (const file of files) {
     let rel = file.path;
     if (rootPath && rel.startsWith(rootPath)) {
@@ -123165,7 +123203,13 @@ async function writeSplitCollection(v32, outputDir) {
     const dest = path.join(outputDir, rel);
     await fs2.mkdir(path.dirname(dest), { recursive: true });
     await fs2.writeFile(dest, file.content, "utf8");
+    written.add(rel.split(path.sep).join("/"));
+  }
+  for (const rel of preexisting) {
+    if (written.has(rel)) continue;
+    await fs2.rm(path.join(outputDir, rel), { force: true });
   }
+  await pruneEmptyDirs(outputDir);
 }
 
 // src/lib/postman/base-urls.ts
@@ -126613,10 +126657,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 +126704,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;
@@ -126687,8 +126758,8 @@ function assertPathWithinCwd(targetPath, fieldName) {
   }
   const base = (0, import_node_fs3.realpathSync)(process.cwd());
   const resolved = path3.resolve(base, rawPath);
-  const relative2 = path3.relative(base, resolved);
-  if (relative2.startsWith("..") || path3.isAbsolute(relative2)) {
+  const relative3 = path3.relative(base, resolved);
+  if (relative3.startsWith("..") || path3.isAbsolute(relative3)) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
   }
   let existingPath = resolved;
@@ -126705,7 +126776,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 +126810,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 +126840,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 +127113,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) {
@@ -127530,8 +127618,8 @@ async function writeOptionalFile(filePath, content) {
   }
   const workspaceRoot = import_node_path3.default.resolve(process.cwd());
   const resolved = import_node_path3.default.resolve(workspaceRoot, filePath);
-  const relative2 = import_node_path3.default.relative(workspaceRoot, resolved);
-  if (relative2.startsWith("..") || import_node_path3.default.isAbsolute(relative2)) {
+  const relative3 = import_node_path3.default.relative(workspaceRoot, resolved);
+  if (relative3.startsWith("..") || import_node_path3.default.isAbsolute(relative3)) {
     throw new Error(`Output path must stay within workspace: ${filePath}`);
   }
   await (0, import_promises.mkdir)(import_node_path3.default.dirname(resolved), { recursive: true });