@vltpkg/graph 1.0.0-rc.1 → 1.0.0-rc.11

package/dist/ideal/append-nodes.js

@@ -0,0 +1,395 @@
+import { joinDepIDTuple, joinExtra } from '@vltpkg/dep-id';
+import { error } from '@vltpkg/error-cause';
+import { Spec } from '@vltpkg/spec';
+import { longDependencyTypes, normalizeManifest } from '@vltpkg/types';
+import { fixupAddedNames } from "../fixup-added-names.js";
+import { shorten } from "../dependencies.js";
+import { removeOptionalSubgraph } from "../remove-optional-subgraph.js";
+import { extractNode } from "../reify/extract-node.js";
+import { endPeerPlacement, postPlacementPeerCheck, startPeerPlacement, } from "./peers.js";
+/**
+ * Only install devDeps for git dependencies and importers
+ * Everything else always gets installed
+ */
+const shouldInstallDepType = (node, depType) => depType !== 'devDependencies' ||
+    node.importer ||
+    node.id.startsWith('git');
+/**
+ * Retrieve the {@link DepID} and location for a `file:` type {@link Node}.
+ */
+const getFileTypeInfo = (spec, fromNode, scurry) => {
+    const f = spec.final;
+    if (f.type !== 'file')
+        return;
+    /* c8 ignore start - should be impossible */
+    if (!f.file) {
+        throw error('no path on file specifier', { spec });
+    }
+    /* c8 ignore stop */
+    // Given that both linked folders and local tarballs (both defined with
+    // usage of the `file:` spec prefix) location needs to be relative to their
+    // parents, build the expected path and use it for both location and id
+    const target = scurry.cwd.resolve(fromNode.location).resolve(f.file);
+    const path = target.relativePosix();
+    const id = joinDepIDTuple(['file', path]);
+    return {
+        path,
+        id,
+        isDirectory: !!target.lstatSync()?.isDirectory(),
+    };
+};
+const isStringArray = (a) => Array.isArray(a) && !a.some(b => typeof b !== 'string');
+/**
+ * Fetch manifests for dependencies and create placement tasks.
+ */
+const fetchManifestsForDeps = async (packageInfo, graph, fromNode, deps, scurry, peerContext, modifierRefs, depth = 0) => {
+    // Create fetch tasks for all dependencies at this level
+    const fetchTasks = [];
+    const placementTasks = [];
+    for (const { spec: originalSpec, type } of deps) {
+        let spec = originalSpec;
+        const fileTypeInfo = getFileTypeInfo(spec, fromNode, scurry);
+        const activeModifier = modifierRefs?.get(spec.name);
+        // here is the place we swap specs if a edge modifier was defined
+        const queryModifier = activeModifier?.modifier.query;
+        const completeModifier = activeModifier &&
+            activeModifier.interactiveBreadcrumb.current ===
+                activeModifier.modifier.breadcrumb.last;
+        if (queryModifier &&
+            completeModifier &&
+            'spec' in activeModifier.modifier) {
+            spec = activeModifier.modifier.spec;
+            if (spec.bareSpec === '-') {
+                continue;
+            }
+        }
+        const peer = type === 'peer' || type === 'peerOptional';
+        // skip reusing nodes for peer deps since their reusability
+        // is handled ahead-of-time during its parent's placement
+        const existingNode = graph.findResolution(spec, fromNode, queryModifier);
+        // defines what nodes are eligible to be reused
+        const validExistingNode = existingNode &&
+            !existingNode.detached &&
+            // Regular deps can always reuse
+            /* c8 ignore start */
+            (!peer ||
+                // otherwise reusing peer deps only in case of a peerSetHash matche
+                existingNode.peerSetHash === fromNode.peerSetHash);
+        /* c8 ignore stop */
+        if (validExistingNode ||
+            // importers are handled at the ./add-nodes.ts top-level
+            // so we should just skip whenever we find one
+            existingNode?.importer) {
+            graph.addEdge(type, spec, fromNode, existingNode);
+            continue;
+        }
+        // is the current edge pointint go an optional dependency?
+        const edgeOptional = type === 'optional' || type === 'peerOptional';
+        // Start manifest fetch immediately for parallel processing
+        const manifestPromise = 
+        // the "detached" node state means that it has already been load as
+        // part of a graph (either lockfile or actual) and it has valid manifest
+        // data so we shortcut the package info manifest fetch here
+        existingNode?.detached ?
+            Promise.resolve(existingNode.manifest)
+            // this is the entry point to fetch calls to retrieve manifests
+            // from the build ideal graph point of view
+            : packageInfo
+                .manifest(spec, { from: scurry.resolve(fromNode.location) })
+                .then(manifest => manifest)
+                .catch((er) => {
+                // optional deps ignored if inaccessible
+                if (edgeOptional || fromNode.optional) {
+                    return undefined;
+                }
+                throw er;
+            });
+        const fetchTask = {
+            spec,
+            type,
+            fromNode,
+            fileTypeInfo,
+            activeModifier,
+            queryModifier,
+            edgeOptional,
+            manifestPromise,
+            depth,
+            peerContext,
+        };
+        fetchTasks.push(fetchTask);
+    }
+    // Create placement tasks from fetch tasks
+    for (const fetchTask of fetchTasks) {
+        const manifest = await fetchTask.manifestPromise;
+        placementTasks.push({
+            fetchTask,
+            manifest,
+        });
+    }
+    // sort placement tasks: non-peer dependencies first, then peer dependencies
+    // so that peer dependencies can easily reuse already placed regular
+    // dependencies as part of peer context set resolution also makes sure to
+    // sort by the manifest name for deterministic order.
+    placementTasks.sort((a, b) => {
+        const aIsPeer = (a.manifest?.peerDependencies &&
+            Object.keys(a.manifest.peerDependencies).length > 0) ?
+            1
+            : 0;
+        const bIsPeer = (b.manifest?.peerDependencies &&
+            Object.keys(b.manifest.peerDependencies).length > 0) ?
+            1
+            : 0;
+        // regular dependencies first, peer dependencies last
+        if (aIsPeer !== bIsPeer) {
+            return aIsPeer - bIsPeer;
+        }
+        // if both are in the same group,
+        // sort alphabetically by manifest name (fallback to spec.name)
+        const aName = a.manifest?.name /* c8 ignore next */ || a.fetchTask.spec.name;
+        const bName = b.manifest?.name || b.fetchTask.spec.name;
+        return aName.localeCompare(bName, 'en');
+    });
+    return placementTasks;
+};
+/**
+ * Process placement tasks and collect child dependencies, this is the
+ * second step of the appendNodes operation after manifest fetching in
+ * which the final graph data structure is actually built.
+ */
+const processPlacementTasks = async (graph, options, placementTasks, add, modifiers, scurry, packageInfo, extractPromises, actual, seenExtracted, remover, transientAdd, transientRemove) => {
+    const childDepsToProcess = [];
+    for (const placementTask of placementTasks) {
+        const { fetchTask, manifest } = placementTask;
+        let { activeModifier, edgeOptional, fileTypeInfo, fromNode, peerContext, queryModifier, spec, type, } = fetchTask;
+        // fix the name in the `add` map when needed. This allows the upcoming
+        // reify step to properly update the package.json file dependencies
+        // using the correct names retrieved from the manifest data
+        const additiveMap = fromNode.importer ? add : transientAdd?.get(fromNode.id);
+        spec = fixupAddedNames(additiveMap, manifest, options, spec);
+        // handles missing manifest resolution
+        if (!manifest) {
+            if (!edgeOptional && fromNode.isOptional()) {
+                // failed resolution of a non-optional dep of an optional node
+                // have to clean up the dependents
+                removeOptionalSubgraph(graph, fromNode);
+                continue;
+            }
+            else if (edgeOptional) {
+                // failed resolution of an optional dep, just ignore it,
+                // nothing to prune because we never added it in the first place.
+                continue;
+            }
+            else {
+                throw error('failed to resolve dependency', {
+                    spec,
+                    from: fromNode.location,
+                });
+            }
+        }
+        // start peer deps placement process, populating the peer context with
+        // dependency data; adding the parent node deps and this manifest's
+        // peer deps references to the current peer context set
+        const peerPlacement = startPeerPlacement(peerContext, manifest, fromNode, options);
+        const peerSetHash = peerPlacement.peerSetHash;
+        const queuedEntries = peerPlacement.queuedEntries;
+        // places a new node in the graph representing a newly seen dependency
+        const node = graph.placePackage(fromNode, type, spec, normalizeManifest(manifest), fileTypeInfo?.id, joinExtra({ peerSetHash, modifier: queryModifier }));
+        /* c8 ignore start - not possible, already ensured manifest */
+        if (!node) {
+            throw error('failed to place package', {
+                from: fromNode.location,
+                spec,
+            });
+        }
+        /* c8 ignore stop */
+        // update the node modifier tracker
+        if (activeModifier) {
+            modifiers?.updateActiveEntry(node, activeModifier);
+        }
+        const eligibleForExtraction = type !== 'peer' &&
+            type !== 'peerOptional' &&
+            remover &&
+            extractPromises &&
+            actual &&
+            scurry &&
+            packageInfo &&
+            node.inVltStore() &&
+            !node.isOptional() &&
+            // this fixes an issue with installing `file:pathname` specs
+            /* c8 ignore next */ !fileTypeInfo?.isDirectory &&
+            !node.importer;
+        // extract the node if it meets the criteria for early extraction
+        if (eligibleForExtraction) {
+            /* c8 ignore start */
+            if (seenExtracted?.has(node.id)) {
+                continue;
+            }
+            /* c8 ignore stop */
+            seenExtracted?.add(node.id);
+            const actualNode = actual.nodes.get(node.id);
+            if (!actualNode?.equals(node)) {
+                // extract the node without awaiting - push the promise to the array
+                const extractPromise = extractNode(node, scurry, remover, options, packageInfo);
+                extractPromises.push(extractPromise);
+            }
+        }
+        // updates graph node information
+        if (fileTypeInfo?.path && fileTypeInfo.isDirectory) {
+            node.location = fileTypeInfo.path;
+        }
+        node.setResolved();
+        // collect child dependencies for processing in the next level
+        const nextPeerDeps = new Map();
+        // compute deps normally
+        const bundleDeps = manifest.bundleDependencies;
+        const bundled = new Set((node.id.startsWith('git') ||
+            node.importer ||
+            !isStringArray(bundleDeps)) ?
+            []
+            : bundleDeps);
+        // setup next level to process all child dependencies in the manifest
+        const nextDeps = [];
+        // traverse actual dependency declarations in the manifest
+        // creating dependency entries for them
+        for (const depTypeName of longDependencyTypes) {
+            const depRecord = manifest[depTypeName];
+            if (depRecord && shouldInstallDepType(node, depTypeName)) {
+                // Sort Object.entries for deterministic iteration
+                const sortedEntries = Object.entries(depRecord).sort(([a], [b]) => a.localeCompare(b, 'en'));
+                for (const [name, bareSpec] of sortedEntries) {
+                    // might need to skip already placed peer deps here
+                    if (bundled.has(name))
+                        continue;
+                    const dep = {
+                        type: shorten(depTypeName, name, manifest),
+                        spec: Spec.parse(name, bareSpec, {
+                            ...options,
+                            registry: spec.registry,
+                        }),
+                    };
+                    if (depTypeName === 'peerDependencies') {
+                        nextPeerDeps.set(name, dep);
+                    }
+                    else {
+                        nextDeps.push(dep);
+                    }
+                }
+            }
+        }
+        // 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
+        const transientDeps = transientAdd?.get(node.id);
+        if (transientDeps) {
+            for (const [, dep] of transientDeps) {
+                if (dep.type === 'peer' || dep.type === 'peerOptional') {
+                    nextPeerDeps.set(dep.spec.name, dep);
+                    continue;
+                }
+                // remove the dependency from nextDeps if it already exists
+                const index = nextDeps.findIndex(d => d.spec.name === dep.spec.name);
+                if (index !== -1) {
+                    nextDeps.splice(index, 1);
+                }
+                nextDeps.push(dep);
+            }
+        }
+        // Remove transient removals when needed
+        const transientRemovals = transientRemove?.get(node.id);
+        if (transientRemovals) {
+            for (const depName of transientRemovals) {
+                const index = nextDeps.findIndex(dep => dep.spec.name === depName);
+                if (index !== -1) {
+                    nextDeps.splice(index, 1);
+                    continue;
+                }
+                if (nextPeerDeps.has(depName)) {
+                    nextPeerDeps.delete(depName);
+                }
+            }
+        }
+        // finish peer placement for this node, resolving satisfied peers
+        // to seen nodes from the peer context and adding unsatisfied peers
+        // to `nextDeps` so they get processed along regular dependencies
+        const updateContext = endPeerPlacement(peerContext, nextDeps, nextPeerDeps, graph, spec, fromNode, node, type, queuedEntries);
+        childDepsToProcess.push({
+            node,
+            deps: nextDeps,
+            modifierRefs: modifiers?.tryDependencies(node, nextDeps),
+            peerContext,
+            updateContext,
+        });
+    }
+    return childDepsToProcess;
+};
+/**
+ * Append new nodes in the given `graph` for dependencies specified at `add`
+ * and missing dependencies from the `deps` parameter.
+ *
+ * It also applies any modifiers that applies to a given node as it processes
+ * and builds the graph.
+ */
+export const appendNodes = async (packageInfo, graph, fromNode, deps, scurry, options, seen, add, modifiers, modifierRefs, extractPromises, actual, seenExtracted, remover, transientAdd, transientRemove) => {
+    /* c8 ignore next */
+    if (seen.has(fromNode.id))
+        return;
+    seen.add(fromNode.id);
+    // Get the initial peer context from the graph
+    const [initialPeerContext] = graph.peerContexts;
+    /* c8 ignore start - impossible */
+    if (!initialPeerContext) {
+        throw error('no initial peer context found in graph');
+    }
+    /* c8 ignore stop */
+    // Use a queue for breadth-first processing
+    let currentLevelDeps = [
+        {
+            node: fromNode,
+            deps,
+            modifierRefs,
+            depth: 0,
+            peerContext: initialPeerContext,
+            /* c8 ignore start */
+            updateContext: {
+                putEntries: () => undefined,
+                resolvePeerDeps: () => { },
+            },
+            /* c8 ignore stop */
+        },
+    ];
+    while (currentLevelDeps.length > 0) {
+        const nextLevelDeps = [];
+        // Process all nodes at the current level in parallel
+        const levelResults = await Promise.all(currentLevelDeps.map(async ({ node, deps: nodeDeps, modifierRefs: nodeModifierRefs, peerContext, depth, }) => {
+            // Mark node as seen when we start processing its dependencies
+            seen.add(node.id);
+            // Fetch manifests for this node's dependencies
+            const placementTasks = await fetchManifestsForDeps(packageInfo, graph, node, 
+            // Sort dependencies by spec.name for deterministic ordering
+            nodeDeps.sort((a, b) => a.spec.name.localeCompare(b.spec.name, 'en')), scurry, peerContext, nodeModifierRefs, depth);
+            // Process the placement tasks and get child dependencies
+            return await processPlacementTasks(graph, options, placementTasks, add, modifiers, scurry, packageInfo, extractPromises, actual, seenExtracted, remover, transientAdd, transientRemove);
+        }));
+        // Traverse the queued up children dependencies, adding and tracking
+        // dependencies on the peer context set, forking the context as needed
+        // and resolving any peer dependency that is able to be resolved using
+        // the current peer context set
+        postPlacementPeerCheck(graph, levelResults);
+        // Collect all child dependencies for the next level
+        for (const childDepsToProcess of levelResults) {
+            for (const childDep of childDepsToProcess) {
+                if (!seen.has(childDep.node.id)) {
+                    /* c8 ignore next */
+                    const currentDepth = currentLevelDeps[0]?.depth ?? 0;
+                    nextLevelDeps.push({
+                        ...childDep,
+                        depth: currentDepth + 1,
+                    });
+                }
+            }
+        }
+        // Move to the next level
+        currentLevelDeps = nextLevelDeps;
+    }
+};
+//# sourceMappingURL=append-nodes.js.map

package/dist/ideal/append-nodes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"append-nodes.js","sourceRoot":"","sources":["../../src/ideal/append-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1D,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAE3C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAOtE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAI5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AAMvE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,YAAY,CAAA;AAenB;;;GAGG;AACH,MAAM,oBAAoB,GAAG,CAC3B,IAAU,EACV,OAA2B,EAC3B,EAAE,CACF,OAAO,KAAK,iBAAiB;IAC7B,IAAI,CAAC,QAAQ;IACb,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;AAE3B;;GAEG;AACH,MAAM,eAAe,GAAG,CACtB,IAAU,EACV,QAAc,EACd,MAAkB,EACQ,EAAE;IAC5B,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAA;IACpB,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM;QAAE,OAAM;IAE7B,4CAA4C;IAC5C,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACZ,MAAM,KAAK,CAAC,2BAA2B,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IACpD,CAAC;IACD,oBAAoB;IAEpB,uEAAuE;IACvE,2EAA2E;IAC3E,uEAAuE;IACvE,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACpE,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,EAAE,CAAA;IACnC,MAAM,EAAE,GAAG,cAAc,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;IAEzC,OAAO;QACL,IAAI;QACJ,EAAE;QACF,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE;KACjD,CAAA;AACH,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CAAC,CAAU,EAAiB,EAAE,CAClD,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAA;AA8BzD;;GAEG;AACH,MAAM,qBAAqB,GAAG,KAAK,EACjC,WAA8B,EAC9B,KAAY,EACZ,QAAc,EACd,IAAkB,EAClB,MAAkB,EAClB,WAAwB,EACxB,YAA+C,EAC/C,KAAK,GAAG,CAAC,EACqB,EAAE;IAChC,wDAAwD;IACxD,MAAM,UAAU,GAAwB,EAAE,CAAA;IAC1C,MAAM,cAAc,GAAwB,EAAE,CAAA;IAE9C,KAAK,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;QAChD,IAAI,IAAI,GAAG,YAAY,CAAA;QACvB,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC5D,MAAM,cAAc,GAAG,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEnD,iEAAiE;QACjE,MAAM,aAAa,GAAG,cAAc,EAAE,QAAQ,CAAC,KAAK,CAAA;QACpD,MAAM,gBAAgB,GACpB,cAAc;YACd,cAAc,CAAC,qBAAqB,CAAC,OAAO;gBAC1C,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAA;QAC3C,IACE,aAAa;YACb,gBAAgB;YAChB,MAAM,IAAI,cAAc,CAAC,QAAQ,EACjC,CAAC;YACD,IAAI,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAA;YACnC,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,EAAE,CAAC;gBAC1B,SAAQ;YACV,CAAC;QACH,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,cAAc,CAAA;QAEvD,2DAA2D;QAC3D,yDAAyD;QACzD,MAAM,YAAY,GAAG,KAAK,CAAC,cAAc,CACvC,IAAI,EACJ,QAAQ,EACR,aAAa,CACd,CAAA;QACD,+CAA+C;QAC/C,MAAM,iBAAiB,GACrB,YAAY;YACZ,CAAC,YAAY,CAAC,QAAQ;YACtB,gCAAgC;YAChC,qBAAqB;YACrB,CAAC,CAAC,IAAI;gBACJ,mEAAmE;gBACnE,YAAY,CAAC,WAAW,KAAK,QAAQ,CAAC,WAAW,CAAC,CAAA;QACtD,oBAAoB;QAEpB,IACE,iBAAiB;YACjB,wDAAwD;YACxD,8CAA8C;YAC9C,YAAY,EAAE,QAAQ,EACtB,CAAC;YACD,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAA;YACjD,SAAQ;QACV,CAAC;QAED,0DAA0D;QAC1D,MAAM,YAAY,GAChB,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,cAAc,CAAA;QAEhD,2DAA2D;QAC3D,MAAM,eAAe;QACnB,mEAAmE;QACnE,wEAAwE;QACxE,2DAA2D;QAC3D,YAAY,EAAE,QAAQ,CAAC,CAAC;YACtB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,QAAgC,CAAC;YAC9D,+DAA+D;YAC/D,2CAA2C;YAC7C,CAAC,CAAC,WAAW;iBACR,QAAQ,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;iBAC3D,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAgC,CAAC;iBAClD,KAAK,CAAC,CAAC,EAAW,EAAE,EAAE;gBACrB,wCAAwC;gBACxC,IAAI,YAAY,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;oBACtC,OAAO,SAAS,CAAA;gBAClB,CAAC;gBACD,MAAM,EAAE,CAAA;YACV,CAAC,CAAC,CAAA;QAER,MAAM,SAAS,GAAsB;YACnC,IAAI;YACJ,IAAI;YACJ,QAAQ;YACR,YAAY;YACZ,cAAc;YACd,aAAa;YACb,YAAY;YACZ,eAAe;YACf,KAAK;YACL,WAAW;SACZ,CAAA;QAED,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC5B,CAAC;IAED,0CAA0C;IAC1C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,eAAe,CAAA;QAEhD,cAAc,CAAC,IAAI,CAAC;YAClB,SAAS;YACT,QAAQ;SACT,CAAC,CAAA;IACJ,CAAC;IAED,4EAA4E;IAC5E,oEAAoE;IACpE,yEAAyE;IACzE,qDAAqD;IACrD,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3B,MAAM,OAAO,GACX,CACE,CAAC,CAAC,QAAQ,EAAE,gBAAgB;YAC5B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,MAAM,GAAG,CAAC,CACpD,CAAC,CAAC;YACD,CAAC;YACH,CAAC,CAAC,CAAC,CAAA;QACL,MAAM,OAAO,GACX,CACE,CAAC,CAAC,QAAQ,EAAE,gBAAgB;YAC5B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,MAAM,GAAG,CAAC,CACpD,CAAC,CAAC;YACD,CAAC;YACH,CAAC,CAAC,CAAC,CAAA;QAEL,qDAAqD;QACrD,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;YACxB,OAAO,OAAO,GAAG,OAAO,CAAA;QAC1B,CAAC;QAED,iCAAiC;QACjC,+DAA+D;QAC/D,MAAM,KAAK,GACT,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAA;QAChE,MAAM,KAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAA;QACvD,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;IAEF,OAAO,cAAc,CAAA;AACvB,CAAC,CAAA;AAED;;;;GAIG;AACH,MAAM,qBAAqB,GAAG,KAAK,EACjC,KAAY,EACZ,OAAoB,EACpB,cAAmC,EACnC,GAA6B,EAC7B,SAAyB,EACzB,MAAmB,EACnB,WAA+B,EAC/B,eAA0C,EAC1C,MAAc,EACd,aAA0B,EAC1B,OAAwB,EACxB,YAA8B,EAC9B,eAAoC,EACH,EAAE;IACnC,MAAM,kBAAkB,GAA2B,EAAE,CAAA;IAErD,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;QAC3C,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAA;QAC7C,IAAI,EACF,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,aAAa,EACb,IAAI,EACJ,IAAI,GACL,GAAG,SAAS,CAAA;QAEb,sEAAsE;QACtE,mEAAmE;QACnE,2DAA2D;QAC3D,MAAM,WAAW,GACf,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QAC1D,IAAI,GAAG,eAAe,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QAE5D,sCAAsC;QACtC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC;gBAC3C,8DAA8D;gBAC9D,kCAAkC;gBAClC,sBAAsB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;gBACvC,SAAQ;YACV,CAAC;iBAAM,IAAI,YAAY,EAAE,CAAC;gBACxB,wDAAwD;gBACxD,iEAAiE;gBACjE,SAAQ;YACV,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,CAAC,8BAA8B,EAAE;oBAC1C,IAAI;oBACJ,IAAI,EAAE,QAAQ,CAAC,QAAQ;iBACxB,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QAED,sEAAsE;QACtE,mEAAmE;QACnE,uDAAuD;QACvD,MAAM,aAAa,GAAG,kBAAkB,CACtC,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,OAAO,CACR,CAAA;QACD,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,CAAA;QAC7C,MAAM,aAAa,GAAG,aAAa,CAAC,aAAa,CAAA;QAEjD,sEAAsE;QACtE,MAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAC7B,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,iBAAiB,CAAC,QAAQ,CAAC,EAC3B,YAAY,EAAE,EAAE,EAChB,SAAS,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CACpD,CAAA;QAED,8DAA8D;QAC9D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,KAAK,CAAC,yBAAyB,EAAE;gBACrC,IAAI,EAAE,QAAQ,CAAC,QAAQ;gBACvB,IAAI;aACL,CAAC,CAAA;QACJ,CAAC;QACD,oBAAoB;QAEpB,mCAAmC;QACnC,IAAI,cAAc,EAAE,CAAC;YACnB,SAAS,EAAE,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;QACpD,CAAC;QAED,MAAM,qBAAqB,GACzB,IAAI,KAAK,MAAM;YACf,IAAI,KAAK,cAAc;YACvB,OAAO;YACP,eAAe;YACf,MAAM;YACN,MAAM;YACN,WAAW;YACX,IAAI,CAAC,UAAU,EAAE;YACjB,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,4DAA4D;YAC5D,oBAAoB,CAAC,CAAC,YAAY,EAAE,WAAW;YAC/C,CAAC,IAAI,CAAC,QAAQ,CAAA;QAEhB,iEAAiE;QACjE,IAAI,qBAAqB,EAAE,CAAC;YAC1B,qBAAqB;YACrB,IAAI,aAAa,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBAChC,SAAQ;YACV,CAAC;YACD,oBAAoB;YACpB,aAAa,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC3B,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC5C,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,oEAAoE;gBACpE,MAAM,cAAc,GAAG,WAAW,CAChC,IAAI,EACJ,MAAM,EACN,OAAO,EACP,OAAO,EACP,WAAW,CACZ,CAAA;gBACD,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;YACtC,CAAC;QACH,CAAC;QAED,iCAAiC;QACjC,IAAI,YAAY,EAAE,IAAI,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;YACnD,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAA;QACnC,CAAC;QACD,IAAI,CAAC,WAAW,EAAE,CAAA;QAElB,8DAA8D;QAC9D,MAAM,YAAY,GAAG,IAAI,GAAG,EAAsB,CAAA;QAElD,wBAAwB;QACxB,MAAM,UAAU,GAAG,QAAQ,CAAC,kBAAkB,CAAA;QAC9C,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,CACE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC;YACvB,IAAI,CAAC,QAAQ;YACb,CAAC,aAAa,CAAC,UAAU,CAAC,CAC7B,CAAC,CAAC;YACD,EAAE;YACJ,CAAC,CAAC,UAAU,CACb,CAAA;QAED,qEAAqE;QACrE,MAAM,QAAQ,GAAiB,EAAE,CAAA;QAEjC,0DAA0D;QAC1D,uCAAuC;QACvC,KAAK,MAAM,WAAW,IAAI,mBAAmB,EAAE,CAAC;YAC9C,MAAM,SAAS,GACb,QAAQ,CAAC,WAAW,CAAC,CAAA;YAEvB,IAAI,SAAS,IAAI,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC;gBACzD,kDAAkD;gBAClD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAClD,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC,CACvC,CAAA;gBACD,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,aAAa,EAAE,CAAC;oBAC7C,mDAAmD;oBACnD,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;wBAAE,SAAQ;oBAC/B,MAAM,GAAG,GAAG;wBACV,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,CAAC;wBAC1C,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE;4BAC/B,GAAG,OAAO;4BACV,QAAQ,EAAE,IAAI,CAAC,QAAQ;yBACxB,CAAC;qBACH,CAAA;oBACD,IAAI,WAAW,KAAK,kBAAkB,EAAE,CAAC;wBACvC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;oBAC7B,CAAC;yBAAM,CAAC;wBACN,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;oBACpB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,wEAAwE;QACxE,oEAAoE;QACpE,mEAAmE;QACnE,MAAM,aAAa,GAAG,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,IAAI,aAAa,EAAE,CAAC;YAClB,KAAK,MAAM,CAAC,EAAE,GAAG,CAAC,IAAI,aAAa,EAAE,CAAC;gBACpC,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;oBACvD,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;oBACpC,SAAQ;gBACV,CAAC;gBAED,2DAA2D;gBAC3D,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAC9B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,IAAI,CACnC,CAAA;gBACD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;oBACjB,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;gBAC3B,CAAC;gBAED,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACpB,CAAC;QACH,CAAC;QAED,wCAAwC;QACxC,MAAM,iBAAiB,GAAG,eAAe,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACvD,IAAI,iBAAiB,EAAE,CAAC;YACtB,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE,CAAC;gBACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAC9B,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CACjC,CAAA;gBACD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;oBACjB,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;oBACzB,SAAQ;gBACV,CAAC;gBAED,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC9B,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC;QAED,iEAAiE;QACjE,mEAAmE;QACnE,iEAAiE;QACjE,MAAM,aAAa,GAAG,gBAAgB,CACpC,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,aAAa,CACd,CAAA;QAED,kBAAkB,CAAC,IAAI,CAAC;YACtB,IAAI;YACJ,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,SAAS,EAAE,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC;YACxD,WAAW;YACX,aAAa;SACd,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,kBAAkB,CAAA;AAC3B,CAAC,CAAA;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,WAA8B,EAC9B,KAAY,EACZ,QAAc,EACd,IAAkB,EAClB,MAAkB,EAClB,OAAoB,EACpB,IAAgB,EAChB,GAA6B,EAC7B,SAAyB,EACzB,YAA+C,EAC/C,eAA0C,EAC1C,MAAc,EACd,aAA0B,EAC1B,OAAwB,EACxB,YAA8B,EAC9B,eAAoC,EACpC,EAAE;IACF,oBAAoB;IACpB,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAAE,OAAM;IACjC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAErB,8CAA8C;IAC9C,MAAM,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC,YAAY,CAAA;IAC/C,kCAAkC;IAClC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,KAAK,CAAC,wCAAwC,CAAC,CAAA;IACvD,CAAC;IACD,oBAAoB;IAEpB,2CAA2C;IAC3C,IAAI,gBAAgB,GAAsB;QACxC;YACE,IAAI,EAAE,QAAQ;YACd,IAAI;YACJ,YAAY;YACZ,KAAK,EAAE,CAAC;YACR,WAAW,EAAE,kBAAkB;YAC/B,qBAAqB;YACrB,aAAa,EAAE;gBACb,UAAU,EAAE,GAAG,EAAE,CAAC,SAAS;gBAC3B,eAAe,EAAE,GAAG,EAAE,GAAE,CAAC;aAC1B;YACD,oBAAoB;SACrB;KACF,CAAA;IAED,OAAO,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,aAAa,GAAsB,EAAE,CAAA;QAE3C,qDAAqD;QACrD,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CACpC,gBAAgB,CAAC,GAAG,CAClB,KAAK,EAAE,EACL,IAAI,EACJ,IAAI,EAAE,QAAQ,EACd,YAAY,EAAE,gBAAgB,EAC9B,WAAW,EACX,KAAK,GACW,EAAE,EAAE;YACpB,8DAA8D;YAC9D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAEjB,+CAA+C;YAC/C,MAAM,cAAc,GAAG,MAAM,qBAAqB,CAChD,WAAW,EACX,KAAK,EACL,IAAI;YACJ,4DAA4D;YAC5D,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACrB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAC7C,EACD,MAAM,EACN,WAAW,EACX,gBAAgB,EAChB,KAAK,CACN,CAAA;YAED,yDAAyD;YACzD,OAAO,MAAM,qBAAqB,CAChC,KAAK,EACL,OAAO,EACP,cAAc,EACd,GAAG,EACH,SAAS,EACT,MAAM,EACN,WAAW,EACX,eAAe,EACf,MAAM,EACN,aAAa,EACb,OAAO,EACP,YAAY,EACZ,eAAe,CAChB,CAAA;QACH,CAAC,CACF,CACF,CAAA;QAED,oEAAoE;QACpE,sEAAsE;QACtE,sEAAsE;QACtE,+BAA+B;QAC/B,sBAAsB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;QAE3C,oDAAoD;QACpD,KAAK,MAAM,kBAAkB,IAAI,YAAY,EAAE,CAAC;YAC9C,KAAK,MAAM,QAAQ,IAAI,kBAAkB,EAAE,CAAC;gBAC1C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;oBAChC,oBAAoB;oBACpB,MAAM,YAAY,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAA;oBACpD,aAAa,CAAC,IAAI,CAAC;wBACjB,GAAG,QAAQ;wBACX,KAAK,EAAE,YAAY,GAAG,CAAC;qBACxB,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,yBAAyB;QACzB,gBAAgB,GAAG,aAAa,CAAA;IAClC,CAAC;AACH,CAAC,CAAA","sourcesContent":["import { joinDepIDTuple, joinExtra } from '@vltpkg/dep-id'\nimport type { DepID } from '@vltpkg/dep-id'\nimport { error } from '@vltpkg/error-cause'\nimport type { PackageInfoClient } from '@vltpkg/package-info'\nimport { Spec } from '@vltpkg/spec'\nimport type { SpecOptions } from '@vltpkg/spec'\nimport { longDependencyTypes, normalizeManifest } from '@vltpkg/types'\nimport type {\n  DependencyTypeLong,\n  DependencySaveType,\n  Manifest,\n} from '@vltpkg/types'\nimport type { PathScurry } from 'path-scurry'\nimport { fixupAddedNames } from '../fixup-added-names.ts'\nimport { shorten } from '../dependencies.ts'\nimport type { Dependency } from '../dependencies.ts'\nimport type { Graph } from '../graph.ts'\nimport type { Node } from '../node.ts'\nimport { removeOptionalSubgraph } from '../remove-optional-subgraph.ts'\nimport type {\n  GraphModifier,\n  ModifierActiveEntry,\n} from '../modifiers.ts'\nimport type { ExtractResult } from '../reify/extract-node.ts'\nimport { extractNode } from '../reify/extract-node.ts'\nimport type { RollbackRemove } from '@vltpkg/rollback-remove'\nimport {\n  endPeerPlacement,\n  postPlacementPeerCheck,\n  startPeerPlacement,\n} from './peers.ts'\nimport type {\n  PeerContext,\n  AppendNodeEntry,\n  ProcessPlacementResult,\n  TransientAddMap,\n  TransientRemoveMap,\n} from './types.ts'\n\ntype FileTypeInfo = {\n  id: DepID\n  path: string\n  isDirectory: boolean\n}\n\n/**\n * Only install devDeps for git dependencies and importers\n * Everything else always gets installed\n */\nconst shouldInstallDepType = (\n  node: Node,\n  depType: DependencyTypeLong,\n) =>\n  depType !== 'devDependencies' ||\n  node.importer ||\n  node.id.startsWith('git')\n\n/**\n * Retrieve the {@link DepID} and location for a `file:` type {@link Node}.\n */\nconst getFileTypeInfo = (\n  spec: Spec,\n  fromNode: Node,\n  scurry: PathScurry,\n): FileTypeInfo | undefined => {\n  const f = spec.final\n  if (f.type !== 'file') return\n\n  /* c8 ignore start - should be impossible */\n  if (!f.file) {\n    throw error('no path on file specifier', { spec })\n  }\n  /* c8 ignore stop */\n\n  // Given that both linked folders and local tarballs (both defined with\n  // usage of the `file:` spec prefix) location needs to be relative to their\n  // parents, build the expected path and use it for both location and id\n  const target = scurry.cwd.resolve(fromNode.location).resolve(f.file)\n  const path = target.relativePosix()\n  const id = joinDepIDTuple(['file', path])\n\n  return {\n    path,\n    id,\n    isDirectory: !!target.lstatSync()?.isDirectory(),\n  }\n}\n\nconst isStringArray = (a: unknown): a is string[] =>\n  Array.isArray(a) && !a.some(b => typeof b !== 'string')\n\n/**\n * Represents a manifest fetch operation with all the context needed.\n */\ntype ManifestFetchTask = {\n  spec: Spec\n  type: DependencySaveType\n  fromNode: Node\n  fileTypeInfo?: FileTypeInfo\n  activeModifier?: ModifierActiveEntry\n  queryModifier?: string\n  edgeOptional: boolean\n  manifestPromise: Promise<Manifest | undefined>\n  depth: number\n  peerContext: PeerContext\n}\n\n/**\n * Represents a node placement operation that depends on a resolved manifest.\n */\ntype NodePlacementTask = {\n  fetchTask: ManifestFetchTask\n  manifest: Manifest | undefined\n  node?: Node\n  childDeps?: Dependency[]\n  childModifierRefs?: Map<string, ModifierActiveEntry>\n  childPeerContext?: PeerContext\n}\n\n/**\n * Fetch manifests for dependencies and create placement tasks.\n */\nconst fetchManifestsForDeps = async (\n  packageInfo: PackageInfoClient,\n  graph: Graph,\n  fromNode: Node,\n  deps: Dependency[],\n  scurry: PathScurry,\n  peerContext: PeerContext,\n  modifierRefs?: Map<string, ModifierActiveEntry>,\n  depth = 0,\n): Promise<NodePlacementTask[]> => {\n  // Create fetch tasks for all dependencies at this level\n  const fetchTasks: ManifestFetchTask[] = []\n  const placementTasks: NodePlacementTask[] = []\n\n  for (const { spec: originalSpec, type } of deps) {\n    let spec = originalSpec\n    const fileTypeInfo = getFileTypeInfo(spec, fromNode, scurry)\n    const activeModifier = modifierRefs?.get(spec.name)\n\n    // here is the place we swap specs if a edge modifier was defined\n    const queryModifier = activeModifier?.modifier.query\n    const completeModifier =\n      activeModifier &&\n      activeModifier.interactiveBreadcrumb.current ===\n        activeModifier.modifier.breadcrumb.last\n    if (\n      queryModifier &&\n      completeModifier &&\n      'spec' in activeModifier.modifier\n    ) {\n      spec = activeModifier.modifier.spec\n      if (spec.bareSpec === '-') {\n        continue\n      }\n    }\n\n    const peer = type === 'peer' || type === 'peerOptional'\n\n    // skip reusing nodes for peer deps since their reusability\n    // is handled ahead-of-time during its parent's placement\n    const existingNode = graph.findResolution(\n      spec,\n      fromNode,\n      queryModifier,\n    )\n    // defines what nodes are eligible to be reused\n    const validExistingNode =\n      existingNode &&\n      !existingNode.detached &&\n      // Regular deps can always reuse\n      /* c8 ignore start */\n      (!peer ||\n        // otherwise reusing peer deps only in case of a peerSetHash matche\n        existingNode.peerSetHash === fromNode.peerSetHash)\n    /* c8 ignore stop */\n\n    if (\n      validExistingNode ||\n      // importers are handled at the ./add-nodes.ts top-level\n      // so we should just skip whenever we find one\n      existingNode?.importer\n    ) {\n      graph.addEdge(type, spec, fromNode, existingNode)\n      continue\n    }\n\n    // is the current edge pointint go an optional dependency?\n    const edgeOptional =\n      type === 'optional' || type === 'peerOptional'\n\n    // Start manifest fetch immediately for parallel processing\n    const manifestPromise =\n      // the \"detached\" node state means that it has already been load as\n      // part of a graph (either lockfile or actual) and it has valid manifest\n      // data so we shortcut the package info manifest fetch here\n      existingNode?.detached ?\n        Promise.resolve(existingNode.manifest as Manifest | undefined)\n        // this is the entry point to fetch calls to retrieve manifests\n        // from the build ideal graph point of view\n      : packageInfo\n          .manifest(spec, { from: scurry.resolve(fromNode.location) })\n          .then(manifest => manifest as Manifest | undefined)\n          .catch((er: unknown) => {\n            // optional deps ignored if inaccessible\n            if (edgeOptional || fromNode.optional) {\n              return undefined\n            }\n            throw er\n          })\n\n    const fetchTask: ManifestFetchTask = {\n      spec,\n      type,\n      fromNode,\n      fileTypeInfo,\n      activeModifier,\n      queryModifier,\n      edgeOptional,\n      manifestPromise,\n      depth,\n      peerContext,\n    }\n\n    fetchTasks.push(fetchTask)\n  }\n\n  // Create placement tasks from fetch tasks\n  for (const fetchTask of fetchTasks) {\n    const manifest = await fetchTask.manifestPromise\n\n    placementTasks.push({\n      fetchTask,\n      manifest,\n    })\n  }\n\n  // sort placement tasks: non-peer dependencies first, then peer dependencies\n  // so that peer dependencies can easily reuse already placed regular\n  // dependencies as part of peer context set resolution also makes sure to\n  // sort by the manifest name for deterministic order.\n  placementTasks.sort((a, b) => {\n    const aIsPeer =\n      (\n        a.manifest?.peerDependencies &&\n        Object.keys(a.manifest.peerDependencies).length > 0\n      ) ?\n        1\n      : 0\n    const bIsPeer =\n      (\n        b.manifest?.peerDependencies &&\n        Object.keys(b.manifest.peerDependencies).length > 0\n      ) ?\n        1\n      : 0\n\n    // regular dependencies first, peer dependencies last\n    if (aIsPeer !== bIsPeer) {\n      return aIsPeer - bIsPeer\n    }\n\n    // if both are in the same group,\n    // sort alphabetically by manifest name (fallback to spec.name)\n    const aName =\n      a.manifest?.name /* c8 ignore next */ || a.fetchTask.spec.name\n    const bName = b.manifest?.name || b.fetchTask.spec.name\n    return aName.localeCompare(bName, 'en')\n  })\n\n  return placementTasks\n}\n\n/**\n * Process placement tasks and collect child dependencies, this is the\n * second step of the appendNodes operation after manifest fetching in\n * which the final graph data structure is actually built.\n */\nconst processPlacementTasks = async (\n  graph: Graph,\n  options: SpecOptions,\n  placementTasks: NodePlacementTask[],\n  add?: Map<string, Dependency>,\n  modifiers?: GraphModifier,\n  scurry?: PathScurry,\n  packageInfo?: PackageInfoClient,\n  extractPromises?: Promise<ExtractResult>[],\n  actual?: Graph,\n  seenExtracted?: Set<DepID>,\n  remover?: RollbackRemove,\n  transientAdd?: TransientAddMap,\n  transientRemove?: TransientRemoveMap,\n): Promise<ProcessPlacementResult> => {\n  const childDepsToProcess: ProcessPlacementResult = []\n\n  for (const placementTask of placementTasks) {\n    const { fetchTask, manifest } = placementTask\n    let {\n      activeModifier,\n      edgeOptional,\n      fileTypeInfo,\n      fromNode,\n      peerContext,\n      queryModifier,\n      spec,\n      type,\n    } = fetchTask\n\n    // fix the name in the `add` map when needed. This allows the upcoming\n    // reify step to properly update the package.json file dependencies\n    // using the correct names retrieved from the manifest data\n    const additiveMap =\n      fromNode.importer ? add : transientAdd?.get(fromNode.id)\n    spec = fixupAddedNames(additiveMap, manifest, options, spec)\n\n    // handles missing manifest resolution\n    if (!manifest) {\n      if (!edgeOptional && fromNode.isOptional()) {\n        // failed resolution of a non-optional dep of an optional node\n        // have to clean up the dependents\n        removeOptionalSubgraph(graph, fromNode)\n        continue\n      } else if (edgeOptional) {\n        // failed resolution of an optional dep, just ignore it,\n        // nothing to prune because we never added it in the first place.\n        continue\n      } else {\n        throw error('failed to resolve dependency', {\n          spec,\n          from: fromNode.location,\n        })\n      }\n    }\n\n    // start peer deps placement process, populating the peer context with\n    // dependency data; adding the parent node deps and this manifest's\n    // peer deps references to the current peer context set\n    const peerPlacement = startPeerPlacement(\n      peerContext,\n      manifest,\n      fromNode,\n      options,\n    )\n    const peerSetHash = peerPlacement.peerSetHash\n    const queuedEntries = peerPlacement.queuedEntries\n\n    // places a new node in the graph representing a newly seen dependency\n    const node = graph.placePackage(\n      fromNode,\n      type,\n      spec,\n      normalizeManifest(manifest),\n      fileTypeInfo?.id,\n      joinExtra({ peerSetHash, modifier: queryModifier }),\n    )\n\n    /* c8 ignore start - not possible, already ensured manifest */\n    if (!node) {\n      throw error('failed to place package', {\n        from: fromNode.location,\n        spec,\n      })\n    }\n    /* c8 ignore stop */\n\n    // update the node modifier tracker\n    if (activeModifier) {\n      modifiers?.updateActiveEntry(node, activeModifier)\n    }\n\n    const eligibleForExtraction =\n      type !== 'peer' &&\n      type !== 'peerOptional' &&\n      remover &&\n      extractPromises &&\n      actual &&\n      scurry &&\n      packageInfo &&\n      node.inVltStore() &&\n      !node.isOptional() &&\n      // this fixes an issue with installing `file:pathname` specs\n      /* c8 ignore next */ !fileTypeInfo?.isDirectory &&\n      !node.importer\n\n    // extract the node if it meets the criteria for early extraction\n    if (eligibleForExtraction) {\n      /* c8 ignore start */\n      if (seenExtracted?.has(node.id)) {\n        continue\n      }\n      /* c8 ignore stop */\n      seenExtracted?.add(node.id)\n      const actualNode = actual.nodes.get(node.id)\n      if (!actualNode?.equals(node)) {\n        // extract the node without awaiting - push the promise to the array\n        const extractPromise = extractNode(\n          node,\n          scurry,\n          remover,\n          options,\n          packageInfo,\n        )\n        extractPromises.push(extractPromise)\n      }\n    }\n\n    // updates graph node information\n    if (fileTypeInfo?.path && fileTypeInfo.isDirectory) {\n      node.location = fileTypeInfo.path\n    }\n    node.setResolved()\n\n    // collect child dependencies for processing in the next level\n    const nextPeerDeps = new Map<string, Dependency>()\n\n    // compute deps normally\n    const bundleDeps = manifest.bundleDependencies\n    const bundled = new Set<string>(\n      (\n        node.id.startsWith('git') ||\n          node.importer ||\n          !isStringArray(bundleDeps)\n      ) ?\n        []\n      : bundleDeps,\n    )\n\n    // setup next level to process all child dependencies in the manifest\n    const nextDeps: Dependency[] = []\n\n    // traverse actual dependency declarations in the manifest\n    // creating dependency entries for them\n    for (const depTypeName of longDependencyTypes) {\n      const depRecord: Record<string, string> | undefined =\n        manifest[depTypeName]\n\n      if (depRecord && shouldInstallDepType(node, depTypeName)) {\n        // Sort Object.entries for deterministic iteration\n        const sortedEntries = Object.entries(depRecord).sort(\n          ([a], [b]) => a.localeCompare(b, 'en'),\n        )\n        for (const [name, bareSpec] of sortedEntries) {\n          // might need to skip already placed peer deps here\n          if (bundled.has(name)) continue\n          const dep = {\n            type: shorten(depTypeName, name, manifest),\n            spec: Spec.parse(name, bareSpec, {\n              ...options,\n              registry: spec.registry,\n            }),\n          }\n          if (depTypeName === 'peerDependencies') {\n            nextPeerDeps.set(name, dep)\n          } else {\n            nextDeps.push(dep)\n          }\n        }\n      }\n    }\n\n    // Inject transient dependencies for non-importer nodes (nested folders)\n    // These are deps that were added from a nested folder context using\n    // relative file: specs that should resolve relative to that folder\n    const transientDeps = transientAdd?.get(node.id)\n    if (transientDeps) {\n      for (const [, dep] of transientDeps) {\n        if (dep.type === 'peer' || dep.type === 'peerOptional') {\n          nextPeerDeps.set(dep.spec.name, dep)\n          continue\n        }\n\n        // remove the dependency from nextDeps if it already exists\n        const index = nextDeps.findIndex(\n          d => d.spec.name === dep.spec.name,\n        )\n        if (index !== -1) {\n          nextDeps.splice(index, 1)\n        }\n\n        nextDeps.push(dep)\n      }\n    }\n\n    // Remove transient removals when needed\n    const transientRemovals = transientRemove?.get(node.id)\n    if (transientRemovals) {\n      for (const depName of transientRemovals) {\n        const index = nextDeps.findIndex(\n          dep => dep.spec.name === depName,\n        )\n        if (index !== -1) {\n          nextDeps.splice(index, 1)\n          continue\n        }\n\n        if (nextPeerDeps.has(depName)) {\n          nextPeerDeps.delete(depName)\n        }\n      }\n    }\n\n    // finish peer placement for this node, resolving satisfied peers\n    // to seen nodes from the peer context and adding unsatisfied peers\n    // to `nextDeps` so they get processed along regular dependencies\n    const updateContext = endPeerPlacement(\n      peerContext,\n      nextDeps,\n      nextPeerDeps,\n      graph,\n      spec,\n      fromNode,\n      node,\n      type,\n      queuedEntries,\n    )\n\n    childDepsToProcess.push({\n      node,\n      deps: nextDeps,\n      modifierRefs: modifiers?.tryDependencies(node, nextDeps),\n      peerContext,\n      updateContext,\n    })\n  }\n\n  return childDepsToProcess\n}\n\n/**\n * Append new nodes in the given `graph` for dependencies specified at `add`\n * and missing dependencies from the `deps` parameter.\n *\n * It also applies any modifiers that applies to a given node as it processes\n * and builds the graph.\n */\nexport const appendNodes = async (\n  packageInfo: PackageInfoClient,\n  graph: Graph,\n  fromNode: Node,\n  deps: Dependency[],\n  scurry: PathScurry,\n  options: SpecOptions,\n  seen: Set<DepID>,\n  add?: Map<string, Dependency>,\n  modifiers?: GraphModifier,\n  modifierRefs?: Map<string, ModifierActiveEntry>,\n  extractPromises?: Promise<ExtractResult>[],\n  actual?: Graph,\n  seenExtracted?: Set<DepID>,\n  remover?: RollbackRemove,\n  transientAdd?: TransientAddMap,\n  transientRemove?: TransientRemoveMap,\n) => {\n  /* c8 ignore next */\n  if (seen.has(fromNode.id)) return\n  seen.add(fromNode.id)\n\n  // Get the initial peer context from the graph\n  const [initialPeerContext] = graph.peerContexts\n  /* c8 ignore start - impossible */\n  if (!initialPeerContext) {\n    throw error('no initial peer context found in graph')\n  }\n  /* c8 ignore stop */\n\n  // Use a queue for breadth-first processing\n  let currentLevelDeps: AppendNodeEntry[] = [\n    {\n      node: fromNode,\n      deps,\n      modifierRefs,\n      depth: 0,\n      peerContext: initialPeerContext,\n      /* c8 ignore start */\n      updateContext: {\n        putEntries: () => undefined,\n        resolvePeerDeps: () => {},\n      },\n      /* c8 ignore stop */\n    },\n  ]\n\n  while (currentLevelDeps.length > 0) {\n    const nextLevelDeps: AppendNodeEntry[] = []\n\n    // Process all nodes at the current level in parallel\n    const levelResults = await Promise.all(\n      currentLevelDeps.map(\n        async ({\n          node,\n          deps: nodeDeps,\n          modifierRefs: nodeModifierRefs,\n          peerContext,\n          depth,\n        }: AppendNodeEntry) => {\n          // Mark node as seen when we start processing its dependencies\n          seen.add(node.id)\n\n          // Fetch manifests for this node's dependencies\n          const placementTasks = await fetchManifestsForDeps(\n            packageInfo,\n            graph,\n            node,\n            // Sort dependencies by spec.name for deterministic ordering\n            nodeDeps.sort((a, b) =>\n              a.spec.name.localeCompare(b.spec.name, 'en'),\n            ),\n            scurry,\n            peerContext,\n            nodeModifierRefs,\n            depth,\n          )\n\n          // Process the placement tasks and get child dependencies\n          return await processPlacementTasks(\n            graph,\n            options,\n            placementTasks,\n            add,\n            modifiers,\n            scurry,\n            packageInfo,\n            extractPromises,\n            actual,\n            seenExtracted,\n            remover,\n            transientAdd,\n            transientRemove,\n          )\n        },\n      ),\n    )\n\n    // Traverse the queued up children dependencies, adding and tracking\n    // dependencies on the peer context set, forking the context as needed\n    // and resolving any peer dependency that is able to be resolved using\n    // the current peer context set\n    postPlacementPeerCheck(graph, levelResults)\n\n    // Collect all child dependencies for the next level\n    for (const childDepsToProcess of levelResults) {\n      for (const childDep of childDepsToProcess) {\n        if (!seen.has(childDep.node.id)) {\n          /* c8 ignore next */\n          const currentDepth = currentLevelDeps[0]?.depth ?? 0\n          nextLevelDeps.push({\n            ...childDep,\n            depth: currentDepth + 1,\n          })\n        }\n      }\n    }\n\n    // Move to the next level\n    currentLevelDeps = nextLevelDeps\n  }\n}\n"]}

