wikilint 2.8.0 → 2.9.1

package/dist/src/tagPair/include.js

@@ -1,4 +1,38 @@
 "use strict";
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IncludeToken = void 0;
 const lint_1 = require("../../util/lint");
@@ -9,31 +43,47 @@ const index_2 = require("./index");
  * `<includeonly>`或`<noinclude>`或`<onlyinclude>`
  * @classdesc `{childNodes: [AstText, AstText]}`
  */
-class IncludeToken extends (0, hidden_1.hiddenToken)(index_2.TagPairToken) {
-    type = 'include';
-    /**
-     * @param name 标签名
-     * @param attr 标签属性
-     * @param inner 内部wikitext
-     * @param closed 是否封闭
-     */
-    constructor(name, attr = '', inner, closed, config = index_1.default.getConfig(), accum = []) {
-        super(name, attr, inner ?? '', inner === undefined ? closed : closed ?? '', config, accum);
-    }
-    /** @override */
-    lint(start = this.getAbsoluteIndex()) {
-        if (this.closed) {
-            return [];
+let IncludeToken = (() => {
+    let _classDecorators = [(0, hidden_1.hiddenToken)()];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = index_2.TagPairToken;
+    var IncludeToken = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            IncludeToken = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
         }
-        const e = (0, lint_1.generateForSelf)(this, { start }, 'unclosed-comment', index_1.default.msg('unclosed $1', `<${this.name}>`));
-        e.suggestions = [
-            {
-                desc: 'close',
-                range: [e.endIndex, e.endIndex],
-                text: `</${this.name}>`,
-            },
-        ];
-        return [e];
-    }
-}
+        type = 'include';
+        /**
+         * @param name 标签名
+         * @param attr 标签属性
+         * @param inner 内部wikitext
+         * @param closed 是否封闭
+         */
+        constructor(name, attr = '', inner, closed, config, accum) {
+            super(name, attr, inner ?? '', inner === undefined ? closed : closed ?? '', config, accum);
+        }
+        /** @private */
+        lint(start = this.getAbsoluteIndex()) {
+            if (this.closed) {
+                return [];
+            }
+            const e = (0, lint_1.generateForSelf)(this, { start }, 'unclosed-comment', index_1.default.msg('unclosed $1', `<${this.name}>`));
+            e.suggestions = [
+                {
+                    desc: 'close',
+                    range: [e.endIndex, e.endIndex],
+                    text: `</${this.name}>`,
+                },
+            ];
+            return [e];
+        }
+    };
+    return IncludeToken = _classThis;
+})();
 exports.IncludeToken = IncludeToken;

package/dist/src/tagPair/index.d.ts

@@ -1,5 +1,5 @@
-import Parser from '../../index';
 import { Token } from '../index';
