wikilint 2.5.0 → 2.5.1

package/config/default.json

@@ -767,7 +767,7 @@
 			"EXPECTED_UNCONNECTED_PAGE"
 		]
 	],
-	"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:",
+	"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": [],
 	"img": {
 		"thumbnail": "thumbnail",

package/config/enwiki.json

@@ -369,7 +369,7 @@
 			"EXPECTED_UNCONNECTED_PAGE"
 		]
 	],
-	"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:",
+	"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": [],
 	"img": {
 		"thumbnail": "thumbnail",

package/config/llwiki.json

@@ -518,7 +518,7 @@
 			"静态重定向"
 		]
 	],
-	"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:",
+	"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": [],
 	"img": {
 		"thumbnail": "thumbnail",

package/config/minimum.json

@@ -66,8 +66,7 @@
 			"wbr",
 			"hr",
 			"meta",
-			"link",
-			"img"
+			"link"
 		]
 	],
 	"namespaces": {},
@@ -82,6 +81,7 @@
 			"#speciale": "speciale",
 			"#tag": "tag",
 			"#formatdate": "formatdate",
+			"#dateformat": "formatdate",
 			"#invoke": "invoke",
 			"#while": "while",
 			"#dowhile": "dowhile",
@@ -118,13 +118,10 @@
 		],
 		[
 			"msg",
-			"原始",
 			"raw"
 		],
 		[
-			"替代",
 			"subst",
-			"安全替代",
 			"safesubst"
 		]
 	],
@@ -132,7 +129,7 @@
 		[],
 		[]
 	],
-	"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:",
+	"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": [],
 	"img": {},
 	"variants": []

package/config/zhwiki.json

@@ -707,7 +707,7 @@
 			"EXPECTED_UNCONNECTED_PAGE"
 		]
 	],
