@blackglory/match 0.3.6 → 0.4.0

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

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeInPlace = void 0;
-const types_1 = require("@blackglory/types");
-function mergeInPlace(target, source) {
+import { isArray } from '@blackglory/prelude';
+export function mergeInPlace(target, source) {
     for (const [key, value] of Object.entries(source)) {
         if (target[key]) {
-            if ((0, types_1.isArray)(target[key])) {
-                if ((0, types_1.isArray)(value)) {
+            if (isArray(target[key])) {
+                if (isArray(value)) {
                     target[key] = [...target[key], ...value];
                 }
                 else {
@@ -14,7 +11,7 @@ function mergeInPlace(target, source) {
                 }
             }
             else {
-                if ((0, types_1.isArray)(value)) {
+                if (isArray(value)) {
                     target[key] = [target[key], ...value];
                 }
                 else {
@@ -27,5 +24,4 @@ function mergeInPlace(target, source) {
         }
     }
 }
-exports.mergeInPlace = mergeInPlace;
 //# sourceMappingURL=merge-in-place.js.map

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,6CAA2C;AAE3C,SAAgB,YAAY,CAC1B,MAAkC,EAClC,MAAkC;IAElC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACjD,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE;YACf,IAAI,IAAA,eAAO,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE;gBACxB,IAAI,IAAA,eAAO,EAAC,KAAK,CAAC,EAAE;oBAClB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAQ,EAAE,GAAG,KAAK,CAAC,CAAA;iBAChD;qBAAM;oBACL,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAQ,EAAE,KAAK,CAAC,CAAA;iBAC7C;aACF;iBAAM;gBACL,IAAI,IAAA,eAAO,EAAC,KAAK,CAAC,EAAE;oBAClB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAM,EAAE,GAAG,KAAK,CAAC,CAAA;iBAC3C;qBAAM;oBACL,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAM,EAAE,KAAK,CAAC,CAAA;iBACxC;aACF;SACF;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;SACpB;KACF;AACH,CAAC;AAvBD,oCAuBC"}
+{"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"}

package/lib/utils/next-element-sibling.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nextElementSibling = void 0;
-const ExtraDOM = require("extra-dom");
-function nextElementSibling(node, distance = 1) {
+import * as ExtraDOM from 'extra-dom';
+export function nextElementSibling(node, distance = 1) {
     if (distance === 0)
         return node;
     return ExtraDOM.nextElementSibling(node, distance);
 }
-exports.nextElementSibling = nextElementSibling;
 //# sourceMappingURL=next-element-sibling.js.map

package/lib/utils/next-element-sibling.js.map

@@ -1 +1 @@
-{"version":3,"file":"next-element-sibling.js","sourceRoot":"","sources":["../../src/utils/next-element-sibling.ts"],"names":[],"mappings":";;;AAAA,sCAAqC;AAErC,SAAgB,kBAAkB,CAChC,IAAU,EACV,WAAmB,CAAC;IAEpB,IAAI,QAAQ,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IAE/B,OAAO,QAAQ,CAAC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;AACpD,CAAC;AAPD,gDAOC"}
+{"version":3,"file":"next-element-sibling.js","sourceRoot":"","sources":["../../src/utils/next-element-sibling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAA;AAErC,MAAM,UAAU,kBAAkB,CAChC,IAAU,EACV,WAAmB,CAAC;IAEpB,IAAI,QAAQ,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IAE/B,OAAO,QAAQ,CAAC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;AACpD,CAAC"}

package/lib/utils/next-sibling.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nextSibling = void 0;
-const ExtraDOM = require("extra-dom");
-function nextSibling(node, distance = 1) {
+import * as ExtraDOM from 'extra-dom';
+export function nextSibling(node, distance = 1) {
     if (distance === 0)
         return node;
     return ExtraDOM.nextSibling(node, distance);
 }
-exports.nextSibling = nextSibling;
 //# sourceMappingURL=next-sibling.js.map

package/lib/utils/next-sibling.js.map

@@ -1 +1 @@
-{"version":3,"file":"next-sibling.js","sourceRoot":"","sources":["../../src/utils/next-sibling.ts"],"names":[],"mappings":";;;AAAA,sCAAqC;AAErC,SAAgB,WAAW,CAAC,IAAU,EAAE,WAAmB,CAAC;IAC1D,IAAI,QAAQ,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IAE/B,OAAO,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;AAC7C,CAAC;AAJD,kCAIC"}
+{"version":3,"file":"next-sibling.js","sourceRoot":"","sources":["../../src/utils/next-sibling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAA;AAErC,MAAM,UAAU,WAAW,CAAC,IAAU,EAAE,WAAmB,CAAC;IAC1D,IAAI,QAAQ,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IAE/B,OAAO,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;AAC7C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blackglory/match",
-  "version": "0.3.6",
+  "version": "0.4.0",
   "description": "A module for matching nodes from pages",
   "keywords": [
     "query",
@@ -11,53 +11,54 @@
     "lib",
     "src"
   ],
+  "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
+  "sideEffects": false,
+  "engines": {
+    "node": ">=22"
+  },
   "repository": "git@github.com:BlackGlory/match.git",
   "author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
   "license": "MIT",
-  "sideEffects": false,
   "scripts": {
+    "prepare": "ts-patch install -s",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src __tests__",
-    "test": "jest --config jest.config.js",
-    "test:coverage": "jest --coverage --config jest.config.js",
-    "prepublishOnly": "run-s clean build",
+    "test": "vitest --run",
+    "prepublishOnly": "run-s prepare clean build",
     "clean": "rimraf lib",
-    "build": "run-s build:*",
-    "build:compile": "tsc --project tsconfig.build.json --module commonjs --target es2018 --outDir lib",
-    "build:patch": "tscpaths -p tsconfig.build.json -s ./src -o ./lib",
+    "build": "tsc --project tsconfig.build.json",
     "release": "standard-version"
   },
   "husky": {
     "hooks": {
-      "pre-commit": "run-s lint build test",
+      "pre-commit": "run-s prepare lint build test",
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "^15.0.0",
-    "@commitlint/config-conventional": "^15.0.0",
-    "@types/jest": "^27.0.3",
-    "@types/jsdom": "^16.2.13",
-    "@typescript-eslint/eslint-plugin": "^5.6.0",
-    "@typescript-eslint/parser": "^5.6.0",
-    "eslint": "^8.4.1",
+    "@commitlint/cli": "^20.3.1",
+    "@commitlint/config-conventional": "^20.3.1",
+    "@eslint/js": "^9.39.2",
+    "@types/jsdom": "^27.0.0",
+    "eslint": "^9.39.2",
     "husky": "^4.3.8",
-    "iterable-operator": "^0.14.4",
-    "jest": "^27.4.4",
-    "jsdom": "^19.0.0",
+    "iterable-operator": "^5.1.0",
+    "jsdom": "^27.4.0",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^3.0.2",
-    "standard-version": "^9.3.2",
-    "ts-jest": "^27.1.1",
-    "tscpaths": "^0.0.9",
-    "tslib": "^2.3.1",
-    "typescript": "^4.5.3"
+    "rimraf": "^6.1.2",
+    "standard-version": "^9.5.0",
+    "ts-patch": "^3.3.0",
+    "tslib": "^2.8.1",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.53.0",
+    "typescript-transform-paths": "^3.5.6",
+    "vite-tsconfig-paths": "^6.0.4",
+    "vitest": "^4.0.17"
   },
   "dependencies": {
-    "@blackglory/errors": "^1.1.2",
-    "@blackglory/types": "^0.5.2",
-    "extra-dom": "^0.4.4",
-    "extra-generator": "^0.2.15"
+    "@blackglory/prelude": "^0.4.0",
+    "extra-dom": "^0.7.0",
+    "extra-generator": "^0.5.9"
   }
 }

package/src/index.ts

@@ -1,18 +1,18 @@
-export { match } from './match'
-export { matchElement } from './match-element'
+export { match } from './match.js'
+export { matchElement } from './match-element.js'
 
-export { anyOf } from '@matchers/any-of'
-export { childNodes } from '@matchers/child-nodes'
-export { children } from '@matchers/children'
-export { css } from '@matchers/css'
-export { element } from '@matchers/element'
-export { multiple } from '@matchers/multiple'
-export { node } from '@matchers/node'
-export { optional } from '@matchers/optional'
-export { repeat } from '@matchers/repeat'
-export { tap } from '@matchers/tap'
-export { textContentEquals } from '@matchers/text-content-equals'
-export { textContentIncludes } from '@matchers/text-content-includes'
-export { textContentMatches } from '@matchers/text-content-matches'
-export { textNode } from '@matchers/text-node'
-export { xpath } from '@matchers/xpath'
+export { anyOf } from '@matchers/any-of.js'
+export { childNodes } from '@matchers/child-nodes.js'
+export { children } from '@matchers/children.js'
+export { css } from '@matchers/css.js'
+export { element } from '@matchers/element.js'
+export { multiple } from '@matchers/multiple.js'
+export { node } from '@matchers/node.js'
+export { optional } from '@matchers/optional.js'
+export { repeat } from '@matchers/repeat.js'
+export { tap } from '@matchers/tap.js'
+export { textContentEquals } from '@matchers/text-content-equals.js'
+export { textContentIncludes } from '@matchers/text-content-includes.js'
+export { textContentMatches } from '@matchers/text-content-matches.js'
+export { textNode } from '@matchers/text-node.js'
+export { xpath } from '@matchers/xpath.js'

package/src/match-element.ts

@@ -1,7 +1,7 @@
 import { isDocument } from 'extra-dom'
-import { IMatcher, IContext } from './types'
-import { matchOneByOne } from '@utils/match-one-by-one'
-import { nextElementSibling } from '@utils/next-element-sibling'
+import { IMatcher, IContext } from './types.js'
+import { matchOneByOne } from '@utils/match-one-by-one.js'
+import { nextElementSibling } from '@utils/next-element-sibling.js'
 
 export function matchElement(
   this: void | Document

package/src/match.ts

@@ -1,7 +1,7 @@
 import { isDocument } from 'extra-dom'
-import { IMatcher, IContext } from './types'
-import { matchOneByOne } from '@utils/match-one-by-one'
-import { nextSibling } from '@utils/next-sibling'
+import { IMatcher, IContext } from './types.js'
+import { matchOneByOne } from '@utils/match-one-by-one.js'
+import { nextSibling } from '@utils/next-sibling.js'
 
 export function match(
   this: void | Document

package/src/matchers/any-of.ts

@@ -1,4 +1,4 @@
-import { ITerminalMatcher, INestedMatcher, IReadonlyContext } from '@src/types'
+import { ITerminalMatcher, INestedMatcher, IReadonlyContext } from '@src/types.js'
 
 export function anyOf<T extends Node>(
   ...matchers: [

package/src/matchers/child-nodes.ts

@@ -1,7 +1,7 @@
-import { INestedMatcher, IMatcher, IReadonlyContext } from '@src/types'
-import { matchOneByOne } from '@utils/match-one-by-one'
-import { mergeInPlace } from '@utils/merge-in-place'
-import { nextSibling } from '@utils/next-sibling'
+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'
+import { nextSibling } from '@utils/next-sibling.js'
 
 export function childNodes(...matchers: Array<IMatcher<Node>>): INestedMatcher<Node> {
   return function (this: IReadonlyContext, node: Node) {

package/src/matchers/children.ts

@@ -1,7 +1,7 @@
-import { IMatcher, INestedMatcher, IReadonlyContext } from '@src/types'
-import { matchOneByOne } from '@utils/match-one-by-one'
-import { mergeInPlace } from '@utils/merge-in-place'
-import { nextElementSibling } from '@utils/next-element-sibling'
+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'
+import { nextElementSibling } from '@utils/next-element-sibling.js'
 
 export function children(
   ...matchers: Array<IMatcher<Element>>

package/src/matchers/css.ts

@@ -1,6 +1,6 @@
-import { concat } from '@utils/concat'
-import { ITerminalMatcher } from '@src/types'
-import { isString } from '@blackglory/types'
+import { concat } from '@utils/concat.js'
+import { ITerminalMatcher } from '@src/types.js'
+import { isString } from '@blackglory/prelude'
 
 export function css(
   strings: TemplateStringsArray

package/src/matchers/element.ts

@@ -1,8 +1,8 @@
 import { isntElement } from 'extra-dom'
-import { INestedMatcher, ITerminalMatcher, IReadonlyContext } from '@src/types'
-import { isArray, isString } from '@blackglory/types'
-import { concat } from '@utils/concat'
-import { mergeInPlace } from '@utils/merge-in-place'
+import { INestedMatcher, ITerminalMatcher, IReadonlyContext } from '@src/types.js'
+import { isArray, isString } from '@blackglory/prelude'
+import { concat } from '@utils/concat.js'
+import { mergeInPlace } from '@utils/merge-in-place.js'
 
 export function element(
   strings: TemplateStringsArray

package/src/matchers/multiple.ts

@@ -1,7 +1,7 @@
-import { INestedMatcher, ITerminalMatcher, ISkipMatcher, IReadonlyContext } from '@src/types'
+import { INestedMatcher, ITerminalMatcher, ISkipMatcher, IReadonlyContext } from '@src/types.js'
 import { countup } from 'extra-generator'
-import { assert } from '@blackglory/errors'
-import { matchMultiple } from '@utils/match-multiple'
+import { assert } from '@blackglory/prelude'
+import { matchMultiple } from '@utils/match-multiple.js'
 
 export enum Range {
   Min = 0

package/src/matchers/node.ts

@@ -1,7 +1,7 @@
-import { INestedMatcher, ITerminalMatcher, IReadonlyContext } from '@src/types'
-import { isArray, isString } from '@blackglory/types'
-import { concat } from '@utils/concat'
-import { mergeInPlace } from '@utils/merge-in-place'
+import { INestedMatcher, ITerminalMatcher, IReadonlyContext } from '@src/types.js'
+import { isArray, isString } from '@blackglory/prelude'
+import { concat } from '@utils/concat.js'
+import { mergeInPlace } from '@utils/merge-in-place.js'
 
 export function node(
   strings: TemplateStringsArray

package/src/matchers/optional.ts

@@ -1,5 +1,5 @@
-import { INestedMatcher, ITerminalMatcher, ISkipMatcher } from '@src/types'
-import { multiple } from './multiple'
+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> {
   return multiple([0, 1], matcher, { greedy: true })

package/src/matchers/repeat.ts

@@ -1,6 +1,6 @@
-import { INestedMatcher, ITerminalMatcher, ISkipMatcher, IReadonlyContext } from '@src/types'
-import { assert } from '@blackglory/errors'
-import { matchMultiple } from '@utils/match-multiple'
+import { INestedMatcher, ITerminalMatcher, ISkipMatcher, IReadonlyContext } from '@src/types.js'
+import { assert } from '@blackglory/prelude'
+import { matchMultiple } from '@utils/match-multiple.js'
 
 export function repeat<T extends Node>(
   times: number

package/src/matchers/tap.ts

@@ -1,4 +1,4 @@
-import { IReadonlyContext, IMatcher } from '@src/types'
+import { IReadonlyContext, IMatcher } from '@src/types.js'
 
 export function tap<T extends Node, U extends ReturnType<IMatcher<any>>>(
   matcher: (this: IReadonlyContext, node: T) => U

package/src/matchers/text-content-equals.ts

@@ -1,5 +1,5 @@
-import { ITerminalMatcher } from '@src/types'
-import { isNull } from '@blackglory/types'
+import { ITerminalMatcher } from '@src/types.js'
+import { isNull } from '@blackglory/prelude'
 
 interface ITextContentEqualsOptions {
   caseSensitive?: boolean

package/src/matchers/text-content-includes.ts

@@ -1,5 +1,5 @@
-import { ITerminalMatcher } from '@src/types'
-import { isNull } from '@blackglory/types'
+import { ITerminalMatcher } from '@src/types.js'
+import { isNull } from '@blackglory/prelude'
 
 interface ITextContentIncludesOptions {
   caseSensitive?: boolean

package/src/matchers/text-content-matches.ts

@@ -1,5 +1,5 @@
-import { ITerminalMatcher } from '@src/types'
-import { isNull } from '@blackglory/types'
+import { ITerminalMatcher } from '@src/types.js'
+import { isNull } from '@blackglory/prelude'
 
 interface ITextContentMatchesOptions {
   trim?: boolean

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 '@utils/concat.js'
 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

package/src/matchers/xpath.ts

@@ -1,7 +1,7 @@
-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 { isString } from '@blackglory/prelude'
+import { concat } from '@utils/concat.js'
+import { assert } from '@blackglory/prelude'
 
 const UNORDERED_NODE_ITERATOR_TYPE =
   'XPathResult' in globalThis

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,5 +1,5 @@
-import { IMatcher, IReadonlyContext } from '@src/types'
-import { isBoolean, isNumber, isIterable } from '@blackglory/types'
+import { IMatcher, IReadonlyContext } from '@src/types.js'
+import { isBoolean, isNumber, isIterable } from '@blackglory/prelude'
 
 export function matchOneByOne<T extends Node>(
   context: IReadonlyContext

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

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