@vltpkg/graph 1.3.1 → 1.3.3

package/dist/ideal/append-nodes.js

@@ -349,7 +349,10 @@ const fetchManifestsForDeps = async (packageInfo, graph, fromNode, deps, scurry,
             // this is the entry point to fetch calls to retrieve manifests
             // from the build ideal graph point of view
             : packageInfo
-                .manifest(spec, { from })
+                // an explicit tag add revalidates before use
+                .manifest(spec, isExplicit ?
+                { from }
+                : { from, backgroundRevalidate: true })
                 .then(manifest => manifest)
                 .catch((er) => {
                 // optional deps ignored if inaccessible, but a dep that tried

package/dist/node.d.ts

@@ -180,6 +180,7 @@ export declare class Node implements NodeLike {
     set location(location: string);
     /**
      * The resolved location of the node in the file system.
+     * Memoized per location and scurry cwd.
      */
     resolvedLocation(scurry: PathScurry): string;
     /**

package/dist/node.js

@@ -16,6 +16,7 @@ export class Node {
     }
     #options;
     #location;
+    #resolvedLoc;
     #rawManifest;
     #optional = false;
     /**
@@ -243,9 +244,17 @@ export class Node {
     }
     /**
      * The resolved location of the node in the file system.
+     * Memoized per location and scurry cwd.
      */
     resolvedLocation(scurry) {
-        return scurry.cwd.resolve(this.location).fullpath();
+        const loc = this.location;
+        const { cwd } = scurry;
+        const m = this.#resolvedLoc;
+        if (m?.loc === loc && m.cwd === cwd)
+            return m.path;
+        const path = cwd.resolve(loc).fullpath();
+        this.#resolvedLoc = { loc, cwd, path };
+        return path;
     }
     /**
      * The location of the node_modules folder where this node's edgesOut
@@ -257,9 +266,11 @@ export class Node {
      */
     nodeModules(scurry) {
         const loc = this.resolvedLocation(scurry);
-        return this.inVltStore() ?
-            loc.substring(0, loc.length - this.name.length - 1)
-            : scurry.resolve(loc, 'node_modules');
+        if (this.inVltStore()) {
+            return loc.substring(0, loc.length - this.name.length - 1);
+        }
+        const { sep } = scurry.cwd;
+        return (loc.endsWith(sep) ? loc : loc + sep) + 'node_modules';
     }
     constructor(options, id, manifest, spec, name, version) {
         this.#options = options;

package/dist/reify/add-edge.js

@@ -1,6 +1,7 @@
 import { cmdShimIfExists } from '@vltpkg/cmd-shim';
-import { mkdir, symlink } from 'node:fs/promises';
+import { symlinkSync } from 'node:fs';
 import { dirname, relative, resolve } from 'node:path';
+import { symlinkSyncMkdirp } from "./symlink-sync.js";
 const clobberSymlink = async (target, link, remover, type = 'file') => {
     // On Windows, directory symlinks require elevated privileges.
     // Use junctions instead, which work without special permissions.
@@ -9,9 +10,8 @@ const clobberSymlink = async (target, link, remover, type = 'file') => {
     const symlinkTarget = symlinkType === 'junction' ?
         resolve(dirname(link), target)
         : target;
-    await mkdir(dirname(link), { recursive: true });
     try {
-        await symlink(symlinkTarget, link, symlinkType);
+        symlinkSyncMkdirp(symlinkTarget, link, symlinkType);
     }
     catch (er) {
         /* c8 ignore start */
@@ -23,7 +23,7 @@ const clobberSymlink = async (target, link, remover, type = 'file') => {
         await remover.rm(link);
         try {
             // then try to create it again
-            await symlink(symlinkTarget, link, symlinkType);
+            symlinkSync(symlinkTarget, link, symlinkType);
             /* c8 ignore start */
         }
         catch (er) {
@@ -44,8 +44,10 @@ const clobberSymlink = async (target, link, remover, type = 'file') => {
 export const addEdge = async (edge, scurry, remover, bins) => {
     if (!edge.to)
         return;
-    const binRoot = scurry.resolve(edge.from.nodeModules(scurry), '.bin');
-    const path = scurry.resolve(edge.from.nodeModules(scurry), edge.spec.name);
+    const { sep } = scurry.cwd;
+    const nm = edge.from.nodeModules(scurry);
+    const binRoot = nm + sep + '.bin';
+    const path = nm + sep + edge.spec.name.replace('/', sep);
     const promises = [];
     const target = relative(dirname(path), edge.to.resolvedLocation(scurry));
     // can only parallelize this on posix, because the win32 shims
@@ -57,8 +59,8 @@ export const addEdge = async (edge, scurry, remover, bins) => {
         promises.push(p);
     if (bins) {
         for (const [key, val] of Object.entries(bins)) {
-            const link = scurry.resolve(binRoot, key);
-            const absTarget = scurry.resolve(path, val);
+            const link = resolve(binRoot, key);
+            const absTarget = resolve(path, val);
             const target = relative(binRoot, absTarget);
             // TODO: bash/cmd/ps1 shims on Windows
             promises.push(process.platform === 'win32' ?

package/dist/reify/bin-chmod.js

@@ -1,5 +1,6 @@
 import { statSync } from 'node:fs';
 import { chmod } from 'node:fs/promises';
+import { join } from 'node:path';
 /**
  * Make all the packages' bins executable.
  */
@@ -18,7 +19,7 @@ export const binChmod = async (node, scurry) => {
     if (!node.bins)
         return;
     for (const bin of Object.values(node.bins)) {
-        const path = scurry.resolve(`${node.resolvedLocation(scurry)}/${bin}`);
+        const path = join(node.resolvedLocation(scurry), bin);
         let mode;
         try {
             mode = statSync(path).mode;

package/dist/reify/delete-edge.js

@@ -1,3 +1,4 @@
+import { resolve } from 'node:path';
 const rmBinPosix = (remover, bin) => {
     return [remover.rm(bin)];
 };
@@ -11,15 +12,16 @@ const rmBinWin32 = (remover, bin) => {
 const rmBin = process.platform === 'win32' ? rmBinWin32 : rmBinPosix;
 export const deleteEdge = async (edge, scurry, remover) => {
     const { spec: { name }, to, } = edge;
+    const { sep } = scurry.cwd;
     const nm = edge.from.nodeModules(scurry);
-    const path = scurry.resolve(nm, name);
-    const binRoot = scurry.cwd.resolve(`${nm}/.bin`);
+    const path = nm + sep + name.replace('/', sep);
+    const binRoot = nm + sep + '.bin';
     const promises = [];
     promises.push(remover.rm(path));
     const bins = to?.bins;
     if (bins) {
         for (const key of Object.keys(bins)) {
-            const bin = binRoot.resolve(key).fullpath();
+            const bin = resolve(binRoot, key);
             promises.push(...rmBin(remover, bin));
         }
     }

package/dist/reify/delete-nodes.js

@@ -1,12 +1,13 @@
 import { deleteEdge } from "./delete-edge.js";
 export const deleteNodes = (diff, remover, scurry) => {
     const store = scurry.resolve('node_modules/.vlt');
+    const { sep } = scurry.cwd;
     const rmActions = [];
     for (const node of diff.nodes.delete) {
         // do not delete workspaces or link targets
         if (!node.inVltStore())
             continue;
-        rmActions.push(remover.rm(scurry.resolve(store, node.id)));
+        rmActions.push(remover.rm(store + sep + node.id));
         for (const edge of node.edgesIn) {
             rmActions.push(deleteEdge(edge, scurry, remover));
         }

package/dist/reify/extract-node.js

@@ -1,7 +1,7 @@
 import { hydrate } from '@vltpkg/dep-id';
-import { platformCheck } from '@vltpkg/pick-manifest';
 import { asManifest, normalizeManifest } from '@vltpkg/types';
-import { optionalFail } from "./optional-fail.js";
+import { lstatSync } from 'node:fs';
+import { isUnsupported, optionalFail } from "./optional-fail.js";
 import { removeOptionalSubgraph } from "../remove-optional-subgraph.js";
 /**
  * Returns a function that handles removing
@@ -26,12 +26,8 @@ export const extractNode = async (node, scurry, remover, options, packageInfo, d
     const spec = hydrate(node.id, node.name, options);
     const removeOptionalFailedNode = getOptionalFailedNodeRemover(node, diff);
     const { integrity, resolved } = node;
-    // Use platform data from node if available (from lockfile), otherwise fall back to manifest
-    const platformData = node.platform ?? manifest;
-    // Check if we should skip this node due to platform incompatibility or deprecation
-    if (removeOptionalFailedNode &&
-        (manifest.deprecated ||
-            !platformCheck(platformData, process.version, process.platform, process.arch))) {
+    // skip optional nodes that are deprecated or can't run here
+    if (removeOptionalFailedNode && isUnsupported(node)) {
         removeOptionalFailedNode();
         return {
             success: false,
@@ -69,7 +65,10 @@ export const extractNode = async (node, scurry, remover, options, packageInfo, d
         return { success: true, node };
     };
     try {
-        await remover.rm(target);
+        // nothing to move away on a fresh tree
+        if (lstatSync(target, { throwIfNoEntry: false })) {
+            await remover.rm(target);
+        }
         if (removeOptionalFailedNode) {
             try {
                 return extracted(await packageInfo.extract(spec, target, extractOptions));

package/dist/reify/index.js

@@ -11,6 +11,7 @@ import { deleteEdges } from "./delete-edges.js";
 import { checkNeededBuild } from "./check-needed-build.js";
 import { deleteNodes } from "./delete-nodes.js";
 import { internalHoist } from "./internal-hoist.js";
+import { pruneUnsupportedOptional } from "./optional-fail.js";
 import { rollback } from "./rollback.js";
 import { updatePackageJson } from "./update-importers-package-json.js";
 import { copyFileSync } from 'node:fs';
@@ -144,6 +145,9 @@ const reify_ = async (options, diff, remover, saveImportersPackageJson) => {
     // any failed/removed optional deps are not reflected in the lockfile
     // data as it is saved.
     const lfData = lockfileData(options);
+    // unsupported optional deps are dropped only after that, so the
+    // lockfile keeps them for other platforms
+    pruneUnsupportedOptional(diff);
     const actions = addNodes(diff, scurry, remover, options, packageInfo).concat(deleteEdges(diff, scurry, remover));
     // need to wait, so that the nodes exist to link to
     if (actions.length)

package/dist/reify/internal-hoist.js

@@ -1,7 +1,8 @@
 import { splitDepID } from '@vltpkg/dep-id';
 import { Version } from '@vltpkg/semver';
-import { mkdir, symlink } from 'node:fs/promises';
+import { mkdir } from 'node:fs/promises';
 import { dirname, relative } from 'node:path';
+import { symlinkSyncMkdirp } from "./symlink-sync.js";
 export const pickNodeToHoist = (nodes) => {
     let pick = undefined;
     let pickNode = undefined;
@@ -107,16 +108,15 @@ export const internalHoist = async (graph, options, remover) => {
         }
     }
     await Promise.all(removes);
-    const symlinks = [];
+    const hoistPath = hoistDir.fullpath();
+    const vlt = scurry.resolve('node_modules/.vlt');
+    const { sep } = scurry.cwd;
+    const native = (n) => n.replace('/', sep);
     for (const [name, { name: nodeName, id }] of links) {
-        const target = scurry.resolve(`node_modules/.vlt/${id}/node_modules/${nodeName}`);
-        const path = scurry.resolve(`node_modules/.vlt/node_modules/${name}`);
-        if (name.includes('/')) {
-            await mkdir(dirname(path), { recursive: true });
-        }
-        symlinks.push(symlink(relative(dirname(path), target), path, 'dir'));
+        const target = vlt + sep + id + sep + 'node_modules' + sep + native(nodeName);
+        const path = hoistPath + sep + native(name);
+        symlinkSyncMkdirp(relative(dirname(path), target), path, 'dir');
     }
-    await Promise.all(symlinks);
 };
 const checkExisting = async (name, entry, links, removes, scurry, remover) => {
     const target = await entry.readlink();

package/dist/reify/optional-fail.d.ts

@@ -13,3 +13,14 @@ export declare function optionalFail(diff: Diff, node: Node & {
     optional: false;
 }): undefined;
 export declare function optionalFail(diff: Diff, node: Node): (() => void) | undefined;
+/**
+ * True if the node is deprecated or can't run on this platform.
+ * Uses lockfile platform data when present, else the manifest.
+ */
+export declare const isUnsupported: (node: Node) => boolean;
+/**
+ * Drop optional adds that can't install here, and deps only they
+ * need, before anything is extracted. Lockfile data must be taken
+ * first, so it keeps them for other platforms.
+ */
+export declare const pruneUnsupportedOptional: (diff: Diff) => void;

package/dist/reify/optional-fail.js

@@ -1,3 +1,4 @@
+import { platformCheck } from '@vltpkg/pick-manifest';
 import { removeOptionalSubgraph } from "../remove-optional-subgraph.js";
 export function optionalFail(diff, node) {
     return node.isOptional() ? () => del(diff, node) : undefined;
@@ -13,3 +14,38 @@ const del = (diff, node) => {
     diff.nodes.add.delete(node);
     diff.nodes.delete.add(node);
 };
+/**
+ * True if the node is deprecated or can't run on this platform.
+ * Uses lockfile platform data when present, else the manifest.
+ */
+export const isUnsupported = (node) => !!node.manifest?.deprecated ||
+    !platformCheck(node.platform ?? node.manifest ?? {}, process.version, process.platform, process.arch);
+/**
+ * Drop optional adds that can't install here, and deps only they
+ * need, before anything is extracted. Lockfile data must be taken
+ * first, so it keeps them for other platforms.
+ */
+export const pruneUnsupportedOptional = (diff) => {
+    let pruned = false;
+    for (const node of diff.nodes.add) {
+        if (node.inVltStore() &&
+            !node.extracted &&
+            node.isOptional() &&
+            isUnsupported(node)) {
+            del(diff, node);
+            pruned = true;
+        }
+    }
+    if (!pruned)
+        return;
+    for (const node of diff.to.gc().values()) {
+        diff.nodes.add.delete(node);
+        diff.nodes.delete.add(node);
+    }
+    // edges out of removed nodes keep their `to`; never link them
+    for (const edge of diff.edges.add) {
+        if (diff.to.nodes.get(edge.from.id) !== edge.from) {
+            diff.edges.add.delete(edge);
+        }
+    }
+};

package/dist/reify/symlink-sync.d.ts

@@ -0,0 +1,5 @@
+import type { symlink } from 'node:fs';
+/**
+ * `symlinkSync`, creating the parent dir on ENOENT.
+ */
+export declare const symlinkSyncMkdirp: (target: string, link: string, type?: symlink.Type) => void;

package/dist/reify/symlink-sync.js

@@ -0,0 +1,16 @@
+import { mkdirSync, symlinkSync } from 'node:fs';
+import { dirname } from 'node:path';
+/**
+ * `symlinkSync`, creating the parent dir on ENOENT.
+ */
+export const symlinkSyncMkdirp = (target, link, type) => {
+    try {
+        symlinkSync(target, link, type);
+    }
+    catch (er) {
+        if (er.code !== 'ENOENT')
+            throw er;
+        mkdirSync(dirname(link), { recursive: true });
+        symlinkSync(target, link, type);
+    }
+};

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.1",
+  "version": "1.3.3",
   "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.1",
-    "@vltpkg/dep-id": "1.3.1",
-    "@vltpkg/dss-breadcrumb": "1.3.1",
-    "@vltpkg/error-cause": "1.3.1",
-    "@vltpkg/fast-split": "1.3.1",
-    "@vltpkg/graph-run": "1.3.1",
-    "@vltpkg/init": "1.3.1",
-    "@vltpkg/output": "1.3.1",
-    "@vltpkg/package-info": "1.3.1",
-    "@vltpkg/package-json": "1.3.1",
-    "@vltpkg/pick-manifest": "1.3.1",
-    "@vltpkg/query": "1.3.1",
-    "@vltpkg/rollback-remove": "1.3.1",
-    "@vltpkg/run": "1.3.1",
-    "@vltpkg/satisfies": "1.3.1",
-    "@vltpkg/security-archive": "1.3.1",
-    "@vltpkg/spec": "1.3.1",
-    "@vltpkg/types": "1.3.1",
-    "@vltpkg/vlt-json": "1.3.1",
-    "@vltpkg/workspaces": "1.3.1",
+    "@vltpkg/cmd-shim": "1.3.3",
+    "@vltpkg/dep-id": "1.3.3",
+    "@vltpkg/dss-breadcrumb": "1.3.3",
+    "@vltpkg/error-cause": "1.3.3",
+    "@vltpkg/fast-split": "1.3.3",
+    "@vltpkg/graph-run": "1.3.3",
+    "@vltpkg/init": "1.3.3",
+    "@vltpkg/output": "1.3.3",
+    "@vltpkg/package-info": "1.3.3",
+    "@vltpkg/package-json": "1.3.3",
+    "@vltpkg/pick-manifest": "1.3.3",
+    "@vltpkg/query": "1.3.3",
+    "@vltpkg/rollback-remove": "1.3.3",
+    "@vltpkg/run": "1.3.3",
+    "@vltpkg/satisfies": "1.3.3",
+    "@vltpkg/security-archive": "1.3.3",
+    "@vltpkg/spec": "1.3.3",
+    "@vltpkg/types": "1.3.3",
+    "@vltpkg/vlt-json": "1.3.3",
+    "@vltpkg/workspaces": "1.3.3",
     "path-scurry": "^2.0.1",
     "promise-call-limit": "^3.0.2"
   },