@vltpkg/graph 1.0.4 → 1.0.6

package/dist/actual/load.d.ts

@@ -102,11 +102,17 @@ export declare const asStoreConfigObject: (obj: unknown) => StoreConfigObject;
  */
 export declare const getPathBasedId: (spec: Spec, path: Path) => DepID | undefined;
 /**
- * Verify that all importer node_modules directories exist on disk.
+ * Verify that importer node_modules directories exist on disk.
  * The hidden lockfile may report deps as installed even when a
  * workspace's node_modules has been manually deleted. Throws if
- * any importer node_modules directory is missing, causing the
- * caller to fall through to filesystem-based graph loading.
+ * an importer with at least one resolved edgeOut is missing
+ * node_modules, causing the caller to fall through to
+ * filesystem-based graph loading.
+ *
+ * Importers with no resolved edgesOut (dep-less / types-only
+ * workspaces) never get a node_modules from reify, so they are
+ * skipped — requiring one would discard the hidden lockfile on
+ * every install.
  */
 export declare const verifyImporterNodeModules: (graph: Graph, projectRoot: string) => void;
 /**

package/dist/actual/load.js

@@ -252,14 +252,29 @@ const parseDir = (options, scurry, packageJson, depsFound, graph, fromNode, curr
     }
 };
 /**
- * Verify that all importer node_modules directories exist on disk.
+ * Verify that importer node_modules directories exist on disk.
  * The hidden lockfile may report deps as installed even when a
  * workspace's node_modules has been manually deleted. Throws if
- * any importer node_modules directory is missing, causing the
- * caller to fall through to filesystem-based graph loading.
+ * an importer with at least one resolved edgeOut is missing
+ * node_modules, causing the caller to fall through to
+ * filesystem-based graph loading.
+ *
+ * Importers with no resolved edgesOut (dep-less / types-only
+ * workspaces) never get a node_modules from reify, so they are
+ * skipped — requiring one would discard the hidden lockfile on
+ * every install.
  */
 export const verifyImporterNodeModules = (graph, projectRoot) => {
     for (const importer of graph.importers) {
+        let linked = false;
+        for (const { to } of importer.edgesOut.values()) {
+            if (to) {
+                linked = true;
+                break;
+            }
+        }
+        if (!linked)
+            continue;
         const nm = resolve(projectRoot, importer.location, 'node_modules');
         if (!existsSync(nm)) {
             throw new Error(`Missing node_modules for importer: ${importer.location}`);

package/dist/diff.d.ts

@@ -42,7 +42,7 @@ export declare class Diff {
         delete: Set<Edge>;
     };
     /**
-     * True if the diff only contains optional nodes (computed during construction)
+     * True if every added node/edge is confined to an optional subtree
      */
     optionalOnly: boolean;
     get [Symbol.toStringTag](): string;

package/dist/diff.js

@@ -43,7 +43,7 @@ export class Diff {
         delete: new Set(),
     };
     /**
-     * True if the diff only contains optional nodes (computed during construction)
+     * True if every added node/edge is confined to an optional subtree
      */
     optionalOnly = true;
     get [Symbol.toStringTag]() {
@@ -82,7 +82,9 @@ export class Diff {
                 this.edges.delete.add(fromEdge);
             if (edge.to) {
                 this.edges.add.add(edge);
-                if (!edge.optional) {
+                // edge.optional is the edge type only; a non-optional edge whose
+                // source is optional is still confined to an optional subtree
+                if (!edge.optional && !edge.from.optional) {
                     this.optionalOnly = false;
                 }
             }

package/dist/ideal/append-nodes.js

@@ -361,7 +361,15 @@ const processPlacementTasks = async (graph, options, placementTasks, add, modifi
             []
             : bundleDeps);
         // setup next level to process all child dependencies in the manifest
-        const nextDeps = [];
+        // Use a Map keyed by name so that later dependency types override
+        // earlier ones. This matches npm semantics where entries in
+        // `optionalDependencies` override entries of the same name in
+        // `dependencies`. Without this, a package listed in both
+        // (e.g. esbuild@0.18.20, typescript@7.0.2) would first be placed
+        // as a regular (non-optional) dep, and the later optional entry
+        // could not recover the `optional` flag due to the `&&=` operator
+        // in `placePackage`.
+        const nextDepsMap = new Map();
         // traverse actual dependency declarations in the manifest
         // creating dependency entries for them
         for (const depTypeName of longDependencyTypes) {
@@ -386,11 +394,12 @@ const processPlacementTasks = async (graph, options, placementTasks, add, modifi
                         nextPeerDeps.set(name, dep);
                     }
                     else {
-                        nextDeps.push(dep);
+                        nextDepsMap.set(name, dep);
                     }
                 }
             }
         }
+        const nextDeps = [...nextDepsMap.values()];
         // Inject transient dependencies for non-importer nodes (nested folders)
         // These are deps that were added from a nested folder context using
         // relative file: specs that should resolve relative to that folder

package/dist/reify/index.js

@@ -66,16 +66,19 @@ export const reify = async (options) => {
     const diff = new Diff(actual, graph);
     const noModifiedDependencies = !options.add?.modifiedDependencies &&
         !options.remove?.modifiedDependencies;
+    // Skip optional-only diffs only after a prior reify wrote lockfiles.
+    // Otherwise a first install of an optional-only tree would never extract.
+    const hasLockfiles = !!scurry.lstatSync('vlt-lock.json') &&
+        !!scurry.lstatSync('node_modules/.vlt-lock.json');
     const skipOptionalOnly = noModifiedDependencies && diff.optionalOnly;
-    const skippable = skipOptionalOnly && !options.update;
+    const skippable = skipOptionalOnly && !options.update && hasLockfiles;
     const res = { diff };
     if (!diff.hasChanges() || skippable) {
         // Even when there are no changes to reify, ensure lockfiles
         // exist on disk. This handles the case where a project has no
         // dependencies (or only workspace importers) but still needs
         // lockfiles written on the first install.
-        if (!scurry.lstatSync('vlt-lock.json') ||
-            !scurry.lstatSync('node_modules/.vlt-lock.json')) {
+        if (!hasLockfiles) {
             saveHidden(options);
             const lfData = lockfileData(options);
             saveData(lfData, scurry.resolve('vlt-lock.json'), false);

package/package.json

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