+import type { Config } from '../../base';
 import type { AstNodes } from '../../lib/node';
 /** 成对标签 */
 export declare abstract class TagPairToken extends Token {
@@ -19,7 +19,5 @@ export declare abstract class TagPairToken extends Token {
      * @param inner 内部wikitext
      * @param closed 是否封闭；约定`undefined`表示自封闭，`''`表示未闭合
      */
-    constructor(name: string, attr: string | Token, inner: string | Token, closed?: string, config?: Parser.Config, accum?: Token[]);
-    /** @override */
-    text(): string;
+    constructor(name: string, attr: string | Token, inner: string | Token, closed?: string, config?: Config, accum?: Token[]);
 }

package/dist/src/tagPair/index.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TagPairToken = void 0;
-const index_1 = require("../../index");
-const index_2 = require("../index");
+const index_1 = require("../index");
 /** 成对标签 */
-class TagPairToken extends index_2.Token {
+class TagPairToken extends index_1.Token {
     #tags;
     closed;
     selfClosing;
@@ -18,7 +17,7 @@ class TagPairToken extends index_2.Token {
      * @param inner 内部wikitext
      * @param closed 是否封闭；约定`undefined`表示自封闭，`''`表示未闭合
      */
-    constructor(name, attr, inner, closed, config = index_1.default.getConfig(), accum = []) {
+    constructor(name, attr, inner, closed, config, accum = []) {
         super(undefined, config);
         this.setAttribute('name', name.toLowerCase());
         this.#tags = [name, closed || name];
@@ -32,10 +31,10 @@ class TagPairToken extends index_2.Token {
     toString() {
         const { selfClosing, firstChild, lastChild, } = this, [opening, closing] = this.#tags;
         return selfClosing
-            ? `<${opening}${String(firstChild)}/>`
-            : `<${opening}${String(firstChild)}>${String(lastChild)}${this.closed ? `</${closing}>` : ''}`;
+            ? `<${opening}${firstChild.toString()}/>`
+            : `<${opening}${firstChild.toString()}>${lastChild.toString()}${this.closed ? `</${closing}>` : ''}`;
     }
-    /** @override */
+    /** @private */
     text() {
         const [opening, closing] = this.#tags;
         return this.selfClosing

package/dist/src/transclude.d.ts

@@ -28,10 +28,6 @@ export declare abstract class TranscludeToken extends Token {
     setModifier(modifier: string): boolean;
     /** 是否是模板或模块 */
     isTemplate(): boolean;
-    /** @override */
-    text(): string;
-    /** @override */
-    lint(start?: number, re?: RegExp): LintError[];
     /**
      * @override
      * @param token 待插入的子节点

package/dist/src/transclude.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TranscludeToken = void 0;
 const string_1 = require("../util/string");
 const lint_1 = require("../util/lint");
+const rect_1 = require("../lib/rect");
 const debug_1 = require("../util/debug");
 const constants_1 = require("../util/constants");
 const index_1 = require("../index");
@@ -51,7 +52,7 @@ class TranscludeToken extends index_2.Token {
             if (isVar || isFunction && canonicalName) {
                 this.setAttribute('name', canonicalName ?? lcName);
                 this.type = 'magic-word';
-                const pattern = new RegExp(`^\\s*${name}\\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {});
+                const pattern = new RegExp(String.raw `^\s*${name}\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {});
                 super.insertAt(token);
                 if (arg.length > 0) {
                     parts.unshift([arg.join(':')]);
@@ -72,7 +73,7 @@ class TranscludeToken extends index_2.Token {
             const name = (0, string_1.removeComment)(title).trim();
             if (!this.normalizeTitle(name, 10, true).valid) {
                 accum.pop();
-                throw new SyntaxError('非法的模板名称');
+                throw new SyntaxError('Invalid template name');
             }
             const token = new atom_1.AtomToken(title, 'template-name', config, accum, {});
             super.insertAt(token);
@@ -131,10 +132,10 @@ class TranscludeToken extends index_2.Token {
     /** @private */
     toString() {
         return `{{${this.modifier}${this.type === 'magic-word'
-            ? `${String(this.firstChild)}${this.length === 1 ? '' : ':'}${this.childNodes.slice(1).map(String).join('|')}`
+            ? `${this.firstChild.toString()}${this.length === 1 ? '' : ':'}${this.childNodes.slice(1).map(String).join('|')}`
             : super.toString('|')}}}`;
     }
-    /** @override */
+    /** @private */
     text() {
         const { childNodes, length, firstChild, modifier, type, name } = this;
         return type === 'magic-word' && name === 'vardefine'
@@ -156,16 +157,14 @@ class TranscludeToken extends index_2.Token {
     getGaps() {
         return 1;
     }
-    /** @override */
+    /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), { type, childNodes, length } = this;
-        let rect;
+        const errors = super.lint(start, re), { type, childNodes, length } = this, rect = new rect_1.BoundingRect(this, start);
         if (!this.isTemplate()) {
             return errors;
         }
         const title = this.#getTitle();
         if (title.fragment !== undefined) {
-            rect = { start, ...this.getRootNode().posFromIndex(start) };
             const child = childNodes[type === 'template' ? 0 : 1], e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', 'useless fragment'), textNode = child.childNodes.find((c) => c.type === 'text' && c.data.includes('#'));
             if (textNode) {
                 e.fix = {
@@ -176,17 +175,14 @@ class TranscludeToken extends index_2.Token {
             errors.push(e);
         }
         if (!title.valid) {
-            rect ??= { start, ...this.getRootNode().posFromIndex(start) };
             errors.push((0, lint_1.generateForChild)(childNodes[1], rect, 'invalid-invoke', 'illegal module name'));
         }
         if (type === 'magic-word' && length === 2) {
-            rect ??= { start, ...this.getRootNode().posFromIndex(start) };
             errors.push((0, lint_1.generateForSelf)(this, rect, 'invalid-invoke', 'missing module function'));
             return errors;
         }
         const duplicatedArgs = this.getDuplicatedArgs().filter(([, parameter]) => !parameter[0].querySelector('ext'));
         if (duplicatedArgs.length > 0) {
-            rect ??= { start, ...this.getRootNode().posFromIndex(start) };
             errors.push(...duplicatedArgs.flatMap(([, args]) => args).map(arg => (0, lint_1.generateForChild)(arg, rect, 'no-duplicate', 'duplicated parameter')));
         }
         return errors;
@@ -257,9 +253,9 @@ class TranscludeToken extends index_2.Token {
      * @throws `Error` 不是可接受的魔术字
      */
     getPossibleValues() {
-        const { type, name, childNodes, constructor: { name: cName } } = this;
+        const { type, name, childNodes } = this;
         if (type === 'template') {
-            throw new Error(`${cName}.getPossibleValues 方法仅供特定魔术字使用！`);
+            throw new Error(`TranscludeToken.getPossibleValues method is only for specific magic words!`);
         }
         let start;
         switch (name) {
@@ -273,7 +269,7 @@ class TranscludeToken extends index_2.Token {
                 start = 3;
                 break;
             default:
-                throw new Error(`${cName}.getPossibleValues 方法仅供特定魔术字使用！`);
+                throw new Error(`TranscludeToken.getPossibleValues method is only for specific magic words!`);
         }
         const queue = childNodes.slice(start, start + 2).map(({ childNodes: [, value] }) => value);
         for (let i = 0; i < queue.length;) {

package/dist/util/debug.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.emptyArray = exports.setChildNodes = exports.isToken = exports.Shadow = void 0;
+exports.mixin = exports.emptyArray = exports.setChildNodes = exports.isToken = exports.Shadow = void 0;
 exports.Shadow = {
     running: false,
     /** @private */
@@ -47,3 +47,12 @@ exports.setChildNodes = setChildNodes;
  */
 const emptyArray = (n, callback) => new Array(n).fill(undefined).map((_, i) => callback(i));
 exports.emptyArray = emptyArray;
+/**
+ * 同步混入的类名
+ * @param target 混入的目标
+ * @param source 混入的源
+ */
+const mixin = (target, source) => {
+    Object.defineProperty(target, 'name', { value: source.name });
+};
+exports.mixin = mixin;

package/dist/util/lint.js

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateForSelf = exports.generateForChild = void 0;
+const rect_1 = require("../lib/rect");
 const index_1 = require("../index");
 /**
  * 生成lint函数
  * @param func lint函数
  */
-const factory = (func) => (token, boundingRect, rule, msg, severity = 'error') => {
-    const { start } = boundingRect, { top, left } = 'top' in boundingRect ? boundingRect : token.getRootNode().posFromIndex(start), { offsetHeight, offsetWidth } = token, { startIndex, startLine, startCol } = func(token, start, top, left);
+const factory = (func) => (token, rect, rule, msg, severity = 'error') => {
+    const { start } = rect, { top, left } = 'top' in rect ? rect : new rect_1.BoundingRect(token, start), { offsetHeight, offsetWidth } = token, { startIndex, startLine, startCol } = func(token, start, top, left);
     return {
         rule,
         message: index_1.default.msg(msg),
         severity,
         startIndex,
-        endIndex: startIndex + String(token).length,
+        endIndex: startIndex + token.toString().length,
         startLine,
         endLine: startLine + offsetHeight - 1,
         startCol,

package/dist/util/string.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.noWrap = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = void 0;
-const commonExtUrlChar = '[^[\\]<>"\0-\x1F\x7F\\p{Zs}\uFFFD]';
-exports.extUrlCharFirst = `(?:\\[[\\da-f:.]+\\]|${commonExtUrlChar})`;
-exports.extUrlChar = `(?:${commonExtUrlChar}|\0\\d+[c!~]\x7F)*`;
+const commonExtUrlChar = String.raw `[^[\]<>"\0-\x1F\x7F\p{Zs}\uFFFD]`;
+exports.extUrlCharFirst = String.raw `(?:\[[\da-f:.]+\]|${commonExtUrlChar})`;
+exports.extUrlChar = String.raw `(?:${commonExtUrlChar}|\0\d+[c!~]\x7F)*`;
 /**
  * 生成正则替换函数
  * @param regex 正则表达式
@@ -15,7 +15,7 @@ exports.tidy = factory(/[\0\x7F]|\r$/gmu, '');
 /** remove half-parsed comment-like tokens */
 exports.removeComment = factory(/\0\d+c\x7F/gu, '');
 /** escape special chars for RegExp constructor */
-exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, '\\$&');
+exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, String.raw `\$&`);
 /**
  * extract effective wikitext
  * @param childNodes a Token's contents
@@ -29,4 +29,4 @@ exports.decodeHtml = factory(/&(?:#(\d+|x[\da-fA-F]+)|([lLgG][tT]|[lr]brac[ke]))
     ? String.fromCodePoint(Number((/^x/iu.test(code) ? '0' : '') + code))
     : names[name.toLowerCase()]);
 /** escape newlines */
-exports.noWrap = factory(/\n/gu, '\\n');
+exports.noWrap = factory(/\n/gu, String.raw `\n`);

package/i18n/zh-hans.json

@@ -28,6 +28,7 @@
 	"invalid conversion flag": "无效的转换标记",
 	"invalid gallery image": "无效的图库图片",
 	"invalid gallery image parameter": "无效的图库图片参数",
+	"invalid ISBN": "无效的ISBN",
 	"invalid link in <imagemap>": "无效的<imagemap>链接",
 	"invalid parameter of <$1>": "<$1>的无效参数",
 	"invalid self-closing tag": "无效自封闭标签",

package/i18n/zh-hant.json

@@ -28,6 +28,7 @@
 	"invalid conversion flag": "無效的轉換標記",
 	"invalid gallery image": "無效的圖庫圖片",
 	"invalid gallery image parameter": "無效的圖庫圖片參數",
+	"invalid ISBN": "無效的ISBN",
 	"invalid link in <imagemap>": "無效的<imagemap>連結",
 	"invalid parameter of <$1>": "<$1>的無效參數",
 	"invalid self-closing tag": "無效自封閉標籤",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.8.0",
+	"version": "2.9.1",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -27,13 +27,14 @@
 		"wikilint": "./bin/cli.js"
 	},
 	"main": "./dist/index.js",
+	"types": "./dist/index.d.ts",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/bhsd-harry/wikiparser-node.git"
 	},
 	"scripts": {
-		"declaration": "grep -rl --include='*.d.ts' '@private' dist/ | xargs bash sed.sh -i -E '/^\\s+\\/\\*\\* @private/,+1d'; grep -rl --include='*.d.ts' '/util/' dist/ | xargs bash sed.sh -i -E '/^import .+\\/util\\//d'; node ./dist/bin/declaration.js",
-		"prepublishOnly": "npm run build",
+		"declaration": "grep -rl --include='*.d.ts' '@private' dist/ | xargs bash sed.sh -i -E '/^\\s+\\/\\*\\* @private/,+1d'; grep -rl --include='*.d.ts' '/util/' dist/ | xargs bash sed.sh -i -E '/^import .+\\/util\\//d'; bash sed.sh -i -E 's/abstract (lint|print|text)\\b/\\1/' dist/lib/node.d.ts; node ./dist/bin/declaration.js",
+		"prepublishOnly": "npm run build:core",
 		"build:core": "bash build.sh",
 		"build": "npm run build:core",
 		"diff": "bash diff.sh",
@@ -41,6 +42,7 @@
 		"lint:ts": "tsc --noEmit && eslint --cache .",
 		"lint:json": "v8r -s config/.schema.json config/*.json",
 		"lint": "npm run lint:ts && npm run lint:json",
+		"prof": "node --prof dist/test/prof.js && node --prof-process isolate-0x*-v8.log > test/prof.txt && bash sed.sh -i '0,/Bottom up/d' test/prof.txt && rm isolate-0x*-v8.log",
 		"test": "node dist/test/test.js",
 		"test:end": "pkill -x http-server",
 		"test:real": "node dist/test/real.js"
@@ -49,22 +51,20 @@
 		"chalk": "^4.1.2"
 	},
 	"devDependencies": {
-		"@cypress/request": "^3.0.1",
-		"@stylistic/eslint-plugin": "^1.5.4",
+		"@stylistic/eslint-plugin": "^2.1.0",
 		"@types/node": "^20.11.6",
-		"@types/request": "^2.48.12",
-		"@typescript-eslint/eslint-plugin": "^7.1.0",
-		"@typescript-eslint/parser": "^7.1.0",
+		"@typescript-eslint/eslint-plugin": "^7.10.0",
+		"@typescript-eslint/parser": "^7.10.0",
 		"eslint": "^8.56.0",
 		"eslint-plugin-es-x": "^7.5.0",
 		"eslint-plugin-eslint-comments": "^3.2.0",
 		"eslint-plugin-jsdoc": "^48.0.2",
-		"eslint-plugin-json-es": "^1.5.7",
-		"eslint-plugin-n": "^17.4.0",
+		"eslint-plugin-json-es": "^1.6.0",
+		"eslint-plugin-n": "^17.6.0",
 		"eslint-plugin-promise": "^6.1.1",
 		"eslint-plugin-regexp": "^2.2.0",
-		"eslint-plugin-unicorn": "^52.0.0",
-		"typescript": "^5.3.3",
+		"eslint-plugin-unicorn": "^53.0.0",
+		"typescript": "^5.4.5",
 		"v8r": "^3.0.0"
 	},
 	"engines": {