wikilint 2.11.1 → 2.12.4

package/config/.schema.json

@@ -45,7 +45,7 @@
 		},
 		"parserFunction": {
 			"type": "array",
-			"items": [
+			"prefixItems": [
 				{
 					"description": "case-insensitive parser functions",
 					"type": "object",
@@ -93,14 +93,31 @@
 		"doubleUnderscore": {
 			"description": "behavior switches",
 			"type": "array",
-			"items": {
-				"type": "array",
-				"items": {
-					"type": "string"
+			"prefixItems": [
+				{
+					"description": "case-insensitive behavior switches",
+					"type": "array",
+					"items": {
+						"type": "string"
+					}
+				},
+				{
+					"description": "case-sensitive behavior switches",
+					"type": "array",
+					"items": {
+						"type": "string"
+					}
+				},
+				{
+					"description": "case-insensitive behavior switches",
+					"type": "object",
+					"additionalProperties": {
+						"type": "string"
+					}
 				}
-			},
+			],
 			"minItems": 2,
-			"maxItems": 2
+			"maxItems": 3
 		},
 		"protocol": {
 			"description": "external link protocols",

package/config/default.json

@@ -702,7 +702,10 @@
 			"CONTENTLANGUAGE",
 			"CONTENTLANG",
 			"PAGELANGUAGE",
-			"="
+			"=",
+			"#FORMAL",
+			"#timef",
+			"#timefl"
 		],
 		[
 			"msg",
@@ -717,34 +720,7 @@
 		]
 	],
 	"doubleUnderscore": [
-		[
-			"forcetoc",
-			"强显目录",
-			"強制目錄",
-			"nocc",
-			"nocontentconvert",
-			"不转换内容",
-			"不轉換內容",
-			"noeditsection",
-			"无段落编辑",
-			"无编辑段落",
-			"無段落編輯",
-			"nogallery",
-			"无图库",
-			"無圖庫",
-			"notc",
-			"notitleconvert",
-			"不转换标题",
-			"不轉換標題",
-			"notoc",
-			"无目录",
-			"無目錄",
-			"toc",
-			"目录",
-			"目錄",
-			"archivedtalk",
-			"notalk"
-		],
+		[],
 		[
 			"EXPECTUNUSEDCATEGORY",
 			"DISAMBIG",
@@ -765,7 +741,35 @@
 			"靜態重新導向",
 			"NOGLOBAL",
 			"EXPECTED_UNCONNECTED_PAGE"
-		]
+		],
+		{
+			"forcetoc": "forcetoc",
+			"强显目录": "forcetoc",
+			"強制目錄": "forcetoc",
+			"nocc": "nocontentconvert",
+			"nocontentconvert": "nocontentconvert",
+			"不转换内容": "nocontentconvert",
+			"不轉換內容": "nocontentconvert",
+			"noeditsection": "noeditsection",
+			"无段落编辑": "noeditsection",
+			"无编辑段落": "noeditsection",
+			"無段落編輯": "noeditsection",
+			"nogallery": "nogallery",
+			"无图库": "nogallery",
+			"無圖庫": "nogallery",
+			"notc": "notitleconvert",
+			"notitleconvert": "notitleconvert",
+			"不转换标题": "notitleconvert",
+			"不轉換標題": "notitleconvert",
+			"notoc": "notoc",
+			"无目录": "notoc",
+			"無目錄": "notoc",
+			"toc": "toc",
+			"目录": "toc",
+			"目錄": "toc",
+			"archivedtalk": "archivedtalk",
+			"notalk": "notalk"
+		}
 	],
 	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|worldwind://|xmpp:",
 	"interwiki": [],

package/config/enwiki.json

@@ -331,7 +331,10 @@
 			"CONTENTLANGUAGE",
 			"CONTENTLANG",
 			"PAGELANGUAGE",
-			"="
+			"=",
+			"#FORMAL",
+			"#timef",
+			"#timefl"
 		],
 		[
 			"msg",
@@ -343,19 +346,7 @@
 		]
 	],
 	"doubleUnderscore": [
-		[
-			"forcetoc",
-			"nocc",
-			"nocontentconvert",
-			"noeditsection",
-			"nogallery",
-			"notc",
-			"notitleconvert",
-			"notoc",
-			"toc",
-			"archivedtalk",
-			"notalk"
-		],
+		[],
 		[
 			"EXPECTUNUSEDCATEGORY",
 			"DISAMBIG",
@@ -367,7 +358,20 @@
 			"STATICREDIRECT",
 			"NOGLOBAL",
 			"EXPECTED_UNCONNECTED_PAGE"
-		]
+		],
+		{
+			"forcetoc": "forcetoc",
+			"nocc": "nocontentconvert",
+			"nocontentconvert": "nocontentconvert",
+			"noeditsection": "noeditsection",
+			"nogallery": "nogallery",
+			"notc": "notitleconvert",
+			"notitleconvert": "notitleconvert",
+			"notoc": "notoc",
+			"toc": "toc",
+			"archivedtalk": "archivedtalk",
+			"notalk": "notalk"
+		}
 	],
 	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|worldwind://|xmpp:",
 	"interwiki": [],

