@blackglory/match 0.3.6 → 0.4.1

package/src/matchers/text-node.ts

@@ -1,8 +1,8 @@
-import { INestedMatcher, ITerminalMatcher, IReadonlyContext } from '@src/types'
-import { isArray, isString } from '@blackglory/types'
-import { concat } from '@utils/concat'
+import { INestedMatcher, ITerminalMatcher, IReadonlyContext } from '@src/types.js'
+import { isArray, isString } from '@blackglory/prelude'
+import { concat } from 'extra-tags'
 import { isntTextNode } from 'extra-dom'
-import { mergeInPlace } from '@utils/merge-in-place'
+import { mergeInPlace } from '@utils/merge-in-place.js'
 
 export function textNode(
   strings: TemplateStringsArray
@@ -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'
-import { isString } from '@blackglory/types'
-import { concat } from '@utils/concat'
-import { assert } from '@blackglory/errors'
+import { ITerminalMatcher, IReadonlyContext } from '@src/types.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-multiple.ts

@@ -1,5 +1,5 @@
 import { countup } from 'extra-generator'
-import { INestedMatcher, ITerminalMatcher, IReadonlyContext } from '@src/types'
+import { INestedMatcher, ITerminalMatcher, IReadonlyContext } from '@src/types.js'
 
 /**
  * @returns {number} 返回值为成功匹配的元素个数, 当此值等于ubound时, 代表匹配成功.

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

@@ -1,12 +1,12 @@
-import { IMatcher, IReadonlyContext } from '@src/types'
-import { isBoolean, isNumber, isIterable } from '@blackglory/types'
+import { IMatcher, IReadonlyContext } from '@src/types.js'
+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/types'
+import { Arrayable, isArray } from '@blackglory/prelude'
 
 export function mergeInPlace<T>(
-  target: { [key: string]: T | T[] }
-, source: { [key: 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,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.concat = void 0;
-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;
-}
-exports.concat = concat;
-//# 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,SAAgB,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;QACjD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;KACvB;IACD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;IACxC,OAAO,MAAM,CAAA;AACf,CAAC;AARD,wBAQC"}

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