wikilint 2.9.2 → 2.10.0

package/config/.schema.json

@@ -162,6 +162,11 @@
 				"minItems": 2,
 				"maxItems": 2
 			}
+		},
+		"articlePath": {
+			"description": "base URL of internal links",
+			"type": "string",
+			"pattern": "\\$1"
 		}
 	},
 	"required": [

package/config/enwiki.json

@@ -409,5 +409,6 @@
 	"redirection": [
 		"#redirect"
 	],
-	"variants": []
+	"variants": [],
+	"articlePath": "/wiki/$1"
 }

package/config/llwiki.json

@@ -597,5 +597,6 @@
 		"zh-sg",
 		"zh-my",
 		"zh-mo"
-	]
+	],
+	"articlePath": "/zh/$1"
 }

package/config/moegirl.json

@@ -687,5 +687,6 @@
 		"zh-cn",
 		"zh-tw",
 		"zh-hk"
-	]
+	],
+	"articlePath": "/$1"
 }

package/config/zhwiki.json

@@ -805,5 +805,6 @@
 		"zh-sg",
 		"zh-my",
 		"zh-mo"
-	]
+	],
+	"articlePath": "/wiki/$1"
 }

package/dist/base.d.ts

@@ -38,13 +38,20 @@ export interface LintError {
 }
 /** 类似Node */
 export interface AstNode {
-    type: string;
     readonly childNodes: readonly AstNode[];
+    /** 节点类型 */
+    type: string;
     /** Linter */
     lint(): LintError[];
 }