package/config/llwiki.json

@@ -483,25 +483,7 @@
 		]
 	],
 	"doubleUnderscore": [
-		[
-			"forcetoc",
-			"强显目录",
-			"nocc",
-			"nocontentconvert",
-			"不转换内容",
-			"noeditsection",
-			"无段落编辑",
-			"无编辑段落",
-			"nogallery",
-			"无图库",
-			"notc",
-			"notitleconvert",
-			"不转换标题",
-			"notoc",
-			"无目录",
-			"toc",
-			"目录"
-		],
+		[],
 		[
 			"EXPECTUNUSEDCATEGORY",
 			"HIDDENCAT",
@@ -516,7 +498,26 @@
 			"无新段落链接",
 			"STATICREDIRECT",
 			"静态重定向"
-		]
+		],
+		{
+			"forcetoc": "forcetoc",
+			"强显目录": "forcetoc",
+			"nocc": "nocontentconvert",
+			"nocontentconvert": "nocontentconvert",
+			"不转换内容": "nocontentconvert",
+			"noeditsection": "noeditsection",
+			"无段落编辑": "noeditsection",
+			"无编辑段落": "noeditsection",
+			"nogallery": "nogallery",
+			"无图库": "nogallery",
+			"notc": "notitleconvert",
+			"notitleconvert": "notitleconvert",
+			"不转换标题": "notitleconvert",
+			"notoc": "notoc",
+			"无目录": "notoc",
+			"toc": "toc",
+			"目录": "toc"
+		}
 	],
 	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|worldwind://|xmpp:",
 	"interwiki": [],

package/config/minimum.json

@@ -114,7 +114,10 @@
 		},
 		[
 			"!",
-			"="
+			"=",
+			"#FORMAL",
+			"#timef",
+			"#timefl"
 		],
 		[
 			"msg",

package/config/moegirl.json

@@ -575,25 +575,7 @@
 		]
 	],
 	"doubleUnderscore": [
-		[
-			"forcetoc",
-			"强显目录",
-			"nocc",
-			"nocontentconvert",
-			"不转换内容",
-			"noeditsection",
-			"无段落编辑",
-			"无编辑段落",
-			"nogallery",
-			"无图库",
-			"notc",
-			"notitleconvert",
-			"不转换标题",
-			"notoc",
-			"无目录",
-			"toc",
-			"目录"
-		],
+		[],
 		[
 			"DISAMBIG",
 			"消除歧义",
@@ -609,7 +591,26 @@
 			"无新段落链接",
 			"STATICREDIRECT",
 			"静态重定向"
-		]
+		],
+		{
+			"forcetoc": "forcetoc",
+			"强显目录": "forcetoc",
+			"nocc": "nocontentconvert",
+			"nocontentconvert": "nocontentconvert",
+			"不转换内容": "nocontentconvert",
+			"noeditsection": "noeditsection",
+			"无段落编辑": "noeditsection",
+			"无编辑段落": "noeditsection",
+			"nogallery": "nogallery",
+			"无图库": "nogallery",
+			"notc": "notitleconvert",
+			"notitleconvert": "notitleconvert",
+			"不转换标题": "notitleconvert",
+			"notoc": "notoc",
+			"无目录": "notoc",
+			"toc": "toc",
+			"目录": "toc"
+		}
 	],
 	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|worldwind://|xmpp:",
 	"interwiki": [],

package/config/zhwiki.json

@@ -644,7 +644,10 @@
 			"CONTENTLANGUAGE",
 			"CONTENTLANG",
 			"PAGELANGUAGE",
