@asamuzakjp/dom-selector 8.1.4 → 8.2.0

package/src/js/nwsapi.js

@@ -10,7 +10,7 @@ import { isContentEditable } from './utility.js';
 
 /* constants */
 import { DOCUMENT_NODE, ELEMENT_NODE } from './constant.js';
-const CACHE_SIZE = 2048;
+const CACHE_SIZE = 4096;
 const F_INIT = '"use strict";return function resolver(c,f,x,r)';
 const S_HEAD = 'var e,n,o,j=r.length-1,k=-1';
 const M_HEAD = 'var e,n,o';

package/src/js/selector.js

@@ -8,6 +8,7 @@ import { generateException } from './utility.js';
 
 /* constants */
 import {
+  ATTR_TYPE,
   COMBINATOR,
   COMBO,
   COMPOUND_I,
@@ -21,8 +22,8 @@ import {
   PS_CLASS_SELECTOR,
   PS_ELEMENT_SELECTOR,
   SELECTOR,
-  SUB_TYPE,
   SYNTAX_ERR,
+  TAG_TYPE_WO_UNIVERSAL,
   TARGET_ALL
 } from './constant.js';
 
@@ -30,7 +31,7 @@ import {
 const REG_EXCLUDE_BASIC =
   /[|\\]|::|[^\u0021-\u007F\s]|\[\s*[\w$*=^|~-]+(?:(?:"[\w$*=^|~\s'-]+"|'[\w$*=^|~\s"-]+')?(?:\s+[\w$*=^|~-]+)+|"[^"\]]{1,255}|'[^'\]]{1,255})\s*\]|:(?:is|where)\(\s*\)/;
 const REG_EXCLUDE_QSA = new RegExp(
-  `(?:^(?:[A-Z]|\\.)[\\w-]*$|^(?:${SUB_TYPE}|:${N_TH})+$|${COMPOUND_I}${COMBO}${COMPOUND_I})`,
+  `(?:^(?:[A-Z]|\\.)[\\w-]*$|${COMPOUND_I}${COMBO}${COMPOUND_I})`,
   'i'
 );
 const REG_COMPLEX = new RegExp(`${COMPOUND_I}${COMBO}${COMPOUND_I}`, 'i');
