@antongolub/lockfile 0.0.0-snapshot.47 → 0.0.0-snapshot.48

package/dist/formats/npm-2.js

@@ -1349,7 +1349,7 @@ function stringifyFamily(graph, config, options = {}) {
   const rootMeta = sidecar?.rootMeta;
   const rootName = rootMeta?.name ?? rootNode?.name ?? "";
   const rootVersion = rootMeta?.version ?? rootNode?.version ?? "0.0.0";
-  const plannedInstallPaths = deriveInstallPathsForStringify(graph, sidecar, rootNode);
+  const plannedInstallPaths = deriveInstallPathsForStringify(graph, sidecar, rootNode, emitDiagnostic);
   const packages = {};
   if (rootNode !== void 0) {
     packages[""] = buildRootEntry(graph, rootNode, rootMeta, sidecar, emitDiagnostic);
@@ -1710,7 +1710,7 @@ function locateRootNode(graph, sidecar) {
   }
   return void 0;
 }
-function deriveInstallPathsForStringify(graph, sidecar, rootNode) {
+function deriveInstallPathsForStringify(graph, sidecar, rootNode, onDiagnostic) {
   const byNodeId = /* @__PURE__ */ new Map();
   const pathToId = /* @__PURE__ */ new Map();
   const seenConsumers = /* @__PURE__ */ new Set();
@@ -1769,11 +1769,19 @@ function deriveInstallPathsForStringify(graph, sidecar, rootNode) {
       }
     }
   };
-  drainBfsQueue();
-  for (const node of seededNodes) {
-    if (byNodeId.has(node.id)) continue;
-    addPlacement(node.id, fallbackInstallPathForNode(node, pathToId));
+  const captureComplete = seededNodes.length > 0 && seededNodes.every((node) => (sidecar?.nodes.get(node.id)?.installPaths?.length ?? 0) > 0);
+  if (!captureComplete) {
     drainBfsQueue();
+    for (const node of seededNodes) {
+      if (byNodeId.has(node.id)) continue;
+      addPlacement(node.id, fallbackInstallPathForNode(node, pathToId));
+      drainBfsQueue();
+    }
+    onDiagnostic?.({
+      code: "LAYOUT_PLACEMENT_RESYNTHESISED",
+      severity: "info",
+      message: "npm install-path layout re-synthesised \u2014 no complete parse-captured placement (cross-PM input or post-mutate graph); emitted a valid find-up tree, not the original projection"
+    });
   }
   const planned = /* @__PURE__ */ new Map();
   for (const [nodeId, installPaths] of byNodeId) {

package/dist/formats/npm-3.js

@@ -1349,7 +1349,7 @@ function stringifyFamily(graph, config, options = {}) {
   const rootMeta = sidecar?.rootMeta;
   const rootName = rootMeta?.name ?? rootNode?.name ?? "";
   const rootVersion = rootMeta?.version ?? rootNode?.version ?? "0.0.0";
-  const plannedInstallPaths = deriveInstallPathsForStringify(graph, sidecar, rootNode);
+  const plannedInstallPaths = deriveInstallPathsForStringify(graph, sidecar, rootNode, emitDiagnostic);
   const packages = {};
   if (rootNode !== void 0) {
     packages[""] = buildRootEntry(graph, rootNode, rootMeta, sidecar, emitDiagnostic);
@@ -1710,7 +1710,7 @@ function locateRootNode(graph, sidecar) {
   }
   return void 0;
 }
-function deriveInstallPathsForStringify(graph, sidecar, rootNode) {
+function deriveInstallPathsForStringify(graph, sidecar, rootNode, onDiagnostic) {
   const byNodeId = /* @__PURE__ */ new Map();
   const pathToId = /* @__PURE__ */ new Map();
   const seenConsumers = /* @__PURE__ */ new Set();
@@ -1769,11 +1769,19 @@ function deriveInstallPathsForStringify(graph, sidecar, rootNode) {
       }
     }
   };
-  drainBfsQueue();
-  for (const node of seededNodes) {
-    if (byNodeId.has(node.id)) continue;
-    addPlacement(node.id, fallbackInstallPathForNode(node, pathToId));
+  const captureComplete = seededNodes.length > 0 && seededNodes.every((node) => (sidecar?.nodes.get(node.id)?.installPaths?.length ?? 0) > 0);
+  if (!captureComplete) {
     drainBfsQueue();
+    for (const node of seededNodes) {
+      if (byNodeId.has(node.id)) continue;
+      addPlacement(node.id, fallbackInstallPathForNode(node, pathToId));
+      drainBfsQueue();
+    }
+    onDiagnostic?.({
+      code: "LAYOUT_PLACEMENT_RESYNTHESISED",
+      severity: "info",
+      message: "npm install-path layout re-synthesised \u2014 no complete parse-captured placement (cross-PM input or post-mutate graph); emitted a valid find-up tree, not the original projection"
+    });
   }
   const planned = /* @__PURE__ */ new Map();
   for (const [nodeId, installPaths] of byNodeId) {

package/dist/formats/pnpm-v6.js

@@ -2292,8 +2292,16 @@ function resolvePeerTargetById(seenIds, peerName, peerVersion) {
   return void 0;
 }
 function resolveWorkspacePeerId(peerVersion, importerByPath) {
-  const importerPath = peerVersion.replace(/\+/g, "/");
-  return importerByPath.get(importerPath);
+  let path2 = peerVersion.replace(/\+/g, "/");
+  const exact = importerByPath.get(path2);
+  if (exact !== void 0) return exact;
+  while (path2.includes("/")) {
+    path2 = path2.slice(0, path2.lastIndexOf("/"));
+    if (path2.length === 0 || path2 === ".") break;
+    const ancestor = importerByPath.get(path2);
+    if (ancestor !== void 0) return ancestor;
+  }
+  return void 0;
 }
 function buildPeerContext(peers, importerByPath) {
   return peers.filter((p) => resolveWorkspacePeerId(p.version, importerByPath) === void 0).map((p) => `${p.name}@${p.version}`).sort();

package/dist/formats/pnpm-v9.js

@@ -2292,8 +2292,16 @@ function resolvePeerTargetById(seenIds, peerName, peerVersion) {
   return void 0;
 }
 function resolveWorkspacePeerId(peerVersion, importerByPath) {
-  const importerPath = peerVersion.replace(/\+/g, "/");
-  return importerByPath.get(importerPath);
+  let path2 = peerVersion.replace(/\+/g, "/");
+  const exact = importerByPath.get(path2);
+  if (exact !== void 0) return exact;
+  while (path2.includes("/")) {
+    path2 = path2.slice(0, path2.lastIndexOf("/"));
+    if (path2.length === 0 || path2 === ".") break;
+    const ancestor = importerByPath.get(path2);
+    if (ancestor !== void 0) return ancestor;
+  }
+  return void 0;
 }
 function buildPeerContext(peers, importerByPath) {
   return peers.filter((p) => resolveWorkspacePeerId(p.version, importerByPath) === void 0).map((p) => `${p.name}@${p.version}`).sort();

package/dist/formats/yarn-classic.js

@@ -934,16 +934,22 @@ var HEADER = "# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.\n
 var HEADER_LINE_1 = "# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.";
 var HEADER_LINE_2 = "# yarn lockfile v1";
 var cmpUtf16 = (a, b) => a < b ? -1 : a > b ? 1 : 0;
-var QUOTED_PAIR_RE = /^("(?:\\.|[^"])*"|[^\s"].*) "(?:\\.|[^"])*"$/;
+var DEP_PAIR_RE = /^("(?:\\.|[^"])*"|[^\s"]\S*) ("(?:\\.|[^"])*"|[^\s"]\S*)$/;
 var BARE_DEP_NAME_RE = /^[A-Za-z0-9._-]+$/;
 var ENTRY_KEY_SPECIAL_RE = /[\s:",#?*&!|>'`[\]{}]/;
 var BERRY_HEADER_RE = /^__metadata:\s*(?:\r?\n|$)/m;
 var sidecarByGraph = /* @__PURE__ */ new WeakMap();
+function stripBom(input) {
+  return input.charCodeAt(0) === 65279 ? input.slice(1) : input;
+}
 function check(input) {
-  return normalizeLineEndings(input).startsWith(HEADER);
+  const normalized = stripBom(normalizeLineEndings(input));
+  if (normalized.startsWith(HEADER)) return true;
+  const lines = normalized.split("\n");
+  return lines[0] === HEADER_LINE_1 && lines[1] === HEADER_LINE_2;
 }
 function parse2(input) {
-  const normalized = normalizeLineEndings(input);
+  const normalized = stripBom(normalizeLineEndings(input));
   ensureClassicHeader(normalized);
   const builder = newBuilder();
   const diagnostics = [];
@@ -1321,7 +1327,7 @@ function splitMixedDescriptorList(token) {
 }
 function parseDependencyLine(line) {
   const raw = line.slice(4);
-  if (!QUOTED_PAIR_RE.test(raw)) {
+  if (!DEP_PAIR_RE.test(raw)) {
     throw parseFailed(`malformed dependency line (${JSON.stringify(line)})`);
   }
   const splitAt = splitDependencyPair(raw);
@@ -1329,7 +1335,7 @@ function parseDependencyLine(line) {
   const rangeToken = raw.slice(splitAt + 1);
   return [
     nameToken.startsWith('"') ? parseQuotedToken(nameToken) : nameToken,
-    parseQuotedToken(rangeToken)
+    rangeToken.startsWith('"') ? parseQuotedToken(rangeToken) : rangeToken
   ];
 }
 function splitDependencyPair(raw) {

package/dist/index.js

@@ -1579,7 +1579,7 @@ function stringifyFamily(graph, config, options = {}) {
   const rootMeta = sidecar?.rootMeta;
   const rootName = rootMeta?.name ?? rootNode?.name ?? "";
   const rootVersion = rootMeta?.version ?? rootNode?.version ?? "0.0.0";
-  const plannedInstallPaths = deriveInstallPathsForStringify(graph, sidecar, rootNode);
+  const plannedInstallPaths = deriveInstallPathsForStringify(graph, sidecar, rootNode, emitDiagnostic);
   const packages = {};
   if (rootNode !== void 0) {
     packages[""] = buildRootEntry(graph, rootNode, rootMeta, sidecar, emitDiagnostic);
@@ -1789,7 +1789,7 @@ function locateRootNode(graph, sidecar) {
   }
   return void 0;
 }
-function deriveInstallPathsForStringify(graph, sidecar, rootNode) {
+function deriveInstallPathsForStringify(graph, sidecar, rootNode, onDiagnostic) {
   const byNodeId = /* @__PURE__ */ new Map();
   const pathToId = /* @__PURE__ */ new Map();
   const seenConsumers = /* @__PURE__ */ new Set();
@@ -1848,11 +1848,19 @@ function deriveInstallPathsForStringify(graph, sidecar, rootNode) {
       }
     }
   };
-  drainBfsQueue();
-  for (const node of seededNodes) {
-    if (byNodeId.has(node.id)) continue;
-    addPlacement(node.id, fallbackInstallPathForNode(node, pathToId));
+  const captureComplete = seededNodes.length > 0 && seededNodes.every((node) => (sidecar?.nodes.get(node.id)?.installPaths?.length ?? 0) > 0);
+  if (!captureComplete) {
     drainBfsQueue();
+    for (const node of seededNodes) {
+      if (byNodeId.has(node.id)) continue;
+      addPlacement(node.id, fallbackInstallPathForNode(node, pathToId));
+      drainBfsQueue();
+    }
+    onDiagnostic?.({
+      code: "LAYOUT_PLACEMENT_RESYNTHESISED",
+      severity: "info",
+      message: "npm install-path layout re-synthesised \u2014 no complete parse-captured placement (cross-PM input or post-mutate graph); emitted a valid find-up tree, not the original projection"
+    });
   }
   const planned = /* @__PURE__ */ new Map();
   for (const [nodeId, installPaths] of byNodeId) {
@@ -3313,8 +3321,16 @@ function resolvePeerTargetById(seenIds, peerName, peerVersion) {
   return void 0;
 }
 function resolveWorkspacePeerId(peerVersion, importerByPath) {
-  const importerPath = peerVersion.replace(/\+/g, "/");
-  return importerByPath.get(importerPath);
+  let path6 = peerVersion.replace(/\+/g, "/");
+  const exact = importerByPath.get(path6);
+  if (exact !== void 0) return exact;
+  while (path6.includes("/")) {
+    path6 = path6.slice(0, path6.lastIndexOf("/"));
+    if (path6.length === 0 || path6 === ".") break;
+    const ancestor = importerByPath.get(path6);
+    if (ancestor !== void 0) return ancestor;
+  }
+  return void 0;
 }
 function buildPeerContext(peers, importerByPath) {
   return peers.filter((p) => resolveWorkspacePeerId(p.version, importerByPath) === void 0).map((p) => `${p.name}@${p.version}`).sort();
@@ -6811,16 +6827,22 @@ var HEADER = "# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.\n
 var HEADER_LINE_1 = "# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.";
 var HEADER_LINE_2 = "# yarn lockfile v1";
 var cmpUtf16 = (a, b) => a < b ? -1 : a > b ? 1 : 0;
-var QUOTED_PAIR_RE = /^("(?:\\.|[^"])*"|[^\s"].*) "(?:\\.|[^"])*"$/;
+var DEP_PAIR_RE = /^("(?:\\.|[^"])*"|[^\s"]\S*) ("(?:\\.|[^"])*"|[^\s"]\S*)$/;
 var BARE_DEP_NAME_RE = /^[A-Za-z0-9._-]+$/;
 var ENTRY_KEY_SPECIAL_RE = /[\s:",#?*&!|>'`[\]{}]/;
 var BERRY_HEADER_RE = /^__metadata:\s*(?:\r?\n|$)/m;
 var sidecarByGraph7 = /* @__PURE__ */ new WeakMap();
+function stripBom(input) {
+  return input.charCodeAt(0) === 65279 ? input.slice(1) : input;
+}
 function check15(input) {
-  return normalizeLineEndings3(input).startsWith(HEADER);
+  const normalized = stripBom(normalizeLineEndings3(input));
+  if (normalized.startsWith(HEADER)) return true;
+  const lines = normalized.split("\n");
+  return lines[0] === HEADER_LINE_1 && lines[1] === HEADER_LINE_2;
 }
 function parse17(input) {
-  const normalized = normalizeLineEndings3(input);
+  const normalized = stripBom(normalizeLineEndings3(input));
   ensureClassicHeader(normalized);
   const builder = newBuilder();
   const diagnostics = [];
@@ -7100,7 +7122,7 @@ function splitMixedDescriptorList(token) {
 }
 function parseDependencyLine(line) {
   const raw = line.slice(4);
-  if (!QUOTED_PAIR_RE.test(raw)) {
+  if (!DEP_PAIR_RE.test(raw)) {
     throw parseFailed2(`malformed dependency line (${JSON.stringify(line)})`);
   }
   const splitAt = splitDependencyPair(raw);
@@ -7108,7 +7130,7 @@ function parseDependencyLine(line) {
   const rangeToken = raw.slice(splitAt + 1);
   return [
     nameToken.startsWith('"') ? parseQuotedToken(nameToken) : nameToken,
-    parseQuotedToken(rangeToken)
+    rangeToken.startsWith('"') ? parseQuotedToken(rangeToken) : rangeToken
   ];
 }
 function splitDependencyPair(raw) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antongolub/lockfile",
-  "version": "0.0.0-snapshot.47",
+  "version": "0.0.0-snapshot.48",
   "private": false,
   "description": "Universal lockfile model and converter for npm, yarn, pnpm, bun",
   "type": "module",