@markuplint/selector 3.8.0 → 3.10.0

package/lib/create-selector.d.ts

@@ -1,3 +1,3 @@
 import type { MLMLSpec } from '@markuplint/ml-spec';
 import { Selector } from './selector';
-export declare function createSelector(selector: string, specs: MLMLSpec): Selector;
+export declare function createSelector(selector: string, specs?: MLMLSpec): Selector;

package/lib/create-selector.js

@@ -11,11 +11,13 @@ function createSelector(selector, specs) {
     if (instance) {
         return instance;
     }
-    instance = new selector_1.Selector(selector, {
-        model: (0, content_model_pseudo_class_1.contentModelPseudoClass)(specs),
-        aria: (0, aria_pseudo_class_1.ariaPseudoClass)(),
-        role: (0, aria_role_pseudo_class_1.ariaRolePseudoClass)(specs),
-    });
+    instance = new selector_1.Selector(selector, specs
+        ? {
+            model: (0, content_model_pseudo_class_1.contentModelPseudoClass)(specs),
+            aria: (0, aria_pseudo_class_1.ariaPseudoClass)(),
+            role: (0, aria_role_pseudo_class_1.ariaRolePseudoClass)(specs),
+        }
+        : undefined);
     caches.set(selector, instance);
     return instance;
 }

package/lib/index.d.ts

@@ -1,4 +1,5 @@
 export { compareSpecificity } from './compare-specificity';
 export { matchSelector } from './match-selector';
 export { createSelector } from './create-selector';
+export { InvalidSelectorError } from './invalid-selector-error';
 export * from './types';

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSelector = exports.matchSelector = exports.compareSpecificity = void 0;
+exports.InvalidSelectorError = exports.createSelector = exports.matchSelector = exports.compareSpecificity = void 0;
 const tslib_1 = require("tslib");
 var compare_specificity_1 = require("./compare-specificity");
 Object.defineProperty(exports, "compareSpecificity", { enumerable: true, get: function () { return compare_specificity_1.compareSpecificity; } });
@@ -8,4 +8,6 @@ var match_selector_1 = require("./match-selector");
 Object.defineProperty(exports, "matchSelector", { enumerable: true, get: function () { return match_selector_1.matchSelector; } });
 var create_selector_1 = require("./create-selector");
 Object.defineProperty(exports, "createSelector", { enumerable: true, get: function () { return create_selector_1.createSelector; } });
+var invalid_selector_error_1 = require("./invalid-selector-error");
+Object.defineProperty(exports, "InvalidSelectorError", { enumerable: true, get: function () { return invalid_selector_error_1.InvalidSelectorError; } });
 tslib_1.__exportStar(require("./types"), exports);

package/lib/invalid-selector-error.d.ts

@@ -1,3 +1,5 @@
 export declare class InvalidSelectorError extends Error {
-	name: string;
+    name: string;
+    selector: string;
+    constructor(selector: string, message?: string);
 }

package/lib/invalid-selector-error.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvalidSelectorError = void 0;
 class InvalidSelectorError extends Error {
-    constructor() {
-        super(...arguments);
+    constructor(selector, message) {
+        super(message !== null && message !== void 0 ? message : `Invalid selector: "${selector}"`);
         this.name = 'InvalidSelectorError';
+        this.selector = selector;
     }
 }
 exports.InvalidSelectorError = InvalidSelectorError;

package/lib/match-selector.d.ts

@@ -1,13 +1,13 @@
 import type { Specificity, RegexSelector } from './types';
 export type SelectorMatches = SelectorMatched | SelectorUnmatched;
 type SelectorMatched = {
-	readonly matched: true;
-	readonly selector: string;
-	readonly specificity: Specificity;
-	readonly data?: Readonly<Record<string, string>>;
+    readonly matched: true;
+    readonly selector: string;
+    readonly specificity: Specificity;
+    readonly data?: Readonly<Record<string, string>>;
 };
 type SelectorUnmatched = {
-	readonly matched: false;
+    readonly matched: false;
 };
 export declare function matchSelector(el: Node, selector: string | RegexSelector | undefined): SelectorMatches;
 export {};

package/lib/regex-selector-matches.d.ts

@@ -1,7 +1,3 @@
-export declare function regexSelectorMatches(
-	reg: string,
-	raw: string,
-	ignoreCase: boolean,
-): {
-	[x: string]: string;
+export declare function regexSelectorMatches(reg: string, raw: string, ignoreCase: boolean): {
+    [x: string]: string;
 } | null;

package/lib/selector.d.ts

@@ -1,9 +1,9 @@
 import type { SelectorResult, Specificity } from './types';
 type ExtendedPseudoClass = Readonly<Record<string, (content: string) => (el: Element) => SelectorResult>>;
 export declare class Selector {
-	#private;
-	constructor(selector: string, extended?: ExtendedPseudoClass);
-	match(el: Node, scope?: ParentNode | null): Specificity | false;
-	search(el: Node, scope?: ParentNode | null): SelectorResult[];
+    #private;
+    constructor(selector: string, extended?: ExtendedPseudoClass);
+    match(el: Node, scope?: ParentNode | null): Specificity | false;
+    search(el: Node, scope?: ParentNode | null): SelectorResult[];
 }
 export {};

package/lib/selector.js

@@ -51,21 +51,24 @@ class Ruleset {
         }
         catch (e) {
             if (e instanceof Error) {
-                throw new Error(`${e.message} At the selector: "${selector}"`);
+                throw new invalid_selector_error_1.InvalidSelectorError(selector);
             }
             throw e;
         }
         return new Ruleset(selectors, extended, 0);
     }
     constructor(selectors, extended, depth) {
-        var _a, _b;
+        var _a, _b, _c;
         _Ruleset_selectorGroup.set(this, []);
         tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f").push(...selectors.map(selector => new StructuredSelector(selector, depth, extended)));
         const head = tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0];
         this.headCombinator = (_a = head === null || head === void 0 ? void 0 : head.headCombinator) !== null && _a !== void 0 ? _a : null;
         if (this.headCombinator) {
             if (depth <= 0) {
-                throw new invalid_selector_error_1.InvalidSelectorError(`'${(_b = tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0]) === null || _b === void 0 ? void 0 : _b.selector}' is not a valid selector`);
+                if ((_b = tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0]) === null || _b === void 0 ? void 0 : _b.selector) {
+                    throw new invalid_selector_error_1.InvalidSelectorError((_c = tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0]) === null || _c === void 0 ? void 0 : _c.selector);
+                }
+                throw new Error('Combinated selector depth is not expected');
             }
         }
     }
