@antongolub/lockfile 0.0.0-snapshot.40 → 0.0.0-snapshot.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antongolub/lockfile",
-  "version": "0.0.0-snapshot.40",
+  "version": "0.0.0-snapshot.41",
   "publishConfig": {
     "access": "public"
   },

package/target/cjs/index.cjs

@@ -187,6 +187,12 @@ var debug = Object.assign((...chunks) => {
     });
   }
 });
+var mergeDeps = (...deps) => {
+  const _deps = deps.filter(Boolean);
+  if (!_deps.length)
+    return;
+  return Object.assign({}, ..._deps);
+};
 var unique = (arr) => [...new Set(arr)];
 
 // src/main/ts/analyze.ts
@@ -697,26 +703,35 @@ var preparse = (value) => {
   }, "").join("\n");
   return (0, import_js_yaml.load)(_value);
 };
-var parse3 = (value, pkg) => {
-  const manifest = JSON.parse(pkg);
+var parse3 = (value, ...pkgs) => {
+  const manifest = JSON.parse(pkgs[0]);
+  const manifests = Object.fromEntries(pkgs.map((p) => {
+    const manifest2 = JSON.parse(p);
+    return [manifest2.name, manifest2];
+  }));
   const raw = preparse(value);
   const snapshot = {};
   Object.entries(raw).forEach((value2) => {
+    var _a, _b;
     const [_key, _entry] = value2;
     const { version: version6, integrity, dependencies, optionalDependencies, resolved } = _entry;
     const hashes = parseIntegrity(integrity);
     const source = parseResolution3(resolved);
     const chunks = _key.split(", ");
     const names = unique(chunks.map((c) => c.slice(0, c.indexOf("@", 1))));
+    const isLocal = version6 === "0.0.0-use.local";
     for (const name of names) {
       const ranges = chunks.filter((c) => c.startsWith(`${name}@`)).map((r) => r.slice(r.indexOf("@", 1) + 1)).sort();
       const key = `${name}@${version6}`;
+      const _dependencies = isLocal && ((_a = manifests[name]) == null ? void 0 : _a.dependencies) || dependencies;
+      const _devDependencies = isLocal && ((_b = manifests[name]) == null ? void 0 : _b.devDependencies);
       snapshot[key] = {
         name,
         version: version6,
         ranges,
         hashes,
-        dependencies,
+        dependencies: _dependencies,
+        devDependencies: _devDependencies,
         optionalDependencies,
         source
       };
@@ -744,7 +759,7 @@ var preformat4 = (idx) => {
   const lf = {};
   const rangemap = {};
   Object.values(snapshot).forEach((entry) => {
-    const { name, version: version6, ranges, hashes, dependencies, optionalDependencies, source } = entry;
+    const { name, version: version6, ranges, hashes, devDependencies, dependencies, optionalDependencies, source } = entry;
     const resolved = formatResolution3(source);
     const alias = rangemap[resolved];
     const integrity = Object.entries(hashes).map(([k, v]) => `${k}-${v}`).join(" ");
@@ -755,12 +770,15 @@ var preformat4 = (idx) => {
       delete lf[alias.key];
     }
     const key = keys.join(", ");
+    const _dependencies = mergeDeps(dependencies, devDependencies);
+    if (_dependencies)
+      sortObject(_dependencies);
     rangemap[resolved] = { keys, key, name };
     lf[key] = {
       version: version6,
       resolved,
       integrity,
-      dependencies,
+      dependencies: _dependencies,
       optionalDependencies
     };
   });
@@ -822,16 +840,24 @@ var version5 = "yarn-berry";
 var check5 = (value) => value.includes(`
 __metadata:
   version:`);
-var parse4 = (lockfile, pkg) => {
-  const manifest = JSON.parse(pkg);
+var parse4 = (lockfile, ...pkgs) => {
+  const manifest = JSON.parse(pkgs[0]);
+  const manifests = Object.fromEntries(pkgs.map((p) => {
+    const manifest2 = JSON.parse(p);
+    return [manifest2.name, manifest2];
+  }));
   const snapshot = {};
   const raw = (0, import_js_yaml2.load)(lockfile);
   delete raw.__metadata;
   Object.entries(raw).forEach((value) => {
+    var _a, _b;
     const [_key, _entry] = value;
     const { version: version6, checksum, dependencies, dependenciesMeta, optionalDependencies, peerDependencies, peerDependenciesMeta, resolution, bin, conditions } = _entry;
     const chunks = _key.split(", ");
     const names = unique(chunks.map((c) => c.slice(0, c.indexOf("@", 1))));
+    const isLocal = version6 === "0.0.0-use.local";
+    const hashes = parseIntegrity(checksum);
+    const source = parseResolution4(resolution);
     for (const name of names) {
       const key = `${name}@${version6}`;
       if (_key.includes("#")) {
@@ -843,15 +869,16 @@ var parse4 = (lockfile, pkg) => {
         return;
       }
       const ranges = chunks.filter((c) => c.startsWith(`${name}@`)).map((r) => r.slice(r.indexOf("@", 1) + 1)).map(normalizeReference);
-      const hashes = parseIntegrity(checksum);
-      const source = parseResolution4(resolution);
+      const _dependencies = normalizeDeps(isLocal && ((_a = manifests[name]) == null ? void 0 : _a.dependencies) || dependencies);
+      const _devDependencies = normalizeDeps(isLocal && ((_b = manifests[name]) == null ? void 0 : _b.devDependencies));
       snapshot[key] = {
         name,
         version: version6,
         ranges,
         hashes,
         source,
-        dependencies: normalizeDeps(dependencies),
+        dependencies: _dependencies,
+        devDependencies: _devDependencies,
         dependenciesMeta,
         optionalDependencies: normalizeDeps(optionalDependencies),
         peerDependencies: normalizeDeps(peerDependencies),
@@ -880,12 +907,13 @@ var parse4 = (lockfile, pkg) => {
   debug.json("yarn-berry-snapshot.json", snapshot);
   return snapshot;
 };
-var preformat5 = (idx) => {
+var preformat5 = (idx, { __metadata } = {}) => {
   const { snapshot } = idx;
   const lf = {};
   const rangemap = {};
+  const isYarn4 = (__metadata == null ? void 0 : __metadata.version) >= 7;
   Object.values(snapshot).forEach((entry) => {
-    const { name, version: version6, ranges, hashes: { checksum }, dependencies, dependenciesMeta, optionalDependencies, peerDependencies, peerDependenciesMeta, source, patch, bin, conditions } = entry;
+    const { name, version: version6, ranges, hashes: { checksum }, devDependencies, dependencies, dependenciesMeta, optionalDependencies, peerDependencies, peerDependenciesMeta, source, patch, bin, conditions } = entry;
     const resolution = formatResolution4(source);
     const alias = rangemap[resolution];
     const isLocal = version6 === "0.0.0-use.local";
@@ -898,11 +926,14 @@ var preformat5 = (idx) => {
       delete lf[alias.key];
     }
     const key = keys.join(", ");
+    const _dependencies = mergeDeps(dependencies, devDependencies);
+    if (_dependencies)
+      sortObject(_dependencies);
     rangemap[resolution] = { keys, key, name };
     lf[key] = {
       version: version6,
       resolution,
-      dependencies: formatDeps(dependencies),
+      dependencies: formatDeps(_dependencies, { semverAsNpm: isYarn4, isLocal: !isLocal }),
       optionalDependencies: formatDeps(optionalDependencies),
       peerDependencies: formatDeps(peerDependencies),
       dependenciesMeta,
@@ -929,7 +960,7 @@ var format5 = (snapshot, { __metadata = {
 } } = {}) => {
   const lines = (0, import_js_yaml2.dump)(__spreadValues({
     __metadata
-  }, preformat5({ snapshot })), {
+  }, preformat5({ snapshot }, { __metadata })), {
     quotingType: '"',
     flowLevel: -1,
     lineWidth: -1,

package/target/dts/interface.d.ts

@@ -83,7 +83,7 @@ export type IFormatOpts = {
 };
 export type IFormat = (snapshot: TSnapshot, opts?: IFormatOpts) => string;
 export type IFormatReference = (value: string, opts: any) => string | number;
-export type IPreformat<T> = (idx: TSnapshotIndex) => T;
+export type IPreformat<T> = (idx: TSnapshotIndex, opts?: IFormatOpts) => T;
 export type ICheck = (input: string) => boolean;
 export type IParseResolution = (input: string) => TResolution;
 export type IFormatResolution = (resolution: TResolution) => string;

package/target/dts/util.d.ts

@@ -1,3 +1,4 @@
+import { TDependencies } from "./interface";
 export declare const sortObject: <T extends Record<string, any>>(unordered: T, predicate?: (a: [string, any], b: [string, any]) => number) => T;
 export declare const flushObject: (obj: Record<string, any>) => Record<string, any>;
 export declare const loadContents: (value: string) => Promise<string>;
@@ -6,4 +7,5 @@ export declare const debug: ((...chunks: any[]) => void) & {
     json(data: any, name?: any, base?: string): Promise<void>;
     tempy(): Promise<string>;
 };
+export declare const mergeDeps: (...deps: (TDependencies | undefined)[]) => TDependencies | undefined;
 export declare const unique: (arr: string[]) => string[];

package/target/esm/index.mjs

@@ -105,6 +105,12 @@ var debug = Object.assign((...chunks) => {
     return temp;
   }
 });
+var mergeDeps = (...deps) => {
+  const _deps = deps.filter(Boolean);
+  if (!_deps.length)
+    return;
+  return Object.assign({}, ..._deps);
+};
 var unique = (arr) => [...new Set(arr)];
 
 // src/main/ts/analyze.ts
@@ -612,8 +618,12 @@ var preparse = (value) => {
   }, "").join("\n");
   return load(_value);
 };
-var parse3 = (value, pkg) => {
-  const manifest = JSON.parse(pkg);
+var parse3 = (value, ...pkgs) => {
+  const manifest = JSON.parse(pkgs[0]);
+  const manifests = Object.fromEntries(pkgs.map((p) => {
+    const manifest2 = JSON.parse(p);
+    return [manifest2.name, manifest2];
+  }));
   const raw = preparse(value);
   const snapshot = {};
   Object.entries(raw).forEach((value2) => {
@@ -623,15 +633,19 @@ var parse3 = (value, pkg) => {
     const source = parseResolution3(resolved);
     const chunks = _key.split(", ");
     const names = unique(chunks.map((c) => c.slice(0, c.indexOf("@", 1))));
+    const isLocal = version6 === "0.0.0-use.local";
     for (const name of names) {
       const ranges = chunks.filter((c) => c.startsWith(`${name}@`)).map((r) => r.slice(r.indexOf("@", 1) + 1)).sort();
       const key = `${name}@${version6}`;
+      const _dependencies = isLocal && manifests[name]?.dependencies || dependencies;
+      const _devDependencies = isLocal && manifests[name]?.devDependencies;
       snapshot[key] = {
         name,
         version: version6,
         ranges,
         hashes,
-        dependencies,
+        dependencies: _dependencies,
+        devDependencies: _devDependencies,
         optionalDependencies,
         source
       };
@@ -659,7 +673,7 @@ var preformat4 = (idx) => {
   const lf = {};
   const rangemap = {};
   Object.values(snapshot).forEach((entry) => {
-    const { name, version: version6, ranges, hashes, dependencies, optionalDependencies, source } = entry;
+    const { name, version: version6, ranges, hashes, devDependencies, dependencies, optionalDependencies, source } = entry;
     const resolved = formatResolution3(source);
     const alias = rangemap[resolved];
     const integrity = Object.entries(hashes).map(([k, v]) => `${k}-${v}`).join(" ");
@@ -670,12 +684,15 @@ var preformat4 = (idx) => {
       delete lf[alias.key];
     }
     const key = keys.join(", ");
+    const _dependencies = mergeDeps(dependencies, devDependencies);
+    if (_dependencies)
+      sortObject(_dependencies);
     rangemap[resolved] = { keys, key, name };
     lf[key] = {
       version: version6,
       resolved,
       integrity,
-      dependencies,
+      dependencies: _dependencies,
       optionalDependencies
     };
   });
@@ -737,8 +754,12 @@ var version5 = "yarn-berry";
 var check5 = (value) => value.includes(`
 __metadata:
   version:`);
-var parse4 = (lockfile, pkg) => {
-  const manifest = JSON.parse(pkg);
+var parse4 = (lockfile, ...pkgs) => {
+  const manifest = JSON.parse(pkgs[0]);
+  const manifests = Object.fromEntries(pkgs.map((p) => {
+    const manifest2 = JSON.parse(p);
+    return [manifest2.name, manifest2];
+  }));
   const snapshot = {};
   const raw = load2(lockfile);
   delete raw.__metadata;
@@ -747,6 +768,9 @@ var parse4 = (lockfile, pkg) => {
     const { version: version6, checksum, dependencies, dependenciesMeta, optionalDependencies, peerDependencies, peerDependenciesMeta, resolution, bin, conditions } = _entry;
     const chunks = _key.split(", ");
     const names = unique(chunks.map((c) => c.slice(0, c.indexOf("@", 1))));
+    const isLocal = version6 === "0.0.0-use.local";
+    const hashes = parseIntegrity(checksum);
+    const source = parseResolution4(resolution);
     for (const name of names) {
       const key = `${name}@${version6}`;
       if (_key.includes("#")) {
@@ -758,15 +782,16 @@ var parse4 = (lockfile, pkg) => {
         return;
       }
       const ranges = chunks.filter((c) => c.startsWith(`${name}@`)).map((r) => r.slice(r.indexOf("@", 1) + 1)).map(normalizeReference);
-      const hashes = parseIntegrity(checksum);
-      const source = parseResolution4(resolution);
+      const _dependencies = normalizeDeps(isLocal && manifests[name]?.dependencies || dependencies);
+      const _devDependencies = normalizeDeps(isLocal && manifests[name]?.devDependencies);
       snapshot[key] = {
         name,
         version: version6,
         ranges,
         hashes,
         source,
-        dependencies: normalizeDeps(dependencies),
+        dependencies: _dependencies,
+        devDependencies: _devDependencies,
         dependenciesMeta,
         optionalDependencies: normalizeDeps(optionalDependencies),
         peerDependencies: normalizeDeps(peerDependencies),
@@ -795,12 +820,13 @@ var parse4 = (lockfile, pkg) => {
   debug.json("yarn-berry-snapshot.json", snapshot);
   return snapshot;
 };
-var preformat5 = (idx) => {
+var preformat5 = (idx, { __metadata } = {}) => {
   const { snapshot } = idx;
   const lf = {};
   const rangemap = {};
+  const isYarn4 = __metadata?.version >= 7;
   Object.values(snapshot).forEach((entry) => {
-    const { name, version: version6, ranges, hashes: { checksum }, dependencies, dependenciesMeta, optionalDependencies, peerDependencies, peerDependenciesMeta, source, patch, bin, conditions } = entry;
+    const { name, version: version6, ranges, hashes: { checksum }, devDependencies, dependencies, dependenciesMeta, optionalDependencies, peerDependencies, peerDependenciesMeta, source, patch, bin, conditions } = entry;
     const resolution = formatResolution4(source);
     const alias = rangemap[resolution];
     const isLocal = version6 === "0.0.0-use.local";
@@ -813,11 +839,14 @@ var preformat5 = (idx) => {
       delete lf[alias.key];
     }
     const key = keys.join(", ");
+    const _dependencies = mergeDeps(dependencies, devDependencies);
+    if (_dependencies)
+      sortObject(_dependencies);
     rangemap[resolution] = { keys, key, name };
     lf[key] = {
       version: version6,
       resolution,
-      dependencies: formatDeps(dependencies),
+      dependencies: formatDeps(_dependencies, { semverAsNpm: isYarn4, isLocal: !isLocal }),
       optionalDependencies: formatDeps(optionalDependencies),
       peerDependencies: formatDeps(peerDependencies),
       dependenciesMeta,
@@ -845,7 +874,7 @@ var format5 = (snapshot, { __metadata = {
 } } = {}) => {
   const lines = dump2({
     __metadata,
-    ...preformat5({ snapshot })
+    ...preformat5({ snapshot }, { __metadata })
   }, {
     quotingType: '"',
     flowLevel: -1,