wikilint 2.7.1 → 2.9.0

package/dist/src/table/trBase.js

@@ -7,7 +7,7 @@ const base_1 = require("./base");
 const td_1 = require("./td");
 /** 表格行或表格 */
 class TrBaseToken extends base_1.TableBaseToken {
-    /** @override */
+    /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
         const errors = super.lint(start, re), inter = this.childNodes.find(({ type }) => type === 'table-inter');
         if (!inter) {
@@ -15,7 +15,7 @@ class TrBaseToken extends base_1.TableBaseToken {
         }
         const first = inter.childNodes.find(child => child.text().trim()), tdPattern = /^\s*(?:!|\{\{\s*![!-]?\s*\}\})/u, isArg = (0, debug_1.isToken)('arg'), isTransclude = (0, debug_1.isToken)('magic-word');
         if (!first
-            || tdPattern.test(String(first))
+            || tdPattern.test(first.toString())
             || isArg(first) && tdPattern.test(first.default || '')) {
             return errors;
         }

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

@@ -20,6 +20,4 @@ export declare abstract class ExtToken extends TagPairToken {
      * @param closed 是否封闭
      */
     constructor(name: string, attr?: string, inner?: string, closed?: string, config?: Parser.Config, accum?: Token[]);
-    /** @override */
-    lint(start?: number, re?: RegExp): LintError[];
 }

package/dist/src/tagPair/ext.js

@@ -118,7 +118,7 @@ class ExtToken extends index_3.TagPairToken {
         super(name, attrToken, innerToken, closed, config, accum);
         this.seal('closed', true);
     }
-    /** @override */
+    /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
         const errors = super.lint(start, re);
         let rect;

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

@@ -14,7 +14,5 @@ export declare abstract class IncludeToken extends TagPairToken {
      * @param closed 是否封闭
      */
     constructor(name: string, attr?: string, inner?: string, closed?: string, config?: Parser.Config, accum?: Token[]);
-    /** @override */
-    lint(start?: number): LintError[];
 }
 export {};

package/dist/src/tagPair/include.js

@@ -20,7 +20,7 @@ class IncludeToken extends (0, hidden_1.hiddenToken)(index_2.TagPairToken) {
     constructor(name, attr = '', inner, closed, config = index_1.default.getConfig(), accum = []) {
         super(name, attr, inner ?? '', inner === undefined ? closed : closed ?? '', config, accum);
     }
-    /** @override */
+    /** @private */
     lint(start = this.getAbsoluteIndex()) {
         if (this.closed) {
             return [];

package/dist/src/tagPair/index.js

@@ -32,8 +32,8 @@ 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 */
     text() {

package/dist/src/transclude.d.ts

@@ -30,8 +30,6 @@ export declare abstract class TranscludeToken extends Token {
     isTemplate(): boolean;
     /** @override */
     text(): string;
-    /** @override */
-    lint(start?: number, re?: RegExp): LintError[];
     /**
      * @override
      * @param token 待插入的子节点

package/dist/src/transclude.js

@@ -131,7 +131,7 @@ 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 */
@@ -156,7 +156,7 @@ 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;

package/dist/util/lint.js

@@ -13,7 +13,7 @@ const factory = (func) => (token, boundingRect, rule, msg, severity = 'error') =
         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

@@ -11,7 +11,7 @@ exports.extUrlChar = `(?:${commonExtUrlChar}|\0\\d+[c!~]\x7F)*`;
  */
 const factory = (regex, replace) => (str) => str.replace(regex, replace);
 /** 清理解析专用的不可见字符 */
-exports.tidy = factory(/[\0\x7F]/gu, '');
+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 */

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.7.1",
+	"version": "2.9.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -27,12 +27,13 @@
 		"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",
+		"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)\\b/\\1/' dist/lib/node.d.ts; node ./dist/bin/declaration.js",
 		"prepublishOnly": "npm run build",
 		"build:core": "bash build.sh",
 		"build": "npm run build:core",
@@ -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,10 +51,8 @@
 		"chalk": "^4.1.2"
 	},
 	"devDependencies": {
-		"@cypress/request": "^3.0.1",
 		"@stylistic/eslint-plugin": "^1.5.4",
 		"@types/node": "^20.11.6",
-		"@types/request": "^2.48.12",
 		"@typescript-eslint/eslint-plugin": "^7.1.0",
 		"@typescript-eslint/parser": "^7.1.0",
 		"eslint": "^8.56.0",