@@ -227,7 +230,7 @@ class SelectorTarget {
                 const has = [];
                 const not = [];
                 let ancestor = el.parentElement;
-                let specificity;
+                let specificity = undefined;
                 while (ancestor) {
                     const res = target.match(ancestor, scope, count + 1);
                     if (!specificity) {
@@ -365,7 +368,7 @@ class SelectorTarget {
                 const has = [];
                 const not = [];
                 let prev = el.previousElementSibling;
-                let specificity;
+                let specificity = undefined;
                 while (prev) {
                     const res = target.match(prev, scope, count + 1);
                     if (!specificity) {
@@ -814,7 +817,7 @@ el) {
 function getSpecificity(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 results) {
-    let specificity;
+    let specificity = undefined;
     for (const result of results) {
         if (specificity) {
             const order = (0, compare_specificity_1.compareSpecificity)(specificity, result.specificity);

package/lib/types.d.ts

@@ -1,24 +1,24 @@
 export type Specificity = readonly [number, number, number];
 export type SelectorResult = SelectorMatchedResult | SelectorUnmatchedResult;
 export type SelectorMatchedResult = {
-	readonly specificity: Specificity;
-	readonly matched: true;
-	readonly nodes: readonly (Element | Text)[];
-	readonly has: readonly SelectorMatchedResult[];
+    readonly specificity: Specificity;
+    readonly matched: true;
+    readonly nodes: readonly (Element | Text)[];
+    readonly has: readonly SelectorMatchedResult[];
 };
 export type SelectorUnmatchedResult = {
-	readonly specificity: Specificity;
-	readonly matched: false;
-	readonly not?: readonly SelectorMatchedResult[];
+    readonly specificity: Specificity;
+    readonly matched: false;
+    readonly not?: readonly SelectorMatchedResult[];
 };
 export type RegexSelector = RegexSelectorWithoutCombination & {
-	readonly combination?: {
-		readonly combinator: RegexSelectorCombinator;
-	} & RegexSelector;
+    readonly combination?: {
+        readonly combinator: RegexSelectorCombinator;
+    } & RegexSelector;
 };
 export type RegexSelectorCombinator = ' ' | '>' | '+' | '~' | ':has(+)' | ':has(~)';
 export type RegexSelectorWithoutCombination = {
-	readonly nodeName?: string;
-	readonly attrName?: string;
-	readonly attrValue?: string;
+    readonly nodeName?: string;
+    readonly attrName?: string;
+    readonly attrValue?: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/selector",
-	"version": "3.8.0",
+	"version": "3.10.0",
 	"description": "Extended W3C Selectors matcher",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -20,16 +20,16 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-spec": "3.8.0",
-		"@types/debug": "^4.1.7",
+		"@markuplint/ml-spec": "3.10.0",
+		"@types/debug": "^4.1.8",
 		"debug": "^4.3.4",
-		"postcss-selector-parser": "^6.0.11",
-		"tslib": "^2.4.1",
-		"type-fest": "^3.8.0"
+		"postcss-selector-parser": "^6.0.13",
+		"tslib": "^2.5.3",
+		"type-fest": "^3.11.1"
 	},
 	"devDependencies": {
 		"@types/jsdom": "21.1.1",
-		"jsdom": "21.1.1"
+		"jsdom": "22.0.0"
 	},
-	"gitHead": "adc6e432cccba7cfad0dc8bf9f92e5aaf1107359"
+	"gitHead": "9547b8dca20736a93e4d01af2d61bee314ba5718"
 }