wikilint 2.3.4 → 2.3.5

package/dist/lib/element.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstElement = void 0;
 const string_1 = require("../util/string");
+const debug_1 = require("../util/debug");
 const node_1 = require("./node");
 /** 类似HTMLElement */
 class AstElement extends node_1.AstNode {
@@ -38,8 +39,7 @@ class AstElement extends node_1.AstNode {
      * @param i 移除位置
      */
     removeAt(i) {
-        const { childNodes } = this, [node] = childNodes.splice(i, 1);
-        return node;
+        return (0, debug_1.setChildNodes)(this, i, 1)[0];
     }
     /**
      * 插入子节点
@@ -47,9 +47,7 @@ class AstElement extends node_1.AstNode {
      * @param i 插入位置
      */
     insertAt(node, i = this.length) {
-        const { childNodes } = this;
-        node.setAttribute('parentNode', this);
-        childNodes.splice(i, 0, node);
+        (0, debug_1.setChildNodes)(this, i, 0, [node]);
         return node;
     }
     /**

package/dist/parser/braces.js

@@ -24,6 +24,13 @@ const parseBraces = (wikitext, config = Parser.getConfig(), accum = []) => {
             mt.index += length;
         }
         const { 0: syntax, index: curIndex } = mt ?? { 0: '\n', index: wikitext.length }, top = stack.pop() ?? {}, { 0: open, index, parts, findEqual: topFindEqual, pos: topPos } = top, innerEqual = syntax === '=' && topFindEqual;
+        /**
+         * 填入模板内容
+         * @param text wikitext全文
+         */
+        const push = (text) => {
+            parts.at(-1).push(text.slice(topPos, curIndex));
+        };
         if (syntax === ']]' || syntax === '}-') { // 情形1：闭合内链或转换
             lastIndex = curIndex + 2;
         }
@@ -42,7 +49,7 @@ const parseBraces = (wikitext, config = Parser.getConfig(), accum = []) => {
         }
         else if (syntax === '|' || innerEqual) { // 情形3：模板内部，含行首单个'='
             lastIndex = curIndex + 1;
-            parts.at(-1).push(wikitext.slice(topPos, curIndex));
+            push(wikitext);
             if (syntax === '|') {
                 parts.push([]);
             }
@@ -53,7 +60,7 @@ const parseBraces = (wikitext, config = Parser.getConfig(), accum = []) => {
         else if (syntax.startsWith('}}')) { // 情形4：闭合模板
             const close = syntax.slice(0, Math.min(open.length, 3)), rest = open.length - close.length, { length } = accum;
             lastIndex = curIndex + close.length; // 这不是最终的lastIndex
-            parts.at(-1).push(wikitext.slice(topPos, curIndex));
+            push(wikitext);
             let skip = false, ch = 't';
             if (close.length === 3) {
                 const argParts = parts.map(part => part.join('=')), str = argParts.length > 1 && (0, string_1.removeComment)(argParts[1]).trim();

package/dist/parser/commentAndExt.js

@@ -16,27 +16,35 @@ const comment_1 = require("../src/nowiki/comment");
  */
 const parseCommentAndExt = (wikitext, config = Parser.getConfig(), accum = [], includeOnly = false) => {
     const onlyincludeLeft = '<onlyinclude>', onlyincludeRight = '</onlyinclude>', { length } = onlyincludeLeft;
+    /** 更新`<onlyinclude>`和`</onlyinclude>`的位置 */
+    const update = () => {
+        const i = wikitext.indexOf(onlyincludeLeft);
+        return { i, j: wikitext.indexOf(onlyincludeRight, i + length) };
+    };
     if (includeOnly) {
-        let i = wikitext.indexOf(onlyincludeLeft), j = wikitext.indexOf(onlyincludeRight, i + length);
+        let { i, j } = update();
         if (i !== -1 && j !== -1) { // `<onlyinclude>`拥有最高优先级
             let str = '';
+            /**
+             * 忽略未被`<onlyinclude>`和`</onlyinclude>`包裹的内容
+             * @param text 未被包裹的内容
+             */
+            const noinclude = (text) => {
+                new noinclude_1.NoincludeToken(text, config, accum);
+                str += `\0${accum.length - 1}c\x7F`;
+            };
             while (i !== -1 && j !== -1) {
                 const token = `\0${accum.length}e\x7F`;
                 new onlyinclude_1.OnlyincludeToken(wikitext.slice(i + length, j), config, accum);
                 if (i > 0) {
-                    new noinclude_1.NoincludeToken(wikitext.slice(0, i), config, accum);
-                    str += `\0${accum.length - 1}c\x7F${token}`;
-                }
-                else {
-                    str += token;
+                    noinclude(wikitext.slice(0, i));
                 }
+                str += token;
                 wikitext = wikitext.slice(j + length + 1);
-                i = wikitext.indexOf(onlyincludeLeft);
-                j = wikitext.indexOf(onlyincludeRight, i + length);
+                ({ i, j } = update());
             }
             if (wikitext) {
-                new noinclude_1.NoincludeToken(wikitext, config, accum);
-                str += `\0${accum.length - 1}c\x7F`;
+                noinclude(wikitext);
             }
             return str;
         }

package/dist/parser/list.js

@@ -22,17 +22,24 @@ const parseList = (wikitext, config = Parser.getConfig(), accum = []) => {
         return text;
     }
     let regex = /:+|-\{/gu, ex = regex.exec(text), lc = 0;
+    /**
+     * 创建`DdToken`
+     * @param syntax `:`
+     * @param index 起点
+     */
+    const dd = (syntax, index) => {
+        new dd_1.DdToken(syntax, config, accum);
+        return `${text.slice(0, index)}\0${accum.length - 1}d\x7F${text.slice(index + syntax.length)}`;
+    };
     while (ex && dt) {
         const { 0: syntax, index } = ex;
         if (syntax.startsWith(':')) {
             if (syntax.length >= dt) {
-                new dd_1.DdToken(':'.repeat(dt), config, accum);
-                return `${text.slice(0, index)}\0${accum.length - 1}d\x7F${text.slice(index + dt)}`;
+                return dd(syntax.slice(0, dt), index);
             }
-            text = `${text.slice(0, index)}\0${accum.length}d\x7F${text.slice(regex.lastIndex)}`;
             dt -= syntax.length;
             regex.lastIndex = index + 4 + String(accum.length).length;
-            new dd_1.DdToken(syntax, config, accum);
+            text = dd(syntax, index);
         }
         else if (syntax === '-{') {
             if (!lc) {

package/dist/parser/table.js

@@ -7,7 +7,10 @@ const index_2 = require("../src/table/index");
 const tr_1 = require("../src/table/tr");
 const td_1 = require("../src/table/td");
 const dd_1 = require("../src/nowiki/dd");
-/** @ignore */
+/**
+ * 判断是否为表格行或表格
+ * @param token 表格节点
+ */
 const isTr = (token) => token.lastChild.constructor !== index_1.Token;
 /**
  * 解析表格，注意`tr`和`td`包含开头的换行
@@ -19,30 +22,32 @@ const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getCon
     const stack = [], lines = data.split('\n');
     let out = type === 'root' || type === 'parameter-value' || type === 'ext-inner' && name === 'poem'
         ? ''
-        : `\n${lines.shift()}`;
+        : `\n${lines.shift()}`, top;
     /**
      * 向表格中插入纯文本
      * @param str 待插入的文本
-     * @param top 当前解析的表格或表格行
+     * @param topToken 当前解析的表格或表格行
      */
-    const push = (str, top) => {
-        if (!top) {
+    const push = (str, topToken) => {
+        if (!topToken) {
             out += str;
             return;
         }
-        const { lastChild } = top;
-        if (isTr(top)) {
+        const { lastChild } = topToken;
+        if (isTr(topToken)) {
             const token = new index_1.Token(str, config, accum);
             token.type = 'table-inter';
             token.setAttribute('stage', 3);
-            top.insertAt(token);
+            topToken.insertAt(token);
         }
         else {
             lastChild.setText(String(lastChild) + str);
         }
-    };
+    }, 
+    /** 取出最近的表格行 */
+    pop = () => top.type === 'td' ? stack.pop() : top;
     for (const outLine of lines) {
-        let top = stack.pop();
+        top = stack.pop();
         const [spaces] = /^(?:\s|\0\d+c\x7F)*/u.exec(outLine), line = outLine.slice(spaces.length), matchesStart = /^(:*)((?:\s|\0\d+c\x7F)*)(\{\||\{(?:\0\d+c\x7F)*\0\d+!\x7F|\0\d+\{\x7F)(.*)$/u
             .exec(line);
         if (matchesStart) {
@@ -78,9 +83,7 @@ const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getCon
             push(attr, stack.at(-1));
         }
         else if (row) {
-            if (top.type === 'td') {
-                top = stack.pop();
-            }
+            top = pop();
             if (top.type === 'tr') {
                 top = stack.pop();
             }
@@ -89,20 +92,25 @@ const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getCon
             top.insertAt(tr);
         }
         else {
-            if (top.type === 'td') {
-                top = stack.pop();
-            }
+            top = pop();
             const regex = cell === '!' ? /!!|(?:\||\0\d+!\x7F){2}|\0\d+\+\x7F/gu : /(?:\||\0\d+!\x7F){2}|\0\d+\+\x7F/gu;
             let mt = regex.exec(attr), lastIndex = 0, lastSyntax = `\n${spaces}${cell}`;
+            /**
+             * 创建表格单元格
+             * @param tr 当前表格行
+             */
+            const createTd = (tr) => {
+                const td = new td_1.TdToken(lastSyntax, attr.slice(lastIndex, mt?.index), config, accum);
+                tr.insertAt(td);
+                return td;
+            };
             while (mt) {
-                top.insertAt(new td_1.TdToken(lastSyntax, attr.slice(lastIndex, mt.index), config, accum));
+                createTd(top);
                 ({ lastIndex } = regex);
                 [lastSyntax] = mt;
                 mt = regex.exec(attr);
             }
-            const td = new td_1.TdToken(lastSyntax, attr.slice(lastIndex), config, accum);
-            stack.push(top, td);
-            top.insertAt(td);
+            stack.push(top, createTd(top));
         }
     }
     return out.slice(1);

package/dist/src/attributes.js

@@ -7,9 +7,15 @@ const Parser = require("../index");
 const index_1 = require("./index");
 const atom_1 = require("./atom");
 const attribute_1 = require("./attribute");
-/** @ignore */
+/**
+ * 将属性类型转换为单属性类型
+ * @param type 属性类型
+ */
 const toAttributeType = (type) => type.slice(0, -1);
-/** @ignore */
+/**
+ * 将属性类型转换为无效属性类型
+ * @param type 属性类型
+ */
 const toDirty = (type) => `${toAttributeType(type)}-dirty`;
 /**
  * 扩展和HTML标签属性
@@ -26,7 +32,7 @@ class AttributesToken extends index_1.Token {
         this.type = type;
         this.setAttribute('name', name);
         if (attr) {
-            const regex = new RegExp(`([^\\s/](?:(?!\0\\d+~\x7F)[^\\s/=])*)` // 属性名
+            const regex = new RegExp('([^\\s/](?:(?!\0\\d+~\x7F)[^\\s/=])*)' // 属性名
                 + '(?:'
                 + '((?:\\s|\0\\d+c\x7F)*' // `=`前的空白字符
                 + '(?:=|\0\\d+~\x7F)' // `=`

package/dist/src/imageParameter.js

@@ -6,7 +6,6 @@ const lint_1 = require("../util/lint");
 const Parser = require("../index");
 const index_1 = require("./index");
 exports.galleryParams = new Set(['alt', 'link', 'lang', 'page', 'caption']);
-/** @ignore */
 function validate(key, val, config = Parser.getConfig(), halfParsed = false) {
     val = val.trim();
     let value = val.replace(/\0\d+t\x7F/gu, '').trim();

package/dist/src/imagemap.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImagemapToken = void 0;
 const lint_1 = require("../util/lint");
+const debug_1 = require("../util/debug");
 const Parser = require("../index");
 const index_1 = require("./index");
 const noinclude_1 = require("./nowiki/noinclude");
@@ -15,7 +16,7 @@ class ImagemapToken extends index_1.Token {
     type = 'ext-inner';
     /** 图片 */
     get image() {
-        return this.childNodes.find((child) => child.type === 'imagemap-image');
+        return this.childNodes.find((0, debug_1.isToken)('imagemap-image'));
     }
     /** @param inner 标签内部wikitext */
     constructor(inner, config = Parser.getConfig(), accum = []) {

package/dist/src/index.d.ts

@@ -19,7 +19,6 @@ export declare class Token extends AstElement {
      * @param i 插入位置
      */
     insertAt(child: string, i?: number): AstText;
-    /** @ignore */
     insertAt<T extends AstNodes>(child: T, i?: number): T;
     /**
      * 规范化页面标题

package/dist/src/index.js

@@ -71,6 +71,9 @@ class Token extends element_1.AstElement {
         if (n < this.#stage || !this.getAttribute('plain') || this.length === 0) {
             return this;
         }
+        else if (this.#stage >= constants_1.MAX_STAGE) {
+            return this;
+        }
         switch (n) {
             case 0:
                 if (this.type === 'root') {
@@ -161,6 +164,7 @@ class Token extends element_1.AstElement {
     }
     /** @private */
     parse(n = constants_1.MAX_STAGE, include = false) {
+        n = Math.min(n, constants_1.MAX_STAGE);
         while (this.#stage < n) {
             this.parseOnce(this.#stage, include);
         }
@@ -297,7 +301,6 @@ class Token extends element_1.AstElement {
                 super.setAttribute(key, value);
         }
     }
-    /** @ignore */
     insertAt(child, i = this.length) {
         const token = typeof child === 'string' ? new text_1.AstText(child) : child;
         super.insertAt(token, i);

package/dist/src/table/trBase.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrBaseToken = void 0;
 const lint_1 = require("../../util/lint");
+const debug_1 = require("../../util/debug");
 const base_1 = require("./base");
 /** 表格行或表格 */
 class TrBaseToken extends base_1.TableBaseToken {
@@ -11,11 +12,7 @@ class TrBaseToken extends base_1.TableBaseToken {
         if (!inter) {
             return errors;
         }
-        const first = inter.childNodes.find(child => child.text().trim()), tdPattern = /^\s*(?:!|\{\{\s*![!-]?\s*\}\})/u, 
-        /** @ignore */
-        isArg = (token) => token.type === 'arg', 
-        /** @ignore */
-        isTransclude = (token) => token.type === 'magic-word';
+        const first = inter.childNodes.find(child => child.text().trim()), tdPattern = /^\s*(?:!|\{\{\s*![!-]?\s*\}\})/u, isArg = (0, debug_1.isToken)('arg'), isTransclude = (0, debug_1.isToken)('magic-word');
         if (!first
             || tdPattern.test(String(first))
             || isArg(first) && tdPattern.test(first.default || '')) {

package/dist/src/transclude.d.ts

@@ -51,7 +51,6 @@ export declare class TranscludeToken extends Token {
     getArgs(key: string | number, exact?: boolean, copy?: boolean): Set<ParameterToken>;
     /**
      * 获取重名参数
-     * @throws `Error` 仅用于模板
      */
     getDuplicatedArgs(): readonly [string, ParameterToken[]][];
     /**

package/dist/src/transclude.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TranscludeToken = void 0;
 const string_1 = require("../util/string");
 const lint_1 = require("../util/lint");
+const debug_1 = require("../util/debug");
 const Parser = require("../index");
 const index_1 = require("./index");
 const parameter_1 = require("./parameter");
@@ -216,7 +217,7 @@ class TranscludeToken extends index_1.Token {
     }
     /** 获取所有参数 */
     getAllArgs() {
-        return this.childNodes.filter((child) => child.type === 'parameter');
+        return this.childNodes.filter((0, debug_1.isToken)('parameter'));
     }
     /** 获取所有匿名参数 */
     getAnonArgs() {
@@ -242,7 +243,6 @@ class TranscludeToken extends index_1.Token {
     }
     /**
      * 获取重名参数
-     * @throws `Error` 仅用于模板
      */
     getDuplicatedArgs() {
         if (this.isTemplate()) {

package/dist/util/debug.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Shadow = void 0;
+exports.setChildNodes = exports.isToken = exports.Shadow = void 0;
 exports.Shadow = {
     /** @private */
     run(callback) {
@@ -8,3 +8,24 @@ exports.Shadow = {
         return result;
     },
 };
+/**
+ * 是否是某一特定类型的节点
+ * @param type 节点类型
+ */
+const isToken = (type) => (node) => node.type === type;
+exports.isToken = isToken;
+/**
+ * 更新chldNodes
+ * @param parent 父节点
+ * @param position 子节点位置
+ * @param deleteCount 移除的子节点数量
+ * @param inserted 插入的子节点
+ */
+const setChildNodes = (parent, position, deleteCount, inserted = []) => {
+    const { childNodes } = parent, removed = childNodes.splice(position, deleteCount, ...inserted);
+    for (const node of inserted) {
+        node.setAttribute('parentNode', parent);
+    }
+    return removed;
+};
+exports.setChildNodes = setChildNodes;

package/dist/util/lint.js

@@ -3,44 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateForSelf = exports.generateForChild = void 0;
 const Parser = require("../index");
 /**
- * 生成对于子节点的LintError对象
- * @param child 子节点
- * @param boundingRect 父节点的绝对定位
- * @param msg 错误信息
- * @param severity 严重程度
+ * 生成lint函数
+ * @param func lint函数
  */
-const generateForChild = (child, boundingRect, msg, severity = 'error') => {
-    const index = child.getRelativeIndex(), { offsetHeight, offsetWidth, parentNode } = child, { top: offsetTop, left: offsetLeft } = parentNode.posFromIndex(index), { start } = boundingRect, { top, left } = 'top' in boundingRect ? boundingRect : child.getRootNode().posFromIndex(start), startIndex = start + index, startLine = top + offsetTop, startCol = offsetTop ? offsetLeft : left + offsetLeft;
+const factory = (func) => (token, boundingRect, msg, severity = 'error') => {
+    const { start } = boundingRect, { top, left } = 'top' in boundingRect ? boundingRect : token.getRootNode().posFromIndex(start), { offsetHeight, offsetWidth } = token, { startIndex, startLine, startCol } = func(token, start, top, left);
     return {
         message: Parser.msg(msg),
         severity,
         startIndex,
-        endIndex: startIndex + String(child).length,
+        endIndex: startIndex + String(token).length,
         startLine,
         endLine: startLine + offsetHeight - 1,
         startCol,
         endCol: offsetHeight === 1 ? startCol + offsetWidth : offsetWidth,
     };
 };
-exports.generateForChild = generateForChild;
-/**
- * 生成对于自己的LintError对象
- * @param token 节点
- * @param boundingRect 绝对定位
- * @param msg 错误信息
- * @param severity 严重程度
- */
-const generateForSelf = (token, boundingRect, msg, severity = 'error') => {
-    const { start } = boundingRect, { offsetHeight, offsetWidth } = token, { top, left } = 'top' in boundingRect ? boundingRect : token.getRootNode().posFromIndex(start);
+exports.generateForChild = factory((child, start, line, col) => {
+    const index = child.getRelativeIndex(), { top, left } = child.parentNode.posFromIndex(index);
     return {
-        message: Parser.msg(msg),
-        severity,
-        startIndex: start,
-        endIndex: start + String(token).length,
-        startLine: top,
-        endLine: top + offsetHeight - 1,
-        startCol: left,
-        endCol: offsetHeight === 1 ? left + offsetWidth : offsetWidth,
+        startIndex: start + index,
+        startLine: line + top,
+        startCol: top ? left : col + left,
     };
-};
-exports.generateForSelf = generateForSelf;
+});
+exports.generateForSelf = factory((_, startIndex, startLine, startCol) => ({ startIndex, startLine, startCol }));

package/dist/util/string.js

@@ -4,17 +4,15 @@ exports.noWrap = exports.decodeHtml = exports.text = exports.escapeRegExp = expo
 exports.extUrlCharFirst = '(?:\\[[\\da-f:.]+\\]|[^[\\]<>"\\0-\\x1F\\x7F\\p{Zs}\\uFFFD])';
 exports.extUrlChar = '(?:[^[\\]<>"\\0-\\x1F\\x7F\\p{Zs}\\uFFFD]|\\0\\d+[c!~]\\x7F)*';
 /**
- * remove half-parsed comment-like tokens
- * @param str 原字符串
+ * 生成正则替换函数
+ * @param regex 正则表达式
+ * @param replace 替换字符串或函数
  */
-const removeComment = (str) => str.replace(/\0\d+c\x7F/gu, '');
-exports.removeComment = removeComment;
-/**
- * escape special chars for RegExp constructor
- * @param str RegExp source
- */
-const escapeRegExp = (str) => str.replace(/[\\{}()|.?*+^$[\]]/gu, '\\$&');
-exports.escapeRegExp = escapeRegExp;
+const factory = (regex, replace) => (str) => str.replace(regex, replace);
+/** remove half-parsed comment-like tokens */
+exports.removeComment = factory(/\0\d+c\x7F/gu, '');
+/** escape special chars for RegExp constructor */
+exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, '\\$&');
 /**
  * extract effective wikitext
  * @param childNodes a Token's contents
@@ -22,15 +20,7 @@ exports.escapeRegExp = escapeRegExp;
  */
 const text = (childNodes, separator = '') => childNodes.map(child => typeof child === 'string' ? child : child.text()).join(separator);
 exports.text = text;
-/**
- * decode HTML entities
- * @param str 原字符串
- */
-const decodeHtml = (str) => str.replace(/&#(\d+|x[\da-f]+);/giu, (_, code) => String.fromCodePoint(Number(`${code.toLowerCase().startsWith('x') ? '0' : ''}${code}`)));
-exports.decodeHtml = decodeHtml;
-/**
- * escape newlines
- * @param str 原字符串
- */
-const noWrap = (str) => str.replaceAll('\n', '\\n');
-exports.noWrap = noWrap;
+/** decode HTML entities */
+exports.decodeHtml = factory(/&#(\d+|x[\da-f]+);/giu, (_, code) => String.fromCodePoint(Number(`${code.toLowerCase().startsWith('x') ? '0' : ''}${code}`)));
+/** escape newlines */
+exports.noWrap = factory(/\n/gu, '\\n');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.3.4",
+	"version": "2.3.5",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",