@asamuzakjp/dom-selector 6.6.2 → 6.7.2

package/dist/cjs/index.cjs

@@ -1326,7 +1326,9 @@ var matchAttributeSelector = (ast, node, opt = {}) => {
         }
         case "*": {
           if (itemName.indexOf(":") > -1) {
-            if (itemName.endsWith(`:${astLocalName}`)) {
+            const [, ...restItemName] = itemName.split(":");
+            const itemLocalName = restItemName.join(":").replace(/^:/, "");
+            if (itemLocalName === astLocalName) {
               attrValues.add(itemValue);
             }
           } else if (astLocalName === itemName) {
@@ -1347,7 +1349,8 @@ var matchAttributeSelector = (ast, node, opt = {}) => {
             );
           }
           if (itemName.indexOf(":") > -1) {
-            const [itemPrefix, itemLocalName] = itemName.split(":");
+            const [itemPrefix, ...restItemName] = itemName.split(":");
+            const itemLocalName = restItemName.join(":").replace(/^:/, "");
             if (itemPrefix === "xml" && itemLocalName === "lang") {
               continue;
             } else if (astPrefix === itemPrefix && astLocalName === itemLocalName) {
@@ -1367,8 +1370,11 @@ var matchAttributeSelector = (ast, node, opt = {}) => {
         itemValue = itemValue.toLowerCase();
       }
       if (itemName.indexOf(":") > -1) {
-        const [itemPrefix, itemLocalName] = itemName.split(":");
-        if (itemPrefix === "xml" && itemLocalName === "lang") {
+        const [itemPrefix, ...restItemName] = itemName.split(":");
+        const itemLocalName = restItemName.join(":").replace(/^:/, "");
+        if (!itemPrefix && astAttrName === `:${itemLocalName}`) {
+          attrValues.add(itemValue);
+        } else if (itemPrefix === "xml" && itemLocalName === "lang") {
           continue;
         } else if (astAttrName === itemLocalName) {
           attrValues.add(itemValue);
@@ -1599,8 +1605,6 @@ var Finder = class {
     this.#window = window;
     this.#astCache = /* @__PURE__ */ new WeakMap();
     this.#documentCache = /* @__PURE__ */ new WeakMap();
-    this.#invalidateResults = /* @__PURE__ */ new WeakMap();
-    this.#results = /* @__PURE__ */ new WeakMap();
     this.#event = null;
     this.#focus = null;
     this.#lastFocusVisible = null;
@@ -1619,6 +1623,7 @@ var Finder = class {
       }
     ]);
     this._registerEventListeners();
+    this.clearResults(true);
   }
   /**
    * Handles errors.
@@ -1668,14 +1673,25 @@ var Finder = class {
     this.#node = node;
     this.#selector = selector;
     [this.#ast, this.#nodes] = this._correspond(selector);
-    this.#invalidateResults = /* @__PURE__ */ new WeakMap();
     this.#pseudoElement = [];
     this.#walkers = /* @__PURE__ */ new WeakMap();
     this.#nodeWalker = null;
     this.#rootWalker = null;
     this.#verifyShadowHost = null;
+    this.clearResults();
     return this;
   };
+  /**
+   * Clear cached results.
+   * @param {boolean} all - clear all results
+   * @returns {void}
+   */
+  clearResults = (all = false) => {
+    this.#invalidateResults = /* @__PURE__ */ new WeakMap();
+    if (all) {
+      this.#results = /* @__PURE__ */ new WeakMap();
+    }
+  };
   /**
    * Handles focus events.
    * @private
@@ -2385,6 +2401,7 @@ var Finder = class {
             break;
           }
           case "current":
+          case "heading":
           case "nth-col":
           case "nth-last-col": {
             if (warn) {
@@ -2966,6 +2983,7 @@ var Finder = class {
         case "fullscreen":
         case "future":
         case "has-slotted":
+        case "heading":
         case "modal":
         case "muted":
         case "past":
@@ -3782,9 +3800,6 @@ var Finder = class {
         break;
       }
       case CLASS_SELECTOR: {
-        if (!complex && !filterLeaves.length) {
-          this.#invalidate = true;
-        }
         result = this._findEntryNodesForClass(leaves, targetType, {
           complex,
           precede
@@ -4317,10 +4332,10 @@ var DOMSelector = class {
   #nwsapi;
   #cache;
   /**
-   * constructor
-   * @param {object} window - window
-   * @param {object} document - document
-   * @param {object} [opt] - options
+   * Creates an instance of DOMSelector.
+   * @param {Window} window - The window object.
+   * @param {Document} document - The document object.
+   * @param {object} [opt] - Options.
    */
   constructor(window, document, opt = {}) {
     const { idlUtils } = opt;
@@ -4334,19 +4349,20 @@ var DOMSelector = class {
     });
   }
   /**
-   * @typedef CheckResult
-   * @type {object}
-   * @property {boolean} match - match result excluding pseudo-element selector
-   * @property {string?} pseudoElement - pseudo-element selector
+   * Clears the internal cache of finder results.
+   * @returns {void}
    */
+  clear = () => {
+    this.#finder.clearResults(true);
+  };
   /**
-   * check
-   * @param {string} selector - CSS selector
-   * @param {object} node - Element node
-   * @param {object} [opt] - options
-   * @returns {CheckResult} - check result
+   * Checks if an element matches a CSS selector.
+   * @param {string} selector - The CSS selector to check against.
+   * @param {Element} node - The element node to check.
+   * @param {object} [opt] - Optional parameters.
+   * @returns {CheckResult} An object containing the check result.
    */
-  check(selector, node, opt = {}) {
+  check = (selector, node, opt = {}) => {
     if (!node?.nodeType) {
       const e = new this.#window.TypeError(`Unexpected type ${getType(node)}`);
       return this.#finder.onError(e, opt);
@@ -4390,15 +4406,15 @@ var DOMSelector = class {
       this.#finder.onError(e, opt);
     }
     return res;
-  }
+  };
   /**
-   * matches
-   * @param {string} selector - CSS selector
-   * @param {object} node - Element node
-   * @param {object} [opt] - options
-   * @returns {boolean} - `true` if matched `false` otherwise
+   * Returns true if the element matches the selector.
+   * @param {string} selector - The CSS selector to match against.
+   * @param {Element} node - The element node to test.
+   * @param {object} [opt] - Optional parameters.
+   * @returns {boolean} `true` if the element matches, or `false` otherwise.
    */
-  matches(selector, node, opt = {}) {
+  matches = (selector, node, opt = {}) => {
     if (!node?.nodeType) {
       const e = new this.#window.TypeError(`Unexpected type ${getType(node)}`);
       return this.#finder.onError(e, opt);
@@ -4437,15 +4453,15 @@ var DOMSelector = class {
       this.#finder.onError(e, opt);
     }
     return !!res;
-  }
+  };
   /**
-   * closest
-   * @param {string} selector - CSS selector
-   * @param {object} node - Element node
-   * @param {object} [opt] - options
-   * @returns {?object} - matched node
+   * Traverses up the DOM tree to find the first node that matches the selector.
+   * @param {string} selector - The CSS selector to match against.
+   * @param {Element} node - The element from which to start traversing.
+   * @param {object} [opt] - Optional parameters.
+   * @returns {?Element} The first matching ancestor element, or `null`.
    */
-  closest(selector, node, opt = {}) {
+  closest = (selector, node, opt = {}) => {
     if (!node?.nodeType) {
       const e = new this.#window.TypeError(`Unexpected type ${getType(node)}`);
       return this.#finder.onError(e, opt);
@@ -4493,15 +4509,15 @@ var DOMSelector = class {
       this.#finder.onError(e, opt);
     }
     return res ?? null;
-  }
+  };
   /**
-   * query selector
-   * @param {string} selector - CSS selector
-   * @param {object} node - Document, DocumentFragment, Element node
-   * @param {object} [opt] - options
-   * @returns {?object} - matched node
+   * Returns the first element within the subtree that matches the selector.
+   * @param {string} selector - The CSS selector to match.
+   * @param {Document|DocumentFragment|Element} node - The node to find within.
+   * @param {object} [opt] - Optional parameters.
+   * @returns {?Element} The first matching element, or `null`.
    */
-  querySelector(selector, node, opt = {}) {
+  querySelector = (selector, node, opt = {}) => {
     if (!node?.nodeType) {
       const e = new this.#window.TypeError(`Unexpected type ${getType(node)}`);
       return this.#finder.onError(e, opt);
@@ -4520,16 +4536,16 @@ var DOMSelector = class {
       this.#finder.onError(e, opt);
     }
     return res ?? null;
-  }
+  };
   /**
-   * query selector all
-   * NOTE: returns Array, not NodeList
-   * @param {string} selector - CSS selector
-   * @param {object} node - Document, DocumentFragment, Element node
-   * @param {object} [opt] - options
-   * @returns {Array.<object|undefined>} - collection of matched nodes
+   * Returns an array of elements within the subtree that match the selector.
+   * Note: This method returns an Array, not a NodeList.
+   * @param {string} selector - The CSS selector to match.
+   * @param {Document|DocumentFragment|Element} node - The node to find within.
+   * @param {object} [opt] - Optional parameters.
+   * @returns {Array<Element>} An array of elements, or an empty array.
    */
-  querySelectorAll(selector, node, opt = {}) {
+  querySelectorAll = (selector, node, opt = {}) => {
     if (!node?.nodeType) {
       const e = new this.#window.TypeError(`Unexpected type ${getType(node)}`);
       return this.#finder.onError(e, opt);
@@ -4567,7 +4583,7 @@ var DOMSelector = class {
       this.#finder.onError(e, opt);
     }
     return res ?? [];
-  }
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {