@antongolub/lockfile 0.0.0-snapshot.53 → 0.0.0-snapshot.56

package/dist/formats/yarn-berry-v10.js

@@ -848,10 +848,7 @@ function codeOf(error) {
 }
 
 // src/main/ts/formats/_yarn-syml.ts
-var YAML_NUMBER_RE = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
-var YAML_BOOLEAN_RE = /^(true|false|yes|no|on|off)$/i;
-var YAML_NULL_RE = /^(null|~)$/;
-var YAML_SPECIAL_RE = /[ \t:,[\]{}#&*!|>'"%@`]/;
+var SYML_SIMPLE_STRING_RE = /^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/;
 var SymlParseError = class extends Error {
   line;
   constructor(message, line) {
@@ -1016,16 +1013,7 @@ function parse(input) {
   return root;
 }
 function needsQuotes(raw) {
-  if (raw === "") return true;
-  if (YAML_SPECIAL_RE.test(raw)) return true;
-  if (raw[0] === "-" || raw[0] === "?") return true;
-  if (YAML_NUMBER_RE.test(raw)) return true;
-  if (YAML_BOOLEAN_RE.test(raw)) return true;
-  if (YAML_NULL_RE.test(raw)) return true;
-  for (let i = 0; i < raw.length; i++) {
-    if (raw.charCodeAt(i) > 127) return true;
-  }
-  return false;
+  return !SYML_SIMPLE_STRING_RE.test(raw);
 }
 function escapeQuoted(raw) {
   let out = "";

package/dist/formats/yarn-berry-v4.js

@@ -848,10 +848,7 @@ function codeOf(error) {
 }
 
 // src/main/ts/formats/_yarn-syml.ts
-var YAML_NUMBER_RE = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
-var YAML_BOOLEAN_RE = /^(true|false|yes|no|on|off)$/i;
-var YAML_NULL_RE = /^(null|~)$/;
-var YAML_SPECIAL_RE = /[ \t:,[\]{}#&*!|>'"%@`]/;
+var SYML_SIMPLE_STRING_RE = /^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/;
 var SymlParseError = class extends Error {
   line;
   constructor(message, line) {
@@ -1016,16 +1013,7 @@ function parse(input) {
   return root;
 }
 function needsQuotes(raw) {
-  if (raw === "") return true;
-  if (YAML_SPECIAL_RE.test(raw)) return true;
-  if (raw[0] === "-" || raw[0] === "?") return true;
-  if (YAML_NUMBER_RE.test(raw)) return true;
-  if (YAML_BOOLEAN_RE.test(raw)) return true;
-  if (YAML_NULL_RE.test(raw)) return true;
-  for (let i = 0; i < raw.length; i++) {
-    if (raw.charCodeAt(i) > 127) return true;
-  }
-  return false;
+  return !SYML_SIMPLE_STRING_RE.test(raw);
 }
 function escapeQuoted(raw) {
   let out = "";

package/dist/formats/yarn-berry-v5.js

@@ -848,10 +848,7 @@ function codeOf(error) {
 }
 
 // src/main/ts/formats/_yarn-syml.ts
-var YAML_NUMBER_RE = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
-var YAML_BOOLEAN_RE = /^(true|false|yes|no|on|off)$/i;
-var YAML_NULL_RE = /^(null|~)$/;
-var YAML_SPECIAL_RE = /[ \t:,[\]{}#&*!|>'"%@`]/;
+var SYML_SIMPLE_STRING_RE = /^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/;
 var SymlParseError = class extends Error {
   line;
   constructor(message, line) {
@@ -1016,16 +1013,7 @@ function parse(input) {
   return root;
 }
 function needsQuotes(raw) {
-  if (raw === "") return true;
-  if (YAML_SPECIAL_RE.test(raw)) return true;
-  if (raw[0] === "-" || raw[0] === "?") return true;
-  if (YAML_NUMBER_RE.test(raw)) return true;
-  if (YAML_BOOLEAN_RE.test(raw)) return true;
-  if (YAML_NULL_RE.test(raw)) return true;
-  for (let i = 0; i < raw.length; i++) {
-    if (raw.charCodeAt(i) > 127) return true;
-  }
-  return false;
+  return !SYML_SIMPLE_STRING_RE.test(raw);
 }
 function escapeQuoted(raw) {
   let out = "";

package/dist/formats/yarn-berry-v6.js

@@ -848,10 +848,7 @@ function codeOf(error) {
 }
 
 // src/main/ts/formats/_yarn-syml.ts
-var YAML_NUMBER_RE = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
-var YAML_BOOLEAN_RE = /^(true|false|yes|no|on|off)$/i;
-var YAML_NULL_RE = /^(null|~)$/;
-var YAML_SPECIAL_RE = /[ \t:,[\]{}#&*!|>'"%@`]/;
+var SYML_SIMPLE_STRING_RE = /^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/;
 var SymlParseError = class extends Error {
   line;
   constructor(message, line) {
@@ -1016,16 +1013,7 @@ function parse(input) {
   return root;
 }
 function needsQuotes(raw) {
-  if (raw === "") return true;
-  if (YAML_SPECIAL_RE.test(raw)) return true;
-  if (raw[0] === "-" || raw[0] === "?") return true;
-  if (YAML_NUMBER_RE.test(raw)) return true;
-  if (YAML_BOOLEAN_RE.test(raw)) return true;
-  if (YAML_NULL_RE.test(raw)) return true;
-  for (let i = 0; i < raw.length; i++) {
-    if (raw.charCodeAt(i) > 127) return true;
-  }
-  return false;
+  return !SYML_SIMPLE_STRING_RE.test(raw);
 }
 function escapeQuoted(raw) {
   let out = "";

package/dist/formats/yarn-berry-v7.js

@@ -848,10 +848,7 @@ function codeOf(error) {
 }
 
 // src/main/ts/formats/_yarn-syml.ts
-var YAML_NUMBER_RE = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
-var YAML_BOOLEAN_RE = /^(true|false|yes|no|on|off)$/i;
-var YAML_NULL_RE = /^(null|~)$/;
-var YAML_SPECIAL_RE = /[ \t:,[\]{}#&*!|>'"%@`]/;
+var SYML_SIMPLE_STRING_RE = /^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/;
 var SymlParseError = class extends Error {
   line;
   constructor(message, line) {
@@ -1016,16 +1013,7 @@ function parse(input) {
   return root;
 }
 function needsQuotes(raw) {
-  if (raw === "") return true;
-  if (YAML_SPECIAL_RE.test(raw)) return true;
-  if (raw[0] === "-" || raw[0] === "?") return true;
-  if (YAML_NUMBER_RE.test(raw)) return true;
-  if (YAML_BOOLEAN_RE.test(raw)) return true;
-  if (YAML_NULL_RE.test(raw)) return true;
-  for (let i = 0; i < raw.length; i++) {
-    if (raw.charCodeAt(i) > 127) return true;
-  }
-  return false;
+  return !SYML_SIMPLE_STRING_RE.test(raw);
 }
 function escapeQuoted(raw) {
   let out = "";

package/dist/formats/yarn-berry-v8.js

@@ -848,10 +848,7 @@ function codeOf(error) {
 }
 
 // src/main/ts/formats/_yarn-syml.ts
-var YAML_NUMBER_RE = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
-var YAML_BOOLEAN_RE = /^(true|false|yes|no|on|off)$/i;
-var YAML_NULL_RE = /^(null|~)$/;
-var YAML_SPECIAL_RE = /[ \t:,[\]{}#&*!|>'"%@`]/;
+var SYML_SIMPLE_STRING_RE = /^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/;
 var SymlParseError = class extends Error {
   line;
   constructor(message, line) {
@@ -1016,16 +1013,7 @@ function parse(input) {
   return root;
 }
 function needsQuotes(raw) {
-  if (raw === "") return true;
-  if (YAML_SPECIAL_RE.test(raw)) return true;
-  if (raw[0] === "-" || raw[0] === "?") return true;
-  if (YAML_NUMBER_RE.test(raw)) return true;
-  if (YAML_BOOLEAN_RE.test(raw)) return true;
-  if (YAML_NULL_RE.test(raw)) return true;
-  for (let i = 0; i < raw.length; i++) {
-    if (raw.charCodeAt(i) > 127) return true;
-  }
-  return false;
+  return !SYML_SIMPLE_STRING_RE.test(raw);
 }
 function escapeQuoted(raw) {
   let out = "";

package/dist/formats/yarn-berry-v9.js

@@ -848,10 +848,7 @@ function codeOf(error) {
 }
 
 // src/main/ts/formats/_yarn-syml.ts
-var YAML_NUMBER_RE = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
-var YAML_BOOLEAN_RE = /^(true|false|yes|no|on|off)$/i;
-var YAML_NULL_RE = /^(null|~)$/;
-var YAML_SPECIAL_RE = /[ \t:,[\]{}#&*!|>'"%@`]/;
+var SYML_SIMPLE_STRING_RE = /^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/;
 var SymlParseError = class extends Error {
   line;
   constructor(message, line) {
@@ -1016,16 +1013,7 @@ function parse(input) {
   return root;
 }
 function needsQuotes(raw) {
-  if (raw === "") return true;
-  if (YAML_SPECIAL_RE.test(raw)) return true;
-  if (raw[0] === "-" || raw[0] === "?") return true;
-  if (YAML_NUMBER_RE.test(raw)) return true;
-  if (YAML_BOOLEAN_RE.test(raw)) return true;
-  if (YAML_NULL_RE.test(raw)) return true;
-  for (let i = 0; i < raw.length; i++) {
-    if (raw.charCodeAt(i) > 127) return true;
-  }
-  return false;
+  return !SYML_SIMPLE_STRING_RE.test(raw);
 }
 function escapeQuoted(raw) {
   let out = "";

package/dist/formats/yarn-classic.js

@@ -1064,7 +1064,8 @@ var HEADER_LINE_2 = "# yarn lockfile v1";
 var cmpUtf16 = (a, b) => a < b ? -1 : a > b ? 1 : 0;
 var DEP_PAIR_RE = /^("(?:\\.|[^"])*"|[^\s"]\S*) ("(?:\\.|[^"])*"|[^\s"]\S*)$/;
 var BARE_DEP_NAME_RE = /^[A-Za-z0-9._-]+$/;
-var ENTRY_KEY_SPECIAL_RE = /[\s:",#?*&!|>'`[\]{}]/;
+var ENTRY_KEY_WRAP_RE = /[:\s\\",[\]]/;
+var ENTRY_KEY_LEADING_ALPHA_RE = /^[a-zA-Z]/;
 var BERRY_HEADER_RE = /^__metadata:\s*(?:\r?\n|$)/m;
 var sidecarByGraph = /* @__PURE__ */ new WeakMap();
 function stripBom(input) {
@@ -1074,7 +1075,40 @@ function check(input) {
   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;
+  if (lines[0] === HEADER_LINE_1 && lines[1] === HEADER_LINE_2) return true;
+  return hasClassicStructuralBody(normalized, lines);
+}
+function hasClassicStructuralBody(normalized, lines) {
+  if (BERRY_HEADER_RE.test(normalized)) return false;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i] ?? "";
+    if (line.length === 0 || line[0] === " " || line[0] === "	" || line[0] === "#") continue;
+    if (!line.endsWith(":")) continue;
+    if (!isClassicEntryKeyLine(line.slice(0, -1))) continue;
+    for (let j = i + 1; j < lines.length; j++) {
+      const body = lines[j] ?? "";
+      if (body.length === 0) return false;
+      if (body.startsWith("  #")) continue;
+      return CLASSIC_VERSION_FIELD_RE.test(body);
+    }
+    return false;
+  }
+  return false;
+}
+var CLASSIC_VERSION_FIELD_RE = /^ {2}version "(?:\\.|[^"])*"\s*$/;
+function isClassicEntryKeyLine(key) {
+  let specs;
+  try {
+    specs = splitEntryKey(parseEntryKeyToken(key));
+  } catch {
+    return false;
+  }
+  if (specs.length === 0) return false;
+  for (const spec of specs) {
+    const idx = spec.indexOf("@", spec.startsWith("@") ? 1 : 0);
+    if (idx <= 0 || idx === spec.length - 1) return false;
+  }
+  return true;
 }
 function parse2(input, options = {}) {
   const normalized = stripBom(normalizeLineEndings(input));
@@ -1097,15 +1131,15 @@ function parse2(input, options = {}) {
     if (entry.version === void 0) {
       throw parseFailed(`entry ${JSON.stringify(entry.key)} missing version`);
     }
-    const specsByName = /* @__PURE__ */ new Map();
+    const specsByResolvedName = /* @__PURE__ */ new Map();
     for (const spec of specs) {
-      const part = parseSpec(spec);
-      const current = specsByName.get(part.name);
-      if (current === void 0) specsByName.set(part.name, [part.spec]);
-      else current.push(part.spec);
+      const identity = specIdentity(parseSpec(spec));
+      const current = specsByResolvedName.get(identity.resolvedName);
+      if (current === void 0) specsByResolvedName.set(identity.resolvedName, [identity.descriptorKey]);
+      else current.push(identity.descriptorKey);
     }
-    for (const [name, rawRanges] of specsByName) {
-      const ranges = Array.from(new Set(rawRanges)).sort(cmpUtf16);
+    for (const [name, rawDescriptors] of specsByResolvedName) {
+      const descriptors = Array.from(new Set(rawDescriptors)).sort(cmpUtf16);
       const id = `${name}@${entry.version}`;
       const prior = seenEntries.get(id);
       if (prior !== void 0) {
@@ -1116,8 +1150,7 @@ function parse2(input, options = {}) {
           });
         }
         const merged = sidecar.get(id) ?? [];
-        for (const range of ranges) {
-          const spec = `${name}@${range}`;
+        for (const spec of descriptors) {
           if (!merged.includes(spec)) merged.push(spec);
           specIndex.set(spec, id);
         }
@@ -1159,14 +1192,14 @@ function parse2(input, options = {}) {
       } else if (canonicalResolution !== void 0) {
         builder.setTarball({ name, version: entry.version }, { resolution: canonicalResolution });
       }
-      sidecar.set(id, ranges.map((range) => `${name}@${range}`));
+      sidecar.set(id, descriptors.slice());
       if (entry.extras !== void 0 && entry.extras.length > 0) {
         entryExtras.set(id, entry.extras);
         for (const raw of entry.extras) unknownFields.add(raw.split(" ", 1)[0] ?? raw);
       }
       entryNodes.push({ node, entry });
-      for (const range of ranges) {
-        specIndex.set(`${name}@${range}`, id);
+      for (const spec of descriptors) {
+        specIndex.set(spec, id);
       }
     }
   }
@@ -1246,7 +1279,7 @@ function stringify(graph, options = {}) {
     }
     const integrity = payload?.integrity && emitSri(payload.integrity);
     if (integrity !== void 0 && integrity !== "") {
-      lines.push(`  integrity ${integrity}`);
+      lines.push(`  integrity ${integrity.includes(" ") ? `"${integrity}"` : integrity}`);
     }
     const extras = emitSidecar?.entryExtras?.get(node.id);
     if (extras !== void 0) {
@@ -1470,7 +1503,8 @@ function parseEntries(input) {
       continue;
     }
     if (line.startsWith("  integrity ")) {
-      current.integrity = line.slice("  integrity ".length);
+      const value = line.slice("  integrity ".length);
+      current.integrity = value.startsWith('"') ? parseQuotedToken(value) : value;
       continue;
     }
     current.extras ??= [];
@@ -1585,6 +1619,19 @@ function parseSpec(spec) {
     spec: spec.slice(idx + 1)
   };
 }
+function specIdentity(part) {
+  const descriptorKey = `${part.name}@${part.spec}`;
+  if (part.spec.startsWith("npm:")) {
+    const target = part.spec.slice("npm:".length);
+    const at = target.indexOf("@", target.startsWith("@") ? 1 : 0);
+    const targetName = at > 0 ? target.slice(0, at) : void 0;
+    if (targetName !== void 0 && targetName.length > 0 && targetName !== part.name) {
+      return { resolvedName: targetName, aliasName: part.name, descriptorKey };
+    }
+    return { resolvedName: part.name, descriptorKey };
+  }
+  return { resolvedName: part.name, descriptorKey };
+}
 function isClassicRegistryRange(range) {
   if (range.startsWith("npm:")) return true;
   const colonIdx = range.indexOf(":");
@@ -1634,7 +1681,10 @@ function addEdgesFromMap(builder, diagnostics, srcId, deps, kind, specIndex, lad
       }
       continue;
     }
-    builder.addEdge(srcId, dstId, kind, { range });
+    const dstName = nameOf(dstId);
+    const attrs = { range };
+    if (name !== dstName) attrs.alias = name;
+    builder.addEdge(srcId, dstId, kind, attrs);
   }
 }
 function specIndexOfGraph(graph, sidecar) {
@@ -1771,7 +1821,7 @@ function isWorkspaceProtocolRange(range) {
   return range.startsWith("workspace:");
 }
 function entrySpecsOfNode(graph, node) {
-  const liveSpecs = Array.from(graph.in(node.id)).filter((edge) => edge.kind === "dep" || edge.kind === "optional").map((edge) => edge.attrs?.range).filter((range) => range !== void 0).map((range) => `${node.name}@${range}`);
+  const liveSpecs = Array.from(graph.in(node.id)).filter((edge) => edge.kind === "dep" || edge.kind === "optional").filter((edge) => edge.attrs?.range !== void 0).map((edge) => `${edge.attrs.alias ?? node.name}@${edge.attrs.range}`);
   if (liveSpecs.length > 0) {
     return Array.from(new Set(liveSpecs)).sort(cmpUtf16);
   }
@@ -1782,14 +1832,10 @@ function entrySpecsOfNode(graph, node) {
   return [`${node.name}@${node.version}`];
 }
 function stringifyEntryKey(specs) {
-  const key = specs.join(", ");
-  return mustQuoteEntryKey(specs) ? `"${escapeQuoted(key)}"` : key;
+  return specs.map((spec) => mustQuoteSpec(spec) ? `"${escapeQuoted(spec)}"` : spec).join(", ");
 }
-function mustQuoteEntryKey(specs) {
-  if (specs.length > 1) return true;
-  return specs.some(
-    (spec) => spec.startsWith("@") || spec.includes("||") || ENTRY_KEY_SPECIAL_RE.test(spec) || hasNonAscii(spec)
-  );
+function mustQuoteSpec(spec) {
+  return spec.startsWith("true") || spec.startsWith("false") || ENTRY_KEY_WRAP_RE.test(spec) || !ENTRY_KEY_LEADING_ALPHA_RE.test(spec);
 }
 function quoteDepName(name) {
   return name.startsWith("@") || !BARE_DEP_NAME_RE.test(name) ? `"${escapeQuoted(name)}"` : name;
@@ -1797,12 +1843,6 @@ function quoteDepName(name) {
 function escapeQuoted(value) {
   return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
-function hasNonAscii(value) {
-  for (let i = 0; i < value.length; i++) {
-    if (value.charCodeAt(i) > 127) return true;
-  }
-  return false;
-}
 function collectDependencyBlockEntries(graph, srcId, emitDiagnostic) {
   return collectBlockEntries(
     graph,
@@ -1836,7 +1876,7 @@ function collectBlockEntries(graph, edges, emitDiagnostic) {
         return [dst.name, resolved];
       }
     }
-    return [dst.name, edge.attrs.range];
+    return [edge.attrs.alias ?? dst.name, edge.attrs.range];
   }).filter((entry) => entry !== void 0).sort((a, b) => cmpUtf16(a[0], b[0]));
 }
 function warnDroppedPeerEdges(graph, srcId, warned, emitDiagnostic) {

package/dist/index.js

@@ -5949,10 +5949,7 @@ function stringify7(graph, options = {}) {
 }
 
 // src/main/ts/formats/_yarn-syml.ts
-var YAML_NUMBER_RE = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
-var YAML_BOOLEAN_RE = /^(true|false|yes|no|on|off)$/i;
-var YAML_NULL_RE = /^(null|~)$/;
-var YAML_SPECIAL_RE = /[ \t:,[\]{}#&*!|>'"%@`]/;
+var SYML_SIMPLE_STRING_RE = /^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/;
 var SymlParseError = class extends Error {
   line;
   constructor(message, line) {
@@ -6117,16 +6114,7 @@ function parse9(input) {
   return root;
 }
 function needsQuotes(raw) {
-  if (raw === "") return true;
-  if (YAML_SPECIAL_RE.test(raw)) return true;
-  if (raw[0] === "-" || raw[0] === "?") return true;
-  if (YAML_NUMBER_RE.test(raw)) return true;
-  if (YAML_BOOLEAN_RE.test(raw)) return true;
-  if (YAML_NULL_RE.test(raw)) return true;
-  for (let i = 0; i < raw.length; i++) {
-    if (raw.charCodeAt(i) > 127) return true;
-  }
-  return false;
+  return !SYML_SIMPLE_STRING_RE.test(raw);
 }
 function escapeQuoted(raw) {
   let out = "";
@@ -7432,7 +7420,8 @@ var HEADER_LINE_2 = "# yarn lockfile v1";
 var cmpUtf16 = (a, b) => a < b ? -1 : a > b ? 1 : 0;
 var DEP_PAIR_RE = /^("(?:\\.|[^"])*"|[^\s"]\S*) ("(?:\\.|[^"])*"|[^\s"]\S*)$/;
 var BARE_DEP_NAME_RE = /^[A-Za-z0-9._-]+$/;
-var ENTRY_KEY_SPECIAL_RE = /[\s:",#?*&!|>'`[\]{}]/;
+var ENTRY_KEY_WRAP_RE = /[:\s\\",[\]]/;
+var ENTRY_KEY_LEADING_ALPHA_RE = /^[a-zA-Z]/;
 var BERRY_HEADER_RE = /^__metadata:\s*(?:\r?\n|$)/m;
 var sidecarByGraph7 = /* @__PURE__ */ new WeakMap();
 function stripBom(input) {
@@ -7442,7 +7431,40 @@ function check15(input) {
   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;
+  if (lines[0] === HEADER_LINE_1 && lines[1] === HEADER_LINE_2) return true;
+  return hasClassicStructuralBody(normalized, lines);
+}
+function hasClassicStructuralBody(normalized, lines) {
+  if (BERRY_HEADER_RE.test(normalized)) return false;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i] ?? "";
+    if (line.length === 0 || line[0] === " " || line[0] === "	" || line[0] === "#") continue;
+    if (!line.endsWith(":")) continue;
+    if (!isClassicEntryKeyLine(line.slice(0, -1))) continue;
+    for (let j = i + 1; j < lines.length; j++) {
+      const body = lines[j] ?? "";
+      if (body.length === 0) return false;
+      if (body.startsWith("  #")) continue;
+      return CLASSIC_VERSION_FIELD_RE.test(body);
+    }
+    return false;
+  }
+  return false;
+}
+var CLASSIC_VERSION_FIELD_RE = /^ {2}version "(?:\\.|[^"])*"\s*$/;
+function isClassicEntryKeyLine(key) {
+  let specs;
+  try {
+    specs = splitEntryKey(parseEntryKeyToken(key));
+  } catch {
+    return false;
+  }
+  if (specs.length === 0) return false;
+  for (const spec of specs) {
+    const idx = spec.indexOf("@", spec.startsWith("@") ? 1 : 0);
+    if (idx <= 0 || idx === spec.length - 1) return false;
+  }
+  return true;
 }
 function parse17(input, options = {}) {
   const normalized = stripBom(normalizeLineEndings3(input));
@@ -7465,15 +7487,15 @@ function parse17(input, options = {}) {
     if (entry.version === void 0) {
       throw parseFailed2(`entry ${JSON.stringify(entry.key)} missing version`);
     }
-    const specsByName = /* @__PURE__ */ new Map();
+    const specsByResolvedName = /* @__PURE__ */ new Map();
     for (const spec of specs) {
-      const part = parseSpec2(spec);
-      const current = specsByName.get(part.name);
-      if (current === void 0) specsByName.set(part.name, [part.spec]);
-      else current.push(part.spec);
+      const identity = specIdentity(parseSpec2(spec));
+      const current = specsByResolvedName.get(identity.resolvedName);
+      if (current === void 0) specsByResolvedName.set(identity.resolvedName, [identity.descriptorKey]);
+      else current.push(identity.descriptorKey);
     }
-    for (const [name, rawRanges] of specsByName) {
-      const ranges = Array.from(new Set(rawRanges)).sort(cmpUtf16);
+    for (const [name, rawDescriptors] of specsByResolvedName) {
+      const descriptors = Array.from(new Set(rawDescriptors)).sort(cmpUtf16);
       const id = `${name}@${entry.version}`;
       const prior = seenEntries.get(id);
       if (prior !== void 0) {
@@ -7484,8 +7506,7 @@ function parse17(input, options = {}) {
           });
         }
         const merged = sidecar.get(id) ?? [];
-        for (const range of ranges) {
-          const spec = `${name}@${range}`;
+        for (const spec of descriptors) {
           if (!merged.includes(spec)) merged.push(spec);
           specIndex.set(spec, id);
         }
@@ -7527,14 +7548,14 @@ function parse17(input, options = {}) {
       } else if (canonicalResolution !== void 0) {
         builder.setTarball({ name, version: entry.version }, { resolution: canonicalResolution });
       }
-      sidecar.set(id, ranges.map((range) => `${name}@${range}`));
+      sidecar.set(id, descriptors.slice());
       if (entry.extras !== void 0 && entry.extras.length > 0) {
         entryExtras.set(id, entry.extras);
         for (const raw of entry.extras) unknownFields.add(raw.split(" ", 1)[0] ?? raw);
       }
       entryNodes.push({ node, entry });
-      for (const range of ranges) {
-        specIndex.set(`${name}@${range}`, id);
+      for (const spec of descriptors) {
+        specIndex.set(spec, id);
       }
     }
   }
@@ -7614,7 +7635,7 @@ function stringify16(graph, options = {}) {
     }
     const integrity = payload?.integrity && emitSri(payload.integrity);
     if (integrity !== void 0 && integrity !== "") {
-      lines.push(`  integrity ${integrity}`);
+      lines.push(`  integrity ${integrity.includes(" ") ? `"${integrity}"` : integrity}`);
     }
     const extras = emitSidecar?.entryExtras?.get(node.id);
     if (extras !== void 0) {
@@ -7733,7 +7754,8 @@ function parseEntries(input) {
       continue;
     }
     if (line.startsWith("  integrity ")) {
-      current.integrity = line.slice("  integrity ".length);
+      const value = line.slice("  integrity ".length);
+      current.integrity = value.startsWith('"') ? parseQuotedToken(value) : value;
       continue;
     }
     current.extras ??= [];
@@ -7848,6 +7870,19 @@ function parseSpec2(spec) {
     spec: spec.slice(idx + 1)
   };
 }
+function specIdentity(part) {
+  const descriptorKey = `${part.name}@${part.spec}`;
+  if (part.spec.startsWith("npm:")) {
+    const target = part.spec.slice("npm:".length);
+    const at = target.indexOf("@", target.startsWith("@") ? 1 : 0);
+    const targetName = at > 0 ? target.slice(0, at) : void 0;
+    if (targetName !== void 0 && targetName.length > 0 && targetName !== part.name) {
+      return { resolvedName: targetName, aliasName: part.name, descriptorKey };
+    }
+    return { resolvedName: part.name, descriptorKey };
+  }
+  return { resolvedName: part.name, descriptorKey };
+}
 function isClassicRegistryRange(range) {
   if (range.startsWith("npm:")) return true;
   const colonIdx = range.indexOf(":");
@@ -7897,11 +7932,14 @@ function addEdgesFromMap(builder, diagnostics, srcId, deps, kind, specIndex, lad
       }
       continue;
     }
-    builder.addEdge(srcId, dstId, kind, { range });
+    const dstName = nameOf(dstId);
+    const attrs = { range };
+    if (name !== dstName) attrs.alias = name;
+    builder.addEdge(srcId, dstId, kind, attrs);
   }
 }
 function entrySpecsOfNode(graph, node) {
-  const liveSpecs = Array.from(graph.in(node.id)).filter((edge) => edge.kind === "dep" || edge.kind === "optional").map((edge) => edge.attrs?.range).filter((range) => range !== void 0).map((range) => `${node.name}@${range}`);
+  const liveSpecs = Array.from(graph.in(node.id)).filter((edge) => edge.kind === "dep" || edge.kind === "optional").filter((edge) => edge.attrs?.range !== void 0).map((edge) => `${edge.attrs.alias ?? node.name}@${edge.attrs.range}`);
   if (liveSpecs.length > 0) {
     return Array.from(new Set(liveSpecs)).sort(cmpUtf16);
   }
@@ -7912,14 +7950,10 @@ function entrySpecsOfNode(graph, node) {
   return [`${node.name}@${node.version}`];
 }
 function stringifyEntryKey(specs) {
-  const key = specs.join(", ");
-  return mustQuoteEntryKey(specs) ? `"${escapeQuoted2(key)}"` : key;
+  return specs.map((spec) => mustQuoteSpec(spec) ? `"${escapeQuoted2(spec)}"` : spec).join(", ");
 }
-function mustQuoteEntryKey(specs) {
-  if (specs.length > 1) return true;
-  return specs.some(
-    (spec) => spec.startsWith("@") || spec.includes("||") || ENTRY_KEY_SPECIAL_RE.test(spec) || hasNonAscii(spec)
-  );
+function mustQuoteSpec(spec) {
+  return spec.startsWith("true") || spec.startsWith("false") || ENTRY_KEY_WRAP_RE.test(spec) || !ENTRY_KEY_LEADING_ALPHA_RE.test(spec);
 }
 function quoteDepName(name) {
   return name.startsWith("@") || !BARE_DEP_NAME_RE.test(name) ? `"${escapeQuoted2(name)}"` : name;
@@ -7927,12 +7961,6 @@ function quoteDepName(name) {
 function escapeQuoted2(value) {
   return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
-function hasNonAscii(value) {
-  for (let i = 0; i < value.length; i++) {
-    if (value.charCodeAt(i) > 127) return true;
-  }
-  return false;
-}
 function collectDependencyBlockEntries(graph, srcId, emitDiagnostic) {
   return collectBlockEntries(
     graph,
@@ -7966,7 +7994,7 @@ function collectBlockEntries(graph, edges, emitDiagnostic) {
         return [dst.name, resolved];
       }
     }
-    return [dst.name, edge.attrs.range];
+    return [edge.attrs.alias ?? dst.name, edge.attrs.range];
   }).filter((entry) => entry !== void 0).sort((a, b) => cmpUtf16(a[0], b[0]));
 }
 function warnDroppedPeerEdges(graph, srcId, warned, emitDiagnostic) {

package/package.json

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