-/** 类似HTMLElement */
-interface AstElement extends AstNode {
+/** 所有节点的基类 */
+interface Token extends AstNode {
+    readonly name?: string;
+    /**
+     * 符合选择器的所有后代节点
+     * @param selector 选择器
+     */
+    querySelectorAll<T = Token>(selector: string): T[];
 }
 export interface Parser {
     config: Config | string;
@@ -56,6 +63,6 @@ export interface Parser {
      * @param include 是否嵌入
      * @param maxStage 最大解析层级
      */
-    parse(wikitext: string, include?: boolean, maxStage?: number, config?: Config): AstElement;
+    parse(wikitext: string, include?: boolean, maxStage?: number, config?: Config): Token;
 }
 export {};

package/dist/index.js

@@ -11,8 +11,7 @@ const string_1 = require("./util/string");
  * @param file 文件名
  * @param dir 子路径
  */
-const rootRequire = (file, dir) => require(file.startsWith('/') ? file : `../${file.includes('/') ? '' : dir}${file}`);
-// eslint-disable-next-line @typescript-eslint/no-redeclare
+const rootRequire = (file, dir) => require(path.isAbsolute(file) ? file : path.join('..', file.includes('/') ? '' : dir, file));
 const Parser = {
     config: 'default',
     i18n: undefined,
@@ -20,7 +19,7 @@ const Parser = {
     /** @implements */
     getConfig() {
         if (typeof this.config === 'string') {
-            this.config = rootRequire(this.config, 'config/');
+            this.config = rootRequire(this.config, 'config');
             return this.getConfig();
         }
         return {
@@ -31,7 +30,7 @@ const Parser = {
     /** @implements */
     msg(msg, arg = '') {
         if (typeof this.i18n === 'string') {
-            this.i18n = rootRequire(this.i18n, 'i18n/');
+            this.i18n = rootRequire(this.i18n, 'i18n');
             return this.msg(msg, arg);
         }
         return msg && (this.i18n?.[msg] ?? msg).replace('$1', this.msg(arg));

package/dist/lib/element.js

@@ -4,6 +4,14 @@ exports.AstElement = void 0;
 const string_1 = require("../util/string");
 const debug_1 = require("../util/debug");
 const node_1 = require("./node");
+/**
+ * 将选择器转化为类型谓词
+ * @param selector 选择器
+ */
+const getCondition = (selector) => {
+    const types = new Set(selector.split(',').map(str => str.trim()));
+    return (({ type }) => types.has(type));
+};
 /** 类似HTMLElement */
 class AstElement extends node_1.AstNode {
     /** 子节点总数 */
@@ -51,20 +59,12 @@ class AstElement extends node_1.AstNode {
         (0, debug_1.setChildNodes)(this, i, 0, [node]);
         return node;
     }
-    /**
-     * 将选择器转化为类型谓词
-     * @param selector 选择器
-     */
-    #getCondition(selector) {
-        const types = new Set(selector.split(',').map(str => str.trim()));
-        return (({ type }) => types.has(type));
-    }
     /**
      * 最近的祖先节点
      * @param selector 选择器
      */
     closest(selector) {
-        const condition = this.#getCondition(selector);
+        const condition = getCondition(selector);
         let { parentNode } = this;
         while (parentNode) {
             if (condition(parentNode)) {
@@ -98,7 +98,7 @@ class AstElement extends node_1.AstNode {
      * @param selector 选择器
      */
     querySelector(selector) {
-        const condition = this.#getCondition(selector);
+        const condition = getCondition(selector);
         return this.#getElementBy(condition);
     }
     /**
@@ -123,7 +123,7 @@ class AstElement extends node_1.AstNode {
      * @param selector 选择器
      */
     querySelectorAll(selector) {
-        const condition = this.#getCondition(selector);
+        const condition = getCondition(selector);
         return this.#getElementsBy(condition);
     }
     /**
@@ -158,8 +158,8 @@ class AstElement extends node_1.AstNode {
         return data;
     }
     /** @private */
-    toString(separator = '') {
-        return this.childNodes.map(String).join(separator);
+    toString(skip, separator = '') {
+        return this.childNodes.map(child => child.toString(skip)).join(separator);
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {

package/dist/lib/node.d.ts

@@ -16,9 +16,12 @@ export interface CaretPosition {
 /** 类似Node */
 export declare abstract class AstNode implements AstNodeBase {
     #private;
-    type: TokenTypes | 'text';
     data?: string | undefined;
     readonly childNodes: readonly AstNodes[];
+    abstract get type(): TokenTypes | 'text';
+    abstract set type(value: TokenTypes | 'text');
+    /** 可见部分 */
+    text(): string;
     lint(): LintError[];
     /** 首位子节点 */
     get firstChild(): AstNodes | undefined;
@@ -48,4 +51,9 @@ export declare abstract class AstNode implements AstNodeBase {
     getRelativeIndex(j?: number): number;
     /** 获取当前节点的绝对位置 */
     getAbsoluteIndex(): number;
+    /**
+     * 是否是某种类型的节点
+     * @param type 节点类型
+     */
+    is<T extends Token>(type: string): this is T;
 }

package/dist/lib/node.js

@@ -114,5 +114,12 @@ class AstNode {
             configurable: true,
         });
     }
+    /**
+     * 是否是某种类型的节点
+     * @param type 节点类型
+     */
+    is(type) {
+        return this.type === type;
+    }
 }
 exports.AstNode = AstNode;

package/dist/lib/text.d.ts

@@ -3,13 +3,11 @@ import type { LintError } from '../base';
 /** 文本节点 */
 export declare class AstText extends AstNode {
     #private;
-    readonly type = "text";
     readonly name: undefined;
     readonly data: string;
+    get type(): 'text';
     /** @param text 包含文本 */
     constructor(text: string);
-    /** 可见部分 */
-    text(): string;
     /**
      * 替换字符串
      * @param text 替换的字符串

package/dist/lib/text.js

@@ -45,14 +45,15 @@ const source = String.raw `<\s*(?:/\s*)?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])
 ];
 /** 文本节点 */
 class AstText extends node_1.AstNode {
-    type = 'text';
     data = '';
+    get type() {
+        return 'text';
+    }
     /** @param text 包含文本 */
     constructor(text) {
         super();
         Object.defineProperties(this, {
             childNodes: { enumerable: false, configurable: false },
-            type: { enumerable: false, writable: false },
             data: {
                 value: text,
             },
@@ -62,12 +63,15 @@ class AstText extends node_1.AstNode {
     toString() {
         return this.data;
     }
-    /** 可见部分 */
+    /** @private */
     text() {
         return this.data;
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), errorRegex) {
+        if (errorRegex === false) {
+            return [];
+        }
         const { data, parentNode, nextSibling, previousSibling } = this;
         if (!parentNode) {
             throw new Error('An isolated text node cannot be linted!');
@@ -107,9 +111,7 @@ class AstText extends node_1.AstNode {
                 || char === '['
                     && type === 'ext-link-text'
                     && (/&(?:rbrack|#93|#x5[Dd];);/u.test(data.slice(index + 1))
-                        || nextType === 'ext'
-                            && nextName === 'nowiki'
-                            && nextSibling.innerText?.includes(']'))) {
+                        || nextSibling?.is('ext') && nextName === 'nowiki' && nextSibling.innerText?.includes(']'))) {
                 continue;
             }
             else if (char === ']' && (index || length > 1)) {

package/dist/mixin/hidden.d.ts

@@ -1,6 +1,7 @@
 /**
  * 解析后不可见的类
  * @param linter 是否覆写 lint 方法
+ * @param html 是否覆写 toHtml 方法
  * @param constructor 基类
  * @param _ context
  */

package/dist/mixin/hidden.js

@@ -5,17 +5,17 @@ const debug_1 = require("../util/debug");
 /**
  * 解析后不可见的类
  * @param linter 是否覆写 lint 方法
+ * @param html 是否覆写 toHtml 方法
  * @param constructor 基类
  * @param _ context
  */
-const hiddenToken = (linter) => (constructor, _) => {
+const hiddenToken = (linter = true, html = true) => (constructor, _) => {
     /** 解析后不可见的类 */
     class AnyHiddenToken extends constructor {
         /** 没有可见部分 */
         text() {
             return '';
         }
-        /** @private */
         lint(start) {
             // @ts-expect-error private argument
             return linter ? [] : super.lint(start);

package/dist/parser/list.js

@@ -10,18 +10,20 @@ const dd_1 = require("../src/nowiki/dd");
  * @param accum
  */
 const parseList = (wikitext, config, accum) => {
-    const mt = /^((?:\0\d+c\x7F)*)([;:*#]+)/u.exec(wikitext);
+    const mt = /^((?:\0\d+c\x7F)*)([;:*#]+\s*)/u.exec(wikitext);
     if (!mt) {
         return wikitext;
     }
-    const [total, comment, prefix] = mt;
-    let text = `${comment}\0${accum.length}d\x7F${wikitext.slice(total.length)}`, dt = prefix.split(';').length - 1;
-    // @ts-expect-error abstract class
-    new list_1.ListToken(prefix, config, accum);
+    const [total, comment, prefix] = mt, parts = prefix.split(/(?=;)/u);
+    let text = comment + parts.map((_, i) => `\0${accum.length + i}d\x7F`).join('') + wikitext.slice(total.length), dt = parts.length - (parts[0].startsWith(';') ? 0 : 1);
+    for (const part of parts) {
+        // @ts-expect-error abstract class
+        new list_1.ListToken(part, config, accum);
+    }
     if (!dt) {
         return text;
     }
-    const { html: [normalTags] } = config, fullRegex = /:+|-\{|\0\d+[xq]\x7F/gu;
+    const { html: [normalTags] } = config, fullRegex = /:+\s*|-\{|\0\d+[xq]\x7F/gu;
     let regex = fullRegex, ex = regex.exec(text), lt = 0, lb = false, li = false, lc = 0;
     /**
      * 创建`DdToken`

package/dist/parser/table.js

@@ -67,8 +67,8 @@ const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
             out += `\n${outLine}`;
             continue;
         }
-        // eslint-disable-next-line @stylistic/operator-linebreak
-        const matches = /^(?:(\|\}|\0\d+!\x7F\}|\0\d+\}\x7F)|(\|-+|\0\d+!\x7F-+|\0\d+-\x7F-*)(?!-)|(!|(?:\||\0\d+!\x7F)\+?))(.*)$/u
+        const matches = // eslint-disable-line @stylistic/operator-linebreak
+         /^(?:(\|\}|\0\d+!\x7F\}|\0\d+\}\x7F)|(\|-+|\0\d+!\x7F-+|\0\d+-\x7F-*)(?!-)|(!|(?:\||\0\d+!\x7F)\+?))(.*)$/u
             .exec(line);
         if (!matches) {
             push(`\n${outLine}`, top);
@@ -101,19 +101,19 @@ const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
              * 创建表格单元格
              * @param tr 当前表格行
              */
-            const createTd = (tr) => {
+            const newTd = (tr) => {
                 // @ts-expect-error abstract class
                 const td = new td_1.TdToken(lastSyntax, attr.slice(lastIndex, mt?.index), config, accum);
                 tr.insertAt(td);
                 return td;
             };
             while (mt) {
-                createTd(top);
+                newTd(top);
                 ({ lastIndex } = regex);
                 [lastSyntax] = mt;
                 mt = regex.exec(attr);
             }
-            stack.push(top, createTd(top));
+            stack.push(top, newTd(top));
         }
     }
     return out.slice(1);

package/dist/src/arg.d.ts

@@ -8,10 +8,10 @@ import type { LintError } from '../base';
  * @classdesc `{childNodes: [AtomToken, ?Token, ...HiddenToken]}`
  */
 export declare abstract class ArgToken extends Token {
-    readonly type = "arg";
     readonly childNodes: readonly [AtomToken] | readonly [AtomToken, Token, ...HiddenToken[]];
     abstract get firstChild(): AtomToken;
     abstract get lastChild(): Token;
+    get type(): 'arg';
     /** 预设值 */
     get default(): string | false;
     /** @param parts 以'|'分隔的各部分 */

package/dist/src/arg.js

@@ -13,7 +13,9 @@ const hidden_1 = require("./hidden");
  * @classdesc `{childNodes: [AtomToken, ?Token, ...HiddenToken]}`
  */
 class ArgToken extends index_2.Token {
-    type = 'arg';
+    get type() {
+        return 'arg';
+    }
     /** 预设值 */
     get default() {
         return this.childNodes[1]?.text() ?? false;
@@ -39,8 +41,8 @@ class ArgToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
-        return `{{{${super.toString('|')}}}}`;
+    toString(skip) {
+        return `{{{${super.toString(skip, '|')}}}}`;
     }
     /** @private */
     text() {

package/dist/src/atom.d.ts

@@ -1,9 +1,12 @@
 import { Token } from './index';
 import type { Config } from '../base';
-declare type AtomTypes = 'arg-name' | 'attr-key' | 'attr-value' | 'ext-attr-dirty' | 'html-attr-dirty' | 'table-attr-dirty' | 'converter-flag' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'invoke-function' | 'invoke-module' | 'template-name' | 'link-target' | 'param-line';
+declare const atomTypes: readonly ["arg-name", "attr-key", "attr-value", "ext-attr-dirty", "html-attr-dirty", "table-attr-dirty", "converter-flag", "converter-rule-variant", "converter-rule-to", "converter-rule-from", "invoke-function", "invoke-module", "template-name", "link-target", "param-line"];
+declare type AtomTypes = typeof atomTypes[number];
 /** 不会被继续解析的plain Token */
 export declare class AtomToken extends Token {
-    type: AtomTypes;
+    #private;
+    get type(): AtomTypes;
+    set type(value: AtomTypes);
     /** @class */
     constructor(wikitext: string | undefined, type: AtomTypes, config?: Config, accum?: Token[], acceptable?: Acceptable);
 }

package/dist/src/atom.js

@@ -2,12 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AtomToken = void 0;
 const index_1 = require("./index");
+const atomTypes = [
+    'arg-name',
+    'attr-key',
+    'attr-value',
+    'ext-attr-dirty',
+    'html-attr-dirty',
+    'table-attr-dirty',
+    'converter-flag',
+    'converter-rule-variant',
+    'converter-rule-to',
+    'converter-rule-from',
+    'invoke-function',
+    'invoke-module',
+    'template-name',
+    'link-target',
+    'param-line',
+];
 /** 不会被继续解析的plain Token */
 class AtomToken extends index_1.Token {
+    #type;
+    get type() {
+        return this.#type;
+    }
+    set type(value) {
+        this.#type = value;
+    }
     /** @class */
     constructor(wikitext, type, config, accum, acceptable) {
         super(wikitext, config, accum, acceptable);
-        this.type = type;
+        this.#type = type;
     }
 }
 exports.AtomToken = AtomToken;

package/dist/src/attribute.d.ts

@@ -10,7 +10,6 @@ export type AttributeTypes = 'ext-attr' | 'html-attr' | 'table-attr';
  */
 export declare abstract class AttributeToken extends Token {
     #private;
-    type: AttributeTypes;
     readonly name: string;
     readonly childNodes: readonly [AtomToken, Token];
     abstract get firstChild(): AtomToken;
@@ -18,6 +17,7 @@ export declare abstract class AttributeToken extends Token {
     abstract get parentNode(): AttributesToken | undefined;
     abstract get nextSibling(): AtomToken | this | undefined;
     abstract get previousSibling(): AtomToken | this | undefined;
+    get type(): AttributeTypes;
     /** 标签名 */
     get tag(): string;
     /** 引号是否匹配 */

package/dist/src/attribute.js

@@ -60,7 +60,6 @@ const commonHtmlAttrs = new Set([
     img: new Set(['alt', 'src', 'width', 'height', 'srcset']),
     font: new Set(['size', 'color', 'face']),
     hr: widthAttrs,
-    rt: new Set(['rbspan']),
     data: new Set(['value']),
     time: new Set(['datetime']),
     meta: new Set(['itemprop', 'content']),
@@ -170,9 +169,13 @@ const commonHtmlAttrs = new Set([
  * @classdesc `{childNodes: [AtomToken, Token|AtomToken]}`
  */
 class AttributeToken extends index_2.Token {
+    #type;
     #tag;
     #equal;
     #quotes;
+    get type() {
+        return this.#type;
+    }
     /** 标签名 */
     get tag() {
         return this.#tag;
@@ -190,23 +193,15 @@ class AttributeToken extends index_2.Token {
      * @param quotes 引号
      */
     constructor(type, tag, key, equal = '', value, quotes = [], config = index_1.default.getConfig(), accum = []) {
-        const keyToken = new atom_1.AtomToken(key, 'attr-key', config, accum, {});
+        const keyToken = new atom_1.AtomToken(key, 'attr-key', config, accum);
         let valueToken;
         if (key === 'title' || tag === 'img' && key === 'alt') {
             valueToken = new index_2.Token(value, config, accum, {});
             valueToken.type = 'attr-value';
             valueToken.setAttribute('stage', constants_1.MAX_STAGE - 1);
         }
-        else if (tag === 'gallery' && key === 'caption') {
-            const newConfig = {
-                ...config,
-                excludes: [...config.excludes, 'quote', 'extLink', 'magicLink', 'list'],
-            };
-            valueToken = new index_2.Token(value, newConfig, accum, {});
-            valueToken.type = 'attr-value';
-            valueToken.setAttribute('stage', 5);
-        }
-        else if (tag === 'choose' && (key === 'before' || key === 'after')) {
+        else if (tag === 'gallery' && key === 'caption'
+            || tag === 'choose' && (key === 'before' || key === 'after')) {
             const newConfig = {
                 ...config,
                 excludes: [...config.excludes, 'heading', 'html', 'table', 'hr', 'list'],
@@ -219,7 +214,7 @@ class AttributeToken extends index_2.Token {
             valueToken = new atom_1.AtomToken(value, 'attr-value', config, accum, {});
         }
         super(undefined, config, accum);
-        this.type = type;
+        this.#type = type;
         this.append(keyToken, valueToken);
         this.#equal = equal;
         this.#quotes = [...quotes];
@@ -234,13 +229,13 @@ class AttributeToken extends index_2.Token {
         if (this.parentNode) {
             this.#tag = this.parentNode.name;
         }
-        this.setAttribute('name', this.firstChild.text().trim().toLowerCase());
+        this.setAttribute('name', this.firstChild.toString(true).trim().toLowerCase());
         super.afterBuild();
     }
     /** @private */
-    toString() {
+    toString(skip) {
         const [quoteStart = '', quoteEnd = ''] = this.#quotes;
-        return this.#equal ? super.toString(this.#equal + quoteStart) + quoteEnd : this.firstChild.toString();
+        return this.#equal ? super.toString(skip, this.#equal + quoteStart) + quoteEnd : this.firstChild.toString(skip);
     }
     /** @private */
     text() {
@@ -288,7 +283,7 @@ class AttributeToken extends index_2.Token {
         else if (name === 'style' && typeof value === 'string' && insecureStyle.test(value)) {
             errors.push((0, lint_1.generateForChild)(lastChild, rect, 'insecure-style', 'insecure style'));
         }
-        else if (name === 'tabindex' && typeof value === 'string' && value.trim() !== '0') {
+        else if (name === 'tabindex' && typeof value === 'string' && value !== '0') {
             const e = (0, lint_1.generateForChild)(lastChild, rect, 'illegal-attr', 'nonzero tabindex');
             e.suggestions = [
                 {
@@ -308,14 +303,7 @@ class AttributeToken extends index_2.Token {
     }
     /** 获取属性值 */
     getValue() {
-        if (this.#equal) {
-            const value = this.lastChild.text();
-            if (this.#quotes[1]) {
-                return value;
-            }
-            return value[this.#quotes[0] ? 'trimEnd' : 'trim']();
-        }
-        return this.type === 'ext-attr' || '';
+        return this.#equal ? this.lastChild.text().trim() : this.type === 'ext-attr' || '';
     }
 }
 exports.AttributeToken = AttributeToken;

package/dist/src/attributes.d.ts

@@ -11,12 +11,13 @@ declare type AttributesTypes = `${AttributeTypes}s`;
  * @classdesc `{childNodes: ...AtomToken|AttributeToken}`
  */
 export declare abstract class AttributesToken extends Token {
-    type: AttributesTypes;
+    #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;
+    get type(): AttributesTypes;
     /**
      * @param attr 标签属性
      * @param type 标签类型

package/dist/src/attributes.js

@@ -24,6 +24,10 @@ const toDirty = (type) => `${toAttributeType(type)}-dirty`;
  * @classdesc `{childNodes: ...AtomToken|AttributeToken}`
  */
 class AttributesToken extends index_2.Token {
+    #type;
+    get type() {
+        return this.#type;
+    }
     /**
      * @param attr 标签属性
      * @param type 标签类型
@@ -31,7 +35,7 @@ class AttributesToken extends index_2.Token {
      */
     constructor(attr, type, name, config = index_1.default.getConfig(), accum = []) {
         super(undefined, config, accum, {});
-        this.type = type;
+        this.#type = type;
         this.setAttribute('name', name);
         if (attr) {
             regex.lastIndex = 0;
@@ -119,7 +123,7 @@ class AttributesToken extends index_2.Token {
                     duplicated.add(name);
                     attrs.get(name).push(attr);
                 }
-                else if (name !== 'class') {
+                else {
                     attrs.set(name, [attr]);
                 }
             }

package/dist/src/converter.d.ts

@@ -7,10 +7,10 @@ import { ConverterRuleToken } from './converterRule';
  * @classdesc `{childNodes: [ConverterFlagsToken, ...ConverterRuleToken]}`
  */
 export declare abstract class ConverterToken extends Token {
-    readonly type = "converter";
-    readonly childNodes: readonly [ConverterFlagsToken, ...ConverterRuleToken[]];
+    readonly childNodes: readonly [ConverterFlagsToken, ConverterRuleToken, ...ConverterRuleToken[]];
     abstract get firstChild(): ConverterFlagsToken;
     abstract get lastChild(): ConverterFlagsToken | ConverterRuleToken;
+    get type(): 'converter';
     /**
      * @param flags 转换类型标记
      * @param rules 转换规则