wikiparser-node 1.5.0 → 1.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": [
 		"acronym",
 		"advisory",

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": [
 		"arxiv",
 		"aswiki",

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": [
 		"acronym",
 		"advisory",

package/dist/base.d.ts

@@ -13,9 +13,10 @@ export interface Config {
     readonly conversionTable?: [string, string][];
     readonly redirects?: [string, 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;
@@ -58,6 +59,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

@@ -3,6 +3,7 @@
 const fs = require("fs");
 const path = require("path");
 const chalk = require("chalk");
+const base_1 = require("./base");
 const debug_1 = require("./util/debug");
 const constants_1 = require("./util/constants");
 const string_1 = require("./util/string");
@@ -17,6 +18,7 @@ const rootRequire = (file, dir) => require(file.startsWith('/') ? file : `../${f
 const Parser = {
     config: 'default',
     i18n: undefined,
+    rules: base_1.rules,
     /* NOT FOR BROWSER */
     conversionTable: new Map(),
     redirects: new Map(),

package/dist/lib/element.js

@@ -413,7 +413,7 @@ class AstElement extends node_1.AstNode {
                         return this.#isProtected() === false;
                     default: {
                         const [t, n] = selector.split('#');
-                        return (!t || t === type || Boolean(constants_1.typeAliases[type]?.includes(t))) && (!n || n === name);
+                        return (!t || t === type) && (!n || n === name);
                     }
                 }
             }

package/dist/parser/list.js

@@ -23,7 +23,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 `:`
@@ -36,15 +37,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;
@@ -52,14 +45,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

@@ -59,6 +59,7 @@ const commonHtmlAttrs = new Set([
     'aria-hidden',
     'aria-label',
     'aria-labelledby',
+    'aria-level',
     'aria-owns',
     'role',
     'about',
@@ -184,7 +185,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*\\('
     + '|'
@@ -356,7 +357,7 @@ let AttributeToken = (() => {
                 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

@@ -19,12 +19,12 @@ export declare abstract class HtmlToken extends Token {
     abstract get children(): [AttributesToken];
     abstract get firstElementChild(): AttributesToken;
     abstract get lastElementChild(): AttributesToken;
+    /** 是否自封闭 */
+    get selfClosing(): boolean;
     /** 是否是闭合标签 */
     get closing(): boolean;
     /** @throws `Error` 自封闭标签或空标签 */
     set closing(value: boolean);
-    /** 是否自封闭 */
-    get selfClosing(): boolean;
     /** @throws `Error` 闭合标签或无效自封闭标签 */
     set selfClosing(value: boolean);
     /**

package/dist/src/html.js

@@ -95,6 +95,10 @@ let HtmlToken = (() => {
         #selfClosing;
         #tag;
         /* NOT FOR BROWSER END */
+        /** 是否自封闭 */
+        get selfClosing() {
+            return this.#selfClosing;
+        }
         /** 是否是闭合标签 */
         get closing() {
             return this.#closing;
@@ -115,10 +119,6 @@ let HtmlToken = (() => {
             }
             this.#closing = true;
         }
-        /** 是否自封闭 */
-        get selfClosing() {
-            return this.#selfClosing;
-        }
         /** @throws `Error` 闭合标签或无效自封闭标签 */
         set selfClosing(value) {
             if (!value) {
@@ -265,14 +265,14 @@ let HtmlToken = (() => {
          * @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) {
@@ -332,8 +332,8 @@ let HtmlToken = (() => {
          * @throws `Error` 无法修复无效自封闭标签
          */
         fix() {
-            const config = this.getAttribute('config'), { parentNode, name: tagName, firstChild, selfClosing } = this;
-            if (!parentNode || !selfClosing || !config.html[0].includes(tagName)) {
+            const { html: [normalTags] } = this.getAttribute('config'), { parentNode, name: tagName, firstChild, selfClosing } = this;
+            if (!parentNode || !selfClosing || !normalTags.includes(tagName)) {
                 return;
             }
             else if (firstChild.text().trim()) {

package/dist/src/tagPair/include.js

@@ -42,10 +42,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];
     }
     /* NOT FOR BROWSER */

package/dist/util/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promises = exports.typeAliases = exports.aliases = exports.parsers = exports.mixins = exports.classes = exports.BuildMethod = exports.MAX_STAGE = void 0;
+exports.promises = exports.aliases = exports.parsers = exports.mixins = exports.classes = exports.BuildMethod = exports.MAX_STAGE = void 0;
 exports.MAX_STAGE = 11;
 var BuildMethod;
 (function (BuildMethod) {
@@ -25,89 +25,4 @@ exports.aliases = [
     ['ListToken', 'DdToken'],
     ['ConverterToken'],
 ];
-exports.typeAliases = {
-    text: ['string', 'str'],
-    plain: ['regular', 'normal'],
-    root: undefined,
-    // comment and extension
-    onlyinclude: ['only-include'],
-    noinclude: ['no-include'],
-    include: ['includeonly', 'include-only'],
-    comment: undefined,
-    ext: ['extension'],
-    'ext-attrs': ['extension-attrs', 'ext-attributes', 'extension-attributes'],
-    'ext-attr-dirty': ['extension-attr-dirty', 'ext-attribute-dirty', 'extension-attribute-dirty'],
-    'ext-attr': ['extension-attr', 'ext-attribute', 'extension-attribute'],
-    'attr-key': ['attribute-key'],
-    'attr-value': ['attribute-value', 'attr-val', 'attribute-val'],
-    'ext-inner': ['extension-inner'],
-    // triple braces
-    arg: ['argument'],
-    'arg-name': ['argument-name'],
-    'arg-default': ['argument-default'],
-    hidden: ['arg-redundant'],
-    // double braces
-    'magic-word': ['parser-function', 'parser-func'],
-    'magic-word-name': ['parser-function-name', 'parser-func-name'],
-    'invoke-function': ['invoke-func', 'lua-function', 'lua-func', 'module-function', 'module-func'],
-    'invoke-module': ['lua-module'],
-    template: undefined,
-    'template-name': undefined,
-    parameter: ['param'],
-    'parameter-key': ['param-key'],
-    'parameter-value': ['parameter-val', 'param-value', 'param-val'],
-    // heading
-    heading: ['header'],
-    'heading-title': ['header-title'],
-    'heading-trail': ['header-trail'],
-    // html
-    html: undefined,
-    'html-attrs': ['html-attributes'],
-    'html-attr-dirty': ['html-attribute-dirty'],
-    'html-attr': ['html-attribute'],
-    // table
-    table: undefined,
-    tr: ['table-row'],
-    td: ['table-cell', 'table-data'],
-    'table-syntax': undefined,
-    'table-attrs': ['tr-attrs', 'td-attrs', 'table-attributes', 'tr-attributes', 'td-attributes'],
-    'table-attr-dirty': ['tr-attr-dirty', 'td-attr-dirty', 'table-attribute-dirty', 'tr-attribute-dirty', 'td-attribute-dirty'],
-    'table-attr': ['tr-attr', 'td-attr', 'table-attribute', 'tr-attribute', 'td-attribute'],
-    'table-inter': undefined,
-    'td-inner': ['table-cell-inner', 'table-data-inner'],
-    // hr and double-underscore
-    hr: ['horizontal'],
-    'double-underscore': ['underscore', 'behavior-switch', 'behaviour-switch'],
-    // link
-    link: ['wikilink'],
-    'link-target': ['wikilink-target'],
-    'link-text': ['wikilink-text'],
-    category: ['category-link', 'cat', 'cat-link'],
-    file: ['file-link', 'image', 'image-link', 'img', 'img-link'],
-    'gallery-image': ['gallery-file', 'gallery-img'],
-    'imagemap-image': ['imagemap-file', 'imagemap-img', 'image-map-image', 'image-map-file', 'image-map-img'],
-    'image-parameter': ['img-parameter', 'image-param', 'img-param'],
-    // quotes
-    quote: ['quotes', 'quot', 'apostrophe', 'apostrophes', 'apos'],
-    // external link
-    'ext-link': ['external-link'],
-    'ext-link-text': ['external-link-text'],
-    'ext-link-url': ['external-link-url'],
-    // magic link
-    'free-ext-link': ['free-external-link', 'magic-link'],
-    // list
-    list: ['ol', 'ordered-list', 'ul', 'unordered-list', 'dl', 'description-list'],
-    dd: ['indent', 'indentation'],
-    // converter
-    converter: ['convert', 'conversion'],
-    'converter-flags': ['convert-flags', 'conversion-flags'],
-    'converter-flag': ['convert-flag', 'conversion-flag'],
-    'converter-rule': ['convert-rule', 'conversion-rule'],
-    'converter-rule-variant': ['convert-rule-variant', 'conversion-rule-variant'],
-    'converter-rule-to': ['convert-rule-to', 'conversion-rule-to', 'converter-rule-noconvert'],
-    'converter-rule-from': ['convert-rule-from', 'conversion-rule-from'],
-    // specific extensions
-    'param-line': ['parameter-line'],
-    'imagemap-link': ['image-map-link'],
-};
 exports.promises = [Promise.resolve()];

package/dist/util/string.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSpace = exports.print = 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": "wikiparser-node",
-	"version": "1.5.0",
+	"version": "1.5.1",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -29,7 +29,7 @@
 	"scripts": {
 		"toc": "node ./dist/bin/toc.js",
 		"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/[pu]*/*.d.ts",
+		"prepublishOnly": "npm run build && rm dist/internal.js dist/[pu]*/*.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",