@vltpkg/query 0.0.0-3 → 0.0.0-30

package/README.md

@@ -4,103 +4,60 @@
 
 The **vlt** query syntax engine.
 
-**[Usage](#usage)**
-·
-**[Examples](#examples)**
-·
-**[Supported Syntax Reference](#supported-syntax-reference)**
+**[Usage](#usage)** · **[Examples](#examples)**
 
 ## Usage
 
 ```js
 import { Query } from '@vltpkg/query'
 
-const query = new Query({ nodes })
-query.search(':root > *')
+const query = new Query({ nodes, specOptions, securityArchive })
+const res = await query.search(':root > *')
 ```
 
 ## Examples
 
-Querying nodes from a local `node_modules` folder.
+### Querying against an ideal/virtual graph
 
 ```js
-import { actual } from '@vltpkg/graph'
+import { ideal } from '@vltpkg/graph'
 import { Query } from '@vltpkg/query'
-
-const graph = await actual.load({ projectRoot: process.cwd() })
-const query = new Query([...graph.nodes.values()])
-query.search(':root > *')
+import { PackageJson } from '@vltpkg/package-json'
+const signal = new AbortController().signal
+const projectRoot = process.cwd()
+const packageJson = new PackageJson()
+const graph = await ideal.build({ projectRoot, packageJson })
+const query = new Query({ graph })
+const res = await query.search(':root > *', { signal })
 ```
 
-## Supported Syntax Reference
-
-The vlt query syntax enable usage of css-selector-like strings to filter
-packages.
-
-Many of the common elements of the CSS language are available, notably:
-
-- `*` Universal selector, matches all selected items.
-- `&` Nesting selector, allows for nesting selectors.
-- `{}` Curly braces, when querying can be used to nest selectors.
-
-Split by group of selectors below is the complete reference to supported
-elements.
-
-### Attribute selectors
-
-Attribute selectors are used to match a value found in the `package.json`
-metadata for each of the nodes being queried to a arbitrary value you choose.
-
-- `[attr]` Matches elements with an `attr` property in its `package.json`.
-- `[attr=value]` Matches elements with a property `attr` whose value is exactly `value`.
-- `[attr^=value]` Matches elements with a property `attr` whose value starts with `value`.
-- `[attr$=value]` Matches elements with a property `attr` whose value ends with `value`.
-- `[attr~=value]` Matches elements with a property `attr` whose value is a whitespace-separated list of words, one of which is exactly `value`.
-- `[attr|=value]` Matches elements with a property `attr` whose value is either `value` or starts with `value-`.
-- `[attr*=value]` Matches elements with a property `attr`.
-- `[attr=value i]` Case-insensitive flag, setting it will cause any comparison to be case-insensitive.
-- `[attr=value s]` Case-sensitive flag, setting it will cause comparisons to be case-sensitive, this is the default behavior.
-
-### Class selectors
-
-- `.prod` Matches prod dependencies to your current project.
-- `.dev` Matches packages that are only used as dev dependencies in your current project.
-- `.optional` Matches packages that are optional to your current project.
-- `.peer` Matches peer dependencies to your current project.
-- `.workspace` Matches the current project worksacpes (listed in your `vlt-workspaces.json` file).
-
-### Combinators
+### Querying against a local `node_modules` folder
 
-- `>` Child combinator, matches packages that are direct dependencies of the previously selected nodes.
-- ` ` Descendant combinator, matches all packages that are direct & transitive dependencies of the previously selected nodes.
-- `~` Sibling combinator, matches packages that are direct dependencies of all dependents of the previously selected nodes.
-
-### ID Selectors
-
-Identifiers are a shortcut to retrieving packages by name, unfortunately this shortcut only works for unscoped packages, with that in mind it's advised to rely on using **Attribute selectors** (showed above) instead.
-
-e.g: `#foo` is the same as `[name=foo]`
-
-### Pseudo class selectors
-
-- `:attr(key, [attr=value])` The attribute pseudo-class allows for selecting packages based on nested properties of its `package.json` metadata. As an example, here is a query that filters only packages that declares an optional peer dependency named `foo`: `:attr(peerDependenciesMeta, foo, [optional=true])`
-- `:empty` Matches packages that have no dependencies installed.
-- `:has(<selector-list>)` Matches only packages that have valid results for the selector expression used. As an example, here is a query that matches all packages that have a peer dependency on `react`: `:has(.peer[name=react])`
-- `:is(<forgiving-selector-list>)` Useful for writing large selectors in a more compact form, the `:is()` pseudo-class takes a selector list as its arguments and selects any element that can be selected by one of the selectors in that list. As an example, let's say I want to select packages named `a` & `b` that are direct dependencies of my project root: `:root > [name=a], :root > [name=b]` using the `:is()` pseudo-class, that same expression can be shortened to: `:root > :is([name=a], [name=b])`. Similar to the css pseudo-class of the same name, this selector has a forgiving behavior regarding its nested selector list ignoring any usage of non-existing ids, classes, combinators, operators and pseudo-selectors.
-- `:not(<selector-list>)` Negation pseudo-class, select packages that do not match a list of selectors.
-- `:outdated(<type>)` Matches packages that are outdated, the type parameter is optional and can be one of the following:
-  - `any` (default) a version exists that is greater than the current one
-  - `in-range` a version exists that is greater than the current one, and satisfies at least one if its parent's dependencies
-  - `out-of-range` a version exists that is greater than the current one, does not satisfy at least one of its parent's dependencies
-  - `major` a version exists that is a semver major greater than the current one
-  - `minor` a version exists that is a semver minor greater than the current one
-  - `patch` a version exists that is a semver patch greater than the current one
-- `:private` Matches packages that have the property `private` set on their `package.json` file.
-- `:semver(<value>, <function>, <custom-attribute-selector>)` Matches packages based on a semver value, e.g, to retrieve all packages that have a `version` satisfied by the semver value `^1.0.0`: `:semver(^1.0.0)`. It's also possible to define the type of semver comparison function to use by defining a second parameter, e.g: `:semver(^1.0.0, eq)` for an exact match, valid comparison types are: `eq`, `neq`, `gt`, `gte`, `lt`, `lte`, `satisfies` (default). A third parameter allows for specifying a different `package.json` property to use for the comparison, e.g: `:semver(^22, satisfies, :attr(engines, [node]))` for comparing the value of `engines.node`.
-- `:type(registry|file|git|remote|workspace)` Matches packages based on their type, e.g, to retrieve all git dependencies: `:type(git)`.
+```js
+import { actual } from '@vltpkg/graph'
+import { Query } from '@vltpkg/query'
+import { PackageJson } from '@vltpkg/package-json'
+import { PathScurry } from 'path-scurry'
+const signal = new AbortController().signal
+const projectRoot = process.cwd()
+const scurry = new PathScurry(projectRoot)
+const packageJson = new PackageJson()
+const graph = await actual.load({ projectRoot, packageJson, scurry })
+const query = new Query({ graph })
+const res = await query.search(':root > *', { signal })
+```
 
-### Pseudo Elements
+### Querying against a lockfile
 
-- `:project` Returns both the root node (as defined below) along with any workspace declared in your project.
-- `:root` Returns the root node, that represents the package defined at the top-level `package.json` of your project folder.
-- `:scope` Returns the current scope of a given selector
+```js
+import { lockfile } from '@vltpkg/graph'
+import { Query } from '@vltpkg/query'
+const signal = new AbortController().signal
+const projectRoot = process.cwd()
+const graph = await lockfile.load({
+  mainManifest: 'package.json',
+  projectRoot,
+})
+const query = new Query({ graph })
+const res = await query.search(':root > *', { signal })
+```

package/dist/esm/attribute.d.ts

@@ -1,4 +1,4 @@
-import type { NodeLike } from '@vltpkg/graph';
+import type { NodeLike } from '@vltpkg/types';
 import type { ParserState } from './types.ts';
 export type ComparatorFn = (attr: string, value?: string) => boolean;
 /**

package/dist/esm/attribute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attribute.d.ts","sourceRoot":"","sources":["../../src/attribute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAG7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE7C,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,OAAO,CAAA;AAOpE;;;GAGG;AACH,eAAO,MAAM,yBAAyB,SAC9B,QAAQ,cACF,MAAM,EAAE,aACT,MAAM,KAChB,MAAM,EAAE,GAAG,SA+Db,CAAA;AAID,eAAO,MAAM,gBAAgB,UACpB,WAAW,cACN,YAAY,GAAG,SAAS,SAC7B,MAAM,gBACC,MAAM,eACP,OAAO,qBACF,MAAM,EAAE,KACzB,WAgDF,CAAA;AAcD,eAAO,MAAM,qBAAqB,2BAEjC,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,UACb,WAAW,KACjB,OAAO,CAAC,WAAW,CAyBrB,CAAA"}
+{"version":3,"file":"attribute.d.ts","sourceRoot":"","sources":["../../src/attribute.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAuB,MAAM,eAAe,CAAA;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE7C,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,OAAO,CAAA;AAOpE;;;GAGG;AACH,eAAO,MAAM,yBAAyB,SAC9B,QAAQ,cACF,MAAM,EAAE,aACT,MAAM,KAChB,MAAM,EAAE,GAAG,SA+Db,CAAA;AAID,eAAO,MAAM,gBAAgB,UACpB,WAAW,cACN,YAAY,GAAG,SAAS,SAC7B,MAAM,gBACC,MAAM,eACP,OAAO,qBACF,MAAM,EAAE,KACzB,WAsCF,CAAA;AAcD,eAAO,MAAM,qBAAqB,2BAEjC,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,UACb,WAAW,KACjB,OAAO,CAAC,WAAW,CA6BrB,CAAA"}

package/dist/esm/attribute.js

@@ -1,5 +1,6 @@
+import { asAttributeNode } from '@vltpkg/dss-parser';
 import { error } from '@vltpkg/error-cause';
-import { asAttributeNode } from "./types.js";
+import { removeDanglingEdges } from "./pseudo/helpers.js";
 // JSONField has a mapped type constituent that would coerce to [object Object]
 // when stringified, which is what we want in this case.
 // eslint-disable-next-line @typescript-eslint/no-base-to-string
@@ -93,17 +94,7 @@ export const filterAttributes = (state, comparator, value, propertyName, insensi
             deleteNode(node);
         }
     }
-    for (const edge of state.partial.edges) {
-        // edge.name is a special case in order
-        // to be able to match missing nodes by name
-        if (propertyName === 'name' && check(edge.name)) {
-            continue;
-        }
-        // remove any remaining dangling edge
-        if (!edge.to) {
-            state.partial.edges.delete(edge);
-        }
-    }
+    removeDanglingEdges(state);
     return state;
 };
 // ref: https://developer.mozilla.org/en-US/docs/Web/CSS/Attribute_selectors
@@ -128,11 +119,15 @@ export const attribute = async (state) => {
         if (state.loose) {
             return state;
         }
-        throw new Error(`Unsupported attribute operator: ${curr.operator}`);
+        throw error(`Unsupported attribute operator: ${curr.operator}`, {
+            found: state.current,
+        });
     }
     const value = curr.value || '';
     const propertyName = curr.attribute;
     const insensitive = !!curr.insensitive;
+    // Increment the commonCounter for specificity
+    state.specificity.commonCounter += 1;
     return filterAttributes(state, operatorFn, value, propertyName, insensitive);
 };
 //# sourceMappingURL=attribute.js.map

package/dist/esm/attribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"attribute.js","sourceRoot":"","sources":["../../src/attribute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAG3C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAK5C,+EAA+E;AAC/E,wDAAwD;AACxD,gEAAgE;AAChE,MAAM,iBAAiB,GAAG,CAAC,CAAY,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;AAErD;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,IAAc,EACd,UAAoB,EACpB,SAAiB,EACK,EAAE;IACxB,IAAI,CAAC,IAAI,CAAC,QAAQ;QAAE,OAAM;IAE1B,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAY,CAAC,IAAI,CAAC,QAAqB,CAAC,CAAC,CAAA;IACjE,MAAM,KAAK,GAAG,IAAI,GAAG,EAAa,CAAA;IAClC,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC5B,4CAA4C;YAC5C,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,KAAK,CAAC,yCAAyC,EAAE;oBACrD,KAAK,EAAE,UAAU;iBAClB,CAAC,CAAA;YACJ,CAAC;YACD,oBAAoB;YAEpB,wDAAwD;YACxD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;oBACrB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;gBACjB,CAAC;gBACD,SAAQ;YACV,CAAC;YAED,4CAA4C;YAC5C,IACE,OAAO,IAAI,KAAK,QAAQ;gBACxB,OAAO,IAAI,KAAK,QAAQ;gBACxB,OAAO,IAAI,KAAK,SAAS,EACzB,CAAC;gBACD,SAAQ;YACV,CAAC;YAED,+BAA+B;YAC/B,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBAChB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;gBAC3B,IAAI,SAAS,EAAE,CAAC;oBACd,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;wBACtB,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;oBACtB,CAAC;yBAAM,CAAC;wBACN,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;wBACrB,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;oBACzB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,iDAAiD;IACjD,uCAAuC;IACvC,IAAI,CAAC,KAAK,CAAC,IAAI;QAAE,OAAM;IAEvB,4CAA4C;IAC5C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;IACjC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;gBACrB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;YAC5C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAA;QACtC,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAG,OAAO,CAAC,CAAA;AACrB,CAAC,CAAA;AAED,qEAAqE;AACrE,4CAA4C;AAC5C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,KAAkB,EAClB,UAAoC,EACpC,KAAa,EACb,YAAoB,EACpB,WAAoB,EACpB,mBAA6B,EAAE,EAClB,EAAE;IACf,MAAM,KAAK,GAAG,CAAC,IAAe,EAAE,EAAE,CAChC,UAAU,EAAE,CACV,WAAW,CAAC,CAAC;QACX,iBAAiB,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE;QACvC,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,EACzB,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CAC1C,CAAA;IACH,MAAM,UAAU,GAAG,CAAC,IAAc,EAAE,EAAE;QACpC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAChC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAClC,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC,CAAA;IAED,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACvC,MAAM,QAAQ,GACZ,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;QAC7D,MAAM,KAAK,GAAG,yBAAyB,CACrC,IAAI,EACJ,QAAQ,EACR,YAAY,CACb,CAAA;QAED,wEAAwE;QACxE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;YACnB,UAAU,CAAC,IAAI,CAAC,CAAA;YAChB,SAAQ;QACV,CAAC;QAED,gEAAgE;QAChE,IAAI,UAAU,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACrC,UAAU,CAAC,IAAI,CAAC,CAAA;QAClB,CAAC;IACH,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACvC,uCAAuC;QACvC,4CAA4C;QAC5C,IAAI,YAAY,KAAK,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,SAAQ;QACV,CAAC;QACD,qCAAqC;QACrC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACb,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAClC,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,4EAA4E;AAC5E,MAAM,kBAAkB,GAAiC;IACvD,GAAG,EAAE,CAAC,IAAY,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK;IACjD,IAAI,EAAE,CAAC,IAAY,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;IAC1D,IAAI,EAAE,CAAC,IAAY,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IACxD,IAAI,EAAE,CAAC,IAAY,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE,CACjC,IAAI,GAAG,CAAS,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC;IAChD,IAAI,EAAE,CAAC,IAAY,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IACxD,IAAI,EAAE,CAAC,IAAY,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE,CACjC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,KAAK,GAAG,CAAC;IAChD,SAAS,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI;CACpC,CAAA;AACD,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAC1C,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CACnC,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC5B,KAAkB,EACI,EAAE;IACxB,MAAM,KAAK,CAAC,WAAW,EAAE,CAAA;IAEzB,MAAM,IAAI,GAAG,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAC3C,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IACnE,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,OAAO,KAAK,CAAA;QACd,CAAC;QAED,MAAM,IAAI,KAAK,CACb,mCAAmC,IAAI,CAAC,QAAQ,EAAE,CACnD,CAAA;IACH,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAA;IAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAA;IACnC,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAA;IACtC,OAAO,gBAAgB,CACrB,KAAK,EACL,UAAU,EACV,KAAK,EACL,YAAY,EACZ,WAAW,CACZ,CAAA;AACH,CAAC,CAAA","sourcesContent":["import { error } from '@vltpkg/error-cause'\nimport type { NodeLike } from '@vltpkg/graph'\nimport type { JSONField, Manifest } from '@vltpkg/types'\nimport { asAttributeNode } from './types.ts'\nimport type { ParserState } from './types.ts'\n\nexport type ComparatorFn = (attr: string, value?: string) => boolean\n\n// JSONField has a mapped type constituent that would coerce to [object Object]\n// when stringified, which is what we want in this case.\n// eslint-disable-next-line @typescript-eslint/no-base-to-string\nconst jsonFieldToString = (v: JSONField) => String(v)\n\n/**\n * Retrieve the {@link Manifest} values found at the given `properties`\n * location for a given {@link Node}.\n */\nexport const getManifestPropertyValues = (\n  node: NodeLike,\n  properties: string[],\n  attribute: string,\n): string[] | undefined => {\n  if (!node.manifest) return\n\n  const traverse = new Set<JSONField>([node.manifest as JSONField])\n  const props = new Set<JSONField>()\n  for (const key of properties) {\n    for (const prop of traverse) {\n      /* c8 ignore start - should be impossible */\n      if (!prop) {\n        throw error('failed to find nested property in :attr', {\n          found: properties,\n        })\n      }\n      /* c8 ignore stop */\n\n      // expand the result list to include nested array values\n      if (Array.isArray(prop)) {\n        for (const p of prop) {\n          traverse.add(p)\n        }\n        continue\n      }\n\n      // guard for inspecting keys of objects next\n      if (\n        typeof prop === 'string' ||\n        typeof prop === 'number' ||\n        typeof prop === 'boolean'\n      ) {\n        continue\n      }\n\n      // assign next value when found\n      if (key in prop) {\n        const nextValue = prop[key]\n        if (nextValue) {\n          if (key === attribute) {\n            props.add(nextValue)\n          } else {\n            traverse.delete(prop)\n            traverse.add(nextValue)\n          }\n        }\n      }\n    }\n  }\n  // if no value was found after trying a given key\n  // then there's nothing to be collected\n  if (!props.size) return\n\n  // expand the result to include array values\n  const collect = new Set<string>()\n  for (const prop of props) {\n    if (Array.isArray(prop)) {\n      for (const p of prop) {\n        collect.add(p ? jsonFieldToString(p) : '')\n      }\n    } else {\n      collect.add(jsonFieldToString(prop))\n    }\n  }\n\n  return [...collect]\n}\n\n// decorator style of function that will filter `ParserState` results\n// based on a provided `comparator` function\nexport const filterAttributes = (\n  state: ParserState,\n  comparator: ComparatorFn | undefined,\n  value: string,\n  propertyName: string,\n  insensitive: boolean,\n  prefixProperties: string[] = [],\n): ParserState => {\n  const check = (attr: JSONField) =>\n    comparator?.(\n      insensitive ?\n        jsonFieldToString(attr).toLowerCase()\n      : jsonFieldToString(attr),\n      insensitive ? value.toLowerCase() : value,\n    )\n  const deleteNode = (node: NodeLike) => {\n    for (const edge of node.edgesIn) {\n      state.partial.edges.delete(edge)\n    }\n    state.partial.nodes.delete(node)\n  }\n\n  for (const node of state.partial.nodes) {\n    const prefixes =\n      prefixProperties.length ? prefixProperties : [propertyName]\n    const attrs = getManifestPropertyValues(\n      node,\n      prefixes,\n      propertyName,\n    )\n\n    // if no attribute value was found, that means the attribute won't match\n    if (!attrs?.length) {\n      deleteNode(node)\n      continue\n    }\n\n    // if the node attribute value won't match, then remove the node\n    if (comparator && !attrs.some(check)) {\n      deleteNode(node)\n    }\n  }\n\n  for (const edge of state.partial.edges) {\n    // edge.name is a special case in order\n    // to be able to match missing nodes by name\n    if (propertyName === 'name' && check(edge.name)) {\n      continue\n    }\n    // remove any remaining dangling edge\n    if (!edge.to) {\n      state.partial.edges.delete(edge)\n    }\n  }\n  return state\n}\n\n// ref: https://developer.mozilla.org/en-US/docs/Web/CSS/Attribute_selectors\nconst attributeSelectors: Record<string, ComparatorFn> = {\n  '=': (attr: string, value = '') => attr === value,\n  '^=': (attr: string, value = '') => attr.startsWith(value),\n  '$=': (attr: string, value = '') => attr.endsWith(value),\n  '~=': (attr: string, value = '') =>\n    new Set<string>(attr.match(/\\w+/g)).has(value),\n  '*=': (attr: string, value = '') => attr.includes(value),\n  '|=': (attr: string, value = '') =>\n    attr === value || attr.startsWith(`${value}-`),\n  undefined: (attr: string) => !!attr,\n}\nexport const attributeSelectorsMap = new Map<string, ComparatorFn>(\n  Object.entries(attributeSelectors),\n)\n\n/**\n * Parse attributes selectors, e.g: `[name]`, `[name=value]`, etc\n */\nexport const attribute = async (\n  state: ParserState,\n): Promise<ParserState> => {\n  await state.cancellable()\n\n  const curr = asAttributeNode(state.current)\n  const operatorFn = attributeSelectorsMap.get(String(curr.operator))\n  if (!operatorFn) {\n    if (state.loose) {\n      return state\n    }\n\n    throw new Error(\n      `Unsupported attribute operator: ${curr.operator}`,\n    )\n  }\n\n  const value = curr.value || ''\n  const propertyName = curr.attribute\n  const insensitive = !!curr.insensitive\n  return filterAttributes(\n    state,\n    operatorFn,\n    value,\n    propertyName,\n    insensitive,\n  )\n}\n"]}
+{"version":3,"file":"attribute.js","sourceRoot":"","sources":["../../src/attribute.ts"],"names":[],"mappings":"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","sourcesContent":["import { asAttributeNode } from '@vltpkg/dss-parser'\nimport { error } from '@vltpkg/error-cause'\nimport { removeDanglingEdges } from './pseudo/helpers.ts'\nimport type { NodeLike, JSONField, Manifest } from '@vltpkg/types'\nimport type { ParserState } from './types.ts'\n\nexport type ComparatorFn = (attr: string, value?: string) => boolean\n\n// JSONField has a mapped type constituent that would coerce to [object Object]\n// when stringified, which is what we want in this case.\n// eslint-disable-next-line @typescript-eslint/no-base-to-string\nconst jsonFieldToString = (v: JSONField) => String(v)\n\n/**\n * Retrieve the {@link Manifest} values found at the given `properties`\n * location for a given {@link Node}.\n */\nexport const getManifestPropertyValues = (\n  node: NodeLike,\n  properties: string[],\n  attribute: string,\n): string[] | undefined => {\n  if (!node.manifest) return\n\n  const traverse = new Set<JSONField>([node.manifest as JSONField])\n  const props = new Set<JSONField>()\n  for (const key of properties) {\n    for (const prop of traverse) {\n      /* c8 ignore start - should be impossible */\n      if (!prop) {\n        throw error('failed to find nested property in :attr', {\n          found: properties,\n        })\n      }\n      /* c8 ignore stop */\n\n      // expand the result list to include nested array values\n      if (Array.isArray(prop)) {\n        for (const p of prop) {\n          traverse.add(p)\n        }\n        continue\n      }\n\n      // guard for inspecting keys of objects next\n      if (\n        typeof prop === 'string' ||\n        typeof prop === 'number' ||\n        typeof prop === 'boolean'\n      ) {\n        continue\n      }\n\n      // assign next value when found\n      if (key in prop) {\n        const nextValue = prop[key]\n        if (nextValue) {\n          if (key === attribute) {\n            props.add(nextValue)\n          } else {\n            traverse.delete(prop)\n            traverse.add(nextValue)\n          }\n        }\n      }\n    }\n  }\n  // if no value was found after trying a given key\n  // then there's nothing to be collected\n  if (!props.size) return\n\n  // expand the result to include array values\n  const collect = new Set<string>()\n  for (const prop of props) {\n    if (Array.isArray(prop)) {\n      for (const p of prop) {\n        collect.add(p ? jsonFieldToString(p) : '')\n      }\n    } else {\n      collect.add(jsonFieldToString(prop))\n    }\n  }\n\n  return [...collect]\n}\n\n// decorator style of function that will filter `ParserState` results\n// based on a provided `comparator` function\nexport const filterAttributes = (\n  state: ParserState,\n  comparator: ComparatorFn | undefined,\n  value: string,\n  propertyName: string,\n  insensitive: boolean,\n  prefixProperties: string[] = [],\n): ParserState => {\n  const check = (attr: JSONField) =>\n    comparator?.(\n      insensitive ?\n        jsonFieldToString(attr).toLowerCase()\n      : jsonFieldToString(attr),\n      insensitive ? value.toLowerCase() : value,\n    )\n  const deleteNode = (node: NodeLike) => {\n    for (const edge of node.edgesIn) {\n      state.partial.edges.delete(edge)\n    }\n    state.partial.nodes.delete(node)\n  }\n\n  for (const node of state.partial.nodes) {\n    const prefixes =\n      prefixProperties.length ? prefixProperties : [propertyName]\n    const attrs = getManifestPropertyValues(\n      node,\n      prefixes,\n      propertyName,\n    )\n\n    // if no attribute value was found, that means the attribute won't match\n    if (!attrs?.length) {\n      deleteNode(node)\n      continue\n    }\n\n    // if the node attribute value won't match, then remove the node\n    if (comparator && !attrs.some(check)) {\n      deleteNode(node)\n    }\n  }\n\n  removeDanglingEdges(state)\n  return state\n}\n\n// ref: https://developer.mozilla.org/en-US/docs/Web/CSS/Attribute_selectors\nconst attributeSelectors: Record<string, ComparatorFn> = {\n  '=': (attr: string, value = '') => attr === value,\n  '^=': (attr: string, value = '') => attr.startsWith(value),\n  '$=': (attr: string, value = '') => attr.endsWith(value),\n  '~=': (attr: string, value = '') =>\n    new Set<string>(attr.match(/\\w+/g)).has(value),\n  '*=': (attr: string, value = '') => attr.includes(value),\n  '|=': (attr: string, value = '') =>\n    attr === value || attr.startsWith(`${value}-`),\n  undefined: (attr: string) => !!attr,\n}\nexport const attributeSelectorsMap = new Map<string, ComparatorFn>(\n  Object.entries(attributeSelectors),\n)\n\n/**\n * Parse attributes selectors, e.g: `[name]`, `[name=value]`, etc\n */\nexport const attribute = async (\n  state: ParserState,\n): Promise<ParserState> => {\n  await state.cancellable()\n\n  const curr = asAttributeNode(state.current)\n  const operatorFn = attributeSelectorsMap.get(String(curr.operator))\n  if (!operatorFn) {\n    if (state.loose) {\n      return state\n    }\n\n    throw error(`Unsupported attribute operator: ${curr.operator}`, {\n      found: state.current,\n    })\n  }\n\n  const value = curr.value || ''\n  const propertyName = curr.attribute\n  const insensitive = !!curr.insensitive\n\n  // Increment the commonCounter for specificity\n  state.specificity.commonCounter += 1\n\n  return filterAttributes(\n    state,\n    operatorFn,\n    value,\n    propertyName,\n    insensitive,\n  )\n}\n"]}

package/dist/esm/combinator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"combinator.d.ts","sourceRoot":"","sources":["../../src/combinator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAY,MAAM,YAAY,CAAA;AA6GvD;;GAEG;AACH,eAAO,MAAM,UAAU,UAAiB,WAAW,yBAclD,CAAA"}
+{"version":3,"file":"combinator.d.ts","sourceRoot":"","sources":["../../src/combinator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAY,MAAM,YAAY,CAAA;AA6GvD;;GAEG;AACH,eAAO,MAAM,UAAU,UAAiB,WAAW,yBAgBlD,CAAA"}

package/dist/esm/combinator.js

@@ -1,4 +1,5 @@
-import { asCombinatorNode } from "./types.js";
+import { asCombinatorNode } from '@vltpkg/dss-parser';
+import { error } from '@vltpkg/error-cause';
 /**
  * Returns a new set of nodes, containing all direct dependencies
  * of the current list of nodes used.
@@ -102,7 +103,9 @@ export const combinator = async (state) => {
         if (state.loose) {
             return state;
         }
-        throw new Error(`Unsupported combinator: ${state.current.value}`);
+        throw error(`Unsupported combinator: ${state.current.value}`, {
+            found: state.current,
+        });
     }
     return parserFn(state);
 };

package/dist/esm/combinator.js.map

@@ -1 +1 @@
-{"version":3,"file":"combinator.js","sourceRoot":"","sources":["../../src/combinator.ts"],"names":[],"mappings":"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","sourcesContent":["import type { EdgeLike, NodeLike } from '@vltpkg/graph'\nimport { asCombinatorNode } from './types.ts'\nimport type { ParserState, ParserFn } from './types.ts'\n\n/**\n * Returns a new set of nodes, containing all direct dependencies\n * of the current list of nodes used.\n *\n * ref: https://developer.mozilla.org/en-US/docs/Web/CSS/Child_combinator\n */\nconst childCombinator = async (state: ParserState) => {\n  const traverse = new Set(state.partial.nodes)\n  state.partial.edges.clear()\n  state.partial.nodes.clear()\n\n  // visit direct children of the current list of nodes\n  // collecting refs to these children and the edges that\n  // connected them.\n  for (const node of traverse) {\n    for (const edge of node.edgesOut.values()) {\n      if (edge.to) {\n        state.partial.edges.add(edge)\n        state.partial.nodes.add(edge.to)\n      }\n    }\n  }\n\n  return state\n}\n\n/**\n * Returns a new set of nodes, containing nodes that are also children\n * of all parent nodes to the current list of nodes used.\n *\n * Note: The subsequent-sibling comparator has a behavior that is\n * somehow approximative of that of its css counterpart, given that\n * in the context of dependency graphs the order of appearance is\n * not necessarily controlled by the end user. The approach for\n * this comparator is to match all siblings of a node.\n *\n * ref: https://developer.mozilla.org/en-US/docs/Web/CSS/Subsequent-sibling_combinator\n */\nconst subsequentSiblingCombinator = async (state: ParserState) => {\n  const traverse = new Set(state.partial.nodes)\n  state.partial.edges.clear()\n  state.partial.nodes.clear()\n\n  // visits direct parents of the current list of node and then\n  // visit their children, collecting refs to all children and edges\n  // that are not in the original list of nodes.\n  for (const node of traverse) {\n    for (const edge of node.edgesIn) {\n      const parents: IterableIterator<EdgeLike> =\n        edge.from.edgesOut.values()\n      for (const edge of parents) {\n        if (edge.to && edge.to !== node) {\n          state.partial.edges.add(edge)\n          state.partial.nodes.add(edge.to)\n        }\n      }\n    }\n  }\n\n  return state\n}\n\n/**\n * Returns a new set of nodes containing all nodes that are descendents\n * to items in the current list of nodes.\n *\n * ref: https://developer.mozilla.org/en-US/docs/Web/CSS/Descendant_combinator\n */\nconst descendentCombinator = async (state: ParserState) => {\n  // spaces between tags selectors are a noop\n  if (state.prev?.type === 'tag' || state.next?.type === 'tag') {\n    return state\n  }\n\n  const traverse = new Set<NodeLike>(state.partial.nodes)\n  state.partial.edges.clear()\n  state.partial.nodes.clear()\n\n  // breadth-first traversal of the graph, starting from the current\n  // list of nodes, collecting all nodes and edges along the way\n  for (const node of traverse) {\n    const children = new Set<NodeLike>()\n    for (const edge of node.edgesOut.values()) {\n      if (edge.to) {\n        children.add(edge.to)\n        state.partial.edges.add(edge)\n        state.partial.nodes.add(edge.to)\n      }\n    }\n    for (const child of children) {\n      traverse.add(child)\n    }\n  }\n\n  return state\n}\n\nconst combinatorSelectors = {\n  '>': childCombinator,\n  '~': subsequentSiblingCombinator,\n  ' ': descendentCombinator,\n}\n\nconst combinatorSelectorsMap = new Map<string, ParserFn>(\n  Object.entries(combinatorSelectors),\n)\n\n/**\n * Parse css-style combinators, e.g: `>`, `~` and ` `\n */\nexport const combinator = async (state: ParserState) => {\n  await state.cancellable()\n\n  const curr = asCombinatorNode(state.current)\n  const parserFn =\n    curr.value && combinatorSelectorsMap.get(curr.value)\n  if (!parserFn) {\n    if (state.loose) {\n      return state\n    }\n\n    throw new Error(`Unsupported combinator: ${state.current.value}`)\n  }\n  return parserFn(state)\n}\n"]}
+{"version":3,"file":"combinator.js","sourceRoot":"","sources":["../../src/combinator.ts"],"names":[],"mappings":"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","sourcesContent":["import { asCombinatorNode } from '@vltpkg/dss-parser'\nimport { error } from '@vltpkg/error-cause'\nimport type { EdgeLike, NodeLike } from '@vltpkg/types'\nimport type { ParserState, ParserFn } from './types.ts'\n\n/**\n * Returns a new set of nodes, containing all direct dependencies\n * of the current list of nodes used.\n *\n * ref: https://developer.mozilla.org/en-US/docs/Web/CSS/Child_combinator\n */\nconst childCombinator = async (state: ParserState) => {\n  const traverse = new Set(state.partial.nodes)\n  state.partial.edges.clear()\n  state.partial.nodes.clear()\n\n  // visit direct children of the current list of nodes\n  // collecting refs to these children and the edges that\n  // connected them.\n  for (const node of traverse) {\n    for (const edge of node.edgesOut.values()) {\n      if (edge.to) {\n        state.partial.edges.add(edge)\n        state.partial.nodes.add(edge.to)\n      }\n    }\n  }\n\n  return state\n}\n\n/**\n * Returns a new set of nodes, containing nodes that are also children\n * of all parent nodes to the current list of nodes used.\n *\n * Note: The subsequent-sibling comparator has a behavior that is\n * somehow approximative of that of its css counterpart, given that\n * in the context of dependency graphs the order of appearance is\n * not necessarily controlled by the end user. The approach for\n * this comparator is to match all siblings of a node.\n *\n * ref: https://developer.mozilla.org/en-US/docs/Web/CSS/Subsequent-sibling_combinator\n */\nconst subsequentSiblingCombinator = async (state: ParserState) => {\n  const traverse = new Set(state.partial.nodes)\n  state.partial.edges.clear()\n  state.partial.nodes.clear()\n\n  // visits direct parents of the current list of node and then\n  // visit their children, collecting refs to all children and edges\n  // that are not in the original list of nodes.\n  for (const node of traverse) {\n    for (const edge of node.edgesIn) {\n      const parents: IterableIterator<EdgeLike> =\n        edge.from.edgesOut.values()\n      for (const edge of parents) {\n        if (edge.to && edge.to !== node) {\n          state.partial.edges.add(edge)\n          state.partial.nodes.add(edge.to)\n        }\n      }\n    }\n  }\n\n  return state\n}\n\n/**\n * Returns a new set of nodes containing all nodes that are descendents\n * to items in the current list of nodes.\n *\n * ref: https://developer.mozilla.org/en-US/docs/Web/CSS/Descendant_combinator\n */\nconst descendentCombinator = async (state: ParserState) => {\n  // spaces between tags selectors are a noop\n  if (state.prev?.type === 'tag' || state.next?.type === 'tag') {\n    return state\n  }\n\n  const traverse = new Set<NodeLike>(state.partial.nodes)\n  state.partial.edges.clear()\n  state.partial.nodes.clear()\n\n  // breadth-first traversal of the graph, starting from the current\n  // list of nodes, collecting all nodes and edges along the way\n  for (const node of traverse) {\n    const children = new Set<NodeLike>()\n    for (const edge of node.edgesOut.values()) {\n      if (edge.to) {\n        children.add(edge.to)\n        state.partial.edges.add(edge)\n        state.partial.nodes.add(edge.to)\n      }\n    }\n    for (const child of children) {\n      traverse.add(child)\n    }\n  }\n\n  return state\n}\n\nconst combinatorSelectors = {\n  '>': childCombinator,\n  '~': subsequentSiblingCombinator,\n  ' ': descendentCombinator,\n}\n\nconst combinatorSelectorsMap = new Map<string, ParserFn>(\n  Object.entries(combinatorSelectors),\n)\n\n/**\n * Parse css-style combinators, e.g: `>`, `~` and ` `\n */\nexport const combinator = async (state: ParserState) => {\n  await state.cancellable()\n\n  const curr = asCombinatorNode(state.current)\n  const parserFn =\n    curr.value && combinatorSelectorsMap.get(curr.value)\n  if (!parserFn) {\n    if (state.loose) {\n      return state\n    }\n\n    throw error(`Unsupported combinator: ${state.current.value}`, {\n      found: state.current,\n    })\n  }\n  return parserFn(state)\n}\n"]}

package/dist/esm/id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"id.d.ts","sourceRoot":"","sources":["../../src/id.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAM7C;;GAEG;AACH,eAAO,MAAM,EAAE,UAAiB,WAAW,yBAc1C,CAAA"}
+{"version":3,"file":"id.d.ts","sourceRoot":"","sources":["../../src/id.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE7C;;GAEG;AACH,eAAO,MAAM,EAAE,UACN,WAAW,KACjB,OAAO,CAAC,WAAW,CAoCrB,CAAA"}

package/dist/esm/id.js

@@ -1,20 +1,36 @@
+import { asIdentifierNode } from '@vltpkg/dss-parser';
 import { error } from '@vltpkg/error-cause';
-import { asIdentifierNode } from "./types.js";
-import { attributeSelectorsMap, filterAttributes, } from "./attribute.js";
 /**
  * Parse ids, e.g: `#foo`
  */
 export const id = async (state) => {
     const { value } = asIdentifierNode(state.current);
-    const comparator = attributeSelectorsMap.get('=');
     /* c8 ignore start - should not be possible */
     if (!value) {
         throw error('Missing identifier name');
     }
-    if (!comparator) {
-        throw error('Could not find attribute selector comparator');
-    }
     /* c8 ignore stop */
-    return filterAttributes(state, comparator, value, 'name', true);
+    // Filter out any edges and their linked
+    // nodes if they don't match the id value
+    for (const edge of state.partial.edges) {
+        if (edge.name !== value) {
+            state.partial.edges.delete(edge);
+            if (edge.to) {
+                state.partial.nodes.delete(edge.to);
+            }
+        }
+    }
+    // Filter out importer nodes, this extra step is needed
+    // to filter out nodes that have no edges linking to them
+    for (const node of state.partial.nodes) {
+        if (node.edgesIn.size === 0 &&
+            node.name !== value &&
+            state.partial.nodes.has(node)) {
+            state.partial.nodes.delete(node);
+        }
+    }
+    // Increment the idCounter for specificity
+    state.specificity.idCounter += 1;
+    return state;
 };
 //# sourceMappingURL=id.js.map

package/dist/esm/id.js.map

@@ -1 +1 @@
-{"version":3,"file":"id.js","sourceRoot":"","sources":["../../src/id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,EACL,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,gBAAgB,CAAA;AAEvB;;GAEG;AACH,MAAM,CAAC,MAAM,EAAE,GAAG,KAAK,EAAE,KAAkB,EAAE,EAAE;IAC7C,MAAM,EAAE,KAAK,EAAE,GAAG,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACjD,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAEjD,8CAA8C;IAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,KAAK,CAAC,yBAAyB,CAAC,CAAA;IACxC,CAAC;IACD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,KAAK,CAAC,8CAA8C,CAAC,CAAA;IAC7D,CAAC;IACD,oBAAoB;IAEpB,OAAO,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;AACjE,CAAC,CAAA","sourcesContent":["import { error } from '@vltpkg/error-cause'\nimport { asIdentifierNode } from './types.ts'\nimport type { ParserState } from './types.ts'\nimport {\n  attributeSelectorsMap,\n  filterAttributes,\n} from './attribute.ts'\n\n/**\n * Parse ids, e.g: `#foo`\n */\nexport const id = async (state: ParserState) => {\n  const { value } = asIdentifierNode(state.current)\n  const comparator = attributeSelectorsMap.get('=')\n\n  /* c8 ignore start - should not be possible */\n  if (!value) {\n    throw error('Missing identifier name')\n  }\n  if (!comparator) {\n    throw error('Could not find attribute selector comparator')\n  }\n  /* c8 ignore stop */\n\n  return filterAttributes(state, comparator, value, 'name', true)\n}\n"]}
+{"version":3,"file":"id.js","sourceRoot":"","sources":["../../src/id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAG3C;;GAEG;AACH,MAAM,CAAC,MAAM,EAAE,GAAG,KAAK,EACrB,KAAkB,EACI,EAAE;IACxB,MAAM,EAAE,KAAK,EAAE,GAAG,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAEjD,8CAA8C;IAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,KAAK,CAAC,yBAAyB,CAAC,CAAA;IACxC,CAAC;IACD,oBAAoB;IAEpB,wCAAwC;IACxC,yCAAyC;IACzC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACvC,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YACxB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAChC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;gBACZ,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACrC,CAAC;QACH,CAAC;IACH,CAAC;IAED,uDAAuD;IACvD,yDAAyD;IACzD,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACvC,IACE,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC;YACvB,IAAI,CAAC,IAAI,KAAK,KAAK;YACnB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAC7B,CAAC;YACD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAClC,CAAC;IACH,CAAC;IAED,0CAA0C;IAC1C,KAAK,CAAC,WAAW,CAAC,SAAS,IAAI,CAAC,CAAA;IAEhC,OAAO,KAAK,CAAA;AACd,CAAC,CAAA","sourcesContent":["import { asIdentifierNode } from '@vltpkg/dss-parser'\nimport { error } from '@vltpkg/error-cause'\nimport type { ParserState } from './types.ts'\n\n/**\n * Parse ids, e.g: `#foo`\n */\nexport const id = async (\n  state: ParserState,\n): Promise<ParserState> => {\n  const { value } = asIdentifierNode(state.current)\n\n  /* c8 ignore start - should not be possible */\n  if (!value) {\n    throw error('Missing identifier name')\n  }\n  /* c8 ignore stop */\n\n  // Filter out any edges and their linked\n  // nodes if they don't match the id value\n  for (const edge of state.partial.edges) {\n    if (edge.name !== value) {\n      state.partial.edges.delete(edge)\n      if (edge.to) {\n        state.partial.nodes.delete(edge.to)\n      }\n    }\n  }\n\n  // Filter out importer nodes, this extra step is needed\n  // to filter out nodes that have no edges linking to them\n  for (const node of state.partial.nodes) {\n    if (\n      node.edgesIn.size === 0 &&\n      node.name !== value &&\n      state.partial.nodes.has(node)\n    ) {\n      state.partial.nodes.delete(node)\n    }\n  }\n\n  // Increment the idCounter for specificity\n  state.specificity.idCounter += 1\n\n  return state\n}\n"]}

package/dist/esm/index.d.ts

@@ -1,15 +1,48 @@
-import type { GraphLike } from '@vltpkg/graph';
-import type { SpecOptions } from '@vltpkg/spec/browser';
-import type { ParserState, QueryResponse } from './types.ts';
+import type { EdgeLike, NodeLike } from '@vltpkg/types';
+import type { SecurityArchiveLike } from '@vltpkg/security-archive';
+import type { HostContextsMap, ParsedSelectorToken, ParserState, QueryResponse } from './types.ts';
+import type { DepID } from '@vltpkg/dep-id';
 export * from './types.ts';
+export type SearchOptions = {
+    signal: AbortSignal;
+    scopeIDs?: DepID[];
+};
 export declare const walk: (state: ParserState) => Promise<ParserState>;
 export type QueryOptions = {
-    graph: GraphLike;
-    specOptions: SpecOptions;
+    edges: Set<EdgeLike>;
+    nodes: Set<NodeLike>;
+    importers: Set<NodeLike>;
+    retries?: number;
+    securityArchive: SecurityArchiveLike | undefined;
+    hostContexts?: HostContextsMap;
 };
+/**
+ * The Query class is used to search the graph for nodes and edges
+ * using the Dependency Selector Syntax (DSS).
+ */
 export declare class Query {
     #private;
-    constructor({ graph, specOptions }: QueryOptions);
-    search(query: string, signal?: AbortSignal): Promise<QueryResponse>;
+    /**
+     * Helper method to determine if a given query string is using any of
+     * the known security selectors. This is useful so that operations can
+     * skip hydrating the security archive if it's not needed.
+     */
+    static hasSecuritySelectors(query: string): boolean;
+    /**
+     * Sorts an array of QueryResponse objects by specificity. Objects with
+     * higher idCounter values come first, if idCounter values are equal,
+     * then objects with higher commonCounter values come first. Otherwise,
+     * the original order is preserved.
+     */
+    static specificitySort(responses: QueryResponse[]): QueryResponse[];
+    constructor({ edges, nodes, importers, retries, securityArchive, hostContexts, }: QueryOptions);
+    /**
+     * Search the graph for nodes and edges that match the given query.
+     */
+    search(query: string, { signal, scopeIDs, }: SearchOptions): Promise<QueryResponse>;
+    /**
+     * Parses a query string in order to retrieve an array of tokens.
+     */
+    static getQueryTokens(query: string): ParsedSelectorToken[];
 }
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAY,SAAS,EAAY,MAAM,eAAe,CAAA;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAYvD,OAAO,KAAK,EAEV,WAAW,EAEX,aAAa,EACd,MAAM,YAAY,CAAA;AAEnB,cAAc,YAAY,CAAA;AAiC1B,eAAO,MAAM,IAAI,UACR,WAAW,KACjB,OAAO,CAAC,WAAW,CAmDrB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,SAAS,CAAA;IAChB,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AAED,qBAAa,KAAK;;gBAKJ,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,YAAY;IAM1C,MAAM,CACV,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,aAAa,CAAC;CAkD1B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAKnE,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACnB,WAAW,EAEX,aAAa,EAGd,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAE3C,cAAc,YAAY,CAAA;AAE1B,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,WAAW,CAAA;IACnB,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAA;CACnB,CAAA;AA+CD,eAAO,MAAM,IAAI,UACR,WAAW,KACjB,OAAO,CAAC,WAAW,CAsDrB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;IACpB,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;IACpB,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,mBAAmB,GAAG,SAAS,CAAA;IAChD,YAAY,CAAC,EAAE,eAAe,CAAA;CAC/B,CAAA;AAiDD;;;GAGG;AACH,qBAAa,KAAK;;IAShB;;;;OAIG;IACH,MAAM,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IASnD;;;;;OAKG;IACH,MAAM,CAAC,eAAe,CACpB,SAAS,EAAE,aAAa,EAAE,GACzB,aAAa,EAAE;gBAqBN,EACV,KAAK,EACL,KAAK,EACL,SAAS,EACT,OAAO,EACP,eAAe,EACf,YAAY,GACb,EAAE,YAAY;IAyLf;;OAEG;IACG,MAAM,CACV,KAAK,EAAE,MAAM,EACb,EACE,MAAM,EACN,QAA0C,GAC3C,EAAE,aAAa,GACf,OAAO,CAAC,aAAa,CAAC;IAkFzB;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,mBAAmB,EAAE;CAmE5D"}