wikiparser-node 1.18.1 → 1.18.3

package/dist/lib/lsp.d.ts

@@ -20,6 +20,7 @@ export declare const isAttr: ({ type, parentNode, length, firstChild }: Token, s
 /** VSCode-style language service */
 export declare class LanguageService implements LanguageServiceBase {
     #private;
+    /** @since v1.17.1 */
     include: boolean;
     lilypond: string;
     /** @param uri 任务标识 */

package/dist/lib/lsp.js

@@ -26,12 +26,12 @@ const cssRules = {
     'block-no-empty': null,
     'property-no-unknown': null,
 }, jsonSelector = document_1.jsonTags.map(s => `ext-inner#${s}`).join(), scores = new Map();
+let colors;
 /* NOT FOR BROWSER ONLY END */
 exports.tasks = new WeakMap();
 const refTags = new Set(['ref']), referencesTags = new Set(['ref', 'references']), nameAttrs = new Set(['name', 'extends', 'follow']), groupAttrs = new Set(['group']), renameTypes = new Set([
     'arg-name',
     'template-name',
-    'magic-word-name',
     'link-target',
     'parameter-key',
 ]), referenceTypes = new Set([
@@ -41,8 +41,11 @@ const refTags = new Set(['ref']), referencesTags = new Set(['ref', 'references']
     'image-parameter',
     'heading-title',
     'heading',
+    'magic-word-name',
     ...renameTypes,
 ]), plainTypes = new Set(['text', 'comment', 'noinclude', 'include']), cssSelector = ['ext', 'html', 'table'].map(s => `${s}-attr#style`).join();
+/^(?:http:\/\/|\/\/)/iu; // eslint-disable-line @typescript-eslint/no-unused-expressions
+const getLinkRegex = (0, common_1.getRegex)(protocol => new RegExp(`^(?:${protocol}|//)`, 'iu'));
 /**
  * Check if a token is a plain attribute.
  * @param token
@@ -276,6 +279,7 @@ class LanguageService {
     #config;
     #include;
     #completionConfig;
+    /** @since v1.17.1 */
     include = true;
     /** @private */
     config;
@@ -291,11 +295,11 @@ class LanguageService {
         exports.tasks.set(uri, this);
         Object.defineProperties(this, {
             config: { enumerable: false },
-            /* NOT FOR BROWSER ONLY */
             data: {
                 value: require(path_1.default.join('..', '..', 'data', 'signatures')),
                 enumerable: false,
             },
+            /* NOT FOR BROWSER ONLY */
             lilypondData: {
                 value: require(path_1.default.join('..', '..', 'data', 'ext', 'score')),
                 enumerable: false,
@@ -409,11 +413,14 @@ class LanguageService {
     async provideDocumentColors(rgba, text, hsl = true) {
         const root = await this.#queue(text);
         /* NOT FOR BROWSER ONLY */
-        let colors;
+        /* eslint-disable require-atomic-updates */
         try {
-            colors = new RegExp(String.raw `\b${Object.keys((await import('color-name')).default).join('|')}\b`, 'giu');
+            colors ??= new RegExp(String.raw `\b${Object.keys((await import('color-name')).default).join('|')}\b`, 'giu');
+        }
+        catch {
+            colors = false;
         }
-        catch { }
+        /* eslint-enable require-atomic-updates */
         /* NOT FOR BROWSER ONLY END */
         return root.querySelectorAll('attr-value,parameter-value,arg-default').reverse()
             .flatMap(token => {
@@ -558,38 +565,46 @@ class LanguageService {
                 return getCompletion(root.querySelectorAll('arg').filter(token => token.name && token !== cur)
                     .map(({ name }) => name), 'Variable', match, position);
             }
-            const [insensitive, sensitive] = this.config.parserFunction, isOld = Array.isArray(sensitive), colon = match.startsWith(':'), str = colon ? match.slice(1).trimStart() : match;
-            return mt[2] === '[['
-                ? getCompletion(// link
-                root.querySelectorAll('link,file,category,redirect-target').filter(token => token !== cur).map(({ name }) => name), 'Folder', str, position)
-                : [
-                    ...getCompletion(functions, 'Function', match, position, '', name => {
-                        if (!this.data) {
-                            return undefined;
-                        }
-                        else if (name in insensitive) {
-                            name = insensitive[name];
+            const [insensitive, sensitive] = this.config.parserFunction, isOld = Array.isArray(sensitive), next = curLine.charAt(character), colon = match.startsWith(':'), str = colon ? match.slice(1).trimStart() : match;
+            if (mt[2] === '[[') { // link
+                return getCompletion(root.querySelectorAll('link,file,category,redirect-target').filter(token => token !== cur).map(({ name }) => name), 'Folder', str, position);
+            }
+            // parser function or template
+            let words = functions;
+            if (next === ':') {
+                words = functions.filter(s => !s.endsWith('：'));
+            }
+            else if (next === '：') {
+                words = functions.filter(s => s.endsWith('：')).map(s => s.slice(0, -1));
+            }
+            return [
+                ...getCompletion(words, 'Function', match, position, '', name => {
+                    if (!this.data) {
+                        return undefined;
+                    }
+                    else if (name in insensitive) {
+                        name = insensitive[name];
+                    }
+                    else if (!isOld && name in sensitive) {
+                        name = sensitive[name];
+                    }
+                    return this.#getParserFunction(name.toLowerCase());
+                }),
+                ...match.startsWith('#')
+                    ? []
+                    : getCompletion(root.querySelectorAll('template').filter(token => token !== cur)
+                        .map(token => {
+                        const { name } = token;
+                        if (colon) {
+                            return name;
                         }
-                        else if (!isOld && name in sensitive) {
-                            name = sensitive[name];
+                        const { ns } = token.getAttribute('title');
+                        if (ns === 0) {
+                            return `:${name}`;
                         }
-                        return this.#getParserFunction(name.toLowerCase());
-                    }),
-                    ...match.startsWith('#')
-                        ? []
-                        : getCompletion(root.querySelectorAll('template').filter(token => token !== cur)
-                            .map(token => {
-                            const { name } = token;
-                            if (colon) {
-                                return name;
-                            }
-                            const { ns } = token.getAttribute('title');
-                            if (ns === 0) {
-                                return `:${name}`;
-                            }
-                            return ns === 10 ? name.slice(9) : name;
-                        }), 'Folder', str, position),
-                ];
+                        return ns === 10 ? name.slice(9) : name;
+                    }), 'Folder', str, position),
+            ];
         }
         let type, parentNode;
         if (mt?.[7] === undefined) {
@@ -598,7 +613,7 @@ class LanguageService {
         }
         if (mt?.[6] !== undefined || type === 'image-parameter') { // image parameter
             const index = root.indexFromPos(line, character), match = mt?.[6]?.trimStart()
-                ?? this.#text.slice(cur.getAbsoluteIndex(), index).trimStart(), equal = this.#text.charAt(index) === '=';
+                ?? this.#text.slice(cur.getAbsoluteIndex(), index).trimStart(), equal = this.#text[index] === '=';
             return [
                 ...getCompletion(params, 'Property', match, position)
                     .filter(({ label }) => !equal || !/[= ]$/u.test(label)),
@@ -634,7 +649,7 @@ class LanguageService {
             if (t === 'magic-word' && n !== 'invoke') {
                 return undefined;
             }
-            const key = this.#text.slice(cur.getAbsoluteIndex(), root.indexFromPos(line, character)).trimStart(), [module, func] = t === 'magic-word' ? transclusion.getModule() : [];
+            const key = this.#text.slice(cur.getAbsoluteIndex(), root.indexFromPos(line, character)).trimStart(), [mod, func] = t === 'magic-word' ? transclusion.getModule() : [];
             return key
                 ? getCompletion(root.querySelectorAll('parameter').filter(token => {
                     if (token === parentNode
@@ -647,7 +662,7 @@ class LanguageService {
                         return true;
                     }
                     const [m, f] = token.parentNode.getModule();
-                    return m === module && f === func;
+                    return m === mod && f === func;
                 }).map(({ name }) => name), 'Variable', key, position, type === 'parameter-value' ? '=' : '')
                 : undefined;
             /* NOT FOR BROWSER ONLY */
@@ -673,7 +688,7 @@ class LanguageService {
             }
             const before = this.#text.slice(cur.getAbsoluteIndex(), root.indexFromPos(line, character)), comment = before.lastIndexOf('%');
             if (comment !== -1
-                && (before.charAt(comment + 1) === '{' || !before.slice(comment).includes('\n'))) {
+                && (before[comment + 1] === '{' || !before.slice(comment).includes('\n'))) {
                 return undefined;
             }
             const word = /\\?\b(?:\w|\b(?:->?|\.)|\bly:)+$/u.exec(curLine.slice(0, character))?.[0];
@@ -890,13 +905,18 @@ class LanguageService {
      */
     async provideLinks(text) {
         this.config ??= index_1.default.getConfig();
-        /^(?:http:\/\/|\/\/)/iu; // eslint-disable-line @typescript-eslint/no-unused-expressions
-        const { articlePath, protocol } = this.config, absolute = articlePath?.includes('//'), protocolRegex = new RegExp(`^(?:${protocol}|//)`, 'iu');
+        const { articlePath, protocol } = this.config, absolute = articlePath?.includes('//'), protocolRegex = getLinkRegex(protocol);
         return (await this.#queue(text))
-            .querySelectorAll(`magic-link,ext-link-url,free-ext-link,attr-value,image-parameter#link${absolute ? ',link-target,template-name,invoke-module' : ''}`)
+            .querySelectorAll(`magic-link,ext-link-url,free-ext-link,attr-value,image-parameter#link${absolute ? ',link-target,template-name,invoke-module,magic-word#filepath,magic-word#widget' : ''}`)
             .reverse()
             .map((token) => {
-            const { type, parentNode, firstChild, lastChild, childNodes, length } = token, { name, tag } = parentNode;
+            let name;
+            if (token.is('magic-word')) {
+                ({ name } = token);
+                token = token.childNodes[1].lastChild; // eslint-disable-line no-param-reassign
+            }
+            const { type, parentNode, firstChild, lastChild, childNodes, length } = token, { tag } = parentNode;
+            name ??= parentNode.name;
             if (!(type !== 'attr-value'
                 || name === 'src' && ['templatestyles', 'img'].includes(tag)
                 || name === 'cite' && ['blockquote', 'del', 'ins', 'q'].includes(tag))
@@ -927,21 +947,26 @@ class LanguageService {
                 else if (type === 'template-name') {
                     target = parentNode.getAttribute('title').getUrl(articlePath);
                 }
-                else if (['link-target', 'invoke-module'].includes(type)
+                else if (['link-target', 'invoke-module', 'parameter-value'].includes(type)
                     || type === 'attr-value' && name === 'src' && tag === 'templatestyles'
                     || type === 'image-parameter' && !protocolRegex.test(target)) {
                     if (!absolute || target.startsWith('/')) {
                         return false;
                     }
                     let ns = 0;
-                    if (type === 'attr-value') {
-                        ns = 10;
-                    }
-                    else if (type === 'invoke-module') {
-                        ns = 828;
+                    switch (type) {
+                        case 'attr-value':
+                            ns = 10;
+                            break;
+                        case 'invoke-module':
+                            ns = 828;
+                            break;
+                        case 'parameter-value':
+                            ns = name === 'filepath' ? 6 : 274;
+                        // no default
                     }
-                    const title = index_1.default.normalizeTitle(target, ns, false, this.config, true);
-                    /* istanbul ignore if */
+                    const title = index_1.default
+                        .normalizeTitle(target, ns, false, this.config, { temporary: true });
                     if (!title.valid) {
                         return false;
                     }
@@ -1091,23 +1116,26 @@ class LanguageService {
             offsetNode = offsetNode.parentNode;
         }
         const { type, parentNode, length, name } = offsetNode;
-        let info, f, range;
+        let info, f, colon, range;
         if (offsetNode.is('double-underscore') && offset > 0) {
             info = this.#getBehaviorSwitch(offsetNode.name);
         }
         else if (type === 'magic-word-name') {
             info = this.#getParserFunction(parentNode.name);
             f = offsetNode.toString(true).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();
+            colon = offsetNode.getAttribute('colon');
         }
         else if ((offsetNode.is('magic-word') || offsetNode.is('template'))
             && offsetNode.modifier && offset >= 2 && offsetNode.getRelativeIndex(0) > offset) {
             f = offsetNode.modifier.trim().slice(0, -1);
             info = this.#getParserFunction(f.toLowerCase());
+            colon = ':';
             if (info) {
                 const aIndex = offsetNode.getAbsoluteIndex();
                 range = {
@@ -1158,7 +1186,7 @@ class LanguageService {
             contents: {
                 kind: 'markdown',
                 value: (info.signatures
-                    ? `${info.signatures.map(params => `- **{{ ${f}${params.length === 0 ? '**' : ':** '}${params.map(({ label, const: c }) => c ? label : `*${label}*`).join(' **|** ')} **}}**`).join('\n')}\n\n`
+                    ? `${info.signatures.map(params => `- **{{ ${f}${params.length === 0 ? '**' : `${colon}** `}${params.map(({ label, const: c }) => c ? label : `*${label}*`).join(' **|** ')} **}}**`).join('\n')}\n\n`
                     : '')
                     + info.description,
             },
@@ -1200,10 +1228,10 @@ class LanguageService {
                 break;
             }
         }
-        const f = firstChild.toString(true).trim();
+        const f = firstChild.toString(true).trim(), colon = lastChild.getAttribute('colon');
         return {
             signatures: candidates.map((params) => ({
-                label: `{{${f}${params.length === 0 ? '' : ':'}${params.map(({ label }) => label).join('|')}}}`,
+                label: `{{${f}${params.length === 0 ? '' : colon}${params.map(({ label }) => label).join('|')}}}`,
                 parameters: params.map(({ label, const: c }) => ({
                     label,
                     ...c ? { documentation: 'Predefined parameter' } : undefined,
@@ -1315,7 +1343,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`));
+            this.config = index_1.default.getConfig(await (0, config_1.default)(site, `${mt[0]}/w`, false, true));
         }
         Object.assign(this.config, { articlePath: `${mt[0]}/wiki/` });
     }

package/dist/lib/redirectMap.d.ts

@@ -0,0 +1,7 @@
+/** 重定向列表 */
+export declare class RedirectMap extends Map<string, string> {
+    #private;
+    /** @ignore */
+    constructor(entries?: Iterable<[string, string]> | Record<string, string>, redirect?: boolean);
+    set(key: string, value: string): this;
+}

package/dist/lib/redirectMap.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedirectMap = void 0;
+const constants_1 = require("../util/constants");
+/**
+ * 快速规范化页面标题
+ * @param title 标题
+ */
+const normalizeTitle = (title) => {
+    const Parser = require('../index');
+    return String(Parser.normalizeTitle(title, 0, false, undefined, { temporary: true }));
+};
+/** 重定向列表 */
+class RedirectMap extends Map {
+    #redirect;
+    /** @ignore */
+    constructor(entries, redirect = true) {
+        super();
+        this.#redirect = redirect;
+        if (entries) {
+            for (const [k, v] of Symbol.iterator in entries ? entries : Object.entries(entries)) {
+                this.set(k, v);
+            }
+        }
+    }
+    set(key, value) {
+        return super.set(normalizeTitle(key), this.#redirect ? normalizeTitle(value) : value);
+    }
+}
+exports.RedirectMap = RedirectMap;
+constants_1.classes['RedirectMap'] = __filename;

package/dist/lib/text.d.ts

@@ -69,9 +69,9 @@ export declare class AstText extends AstNode {
      */
     splitText(offset: number): AstText;
     /**
-     * Escape `=`
+     * Escape `=` and `|`
      *
-     * 转义 `=`
+     * 转义 `=` 和 `|`
      */
     escape(): void;
     /**