@markuplint/selector 3.3.0 → 3.4.0

package/lib/extended-selector/aria-pseudo-class.js

@@ -44,7 +44,7 @@ function ariaPseudoClass() {
 exports.ariaPseudoClass = ariaPseudoClass;
 function ariaPseudoClassParser(syntax) {
     const [_query, _version] = syntax.split('|');
-    const query = _query.replace(/\s+/g, '').toLowerCase();
+    const query = _query === null || _query === void 0 ? void 0 : _query.replace(/\s+/g, '').toLowerCase();
     const version = _version === '1.1' ? '1.1' : '1.2';
     switch (query) {
         case 'hasname': {

package/lib/extended-selector/aria-role-pseudo-class.js

@@ -23,10 +23,11 @@ function ariaRolePseudoClass(specs) {
 }
 exports.ariaRolePseudoClass = ariaRolePseudoClass;
 function ariaPseudoClassParser(syntax) {
+    var _a;
     const [roleName, _version] = syntax.split('|');
     const version = _version === '1.1' ? '1.1' : '1.2';
     return {
-        role: roleName.trim().toLowerCase(),
+        role: (_a = roleName === null || roleName === void 0 ? void 0 : roleName.trim().toLowerCase()) !== null && _a !== void 0 ? _a : syntax.trim().toLowerCase(),
         version,
     };
 }

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

@@ -1,3 +1,3 @@
 export declare class InvalidSelectorError extends Error {
-    name: string;
+	name: string;
 }

package/lib/match-selector.d.ts

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

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

@@ -1,3 +1,7 @@
-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/regex-selector-matches.js

@@ -18,7 +18,7 @@ function regexSelectorMatches(reg, raw, ignoreCase) {
 exports.regexSelectorMatches = regexSelectorMatches;
 function toRegexp(pattern) {
     const matched = pattern.match(/^\/(.+)\/([ig]*)$/i);
-    if (matched) {
+    if (matched && matched[1]) {
         return new RegExp(matched[1], matched[2]);
     }
     return pattern;

package/lib/selector.d.ts

@@ -1,9 +1,9 @@
 import type { SelectorResult, Specificity } from './types';
 type ExtendedPseudoClass = 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

@@ -48,13 +48,14 @@ class Ruleset {
         return new Ruleset(selectors, extended, 0);
     }
     constructor(selectors, extended, depth) {
+        var _a;
         _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 = (head === null || head === void 0 ? void 0 : head.headCombinator) || null;
         if (this.headCombinator) {
             if (depth <= 0) {
-                throw new invalid_selector_error_1.InvalidSelectorError(`'${tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0].selector}' is not a valid selector`);
+                throw new invalid_selector_error_1.InvalidSelectorError(`'${(_a = tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0]) === null || _a === void 0 ? void 0 : _a.selector}' is not a valid selector`);
             }
         }
     }
@@ -71,12 +72,13 @@ class Ruleset {
 _Ruleset_selectorGroup = new WeakMap();
 class StructuredSelector {
     constructor(selector, depth, extended) {
+        var _a;
         _StructuredSelector_edge.set(this, void 0);
         _StructuredSelector_selector.set(this, void 0);
         tslib_1.__classPrivateFieldSet(this, _StructuredSelector_selector, selector, "f");
         tslib_1.__classPrivateFieldSet(this, _StructuredSelector_edge, new SelectorTarget(extended, depth), "f");
         this.headCombinator =
-            tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes[0].type === 'combinator' ? tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes[0].value || null : null;
+            ((_a = tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes[0]) === null || _a === void 0 ? void 0 : _a.type) === 'combinator' ? tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes[0].value || null : null;
         if (0 < depth && this.headCombinator) {
             tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes.unshift((0, postcss_selector_parser_1.pseudo)({ value: ':scope' }));
         }
@@ -738,6 +740,9 @@ function pseudoMatch(pseudo, el, scope, extended, depth) {
                 }
                 const content = pseudo.nodes.map(node => node.toString()).join('');
                 const hook = extended[ext];
+                if (!hook) {
+                    continue;
+                }
                 const matcher = hook(content);
                 return matcher(el);
             }

package/lib/types.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/selector",
-	"version": "3.3.0",
+	"version": "3.4.0",
 	"description": "Extended W3C Selectors matcher",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -25,10 +25,10 @@
 		"tslib": "^2.4.1"
 	},
 	"devDependencies": {
-		"@markuplint/ml-spec": "3.3.0",
+		"@markuplint/ml-spec": "3.4.0",
 		"@types/debug": "^4.1.7",
 		"@types/jsdom": "16",
 		"jsdom": "19"
 	},
-	"gitHead": "791fb22a4df7acb985ced3808923fba0cd95c28a"
+	"gitHead": "a83e0f5f214a9bbcc0286b9e269074ddca6189e7"
 }