wikilint 2.4.2 → 2.4.4

package/dist/lib/element.js

@@ -21,17 +21,13 @@ class AstElement extends node_1.AstNode {
     normalize() {
         const childNodes = [...this.childNodes];
         for (let i = childNodes.length - 1; i >= 0; i--) {
-            const { type, data } = childNodes[i], prev = childNodes[i - 1];
+            const { type, data } = childNodes[i];
             if (type !== 'text' || this.getGaps(i - 1)) {
                 //
             }
             else if (data === '') {
                 childNodes.splice(i, 1);
             }
-            else if (prev?.type === 'text') {
-                prev.setAttribute('data', prev.data + data);
-                childNodes.splice(i, 1);
-            }
         }
         this.setAttribute('childNodes', childNodes);
     }
@@ -56,11 +52,8 @@ class AstElement extends node_1.AstNode {
      * @param selector 选择器
      */
     #getCondition(selector) {
-        let condition;
         const types = new Set(selector.split(',').map(str => str.trim()));
-        // eslint-disable-next-line prefer-const
-        condition = (token => types.has(token.type));
-        return condition;
+        return (({ type }) => types.has(type));
     }
     /**
      * 最近的祖先节点

package/dist/lib/node.js

@@ -111,5 +111,12 @@ class AstNode {
         const { parentNode } = this;
         return parentNode ? parentNode.getAbsoluteIndex() + this.getRelativeIndex() : 0;
     }
+    /** @private */
+    seal(key, permanent) {
+        Object.defineProperty(this, key, {
+            enumerable: !permanent && Boolean(this[key]),
+            configurable: true,
+        });
+    }
 }
 exports.AstNode = AstNode;

package/dist/lib/text.js

