@vltpkg/graph 1.3.4 → 1.3.5

package/dist/ideal/build.js

@@ -62,17 +62,24 @@ export const build = async (options) => {
         });
     }
     // Start resolving the importers' dependencies server-side, one request
-    // to the default registry. manifest() picks the answers up as they land.
-    prefetchResolve(graph, packageInfo, options);
-    const res = await buildIdealFromStartingGraph({
-        ...options,
-        scurry,
-        add: getMap(options.add),
-        graph,
-        packageInfo,
-        remove: getMap(options.remove),
-        actual: options.actual,
-    });
+    // to the default registry. manifest() picks the answers up as they land,
+    // and nothing reads them once the ideal graph is built.
+    const releaseResolve = prefetchResolve(graph, packageInfo, options);
+    let res;
+    try {
+        res = await buildIdealFromStartingGraph({
+            ...options,
+            scurry,
+            add: getMap(options.add),
+            graph,
+            packageInfo,
+            remove: getMap(options.remove),
+            actual: options.actual,
+        });
+    }
+    finally {
+        releaseResolve();
+    }
     done();
     // when adding or removing a new dependency from a file dep,
     // validate the receiver node was present in the graph

package/dist/ideal/prefetch-resolve.d.ts

@@ -2,9 +2,14 @@ import type { PackageInfoClient } from '@vltpkg/package-info';
 import type { SpecOptions } from '@vltpkg/spec';
 import type { Graph } from '../graph.ts';
 /**
- * Start a server-side resolve for the importers' dependencies, one request
- * to the default registry, without waiting for it: the request overlaps
- * whatever the build does before it asks for its first manifest.
+ * Start a server-side resolve for the importers' dependencies the starting
+ * graph does not already satisfy, one request to the default registry,
+ * without waiting for it: the request overlaps whatever the build does
+ * before it asks for its first manifest. A graph loaded whole from a
+ * lockfile or node_modules sends nothing.
+ *
+ * Returns the function that releases the request, for the build to call
+ * once it has placed its last node.
  *
  * Fails soft in every direction: a registry that does not serve the
  * endpoint, a request that errors, and a spec it does not resolve all
@@ -12,4 +17,4 @@ import type { Graph } from '../graph.ts';
  */
 export declare const prefetchResolve: (graph: Graph, packageInfo: PackageInfoClient, options: SpecOptions & {
     modifiers?: unknown;
-}) => number;
+}) => (() => void);

package/dist/ideal/prefetch-resolve.js

@@ -1,8 +1,14 @@
 import { detectLibc } from '@vltpkg/pick-manifest';
