@markuplint/selector 3.5.0 → 3.6.1

package/lib/extended-selector/content-model-pseudo-class.js

@@ -42,7 +42,7 @@ function contentModelPseudoClass(specs) {
         })
             .flat()
             .filter((m) => m.matched);
-        if (matched.length) {
+        if (matched.length > 0) {
             return {
                 specificity: [0, 1, 0],
                 matched: true,

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 = {
-    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/match-selector.js

@@ -9,7 +9,7 @@ const selector_1 = require("./selector");
 function matchSelector(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 el, selector) {
-    if (!selector) {
+    if (selector == null || selector === '') {
         return {
             matched: false,
         };
@@ -17,7 +17,7 @@ el, selector) {
     if (typeof selector === 'string') {
         const sel = new selector_1.Selector(selector);
         const specificity = sel.match(el);
-        if (specificity) {
+        if (specificity !== false) {
             return {
                 matched: true,
                 selector,

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/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

@@ -58,14 +58,14 @@ class Ruleset {
         return new Ruleset(selectors, extended, 0);
     }
     constructor(selectors, extended, depth) {
-        var _a;
+        var _a, _b;
         _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;
+        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(`'${(_a = tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0]) === null || _a === void 0 ? void 0 : _a.selector}' is not a valid selector`);
+                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`);
             }
         }
     }
@@ -86,13 +86,13 @@ class Ruleset {
 _Ruleset_selectorGroup = new WeakMap();
 class StructuredSelector {
     constructor(selector, depth, extended) {
-        var _a;
+        var _a, _b;
         _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 =
-            ((_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;
+            ((_a = tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes[0]) === null || _a === void 0 ? void 0 : _a.type) === 'combinator' ? (_b = tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes[0].value) !== null && _b !== void 0 ? _b : null : null;
         const nodes = tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes.slice();
         if (0 < depth && this.headCombinator) {
             nodes.unshift((0, postcss_selector_parser_1.pseudo)({ value: ':scope' }));
@@ -180,15 +180,15 @@ class SelectorTarget {
     el, 
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     scope, count) {
-        var _a;
+        var _a, _b, _c;
         const result = this._match(el, scope, count);
         if (selLog.enabled) {
             const nodeName = el.nodeName;
-            const selector = ((_a = tslib_1.__classPrivateFieldGet(this, _SelectorTarget_combinedFrom, "f")) === null || _a === void 0 ? void 0 : _a.target.toString()) || this.toString();
+            const selector = (_b = (_a = tslib_1.__classPrivateFieldGet(this, _SelectorTarget_combinedFrom, "f")) === null || _a === void 0 ? void 0 : _a.target.toString()) !== null && _b !== void 0 ? _b : this.toString();
             const combinator = result.combinator ? ` ${result.combinator}` : '';
             selLog('The %s element by "%s" => %s (%d)', nodeName, `${selector}${combinator}`, result.matched, count);
             if (selector === ':scope') {
-                selLog(`† Scope is the ${(scope === null || scope === void 0 ? void 0 : scope.nodeName) || null}`);
+                selLog(`† Scope is the ${(_c = scope === null || scope === void 0 ? void 0 : scope.nodeName) !== null && _c !== void 0 ? _c : null}`);
             }
         }
         delete result.combinator;
@@ -256,7 +256,7 @@ class SelectorTarget {
                         unitCheck.specificity[2] + res.specificity[2],
                     ];
                 }
-                if (matchedNodes.length) {
+                if (matchedNodes.length > 0) {
                     return {
                         combinator: '␣',
                         specificity,
@@ -300,7 +300,7 @@ class SelectorTarget {
                     specificity[1] += res.specificity[1];
                     specificity[2] += res.specificity[2];
                 }
-                if (matchedNodes.length) {
+                if (matchedNodes.length > 0) {
                     return {
                         combinator: '>',
                         specificity,
@@ -343,7 +343,7 @@ class SelectorTarget {
                     specificity[1] += res.specificity[1];
                     specificity[2] += res.specificity[2];
                 }
-                if (matchedNodes.length) {
+                if (matchedNodes.length > 0) {
                     return {
                         combinator: '+',
                         specificity,
@@ -394,7 +394,7 @@ class SelectorTarget {
                         unitCheck.specificity[2] + res.specificity[2],
                     ];
                 }
-                if (matchedNodes.length) {
+                if (matchedNodes.length > 0) {
                     return {
                         combinator: '~',
                         specificity,
@@ -554,7 +554,7 @@ el) {
                     break;
                 }
                 case '*=': {
-                    if (valueOfEl.indexOf(value) === -1) {
+                    if (!valueOfEl.includes(value)) {
                         return false;
                     }
                     break;
@@ -592,7 +592,7 @@ scope, extended, depth) {
             let parent = el.parentElement;
             while (parent) {
                 const matched = ruleset.match(parent, scope).filter((r) => r.matched);
-                if (matched.length) {
+                if (matched.length > 0) {
                     return {
                         specificity,
                         matched: true,
@@ -636,7 +636,7 @@ scope, extended, depth) {
             const matched = resList.filter((r) => r.matched);
             return {
                 specificity,
-                matched: !!matched.length,
+                matched: matched.length > 0,
                 nodes: matched.map(m => m.nodes).flat(),
                 has: matched.map(m => m.has).flat(),
             };
@@ -650,7 +650,7 @@ scope, extended, depth) {
                     const has = getSiblings(el)
                         .map(sib => ruleset.match(sib, el).filter((m) => m.matched))
                         .flat();
-                    if (has.length) {
+                    if (has.length > 0) {
                         return {
                             specificity,
                             matched: true,
@@ -667,7 +667,7 @@ scope, extended, depth) {
                     const has = getDescendants(el)
                         .map(sib => ruleset.match(sib, el).filter((m) => m.matched))
                         .flat();
-                    if (has.length) {
+                    if (has.length > 0) {
                         return {
                             specificity,
                             matched: true,
@@ -688,7 +688,7 @@ scope, extended, depth) {
             const matched = resList.filter((r) => r.matched);
             return {
                 specificity: [0, 0, 0],
-                matched: !!matched.length,
+                matched: matched.length > 0,
                 nodes: matched.map(m => m.nodes).flat(),
                 has: matched.map(m => m.has).flat(),
             };
@@ -792,7 +792,8 @@ function isScope(
 el, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 scope) {
-    return el === scope || el.parentNode === null;
+    var _a;
+    return (_a = el === scope) !== null && _a !== void 0 ? _a : el.parentNode === null;
 }
 function getDescendants(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
@@ -807,8 +808,8 @@ el, includeSelf = false) {
 function getSiblings(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 el) {
-    var _a;
-    return Array.from(((_a = el.parentElement) === null || _a === void 0 ? void 0 : _a.children) || []);
+    var _a, _b;
+    return Array.from((_b = (_a = el.parentElement) === null || _a === void 0 ? void 0 : _a.children) !== null && _b !== void 0 ? _b : []);
 }
 function getSpecificity(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types

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.5.0",
+	"version": "3.6.1",
 	"description": "Extended W3C Selectors matcher",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -25,11 +25,11 @@
 		"tslib": "^2.4.1"
 	},
 	"devDependencies": {
-		"@markuplint/ml-spec": "3.5.0",
+		"@markuplint/ml-spec": "3.6.1",
 		"@types/debug": "^4.1.7",
 		"@types/jsdom": "16",
 		"jsdom": "19",
 		"type-fest": "^3.6.1"
 	},
-	"gitHead": "0c47b2c2722f6823a17f36edbab98486275f8ab4"
+	"gitHead": "3cdf5a088b2da03773d5d4461d0e65ec32290a00"
 }