wikiparser-node 1.18.2 → 1.18.4

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

@@ -19,13 +19,13 @@ 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 = {
     '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([
@@ -43,6 +43,8 @@ const refTags = new Set(['ref']), referencesTags = new Set(['ref', 'references']
     '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 +278,7 @@ class LanguageService {
     #config;
     #include;
     #completionConfig;
+    /** @since v1.17.1 */
     include = true;
     /** @private */
     config;
@@ -409,11 +412,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 { }
+        catch {
+            colors = false;
+        }
+        /* eslint-enable require-atomic-updates */
         /* NOT FOR BROWSER ONLY END */
         return root.querySelectorAll('attr-value,parameter-value,arg-default').reverse()
             .flatMap(token => {
@@ -642,7 +648,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
@@ -655,7 +661,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 */
@@ -898,8 +904,7 @@ 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,magic-word#filepath,magic-word#widget' : ''}`)
             .reverse()
@@ -959,8 +964,8 @@ class LanguageService {
                             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;
                     }
@@ -1116,13 +1121,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 +1214,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 +1227,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 +1342,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 = await index_1.default.fetchConfig(site, `${mt[0]}/w`);
         }
         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;
     /**