@vltpkg/dss-parser 1.4.0 → 1.6.0

package/README.md

@@ -27,9 +27,11 @@ const ast = parse(':root > *')
 - dangling combinators, e.g. `:root >`, `> >`
 - bare words, strings, empty ids / attributes, e.g. `foo`, `.dev`,
   `"foo"`, `#`, `[]`
+- a part selector (`:skill()`) with an empty argument, not ending a
+  top-level selector, or inside `:not()`/`:is()`/`:has()`
 
-`:is()` arguments are a forgiving list: only the last group above is
-rejected there.
+`:is()` arguments are a forgiving list: only the bare words group and
+the part selector rule apply there.
 
 Pass `{ loose: true }` to skip the DSS checks (malformed syntax still
 throws):
@@ -38,5 +40,5 @@ throws):
 parse('#a, :unknown', { loose: true }) // no throw
 ```
 
-Supported names are exported as `pseudoClassNames`, `combinatorNames`
-and `attributeOperatorNames`.
+Supported names are exported as `pseudoClassNames`, `combinatorNames`,
+`attributeOperatorNames` and `partPseudoNames`.

package/dist/grammar.d.ts

@@ -1,8 +1,15 @@
 /**
  * Pseudo-class names supported by DSS, without the leading `:`.
  */
-export declare const pseudoClassNames: readonly ["abandoned", "attr", "built", "confused", "cve", "cwe", "debug", "deprecated", "dev", "diff", "dist", "dynamic", "empty", "entropic", "env", "eval", "fs", "has", "host", "hostname", "is", "license", "link", "malware", "minified", "missing", "native", "network", "not", "obfuscated", "optional", "outdated", "overridden", "path", "peer", "prerelease", "private", "prod", "project", "published", "registry", "root", "scanned", "scope", "score", "scripts", "semver", "sev", "severity", "shell", "shrinkwrap", "spec", "squat", "suspicious", "tracker", "trivial", "type", "undesirable", "unknown", "unmaintained", "unpopular", "unstable", "v", "vuln", "vulnerable", "workspace"];
+export declare const pseudoClassNames: readonly ["abandoned", "attr", "built", "confused", "cve", "cwe", "debug", "deprecated", "dev", "diff", "dist", "dynamic", "empty", "entropic", "env", "eval", "fs", "has", "host", "hostname", "is", "license", "link", "malware", "minified", "missing", "native", "network", "not", "obfuscated", "optional", "outdated", "overridden", "path", "peer", "prerelease", "private", "prod", "project", "published", "registry", "root", "scanned", "scope", "score", "scripts", "semver", "sev", "severity", "shell", "shrinkwrap", "skill", "skills", "spec", "squat", "suspicious", "tracker", "trivial", "type", "undesirable", "unknown", "unmaintained", "unpopular", "unstable", "v", "vuln", "vulnerable", "workspace"];
 export type PseudoClassName = (typeof pseudoClassNames)[number];
+/**
+ * Part selectors: pseudo-classes that pick a part of the packages
+ * their selector matched, e.g. `:skill()`. They must end a top-level
+ * selector.
+ */
+export declare const partPseudoNames: readonly ["skill"];
+export type PartPseudoName = (typeof partPseudoNames)[number];
 /**
  * Combinators supported by DSS.
  */

package/dist/grammar.js

@@ -53,6 +53,8 @@ export const pseudoClassNames = [
     'severity',
     'shell',
     'shrinkwrap',
+    'skill',
+    'skills',
     'spec',
     'squat',
     'suspicious',
@@ -69,6 +71,12 @@ export const pseudoClassNames = [
     'vulnerable',
     'workspace',
 ];
+/**
+ * Part selectors: pseudo-classes that pick a part of the packages
+ * their selector matched, e.g. `:skill()`. They must end a top-level
+ * selector.
+ */
+export const partPseudoNames = ['skill'];
 /**
  * Combinators supported by DSS.
  */

package/dist/index.js

@@ -1,6 +1,6 @@
 import postcssSelectorParser from 'postcss-selector-parser';
 import { syntaxError } from '@vltpkg/error-cause';
-import { attributeOperatorNames, combinatorNames, pseudoClassNames, } from "./grammar.js";
+import { attributeOperatorNames, combinatorNames, partPseudoNames, pseudoClassNames, } from "./grammar.js";
 import { asSelectorNode, isAttributeNode, isCombinatorNode, isPseudoNode, isStringNode, isTagNode, } from "./types.js";
 export * from "./types.js";
 export * from "./grammar.js";
@@ -25,6 +25,7 @@ const pseudoCleanUpNeeded = new Set([
 ]);
 const hasParamsToEscape = (node) => pseudoCleanUpNeeded.has(node.value);
 const pseudoClasses = new Set(pseudoClassNames);
+const partPseudos = new Set(partPseudoNames);
 const combinators = new Set(combinatorNames);
 const attributeOperators = new Set(attributeOperatorNames);
 // pseudo-classes taking selector args, all others take strings
@@ -33,9 +34,10 @@ const invalid = (message, found) => syntaxError(message, { code: 'EQUERY', found
 /**
  * Checks a parsed selector against the DSS grammar.
  * `forgiving`: inside `:is()`, only bare words / strings / empty
- * `#` `[]` are rejected.
+ * `#` `[]` and part selectors are rejected.
+ * `nested`: inside `:not()`/`:is()`/`:has()` (part selectors rejected).
  */
-const validate = (selector, query, forgiving = false) => {
+const validate = (selector, query, forgiving = false, nested = false) => {
     const nodes = selector.nodes.filter(n => n.type !== 'comment');
     if (!nodes.length && !forgiving) {
         throw invalid('Empty selector', query);
@@ -68,9 +70,19 @@ const validate = (selector, query, forgiving = false) => {
                     return;
                 throw invalid(`Unsupported pseudo-class: ${node.value}`, node.value);
             }
+            if (partPseudos.has(name)) {
+                if (nested || i < nodes.length - 1) {
+                    throw invalid(`:${name}() must end a top-level selector`, node.value);
+                }
+                // `:skill`, `:skill()`, `:skill(a,)`
+                if (!node.nodes.length ||
+                    node.nodes.some(s => s.nodes.every(n => n.type === 'comment'))) {
+                    throw invalid(`Missing ${name} name in :${name}()`, node.value);
+                }
+            }
             if (selectorPseudos.has(name)) {
                 for (const n of node.nodes) {
-                    validate(asSelectorNode(n), query, forgiving || name === 'is');
+                    validate(asSelectorNode(n), query, forgiving || name === 'is', true);
                 }
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vltpkg/dss-parser",
   "description": "The Dependency Selector Syntax (DSS) parser",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vltpkg/vltpkg.git",
@@ -13,7 +13,7 @@
     "url": "http://vlt.sh"
   },
   "dependencies": {
-    "@vltpkg/error-cause": "1.4.0",
+    "@vltpkg/error-cause": "1.6.0",
     "postcss-selector-parser": "^7.1.1"
   },
   "devDependencies": {