@@ -51,6 +52,9 @@ const REG_CLASS = /\.(\D[^#.*]+)/g;
 const REG_TAG = /^([^#.]+)/;
 const REG_INVALID_SYNTAX =
   /[+~>]\s*[+~>]|^\s*[+~>]|[+~>]\s*$|^\s*,|,\s*,|,\s*$/;
+const REG_TEST_LIB = new RegExp(
+  `^(?:[*]?${ATTR_TYPE}(?:\\s*,\\s*${TAG_TYPE_WO_UNIVERSAL}${COMBO}${TAG_TYPE_WO_UNIVERSAL})?)$`
+);
 
 /**
  * Find a nested :has() pseudo-class.
@@ -278,7 +282,11 @@ export const filterSelector = (selector, target) => {
     return false;
   }
   // Target-specific early exits.
-  if (target === TARGET_ALL && REG_EXCLUDE_QSA.test(selector)) {
+  if (
+    target === TARGET_ALL &&
+    REG_EXCLUDE_QSA.test(selector) &&
+    !REG_TEST_LIB.test(selector)
+  ) {
     return false;
   }
   // Exclude various complex or unsupported selectors early.

package/src/js/utility.js

@@ -90,43 +90,6 @@ export const generateException = (msg, name, globalObject = globalThis) => {
   return new globalObject.DOMException(msg, name);
 };
 
-/**
- * Filter a list of nodes based on An+B logic
- * @param {Array.<object>} nodes - array of nodes to filter
- * @param {object} anb - An+B options
- * @param {number} anb.a - a
- * @param {number} anb.b - b
- * @param {boolean} [anb.reverse] - reverse order
- * @returns {Array.<object>} - array of matched nodes
- */
-export const filterNodesByAnB = (nodes, anb) => {
-  const { a, b, reverse } = anb;
-  const processedNodes = reverse ? [...nodes].reverse() : nodes;
-  const l = nodes.length;
-  const matched = [];
-  if (a === 0) {
-    if (b > 0 && b <= l) {
-      matched.push(processedNodes[b - 1]);
-    }
-    return matched;
-  }
-  let startIndex = b - 1;
-  if (a > 0) {
-    while (startIndex < 0) {
-      startIndex += a;
-    }
-    for (let i = startIndex; i < l; i += a) {
-      matched.push(processedNodes[i]);
-    }
-  } else if (startIndex >= 0) {
-    for (let i = startIndex; i >= 0; i += a) {
-      matched.push(processedNodes[i]);
-    }
-    return matched.reverse();
-  }
-  return matched;
-};
-
 /**
  * Resolve content document, root node, and check if it's in a shadow DOM.
  * @param {object} node - Document, DocumentFragment, or Element node.

package/types/js/evaluator.d.ts

@@ -0,0 +1,58 @@
+export class Evaluator {
+    constructor(window: object);
+    window: object;
+    documentCache: WeakMap<WeakKey, any>;
+    onError: (e: Error, opt?: {
+        noexcept?: boolean | undefined;
+    }) => void;
+    setup(selector: string, node: object, opt?: {
+        check?: boolean | undefined;
+        noexcept?: boolean | undefined;
+        warn?: boolean | undefined;
+    }): object;
+    check: boolean | undefined;
+    noexcept: boolean | undefined;
+    warn: boolean | undefined;
+    matchOpts: {
+        warn: boolean;
+    } | undefined;
+    node: object | undefined;
+    pseudoElements: any[] | undefined;
+    invalidate: boolean | undefined;
+    clearResults(all?: boolean): void;
+    matchSelector: (ast: object, node: object, opt: object) => boolean;
+    matchLeaves: (leaves: Array<object>, node: object, opt: object) => boolean;
+    getFilterLeaves: (leaves: Array<object>) => Array<object>;
+    evaluateShadowHost: (ast: object, node: object) => boolean;
+    matchPseudoClassSelector: (ast: object, node: object, opt?: {
+        forgive?: boolean | undefined;
+        warn?: boolean | undefined;
+    }) => Set<object> | boolean;
+    createTreeWalker: (node: object, opt?: {
+        force?: boolean | undefined;
+        whatToShow?: number | undefined;
+    }) => object;
+    yieldCombinatorMatches(twig: object, node: object, opt?: {
+        dir?: string | undefined;
+    }): Generator<any, void, unknown>;
+    private _handleFocusEvent;
+    private _handleKeyboardEvent;
+    private _handleMouseEvent;
+    private _registerEventListeners;
+    private _getSelectorBranches;
+    private _matchAnPlusB;
+    private _hasCombinatorMatch;
+    private _matchHasPseudoFunc;
+    private _buildHasAllowlist;
+    private _evaluateHasPseudo;
+    private _matchLogicalPseudoFunc;
+    private _evaluateLogicalPseudo;
+    private _evaluatePseudoClassFunc;
+    private _evaluateHostPseudo;
+    private _evaluateHostContextPseudo;
+    private _matchSelectorForElement;
+    private _matchSelectorForShadowRoot;
+    private _traverseAllDescendants;
+    private _findDescendantNodes;
+    #private;
+}

package/types/js/finder.d.ts

@@ -1,45 +1,6 @@
-export class Finder {
-    constructor(window: object);
-    onError: (e: Error, opt?: {
-        noexcept?: boolean | undefined;
-    }) => void;
-    setup: (selector: string, node: object, opt?: {
-        check?: boolean | undefined;
-        noexcept?: boolean | undefined;
-        warn?: boolean | undefined;
-    }) => object;
-    clearResults: (all?: boolean) => void;
-    private _handleFocusEvent;
-    private _handleKeyboardEvent;
-    private _handleMouseEvent;
-    private _registerEventListeners;
+export class Finder extends Evaluator {
     private _processSelectorBranches;
     private _correspond;
-    private _createTreeWalker;
-    private _getSelectorBranches;
-    private _getFilteredChildren;
-    private _collectNthChild;
-    private _collectNthOfType;
-    private _matchAnPlusB;
-    private _matchHasPseudoFunc;
-    private _buildHasAllowlist;
-    private _evaluateHasPseudo;
-    private _matchLogicalPseudoFunc;
-    private _evaluateLogicalPseudo;
-    private _evaluatePseudoClassFunc;
-    private _matchPseudoClassSelector;
-    private _evaluateHostPseudo;
-    private _evaluateHostContextPseudo;
-    private _evaluateShadowHost;
-    private _matchSelectorForElement;
-    private _matchSelectorForShadowRoot;
-    private _matchSelector;
-    private _matchLeaves;
-    private _getFilterLeaves;
-    private _traverseAllDescendants;
-    private _findDescendantNodes;
-    private _collectCombinatorMatches;
-    private _matchCombinator;
     private _traverseAndCollectNodes;
     private _findPrecede;
     private _findNodeWalker;
@@ -54,12 +15,12 @@ export class Finder {
     private _determineTraversalStrategy;
     private _processPendingItems;
     private _collectNodes;
-    private _getCombinedNodes;
     private _matchNodeNext;
-    private _matchNodePrev;
+    private _hasValidPathPrev;
     private _processComplexBranchAll;
     private _processComplexBranchFirst;
-    find: (targetType: string) => Set<object>;
+    find: (targetType: string) => Set<object> | object;
     getAST: (selector: string) => object;
     #private;
 }
+import { Evaluator } from './evaluator.js';

package/types/js/utility.d.ts

@@ -1,11 +1,6 @@
 export function getType(o: object): string;
 export function verifyArray(arr: any[], type: string): any[];
 export function generateException(msg: string, name: string, globalObject?: object): DOMException;
-export function filterNodesByAnB(nodes: Array<object>, anb: {
-    a: number;
-    b: number;
-    reverse?: boolean | undefined;
-}): Array<object>;
 export function resolveContent(node: object): Array<object | boolean>;
 export function traverseNode(node: object, walker: object, force?: boolean): object | null;
 export function isCustomElement(node: object, { formAssociated }?: {