@asamuzakjp/dom-selector 2.0.3-a.1 → 2.0.3-a.2

package/src/index.js

@@ -6,13 +6,13 @@
  */
 
 /* import */
-import { Matcher } from './js/matcher.js';
+import { Finder } from './js/finder.js';
 
 /* export for test */
-export { Matcher };
+export { Finder };
 
 /* instance, export for test */
-export let matcher = new Matcher();
+export let finder = new Finder();
 
 /**
  * matches
@@ -25,13 +25,13 @@ export let matcher = new Matcher();
 export const matches = (selector, node, opt) => {
   let res;
   try {
-    if (!matcher) {
-      matcher = new Matcher();
+    if (!finder) {
+      finder = new Finder();
     }
-    res = matcher.matches(node, selector, opt);
+    res = finder.matches(node, selector, opt);
   } catch (e) {
     if (e instanceof Error) {
-      matcher = null;
+      finder = null;
     }
     throw e;
   }
@@ -49,13 +49,13 @@ export const matches = (selector, node, opt) => {
 export const closest = (selector, node, opt) => {
   let res;
   try {
-    if (!matcher) {
-      matcher = new Matcher();
+    if (!finder) {
+      finder = new Finder();
     }
-    res = matcher.closest(node, selector, opt);
+    res = finder.closest(node, selector, opt);
   } catch (e) {
     if (e instanceof globalThis[e.name]) {
-      matcher = null;
+      finder = null;
     }
     throw e;
   }
@@ -73,13 +73,13 @@ export const closest = (selector, node, opt) => {
 export const querySelector = (selector, node, opt) => {
   let res;
   try {
-    if (!matcher) {
-      matcher = new Matcher();
+    if (!finder) {
+      finder = new Finder();
     }
-    res = matcher.querySelector(node, selector, opt);
+    res = finder.querySelector(node, selector, opt);
   } catch (e) {
     if (e instanceof globalThis[e.name]) {
-      matcher = null;
+      finder = null;
     }
     throw e;
   }
@@ -98,13 +98,13 @@ export const querySelector = (selector, node, opt) => {
 export const querySelectorAll = (selector, node, opt) => {
   let res;
   try {
-    if (!matcher) {
-      matcher = new Matcher();
+    if (!finder) {
+      finder = new Finder();
     }
-    res = matcher.querySelectorAll(node, selector, opt);
+    res = finder.querySelectorAll(node, selector, opt);
   } catch (e) {
     if (e instanceof globalThis[e.name]) {
-      matcher = null;
+      finder = null;
     }
     throw e;
   }

package/src/js/constant.js

@@ -29,10 +29,10 @@ export const BIT_04 = 4;
 export const BIT_08 = 8;
 export const BIT_16 = 0x10;
 export const BIT_32 = 0x20;
+export const BIT_FFFF = 0xFFFF;
 export const BIT_HYPHEN = 0x2D;
 export const DUO = 2;
 export const HEX = 16;
-export const MAX_BIT_16 = 0xFFFF;
 export const TYPE_FROM = 8;
 export const TYPE_TO = -1;
 

package/src/js/dom-util.js

@@ -9,9 +9,63 @@ import bidiFactory from 'bidi-js';
 import {
   DOCUMENT_FRAGMENT_NODE, DOCUMENT_NODE, DOCUMENT_POSITION_CONTAINS,
   DOCUMENT_POSITION_CONTAINED_BY, DOCUMENT_POSITION_PRECEDING, ELEMENT_NODE,
-  REG_SHADOW_MODE, SYNTAX_ERR, TEXT_NODE
+  REG_SHADOW_MODE, TEXT_NODE, TYPE_FROM, TYPE_TO
 } from './constant.js';
 
+/**
+ * prepare window, document, root node
+ * @param {object} node - Document, DocumentFragment, Element node
+ * @returns {Array.<object>} - array of window, document, root node
+ */
+export const prepareDOMObjects = node => {
+  if (!node || !node.nodeType || !node.nodeName) {
+    const type =
+      Object.prototype.toString.call(node).slice(TYPE_FROM, TYPE_TO);
+    const msg = `Unexpected type ${type}`;
+    throw new TypeError(msg);
+  } else if (node.nodeType !== DOCUMENT_NODE &&
+             node.nodeType !== DOCUMENT_FRAGMENT_NODE &&
+             node.nodeType !== ELEMENT_NODE) {
+    const msg = `Unexpected node ${node.nodeName}`;
+    throw new TypeError(msg);
+  }
+  let document;
+  let root;
+  switch (node.nodeType) {
+    case DOCUMENT_NODE: {
+      document = node;
+      root = node;
+      break;
+    }
+    case DOCUMENT_FRAGMENT_NODE: {
+      document = node.ownerDocument;
+      root = node;
+      break;
+    }
+    case ELEMENT_NODE:
+    default: {
+      document = node.ownerDocument;
+      let parent = node;
+      while (parent) {
+        if (parent.parentNode) {
+          parent = parent.parentNode;
+        } else {
+          break;
+        }
+      }
+      root = parent;
+      break;
+    }
+  }
+  // NOTE: nullable
+  const window = document.defaultView;
+  return [
+    window,
+    document,
+    root
+  ];
+};
+
 /**
  * is in shadow tree
  * @param {object} node - node
@@ -269,26 +323,22 @@ export const isPreceding = (nodeA = {}, nodeB = {}) => {
 };
 
 /**
- * selector to node properties - e.g. ns|E -> { prefix: ns, tagName: E }
- * @param {string} selector - type selector
- * @param {object} [node] - Element node
- * @returns {object} - node properties
+ * sort nodes
+ * @param {Array.<object>|Set.<object>} nodes - collection of nodes
+ * @returns {Array.<object|undefined>} - collection of sorted nodes
  */
-export const selectorToNodeProps = (selector, node) => {
-  let prefix;
-  let tagName;
-  if (selector && typeof selector === 'string') {
-    if (selector.indexOf('|') > -1) {
-      [prefix, tagName] = selector.split('|');
-    } else {
-      prefix = '*';
-      tagName = selector;
-    }
-  } else {
-    throw new DOMException(`Invalid selector ${selector}`, SYNTAX_ERR);
+export const sortNodes = (nodes = []) => {
+  const arr = [...nodes];
+  if (arr.length > 1) {
+    arr.sort((a, b) => {
+      let res;
+      if (isPreceding(b, a)) {
+        res = 1;
+      } else {
+        res = -1;
+      }
+      return res;
+    });
   }
-  return {
-    prefix,
-    tagName
-  };
+  return arr;
 };