@blackglory/match 0.4.0 → 0.4.1

package/README.md

@@ -9,11 +9,63 @@ yarn add @blackglory/match
 ```
 
 ## Usage
+### Match only
 ```ts
 import { matchElement, element, css, childNodes, textNode, children, multiple } from '@blackglory/match'
+import { parseNodes, getBySelector } from 'extra-dom'
+
+const div = parseNodes(`
+  <div>
+    <header>Heading</header>
+    <article>
+      <p>Paragraph1</p>
+      <p>Paragraph2</p>
+    </article>
+  </div>
+`.trim())[0] as Element
+const header = getBySelector.call(div, 'header')
+
+const result = matchElement(
+  header
+, element(
+    css`header`
+  , childNodes(
+      textNode()
+    )
+  )
+, element(
+    css`article`
+  , children(
+      multiple([1, Infinity], element(
+        css`p`
+      , childNodes(
+          textNode()
+        )
+      ))
+    )
+  )
+)
+// {}
+```
+
+### Match and collect nodes
+```ts
+import { matchElement, element, css, childNodes, textNode, children, multiple } from '@blackglory/match'
+import { parseNodes, getBySelector } from 'extra-dom'
+
+const div = parseNodes(`
+  <div>
+    <header>Heading</header>
+    <article>
+      <p>Paragraph1</p>
+      <p>Paragraph2</p>
+    </article>
+  </div>
+`.trim())[0] as Element
+const header = getBySelector.call(div, 'header')
 
 const result = matchElement(
-  node
+  header
 , element(
     css`header`
   , childNodes(
@@ -21,7 +73,7 @@ const result = matchElement(
     )
   )
 , element(
-    css`section`
+    css`article`
   , children(
       multiple([1, Infinity], element(
         css`p`
@@ -32,7 +84,13 @@ const result = matchElement(
     )
   )
 )
-// { heading: Text, paragraph: [ Text, Text ] }
+// {
+//   heading: [object Text "Heading"]
+// , paragraph: [
+//     [object Text "Paragraph1"]
+//   , [object Text "Paragraph2"]
+//   ]
+// }
 ```
 
 ## API
@@ -80,7 +138,7 @@ function match(
   this: void | Document
 , node: Node
 , ...matchers: Array<IMatcher<Node>>
-): { [name: string]: Node | Node[] } | null
+): Record<string, Arrayable<Node>> | null
 ```
 
 ### matchElement
@@ -89,7 +147,7 @@ function matchElement(
   this: void | Document
 , element: Element
 , ...matchers: Array<IMatcher<Element>>
-): { [name: string]: Node | Node[] } | null
+): Record<string, Arrayable<Node>> | null
 ```
 
 ### Matchers
@@ -129,7 +187,10 @@ function element(
   strings: TemplateStringsArray
 , ...values: string[]
 ): (
-  ...matchers: Array<INestedMatcher<Element> | ITerminalMatcher<Element>>
+  ...matchers: Array<
+  | INestedMatcher<Element>
+  | ITerminalMatcher<Element>
+  >
 ) => INestedMatcher<Node>
 function element(
   name: string

package/lib/match-element.d.ts

@@ -1,4 +1,3 @@
 import { IMatcher } from './types.js';
-export declare function matchElement(this: void | Document, element: Element, ...matchers: Array<IMatcher<Element>>): {
-    [name: string]: Node | Node[];
-} | null;
+import { Arrayable } from '@blackglory/prelude';
+export declare function matchElement(this: void | Document, element: Element, ...matchers: Array<IMatcher<Element>>): Record<string, Arrayable<Node>> | null;

package/lib/match-element.js

@@ -2,7 +2,9 @@ import { isDocument } from 'extra-dom';
 import { matchOneByOne } from "./utils/match-one-by-one.js";
 import { nextElementSibling } from "./utils/next-element-sibling.js";
 export function matchElement(element, ...matchers) {
-    const document = isDocument(this) ? this : globalThis.document;
+    const document = isDocument(this)
+        ? this
+        : globalThis.document;
     const context = {
         document,
         collection: {},

package/lib/match-element.js.map

@@ -1 +1 @@
-{"version":3,"file":"match-element.js","sourceRoot":"","sources":["../src/match-element.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,OAAO,EAAE,aAAa,EAAE,oCAAkC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,wCAAsC;AAEnE,MAAM,UAAU,YAAY,CAE1B,OAAgB,EAChB,GAAG,QAAkC;IAErC,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAA;IAC9D,MAAM,OAAO,GAAa;QACxB,QAAQ;QACR,UAAU,EAAE,EAAE;QACd,IAAI,EAAE,kBAAkB;KACzB,CAAA;IAED,IAAI,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QACjD,OAAO,OAAO,CAAC,UAAU,CAAA;IAC3B,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC"}
+{"version":3,"file":"match-element.js","sourceRoot":"","sources":["../src/match-element.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,OAAO,EAAE,aAAa,EAAE,oCAAkC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,wCAAsC;AAGnE,MAAM,UAAU,YAAY,CAE1B,OAAgB,EAChB,GAAG,QAAkC;IAErC,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC;QAClB,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAA;IAEpC,MAAM,OAAO,GAAa;QACxB,QAAQ;QACR,UAAU,EAAE,EAAE;QACd,IAAI,EAAE,kBAAkB;KACzB,CAAA;IAED,IAAI,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QACjD,OAAO,OAAO,CAAC,UAAU,CAAA;IAC3B,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC"}

package/lib/match.d.ts

@@ -1,4 +1,3 @@
 import { IMatcher } from './types.js';
-export declare function match(this: void | Document, node: Node, ...matchers: Array<IMatcher<Node>>): {
-    [name: string]: Node | Node[];
-} | null;
+import { Arrayable } from '@blackglory/prelude';
+export declare function match(this: void | Document, node: Node, ...matchers: Array<IMatcher<Node>>): Record<string, Arrayable<Node>> | null;

package/lib/match.js

@@ -2,7 +2,9 @@ import { isDocument } from 'extra-dom';
 import { matchOneByOne } from "./utils/match-one-by-one.js";
 import { nextSibling } from "./utils/next-sibling.js";
 export function match(node, ...matchers) {
-    const document = isDocument(this) ? this : globalThis.document;
+    const document = isDocument(this)
+        ? this
+        : globalThis.document;
     const context = {
         document,
         collection: {},

package/lib/match.js.map

@@ -1 +1 @@
-{"version":3,"file":"match.js","sourceRoot":"","sources":["../src/match.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,OAAO,EAAE,aAAa,EAAE,oCAAkC;AAC1D,OAAO,EAAE,WAAW,EAAE,gCAA8B;AAEpD,MAAM,UAAU,KAAK,CAEnB,IAAU,EACV,GAAG,QAA+B;IAElC,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAA;IAC9D,MAAM,OAAO,GAAa;QACxB,QAAQ;QACR,UAAU,EAAE,EAAE;QACd,IAAI,EAAE,WAAW;KAClB,CAAA;IAED,IAAI,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QAC9C,OAAO,OAAO,CAAC,UAAU,CAAA;IAC3B,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC"}
+{"version":3,"file":"match.js","sourceRoot":"","sources":["../src/match.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,OAAO,EAAE,aAAa,EAAE,oCAAkC;AAC1D,OAAO,EAAE,WAAW,EAAE,gCAA8B;AAGpD,MAAM,UAAU,KAAK,CAEnB,IAAU,EACV,GAAG,QAA+B;IAElC,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC;QAClB,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAA;IAEpC,MAAM,OAAO,GAAa;QACxB,QAAQ;QACR,UAAU,EAAE,EAAE;QACd,IAAI,EAAE,WAAW;KAClB,CAAA;IAED,IAAI,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QAC9C,OAAO,OAAO,CAAC,UAAU,CAAA;IAC3B,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC"}

package/lib/matchers/child-nodes.js

@@ -1,10 +1,11 @@
+import { isEmptyArray } from '@blackglory/prelude';
 import { matchOneByOne } from "../utils/match-one-by-one.js";
 import { mergeInPlace } from "../utils/merge-in-place.js";
 import { nextSibling } from "../utils/next-sibling.js";
 export function childNodes(...matchers) {
     return function (node) {
         // 空matchers意味着"childNodes应该为空".
-        if (matchers.length === 0) {
+        if (isEmptyArray(matchers)) {
             return node.childNodes.length === 0;
         }
         if (node.childNodes.length === 0)

package/lib/matchers/child-nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"child-nodes.js","sourceRoot":"","sources":["../../src/matchers/child-nodes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,qCAAkC;AAC1D,OAAO,EAAE,YAAY,EAAE,mCAAgC;AACvD,OAAO,EAAE,WAAW,EAAE,iCAA8B;AAEpD,MAAM,UAAU,UAAU,CAAC,GAAG,QAA+B;IAC3D,OAAO,UAAkC,IAAU;QACjD,gCAAgC;QAChC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,CAAA;QACrC,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAA;QAE9C,MAAM,OAAO,GAAqB;YAChC,GAAG,IAAI;YACP,UAAU,EAAE,EAAE;YACd,IAAI,EAAE,WAAW;SAClB,CAAA;QAED,MAAM,MAAM,GAAG,aAAa,CAC1B,OAAO,EACP,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAClB,GAAG,QAAQ,CACZ,CAAA;QAED,IAAI,MAAM,EAAE,CAAC;YACX,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QACnD,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"child-nodes.js","sourceRoot":"","sources":["../../src/matchers/child-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,EAAE,aAAa,EAAE,qCAAkC;AAC1D,OAAO,EAAE,YAAY,EAAE,mCAAgC;AACvD,OAAO,EAAE,WAAW,EAAE,iCAA8B;AAEpD,MAAM,UAAU,UAAU,CAAC,GAAG,QAA+B;IAC3D,OAAO,UAAkC,IAAU;QACjD,gCAAgC;QAChC,IAAI,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,CAAA;QACrC,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAA;QAE9C,MAAM,OAAO,GAAqB;YAChC,GAAG,IAAI;YACP,UAAU,EAAE,EAAE;YACd,IAAI,EAAE,WAAW;SAClB,CAAA;QAED,MAAM,MAAM,GAAG,aAAa,CAC1B,OAAO,EACP,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAClB,GAAG,QAAQ,CACZ,CAAA;QAED,IAAI,MAAM,EAAE,CAAC;YACX,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QACnD,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;AACH,CAAC"}

package/lib/matchers/children.js

@@ -1,10 +1,11 @@
+import { isEmptyArray } from '@blackglory/prelude';
 import { matchOneByOne } from "../utils/match-one-by-one.js";
 import { mergeInPlace } from "../utils/merge-in-place.js";
 import { nextElementSibling } from "../utils/next-element-sibling.js";
 export function children(...matchers) {
     return function (element) {
         // 空matchers意味着"children应该为空".
-        if (matchers.length === 0) {
+        if (isEmptyArray(matchers)) {
             return element.children.length === 0;
         }
         if (element.children.length === 0)

package/lib/matchers/children.js.map

@@ -1 +1 @@
-{"version":3,"file":"children.js","sourceRoot":"","sources":["../../src/matchers/children.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,qCAAkC;AAC1D,OAAO,EAAE,YAAY,EAAE,mCAAgC;AACvD,OAAO,EAAE,kBAAkB,EAAE,yCAAsC;AAEnE,MAAM,UAAU,QAAQ,CACtB,GAAG,QAAkC;IAErC,OAAO,UAAkC,OAAgB;QACvD,8BAA8B;QAC9B,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAA;QACtC,CAAC;QAED,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAA;QAE/C,MAAM,OAAO,GAAqB;YAChC,GAAG,IAAI;YACP,UAAU,EAAE,EAAE;YACd,IAAI,EAAE,kBAAkB;SACzB,CAAA;QAED,MAAM,MAAM,GAAG,aAAa,CAC1B,OAAO,EACP,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EACnB,GAAG,QAAQ,CACZ,CAAA;QAED,IAAI,MAAM,EAAE,CAAC;YACX,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QACnD,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"children.js","sourceRoot":"","sources":["../../src/matchers/children.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,EAAE,aAAa,EAAE,qCAAkC;AAC1D,OAAO,EAAE,YAAY,EAAE,mCAAgC;AACvD,OAAO,EAAE,kBAAkB,EAAE,yCAAsC;AAEnE,MAAM,UAAU,QAAQ,CACtB,GAAG,QAAkC;IAErC,OAAO,UAAkC,OAAgB;QACvD,8BAA8B;QAC9B,IAAI,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAA;QACtC,CAAC;QAED,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAA;QAE/C,MAAM,OAAO,GAAqB;YAChC,GAAG,IAAI;YACP,UAAU,EAAE,EAAE;YACd,IAAI,EAAE,kBAAkB;SACzB,CAAA;QAED,MAAM,MAAM,GAAG,aAAa,CAC1B,OAAO,EACP,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EACnB,GAAG,QAAQ,CACZ,CAAA;QAED,IAAI,MAAM,EAAE,CAAC;YACX,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QACnD,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;AACH,CAAC"}

package/lib/matchers/css.js

@@ -1,4 +1,4 @@
-import { concat } from "../utils/concat.js";
+import { concat } from 'extra-tags';
 import { isString } from '@blackglory/prelude';
 export function css(...args) {
     if (isString(args[0])) {
@@ -7,7 +7,7 @@ export function css(...args) {
     }
     else {
         const [strings, ...values] = args;
-        const selector = concat(strings, values).join('');
+        const selector = concat(strings, ...values);
         return css(selector);
     }
 }

package/lib/matchers/css.js.map

@@ -1 +1 @@
-{"version":3,"file":"css.js","sourceRoot":"","sources":["../../src/matchers/css.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,2BAAwB;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAO9C,MAAM,UAAU,GAAG,CAAC,GAAG,IAE+B;IAEpD,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAA;QAEvB,OAAO,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACxD,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,IAAI,CAAA;QACjC,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAEjD,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAA;IACtB,CAAC;AACH,CAAC"}
+{"version":3,"file":"css.js","sourceRoot":"","sources":["../../src/matchers/css.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEnC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAO9C,MAAM,UAAU,GAAG,CAAC,GAAG,IAE+B;IAEpD,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAA;QAEvB,OAAO,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACxD,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,IAAI,CAAA;QACjC,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAA;QAE3C,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAA;IACtB,CAAC;AACH,CAAC"}

package/lib/matchers/element.js

@@ -1,11 +1,11 @@
 import { isntElement } from 'extra-dom';
-import { isArray, isString } from '@blackglory/prelude';
-import { concat } from "../utils/concat.js";
+import { isArray, isEmptyArray, isString } from '@blackglory/prelude';
+import { concat } from 'extra-tags';
 import { mergeInPlace } from "../utils/merge-in-place.js";
 export function element(...args) {
     if (isArray(args[0])) {
         const [strings, ...values] = args;
-        const name = concat(strings, values).join('');
+        const name = concat(strings, ...values);
         return (...matchers) => element(name, ...matchers);
     }
     if (isString(args[0])) {
@@ -22,7 +22,7 @@ export function element(...args) {
     return function (element) {
         if (isntElement(element))
             return false;
-        if (matchers.length === 0)
+        if (isEmptyArray(matchers))
             return true;
         return matchers.every(match => match.call(this, element));
     };

package/lib/matchers/element.js.map

@@ -1 +1 @@
-{"version":3,"file":"element.js","sourceRoot":"","sources":["../../src/matchers/element.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAEvC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,MAAM,EAAE,2BAAwB;AACzC,OAAO,EAAE,YAAY,EAAE,mCAAgC;AAUvD,MAAM,UAAU,OAAO,CAAC,GAAG,IAGgD;IAEzE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GACxB,IAA4D,CAAA;QAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAE7C,OAAO,CAAC,GAAG,QAAoE,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAA;IAChH,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,GACvB,IAA+F,CAAA;QAEjG,OAAO,UAAkC,QAAiB;YACxD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;YACxD,IAAI,MAAM,EAAE,CAAC;gBACX,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;YACrD,CAAC;YACD,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,IAAiF,CAAA;IAEvG,OAAO,UAAkC,OAAgB;QACvD,IAAI,WAAW,CAAC,OAAO,CAAC;YAAE,OAAO,KAAK,CAAA;QACtC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAA;QAEtC,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;IAC3D,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"element.js","sourceRoot":"","sources":["../../src/matchers/element.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAEvC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,mCAAgC;AAkBvD,MAAM,UAAU,OAAO,CAAC,GAAG,IAGgD;IAEzE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,IAG5B,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAA;QAEvC,OAAO,CACL,GAAG,QAGF,EACD,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAA;IACjC,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,GAAG,IAM3B,CAAA;QAED,OAAO,UAAkC,QAAiB;YACxD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;YACxD,IAAI,MAAM,EAAE,CAAC;gBACX,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;YACrD,CAAC;YACD,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,IAKrB,CAAA;IAED,OAAO,UAAkC,OAAgB;QACvD,IAAI,WAAW,CAAC,OAAO,CAAC;YAAE,OAAO,KAAK,CAAA;QACtC,IAAI,YAAY,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,CAAA;QAEvC,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;IAC3D,CAAC,CAAA;AACH,CAAC"}

package/lib/matchers/node.js

@@ -1,10 +1,10 @@
-import { isArray, isString } from '@blackglory/prelude';
-import { concat } from "../utils/concat.js";
+import { isArray, isEmptyArray, isString } from '@blackglory/prelude';
+import { concat } from 'extra-tags';
 import { mergeInPlace } from "../utils/merge-in-place.js";
 export function node(...args) {
     if (isArray(args[0])) {
         const [strings, ...values] = args;
-        const name = concat(strings, values).join('');
+        const name = concat(strings, ...values);
         return (...matchers) => node(name, ...matchers);
     }
     if (isString(args[0])) {
@@ -19,7 +19,7 @@ export function node(...args) {
     }
     const [...matchers] = args;
     return function (node) {
-        if (matchers.length === 0)
+        if (isEmptyArray(matchers))
             return true;
         return matchers.every(match => match.call(this, node));
     };

package/lib/matchers/node.js.map

@@ -1 +1 @@
-{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/matchers/node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,MAAM,EAAE,2BAAwB;AACzC,OAAO,EAAE,YAAY,EAAE,mCAAgC;AAavD,MAAM,UAAU,IAAI,CAAC,GAAG,IAG6C;IAEnE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GACxB,IAA4D,CAAA;QAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAE7C,OAAO,CAAC,GAAG,QAA8D,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAA;IACvG,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,GACvB,IAAyF,CAAA;QAE3F,OAAO,UAAkC,KAAW;YAClD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YAClD,IAAI,MAAM,EAAE,CAAC;gBACX,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;YAClD,CAAC;YACD,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,IAA2E,CAAA;IAEjG,OAAO,UAAkC,IAAU;QACjD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAA;QAEtC,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IACxD,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/matchers/node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,mCAAgC;AAkBvD,MAAM,UAAU,IAAI,CAAC,GAAG,IAG6C;IAEnE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,IAG5B,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAA;QAEvC,OAAO,CACL,GAAG,QAGF,EACD,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAA;IAC9B,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,GAAG,IAM3B,CAAA;QAED,OAAO,UAAkC,KAAW;YAClD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YAClD,IAAI,MAAM,EAAE,CAAC;gBACX,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;YAClD,CAAC;YACD,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,IAKrB,CAAA;IAED,OAAO,UAAkC,IAAU;QACjD,IAAI,YAAY,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,CAAA;QAEvC,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IACxD,CAAC,CAAA;AACH,CAAC"}

package/lib/matchers/optional.js.map

@@ -1 +1 @@
-{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../src/matchers/optional.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAExC,MAAM,UAAU,QAAQ,CAAiB,OAAgD;IACvF,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;AACpD,CAAC"}
+{"version":3,"file":"optional.js","sourceRoot":"","sources":["../../src/matchers/optional.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAExC,MAAM,UAAU,QAAQ,CACtB,OAAgD;IAEhD,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;AACpD,CAAC"}

package/lib/matchers/text-node.js

@@ -1,11 +1,11 @@
 import { isArray, isString } from '@blackglory/prelude';
-import { concat } from "../utils/concat.js";
+import { concat } from 'extra-tags';
 import { isntTextNode } from 'extra-dom';
 import { mergeInPlace } from "../utils/merge-in-place.js";
 export function textNode(...args) {
     if (isArray(args[0])) {
         const [strings, ...values] = args;
-        const name = concat(strings, values).join('');
+        const name = concat(strings, ...values);
         return (...matchers) => textNode(name, ...matchers);
     }
     if (isString(args[0])) {

package/lib/matchers/text-node.js.map

@@ -1 +1 @@
-{"version":3,"file":"text-node.js","sourceRoot":"","sources":["../../src/matchers/text-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,MAAM,EAAE,2BAAwB;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,mCAAgC;AAavD,MAAM,UAAU,QAAQ,CAAC,GAAG,IAGkB;IAE5C,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GACxB,IAA4D,CAAA;QAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAE7C,OAAO,CAAC,GAAG,QAAuC,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAA;IACpF,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,GACvB,IAAkE,CAAA;QAEpE,OAAO,UAAkC,IAAU;YACjD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACrD,IAAI,MAAM,EAAE,CAAC;gBACX,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;YACjD,CAAC;YACD,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,IAAoD,CAAA;IAE1E,OAAO,UAAkC,IAAU;QACjD,IAAI,YAAY,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAA;QACpC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAA;QAEtC,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IACxD,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"text-node.js","sourceRoot":"","sources":["../../src/matchers/text-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,mCAAgC;AAavD,MAAM,UAAU,QAAQ,CAAC,GAAG,IAGkB;IAE5C,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,IAG5B,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAA;QAEvC,OAAO,CAAC,GAAG,QAAuC,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAA;IACpF,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,GAAG,IAG3B,CAAA;QAED,OAAO,UAAkC,IAAU;YACjD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACrD,IAAI,MAAM,EAAE,CAAC;gBACX,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;YACjD,CAAC;YACD,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,IAAoD,CAAA;IAE1E,OAAO,UAAkC,IAAU;QACjD,IAAI,YAAY,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAA;QACpC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAA;QAEtC,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IACxD,CAAC,CAAA;AACH,CAAC"}

package/lib/matchers/xpath.js

@@ -1,5 +1,5 @@
-import { isString } from '@blackglory/prelude';
-import { concat } from "../utils/concat.js";
+import { isntNull, isString } from '@blackglory/prelude';
+import { concat } from 'extra-tags';
 import { assert } from '@blackglory/prelude';
 const UNORDERED_NODE_ITERATOR_TYPE = 'XPathResult' in globalThis
     ? XPathResult.UNORDERED_NODE_ITERATOR_TYPE
@@ -7,21 +7,21 @@ const UNORDERED_NODE_ITERATOR_TYPE = 'XPathResult' in globalThis
 export function xpath(...args) {
     if (isString(args[0])) {
         const [expression] = args;
-        assert(expression.startsWith('//*'), 'XPath expressions must start with "//*"');
+        assert(expression.startsWith('/'), 'XPath expressions must start with "/"');
         return function (node) {
             return xpathMatches(this.document, expression, node);
         };
     }
     else {
         const [strings, ...values] = args;
-        const expression = concat(strings, values).join('');
+        const expression = concat(strings, ...values);
         return xpath(expression);
     }
 }
 function xpathMatches(document, expression, node) {
     const iterator = document.evaluate(expression, node, null, UNORDERED_NODE_ITERATOR_TYPE, null);
     let value;
-    while ((value = iterator.iterateNext()) !== null) {
+    while (value = iterator.iterateNext(), isntNull(value)) {
         if (value === node)
             return true;
     }

package/lib/matchers/xpath.js.map

@@ -1 +1 @@
-{"version":3,"file":"xpath.js","sourceRoot":"","sources":["../../src/matchers/xpath.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,2BAAwB;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,MAAM,4BAA4B,GAChC,aAAa,IAAI,UAAU;IAC3B,CAAC,CAAC,WAAW,CAAC,4BAA4B;IAC1C,CAAC,CAAC,CAAC,CAAA;AASL,MAAM,UAAU,KAAK,CAAC,GAAG,IAE6B;IAEpD,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAA;QACzB,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,yCAAyC,CAAC,CAAA;QAE/E,OAAO,UAEL,IAAU;YAEV,OAAO,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;QACtD,CAAC,CAAA;IACH,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,IAAI,CAAA;QACjC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAEnD,OAAO,KAAK,CAAC,UAAU,CAAC,CAAA;IAC1B,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,QAAkB,EAAE,UAAkB,EAAE,IAAU;IACtE,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAChC,UAAU,EACV,IAAI,EACJ,IAAI,EACJ,4BAA4B,EAC5B,IAAI,CACL,CAAA;IAED,IAAI,KAAK,CAAA;IACT,OAAO,CAAC,KAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC;QACjD,IAAI,KAAK,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;IACjC,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC"}
+{"version":3,"file":"xpath.js","sourceRoot":"","sources":["../../src/matchers/xpath.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,MAAM,4BAA4B,GAChC,aAAa,IAAI,UAAU;IAC7B,CAAC,CAAC,WAAW,CAAC,4BAA4B;IAC1C,CAAC,CAAC,CAAC,CAAA;AASH,MAAM,UAAU,KAAK,CAAC,GAAG,IAE6B;IAEpD,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAA;QACzB,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,uCAAuC,CAAC,CAAA;QAE3E,OAAO,UAEL,IAAU;YAEV,OAAO,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;QACtD,CAAC,CAAA;IACH,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,IAAI,CAAA;QACjC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAA;QAE7C,OAAO,KAAK,CAAC,UAAU,CAAC,CAAA;IAC1B,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,QAAkB,EAAE,UAAkB,EAAE,IAAU;IACtE,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAChC,UAAU,EACV,IAAI,EACJ,IAAI,EACJ,4BAA4B,EAC5B,IAAI,CACL,CAAA;IAED,IAAI,KAAkB,CAAA;IACtB,OAAO,KAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACvD,IAAI,KAAK,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;IACjC,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC"}

package/lib/types.d.ts

@@ -1,15 +1,16 @@
+import { Arrayable } from '@blackglory/prelude';
 export interface IContext {
     readonly document: Document;
     readonly next: (node: Node, distance?: number) => Node | undefined;
     readonly collection: {
-        [name: string]: Node | Node[];
+        [name: string]: Arrayable<Node>;
     };
 }
 export interface IReadonlyContext {
     readonly document: Document;
     readonly next: (node: Node, distance?: number) => Node | undefined;
     readonly collection: {
-        readonly [name: string]: Node | Node[];
+        readonly [name: string]: Arrayable<Node>;
     };
 }
 export type IMatcher<T extends Node> = ITerminalMatcher<T> | INestedMatcher<T> | ISkipMatcher<T> | (<T extends Node>(this: IReadonlyContext, node: T) => boolean | number | Iterable<number>);

package/lib/utils/match-one-by-one.js

@@ -1,6 +1,6 @@
-import { isBoolean, isNumber, isIterable } from '@blackglory/prelude';
+import { isBoolean, isNumber, isIterable, isEmptyArray } from '@blackglory/prelude';
 export function matchOneByOne(context, source, ...matchers) {
-    if (matchers.length === 0)
+    if (isEmptyArray(matchers))
         return true;
     if (!source)
         return false;

package/lib/utils/match-one-by-one.js.map

@@ -1 +1 @@
-{"version":3,"file":"match-one-by-one.js","sourceRoot":"","sources":["../../src/utils/match-one-by-one.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAErE,MAAM,UAAU,aAAa,CAC3B,OAAyB,EACzB,MAAgB,EAChB,GAAG,QAA4B;IAE/B,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IACtC,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IAEzB,MAAM,CAAC,OAAO,EAAE,GAAG,aAAa,CAAC,GAAG,QAAQ,CAAA;IAE5C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,CAA+B,CAAA;IAEtF,kBAAkB;IAClB,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QACtB,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAa,CAAA;YACjD,OAAO,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC,CAAA;QAC3D,CAAC;aAAM,CAAC;YACN,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC;IAED,wCAAwC;IACxC,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACrB,MAAM,QAAQ,GAAG,MAAM,CAAA;QACvB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAa,CAAA;QAC3D,OAAO,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC,CAAA;IAC3D,CAAC;IAED,6CAA6C;IAC7C,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,KAAK,MAAM,QAAQ,IAAI,MAAM,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAa,CAAA;YAC3D,IAAI,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC,EAAE,CAAC;gBACvD,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;QAED,uBAAuB;QACvB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;AACzC,CAAC"}
+{"version":3,"file":"match-one-by-one.js","sourceRoot":"","sources":["../../src/utils/match-one-by-one.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEnF,MAAM,UAAU,aAAa,CAC3B,OAAyB,EACzB,MAAgB,EAChB,GAAG,QAA4B;IAE/B,IAAI,YAAY,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAA;IACvC,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IAEzB,MAAM,CAAC,OAAO,EAAE,GAAG,aAAa,CAAC,GAAG,QAAQ,CAAA;IAE5C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,CAA+B,CAAA;IAEtF,kBAAkB;IAClB,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QACtB,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAa,CAAA;YACjD,OAAO,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC,CAAA;QAC3D,CAAC;aAAM,CAAC;YACN,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC;IAED,wCAAwC;IACxC,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACrB,MAAM,QAAQ,GAAG,MAAM,CAAA;QACvB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAa,CAAA;QAC3D,OAAO,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC,CAAA;IAC3D,CAAC;IAED,6CAA6C;IAC7C,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,KAAK,MAAM,QAAQ,IAAI,MAAM,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAa,CAAA;YAC3D,IAAI,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC,EAAE,CAAC;gBACvD,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;QAED,uBAAuB;QACvB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;AACzC,CAAC"}

package/lib/utils/merge-in-place.d.ts

@@ -1 +1,2 @@
-export declare function mergeInPlace<T>(target: Record<string, T | T[]>, source: Record<string, T | T[]>): void;
+import { Arrayable } from '@blackglory/prelude';
+export declare function mergeInPlace<T>(target: Record<string, Arrayable<T>>, source: Record<string, Arrayable<T>>): void;

package/lib/utils/merge-in-place.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-in-place.js","sourceRoot":"","sources":["../../src/utils/merge-in-place.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAE7C,MAAM,UAAU,YAAY,CAC1B,MAA+B,EAC/B,MAA+B;IAE/B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YAChB,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBACzB,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACnB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAQ,EAAE,GAAG,KAAK,CAAC,CAAA;gBACjD,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAQ,EAAE,KAAK,CAAC,CAAA;gBAC9C,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACnB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAM,EAAE,GAAG,KAAK,CAAC,CAAA;gBAC5C,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAM,EAAE,KAAK,CAAC,CAAA;gBACzC,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;QACrB,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"merge-in-place.js","sourceRoot":"","sources":["../../src/utils/merge-in-place.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAExD,MAAM,UAAU,YAAY,CAC1B,MAAoC,EACpC,MAAoC;IAEpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YAChB,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBACzB,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACnB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAQ,EAAE,GAAG,KAAK,CAAC,CAAA;gBACjD,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAQ,EAAE,KAAK,CAAC,CAAA;gBAC9C,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACnB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAM,EAAE,GAAG,KAAK,CAAC,CAAA;gBAC5C,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAM,EAAE,KAAK,CAAC,CAAA;gBACzC,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;QACrB,CAAC;IACH,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blackglory/match",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A module for matching nodes from pages",
   "keywords": [
     "query",
@@ -43,7 +43,6 @@
     "@types/jsdom": "^27.0.0",
     "eslint": "^9.39.2",
     "husky": "^4.3.8",
-    "iterable-operator": "^5.1.0",
     "jsdom": "^27.4.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^6.1.2",
@@ -59,6 +58,7 @@
   "dependencies": {
     "@blackglory/prelude": "^0.4.0",
     "extra-dom": "^0.7.0",
-    "extra-generator": "^0.5.9"
+    "extra-generator": "^0.5.9",
+    "extra-tags": "^0.5.4"
   }
 }

package/src/match-element.ts

@@ -2,13 +2,17 @@ import { isDocument } from 'extra-dom'
 import { IMatcher, IContext } from './types.js'
 import { matchOneByOne } from '@utils/match-one-by-one.js'
 import { nextElementSibling } from '@utils/next-element-sibling.js'
+import { Arrayable } from '@blackglory/prelude'
 
 export function matchElement(
   this: void | Document
 , element: Element
 , ...matchers: Array<IMatcher<Element>>
-): { [name: string]: Node | Node[] } | null {
-  const document = isDocument(this) ? this : globalThis.document
+): Record<string, Arrayable<Node>> | null {
+  const document = isDocument(this)
+                 ? this
+                 : globalThis.document
+
   const context: IContext = {
     document
   , collection: {}

package/src/match.ts

@@ -2,13 +2,17 @@ import { isDocument } from 'extra-dom'
 import { IMatcher, IContext } from './types.js'
 import { matchOneByOne } from '@utils/match-one-by-one.js'
 import { nextSibling } from '@utils/next-sibling.js'
+import { Arrayable } from '@blackglory/prelude'
 
 export function match(
   this: void | Document
 , node: Node
 , ...matchers: Array<IMatcher<Node>>
-): { [name: string]: Node | Node[] } | null {
-  const document = isDocument(this) ? this : globalThis.document
+): Record<string, Arrayable<Node>> | null {
+  const document = isDocument(this)
+                 ? this
+                 : globalThis.document
+
   const context: IContext = {
     document
   , collection: {}

package/src/matchers/child-nodes.ts

@@ -1,3 +1,4 @@
+import { isEmptyArray } from '@blackglory/prelude'
 import { INestedMatcher, IMatcher, IReadonlyContext } from '@src/types.js'
 import { matchOneByOne } from '@utils/match-one-by-one.js'
 import { mergeInPlace } from '@utils/merge-in-place.js'
@@ -6,7 +7,7 @@ import { nextSibling } from '@utils/next-sibling.js'
 export function childNodes(...matchers: Array<IMatcher<Node>>): INestedMatcher<Node> {
   return function (this: IReadonlyContext, node: Node) {
     // 空matchers意味着"childNodes应该为空".
-    if (matchers.length === 0) {
+    if (isEmptyArray(matchers)) {
       return node.childNodes.length === 0
     }
 

package/src/matchers/children.ts

@@ -1,3 +1,4 @@
+import { isEmptyArray } from '@blackglory/prelude'
 import { IMatcher, INestedMatcher, IReadonlyContext } from '@src/types.js'
 import { matchOneByOne } from '@utils/match-one-by-one.js'
 import { mergeInPlace } from '@utils/merge-in-place.js'
@@ -8,7 +9,7 @@ export function children(
 ): INestedMatcher<Element> {
   return function (this: IReadonlyContext, element: Element) {
     // 空matchers意味着"children应该为空".
-    if (matchers.length === 0) {
+    if (isEmptyArray(matchers)) {
       return element.children.length === 0
     }
 

package/src/matchers/css.ts

@@ -1,4 +1,4 @@
-import { concat } from '@utils/concat.js'
+import { concat } from 'extra-tags'
 import { ITerminalMatcher } from '@src/types.js'
 import { isString } from '@blackglory/prelude'
 
@@ -17,7 +17,7 @@ export function css(...args:
     return (element: Element) => element.matches(selector)
   } else {
     const [strings, ...values] = args
-    const selector = concat(strings, values).join('')
+    const selector = concat(strings, ...values)
 
     return css(selector)
   }

package/src/matchers/element.ts

@@ -1,33 +1,53 @@
 import { isntElement } from 'extra-dom'
 import { INestedMatcher, ITerminalMatcher, IReadonlyContext } from '@src/types.js'
-import { isArray, isString } from '@blackglory/prelude'
-import { concat } from '@utils/concat.js'
+import { isArray, isEmptyArray, isString } from '@blackglory/prelude'
+import { concat } from 'extra-tags'
 import { mergeInPlace } from '@utils/merge-in-place.js'
 
 export function element(
   strings: TemplateStringsArray
 , ...values: string[]
-): (...matchers: Array<INestedMatcher<Element> | ITerminalMatcher<Element>>) => INestedMatcher<Node>
-export function element(name: string, ...matchers: Array<INestedMatcher<Element>>):
-  INestedMatcher<Node>
-export function element(...matchers: Array<INestedMatcher<Element>>):
-  INestedMatcher<Node>
+): (
+  ...matchers: Array<
+  | INestedMatcher<Element>
+  | ITerminalMatcher<Element>
+  >
+) => INestedMatcher<Node>
+export function element(
+  name: string
+, ...matchers: Array<INestedMatcher<Element>>
+): INestedMatcher<Node>
+export function element(
+  ...matchers: Array<INestedMatcher<Element>>
+): INestedMatcher<Node>
 export function element(...args:
 | [strings: TemplateStringsArray, ...values: string[]]
 | [name: string, ...matchers: Array<INestedMatcher<Element> | ITerminalMatcher<Element>>]
 | [...matchers: Array<INestedMatcher<Element> | ITerminalMatcher<Element>>]
 ) {
   if (isArray(args[0])) {
-    const [strings, ...values] =
-      args as [strings: TemplateStringsArray, ...values: string[]]
-    const name = concat(strings, values).join('')
+    const [strings, ...values] = args as [
+      strings: TemplateStringsArray
+    , ...values: string[]
+    ]
+    const name = concat(strings, ...values)
 
-    return (...matchers: Array<INestedMatcher<Element> | ITerminalMatcher<Element>>) => element(name, ...matchers)
+    return (
+      ...matchers: Array<
+      | INestedMatcher<Element>
+      | ITerminalMatcher<Element>
+      >
+    ) => element(name, ...matchers)
   }
 
   if (isString(args[0])) {
-    const [name, ...matchers] =
-      args as [name: string, ...matchers: Array<INestedMatcher<Element> | ITerminalMatcher<Element>>]
+    const [name, ...matchers] = args as [
+      name: string
+    , ...matchers: Array<
+      | INestedMatcher<Element>
+      | ITerminalMatcher<Element>
+      >
+    ]
 
     return function (this: IReadonlyContext, _element: Element) {
       const result = element(...matchers).call(this, _element)
@@ -38,11 +58,16 @@ export function element(...args:
     }
   }
 
-  const [...matchers] = args as [...matchers: Array<INestedMatcher<Element> | ITerminalMatcher<Element>>]
+  const [...matchers] = args as [
+    ...matchers: Array<
+    | INestedMatcher<Element>
+    | ITerminalMatcher<Element>
+    >
+  ]
 
   return function (this: IReadonlyContext, element: Element) {
     if (isntElement(element)) return false
-    if (matchers.length === 0) return true
+    if (isEmptyArray(matchers)) return true
 
     return matchers.every(match => match.call(this, element))
   }

package/src/matchers/node.ts

@@ -1,12 +1,17 @@
 import { INestedMatcher, ITerminalMatcher, IReadonlyContext } from '@src/types.js'
-import { isArray, isString } from '@blackglory/prelude'
-import { concat } from '@utils/concat.js'
+import { isArray, isEmptyArray, isString } from '@blackglory/prelude'
+import { concat } from 'extra-tags'
 import { mergeInPlace } from '@utils/merge-in-place.js'
 
 export function node(
   strings: TemplateStringsArray
 , ...values: string[]
-): (...matchers: Array<INestedMatcher<Node> | ITerminalMatcher<Node>>) => INestedMatcher<Node>
+): (
+  ...matchers: Array<
+  | INestedMatcher<Node>
+  | ITerminalMatcher<Node>
+  >
+) => INestedMatcher<Node>
 export function node(
   name: string
 , ...matchers: Array<INestedMatcher<Node> | ITerminalMatcher<Node>>
@@ -20,16 +25,28 @@ export function node(...args:
 | [...matchers: Array<INestedMatcher<Node> | ITerminalMatcher<Node>>]
 ) {
   if (isArray(args[0])) {
-    const [strings, ...values] =
-      args as [strings: TemplateStringsArray, ...values: string[]]
-    const name = concat(strings, values).join('')
+    const [strings, ...values] = args as [
+      strings: TemplateStringsArray
+    , ...values: string[]
+    ]
+    const name = concat(strings, ...values)
 
-    return (...matchers: Array<INestedMatcher<Node> | ITerminalMatcher<Node>>) => node(name, ...matchers)
+    return (
+      ...matchers: Array<
+      | INestedMatcher<Node>
+      | ITerminalMatcher<Node>
+      >
+    ) => node(name, ...matchers)
   }
 
   if (isString(args[0])) {
-    const [name, ...matchers] =
-      args as [name: string, ...matchers: Array<INestedMatcher<Node> | ITerminalMatcher<Node>>]
+    const [name, ...matchers] = args as [
+      name: string
+    , ...matchers: Array<
+      | INestedMatcher<Node>
+      | ITerminalMatcher<Node>
+      >
+    ]
 
     return function (this: IReadonlyContext, _node: Node) {
       const result = node(...matchers).call(this, _node)
@@ -40,10 +57,15 @@ export function node(...args:
     }
   }
 
-  const [...matchers] = args as [...matchers: Array<INestedMatcher<Node> | ITerminalMatcher<Node>>]
+  const [...matchers] = args as [
+    ...matchers: Array<
+    | INestedMatcher<Node>
+    | ITerminalMatcher<Node>
+    >
+  ]
 
   return function (this: IReadonlyContext, node: Node) {
-    if (matchers.length === 0) return true
+    if (isEmptyArray(matchers)) return true
 
     return matchers.every(match => match.call(this, node))
   }

package/src/matchers/optional.ts

@@ -1,6 +1,8 @@
 import { INestedMatcher, ITerminalMatcher, ISkipMatcher } from '@src/types.js'
 import { multiple } from './multiple.js'
 
-export function optional<T extends Node>(matcher: INestedMatcher<T> | ITerminalMatcher<T>): ISkipMatcher<T> {
+export function optional<T extends Node>(
+  matcher: INestedMatcher<T> | ITerminalMatcher<T>
+): ISkipMatcher<T> {
   return multiple([0, 1], matcher, { greedy: true })
 }

package/src/matchers/text-node.ts

@@ -1,6 +1,6 @@
 import { INestedMatcher, ITerminalMatcher, IReadonlyContext } from '@src/types.js'
 import { isArray, isString } from '@blackglory/prelude'
-import { concat } from '@utils/concat.js'
+import { concat } from 'extra-tags'
 import { isntTextNode } from 'extra-dom'
 import { mergeInPlace } from '@utils/merge-in-place.js'
 
@@ -21,16 +21,20 @@ export function textNode(...args:
 | [...matchers: Array<ITerminalMatcher<Node>>]
 ) {
   if (isArray(args[0])) {
-    const [strings, ...values] =
-      args as [strings: TemplateStringsArray, ...values: string[]]
-    const name = concat(strings, values).join('')
+    const [strings, ...values] = args as [
+      strings: TemplateStringsArray
+    , ...values: string[]
+    ]
+    const name = concat(strings, ...values)
 
     return (...matchers: Array<ITerminalMatcher<Node>>) => textNode(name, ...matchers)
   }
 
   if (isString(args[0])) {
-    const [name, ...matchers] =
-      args as [name: string, ...matchers: Array<ITerminalMatcher<Node>>]
+    const [name, ...matchers] = args as [
+      name: string
+    , ...matchers: Array<ITerminalMatcher<Node>>
+    ]
 
     return function (this: IReadonlyContext, node: Node) {
       const result = textNode(...matchers).call(this, node)

package/src/matchers/xpath.ts

@@ -1,12 +1,12 @@
 import { ITerminalMatcher, IReadonlyContext } from '@src/types.js'
-import { isString } from '@blackglory/prelude'
-import { concat } from '@utils/concat.js'
+import { isntNull, isString } from '@blackglory/prelude'
+import { concat } from 'extra-tags'
 import { assert } from '@blackglory/prelude'
 
 const UNORDERED_NODE_ITERATOR_TYPE =
   'XPathResult' in globalThis
-  ? XPathResult.UNORDERED_NODE_ITERATOR_TYPE
-  : 4
+? XPathResult.UNORDERED_NODE_ITERATOR_TYPE
+: 4
 
 export function xpath(
   strings: TemplateStringsArray
@@ -21,7 +21,7 @@ export function xpath(...args:
 ): ITerminalMatcher<Node> {
   if (isString(args[0])) {
     const [expression] = args
-    assert(expression.startsWith('//*'), 'XPath expressions must start with "//*"')
+    assert(expression.startsWith('/'), 'XPath expressions must start with "/"')
 
     return function (
       this: Pick<IReadonlyContext, 'document'>
@@ -31,7 +31,7 @@ export function xpath(...args:
     }
   } else {
     const [strings, ...values] = args
-    const expression = concat(strings, values).join('')
+    const expression = concat(strings, ...values)
 
     return xpath(expression)
   }
@@ -46,8 +46,8 @@ function xpathMatches(document: Document, expression: string, node: Node): boole
   , null
   )
 
-  let value
-  while ((value = iterator.iterateNext()) !== null) {
+  let value: Node | null
+  while (value = iterator.iterateNext(), isntNull(value)) {
     if (value === node) return true
   }
   return false

package/src/types.ts

@@ -1,8 +1,10 @@
+import { Arrayable } from '@blackglory/prelude'
+
 export interface IContext {
   readonly document: Document
   readonly next: (node: Node, distance?: number) => Node | undefined
   readonly collection: {
-    [name: string]: Node | Node[]
+    [name: string]: Arrayable<Node>
   }
 }
 
@@ -10,7 +12,7 @@ export interface IReadonlyContext {
   readonly document: Document
   readonly next: (node: Node, distance?: number) => Node | undefined
   readonly collection: {
-    readonly [name: string]: Node | Node[]
+    readonly [name: string]: Arrayable<Node>
   }
 }
 
@@ -19,8 +21,9 @@ export type IMatcher<T extends Node> =
 | INestedMatcher<T>
 | ISkipMatcher<T>
 | (
-    <T extends Node>(this: IReadonlyContext, node: T) =>
-      boolean | number | Iterable<number>
+    <T extends Node>(
+      this: IReadonlyContext, node: T
+    ) => boolean | number | Iterable<number>
   )
 
 export type INestedMatcher<T extends Node> = (

package/src/utils/match-one-by-one.ts

@@ -1,12 +1,12 @@
 import { IMatcher, IReadonlyContext } from '@src/types.js'
-import { isBoolean, isNumber, isIterable } from '@blackglory/prelude'
+import { isBoolean, isNumber, isIterable, isEmptyArray } from '@blackglory/prelude'
 
 export function matchOneByOne<T extends Node>(
   context: IReadonlyContext
 , source: T | null
 , ...matchers: Array<IMatcher<T>>
 ): boolean {
-  if (matchers.length === 0) return true
+  if (isEmptyArray(matchers)) return true
   if (!source) return false
 
   const [matcher, ...otherMatchers] = matchers

package/src/utils/merge-in-place.ts

@@ -1,8 +1,8 @@
-import { isArray } from '@blackglory/prelude'
+import { Arrayable, isArray } from '@blackglory/prelude'
 
 export function mergeInPlace<T>(
-  target: Record<string, T | T[]>
-, source: Record<string, T | T[]>
+  target: Record<string, Arrayable<T>>
+, source: Record<string, Arrayable<T>>
 ): void {
   for (const [key, value] of Object.entries(source)) {
     if (target[key]) {

package/lib/utils/concat.d.ts

@@ -1 +0,0 @@
-export declare function concat(strings: TemplateStringsArray, values: string[]): string[];

package/lib/utils/concat.js

@@ -1,10 +0,0 @@
-export function concat(strings, values) {
-    const result = [];
-    for (let i = 0, len = values.length; i < len; i++) {
-        result.push(strings[i]);
-        result.push(values[i]);
-    }
-    result.push(strings[strings.length - 1]);
-    return result;
-}
-//# sourceMappingURL=concat.js.map

package/lib/utils/concat.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"concat.js","sourceRoot":"","sources":["../../src/utils/concat.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,MAAM,CAAC,OAA6B,EAAE,MAAgB;IACpE,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IACxB,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;IACxC,OAAO,MAAM,CAAA;AACf,CAAC"}

package/src/utils/concat.ts

@@ -1,9 +0,0 @@
-export function concat(strings: TemplateStringsArray, values: string[]): string[] {
-  const result = []
-  for (let i = 0, len = values.length; i < len; i++) {
-    result.push(strings[i])
-    result.push(values[i])
-  }
-  result.push(strings[strings.length - 1])
-  return result
-}