-			"="
+			"=",
+			"#FORMAL",
+			"#timef",
+			"#timefl"
 		],
 		[
 			"msg",
@@ -659,32 +662,7 @@
 		]
 	],
 	"doubleUnderscore": [
-		[
-			"forcetoc",
-			"强显目录",
-			"強制目錄",
-			"nocc",
-			"nocontentconvert",
-			"不转换内容",
-			"不轉換內容",
-			"noeditsection",
-			"无段落编辑",
-			"无编辑段落",
-			"無段落編輯",
-			"nogallery",
-			"无图库",
-			"無圖庫",
-			"notc",
-			"notitleconvert",
-			"不转换标题",
-			"不轉換標題",
-			"notoc",
-			"无目录",
-			"無目錄",
-			"toc",
-			"目录",
-			"目錄"
-		],
+		[],
 		[
 			"EXPECTUNUSEDCATEGORY",
 			"DISAMBIG",
@@ -705,7 +683,33 @@
 			"靜態重新導向",
 			"NOGLOBAL",
 			"EXPECTED_UNCONNECTED_PAGE"
-		]
+		],
+		{
+			"forcetoc": "forcetoc",
+			"强显目录": "forcetoc",
+			"強制目錄": "forcetoc",
+			"nocc": "nocontentconvert",
+			"nocontentconvert": "nocontentconvert",
+			"不转换内容": "nocontentconvert",
+			"不轉換內容": "nocontentconvert",
+			"noeditsection": "noeditsection",
+			"无段落编辑": "noeditsection",
+			"无编辑段落": "noeditsection",
+			"無段落編輯": "noeditsection",
+			"nogallery": "nogallery",
+			"无图库": "nogallery",
+			"無圖庫": "nogallery",
+			"notc": "notitleconvert",
+			"notitleconvert": "notitleconvert",
+			"不转换标题": "notitleconvert",
+			"不轉換標題": "notitleconvert",
+			"notoc": "notoc",
+			"无目录": "notoc",
+			"無目錄": "notoc",
+			"toc": "toc",
+			"目录": "toc",
+			"目錄": "toc"
+		}
 	],
 	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|worldwind://|xmpp:",
 	"interwiki": [],

package/dist/base.d.ts

