wikilint 2.18.3 → 2.18.4

package/dist/index.d.ts

@@ -23,6 +23,15 @@ declare interface Parser extends ParserBase {
      * @since v1.16.1
      */
     createLanguageService(uri: object): LanguageService;
+    /**
+     * Get the parser configuration for a MediaWiki project with Extension:CodeMirror installed
+     *
+     * 获取一个安装了CodeMirror扩展的MediaWiki项目的解析设置
+     * @param site site nickname / 网站别名
+     * @param url script path / 脚本路径
+     * @since v1.18.4
+     */
+    fetchConfig(site: string, url: string): Promise<Config>;
 }
 declare const Parser: Parser;
 // @ts-expect-error mixed export styles

package/dist/index.js

@@ -11,6 +11,7 @@ const string_1 = require("./util/string");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const diff_1 = require("./util/diff");
+const config_1 = __importDefault(require("./bin/config"));
 /* NOT FOR BROWSER ONLY */
 /**
  * 从根路径require
@@ -175,6 +176,12 @@ const Parser = {
             return tasks.get(uri) ?? new LanguageService(uri);
         }
     },
+    /* NOT FOR BROWSER ONLY */
+    /** @implements */
+    async fetchConfig(site, url) {
+        return this.getConfig(await (0, config_1.default)(site, url, false, true));
+    },
+    /* NOT FOR BROWSER ONLY */
 };
 const def = {
     default: { value: Parser },

package/dist/lib/lsp.js

@@ -16,7 +16,6 @@ const util_1 = __importDefault(require("util"));
 const child_process_1 = require("child_process");
 const crypto_1 = require("crypto");
 const stylelint_1 = require("@bhsd/common/dist/stylelint");
-const config_1 = __importDefault(require("../bin/config"));
 const document_1 = require("./document");
 /** @see https://www.npmjs.com/package/stylelint-config-recommended */
 const cssRules = {
@@ -1116,13 +1115,13 @@ class LanguageService {
         }
         else if (type === 'magic-word-name') {
             info = this.#getParserFunction(parentNode.name);
-            f = offsetNode.toString(true).trim();
+            f = offsetNode.text().trim();
             colon = parentNode.getAttribute('colon');
         }
         else if (offsetNode.is('magic-word') && !offsetNode.modifier && length === 1
             && (offset > 0 || root.posFromIndex(offsetNode.getAbsoluteIndex()).left === position.character)) {
             info = this.#getParserFunction(name);
-            f = offsetNode.firstChild.toString(true).trim();
+            f = offsetNode.firstChild.text().trim();
             colon = offsetNode.getAttribute('colon');
         }
         else if ((offsetNode.is('magic-word') || offsetNode.is('template'))
@@ -1209,7 +1208,7 @@ class LanguageService {
         }
         const n = childNodes.length - 1, candidates = info.signatures.filter(params => (params.length >= n || params[params.length - 1]?.rest)
             && params.every(({ label, const: c }, i) => {
-                const p = c && i < n && childNodes[i + 1]?.toString(true).trim();
+                const p = c && i < n && childNodes[i + 1]?.text().trim();
                 return !p || label.toLowerCase().includes(p.toLowerCase());
             }));
         if (candidates.length === 0) {
@@ -1222,7 +1221,7 @@ class LanguageService {
                 break;
             }
         }
-        const f = firstChild.toString(true).trim(), colon = lastChild.getAttribute('colon');
+        const f = firstChild.text().trim(), colon = lastChild.getAttribute('colon');
         return {
             signatures: candidates.map((params) => ({
                 label: `{{${f}${params.length === 0 ? '' : colon}${params.map(({ label }) => label).join('|')}}}`,
@@ -1337,7 +1336,7 @@ class LanguageService {
             this.config = index_1.default.getConfig(config);
         }
         catch {
-            this.config = index_1.default.getConfig(await (0, config_1.default)(site, `${mt[0]}/w`, false, true));
+            this.config = await index_1.default.fetchConfig(site, `${mt[0]}/w`);
         }
         Object.assign(this.config, { articlePath: `${mt[0]}/wiki/` });
     }

package/dist/lib/text.js

@@ -74,7 +74,6 @@ class AstText extends node_1.AstNode {
     constructor(text) {
         super();
         Object.defineProperties(this, {
-            childNodes: { enumerable: false, configurable: false },
             data: {
                 value: text,
             },
@@ -132,12 +131,13 @@ class AstText extends node_1.AstNode {
         ]);
         for (let mt = errorRegex.exec(data); mt; mt = errorRegex.exec(data)) {
             const [, tag, prefix] = mt;
-            let { index } = mt, error = mt[0].toLowerCase();
+            let { index, 0: error } = mt;
             if (prefix && prefix !== ']') {
                 const { length } = prefix;
                 index += length;
                 error = error.slice(length);
             }
+            error = error.toLowerCase();
             const { 0: char, length } = error, magicLink = char === 'r' || char === 'p' || char === 'i';
             if (char === '<' && !tags.has(tag.toLowerCase())
                 || char === '[' && type === 'ext-link-text' && (/&(?:rbrack|#93|#x5[Dd];);/u.test(data.slice(index + 1))

package/dist/parser/braces.js

@@ -8,14 +8,33 @@ const transclude_1 = require("../src/transclude");
 const arg_1 = require("../src/arg");
 /* NOT FOR BROWSER ONLY */
 const v8_1 = require("v8");
-const MAXHEAP = (0, v8_1.getHeapStatistics)().total_available_size * 0.9, MAXITER = MAXHEAP / 2e5;
+const MAXHEAP = (0, v8_1.getHeapStatistics)().heap_size_limit * 0.9;
 /* NOT FOR BROWSER ONLY END */
 const closes = {
     '=': String.raw `\n(?!(?:[^\S\n]|\0\d+[cn]\x7F)*\n)`,
     '{': String.raw `\}{2,}|\|`,
     '-': String.raw `\}-`,
     '[': String.raw `\]\]`,
-}, openBraces = String.raw `|\{{2,}`, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~'], ['server', 'm']]), getExecRegex = (0, common_1.getRegex)(s => new RegExp(s, 'gmu'));
+}, lbrack = String.raw `\[(?!\[)`, newline = String.raw `\n(?![=\0])`, openBraces = String.raw `|\{{2,}`, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~'], ['server', 'm']]), getExecRegex = (0, common_1.getRegex)(s => new RegExp(s, 'gmu'));
+let reReplace;
+/* NOT FOR BROWSER ONLY */
+try {
+    reReplace = new RegExp(String.raw `(?<!\{)\{\{((?:[^\n{}[]|${lbrack}|${newline})*)\}\}` // eslint-disable-line prefer-template
+        + '|'
+        + String.raw `\{\{((?:[^\n{}[]|${lbrack}|${newline})*)\}\}(?!\})`
+        + '|'
+        + String.raw `\[\[(?:[^\n[\]{]|${newline})*\]\]`
+        + '|'
+        + String.raw `-\{(?:[^\n{}[]|${lbrack}|${newline})*\}-`, 'gu');
+}
+catch {
+    /* NOT FOR BROWSER ONLY END */
+    reReplace = new RegExp(String.raw `\{\{((?:[^\n{}[]|${lbrack}|${newline})*)\}\}(?!\})` // eslint-disable-line prefer-template
+        + '|'
+        + String.raw `\[\[(?:[^\n[\]{]|${newline})*\]\]`
+        + '|'
+        + String.raw `-\{(?:[^\n{}[]|${lbrack}|${newline})*\}-`, 'gu');
+}
 /**
  * 获取模板或魔术字对应的字符
  * @param s 模板或魔术字名
@@ -58,36 +77,43 @@ const parseBraces = (wikitext, config, accum) => {
     const push = (text, parts, lastIndex, index) => {
         parts[parts.length - 1].push(restore(text.slice(lastIndex, index)));
     };
-    wikitext = wikitext.replace(/\{\{([^\n{}[]*)\}\}(?!\})|\[\[[^\n[\]{]*\]\]|-\{[^\n{}[]*\}-/gu, (m, p1) => {
-        if (p1 !== undefined) {
-            try {
-                const { length } = accum, parts = p1.split('|');
-                // @ts-expect-error abstract class
-                new transclude_1.TranscludeToken(parts[0], parts.slice(1).map(part => {
-                    const i = part.indexOf('=');
-                    return i === -1 ? [part] : [part.slice(0, i), part.slice(i + 1)];
-                }), config, accum);
-                return `\0${length}${getSymbol(parts[0])}\x7F`;
-            }
-            catch (e) {
-                /* istanbul ignore if */
-                if (!(e instanceof SyntaxError) || e.message !== 'Invalid template name') {
-                    throw e;
+    let replaced;
+    do {
+        if (replaced !== undefined) {
+            wikitext = replaced;
+        }
+        replaced = wikitext.replace(reReplace, (m, p1, p2) => {
+            if (p1 !== undefined || typeof p2 === 'string') {
+                try {
+                    const { length } = accum, parts = (p1 ?? p2).split('|');
+                    // @ts-expect-error abstract class
+                    new transclude_1.TranscludeToken(restore(parts[0]), parts.slice(1).map(part => {
+                        const i = part.indexOf('=');
+                        return (i === -1 ? [part] : [part.slice(0, i), part.slice(i + 1)]).map(restore);
+                    }), config, accum);
+                    return `\0${length}${getSymbol(parts[0])}\x7F`;
+                }
+                catch (e) {
+                    /* istanbul ignore if */
+                    if (!(e instanceof SyntaxError) || e.message !== 'Invalid template name') {
+                        throw e;
+                    }
                 }
             }
-        }
-        linkStack.push(m);
-        return `\0${linkStack.length - 1}\x7F`;
-    });
+            linkStack.push(restore(m));
+            return `\0${linkStack.length - 1}\x7F`;
+        });
+    } while (replaced !== wikitext);
+    wikitext = replaced;
     const lastBraces = wikitext.lastIndexOf('}}') - wikitext.length;
     let moreBraces = lastBraces + wikitext.length !== -1;
-    let regex = getExecRegex(source + (moreBraces ? openBraces : '')), mt = regex.exec(wikitext), iter = 0, lastIndex;
+    let regex = getExecRegex(source + (moreBraces ? openBraces : '')), mt = regex.exec(wikitext), lastIndex;
     while (mt
         || lastIndex !== undefined && lastIndex <= wikitext.length
             && stack[stack.length - 1]?.[0]?.startsWith('=')) {
         /* NOT FOR BROWSER ONLY */
-        if (iter++ > MAXITER && process.memoryUsage().heapUsed > MAXHEAP) {
-            throw new RangeError('Maximum iteration exceeded');
+        if (process.memoryUsage().heapUsed > MAXHEAP) {
+            throw new RangeError('Maximum heap size exceeded');
         }
         /* NOT FOR BROWSER ONLY END */
         if (mt?.[1]) {
@@ -106,11 +132,13 @@ const parseBraces = (wikitext, config, accum) => {
                 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)}`;
-                    lastIndex = index + 4 + String(accum.length).length;
                     rmt[2] = restore(rmt[2]);
-                    // @ts-expect-error abstract class
-                    new heading_1.HeadingToken(rmt[1].length, rmt.slice(2), config, accum);
+                    if (!rmt[2].includes('\n')) {
+                        wikitext = `${wikitext.slice(0, index)}\0${accum.length}h\x7F${wikitext.slice(curIndex)}`;
+                        lastIndex = index + 4 + String(accum.length).length;
+                        // @ts-expect-error abstract class
+                        new heading_1.HeadingToken(rmt[1].length, rmt.slice(2), config, accum);
+                    }
                 }
             }
         }

package/dist/parser/commentAndExt.js

@@ -9,7 +9,7 @@ const ext_1 = require("../src/tagPair/ext");
 const comment_1 = require("../src/nowiki/comment");
 const onlyincludeLeft = '<onlyinclude>', onlyincludeRight = '</onlyinclude>', { length } = onlyincludeLeft, getRegex = [false, true].map(includeOnly => {
     const noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly';
-    return (0, common_1.getObjRegex)(ext => new RegExp(String.raw `<!--[\s\S]*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${ext.join('|')})(\s[^>]*?)?(?:/>|>([\s\S]*?)</(\1\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>([\s\S]*?)(?:</(${includeRegex}\s*)>|$))`, 'giu'));
+    return (0, common_1.getRegex)(ext => new RegExp(String.raw `<!--[\s\S]*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${ext.join('|')})(\s[^>]*?)?(?:/>|>([\s\S]*?)</(\1\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>([\s\S]*?)(?:</(${includeRegex}\s*)>|$))`, 'giu'));
 });
 /**
  * 更新`<onlyinclude>`和`</onlyinclude>`的位置

package/dist/src/arg.js

@@ -61,7 +61,7 @@ class ArgToken extends index_1.Token {
     /** 设置name */
     #setName() {
         // eslint-disable-next-line no-unused-labels
-        LSP: this.setAttribute('name', this.firstChild.toString(true).trim());
+        LSP: this.setAttribute('name', this.firstChild.text().trim());
     }
     /** @private */
     afterBuild() {

package/dist/src/attribute.js

@@ -80,7 +80,7 @@ class AttributeToken extends index_2.Token {
         if (this.parentNode) {
             this.#tag = this.parentNode.name;
         }
-        this.setAttribute('name', this.firstChild.toString(true).trim().toLowerCase());
+        this.setAttribute('name', this.firstChild.text().trim().toLowerCase());
         super.afterBuild();
     }
     /** @private */

package/dist/src/link/base.js

@@ -132,7 +132,7 @@ class LinkBaseToken extends index_2.Token {
     }
     /** @private */
     getTitle(temporary, halfParsed) {
-        return this.normalizeTitle(this.firstChild.toString(true), 0, { halfParsed, temporary, decode: true, selfLink: true });
+        return this.normalizeTitle(this.firstChild.text(), 0, { halfParsed, temporary, decode: true, selfLink: true });
     }
 }
 exports.LinkBaseToken = LinkBaseToken;

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

@@ -108,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,7 +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']);
+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
  *
@@ -17,23 +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 || '')
-            || first.is('html') && tableTags.has(first.name)) {
+        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

@@ -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, { temporary: 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/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/package.json

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