package/dist/{esm/ideal → ideal}/build-ideal-from-starting-graph.d.ts

@@ -1,8 +1,8 @@
+import type { PackageJson } from '@vltpkg/package-json';
+import type { RefreshIdealGraphOptions } from './refresh-ideal-graph.ts';
 import type { Graph } from '../graph.ts';
-import type { AddNodesOptions } from './add-nodes.ts';
-import type { RemoveNodesOptions } from './remove-nodes.ts';
-export type BuildIdealFromStartingGraphOptions = AddNodesOptions & RemoveNodesOptions & {
-    projectRoot: string;
+export type BuildIdealFromStartingGraphOptions = RefreshIdealGraphOptions & {
+    packageJson: PackageJson;
 };
 /**
  * Builds an ideal {@link Graph} representing the dependencies that

package/dist/ideal/build-ideal-from-starting-graph.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-ideal-from-starting-graph.d.ts","sourceRoot":"","sources":["../../src/ideal/build-ideal-from-starting-graph.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AACxE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAExC,MAAM,MAAM,kCAAkC,GAC5C,wBAAwB,GAAG;IACzB,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,2BAA2B,YAC7B,kCAAkC,KAC1C,OAAO,CAAC,KAAK,CAmEf,CAAA"}

package/dist/ideal/build-ideal-from-starting-graph.js

@@ -0,0 +1,70 @@
+import { getImporterSpecs } from "./get-importer-specs.js";
+import { refreshIdealGraph } from "./refresh-ideal-graph.js";
+import { resolveSaveType } from "../resolve-save-type.js";
+/**
+ * Builds an ideal {@link Graph} representing the dependencies that
+ * should be present in order to fulfill the requirements defined
+ * by the `package.json` and `vlt-lock.json` files using the `graph` set
+ * in options as a starting point. Also add / remove any dependencies
+ * listed in the `add` and `remove` properties.
+ */
+export const buildIdealFromStartingGraph = async (options) => {
+    // Gets a map of dependencies that are keyed to its importer node ids,
+    // merging values already found in the graph with user specified values.
+    // Any dependencies that are already satisfied in the starting `graph`
+    // are going to be pruned from the resulting object.
+    const importerSpecs = getImporterSpecs(options);
+    // merge modifiedDependencies flags
+    options.add.modifiedDependencies =
+        options.add.modifiedDependencies ||
+            importerSpecs.add.modifiedDependencies;
+    options.remove.modifiedDependencies =
+        options.remove.modifiedDependencies ||
+            importerSpecs.remove.modifiedDependencies;
+    // merge values found on node specs with
+    // user-provided values from `options.add`
+    for (const [nodeId, deps] of importerSpecs.add) {
+        const node = options.graph.nodes.get(nodeId);
+        /* c8 ignore next - impossible */
+        if (!node)
+            continue;
+        if (!options.add.has(nodeId)) {
+            options.add.set(nodeId, deps);
+            continue;
+        }
+        // merge any deps found when reading the nodes manifest
+        // with the ones provided by the user in the `add` options,
+        // user-provided deps should take precedence
+        for (const [depName, dep] of deps) {
+            if (!options.add.get(nodeId)?.has(depName)) {
+                options.add.get(nodeId)?.set(depName, dep);
+            }
+            // update the save type for deps when using an implicit type
+            dep.type = resolveSaveType(node, depName, dep.type);
+        }
+    }
+    // merge values found on node specs with
+    // user-provided values from `options.remove`
+    for (const [nodeId, deps] of importerSpecs.remove) {
+        if (!options.remove.has(nodeId)) {
+            options.remove.set(nodeId, deps);
+            continue;
+        }
+        // merge any deps found when reading the nodes manifest
+        // with the ones provided by the user in the `remove` options
+        for (const depName of deps) {
+            options.remove.get(nodeId)?.add(depName);
+        }
+    }
+    // refreshs the current graph adding the nodes marked for addition
+    // and removing the ones marked for removal, while also recalculating
+    // peer dependencies and default locations
+    await refreshIdealGraph({
+        ...options,
+        transientAdd: importerSpecs.transientAdd,
+        transientRemove: importerSpecs.transientRemove,
+    });
+    options.graph.gc();
+    return options.graph;
+};
+//# sourceMappingURL=build-ideal-from-starting-graph.js.map

package/dist/ideal/build-ideal-from-starting-graph.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-ideal-from-starting-graph.js","sourceRoot":"","sources":["../../src/ideal/build-ideal-from-starting-graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAUzD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,EAC9C,OAA2C,EAC3B,EAAE;IAClB,sEAAsE;IACtE,wEAAwE;IACxE,sEAAsE;IACtE,oDAAoD;IACpD,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAE/C,mCAAmC;IACnC,OAAO,CAAC,GAAG,CAAC,oBAAoB;QAC9B,OAAO,CAAC,GAAG,CAAC,oBAAoB;YAChC,aAAa,CAAC,GAAG,CAAC,oBAAoB,CAAA;IACxC,OAAO,CAAC,MAAM,CAAC,oBAAoB;QACjC,OAAO,CAAC,MAAM,CAAC,oBAAoB;YACnC,aAAa,CAAC,MAAM,CAAC,oBAAoB,CAAA;IAE3C,wCAAwC;IACxC,0CAA0C;IAC1C,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,aAAa,CAAC,GAAG,EAAE,CAAC;QAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAC5C,iCAAiC;QACjC,IAAI,CAAC,IAAI;YAAE,SAAQ;QAEnB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YAC7B,SAAQ;QACV,CAAC;QAED,uDAAuD;QACvD,2DAA2D;QAC3D,4CAA4C;QAC5C,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;YAClC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;YAC5C,CAAC;YAED,4DAA4D;YAC5D,GAAG,CAAC,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QACrD,CAAC;IACH,CAAC;IAED,wCAAwC;IACxC,6CAA6C;IAC7C,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;QAClD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YAChC,SAAQ;QACV,CAAC;QAED,uDAAuD;QACvD,6DAA6D;QAC7D,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE,CAAC;YAC3B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;IAED,kEAAkE;IAClE,qEAAqE;IACrE,0CAA0C;IAC1C,MAAM,iBAAiB,CAAC;QACtB,GAAG,OAAO;QACV,YAAY,EAAE,aAAa,CAAC,YAAY;QACxC,eAAe,EAAE,aAAa,CAAC,eAAe;KAC/C,CAAC,CAAA;IAEF,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,CAAA;IAElB,OAAO,OAAO,CAAC,KAAK,CAAA;AACtB,CAAC,CAAA","sourcesContent":["import { getImporterSpecs } from './get-importer-specs.ts'\nimport { refreshIdealGraph } from './refresh-ideal-graph.ts'\nimport { resolveSaveType } from '../resolve-save-type.ts'\nimport type { PackageJson } from '@vltpkg/package-json'\nimport type { RefreshIdealGraphOptions } from './refresh-ideal-graph.ts'\nimport type { Graph } from '../graph.ts'\n\nexport type BuildIdealFromStartingGraphOptions =\n  RefreshIdealGraphOptions & {\n    packageJson: PackageJson\n  }\n\n/**\n * Builds an ideal {@link Graph} representing the dependencies that\n * should be present in order to fulfill the requirements defined\n * by the `package.json` and `vlt-lock.json` files using the `graph` set\n * in options as a starting point. Also add / remove any dependencies\n * listed in the `add` and `remove` properties.\n */\nexport const buildIdealFromStartingGraph = async (\n  options: BuildIdealFromStartingGraphOptions,\n): Promise<Graph> => {\n  // Gets a map of dependencies that are keyed to its importer node ids,\n  // merging values already found in the graph with user specified values.\n  // Any dependencies that are already satisfied in the starting `graph`\n  // are going to be pruned from the resulting object.\n  const importerSpecs = getImporterSpecs(options)\n\n  // merge modifiedDependencies flags\n  options.add.modifiedDependencies =\n    options.add.modifiedDependencies ||\n    importerSpecs.add.modifiedDependencies\n  options.remove.modifiedDependencies =\n    options.remove.modifiedDependencies ||\n    importerSpecs.remove.modifiedDependencies\n\n  // merge values found on node specs with\n  // user-provided values from `options.add`\n  for (const [nodeId, deps] of importerSpecs.add) {\n    const node = options.graph.nodes.get(nodeId)\n    /* c8 ignore next - impossible */\n    if (!node) continue\n\n    if (!options.add.has(nodeId)) {\n      options.add.set(nodeId, deps)\n      continue\n    }\n\n    // merge any deps found when reading the nodes manifest\n    // with the ones provided by the user in the `add` options,\n    // user-provided deps should take precedence\n    for (const [depName, dep] of deps) {\n      if (!options.add.get(nodeId)?.has(depName)) {\n        options.add.get(nodeId)?.set(depName, dep)\n      }\n\n      // update the save type for deps when using an implicit type\n      dep.type = resolveSaveType(node, depName, dep.type)\n    }\n  }\n\n  // merge values found on node specs with\n  // user-provided values from `options.remove`\n  for (const [nodeId, deps] of importerSpecs.remove) {\n    if (!options.remove.has(nodeId)) {\n      options.remove.set(nodeId, deps)\n      continue\n    }\n\n    // merge any deps found when reading the nodes manifest\n    // with the ones provided by the user in the `remove` options\n    for (const depName of deps) {\n      options.remove.get(nodeId)?.add(depName)\n    }\n  }\n\n  // refreshs the current graph adding the nodes marked for addition\n  // and removing the ones marked for removal, while also recalculating\n  // peer dependencies and default locations\n  await refreshIdealGraph({\n    ...options,\n    transientAdd: importerSpecs.transientAdd,\n    transientRemove: importerSpecs.transientRemove,\n  })\n\n  options.graph.gc()\n\n  return options.graph\n}\n"]}

package/dist/ideal/build.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/ideal/build.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACzE,OAAO,KAAK,EACV,2BAA2B,EAC3B,8BAA8B,EAE/B,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGxC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAK7D,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,GAAG;IAClD;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,CAAA;IACd;;;;;OAKG;IACH,GAAG,CAAC,EAAE,2BAA2B,CAAA;IACjC;;;;OAIG;IACH,MAAM,CAAC,EAAE,8BAA8B,CAAA;IACvC;;OAEG;IACH,OAAO,EAAE,cAAc,CAAA;IACvB;;OAEG;IACH,WAAW,EAAE,iBAAiB,CAAA;CAC/B,CAAA;AAmBD;;;;;;GAMG;AACH,eAAO,MAAM,KAAK,YACP,iBAAiB,KACzB,OAAO,CAAC,KAAK,CAgDf,CAAA"}

package/dist/{esm/ideal → ideal}/build.js

@@ -1,8 +1,23 @@
+import { error } from '@vltpkg/error-cause';
 import { graphStep } from '@vltpkg/output';
 import { load as loadActual } from "../actual/load.js";
 import { load as loadVirtual } from "../lockfile/load.js";
 import { buildIdealFromStartingGraph } from "./build-ideal-from-starting-graph.js";
+import { splitDepID } from '@vltpkg/dep-id';
 const getMap = (m) => m ?? new Map();
+/**
+ * Validates that a file dependency node exists in the graph after
+ * a successful graph build. This helps providing an actionable error
+ * message in case the current working directory is a linked nested
+ * folder that hasn't yet been added as a dependency to an importer
+ * in the project.
+ */
+const validateFileDepNode = (graph, id) => {
+    const [type, path] = splitDepID(id);
+    if (type === 'file' && !graph.nodes.get(id)) {
+        throw error('The current working dir is not a dependency of this project', { path });
+    }
+};
 /**
  * Builds an ideal {@link Graph} representing the dependencies that
  * should be present in order to fulfill the requirements defined
@@ -22,7 +37,6 @@ export const build = async (options) => {
             ...options,
             mainManifest,
             monorepo,
-            skipLoadingNodesOnModifiersChange: true,
         });
     }
     catch {
@@ -30,7 +44,6 @@ export const build = async (options) => {
             ...options,
             mainManifest,
             monorepo,
-            skipLoadingNodesOnModifiersChange: true,
         });
     }
     const res = await buildIdealFromStartingGraph({
@@ -43,6 +56,20 @@ export const build = async (options) => {
         actual: options.actual,
     });
     done();
+    // when adding or removing a new dependency from a file dep,
+    // validate the receiver node was present in the graph
+    if (options.add) {
+        for (const [addKey, value] of options.add.entries()) {
+            if (value.size)
+                validateFileDepNode(res, addKey);
+        }
+    }
+    if (options.remove) {
+        for (const [removeKey, value] of options.remove.entries()) {
+            if (value.size)
+                validateFileDepNode(res, removeKey);
+        }
+    }
     return res;
 };
 //# sourceMappingURL=build.js.map

package/dist/ideal/build.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/ideal/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,IAAI,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAA;AASlF,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAI3C,MAAM,MAAM,GAAG,CAA0B,CAAK,EAAE,EAAE,CAChD,CAAC,IAAK,IAAI,GAAG,EAAQ,CAAA;AA8BvB;;;;;;GAMG;AACH,MAAM,mBAAmB,GAAG,CAAC,KAAY,EAAE,EAAS,EAAE,EAAE;IACtD,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAA;IACnC,IAAI,IAAI,KAAK,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QAC5C,MAAM,KAAK,CACT,6DAA6D,EAC7D,EAAE,IAAI,EAAE,CACT,CAAA;IACH,CAAC;AACH,CAAC,CAAA;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EACxB,OAA0B,EACV,EAAE;IAClB,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;IAE/B,yDAAyD;IACzD,iDAAiD;IACjD,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;IAC9D,MAAM,YAAY,GAChB,OAAO,CAAC,YAAY,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAC/D,IAAI,KAAK,CAAA;IACT,IAAI,CAAC;QACH,KAAK,GAAG,WAAW,CAAC;YAClB,GAAG,OAAO;YACV,YAAY;YACZ,QAAQ;SACT,CAAC,CAAA;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,KAAK,GAAG,UAAU,CAAC;YACjB,GAAG,OAAO;YACV,YAAY;YACZ,QAAQ;SACT,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,2BAA2B,CAAC;QAC5C,GAAG,OAAO;QACV,MAAM;QACN,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;QACxB,KAAK;QACL,WAAW;QACX,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAA;IACF,IAAI,EAAE,CAAA;IAEN,4DAA4D;IAC5D,sDAAsD;IACtD,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC;YACpD,IAAI,KAAK,CAAC,IAAI;gBAAE,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QAClD,CAAC;IACH,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YAC1D,IAAI,KAAK,CAAC,IAAI;gBAAE,mBAAmB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QACrD,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA","sourcesContent":["import { error } from '@vltpkg/error-cause'\nimport { graphStep } from '@vltpkg/output'\nimport { load as loadActual } from '../actual/load.ts'\nimport { load as loadVirtual } from '../lockfile/load.ts'\nimport { buildIdealFromStartingGraph } from './build-ideal-from-starting-graph.ts'\nimport type { PackageInfoClient } from '@vltpkg/package-info'\nimport type { LoadOptions as LoadActualOptions } from '../actual/load.ts'\nimport type {\n  AddImportersDependenciesMap,\n  RemoveImportersDependenciesMap,\n  Dependency,\n} from '../dependencies.ts'\nimport type { Graph } from '../graph.ts'\nimport { splitDepID } from '@vltpkg/dep-id'\nimport type { DepID } from '@vltpkg/dep-id'\nimport type { RollbackRemove } from '@vltpkg/rollback-remove'\n\nconst getMap = <T extends Map<any, any>>(m?: T) =>\n  m ?? (new Map() as T)\n\nexport type BuildIdealOptions = LoadActualOptions & {\n  /**\n   * An actual graph\n   */\n  actual?: Graph\n  /**\n   * A `Map` in which keys are {@link DepID} linking to another `Map` in which\n   * keys are the dependency names and values are {@link Dependency}. This\n   * structure represents dependencies that need to be added to the importer\n   * represented by {@link DepID}.\n   */\n  add?: AddImportersDependenciesMap\n  /**\n   * A `Map` object representing nodes to be removed from the ideal graph.\n   * Each {@link DepID} key represents an importer node and the `Set` of\n   * dependency names to be removed from its dependency list.\n   */\n  remove?: RemoveImportersDependenciesMap\n  /**\n   * A {@link RollbackRemove} instance to handle extraction rollbacks\n   */\n  remover: RollbackRemove\n  /**\n   * A {@link PackageInfoClient} instance to read manifest info from.\n   */\n  packageInfo: PackageInfoClient\n}\n\n/**\n * Validates that a file dependency node exists in the graph after\n * a successful graph build. This helps providing an actionable error\n * message in case the current working directory is a linked nested\n * folder that hasn't yet been added as a dependency to an importer\n * in the project.\n */\nconst validateFileDepNode = (graph: Graph, id: DepID) => {\n  const [type, path] = splitDepID(id)\n  if (type === 'file' && !graph.nodes.get(id)) {\n    throw error(\n      'The current working dir is not a dependency of this project',\n      { path },\n    )\n  }\n}\n\n/**\n * Builds an ideal {@link Graph} representing the dependencies that\n * should be present in order to fulfill the requirements defined\n * by the `package.json` and `vlt-lock.json` files using either the\n * virtual or actual graph as a starting point. Also add / remove any\n * dependencies listed in the `add` and `remove` properties.\n */\nexport const build = async (\n  options: BuildIdealOptions,\n): Promise<Graph> => {\n  const done = graphStep('build')\n\n  // Creates the shared instances that are going to be used\n  // in both the loader methods and the build graph\n  const { packageInfo, packageJson, scurry, monorepo } = options\n  const mainManifest =\n    options.mainManifest ?? packageJson.read(options.projectRoot)\n  let graph\n  try {\n    graph = loadVirtual({\n      ...options,\n      mainManifest,\n      monorepo,\n    })\n  } catch {\n    graph = loadActual({\n      ...options,\n      mainManifest,\n      monorepo,\n    })\n  }\n\n  const res = await buildIdealFromStartingGraph({\n    ...options,\n    scurry,\n    add: getMap(options.add),\n    graph,\n    packageInfo,\n    remove: getMap(options.remove),\n    actual: options.actual,\n  })\n  done()\n\n  // when adding or removing a new dependency from a file dep,\n  // validate the receiver node was present in the graph\n  if (options.add) {\n    for (const [addKey, value] of options.add.entries()) {\n      if (value.size) validateFileDepNode(res, addKey)\n    }\n  }\n  if (options.remove) {\n    for (const [removeKey, value] of options.remove.entries()) {\n      if (value.size) validateFileDepNode(res, removeKey)\n    }\n  }\n\n  return res\n}\n"]}