@@ -4,7 +4,7 @@ export interface Config {
     readonly namespaces: Record<string, string>;
     readonly nsid: Record<string, number>;
     readonly parserFunction: [Record<string, string>, string[], string[], string[]];
-    readonly doubleUnderscore: [string[], string[]];
+    readonly doubleUnderscore: [string[], string[], Record<string, string>?];
     readonly protocol: string;
     readonly img: Record<string, string>;
     readonly redirection: string[];

package/dist/index.js

@@ -6,6 +6,8 @@ const base_1 = require("./base");
 const debug_1 = require("./util/debug");
 const constants_1 = require("./util/constants");
 const string_1 = require("./util/string");
+/* NOT FOR BROWSER */
+const diff_1 = require("./util/diff");
 /**
  * 从根路径require
  * @param file 文件名
@@ -22,6 +24,13 @@ const Parser = {
             this.config = rootRequire(this.config, 'config');
             return this.getConfig();
         }
+        const { doubleUnderscore } = this.config;
+        if (doubleUnderscore.length === 2) {
+            (0, diff_1.error)(`The schema (${path.resolve(__dirname, '..', 'config', '.schema.json')}) of parser configuration is updated.`);
+        }
+        else if (doubleUnderscore[0].length === 0) {
+            doubleUnderscore[0] = Object.keys(doubleUnderscore[2]);
+        }
         return {
             ...this.config,
             excludes: [],
@@ -52,7 +61,13 @@ const Parser = {
                 for (const key of ['main', 'fragment']) {
                     const str = t[key];
                     if (str?.includes('\0')) {
-                        t[key] = root.buildFromStr(str, constants_1.BuildMethod.Text);
+                        const s = root.buildFromStr(str, constants_1.BuildMethod.Text);
+                        if (key === 'main') {
+                            t.main = s;
+                        }
+                        else {
+                            t.setFragment(s);
+                        }
                     }
                 }
                 return t;

package/dist/lib/element.js

@@ -8,10 +8,10 @@ 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));
-};
+const getCondition = (selector) => (({ type, name }) => selector.split(',').some(str => {
+    const [t, ...ns] = str.trim().split('#');
+    return (!t || t === type) && ns.every(n => n === name);
+}));
 /** 类似HTMLElement */
 class AstElement extends node_1.AstNode {
     /** 子节点总数 */

package/dist/lib/text.js

@@ -89,6 +89,7 @@ class AstText extends node_1.AstNode {
         }
         errorRegex ??= type === 'free-ext-link'
             || type === 'ext-link-url'
+            || type === 'ext-link-text'
             || type === 'image-parameter' && name === 'link'
             || isHtmlAttrVal
             ? errorSyntaxUrl

package/dist/lib/title.d.ts

@@ -2,10 +2,12 @@ import type { Config } from '../base';
 /** MediaWiki页面标题对象 */
 export declare class Title {
     #private;
-    ns: number;
-    fragment: string | undefined;
     interwiki: string;
     readonly valid: boolean;
+    /** 命名空间 */
+    get ns(): number;
+    /** 片段标识符 */
+    get fragment(): string | undefined;
     /** 不含命名空间的标题主体部分 */
     get main(): string;
     set main(title: string);
@@ -24,4 +26,6 @@ export declare class Title {
      * @param selfLink 是否允许selfLink
      */
     constructor(title: string, defaultNs: number, config: Config, decode: boolean, selfLink: boolean);
+    /** 检测是否是重定向 */
+    getRedirection(): [boolean, string];
 }

package/dist/lib/title.js

@@ -6,12 +6,20 @@ const string_1 = require("../util/string");
 class Title {
     #main;
     #namespaces;
-    ns;
-    fragment;
+    #ns;
+    #fragment;
     interwiki = '';
     valid;
     /** @private */
     encoded = false;
+    /** 命名空间 */
+    get ns() {
+        return this.#ns;
+    }
+    /** 片段标识符 */
+    get fragment() {
+        return this.#fragment;
+    }
     /** 不含命名空间的标题主体部分 */
     get main() {
         return this.#main;
@@ -27,10 +35,7 @@ class Title {
     }
     /** 完整标题 */
     get title() {
-        const prefix = this.interwiki + (this.interwiki && ':') + this.prefix;
-        // eslint-disable-next-line prefer-const
-        let title = (prefix + this.main).replace(/ /gu, '_');
-        return title;
+        return this.getRedirection()[1];
     }
     /** 扩展名 */
     get extension() {
@@ -58,7 +63,7 @@ class Title {
         }
         title = title.replace(/[_ ]+/gu, ' ').trim();
         if (subpage) {
-            this.ns = 0;
+            this.#ns = 0;
         }
         else {
             let ns = defaultNs;
@@ -74,7 +79,7 @@ class Title {
                     title = m.slice(1).join(':').trim();
                 }
             }
-            this.ns = ns;
+            this.#ns = ns;
         }
         const i = title.indexOf('#');
         if (i !== -1) {
@@ -85,10 +90,11 @@ class Title {
                 }
                 catch { }
             }
-            this.fragment = fragment;
+            this.#fragment = fragment.replace(/ /gu, '_');
             title = title.slice(0, i).trim();
         }
-        this.valid = Boolean(title || this.interwiki || selfLink && this.ns === 0 && this.fragment !== undefined)
+        this.valid = Boolean(title || this.interwiki || selfLink && this.ns === 0 && this.#fragment !== undefined)
+            && (0, string_1.decodeHtml)(title) === title
             && !/^:|\0\d+[eh!+-]\x7F|[<>[\]{}|\n]|%[\da-f]{2}|(?:^|\/)\.{1,2}(?:$|\/)/iu.test(subpage ? /^(?:\.\.\/)+(.*)/u.exec(title)[1] : title);
         this.main = title;
         Object.defineProperties(this, {
@@ -97,10 +103,21 @@ class Title {
         this.#namespaces = config.namespaces;
     }
     /** @private */
-    toString() {
-        return `${this.title}${this.fragment === undefined
+    toString(display) {
+        return `${display ? this.title.replace(/_/gu, ' ') : this.title}${this.#fragment === undefined
             ? ''
-            : `#${this.fragment}`}`;
+            : `#${this.#fragment}`}`;
+    }
+    /** 检测是否是重定向 */
+    getRedirection() {
+        const prefix = this.interwiki + (this.interwiki && ':') + this.prefix;
+        // eslint-disable-next-line prefer-const
+        let title = (prefix + this.main).replace(/ /gu, '_');
+        return [false, title];
+    }
+    /** @private */
+    setFragment(fragment) {
+        this.#fragment = fragment;
     }
 }
 exports.Title = Title;

package/dist/parser/braces.js

@@ -6,7 +6,7 @@ const heading_1 = require("../src/heading");
 const transclude_1 = require("../src/transclude");
 const arg_1 = require("../src/arg");
 const closes = {
-    '=': '\n',
+    '=': String.raw `\n(?!(?:[^\S\n]|\0\d+[cn]\x7F)*\n)`,
     '{': String.raw `\}{2,}|\|`,
     '-': String.raw `\}-`,
     '[': String.raw `\]\]`,
@@ -19,7 +19,7 @@ const closes = {
  * @throws TranscludeToken.constructor()
  */
 const parseBraces = (wikitext, config, accum) => {
-    const source = String.raw `${config.excludes?.includes('heading') ? '' : String.raw `^(\0\d+c\x7F)*={1,6}|`}\[\[|-\{(?!\{)`, openBraces = String.raw `|\{{2,}`, { parserFunction: [, , , subst] } = config, stack = [];
+    const source = String.raw `${config.excludes?.includes('heading') ? '' : String.raw `^((?:\0\d+[cno]\x7F)*)={1,6}|`}\[\[|-\{(?!\{)`, openBraces = String.raw `|\{{2,}`, { parserFunction: [, , , subst] } = config, stack = [];
     wikitext = wikitext.replace(re, (m, p1) => {
         // @ts-expect-error abstract class
         new transclude_1.TranscludeToken(m.slice(2, -2), [], config, accum);
@@ -49,7 +49,7 @@ const parseBraces = (wikitext, config, accum) => {
             lastIndex = curIndex + 1;
             const { pos, findEqual } = stack[stack.length - 1] ?? {};
             if (pos === undefined || findEqual || (0, string_1.removeComment)(wikitext.slice(pos, index)) !== '') {
-                const rmt = /^(={1,6})(.+)\1((?:\s|\0\d+c\x7F)*)$/u
+                const rmt = /^(={1,6})(.+)\1((?:\s|\0\d+[cn]\x7F)*)$/u
                     .exec(wikitext.slice(index, curIndex));
                 if (rmt) {
                     wikitext = `${wikitext.slice(0, index)}\0${accum.length}h\x7F${wikitext.slice(curIndex)}`;
@@ -94,7 +94,7 @@ const parseBraces = (wikitext, config, accum) => {
                         ch = 'm';
                     }
                     else if (/^#vardefine:./iu.test(name)) {
-                        ch = 'c';
+                        ch = 'n';
                     }
                 }
                 catch (e) {

package/dist/parser/commentAndExt.js

@@ -31,7 +31,7 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
             const noinclude = (text) => {
                 // @ts-expect-error abstract class
                 new noinclude_1.NoincludeToken(text, config, accum);
-                str += `\0${accum.length - 1}c\x7F`;
+                str += `\0${accum.length - 1}n\x7F`;
             };
             while (i !== -1 && j !== -1) {
                 const token = `\0${accum.length}e\x7F`;
@@ -51,12 +51,15 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
     }
     const ext = config.ext.join('|'), noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly', regex = new RegExp(String.raw `<!--.*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${ext})(\s[^>]*?)?(?:/>|>(.*?)</(\1\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>(.*?)(?:</(${includeRegex}\s*)>|$))`, 'gisu');
     return wikitext.replace(regex, (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {
-        const str = `\0${accum.length}${name ? 'e' : 'c'}\x7F`;
+        const l = accum.length;
+        let ch = 'n';
         if (name) {
+            ch = 'e';
             // @ts-expect-error abstract class
             new ext_1.ExtToken(name, attr, inner, closing, config, accum);
         }
         else if (substr.startsWith('<!--')) {
+            ch = 'c';
             const closed = substr.endsWith('-->');
             // @ts-expect-error abstract class
             new comment_1.CommentToken(substr.slice(4, closed ? -3 : undefined), closed, config, accum);
@@ -69,7 +72,7 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
             // @ts-expect-error abstract class
             new noinclude_1.NoincludeToken(substr, config, accum);
         }
-        return str;
+        return `\0${l}${ch}\x7F`;
     });
 };
 exports.parseCommentAndExt = parseCommentAndExt;

package/dist/parser/converter.js

@@ -9,7 +9,7 @@ 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+c\x7F)*$)`, 'u'), stack = [];
+    const variants = `(?:${config.variants.join('|')})`, regex1 = /-\{/gu, regex2 = /-\{|\}-/gu, regex3 = new RegExp(String.raw `;(?=(?:[^;]*?=>)?\s*${variants}\s*:|(?:\s|\0\d+[cn]\x7F)*$)`, 'u'), stack = [];
     let regex = regex1, mt = regex.exec(text);
     while (mt) {
         const { 0: syntax, index } = mt;