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

package/dist/{esm/ideal → ideal}/get-importer-specs.d.ts

@@ -1,7 +1,12 @@
 import type { AddImportersDependenciesMap, RemoveImportersDependenciesMap } from '../dependencies.ts';
-import type { BuildIdealAddOptions, BuildIdealFromGraphOptions, BuildIdealRemoveOptions } from './types.ts';
+import type { BuildIdealAddOptions, BuildIdealFromGraphOptions, BuildIdealRemoveOptions, TransientAddMap, TransientRemoveMap } from './types.ts';
 import type { SpecOptions } from '@vltpkg/spec';
-export type GetImporterSpecsOptions = BuildIdealAddOptions & BuildIdealFromGraphOptions & BuildIdealRemoveOptions & SpecOptions;
+import type { PackageJson } from '@vltpkg/package-json';
+import type { PathScurry } from 'path-scurry';
+export type GetImporterSpecsOptions = BuildIdealAddOptions & BuildIdealFromGraphOptions & BuildIdealRemoveOptions & SpecOptions & {
+    scurry: PathScurry;
+    packageJson: PackageJson;
+};
 /**
  * Given a {@link Graph} and a list of {@link Dependency}, merges the
  * dependencies info found in the graph importers and returns the add & remove
@@ -10,5 +15,7 @@ export type GetImporterSpecsOptions = BuildIdealAddOptions & BuildIdealFromGraph
 export declare const getImporterSpecs: (options: GetImporterSpecsOptions) => {
     add: AddImportersDependenciesMap;
     remove: RemoveImportersDependenciesMap;
+    transientAdd: TransientAddMap;
+    transientRemove: TransientRemoveMap;
 };
 //# sourceMappingURL=get-importer-specs.d.ts.map

package/dist/ideal/get-importer-specs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-importer-specs.d.ts","sourceRoot":"","sources":["../../src/ideal/get-importer-specs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,2BAA2B,EAE3B,8BAA8B,EAC/B,MAAM,oBAAoB,CAAA;AAE3B,OAAO,KAAK,EACV,oBAAoB,EACpB,0BAA0B,EAC1B,uBAAuB,EACvB,eAAe,EACf,kBAAkB,EACnB,MAAM,YAAY,CAAA;AAMnB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C,MAAM,MAAM,uBAAuB,GAAG,oBAAoB,GACxD,0BAA0B,GAC1B,uBAAuB,GACvB,WAAW,GAAG;IACZ,MAAM,EAAE,UAAU,CAAA;IAClB,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AAyBH;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,YAClB,uBAAuB;;;;;CAoLjC,CAAA"}

package/dist/{esm/ideal → ideal}/get-importer-specs.js

@@ -1,4 +1,3 @@
-import { error } from '@vltpkg/error-cause';
 import { longDependencyTypes } from '@vltpkg/types';
 import { shorten, asDependency } from "../dependencies.js";
 import { removeSatisfiedSpecs } from "./remove-satisfied-specs.js";
@@ -47,23 +46,85 @@ export const getImporterSpecs = (options) => {
             const deps = Object.entries(importer.manifest?.[depType] ?? {});
             for (const [depName, depSpec] of deps) {
                 const edge = importer.edgesOut.get(depName);
+                // skip if the edge exists and already uses the same spec
+                if (edge?.to && depSpec === edge.spec.bareSpec)
+                    continue;
                 const dependency = asDependency({
                     spec: Spec.parse(depName, depSpec, options),
                     type: shorten(depType, depName, importer.manifest),
                 });
-                if (!edge?.to) {
-                    addDeps.set(depName, dependency);
-                }
+                addDeps.set(depName, dependency);
             }
         }
         addResult.set(importer.id, addDeps);
         removeResult.set(importer.id, removeDeps);
     }
+    // Maps to store dependencies targeting non-importer nodes (e.g., nested folders)
+    // These will be injected when the target node is placed in the graph
+    const transientAdd = new Map();
+    const transientRemove = new Map();
+    // Traverse all nodes in the graph to find file type dependencies that are directories
+    // and populate transientAdd/transientRemove with their manifest dependencies
+    // Only process when scurry and packageJson are available
+    for (const node of graph.nodes.values()) {
+        // Skip importers as they're already handled above and also skip
+        // any non-file type dependencies
+        if (graph.importers.has(node) || !node.id.startsWith('file'))
+            continue;
+        // check if this is a file type dependency that is a directory
+        const nodePath = options.scurry.cwd.resolve(node.location);
+        const stat = nodePath.lstatSync();
+        if (stat?.isDirectory()) {
+            // load the manifest for this directory (throw if it does not exist)
+            const manifest = options.packageJson.read(nodePath.fullpath());
+            // should always set the manifest to the read manifest
+            node.manifest = manifest;
+            // create a map of dependencies from the manifest
+            const addDeps = new Map();
+            // check for edges not in manifest (should be removed)
+            const removeDeps = new Set();
+            for (const edge of node.edgesOut.values()) {
+                if (!hasDepName(node, edge) &&
+                    !add.get(node.id)?.has(edge.name)) {
+                    removeDeps.add(edge.name);
+                }
+            }
+            // iterate over manifest dependencies to add them if
+            // they're missing from the graph
+            for (const depType of longDependencyTypes) {
+                const deps = Object.entries(manifest[depType] ?? {});
+                for (const [depName, depSpec] of deps) {
+                    const edge = node.edgesOut.get(depName);
+                    // skip if the edge exists and already uses the same spec
+                    if (edge?.to && depSpec === edge.spec.bareSpec)
+                        continue;
+                    // add the dependency to the addDeps map
+                    const dependency = asDependency({
+                        spec: Spec.parse(depName, depSpec, options),
+                        type: shorten(depType, depName, manifest),
+                    });
+                    addDeps.set(depName, dependency);
+                }
+            }
+            // store in transientAdd if there are any dependencies
+            if (addDeps.size > 0) {
+                transientAdd.set(node.id, addDeps);
+            }
+            // store in transientRemove if there are any to remove
+            if (removeDeps.size > 0) {
+                transientRemove.set(node.id, removeDeps);
+            }
+        }
+    }
     // merges any provided specs to add to the current found results
     for (const [id, addDeps] of add.entries()) {
         const deps = addResult.get(id);
         if (!deps) {
-            throw error('Not an importer', { found: id });
+            // Not an importer - only store file-type deps for later injection
+            if (id.startsWith('file')) {
+                transientAdd.set(id, addDeps);
+            }
+            continue;
         }
         for (const [name, dep] of addDeps.entries()) {
             deps.set(name, dep);
@@ -78,6 +139,18 @@ export const getImporterSpecs = (options) => {
                 importerRemoveItem.add(depName);
             }
         }
+        else if (key.startsWith('file')) {
+            // Not an importer - only store file-type deps in transientRemove
+            const existing = transientRemove.get(key);
+            if (existing) {
+                for (const depName of removeSet) {
+                    existing.add(depName);
+                }
+            }
+            else {
+                transientRemove.set(key, new Set(removeSet));
+            }
+        }
     }
     // Removes any references to an importer that no longer has specs
     for (const [key, removeItem] of removeResult) {
@@ -101,6 +174,8 @@ export const getImporterSpecs = (options) => {
     return {
         add: addResult,
         remove: removeResult,
+        transientAdd,
+        transientRemove,
     };
 };
 //# sourceMappingURL=get-importer-specs.js.map

package/dist/ideal/get-importer-specs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-importer-specs.js","sourceRoot":"","sources":["../../src/ideal/get-importer-specs.ts"],"names":[],"mappings":"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","sourcesContent":["import { longDependencyTypes } from '@vltpkg/types'\nimport { shorten, asDependency } from '../dependencies.ts'\nimport type {\n  AddImportersDependenciesMap,\n  Dependency,\n  RemoveImportersDependenciesMap,\n} from '../dependencies.ts'\nimport { removeSatisfiedSpecs } from './remove-satisfied-specs.ts'\nimport type {\n  BuildIdealAddOptions,\n  BuildIdealFromGraphOptions,\n  BuildIdealRemoveOptions,\n  TransientAddMap,\n  TransientRemoveMap,\n} from './types.ts'\nimport type { Edge } from '../edge.ts'\nimport type { Node } from '../node.ts'\nimport type { Graph } from '../graph.ts'\nimport type { DepID } from '@vltpkg/dep-id'\nimport { Spec } from '@vltpkg/spec'\nimport type { SpecOptions } from '@vltpkg/spec'\nimport type { PackageJson } from '@vltpkg/package-json'\nimport type { PathScurry } from 'path-scurry'\n\nexport type GetImporterSpecsOptions = BuildIdealAddOptions &\n  BuildIdealFromGraphOptions &\n  BuildIdealRemoveOptions &\n  SpecOptions & {\n    scurry: PathScurry\n    packageJson: PackageJson\n  }\n\nconst hasDepName = (importer: Node, edge: Edge): boolean => {\n  for (const depType of longDependencyTypes) {\n    const listedDeps = importer.manifest?.[depType]\n    if (listedDeps && Object.hasOwn(listedDeps, edge.name))\n      return true\n  }\n  return false\n}\n\nclass AddImportersDependenciesMapImpl\n  extends Map\n  implements AddImportersDependenciesMap\n{\n  modifiedDependencies = false\n}\n\nclass RemoveImportersDependenciesMapImpl\n  extends Map\n  implements RemoveImportersDependenciesMap\n{\n  modifiedDependencies = false\n}\n\n/**\n * Given a {@link Graph} and a list of {@link Dependency}, merges the\n * dependencies info found in the graph importers and returns the add & remove\n * results as a Map in which keys are {@link DepID} of each importer node.\n */\nexport const getImporterSpecs = (\n  options: GetImporterSpecsOptions,\n) => {\n  const { add, graph, remove } = options\n  const addResult: AddImportersDependenciesMap =\n    new AddImportersDependenciesMapImpl()\n  const removeResult: RemoveImportersDependenciesMap =\n    new RemoveImportersDependenciesMapImpl()\n\n  // traverse the list of importers in the starting graph\n  for (const importer of graph.importers) {\n    // uses a Map keying to the spec.name in order to easily make sure there's\n    // only a single dependency entry for a given dependency for each importer\n    const addDeps = new Map<string, Dependency>()\n    const removeDeps = new Set<string>()\n    // if an edge from the graph is not listed in the manifest,\n    // add that edge to the list of dependencies to be removed\n    for (const edge of importer.edgesOut.values()) {\n      if (\n        !hasDepName(importer, edge) &&\n        !add.get(importer.id)?.has(edge.name)\n      ) {\n        removeDeps.add(edge.name)\n        removeResult.modifiedDependencies = true\n      }\n    }\n    // if a dependency is listed in the manifest but not in the graph,\n    // add that dependency to the list of dependencies to be added\n    for (const depType of longDependencyTypes) {\n      const deps = Object.entries(importer.manifest?.[depType] ?? {})\n      for (const [depName, depSpec] of deps) {\n        const edge = importer.edgesOut.get(depName)\n\n        // skip if the edge exists and already uses the same spec\n        if (edge?.to && depSpec === edge.spec.bareSpec) continue\n\n        const dependency = asDependency({\n          spec: Spec.parse(depName, depSpec, options),\n          type: shorten(depType, depName, importer.manifest),\n        })\n        addDeps.set(depName, dependency)\n      }\n    }\n    addResult.set(importer.id, addDeps)\n    removeResult.set(importer.id, removeDeps)\n  }\n\n  // Maps to store dependencies targeting non-importer nodes (e.g., nested folders)\n  // These will be injected when the target node is placed in the graph\n  const transientAdd = new Map() as TransientAddMap\n  const transientRemove = new Map() as TransientRemoveMap\n\n  // Traverse all nodes in the graph to find file type dependencies that are directories\n  // and populate transientAdd/transientRemove with their manifest dependencies\n  // Only process when scurry and packageJson are available\n  for (const node of graph.nodes.values()) {\n    // Skip importers as they're already handled above and also skip\n    // any non-file type dependencies\n    if (graph.importers.has(node) || !node.id.startsWith('file'))\n      continue\n\n    // check if this is a file type dependency that is a directory\n    const nodePath = options.scurry.cwd.resolve(node.location)\n    const stat = nodePath.lstatSync()\n\n    if (stat?.isDirectory()) {\n      // load the manifest for this directory (throw if it does not exist)\n      const manifest = options.packageJson.read(nodePath.fullpath())\n\n      // should always set the manifest to the read manifest\n      node.manifest = manifest\n\n      // create a map of dependencies from the manifest\n      const addDeps = new Map<string, Dependency>()\n\n      // check for edges not in manifest (should be removed)\n      const removeDeps = new Set<string>()\n      for (const edge of node.edgesOut.values()) {\n        if (\n          !hasDepName(node, edge) &&\n          !add.get(node.id)?.has(edge.name)\n        ) {\n          removeDeps.add(edge.name)\n        }\n      }\n\n      // iterate over manifest dependencies to add them if\n      // they're missing from the graph\n      for (const depType of longDependencyTypes) {\n        const deps = Object.entries(manifest[depType] ?? {})\n        for (const [depName, depSpec] of deps) {\n          const edge = node.edgesOut.get(depName)\n\n          // skip if the edge exists and already uses the same spec\n          if (edge?.to && depSpec === edge.spec.bareSpec) continue\n\n          // add the dependency to the addDeps map\n          const dependency = asDependency({\n            spec: Spec.parse(depName, depSpec, options),\n            type: shorten(depType, depName, manifest),\n          })\n          addDeps.set(depName, dependency)\n        }\n      }\n\n      // store in transientAdd if there are any dependencies\n      if (addDeps.size > 0) {\n        transientAdd.set(node.id, addDeps)\n      }\n\n      // store in transientRemove if there are any to remove\n      if (removeDeps.size > 0) {\n        transientRemove.set(node.id, removeDeps)\n      }\n    }\n  }\n\n  // merges any provided specs to add to the current found results\n  for (const [id, addDeps] of add.entries()) {\n    const deps = addResult.get(id)\n    if (!deps) {\n      // Not an importer - only store file-type deps for later injection\n      if (id.startsWith('file')) {\n        transientAdd.set(id, addDeps)\n      }\n      continue\n    }\n    for (const [name, dep] of addDeps.entries()) {\n      deps.set(name, dep)\n    }\n  }\n\n  // Merges results from user-provided `remove` option with any remove\n  // results found from comparing the manifest with the loaded graph\n  for (const [key, removeSet] of remove) {\n    const importerRemoveItem = removeResult.get(key)\n    if (importerRemoveItem) {\n      for (const depName of removeSet) {\n        importerRemoveItem.add(depName)\n      }\n    } else if (key.startsWith('file')) {\n      // Not an importer - only store file-type deps in transientRemove\n      const existing = transientRemove.get(key)\n      if (existing) {\n        for (const depName of removeSet) {\n          existing.add(depName)\n        }\n      } else {\n        transientRemove.set(key, new Set(removeSet))\n      }\n    }\n  }\n\n  // Removes any references to an importer that no longer has specs\n  for (const [key, removeItem] of removeResult) {\n    if (removeItem.size === 0) {\n      removeResult.delete(key)\n    }\n  }\n\n  // removes already satisfied dependencies from the dependencies list\n  removeSatisfiedSpecs({\n    add: addResult,\n    graph,\n  })\n\n  // set the modifiedDependencies flag if any\n  // of the importers have modified dependencies\n  for (const addDeps of addResult.values()) {\n    if (addDeps.size > 0) {\n      addResult.modifiedDependencies = true\n      break\n    }\n  }\n\n  return {\n    add: addResult,\n    remove: removeResult,\n    transientAdd,\n    transientRemove,\n  }\n}\n"]}

package/dist/ideal/get-ordered-dependencies.d.ts

@@ -0,0 +1,10 @@
+import type { Node } from '../node.ts';
+import type { Dependency } from '../dependencies.ts';
+import type { BuildIdealAddOptions, BuildIdealRemoveOptions } from './types.ts';
+/**
+ * Computes the ordered list of dependencies for an given node,
+ * taking into account additions and removals.
+ */
+export declare const getNodeOrderedDependencies: (fromNode: Node, options?: BuildIdealAddOptions & BuildIdealRemoveOptions) => Dependency[];
+export declare const getOrderedDependencies: (deps: Dependency[]) => Dependency[];
+//# sourceMappingURL=get-ordered-dependencies.d.ts.map

package/dist/ideal/get-ordered-dependencies.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-ordered-dependencies.d.ts","sourceRoot":"","sources":["../../src/ideal/get-ordered-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,KAAK,EACV,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,YAAY,CAAA;AAEnB;;;GAGG;AACH,eAAO,MAAM,0BAA0B,aAC3B,IAAI,YACJ,oBAAoB,GAAG,uBAAuB,KACvD,UAAU,EAyBZ,CAAA;AAED,eAAO,MAAM,sBAAsB,SAC3B,UAAU,EAAE,KACjB,UAAU,EAiBZ,CAAA"}

package/dist/ideal/get-ordered-dependencies.js

@@ -0,0 +1,42 @@
+/**
+ * Computes the ordered list of dependencies for an given node,
+ * taking into account additions and removals.
+ */
+export const getNodeOrderedDependencies = (fromNode, options) => {
+    // using a map here instead of an array helps us get simpler
+    // deduplication while iterating through all the items at hand:
+    // existing dependencies in the graph, dependencies to be added, etc.
+    const deps = new Map();
+    for (const [name, { spec, type }] of fromNode.edgesOut.entries()) {
+        deps.set(name, { spec, type });
+    }
+    // next iterate through the list of dependencies to be added
+    const addedDeps = options?.add.get(fromNode.id);
+    if (addedDeps) {
+        for (const [name, { spec, type }] of addedDeps.entries()) {
+            deps.set(name, { spec, type });
+        }
+    }
+    // finally iterate through the list of dependencies to be removed
+    const removedDeps = options?.remove.get(fromNode.id);
+    if (removedDeps) {
+        for (const name of removedDeps) {
+            deps.delete(name);
+        }
+    }
+    // now turn the map into a sorted array
+    return getOrderedDependencies([...deps.values()]);
+};
+export const getOrderedDependencies = (deps) => {
+    const orderedDeps = [...deps].sort(({ spec: aSpec, type: aType }, { spec: bSpec, type: bType }) => {
+        const aIsPeer = aType === 'peer' || aType === 'peerOptional' ? 1 : 0;
+        const bIsPeer = bType === 'peer' || bType === 'peerOptional' ? 1 : 0;
+        // regular dependencies first, peer dependencies last
+        if (aIsPeer !== bIsPeer) {
+            return aIsPeer - bIsPeer;
+        }
+        return aSpec.name.localeCompare(bSpec.name, 'en');
+    });
+    return orderedDeps;
+};
+//# sourceMappingURL=get-ordered-dependencies.js.map

package/dist/ideal/get-ordered-dependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-ordered-dependencies.js","sourceRoot":"","sources":["../../src/ideal/get-ordered-dependencies.ts"],"names":[],"mappings":"AAOA;;;GAGG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,QAAc,EACd,OAAwD,EAC1C,EAAE;IAChB,4DAA4D;IAC5D,+DAA+D;IAC/D,qEAAqE;IACrE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAsB,CAAA;IAC1C,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QACjE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IAChC,CAAC;IACD,4DAA4D;IAC5D,MAAM,SAAS,GAAG,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAC/C,IAAI,SAAS,EAAE,CAAC;QACd,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YACzD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QAChC,CAAC;IACH,CAAC;IACD,iEAAiE;IACjE,MAAM,WAAW,GAAG,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IACpD,IAAI,WAAW,EAAE,CAAC;QAChB,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED,uCAAuC;IACvC,OAAO,sBAAsB,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;AACnD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAAkB,EACJ,EAAE;IAChB,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAChC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QAC7D,MAAM,OAAO,GACX,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACtD,MAAM,OAAO,GACX,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAEtD,qDAAqD;QACrD,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;YACxB,OAAO,OAAO,GAAG,OAAO,CAAA;QAC1B,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACnD,CAAC,CACF,CAAA;IACD,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA","sourcesContent":["import type { Node } from '../node.ts'\nimport type { Dependency } from '../dependencies.ts'\nimport type {\n  BuildIdealAddOptions,\n  BuildIdealRemoveOptions,\n} from './types.ts'\n\n/**\n * Computes the ordered list of dependencies for an given node,\n * taking into account additions and removals.\n */\nexport const getNodeOrderedDependencies = (\n  fromNode: Node,\n  options?: BuildIdealAddOptions & BuildIdealRemoveOptions,\n): Dependency[] => {\n  // using a map here instead of an array helps us get simpler\n  // deduplication while iterating through all the items at hand:\n  // existing dependencies in the graph, dependencies to be added, etc.\n  const deps = new Map<string, Dependency>()\n  for (const [name, { spec, type }] of fromNode.edgesOut.entries()) {\n    deps.set(name, { spec, type })\n  }\n  // next iterate through the list of dependencies to be added\n  const addedDeps = options?.add.get(fromNode.id)\n  if (addedDeps) {\n    for (const [name, { spec, type }] of addedDeps.entries()) {\n      deps.set(name, { spec, type })\n    }\n  }\n  // finally iterate through the list of dependencies to be removed\n  const removedDeps = options?.remove.get(fromNode.id)\n  if (removedDeps) {\n    for (const name of removedDeps) {\n      deps.delete(name)\n    }\n  }\n\n  // now turn the map into a sorted array\n  return getOrderedDependencies([...deps.values()])\n}\n\nexport const getOrderedDependencies = (\n  deps: Dependency[],\n): Dependency[] => {\n  const orderedDeps = [...deps].sort(\n    ({ spec: aSpec, type: aType }, { spec: bSpec, type: bType }) => {\n      const aIsPeer =\n        aType === 'peer' || aType === 'peerOptional' ? 1 : 0\n      const bIsPeer =\n        bType === 'peer' || bType === 'peerOptional' ? 1 : 0\n\n      // regular dependencies first, peer dependencies last\n      if (aIsPeer !== bIsPeer) {\n        return aIsPeer - bIsPeer\n      }\n\n      return aSpec.name.localeCompare(bSpec.name, 'en')\n    },\n  )\n  return orderedDeps\n}\n"]}

package/dist/ideal/peers.d.ts

@@ -0,0 +1,76 @@
+import type { PeerContext, PeerContextEntry, PeerContextEntryInput, ProcessPlacementResult } from './types.ts';
+import type { Spec, SpecOptions } from '@vltpkg/spec';
+import type { DependencySaveType, Manifest } from '@vltpkg/types';
+import type { Monorepo } from '@vltpkg/workspaces';
+import type { Dependency } from '../dependencies.ts';
+import type { Graph } from '../graph.ts';
+import type { Node } from '../node.ts';
+/**
+ * Retrieve a unique hash value for a given peer context set.
+ */
+export declare const retrievePeerContextHash: (peerContext: PeerContext | undefined) => string | undefined;
+/**
+ * Checks if a given spec is compatible with the specs already
+ * assigned to a peer context entry.
+ *
+ * Returns true if compatible, false otherwise.
+ */
+export declare const incompatibleSpecs: (spec: Spec, entry: PeerContextEntry) => boolean;
+/**
+ * Sort peer context entry inputs for deterministic processing.
+ * Orders: non-peer dependencies first, then peer dependencies, alphabetically by name.
+ */
+export declare const getOrderedPeerContextEntries: (entries: PeerContextEntryInput[]) => PeerContextEntryInput[];
+export declare const checkEntriesToPeerContext: (peerContext: PeerContext, entries: PeerContextEntryInput[]) => boolean;
+/**
+ * Add or update dependencies in a given peer context making sure to check
+ * for compatibility with existing dependencies already resolved by a given
+ * peer context set. Extra info such as a target or dependent nodes is
+ * optional.
+ *
+ * Returns true if forking is needed, false otherwise.
+ */
+export declare const addEntriesToPeerContext: (peerContext: PeerContext, entries: PeerContextEntryInput[], fromNode: Node, monorepo?: Monorepo) => boolean;
+/**
+ * Create and returns a forked copy of a given peer context set.
+ */
+export declare const forkPeerContext: (graph: Graph, peerContext: PeerContext, entries: PeerContextEntryInput[]) => PeerContext;
+/**
+ * Starts the peer dependency placement process
+ * for a given node being processed and placed.
+ */
+export declare const startPeerPlacement: (peerContext: PeerContext, manifest: Manifest, fromNode: Node, options: SpecOptions) => {
+    peerSetHash: string | undefined;
+    queuedEntries: PeerContextEntryInput[];
+};
+/**
+ * Ends the peer dependency placement process, returning the functions that
+ * are going to be used to update the peer context set, forking when needed
+ * and resolving peer dependencies if possible.
+ */
+export declare const endPeerPlacement: (peerContext: PeerContext, nextDeps: Dependency[], nextPeerDeps: Map<string, Dependency> & {
+    id?: number;
+}, graph: Graph, spec: Spec, fromNode: Node, node: Node, type: DependencySaveType, queuedEntries: PeerContextEntryInput[]) => {
+    /**
+     * Add the new entries to the current peer context set.
+     */
+    putEntries: () => {
+        dependent: Node;
+        spec: import("@vltpkg/spec/browser").Spec;
+        type: DependencySaveType;
+    }[] | undefined;
+    /**
+     * Try to resolve peer dependencies using already seen target
+     * values from the current peer context set.
+     */
+    resolvePeerDeps: () => void;
+};
+/**
+ * Given an array of processed results for the current level dependencies
+ * being placed in the currently building ideal graph, traverse its direct
+ * dependencies and track peer dependencies in their appropriate peer context
+ * sets, forking as needed and resolving peer dependencies using suitable
+ * nodes already present in the graph if possible.
+ */
+export declare const postPlacementPeerCheck: (graph: Graph, sortedLevelResults: ProcessPlacementResult[]) => void;
+//# sourceMappingURL=peers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"peers.d.ts","sourceRoot":"","sources":["../../src/ideal/peers.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAEV,WAAW,EACX,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEtC;;GAEG;AACH,eAAO,MAAM,uBAAuB,gBACrB,WAAW,GAAG,SAAS,KACnC,MAAM,GAAG,SAKX,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,SACtB,IAAI,SACH,gBAAgB,KACtB,OAkBF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,4BAA4B,YAC9B,qBAAqB,EAAE,KAC/B,qBAAqB,EAUpB,CAAA;AAQJ,eAAO,MAAM,yBAAyB,gBACvB,WAAW,WACf,qBAAqB,EAAE,KAC/B,OAgBF,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,gBACrB,WAAW,WACf,qBAAqB,EAAE,YACtB,IAAI,aACH,QAAQ,KAClB,OAsEF,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,UACnB,KAAK,eACC,WAAW,WACf,qBAAqB,EAAE,KAC/B,WAqCF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,gBAChB,WAAW,YACd,QAAQ,YACR,IAAI,WACL,WAAW;;;CA4CrB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,gBACd,WAAW,YACd,UAAU,EAAE,gBACR,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,SAChD,KAAK,QACN,IAAI,YACA,IAAI,QACR,IAAI,QACJ,kBAAkB,iBACT,qBAAqB,EAAE;IAEtC;;OAEG;;;;;;IA2CH;;;OAGG;;CAsCH,CAAA;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,UAC1B,KAAK,sBACQ,sBAAsB,EAAE,SAiE7C,CAAA"}