wikilint 2.13.0 → 2.13.2

package/config/default.json

@@ -140,10 +140,6 @@
 		"711": "TimedText talk",
 		"828": "Module",
 		"829": "Module talk",
-		"2300": "Gadget",
-		"2301": "Gadget talk",
-		"2302": "Gadget definition",
-		"2303": "Gadget definition talk",
 		"2600": "Topic"
 	},
 	"nsid": {
@@ -300,11 +296,7 @@
 		"模組討論": 829,
 		"模组对话": 829,
 		"模组讨论": 829,
-		"モジュール・トーク": 829,
-		"gadget": 2300,
-		"gadget talk": 2301,
-		"gadget definition": 2302,
-		"gadget definition talk": 2303
+		"モジュール・トーク": 829
 	},
 	"parserFunction": [
 		{

package/config/enwiki.json

@@ -125,11 +125,7 @@
 		"710": "TimedText",
 		"711": "TimedText talk",
 		"828": "Module",
-		"829": "Module talk",
-		"2300": "Gadget",
-		"2301": "Gadget talk",
-		"2302": "Gadget definition",
-		"2303": "Gadget definition talk"
+		"829": "Module talk"
 	},
 	"nsid": {
 		"": 0,
@@ -165,11 +161,7 @@
 		"timedtext": 710,
 		"timedtext talk": 711,
 		"module": 828,
-		"module talk": 829,
-		"gadget": 2300,
-		"gadget talk": 2301,
-		"gadget definition": 2302,
-		"gadget definition talk": 2303
+		"module talk": 829
 	},
 	"parserFunction": [
 		{

package/dist/base.d.ts

@@ -9,7 +9,6 @@ export interface Config {
     readonly img: Record<string, string>;
     readonly redirection: string[];
     readonly variants: string[];
-    readonly excludes?: string[];
 }
 export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'magic-link' | 'list' | 'dd' | 'list-range' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'imagemap-link';
 export declare const stages: {

package/dist/index.js

@@ -92,6 +92,11 @@ const Parser = {
             catch (e) {
                 if (e instanceof Error) {
                     const file = path.join(__dirname, '..', 'errors', new Date().toISOString()), stage = token.getAttribute('stage');
+                    for (const k in config) {
+                        if (k.startsWith('regex')) {
+                            delete config[k];
+                        }
+                    }
                     fs.writeFileSync(file, stage === constants_1.MAX_STAGE ? wikitext : token.toString());
                     fs.writeFileSync(`${file}.err`, e.stack);
                     fs.writeFileSync(`${file}.json`, JSON.stringify({ stage, include, config }, null, '\t'));

package/dist/parser/braces.js

@@ -10,7 +10,7 @@ const closes = {
     '{': String.raw `\}{2,}|\|`,
     '-': String.raw `\}-`,
     '[': String.raw `\]\]`,
-}, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~']]), re = new RegExp(String.raw `\{\{\s*(${[...marks.keys()].map(string_1.escapeRegExp).join('|')})\s*\}\}(?!\})`, 'gu');
+}, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~'], ['server', 'm']]), re = /\{\{\s*([^\s\0<>[\]{}|_#&%:.]+)\s*\}\}(?!\})/gu;
 /**
  * 解析花括号
  * @param wikitext
@@ -23,7 +23,7 @@ const parseBraces = (wikitext, config, accum) => {
     wikitext = wikitext.replace(re, (m, p1) => {
         // @ts-expect-error abstract class
         new transclude_1.TranscludeToken(m.slice(2, -2), [], config, accum);
-        return `\0${accum.length - 2}${marks.get(p1)}\x7F`;
+        return `\0${accum.length - 2}${marks.get(p1.toLowerCase()) ?? 't'}\x7F`;
     });
     const lastBraces = wikitext.lastIndexOf('}}') - wikitext.length;
     let moreBraces = lastBraces + wikitext.length !== -1, regex = new RegExp(source + (moreBraces ? openBraces : ''), 'gmu'), mt = regex.exec(wikitext), lastIndex;
@@ -87,10 +87,10 @@ const parseBraces = (wikitext, config, accum) => {
                     // @ts-expect-error abstract class
                     new transclude_1.TranscludeToken(parts[0][0], parts.slice(1), config, accum);
                     const name = (0, string_1.removeComment)(parts[0][0]).trim();
-                    if (marks.has(name)) {
-                        ch = marks.get(name); // 标记{{!}}等
+                    if (marks.has(name.toLowerCase())) {
+                        ch = marks.get(name.toLowerCase()); // 标记{{!}}等
                     }
-                    else if (/^(?:filepath|(?:full|canonical)urle?):.|^server$/iu.test(name)) {
+                    else if (/^(?:filepath|(?:full|canonical)urle?):./iu.test(name)) {
                         ch = 'm';
                     }
                     else if (/^#vardefine:./iu.test(name)) {

package/dist/parser/commentAndExt.js

@@ -56,7 +56,7 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
         if (name) {
             ch = 'e';
             // @ts-expect-error abstract class
-            new ext_1.ExtToken(name, attr, inner, closing, config, accum);
+            new ext_1.ExtToken(name, attr, inner, closing, config, include, accum);
         }
         else if (substr.startsWith('<!--')) {
             ch = 'c';

package/dist/parser/converter.js

@@ -9,12 +9,14 @@ const converter_1 = require("../src/converter");
  * @param accum
  */
 const parseConverter = (text, config, accum) => {
-    const variants = `(?:${config.variants.join('|')})`, regex1 = /-\{/gu, regex2 = /-\{|\}-/gu, regex3 = new RegExp(String.raw `;(?=(?:[^;]*?=>)?\s*${variants}\s*:|(?:\s|\0\d+[cn]\x7F)*$)`, 'u'), stack = [];
+    config.regexConverter ??= new RegExp(String.raw `;(?=(?:[^;]*?=>)?\s*(?:${config.variants.join('|')})\s*:|(?:\s|\0\d+[cn]\x7F)*$)`, 'u');
+    const regex1 = /-\{/gu, regex2 = /-\{|\}-/gu, stack = [];
     let regex = regex1, mt = regex.exec(text);
     while (mt) {
         const { 0: syntax, index } = mt;
         if (syntax === '}-') {
-            const top = stack.pop(), { length } = accum, str = text.slice(top.index + 2, index), i = str.indexOf('|'), [flags, raw] = i === -1 ? [[], str] : [str.slice(0, i).split(';'), str.slice(i + 1)], temp = raw.replace(/(&[#a-z\d]+);/giu, '$1\x01'), rules = temp.split(regex3).map(rule => rule.replace(/\x01/gu, ';'));
+            const top = stack.pop(), { length } = accum, str = text.slice(top.index + 2, index), i = str.indexOf('|'), [flags, raw] = i === -1 ? [[], str] : [str.slice(0, i).split(';'), str.slice(i + 1)], temp = raw.replace(/(&[#a-z\d]+);/giu, '$1\x01'), rules = temp.split(config.regexConverter)
+                .map(rule => rule.replace(/\x01/gu, ';'));
             // @ts-expect-error abstract class
             new converter_1.ConverterToken(flags, rules, config, accum);
             text = `${text.slice(0, top.index)}\0${length}v\x7F${text.slice(index + 2)}`;

package/dist/parser/externalLinks.js

@@ -12,8 +12,8 @@ const magicLink_1 = require("../src/magicLink");
  * @param inFile 是否在图链中
  */
 const parseExternalLinks = (wikitext, config, accum, inFile) => {
-    const regex = new RegExp(String.raw `\[(\0\d+f\x7F|(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}(?=[[\]<>"\t\p{Zs}]|\0\d))(\p{Zs}*(?!\p{Zs}))([^\]\x01-\x08\x0A-\x1F\uFFFD]*)\]`, 'giu');
-    return wikitext.replace(regex, (_, url, space, text) => {
+    config.regexExternalLinks ??= new RegExp(String.raw `\[(\0\d+f\x7F|(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}(?=[[\]<>"\t\p{Zs}]|\0\d))(\p{Zs}*(?!\p{Zs}))([^\]\x01-\x08\x0A-\x1F\uFFFD]*)\]`, 'giu');
+    return wikitext.replace(config.regexExternalLinks, (_, url, space, text) => {
         const { length } = accum, mt = /&[lg]t;/u.exec(url);
         if (mt) {
             url = url.slice(0, mt.index);

package/dist/parser/hrAndDoubleUnderscore.js

@@ -12,6 +12,7 @@ const heading_1 = require("../src/heading");
  */
 const parseHrAndDoubleUnderscore = ({ firstChild: { data }, type, name }, config, accum) => {
     const { doubleUnderscore } = config, insensitive = new Set(doubleUnderscore[0]), sensitive = new Set(doubleUnderscore[1]);
+    config.regexHrAndDoubleUnderscore ??= new RegExp(`__(${[...insensitive, ...sensitive].join('|')})__`, 'giu');
     if (type !== 'root' && (type !== 'ext-inner' || name !== 'poem')) {
         data = `\0${data}`;
     }
@@ -19,7 +20,7 @@ const parseHrAndDoubleUnderscore = ({ firstChild: { data }, type, name }, config
         // @ts-expect-error abstract class
         new hr_1.HrToken(m, config, accum);
         return `${lead}\0${accum.length - 1}r\x7F`;
-    }).replace(new RegExp(`__(${[...insensitive, ...sensitive].join('|')})__`, 'giu'), (m, p1) => {
+    }).replace(config.regexHrAndDoubleUnderscore, (m, p1) => {
         const caseSensitive = sensitive.has(p1), lc = p1.toLowerCase(), caseInsensitive = insensitive.has(lc);
         if (caseSensitive || caseInsensitive) {
             // @ts-expect-error abstract class

package/dist/parser/links.js

@@ -7,6 +7,7 @@ const externalLinks_1 = require("./externalLinks");
 const index_2 = require("../src/link/index");
 const file_1 = require("../src/link/file");
 const category_1 = require("../src/link/category");
+const regexImg = /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(\||\0\d+!\x7F)(.*)$/su;
 /**
  * 解析内部链接
  * @param wikitext
@@ -14,9 +15,10 @@ const category_1 = require("../src/link/category");
  * @param accum
  */
 const parseLinks = (wikitext, config, accum) => {
+    config.regexLinks ??= new RegExp(String.raw `^\s*(?:${config.protocol}|//)`, 'iu');
     const regex = true // eslint-disable-line no-constant-condition, @typescript-eslint/no-unnecessary-condition
         ? /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]]))?\]\](.*)$/su
-        : /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]])?)?\]\](.*)$/su, regexImg = /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(\||\0\d+!\x7F)(.*)$/su, regexExt = new RegExp(String.raw `^\s*(?:${config.protocol}|//)`, 'iu'), bits = wikitext.split('[[');
+        : /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]])?)?\]\](.*)$/su, bits = wikitext.split('[[');
     let s = bits.shift();
     for (let i = 0; i < bits.length; i++) {
         let mightBeImg = false, link, delimiter, text, after;
@@ -35,7 +37,7 @@ const parseLinks = (wikitext, config, accum) => {
                 [, link, delimiter, text] = m2;
             }
         }
-        if (link === undefined || regexExt.test(link) || /\0\d+[exhbru]\x7F/u.test(link)) {
+        if (link === undefined || config.regexLinks.test(link) || /\0\d+[exhbru]\x7F/u.test(link)) {
             s += `[[${x}`;
             continue;
         }

package/dist/parser/magicLinks.js

@@ -11,8 +11,8 @@ const space = String.raw `[\p{Zs}\t]| |&#0*160;|&#x0*a0;`, sp = `(?:${space
  * @param accum
  */
 const parseMagicLinks = (wikitext, config, accum) => {
-    const regex = new RegExp(String.raw `(^|[^\p{L}\d_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|${magicLinkPattern})`, 'giu');
-    return wikitext.replace(regex, (m, lead, p1) => {
+    config.regexMagicLinks ??= new RegExp(String.raw `(^|[^\p{L}\d_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|${magicLinkPattern})`, 'giu');
+    return wikitext.replace(config.regexMagicLinks, (m, lead, p1) => {
         let url = lead ? m.slice(lead.length) : m;
         if (p1) {
             let trail = '';

package/dist/parser/redirect.js

@@ -10,7 +10,8 @@ const redirect_1 = require("../src/redirect");
  * @param accum
  */
 const parseRedirect = (text, config, accum) => {
-    const re = new RegExp(String.raw `^(\s*)((?:${config.redirection.join('|')})\s*(?::\s*)?)\[\[([^\n|\]]+)(\|.*?)?\]\](\s*)`, 'iu'), mt = re.exec(text);
+    config.regexRedirect ??= new RegExp(String.raw `^(\s*)((?:${config.redirection.join('|')})\s*(?::\s*)?)\[\[([^\n|\]]+)(\|.*?)?\]\](\s*)`, 'iu');
+    const mt = config.regexRedirect.exec(text);
     if (mt && index_1.default.normalizeTitle(mt[3], 0, false, config, true, true).valid) {
         text = `\0${accum.length}o\x7F${text.slice(mt[0].length)}`;
         // @ts-expect-error abstract class

package/dist/src/attributes.d.ts

@@ -3,9 +3,11 @@ import { Token } from './index';
 import { AtomToken } from './atom';
 import { AttributeToken } from './attribute';
 import type { LintError } from '../base';
-import type { ExtToken, HtmlToken, TdToken, TrToken, TableToken, SyntaxToken } from '../internal';
+import type { ExtToken, HtmlToken, SyntaxToken } from '../internal';
 import type { AttributeTypes } from './attribute';
+import type { TableTokens } from './table/index';
 declare type AttributesTypes = `${AttributeTypes}s`;
+declare type Child = AtomToken | AttributeToken;
 /**
  * 扩展和HTML标签属性
  * @classdesc `{childNodes: ...AtomToken|AttributeToken}`
@@ -13,10 +15,10 @@ declare type AttributesTypes = `${AttributeTypes}s`;
 export declare abstract class AttributesToken extends Token {
     #private;
     readonly name: string;
-    readonly childNodes: readonly (AtomToken | AttributeToken)[];
-    abstract get firstChild(): AtomToken | AttributeToken | undefined;
-    abstract get lastChild(): AtomToken | AttributeToken | undefined;
-    abstract get parentNode(): ExtToken | HtmlToken | TableToken | TrToken | TdToken | undefined;
+    readonly childNodes: readonly Child[];
+    abstract get firstChild(): Child | undefined;
+    abstract get lastChild(): Child | undefined;
+    abstract get parentNode(): ExtToken | HtmlToken | TableTokens | undefined;
     abstract get previousSibling(): SyntaxToken | undefined;
     get type(): AttributesTypes;
     /**

package/dist/src/gallery.d.ts

@@ -4,6 +4,7 @@ import { GalleryImageToken } from './link/galleryImage';
 import { NoincludeToken } from './nowiki/noinclude';
 import type { LintError } from '../base';
 import type { AstText, AttributesToken, ExtToken } from '../internal';
+declare type Child = GalleryImageToken | NoincludeToken;
 /**
  * gallery标签
  * @classdesc `{childNodes: ...(GalleryImageToken|NoincludeToken|AstText)}`
@@ -11,9 +12,9 @@ import type { AstText, AttributesToken, ExtToken } from '../internal';
 export declare abstract class GalleryToken extends Token {
     #private;
     readonly name: 'gallery';
-    readonly childNodes: readonly (GalleryImageToken | NoincludeToken | AstText)[];
-    abstract get firstChild(): GalleryImageToken | NoincludeToken | AstText | undefined;
-    abstract get lastChild(): GalleryImageToken | NoincludeToken | AstText | undefined;
+    readonly childNodes: readonly (Child | AstText)[];
+    abstract get firstChild(): Child | AstText | undefined;
+    abstract get lastChild(): Child | AstText | undefined;
     abstract get nextSibling(): undefined;
     abstract get previousSibling(): AttributesToken;
     abstract get parentNode(): ExtToken | undefined;
@@ -21,3 +22,4 @@ export declare abstract class GalleryToken extends Token {
     /** @param inner 标签内部wikitext */
     constructor(inner?: string, config?: Parser.Config, accum?: Token[]);
 }
+export {};

package/dist/src/imagemap.d.ts

@@ -5,15 +5,16 @@ import { GalleryImageToken } from './link/galleryImage';
 import { ImagemapLinkToken } from './imagemapLink';
 import type { LintError } from '../base';
 import type { AstText, AttributesToken, ExtToken } from '../internal';
+declare type Child = GalleryImageToken | NoincludeToken;
 /**
  * `<imagemap>`
  * @classdesc `{childNodes: ...NoincludeToken, GalleryImageToken, ...(NoincludeToken|ImagemapLinkToken|AstText)}`
  */
 export declare abstract class ImagemapToken extends Token {
     readonly name: 'imagemap';
-    readonly childNodes: readonly (GalleryImageToken | NoincludeToken | ImagemapLinkToken | AstText)[];
-    abstract get firstChild(): NoincludeToken | GalleryImageToken | undefined;
-    abstract get lastChild(): GalleryImageToken | NoincludeToken | ImagemapLinkToken | AstText | undefined;
+    readonly childNodes: readonly (Child | ImagemapLinkToken | AstText)[];
+    abstract get firstChild(): Child | undefined;
+    abstract get lastChild(): Child | ImagemapLinkToken | AstText | undefined;
     abstract get nextSibling(): undefined;
     abstract get previousSibling(): AttributesToken;
     abstract get parentNode(): ExtToken | undefined;
@@ -23,3 +24,4 @@ export declare abstract class ImagemapToken extends Token {
     /** @param inner 标签内部wikitext */
     constructor(inner?: string, config?: Parser.Config, accum?: Token[]);
 }
+export {};

package/dist/src/nested.d.ts

@@ -2,18 +2,19 @@ import Parser from '../index';
 import { Token } from './index';
 import { ExtToken } from './tagPair/ext';
 import { NoincludeToken } from './nowiki/noinclude';
-import { CommentToken } from './nowiki/comment';
 import type { LintError } from '../base';
-import type { AttributesToken } from './attributes';
+import type { CommentToken, AttributesToken, IncludeToken, ArgToken, TranscludeToken } from '../internal';
+declare type Child = ExtToken | NoincludeToken | CommentToken | IncludeToken | ArgToken | TranscludeToken;
 /**
  * 嵌套式的扩展标签
  * @classdesc `{childNodes: ...ExtToken|NoincludeToken|CommentToken}`
  */
 export declare abstract class NestedToken extends Token {
+    #private;
     readonly name: string;
-    readonly childNodes: readonly (ExtToken | NoincludeToken | CommentToken)[];
-    abstract get firstChild(): ExtToken | NoincludeToken | CommentToken | undefined;
-    abstract get lastChild(): ExtToken | NoincludeToken | CommentToken | undefined;
+    readonly childNodes: readonly Child[];
+    abstract get firstChild(): Child | undefined;
+    abstract get lastChild(): Child | undefined;
     abstract get nextSibling(): undefined;
     abstract get previousSibling(): AttributesToken;
     abstract get parentNode(): ExtToken | undefined;
@@ -22,5 +23,6 @@ export declare abstract class NestedToken extends Token {
      * @param regex 内层正则
      * @param tags 内层标签名
      */
-    constructor(wikitext: string | undefined, regex: RegExp, tags: readonly string[], config?: Parser.Config, accum?: Token[]);
+    constructor(wikitext: string | undefined, regex: RegExp | boolean, tags: readonly string[], config?: Parser.Config, accum?: Token[]);
 }
+export {};

package/dist/src/nested.js

@@ -3,16 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NestedToken = void 0;
 const lint_1 = require("../util/lint");
 const rect_1 = require("../lib/rect");
+const commentAndExt_1 = require("../parser/commentAndExt");
+const braces_1 = require("../parser/braces");
 const index_1 = require("../index");
 const index_2 = require("./index");
 const ext_1 = require("./tagPair/ext");
 const noinclude_1 = require("./nowiki/noinclude");
-const comment_1 = require("./nowiki/comment");
+const childTypes = new Set(['comment', 'include', 'arg', 'template', 'magic-word']);
 /**
  * 嵌套式的扩展标签
  * @classdesc `{childNodes: ...ExtToken|NoincludeToken|CommentToken}`
  */
 class NestedToken extends index_2.Token {
+    #tags;
+    #regex;
     get type() {
         return 'ext-inner';
     }
@@ -21,36 +25,46 @@ class NestedToken extends index_2.Token {
      * @param tags 内层标签名
      */
     constructor(wikitext, regex, tags, config = index_1.default.getConfig(), accum = []) {
-        wikitext = wikitext?.replace(regex, (comment, name, attr, inner, closing) => {
-            const str = `\0${accum.length + 1}${name ? 'e' : 'c'}\x7F`;
-            if (name) {
+        if (typeof regex === 'boolean') {
+            const placeholder = Symbol('InputboxToken'), { length } = accum;
+            accum.push(placeholder);
+            wikitext &&= (0, commentAndExt_1.parseCommentAndExt)(wikitext, config, accum, regex);
+            wikitext &&= (0, braces_1.parseBraces)(wikitext, config, accum);
+            accum.splice(length, 1);
+        }
+        else {
+            wikitext &&= wikitext.replace(regex, (_, name, attr, inner, closing) => {
+                const str = `\0${accum.length + 1}e\x7F`;
                 // @ts-expect-error abstract class
-                new ext_1.ExtToken(name, attr, inner, closing, config, accum);
-            }
-            else {
-                const closed = comment.endsWith('-->');
-                // @ts-expect-error abstract class
-                new comment_1.CommentToken(comment.slice(4, closed ? -3 : undefined), closed, config, accum);
-            }
-            return str;
-        }).replace(/(^|\0\d+[cne]\x7F)([^\0]+)(?=$|\0\d+[cne]\x7F)/gu, (_, lead, substr) => {
+                new ext_1.ExtToken(name, attr, inner, closing, config, false, accum);
+                return str;
+            });
+        }
+        wikitext &&= wikitext.replace(/(^|\0\d+.\x7F)([^\0]+)(?=$|\0\d+.\x7F)/gu, (_, lead, substr) => {
             // @ts-expect-error abstract class
             new noinclude_1.NoincludeToken(substr, config, accum);
             return `${lead}\0${accum.length}n\x7F`;
         });
-        super(wikitext, config, accum, {});
+        super(wikitext, config, accum);
+        this.#tags = [...tags];
+        this.#regex = regex;
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const rect = new rect_1.BoundingRect(this, start);
+        const rect = new rect_1.BoundingRect(this, start), noinclude = this.#regex ? 'includeonly' : 'noinclude', regex = typeof this.#regex === 'boolean'
+            ? new RegExp(String.raw `^(?:<${noinclude}(?:\s[^>]*)?/?>|</${noinclude}\s*>)$`, 'iu')
+            : /^<!--.*-->$/su;
         return [
             ...super.lint(start, re),
             ...this.childNodes.filter(child => {
-                if (child.type === 'ext' || child.type === 'comment') {
+                if (child.type === 'ext') {
+                    return !this.#tags.includes(child.name);
+                }
+                else if (childTypes.has(child.type)) {
                     return false;
                 }
                 const str = child.toString().trim();
-                return str && !/^<!--.*-->$/su.test(str);
+                return str && !regex.test(str);
             }).map(child => {
                 const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', index_1.default.msg('invalid content in <$1>', this.name));
                 e.suggestions = [

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

@@ -17,5 +17,5 @@ export declare abstract class ParamTagToken extends Token {
     abstract get parentNode(): ExtToken | undefined;
     get type(): 'ext-inner';
     /** @class */
-    constructor(wikitext?: string, config?: Parser.Config, accum?: Token[], acceptable?: Acceptable);
+    constructor(include: boolean, wikitext?: string, config?: Parser.Config, accum?: Token[], acceptable?: Acceptable);
 }

package/dist/src/paramTag/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParamTagToken = void 0;
 const lint_1 = require("../../util/lint");
 const rect_1 = require("../../lib/rect");
+const commentAndExt_1 = require("../../parser/commentAndExt");
 const index_1 = require("../../index");
 const index_2 = require("../index");
 const atom_1 = require("../atom");
@@ -15,12 +16,16 @@ class ParamTagToken extends index_2.Token {
         return 'ext-inner';
     }
     /** @class */
-    constructor(wikitext, config = index_1.default.getConfig(), accum = [], acceptable = {}) {
+    constructor(include, wikitext, config = index_1.default.getConfig(), accum = [], acceptable) {
         super(undefined, config, accum, {});
         if (wikitext) {
             const SingleLineAtomToken = atom_1.AtomToken;
-            this.append(...wikitext.split('\n').map(line => new SingleLineAtomToken(line, 'param-line', config, accum, {})));
+            this.append(...wikitext.split('\n')
+                .map(line => acceptable ? line : (0, commentAndExt_1.parseCommentAndExt)(line, config, accum, include))
+                .map(line => new SingleLineAtomToken(line, 'param-line', config, accum, {})));
         }
+        accum.splice(accum.indexOf(this), 1);
+        accum.push(this);
     }
     /** @private */
     toString(skip) {
@@ -36,21 +41,33 @@ class ParamTagToken extends index_2.Token {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex()) {
-        const rect = new rect_1.BoundingRect(this, start);
-        return this.childNodes.filter(child => {
-            const { childNodes } = child, i = childNodes.findIndex(({ type }) => type !== 'text'), str = (i >= 0 ? childNodes.slice(0, i).map(String).join('') : child.toString()).trim();
-            return str && !(i >= 0 ? /^[a-z]+(?:\[\])?\s*(?:=|$)/iu : /^[a-z]+(?:\[\])?\s*=/iu).test(str);
-        }).map(child => {
-            const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', index_1.default.msg('invalid parameter of <$1>', this.name));
-            e.suggestions = [
-                {
-                    desc: 'remove',
-                    range: [e.startIndex, e.endIndex],
-                    text: '',
-                },
-            ];
-            return e;
-        });
+        const rect = new rect_1.BoundingRect(this, start), msg = index_1.default.msg('invalid parameter of <$1>', this.name), errors = [];
+        for (const child of this.childNodes) {
+            const grandChildren = child.childNodes
+                .filter(({ type }) => type !== 'comment' && type !== 'include' && type !== 'noinclude');
+            if (grandChildren.some(({ type }) => type === 'ext')) {
+                errors.push((0, lint_1.generateForChild)(child, rect, 'no-ignored', msg));
+            }
+            else {
+                const i = grandChildren.findIndex(({ type }) => type !== 'text'), str = grandChildren.slice(0, i >= 0 ? i : undefined).map(String).join('');
+                if (str && !(i >= 0 ? /^[a-z]+(?:\[\])?\s*(?:=|$)/iu : /^[a-z]+(?:\[\])?\s*=/iu).test(str)) {
+                    const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', msg);
+                    e.suggestions = [
+                        {
+                            desc: 'remove',
+                            range: [e.startIndex, e.endIndex],
+                            text: '',
+                        },
+                    ];
+                    errors.push(e);
+                }
+                else {
+                    errors.push(...child.lint(start, false));
+                }
+            }
+            start += child.toString().length + 1;
+        }
+        return errors;
     }
 }
 exports.ParamTagToken = ParamTagToken;

package/dist/src/paramTag/inputbox.d.ts

@@ -4,5 +4,5 @@ import type { Token } from '../index';
 /** `<inputbox>` */
 export declare abstract class InputboxToken extends ParamTagToken {
     /** @class */
-    constructor(wikitext?: string, config?: Parser.Config, accum?: Token[]);
+    constructor(include: boolean, wikitext?: string, config?: Parser.Config, accum?: Token[]);
 }

package/dist/src/paramTag/inputbox.js

@@ -1,18 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InputboxToken = void 0;
+const commentAndExt_1 = require("../../parser/commentAndExt");
 const braces_1 = require("../../parser/braces");
 const index_1 = require("../../index");
 const index_2 = require("./index");
 /** `<inputbox>` */
 class InputboxToken extends index_2.ParamTagToken {
     /** @class */
-    constructor(wikitext, config = index_1.default.getConfig(), accum = []) {
+    constructor(include, wikitext, config = index_1.default.getConfig(), accum = []) {
         const placeholder = Symbol('InputboxToken'), { length } = accum;
         accum.push(placeholder);
+        wikitext &&= (0, commentAndExt_1.parseCommentAndExt)(wikitext, config, accum, include);
         wikitext &&= (0, braces_1.parseBraces)(wikitext, config, accum);
         accum.splice(length, 1);
-        super(wikitext, config, accum, {});
+        super(include, wikitext, config, accum, {});
     }
 }
 exports.InputboxToken = InputboxToken;

package/dist/src/pre.d.ts

@@ -3,15 +3,16 @@ import { Token } from './index';
 import { NoincludeToken } from './nowiki/noinclude';
 import type { LintError } from '../base';
 import type { AstText, AttributesToken, ExtToken, ConverterToken } from '../internal';
+declare type Child = NoincludeToken | ConverterToken;
 /**
  * `<pre>`
  * @classdesc `{childNodes: [...AstText|NoincludeToken|ConverterToken]}`
  */
 export declare abstract class PreToken extends Token {
     readonly name: 'pre';
-    readonly childNodes: readonly (AstText | NoincludeToken | ConverterToken)[];
-    abstract get firstChild(): AstText | NoincludeToken | ConverterToken | undefined;
-    abstract get lastChild(): AstText | NoincludeToken | ConverterToken | undefined;
+    readonly childNodes: readonly (AstText | Child)[];
+    abstract get firstChild(): AstText | Child | undefined;
+    abstract get lastChild(): AstText | Child | undefined;
     abstract get nextSibling(): undefined;
     abstract get previousSibling(): AttributesToken;
     abstract get parentNode(): ExtToken | undefined;
@@ -19,3 +20,4 @@ export declare abstract class PreToken extends Token {
     /** @class */
     constructor(wikitext?: string, config?: Parser.Config, accum?: Token[]);
 }
+export {};

package/dist/src/pre.js

@@ -16,19 +16,27 @@ class PreToken extends index_2.Token {
     /** @class */
     constructor(wikitext, config = index_1.default.getConfig(), accum = []) {
         if (wikitext) {
-            const opening = '<nowiki>', closing = '</nowiki>', { length } = opening;
-            let i = wikitext.indexOf(opening), j = wikitext.indexOf(closing, i + length), str = '';
-            while (i !== -1 && j !== -1) {
+            const opening = /<nowiki>/giu, closing = /<\/nowiki>/giu, { length } = opening.source;
+            let i = opening.exec(wikitext);
+            if (i) {
+                closing.lastIndex = i.index + length;
+            }
+            let j = closing.exec(wikitext), lastIndex = 0, str = '';
+            while (i && j) {
                 // @ts-expect-error abstract class
-                new noinclude_1.NoincludeToken(opening, config, accum);
+                new noinclude_1.NoincludeToken(i[0], config, accum);
                 // @ts-expect-error abstract class
-                new noinclude_1.NoincludeToken(closing, config, accum);
-                str += `${wikitext.slice(0, i)}\0${accum.length - 1}n\x7F${wikitext.slice(i + length, j)}\0${accum.length}n\x7F`;
-                wikitext = wikitext.slice(j + length + 1);
-                i = wikitext.indexOf(opening);
-                j = wikitext.indexOf(closing, i + length);
+                new noinclude_1.NoincludeToken(j[0], config, accum);
+                str += `${wikitext.slice(lastIndex, i.index)}\0${accum.length - 1}n\x7F${wikitext.slice(i.index + length, j.index)}\0${accum.length}n\x7F`;
+                lastIndex = j.index + length + 1;
+                opening.lastIndex = lastIndex;
+                i = opening.exec(wikitext);
+                if (i) {
+                    closing.lastIndex = i.index + length;
+                }
+                j = closing.exec(wikitext);
             }
-            wikitext = str + wikitext;
+            wikitext = str + wikitext.slice(lastIndex);
         }
         super(wikitext, config, accum, {});
         this.setAttribute('stage', constants_1.MAX_STAGE - 1);

package/dist/src/table/base.js

@@ -17,7 +17,7 @@ class TableBaseToken extends (0, attributesParent_1.attributesParent)(1)(index_2
      * @param type 节点类型
      * @param attr 表格属性
      */
-    constructor(pattern, syntax, type, attr, config = index_1.default.getConfig(), accum = [], acceptable = {}) {
+    constructor(pattern, syntax, type, attr, config = index_1.default.getConfig(), accum = [], acceptable) {
         super(undefined, config, accum, acceptable);
         this.append(new syntax_1.SyntaxToken(syntax, pattern, 'table-syntax', config, accum, {}), 
         // @ts-expect-error abstract class

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

@@ -3,6 +3,7 @@ import { SyntaxToken } from '../syntax';
 import type { Config, LintError } from '../../base';
 import type { AttributesToken, TdToken, TrToken, Token } from '../../internal';
 import type { TableCoords } from './trBase';
+export type TableTokens = TableToken | TrToken | TdToken;
 /**
  * 是否是行尾
  * @param {Token} cell 表格单元格

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

@@ -15,9 +15,10 @@ export declare abstract class ExtToken extends TagPairToken {
     get type(): 'ext';
     /**
      * @param name 标签名
+     * @param include 是否嵌入
      * @param attr 标签属性
      * @param inner 内部wikitext
      * @param closed 是否封闭
      */
-    constructor(name: string, attr?: string, inner?: string, closed?: string, config?: Parser.Config, accum?: Token[]);
+    constructor(name: string, attr?: string, inner?: string, closed?: string, config?: Parser.Config, include?: boolean, accum?: Token[]);
 }

package/dist/src/tagPair/ext.js

@@ -33,11 +33,12 @@ class ExtToken extends index_3.TagPairToken {
     }
     /**
      * @param name 标签名
+     * @param include 是否嵌入
      * @param attr 标签属性
      * @param inner 内部wikitext
      * @param closed 是否封闭
      */
-    constructor(name, attr, inner, closed, config = index_1.default.getConfig(), accum = []) {
+    constructor(name, attr, inner, closed, config = index_1.default.getConfig(), include = false, accum = []) {
         const lcName = name.toLowerCase(), 
         // @ts-expect-error abstract class
         attrToken = new attributes_1.AttributesToken(!attr || attr.trimStart() !== attr ? attr : ` ${attr}`, 'ext-attrs', lcName, config, accum), newConfig = { ...config, ext: del(config.ext, lcName), excludes: [...config.excludes ?? []] };
@@ -65,17 +66,18 @@ class ExtToken extends index_3.TagPairToken {
                 break;
             case 'dynamicpagelist':
                 // @ts-expect-error abstract class
-                innerToken = new index_4.ParamTagToken(inner, newConfig, accum);
+                innerToken = new index_4.ParamTagToken(include, inner, newConfig, accum);
                 break;
             case 'inputbox':
                 newConfig.excludes.push('heading');
                 // @ts-expect-error abstract class
-                innerToken = new inputbox_1.InputboxToken(inner, newConfig, accum);
+                innerToken = new inputbox_1.InputboxToken(include, inner, newConfig, accum);
                 break;
             case 'references': {
                 const { NestedToken } = require('../nested');
+                newConfig.excludes.push('heading');
                 // @ts-expect-error abstract class
-                innerToken = new NestedToken(inner, /<!--.*?(?:-->|$)|<(ref)(\s[^>]*?)?(?:\/>|>(.*?)<\/(ref\s*)>)/gisu, ['ref'], newConfig, accum);
+                innerToken = new NestedToken(inner, include, ['ref'], newConfig, accum);
                 break;
             }
             case 'choose': {

package/dist/src/tagPair/include.js

@@ -36,6 +36,7 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IncludeToken = void 0;
 const lint_1 = require("../../util/lint");
+const rect_1 = require("../../lib/rect");
 const hidden_1 = require("../../mixin/hidden");
 const index_1 = require("../../index");
 const index_2 = require("./index");
@@ -76,18 +77,30 @@ let IncludeToken = (() => {
         }
         /** @private */
         lint(start = this.getAbsoluteIndex()) {
-            if (this.closed) {
-                return [];
+            const errors = [], { firstChild, closed, name } = this, rect = new rect_1.BoundingRect(this, start);
+            if (firstChild.data.trim()) {
+                const e = (0, lint_1.generateForChild)(firstChild, rect, 'no-ignored', 'useless attribute', 'warning');
+                e.suggestions = [
+                    {
+                        desc: 'remove',
+                        range: [e.startIndex, e.endIndex],
+                        text: '',
+                    },
+                ];
+                errors.push(e);
             }
-            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];
+            if (!closed) {
+                const e = (0, lint_1.generateForSelf)(this, rect, 'unclosed-comment', index_1.default.msg('unclosed $1', `<${name}>`));
+                e.suggestions = [
+                    {
+                        desc: 'close',
+                        range: [e.endIndex, e.endIndex],
+                        text: `</${name}>`,
+                    },
+                ];
+                errors.push(e);
+            }
+            return errors;
         }
     };
     return IncludeToken = _classThis;

package/dist/src/transclude.d.ts

@@ -4,6 +4,7 @@ import { ParameterToken } from './parameter';
 import { AtomToken } from './atom';
 import { SyntaxToken } from './syntax';
 import type { LintError } from '../base';
+declare type Child = AtomToken | SyntaxToken;
 /**
  * 模板或魔术字
  * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken, ...ParameterToken]}`
@@ -11,9 +12,9 @@ import type { LintError } from '../base';
 export declare abstract class TranscludeToken extends Token {
     #private;
     readonly modifier: string;
-    readonly childNodes: readonly [AtomToken | SyntaxToken, ...ParameterToken[]] | readonly [SyntaxToken, AtomToken, AtomToken, ...ParameterToken[]];
-    abstract get firstChild(): AtomToken | SyntaxToken;
-    abstract get lastChild(): AtomToken | SyntaxToken | ParameterToken;
+    readonly childNodes: readonly [Child, ...ParameterToken[]] | readonly [SyntaxToken, AtomToken, AtomToken, ...ParameterToken[]];
+    abstract get firstChild(): Child;
+    abstract get lastChild(): Child | ParameterToken;
     get type(): 'template' | 'magic-word';
     /**
      * @param title 模板标题或魔术字
@@ -55,3 +56,4 @@ export declare abstract class TranscludeToken extends Token {
      */
     getPossibleValues(): Token[];
 }
+export {};

package/dist/src/transclude.js

@@ -37,6 +37,12 @@ class TranscludeToken extends index_2.Token {
      * @throws `SyntaxError` 非法的模板名称
      */
     constructor(title, parts, config = index_1.default.getConfig(), accum = []) {
+        let heading;
+        const m = /^(?:\s|\0\d+[cn]\x7F)*\0(\d+)h\x7F(?:\s|\0\d+[cn]\x7F)*/u.exec(title);
+        if (m) {
+            heading = Number(m[1]);
+            title = title.replace(`\0${heading}h\x7F`, accum[heading].toString().replace(/^\n/u, ''));
+        }
         super(undefined, config, accum, {});
         const { parserFunction: [insensitive, sensitive] } = config, argSubst = /^(?:\s|\0\d+[cn]\x7F)*\0\d+s\x7F/u.exec(title)?.[0];
         if (argSubst) {
@@ -81,6 +87,10 @@ class TranscludeToken extends index_2.Token {
             const token = new atom_1.AtomToken(title, 'template-name', config, accum, {});
             super.insertAt(token);
         }
+        if (typeof heading === 'number') {
+            // @ts-expect-error sparse array
+            accum[heading] = undefined;
+        }
         const templateLike = this.isTemplate();
         let i = 1;
         for (const [j, part] of parts.entries()) {

package/i18n/zh-hans.json

@@ -53,6 +53,7 @@
 	"unexpected template argument": "未预期的模板参数",
 	"unmatched closing tag": "未匹配的闭合标签",
 	"unnecessary URL encoding in an internal link": "内链中不必要的URL编码",
+	"useless attribute": "无用的属性",
 	"useless fragment": "无用的fragment",
 	"useless link text": "无用的链接文字",
 	"variable anchor in a section header": "段落标题中可变的锚点",

package/i18n/zh-hant.json

@@ -53,6 +53,7 @@
 	"unexpected template argument": "未預期的模板參數",
 	"unmatched closing tag": "未匹配的閉合標籤",
 	"unnecessary URL encoding in an internal link": "內部連結中不必要的URL編碼",
+	"useless attribute": "無用的屬性",
 	"useless fragment": "無用的fragment",
 	"useless link text": "無用的連結文字",
 	"variable anchor in a section header": "段落標題中可變的錨點",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.13.0",
+	"version": "2.13.2",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -51,7 +51,7 @@
 		"chalk": "^4.1.2"
 	},
 	"devDependencies": {
-		"@bhsd/common": "^0.1.1",
+		"@bhsd/common": "^0.3.0",
 		"@types/node": "^20.11.6",
 		"v8r": "^3.0.0"
 	},