-	"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:",
+	"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": [],
 	"img": {
 		"thumbnail": "thumbnail",

package/dist/base.d.ts

@@ -10,9 +10,10 @@ export interface Config {
     readonly variants: string[];
     readonly excludes?: string[];
 }
+export declare const rules: readonly ["bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext"];
 export declare namespace LintError {
     type Severity = 'error' | 'warning';
-    type Rule = 'bold-header' | 'format-leakage' | 'fostered-content' | 'h1' | 'illegal-attr' | 'insecure-style' | 'invalid-gallery' | 'invalid-imagemap' | 'invalid-invoke' | 'lonely-apos' | 'lonely-bracket' | 'lonely-http' | 'nested-link' | 'no-arg' | 'no-duplicate' | 'no-ignored' | 'obsolete-attr' | 'obsolete-tag' | 'parsing-order' | 'pipe-like' | 'table-layout' | 'tag-like' | 'unbalanced-header' | 'unclosed-comment' | 'unclosed-quote' | 'unclosed-table' | 'unescaped' | 'unknown-page' | 'unmatched-tag' | 'unterminated-url' | 'url-encoding' | 'var-anchor' | 'void-ext';
+    type Rule = typeof rules[number];
     interface Fix {
         readonly range: [number, number];
         text: string;
@@ -46,6 +47,7 @@ interface AstElement extends AstNode {
 export interface Parser {
     config: string | Config;
     i18n: string | Record<string, string> | undefined;
+    rules: readonly LintError.Rule[];
     /** 获取解析设置 */
     getConfig(): Config;
     /**

package/dist/base.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rules = void 0;
+exports.rules = [
+    'bold-header',
+    'format-leakage',
+    'fostered-content',
+    'h1',
+    'illegal-attr',
+    'insecure-style',
+    'invalid-gallery',
+    'invalid-imagemap',
+    'invalid-invoke',
+    'lonely-apos',
+    'lonely-bracket',
+    'lonely-http',
+    'nested-link',
+    'no-arg',
+    'no-duplicate',
+    'no-ignored',
+    'obsolete-attr',
+    'obsolete-tag',
+    'parsing-order',
+    'pipe-like',
+    'table-layout',
+    'tag-like',
+    'unbalanced-header',
+    'unclosed-comment',
+    'unclosed-quote',
+    'unclosed-table',
+    'unescaped',
+    'unknown-page',
+    'unmatched-tag',
+    'unterminated-url',
+    'url-encoding',
+    'var-anchor',
+    'void-ext',
+];

package/dist/index.js

@@ -2,6 +2,7 @@
 /* eslint n/exports-style: 0 */
 const fs = require("fs");
 const path = require("path");
+const base_1 = require("./base");
 const debug_1 = require("./util/debug");
 const constants_1 = require("./util/constants");
 const string_1 = require("./util/string");
@@ -15,6 +16,7 @@ const rootRequire = (file, dir) => require(file.startsWith('/') ? file : `../${f
 const Parser = {
     config: 'default',
     i18n: undefined,
+    rules: base_1.rules,
     /** @implements */
     getConfig() {
         if (typeof this.config === 'string') {

package/dist/parser/list.js

@@ -22,7 +22,8 @@ const parseList = (wikitext, config = index_1.default.getConfig(), accum = []) =
     if (!dt) {
         return text;
     }
-    let regex = /:+|-\{/gu, ex = regex.exec(text), lc = 0;
+    const { html: [normalTags] } = config, fullRegex = /:+|-\{|\0\d+x\x7F/gu;
+    let regex = fullRegex, ex = regex.exec(text), lt = 0, lc = 0;
     /**
      * 创建`DdToken`
      * @param syntax `:`
@@ -35,15 +36,7 @@ const parseList = (wikitext, config = index_1.default.getConfig(), accum = []) =
     };
     while (ex && dt) {
         const { 0: syntax, index } = ex;
-        if (syntax.startsWith(':')) {
-            if (syntax.length >= dt) {
-                return dd(syntax.slice(0, dt), index);
-            }
-            dt -= syntax.length;
-            regex.lastIndex = index + 4 + String(accum.length).length;
-            text = dd(syntax, index);
-        }
-        else if (syntax === '-{') {
+        if (syntax === '-{') {
             if (!lc) {
                 const { lastIndex } = regex;
                 regex = /-\{|\}-/gu;
@@ -51,14 +44,33 @@ const parseList = (wikitext, config = index_1.default.getConfig(), accum = []) =
             }
             lc++;
         }
-        else {
+        else if (syntax === '}-') {
             lc--;
             if (!lc) {
                 const { lastIndex } = regex;
-                regex = /:+|-\{/gu;
+                regex = fullRegex;
                 regex.lastIndex = lastIndex;
             }
         }
+        else if (syntax.startsWith('\0')) {
+            const { name, closing, selfClosing } = accum[Number(syntax.slice(1, -2))];
+            if (!selfClosing || normalTags.includes(name)) {
+                if (!closing) {
+                    lt++;
+                }
+                else if (lt) {
+                    lt--;
+                }
+            }
+        }
+        else if (lt === 0) { // syntax === ':'
+            if (syntax.length >= dt) {
+                return dd(syntax.slice(0, dt), index);
+            }
+            dt -= syntax.length;
+            regex.lastIndex = index + 4 + String(accum.length).length;
+            text = dd(syntax, index);
+        }
         ex = regex.exec(text);
     }
     return text;

package/dist/src/attribute.js

@@ -20,6 +20,7 @@ const commonHtmlAttrs = new Set([
     'aria-hidden',
     'aria-label',
     'aria-labelledby',
+    'aria-level',
     'aria-owns',
     'role',
     'about',
@@ -145,7 +146,7 @@ const commonHtmlAttrs = new Set([
     combobox: new Set(['placeholder', 'value', 'id', 'class', 'text', 'dropdown', 'style']),
 }, insecureStyle = new RegExp('expression'
     + '|'
-    + '(?:filter|accelerator|-o-link(?:-source)?|-o-replace)\\s*:'
+    + '(?:accelerator|-o-link(?:-source)?|-o-replace)\\s*:'
     + '|'
     + '(?:url|image(?:-set)?)\\s*\\('
     + '|'
@@ -270,7 +271,7 @@ class AttributeToken extends index_2.Token {
             if (lastChild.childNodes.some(child => child.type === 'text' && /\s/u.test(child.text()))) {
                 e.suggestions = [
                     {
-                        desc: 'quote',
+                        desc: 'close',
                         ...fix,
                     },
                 ];

package/dist/src/html.d.ts

@@ -13,6 +13,8 @@ export declare abstract class HtmlToken extends Token {
     readonly childNodes: readonly [AttributesToken];
     abstract get firstChild(): AttributesToken;
     abstract get lastChild(): AttributesToken;
+    /** 是否自封闭 */
+    get selfClosing(): boolean;
     /** 是否是闭合标签 */
     get closing(): boolean;
     /**

package/dist/src/html.js

@@ -41,6 +41,10 @@ class HtmlToken extends index_2.Token {
     #closing;
     #selfClosing;
     #tag;
+    /** 是否自封闭 */
+    get selfClosing() {
+        return this.#selfClosing;
+    }
     /** 是否是闭合标签 */
     get closing() {
         return this.#closing;
@@ -163,14 +167,14 @@ class HtmlToken extends index_2.Token {
      * @throws `SyntaxError` 未匹配的标签
      */
     findMatchingTag() {
-        const { html } = this.getAttribute('config'), { name: tagName, parentNode, closing } = this, string = (0, string_1.noWrap)(String(this));
-        if (closing && (this.#selfClosing || html[2].includes(tagName))) {
+        const { html: [normalTags, flexibleTags, voidTags] } = this.getAttribute('config'), { name: tagName, parentNode, closing } = this, string = (0, string_1.noWrap)(String(this));
+        if (closing && (this.#selfClosing || voidTags.includes(tagName))) {
             throw new SyntaxError(`tag that is both closing and self-closing: ${string}`);
         }
-        else if (html[2].includes(tagName) || this.#selfClosing && html[1].includes(tagName)) { // 自封闭标签
+        else if (voidTags.includes(tagName) || this.#selfClosing && flexibleTags.includes(tagName)) { // 自封闭标签
             return this;
         }
-        else if (this.#selfClosing && html[0].includes(tagName)) {
+        else if (this.#selfClosing && normalTags.includes(tagName)) {
             throw new SyntaxError(`invalid self-closing tag: ${string}`);
         }
         else if (!parentNode) {

package/dist/src/tagPair/include.js

@@ -26,10 +26,13 @@ class IncludeToken extends (0, hidden_1.hiddenToken)(index_2.TagPairToken) {
             return [];
         }
         const e = (0, lint_1.generateForSelf)(this, { start }, 'unclosed-comment', index_1.default.msg('unclosed $1', `<${this.name}>`));
-        e.fix = {
-            range: [e.endIndex, e.endIndex],
-            text: `</${this.name}>`,
-        };
+        e.suggestions = [
+            {
+                desc: 'close',
+                range: [e.endIndex, e.endIndex],
+                text: `</${this.name}>`,
+            },
+        ];
         return [e];
     }
 }

package/dist/util/string.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.noWrap = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = void 0;
-exports.extUrlCharFirst = '(?:\\[[\\da-f:.]+\\]|[^[\\]<>"\0-\x1F\x7F\\p{Zs}\uFFFD])';
-exports.extUrlChar = '(?:[^[\\]<>"\0-\x1F\x7F\\p{Zs}\uFFFD]|\0\\d+[c!~]\x7F)*';
+const commonExtUrlChar = '[^[\\]<>"\0-\x1F\x7F\\p{Zs}\uFFFD]';
+exports.extUrlCharFirst = `(?:\\[[\\da-f:.]+\\]|${commonExtUrlChar})`;
+exports.extUrlChar = `(?:${commonExtUrlChar}|\0\\d+[c!~]\x7F)*`;
 /**
  * 生成正则替换函数
  * @param regex 正则表达式

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.5.0",
+	"version": "2.5.1",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -33,7 +33,7 @@
 	},
 	"scripts": {
 		"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",
+		"prepublishOnly": "npm run build && rm dist/internal.js dist/[bmpu]*/*.d.ts",
 		"build": "bash build.sh",
 		"diff": "bash diff.sh",
 		"diff:stat": "f() { git diff --stat --ignore-all-space --color=always $1 $2 -- . ':!extensions/' ':!bin/' | grep '\\.ts'; }; f",