+const nothing = () => { };
 /**
- * Start a server-side resolve for the importers' dependencies, one request
- * to the default registry, without waiting for it: the request overlaps
- * whatever the build does before it asks for its first manifest.
+ * Start a server-side resolve for the importers' dependencies the starting
+ * graph does not already satisfy, one request to the default registry,
+ * without waiting for it: the request overlaps whatever the build does
+ * before it asks for its first manifest. A graph loaded whole from a
+ * lockfile or node_modules sends nothing.
+ *
+ * Returns the function that releases the request, for the build to call
+ * once it has placed its last node.
  *
  * Fails soft in every direction: a registry that does not serve the
  * endpoint, a request that errors, and a spec it does not resolve all
@@ -12,10 +18,10 @@ export const prefetchResolve = (graph, packageInfo, options) => {
     // a modifier can swap any spec mid-graph, taking the server's whole
     // closure off the client's real one; those installs resolve locally
     if (options.modifiers)
-        return 0;
+        return nothing;
     const registry = options.registry;
     if (!registry)
-        return 0;
+        return nothing;
     const scopes = Object.keys(options['scoped-registries'] ?? {});
     // a name under a scoped registry is that registry's; it is not sent to
     // this one at all, and `stop` keeps the server from walking into it
@@ -40,6 +46,11 @@ export const prefetchResolve = (graph, packageInfo, options) => {
                 // protocols, workspace and file specs are the client's to resolve
                 if (spec.includes(':') || scoped(name))
                     continue;
+                // an edge the starting graph already resolves to a node that
+                // satisfies this very spec is settled; the build keeps it as is
+                const edge = importer.edgesOut.get(name);
+                if (edge?.to && edge.spec.bareSpec === spec && edge.valid())
+                    continue;
                 const key = `${name}@${spec}`;
                 if (seen.has(key))
                     continue;
@@ -49,7 +60,7 @@ export const prefetchResolve = (graph, packageInfo, options) => {
         }
     }
     if (!roots.length)
-        return 0;
+        return nothing;
     const have = [];
     for (const node of graph.nodes.values()) {
         if (node.manifest &&
@@ -59,7 +70,7 @@ export const prefetchResolve = (graph, packageInfo, options) => {
             have.push(`${node.name}@${node.version}`);
         }
     }
-    packageInfo.prefetchResolve(registry, {
+    return packageInfo.prefetchResolve(registry, {
         roots,
         have,
         ...(scopes.length ? { stop: { scopes } } : {}),
@@ -71,5 +82,4 @@ export const prefetchResolve = (graph, packageInfo, options) => {
             libc: detectLibc(),
         },
     });
-    return roots.length;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vltpkg/graph",
   "description": "A library that helps understanding & expressing what happens on an install",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vltpkg/vltpkg.git",
@@ -13,26 +13,26 @@
     "url": "http://vlt.sh"
   },
   "dependencies": {
-    "@vltpkg/cmd-shim": "1.3.4",
-    "@vltpkg/dep-id": "1.3.4",
-    "@vltpkg/dss-breadcrumb": "1.3.4",
-    "@vltpkg/error-cause": "1.3.4",
-    "@vltpkg/fast-split": "1.3.4",
-    "@vltpkg/graph-run": "1.3.4",
-    "@vltpkg/init": "1.3.4",
-    "@vltpkg/output": "1.3.4",
-    "@vltpkg/package-info": "1.3.4",
-    "@vltpkg/package-json": "1.3.4",
-    "@vltpkg/pick-manifest": "1.3.4",
-    "@vltpkg/query": "1.3.4",
-    "@vltpkg/rollback-remove": "1.3.4",
-    "@vltpkg/run": "1.3.4",
-    "@vltpkg/satisfies": "1.3.4",
-    "@vltpkg/security-archive": "1.3.4",
-    "@vltpkg/spec": "1.3.4",
-    "@vltpkg/types": "1.3.4",
-    "@vltpkg/vlt-json": "1.3.4",
-    "@vltpkg/workspaces": "1.3.4",
+    "@vltpkg/cmd-shim": "1.3.5",
+    "@vltpkg/dep-id": "1.3.5",
+    "@vltpkg/dss-breadcrumb": "1.3.5",
+    "@vltpkg/error-cause": "1.3.5",
+    "@vltpkg/fast-split": "1.3.5",
+    "@vltpkg/graph-run": "1.3.5",
+    "@vltpkg/init": "1.3.5",
+    "@vltpkg/output": "1.3.5",
+    "@vltpkg/package-info": "1.3.5",
+    "@vltpkg/package-json": "1.3.5",
+    "@vltpkg/pick-manifest": "1.3.5",
+    "@vltpkg/query": "1.3.5",
+    "@vltpkg/rollback-remove": "1.3.5",
+    "@vltpkg/run": "1.3.5",
+    "@vltpkg/satisfies": "1.3.5",
+    "@vltpkg/security-archive": "1.3.5",
+    "@vltpkg/spec": "1.3.5",
+    "@vltpkg/types": "1.3.5",
+    "@vltpkg/vlt-json": "1.3.5",
+    "@vltpkg/workspaces": "1.3.5",
     "path-scurry": "^2.0.1",
     "promise-call-limit": "^3.0.2"
   },