@@ -52,6 +52,8 @@ class AstText extends node_1.AstNode {
     constructor(text) {
         super();
         Object.defineProperties(this, {
+            childNodes: { enumerable: false, configurable: false },
+            type: { enumerable: false, writable: false },
             data: {
                 value: text,
             },

package/dist/lib/title.js

@@ -17,7 +17,6 @@ class Title {
      * @param selfLink 是否允许selfLink
      */
     constructor(title, defaultNs = 0, config = index_1.default.getConfig(), decode = false, selfLink = false) {
-        const { nsid, } = config;
         title = (0, string_1.decodeHtml)(title);
         if (decode && title.includes('%')) {
             try {
@@ -35,7 +34,7 @@ class Title {
         }
         const m = title.split(':');
         if (m.length > 1) {
-            const id = nsid[m[0].trim().toLowerCase()];
+            const id = config.nsid[m[0].trim().toLowerCase()];
             if (id) {
                 ns = id;
                 title = m.slice(1).join(':').trim();
@@ -60,8 +59,8 @@ class Title {
             this.fragment = fragment;
             title = title.slice(0, i).trim();
         }
-        this.valid = Boolean(title
-            || selfLink && this.fragment !== undefined) && !/^:|\0\d+[eh!+-]\x7F|[<>[\]{}|]|%[\da-f]{2}/iu.test(title);
+        this.valid = Boolean(title || this.interwiki || selfLink && this.fragment !== undefined)
+            && !/^:|\0\d+[eh!+-]\x7F|[<>[\]{}|]|%[\da-f]{2}/iu.test(title);
     }
 }
 exports.Title = Title;

package/dist/parser/links.js

@@ -41,13 +41,13 @@ const parseLinks = (wikitext, config = index_1.default.getConfig(), accum = [])
             s += `[[${x}`;
             continue;
         }
-        const title = index_1.default.normalizeTitle(link, 0, false, config, true, true, true), { ns, valid, } = title;
+        const title = index_1.default.normalizeTitle(link, 0, false, config, true, true, true), { ns, valid, interwiki } = title;
         if (!valid) {
             s += `[[${x}`;
             continue;
         }
         else if (mightBeImg) {
-            if (ns !== 6) {
+            if (interwiki || ns !== 6) {
                 s += `[[${x}`;
                 continue;
             }
@@ -78,10 +78,10 @@ const parseLinks = (wikitext, config = index_1.default.getConfig(), accum = [])
         s += `\0${accum.length}l\x7F${after}`;
         let SomeLinkToken = index_2.LinkToken;
         if (!force) {
-            if (ns === 6) {
+            if (!interwiki && ns === 6) {
                 SomeLinkToken = file_1.FileToken;
             }
-            else if (ns === 14) {
+            else if (!interwiki && ns === 14) {
                 SomeLinkToken = category_1.CategoryToken;
             }
         }

package/dist/src/attribute.d.ts

@@ -12,7 +12,6 @@ export declare abstract class AttributeToken extends Token {
     #private;
     type: AttributeTypes;
     readonly name: string;
-    readonly tag: string;
     readonly childNodes: readonly [AtomToken, Token];
     abstract get firstChild(): AtomToken;
     abstract get lastChild(): Token;

package/dist/src/attribute.js

@@ -174,9 +174,13 @@ const commonHtmlAttrs = new Set([
  * @classdesc `{childNodes: [AtomToken, Token|AtomToken]}`
  */
 class AttributeToken extends index_2.Token {
-    tag;
+    #tag;
     #equal;
     #quotes;
+    /** @private */
+    get tag() {
+        return this.#tag;
+    }
     /** 引号是否匹配 */
     get balanced() {
         return !this.#equal || this.#quotes[0] === this.#quotes[1];
@@ -223,7 +227,7 @@ class AttributeToken extends index_2.Token {
         this.append(keyToken, valueToken);
         this.#equal = equal;
         this.#quotes = [...quotes];
-        this.tag = tag;
+        this.#tag = tag;
         this.setAttribute('name', (0, string_1.removeComment)(key).trim().toLowerCase());
     }
     /** @private */
@@ -232,7 +236,7 @@ class AttributeToken extends index_2.Token {
             this.#equal = this.buildFromStr(this.#equal, constants_1.BuildMethod.String);
         }
         if (this.parentNode) {
-            this.setAttribute('tag', this.parentNode.name);
+            this.#tag = this.parentNode.name;
         }
         this.setAttribute('name', this.firstChild.text().trim().toLowerCase());
     }
@@ -263,7 +267,8 @@ class AttributeToken extends index_2.Token {
                 startCol: e.startCol - 1,
             });
         }
-        if (extAttrs[tag] && !extAttrs[tag].has(name)
+        const attrs = extAttrs[tag];
+        if (attrs && !attrs.has(name)
             || (type === 'ext-attr' ? tag in htmlAttrs : !/\{\{[^{]+\}\}/u.test(name))
                 && !htmlAttrs[tag]?.has(name)
                 && !/^(?:xmlns:[\w:.-]+|data-[^:]*)$/u.test(name)

package/dist/src/converter.d.ts

@@ -2,9 +2,14 @@ import Parser from '../index';
 import { Token } from './index';
 import { ConverterFlagsToken } from './converterFlags';
 import { ConverterRuleToken } from './converterRule';
+/**
+ * 转换
+ * @classdesc `{childNodes: [ConverterFlagsToken, ...ConverterRuleToken]}`
+ */
 export declare abstract class ConverterToken extends Token {
     readonly type = "converter";
     readonly childNodes: readonly [ConverterFlagsToken, ...ConverterRuleToken[]];
+    abstract get firstChild(): ConverterFlagsToken;
     abstract get lastChild(): ConverterFlagsToken | ConverterRuleToken;
     /**
      * @param flags 转换类型标记
@@ -14,4 +19,3 @@ export declare abstract class ConverterToken extends Token {
     /** @override */
     text(): string;
 }
-export {};

package/dist/src/converter.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConverterToken = void 0;
 const string_1 = require("../util/string");
-const flagsParent_1 = require("../mixin/flagsParent");
 const index_1 = require("../index");
 const index_2 = require("./index");
 const converterFlags_1 = require("./converterFlags");
@@ -11,7 +10,7 @@ const converterRule_1 = require("./converterRule");
  * 转换
  * @classdesc `{childNodes: [ConverterFlagsToken, ...ConverterRuleToken]}`
  */
-class ConverterToken extends (0, flagsParent_1.flagsParent)(index_2.Token) {
+class ConverterToken extends index_2.Token {
     type = 'converter';
     /**
      * @param flags 转换类型标记

package/dist/src/extLink.d.ts

@@ -2,10 +2,15 @@ import Parser from '../index';
 import { Token } from './index';
 import { MagicLinkToken } from './magicLink';
 import type { LintError } from '../base';
+/**
+ * 外链
+ * @classdesc `{childNodes: [MagicLinkToken, ?Token]}`
+ */
 export declare abstract class ExtLinkToken extends Token {
     #private;
     readonly type = "ext-link";
     readonly childNodes: readonly [MagicLinkToken] | readonly [MagicLinkToken, Token];
+    abstract get firstChild(): MagicLinkToken;
     abstract get lastChild(): Token;
     /**
      * @param url 网址
@@ -18,4 +23,3 @@ export declare abstract class ExtLinkToken extends Token {
     /** @override */
     lint(start?: number): LintError[];
 }
-export {};

package/dist/src/extLink.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExtLinkToken = void 0;
 const constants_1 = require("../util/constants");
 const lint_1 = require("../util/lint");
-const magicLinkParent_1 = require("../mixin/magicLinkParent");
 const index_1 = require("../index");
 const index_2 = require("./index");
 const magicLink_1 = require("./magicLink");
@@ -11,7 +10,7 @@ const magicLink_1 = require("./magicLink");
  * 外链
  * @classdesc `{childNodes: [MagicLinkToken, ?Token]}`
  */
-class ExtLinkToken extends (0, magicLinkParent_1.magicLinkParent)(index_2.Token) {
+class ExtLinkToken extends index_2.Token {
     type = 'ext-link';
     #space;
     /**

package/dist/src/heading.js

@@ -45,9 +45,7 @@ class HeadingToken extends index_2.Token {
     }
     /** @private */
     getAttribute(key) {
-        return key === 'padding'
-            ? super.getAttribute('padding') + this.level
-            : super.getAttribute(key);
+        return key === 'padding' ? this.level : super.getAttribute(key);
     }
     /** @private */
     getGaps() {

package/dist/src/html.js

@@ -65,11 +65,8 @@ class HtmlToken extends index_2.Token {
     }
     /** @override */
     text() {
-        const { closing, name } = this, tag = `${this.#tag}${closing ? '' : super.text()}`, { html } = this.getAttribute('config');
-        if (html[2].includes(name)) {
-            return closing && name !== 'br' ? '' : `<${tag}>`;
-        }
-        return `<${closing ? '/' : ''}${tag}${this.#selfClosing && html[1].includes(name) ? '/' : ''}>`;
+        const { closing, } = this, tag = `${this.#tag}${closing ? '' : super.text()}`;
+        return `<${closing ? '/' : ''}${tag}${this.#selfClosing ? '/' : ''}>`;
     }
     /** @private */
     getAttribute(key) {

package/dist/src/imagemap.js

@@ -33,8 +33,7 @@ class ImagemapToken extends index_2.Token {
             }
             else if (first) {
                 const [file, ...options] = line.split('|'), title = this.normalizeTitle(file, 0, true);
-                if (title.valid
-                    && title.ns === 6) {
+                if (title.valid && !title.interwiki && title.ns === 6) {
                     // @ts-expect-error abstract class
                     const token = new galleryImage_1.GalleryImageToken('imagemap', file, options.length > 0 ? options.join('|') : undefined, config, accum);
                     super.insertAt(token);

package/dist/src/index.js

@@ -272,8 +272,6 @@ class Token extends element_1.AstElement {
                 return (this.constructor === Token);
             case 'config':
                 return structuredClone(this.#config);
-            case 'accum':
-                return this.#accum;
             case 'include': {
                 if (this.#include !== undefined) {
                     return this.#include;
@@ -281,6 +279,8 @@ class Token extends element_1.AstElement {
                 const root = this.getRootNode();
                 return (root !== this && root.getAttribute('include'));
             }
+            case 'accum':
+                return this.#accum;
             default:
                 return super.getAttribute(key);
         }

package/dist/src/link/galleryImage.js

@@ -38,8 +38,8 @@ class GalleryImageToken extends file_1.FileToken {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
-        const errors = super.lint(start), { ns, } = this.getAttribute('title');
-        if (ns !== 6) {
+        const errors = super.lint(start), { ns, interwiki } = this.getAttribute('title');
+        if (interwiki || ns !== 6) {
             errors.push((0, lint_1.generateForSelf)(this, { start }, 'invalid gallery image'));
         }
         return errors;

package/dist/src/table/index.js

@@ -34,9 +34,11 @@ class TableToken extends trBase_1.TrBaseToken {
     }
     /** @private */
     close(syntax = '\n|}', halfParsed = false) {
-        const config = this.getAttribute('config'), accum = this.getAttribute('accum'), inner = [syntax];
-        // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
+        const config = this.getAttribute('config'), accum = this.getAttribute('accum'), inner = halfParsed ? [syntax] : index_1.default.parse(syntax, this.getAttribute('include'), 2, config).childNodes;
         const token = debug_1.Shadow.run(() => super.insertAt(new syntax_1.SyntaxToken(undefined, closingPattern, 'table-syntax', config, accum, {})));
+        if (!halfParsed) {
+            token.afterBuild();
+        }
         this.lastChild.replaceChildren(...inner);
     }
 }

package/dist/src/table/td.js

@@ -46,7 +46,9 @@ class TdToken extends base_1.TableBaseToken {
         else if (char === '+') {
             subtype = 'caption';
         }
-        return { subtype };
+        return {
+            subtype,
+        };
     }
     /** @private */
     afterBuild() {

package/dist/src/tagPair/ext.js

@@ -116,6 +116,7 @@ class ExtToken extends index_3.TagPairToken {
         innerToken.setAttribute('name', lcName);
         innerToken.type = 'ext-inner';
         super(name, attrToken, innerToken, closed, config, accum);
+        this.seal('closed', true);
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {

package/dist/src/tagPair/index.js

@@ -8,7 +8,6 @@ class TagPairToken extends index_2.Token {
     #tags;
     closed;
     selfClosing;
-    /* NOT FOR BROWSER END */
     /** 内部wikitext */
     get innerText() {
         return this.selfClosing ? undefined : this.lastChild.text();

package/dist/src/transclude.js

@@ -92,6 +92,7 @@ class TranscludeToken extends index_2.Token {
             // @ts-expect-error abstract class
             this.insertAt(new parameter_1.ParameterToken(...part, config, accum));
         }
+        this.seal('modifier');
     }
     /**
      * 设置引用修饰符
@@ -105,7 +106,7 @@ class TranscludeToken extends index_2.Token {
         const magicWord = lcModifier.slice(0, -1).toLowerCase(), isRaw = raw.includes(magicWord), isSubst = subst.includes(magicWord);
         if (this.#raw && isRaw
             || !this.#raw && (isSubst || modifier === '')
-            || this.length > 1 && (isRaw || isSubst || modifier === '')) {
+            || (debug_1.Shadow.running || this.length > 1) && (isRaw || isSubst || modifier === '')) {
             this.setAttribute('modifier', modifier);
             this.#raw = isRaw;
             return Boolean(modifier);
@@ -242,10 +243,7 @@ class TranscludeToken extends index_2.Token {
      * 获取重名参数
      */
     getDuplicatedArgs() {
-        if (this.isTemplate()) {
-            return [...this.#args].filter(([, { size }]) => size > 1).map(([key, args]) => [key, [...args]]);
-        }
-        return [];
+        return [...this.#args].filter(([, { size }]) => size > 1).map(([key, args]) => [key, [...args]]);
     }
     /**
      * 对特定魔术字获取可能的取值

package/dist/util/debug.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setChildNodes = exports.isToken = exports.Shadow = void 0;
 exports.Shadow = {
+    running: false,
     /** @private */
     run(callback) {
         const result = callback();

package/i18n/zh-hans.json

@@ -21,6 +21,7 @@
 	"HTML tag in table attributes": "表格属性中的HTML标签",
 	"illegal attribute name": "非法的属性名",
 	"illegal module name": "非法的模块名称",
+	"inconsistent table layout": "不一致的表格布局",
 	"insecure style": "不安全的样式",
 	"internal link in an external link": "外链中的内链",
 	"invalid content in <$1>": "<$1>内的无效内容",

package/i18n/zh-hant.json

@@ -21,6 +21,7 @@
 	"HTML tag in table attributes": "表格屬性中的HTML標籤",
 	"illegal attribute name": "非法的屬性名",
 	"illegal module name": "非法的模組名稱",
+	"inconsistent table layout": "不一致的表格佈局",
 	"insecure style": "不安全的樣式",
 	"internal link in an external link": "外部連結中的內部連結",
 	"invalid content in <$1>": "<$1>內的無效內容",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.4.2",
+	"version": "2.4.4",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -35,14 +35,13 @@
 		"declaration": "grep -rl --include='*.d.ts' '@private' dist/ | xargs bash sed.sh -i -E '/^\\s+\\/\\*\\* @private/,+1d'; node ./dist/bin/declaration.js",
 		"prepublishOnly": "npm run build && rm dist/internal.js dist/base.js dist/[bmpu]*/*.d.ts",
 		"build": "bash build.sh",
-		"diff": "git diff --ignore-all-space --color-moved",
+		"diff": "bash diff.sh",
+		"diff:stat": "f() { git diff --stat --ignore-all-space --color=always $1 $2 -- . ':!extensions/' ':!bin/' | grep '\\.ts'; }; f",
 		"lint:ts": "tsc --noEmit && eslint --cache .",
 		"lint:json": "ajv -s config/.schema.json -d 'config/*.json' --strict=true --strict-required=false",
 		"lint": "npm run lint:ts && npm run lint:json",
-		"test": "npx wikilint test/single-page.wiki",
 		"test:end": "pkill -x http-server",
-		"test:real": "node dist/test/real.js",
-		"test:single": "node dist/test/single.js && node --prof dist/test/single.js && node --prof-process isolate-0x*-v8.log > test/processed.txt && rm isolate-0x*-v8.log"
+		"test:real": "node dist/test/real.js"
 	},
 	"devDependencies": {
 		"@cypress/request": "^3.0.1",

package/dist/mixin/flagsParent.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.flagsParent = void 0;
-/**
- * ConverterToken
- * @param constructor 基类
- */
-const flagsParent = (constructor) => {
-    /** 子节点含有ConverterFlagsToken的类 */
-    class FlagsParent extends constructor {
-    }
-    return FlagsParent;
-};
-exports.flagsParent = flagsParent;

package/dist/mixin/magicLinkParent.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.magicLinkParent = void 0;
-/**
- * ExtLinkToken
- * @param constructor 基类
- */
-const magicLinkParent = (constructor) => {
-    /** 子节点含有MagicLinkParent的类 */
-    class MagicLinkParent extends constructor {
-    }
-    return MagicLinkParent;
-};
-exports.magicLinkParent = magicLinkParent;