wikilint 2.18.2 → 2.18.4

package/dist/src/syntax.d.ts

@@ -9,7 +9,9 @@ declare type SyntaxTypes = 'heading-trail' | 'magic-word-name' | 'table-syntax'
 export declare class SyntaxToken extends Token {
     #private;
     get type(): SyntaxTypes;
-    /** @param pattern 语法正则 */
-    constructor(wikitext: string | undefined, pattern: RegExp, type: SyntaxTypes, config?: Config, accum?: Token[], acceptable?: Acceptable);
+    /**
+     * @class
+     */
+    constructor(wikitext: string | undefined, type: SyntaxTypes, config?: Config, accum?: Token[], acceptable?: Acceptable);
 }
 export {};

package/dist/src/syntax.js

@@ -12,8 +12,10 @@ class SyntaxToken extends index_1.Token {
     get type() {
         return this.#type;
     }
-    /** @param pattern 语法正则 */
-    constructor(wikitext, pattern, type, config, accum, acceptable) {
+    /**
+     * @class
+     */
+    constructor(wikitext, type, config, accum, acceptable) {
         super(wikitext, config, accum, acceptable);
         this.#type = type;
     }

package/dist/src/table/base.js

@@ -24,7 +24,7 @@ class TableBaseToken extends (0, attributesParent_1.attributesParent)(1)(index_2
      */
     constructor(pattern, syntax, type, attr, config = index_1.default.getConfig(), accum = [], acceptable) {
         super(undefined, config, accum, acceptable);
-        this.append(new syntax_1.SyntaxToken(syntax, pattern, 'table-syntax', config, accum, {}), 
+        this.append(new syntax_1.SyntaxToken(syntax, 'table-syntax', config, accum), 
         // @ts-expect-error abstract class
         new attributes_1.AttributesToken(attr, 'table-attrs', type, config, accum));
     }

package/dist/src/table/index.d.ts

@@ -11,6 +11,7 @@ export type TableTokens = TableToken | TrToken | TdToken;
 export declare const isRowEnd: ({ type }: Token) => boolean;
 /** @extends {Array<TableCoords[]>} */
 export declare class Layout extends Array<TableCoords[]> {
+    abstract static from(arr: TableCoords[][]): Layout;
 }
 /**
  * table

package/dist/src/table/index.js

@@ -10,7 +10,6 @@ const rect_1 = require("../../lib/rect");
 const index_1 = __importDefault(require("../../index"));
 const trBase_1 = require("./trBase");
 const syntax_1 = require("../syntax");
-const closingPattern = /^\n[^\S\n]*(?:\|\}|\{\{\s*!\s*\}\}\}|\{\{\s*!\)\s*\}\})$/u;
 /**
  * 生成一个指定长度的空数组
  * @param n 数组长度
@@ -91,11 +90,9 @@ class TableToken extends trBase_1.TrBaseToken {
      * @param halfParsed
      */
     close(syntax = '\n|}', halfParsed) {
-        const config = this.getAttribute('config'), accum = this.getAttribute('accum'), inner = halfParsed
-            ? [syntax]
-            : index_1.default.parse(syntax, this.getAttribute('include'), 2, config).childNodes;
+        const config = this.getAttribute('config'), accum = this.getAttribute('accum'), inner = [syntax];
         debug_1.Shadow.run(() => {
-            const token = new syntax_1.SyntaxToken(undefined, closingPattern, 'table-syntax', config, accum);
+            const token = new syntax_1.SyntaxToken(undefined, 'table-syntax', config, accum);
             super.insertAt(token);
         });
         this.lastChild.replaceChildren(...inner);
@@ -111,7 +108,7 @@ class TableToken extends trBase_1.TrBaseToken {
      * @param stop.y stop at the column / 中止列
      */
     getLayout(stop) {
-        const rows = this.getAllRows(), { length } = rows, layout = new Layout(...emptyArray(length, () => []));
+        const rows = this.getAllRows(), { length } = rows, layout = Layout.from(emptyArray(length, () => []));
         for (let i = 0; i < layout.length; i++) {
             const rowLayout = layout[i];
             let j = 0, k = 0, last;

package/dist/src/table/trBase.js

@@ -4,6 +4,34 @@ exports.TrBaseToken = void 0;
 const lint_1 = require("../../util/lint");
 const base_1 = require("./base");
 const td_1 = require("./td");
+const tableTags = new Set(['tr', 'td', 'th', 'caption']), tableTemplates = new Set(['Template:!!', 'Template:!-']);
+/**
+ * Check if the content is fostered
+ * @param token
+ */
+const isFostered = (token) => {
+    const first = token.childNodes.find(child => child.text().trim());
+    if (!first
+        || first.type === 'text' && first.data.trim().startsWith('!')
+        || first.type === 'magic-word' && first.name === '!'
+        || first.type === 'template' && tableTemplates.has(first.name)
+        || first.is('html') && tableTags.has(first.name)) {
+        return false;
+    }
+    else if (first.is('arg')) {
+        return first.length > 1 && isFostered(first.childNodes[1]);
+    }
+    else if (first.is('magic-word')) {
+        try {
+            const severity = first.getPossibleValues().map(isFostered);
+            return severity.includes('error')
+                ? 'error'
+                : severity.includes('warning') && 'warning';
+        }
+        catch { }
+    }
+    return first.type === 'template' || first.type === 'magic-word' && first.name === 'invoke' ? 'warning' : 'error';
+};
 /**
  * table row or table
  *
@@ -16,22 +44,11 @@ class TrBaseToken extends base_1.TableBaseToken {
         if (!inter) {
             return errors;
         }
-        const first = inter.childNodes.find(child => child.text().trim()), tdPattern = /^\s*(?:!|\{\{\s*![!-]?\s*\}\})/u;
-        if (!first
-            || tdPattern.test(first.toString())
-            || first.is('arg') && tdPattern.test(first.default || '')) {
+        const severity = isFostered(inter);
+        if (!severity) {
             return errors;
         }
-        else if (first.is('magic-word')) {
-            try {
-                if (first.getPossibleValues().every(token => tdPattern.test(token.text()))) {
-                    return errors;
-                }
-            }
-            catch { }
-        }
-        const error = (0, lint_1.generateForChild)(inter, { start }, 'fostered-content', 'content to be moved out from the table');
-        error.severity = first.type === 'template' ? 'warning' : 'error';
+        const error = (0, lint_1.generateForChild)(inter, { start }, 'fostered-content', 'content to be moved out from the table', severity);
         error.startIndex++;
         error.startLine++;
         error.startCol = 0;

package/dist/src/transclude.js

@@ -66,7 +66,7 @@ class TranscludeToken extends index_1.Token {
                 if (fullWidth) {
                     this.#colon = '：';
                 }
-                const pattern = new RegExp(String.raw `^\s*${name}\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {});
+                const token = new syntax_1.SyntaxToken(magicWord, 'magic-word-name', config, accum);
                 super.insertAt(token);
                 if (arg !== false) {
                     parts.unshift([arg]);
@@ -85,7 +85,7 @@ class TranscludeToken extends index_1.Token {
         }
         if (this.type === 'template') {
             const name = (0, string_1.removeComment)(title).trim();
-            if (!this.normalizeTitle(name, 10, true, true).valid) {
+            if (!this.normalizeTitle(name, 10, { halfParsed: true, temporary: true }).valid) {
                 accum.pop();
                 throw new SyntaxError('Invalid template name');
             }
@@ -144,7 +144,7 @@ class TranscludeToken extends index_1.Token {
     }
     /** 获取模板或模块名 */
     #getTitle() {
-        const isTemplate = this.type === 'template', title = this.normalizeTitle(this.childNodes[isTemplate ? 0 : 1].toString(true), isTemplate ? 10 : 828, true);
+        const isTemplate = this.type === 'template', title = this.normalizeTitle(this.childNodes[isTemplate ? 0 : 1].text(), isTemplate ? 10 : 828, { temporary: true });
         return title;
     }
     /**
@@ -162,7 +162,7 @@ class TranscludeToken extends index_1.Token {
             return [
                 this.#getTitle().title,
                 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                this.childNodes[2]?.toString(true).trim(),
+                this.childNodes[2]?.text().trim(),
             ];
         }
     }
@@ -344,7 +344,7 @@ class TranscludeToken extends index_1.Token {
         if (type === 'template') {
             throw new Error('TranscludeToken.getPossibleValues method is only for specific magic words!');
         }
-        let start;
+        let start, queue;
         switch (name) {
             case 'if':
             case 'ifexist':
@@ -355,10 +355,18 @@ class TranscludeToken extends index_1.Token {
             case 'ifeq':
                 start = 3;
                 break;
+            case 'switch': {
+                const parameters = childNodes.slice(2), last = parameters[parameters.length - 1];
+                queue = [
+                    ...parameters.filter(({ anon }) => !anon),
+                    ...last?.anon ? [last] : [],
+                ].map(({ lastChild }) => lastChild);
+                break;
+            }
             default:
                 throw new Error('TranscludeToken.getPossibleValues method is only for specific magic words!');
         }
-        const queue = childNodes.slice(start, start + 2).map(({ childNodes: [, value] }) => value);
+        queue ??= childNodes.slice(start, start + 2).map(({ lastChild }) => lastChild);
         for (let i = 0; i < queue.length;) {
             const { length, 0: first } = queue[i].childNodes.filter(child => child.text().trim());
             if (length === 0) {

package/dist/util/debug.js

@@ -37,7 +37,14 @@ exports.isToken = isToken;
  * @param inserted 插入的子节点
  */
 const setChildNodes = (parent, position, deleteCount, inserted = []) => {
-    const nodes = parent.getChildNodes(), removed = nodes.splice(position, deleteCount, ...inserted);
+    let nodes = parent.getChildNodes(), removed;
+    if (nodes.length === deleteCount) {
+        removed = nodes;
+        nodes = inserted;
+    }
+    else {
+        removed = nodes.splice(position, deleteCount, ...inserted);
+    }
     for (let i = 0; i < inserted.length; i++) {
         const node = inserted[i];
         node.setAttribute('parentNode', parent);
@@ -46,6 +53,9 @@ const setChildNodes = (parent, position, deleteCount, inserted = []) => {
     }
     nodes[position - 1]?.setAttribute('nextSibling', nodes[position]);
     nodes[position + inserted.length]?.setAttribute('previousSibling', nodes[position + inserted.length - 1]);
+    if (nodes === inserted) {
+        parent.setAttribute('childNodes', nodes);
+    }
     return removed;
 };
 exports.setChildNodes = setChildNodes;

package/dist/util/diff.js

@@ -31,7 +31,7 @@ const cmd = (command, args) => new Promise(resolve => {
         shell = (0, child_process_1.spawn)(command, args);
         timer = setTimeout(() => {
             shell.kill('SIGINT');
-        }, 60 * 1000);
+        }, 60 * 1e3);
         let buf = '';
         shell.stdout.on('data', data => {
             buf += String(data);

package/dist/util/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = exports.rawurldecode = void 0;
+exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.decodeHtmlBasic = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = exports.rawurldecode = void 0;
 var common_1 = require("@bhsd/common");
 Object.defineProperty(exports, "rawurldecode", { enumerable: true, get: function () { return common_1.rawurldecode; } });
 exports.zs = String.raw ` \xA0\u1680\u2000-\u200A\u202F\u205F\u3000`;
@@ -27,9 +27,8 @@ exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, String.raw `\$&`);
 const text = (childNodes, separator = '') => childNodes.map(child => typeof child === 'string' ? child : child.text()).join(separator);
 exports.text = text;
 const names = { lt: '<', gt: '>', lbrack: '[', rbrack: ']', lbrace: '{', rbrace: '}', nbsp: ' ', amp: '&', quot: '"' };
-/* istanbul ignore next */
 /** decode HTML entities */
-const decodeHtmlBasic = factory(/&(?:#(\d+|[Xx][\da-fA-F]+)|([lg]t|[LG]T|[lr]brac[ke]|nbsp|amp|AMP|quot|QUOT));/gu, (_, code, name) => code
+exports.decodeHtmlBasic = factory(/&(?:#(\d+|[Xx][\da-fA-F]+)|([lg]t|[LG]T|[lr]brac[ke]|nbsp|amp|AMP|quot|QUOT));/gu, (_, code, name) => code
     ? String.fromCodePoint(Number((/^x/iu.test(code) ? '0' : '') + code))
     : names[name.toLowerCase()]);
 /**
@@ -48,7 +47,7 @@ const decodeHtml = (str) => {
     }
     /* istanbul ignore next */
     /* NOT FOR BROWSER ONLY END */
-    return decodeHtmlBasic(str);
+    return (0, exports.decodeHtmlBasic)(str);
 };
 exports.decodeHtml = decodeHtml;
 /** decode numbered HTML entities */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.18.2",
+	"version": "2.18.4",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -65,7 +65,7 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.8.1",
+		"@bhsd/common": "^0.9.1",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {