wikiparser-node 1.38.1 → 1.39.1

package/{extensions → dist/extensions}/typings.d.ts

@@ -9,7 +9,7 @@ import type {
 	CodeAction,
 } from 'vscode-languageserver-types';
 // 必须写在一行内
-import type {Config, ConfigData, LintConfig, LintError, AST, LanguageService} from '../base';
+import type {Config, ConfigData, LintConfig, LintError, AST, LanguageService, SignatureData} from '../base';
 
 declare interface Test {
 	desc: string;
@@ -40,6 +40,7 @@ export interface LanguageServiceBase extends Omit<
 	LanguageService,
 	'provideDocumentSymbols' | 'provideCodeAction'
 > {
+	data?: SignatureData;
 	provideDocumentColors(text: string): Promise<ColorInformation[]>;
 	provideColorPresentations(color: ColorInformation): Promise<ColorPresentation[]>;
 	resolveCodeAction(rule?: string): Promise<CodeAction>;

package/dist/index.js

@@ -30,6 +30,7 @@ const jsonRequire = (file) => {
     if (fullPath.endsWith('.json')) {
         return require(fullPath);
     }
+    /* c8 ignore next */
     throw new RangeError('Only JSON files are supported!');
 };
 /**
@@ -138,7 +139,7 @@ const Parser = {
                 this.config = rootRequire(this.config, 'config');
             }
             /* c8 ignore next 3 */
-            if (this.config.doubleUnderscore.length < 3 || !('functionHook' in this.config)) {
+            if (!('functionHook' in this.config)) {
                 (0, diff_1.error)(`The schema (${path_1.default.join(__dirname, '..', 'config', '.schema.json')}) of parser configuration is updated.`);
             }
             return this.getConfig();
@@ -148,7 +149,7 @@ const Parser = {
         /* NOT FOR BROWSER */
         conversionTable, redirects, } = parserConfig;
         for (let i = 0; i < 2; i++) {
-            if (doubleUnderscore.length > i + 2 && doubleUnderscore[i].length === 0) {
+            if (doubleUnderscore[i].length === 0) {
                 doubleUnderscore[i] = Object.keys(doubleUnderscore[i + 2]);
             }
         }
@@ -260,7 +261,7 @@ const Parser = {
             /* NOT FOR BROWSER ONLY END */
         });
         /* NOT FOR BROWSER */
-        if (types?.includes('list-range')) {
+        if (maxStage > constants_1.MAX_STAGE || types?.includes('list-range')) {
             root.buildLists();
         }
         /* c8 ignore start */

package/dist/lib/lsp.js

@@ -261,6 +261,7 @@ const partialParse = async (wikitext, watch, include, config = index_1.default.g
                     set(parseOnce, 0);
                 }
                 else {
+                    /* c8 ignore next */
                     resolve();
                 }
             }, 
@@ -505,6 +506,7 @@ class LanguageService {
                 colors = new RegExp(String.raw `\b${Object.keys(colorName).join('|')}\b`, 'giu');
             }
             catch {
+                /* c8 ignore next */
                 colors = false;
             }
         }
@@ -618,7 +620,7 @@ class LanguageService {
      * @param position position / 位置
      */
     async provideCompletionItems(text, position) {
-        const { re, allTags, functions, switches, jaSwitches, protocols, params, tags, ext, } = this.#prepareCompletionConfig(), { line, character } = position, curLine = text.split(/\r?\n/u, line + 1)[line], mt = re.exec(curLine?.slice(0, character) ?? ''), [, , iAlias = {}, sAlias = {}] = this.config.doubleUnderscore;
+        const { re, allTags, functions, switches, jaSwitches, protocols, params, tags, ext, } = this.#prepareCompletionConfig(), { line, character } = position, curLine = text.split(/\r?\n/u, line + 1)[line], mt = re.exec(curLine?.slice(0, character) ?? ''), [, , iAlias, sAlias] = this.config.doubleUnderscore;
         if (mt?.[1] !== undefined) { // tag
             const closing = mt[1].startsWith('/');
             return getCompletion(allTags, 'Class', mt[1].slice(closing ? 1 : 0), position, closing && !curLine?.slice(character).trim().startsWith('>') ? '>' : '');

package/dist/lib/title.d.ts

@@ -58,9 +58,9 @@ export declare class Title {
      */
     constructor(title: string, defaultNs: number, config: Config, { temporary, decode, selfLink, page }?: TitleOptions);
     /**
-     * Check if the title is a redirect
+     * Check if the title is a redirect and get the redirect target
      *
-     * 检测是否是重定向
+     * 检测是否是重定向并获取重定向目标
      * @since v1.12.2
      */
     getRedirection(): [boolean, string];
@@ -72,6 +72,13 @@ export declare class Title {
      * @since v1.10.0
      */
     getUrl(articlePath?: string): string;
+    /**
+     * Check if the title is a redirect
+     *
+     * 检测是否是重定向
+     * @since v1.38.2
+     */
+    isRedirect(): boolean;
     /**
      * Get the URL of the file
      *

package/dist/lib/title.js

@@ -201,8 +201,9 @@ class Title {
     /**
      * 生成标题
      * @param prefix 前缀
+     * @param redirect 是否允许重定向
      */
-    #getTitle(prefix) {
+    #getTitle(prefix, redirect = true) {
         let title = (prefix + this.main).replace(/ /gu, '_');
         if (title.startsWith('/')) {
             title = (this.page ?? '') + title.replace(/(.)\/$/u, '$1');
@@ -214,21 +215,23 @@ class Title {
             }
         }
         /* NOT FOR BROWSER */
-        const media = title.startsWith('Media:');
-        let redirected = this.redirects.get(media ? `File:${title.slice(6)}` : title);
-        if (redirected) {
-            const hash = redirected.indexOf('#');
-            this.#redirectFragment = hash === -1 ? undefined : redirected.slice(hash + 1);
-            redirected = hash === -1 ? redirected : redirected.slice(0, hash);
-            return [true, media ? redirected.replace(/^File:/u, 'Media:') : redirected];
+        if (redirect) {
+            const media = title.startsWith('Media:');
+            let redirected = this.redirects.get(media ? `File:${title.slice(6)}` : title);
+            if (redirected) {
+                const hash = redirected.indexOf('#');
+                this.#redirectFragment = hash === -1 ? undefined : redirected.slice(hash + 1);
+                redirected = hash === -1 ? redirected : redirected.slice(0, hash);
+                return [true, media ? redirected.replace(/^File:/u, 'Media:') : redirected];
+            }
         }
         /* NOT FOR BROWSER */
         return [false, title];
     }
     /**
-     * Check if the title is a redirect
+     * Check if the title is a redirect and get the redirect target
      *
-     * 检测是否是重定向
+     * 检测是否是重定向并获取重定向目标
      * @since v1.12.2
      */
     getRedirection() {
@@ -280,6 +283,15 @@ class Title {
         }
     }
     /* NOT FOR BROWSER */
+    /**
+     * Check if the title is a redirect
+     *
+     * 检测是否是重定向
+     * @since v1.38.2
+     */
+    isRedirect() {
+        return this.getRedirection()[0];
+    }
     /**
      * Get the URL of the file
      *
@@ -308,10 +320,15 @@ class Title {
         return expandMagicWord('filepath', [main, `${width || ''}${height ? `x${height}` : ''}`]);
     }
     /** @private */
-    toString(display) {
-        return (display ? this.displayTitle : this.title) + (this.#fragment === undefined && this.#redirectFragment === undefined
-            ? ''
-            : `#${this.#fragment ?? this.#redirectFragment}`);
+    toString(display, redirect = true) {
+        if (redirect) {
+            return (display ? this.displayTitle : this.title) + (this.#fragment === undefined && this.#redirectFragment === undefined
+                ? ''
+                : `#${this.#fragment ?? this.#redirectFragment}`);
+        }
+        const { prefix, interwiki } = this, [, result] = this.#getTitle(interwiki + (interwiki && ':') + prefix, false);
+        return (display ? result.replaceAll('_', ' ') : result)
+            + (this.#fragment === undefined ? '' : `#${this.#fragment}`);
     }
     /**
      * Perform unidirectional language conversion

package/dist/mixin/elementLike.d.ts

@@ -1,4 +1,4 @@
-import type { AstNodes, Token } from '../internal';
+import type { AstNodes, Token, HtmlToken, ExtToken } from '../internal';
 declare type ElementConstructor = abstract new (...args: any[]) => {
     readonly childNodes: readonly AstNodes[];
     detach?: () => void;
@@ -60,6 +60,6 @@ export interface ElementLike {
      * 标签名选择器
      * @param tag tag name / 标签名
      */
-    getElementsByTagName<T = Token>(tag: string): T[];
+    getElementsByTagName<T extends HtmlToken | ExtToken = HtmlToken | ExtToken>(tag: string): T[];
 }
 /** @ignore */

package/dist/parser/hrAndDoubleUnderscore.js

@@ -34,7 +34,7 @@ const parseHrAndDoubleUnderscore = ({ firstChild: { data }, type, name }, config
         if (caseSensitive || caseInsensitive) {
             // @ts-expect-error abstract class
             new doubleUnderscore_1.DoubleUnderscoreToken(key, caseSensitive, Boolean(p4), config, accum);
-            return `\0${accum.length - 1}${caseInsensitive && (aliases?.[lc] ?? /* c8 ignore next */ lc) === 'toc' ? 'u' : 'n'}\x7F`;
+            return `\0${accum.length - 1}${caseInsensitive && (aliases[lc] ?? /* c8 ignore next */ lc) === 'toc' ? 'u' : 'n'}\x7F`;
         }
         return m;
     });

package/dist/parser/table.js

@@ -92,7 +92,7 @@ const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
         else if (row) {
             top = pop(top, stack);
             if (top.is('tr')) {
-                top = stack.pop();
+                top = stack.pop(); // eslint-disable-line @typescript-eslint/no-unnecessary-type-assertion
             }
             // @ts-expect-error abstract class
             const tr = new tr_1.TrToken(`\n${spaces}${row}`, attr, config, accum);

package/dist/src/attribute.js

@@ -224,7 +224,7 @@ let AttributeToken = (() => {
                 // 不支持通用HTML属性的扩展标签
                 type === 'ext-attr' && !attrs2
                     // 或非通用HTML属性
-                    || !/^(?:xmlns:[\w:.-]+|data-(?!ooui|mw|parsoid)[^:]*)$/u.test(name)
+                    || !/^(?:xmlns:[\w:.-]+|data-(?!ooui|mw|parsoid)[^:_]*)$/u.test(name)
                         && (tag === 'meta' || tag === 'link' || !sharable_1.commonHtmlAttrs.has(name)))
                 || (name === 'itemtype' || name === 'itemid' || name === 'itemref')
                     && !parentNode?.hasAttr('itemscope')) {

package/dist/src/link/base.d.ts

@@ -1,6 +1,7 @@
+import Parser from '../../index';
 import { Token } from '../index';
 import { AtomToken } from '../atom';
-import type { Config, LintError, AST } from '../../base';
+import type { LintError, AST } from '../../base';
 import type { Title } from '../../lib/title';
 /**
  * internal link
@@ -33,7 +34,7 @@ export declare abstract class LinkBaseToken extends Token {
      * @param linkText 链接显示文字
      * @param delimiter `|`
      */
-    constructor(link: string, linkText?: string, config?: Config, accum?: Token[], delimiter?: string);
+    constructor(link: string, linkText?: string, config?: Parser.Config, accum?: Token[], delimiter?: string);
     cloneNode(): this;
     /**
      * Set the link target

package/dist/src/link/base.js

@@ -119,7 +119,7 @@ let LinkBaseToken = (() => {
          * @param linkText 链接显示文字
          * @param delimiter `|`
          */
-        constructor(link, linkText, config, accum = [], delimiter = '|') {
+        constructor(link, linkText, config = index_1.default.getConfig(), accum = [], delimiter = '|') {
             super(undefined, config, accum, {
                 AtomToken: 0, Token: 1,
             });
@@ -127,9 +127,7 @@ let LinkBaseToken = (() => {
                 'Stage-2': ':', '!ExtToken': '', '!HeadingToken': '',
             }));
             if (linkText !== undefined) {
-                const inner = new index_2.Token(linkText, config, accum, {
-                    'Stage-5': ':', QuoteToken: ':', ConverterToken: ':',
-                });
+                const inner = new index_2.Token(linkText, { ...config, excludes: [...config.excludes, 'list'] }, accum, { 'Stage-5': ':', QuoteToken: ':', ConverterToken: ':' });
                 inner.type = 'link-text';
                 inner.setAttribute('stage', constants_1.MAX_STAGE - 1);
                 this.insertAt(inner);

package/dist/src/link/redirectTarget.js

@@ -30,7 +30,7 @@ class RedirectTargetToken extends base_1.LinkBaseToken {
      * @since v1.10.0
      */
     get innerText() {
-        return this.link.toString(true);
+        return this.link.toString(true, false);
     }
     /* NOT FOR BROWSER END */
     /**

package/dist/src/nowiki/doubleUnderscore.js

@@ -78,7 +78,7 @@ let DoubleUnderscoreToken = (() => {
         constructor(word, sensitive, fullWidth, config, accum) {
             super(word, config, accum);
             const lc = word.toLowerCase(), [, , iAlias, sAlias] = config.doubleUnderscore;
-            this.setAttribute('name', (sensitive ? sAlias?.[word]?.toLowerCase() : iAlias?.[lc]) ?? lc);
+            this.setAttribute('name', (sensitive ? sAlias[word]?.toLowerCase() : iAlias[lc]) ?? lc);
             this.#fullWidth = fullWidth;
             /* NOT FOR BROWSER */
             this.#sensitive = sensitive;

package/dist/src/nowiki/listBase.js

@@ -24,7 +24,7 @@ class ListBaseToken extends base_1.NowikiBaseToken {
     /* NOT FOR BROWSER */
     /** @throws `Error` not `<dd>` only */
     set indent(indent) {
-        if (/[^:]/u.test(this.innerText)) {
+        if (/[^:\s]/u.test(this.innerText)) {
             throw new Error('The token is not <dd>!');
         }
         this.setText(':'.repeat(indent));

package/dist/src/transclude.js

@@ -682,6 +682,9 @@ let TranscludeToken = (() => {
         removeArg(key, exact) {
             debug_1.Shadow.run(() => {
                 for (const token of this.getArgs(key, exact, false)) {
+                    if (token.anon) {
+                        this.anonToNamed();
+                    }
                     this.removeChild(token);
                 }
             });

package/dist/util/string.js

@@ -58,7 +58,7 @@ const decodeHtml = (str) => {
         if (typeof process === 'object' && typeof process.versions?.node === 'string') {
             try {
                 const { decodeHTMLStrict } = require('entities');
-                return (s) => decodeHTMLStrict(s).replace(/\xA0/gu, ' ');
+                return (s) => decodeHTMLStrict(s).replaceAll('\xA0', ' ');
             }
             catch /* c8 ignore next */ { }
         }

package/extensions/dist/base.js

@@ -1,6 +1,6 @@
 (() => {
 var _a;
-const version = '1.38.1', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
+const version = '1.39.1', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
     ? src.replace(file, '')
     : `https://fastly.jsdelivr.net/npm/wikiparser-node@${version}`;
 const workerJS = () => {

package/extensions/dist/lsp.js

@@ -88,7 +88,8 @@ _LanguageService_id = new WeakMap(), _LanguageService_include = new WeakMap(), _
     if (!__classPrivateFieldGet(this, _LanguageService_hasData, "f")) {
         __classPrivateFieldSet(this, _LanguageService_hasData, true, "f");
         data !== null && data !== void 0 ? data : (data = (async () => (await fetch(`${wikiparse.CDN}/data/signatures.json`)).json())());
-        wikiparse.provide('data', __classPrivateFieldGet(this, _LanguageService_id, "f"), await data, __classPrivateFieldGet(this, _LanguageService_include, "f"));
+        this.data = await data;
+        wikiparse.provide('data', __classPrivateFieldGet(this, _LanguageService_id, "f"), this.data, __classPrivateFieldGet(this, _LanguageService_include, "f"));
     }
 };
 wikiparse.LanguageService = LanguageService;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.38.1",
+	"version": "1.39.1",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -16,7 +16,6 @@
 	"author": "Bhsd",
 	"files": [
 		"/bundle/bundle*.js",
-		"/extensions/typings.d.ts",
 		"/extensions/dist/*.js",
 		"/extensions/*.css",
 		"!/extensions/dist/*-page*.js",
@@ -46,6 +45,7 @@
 		"url": "git+https://github.com/bhsd-harry/wikiparser-node.git"
 	},
 	"scripts": {
+		"ls": "npm i --package-lock-only && npm ls --package-lock-only --all --omit=dev",
 		"toc": "node dist/script/toc.js",
 		"prepublishOnly": "npm run build:core",
 		"build:core": "bash build.sh",
@@ -53,7 +53,7 @@
 		"build": "npm run build:core && LC_ALL=en.UTF-8 node dist/script/parserTests.js",
 		"diff": "bash diff.sh",
 		"diff:stat": "f() { git diff --stat --ignore-all-space --color=always $1 $2 -- . | grep '\\.ts'; }; f",
-		"lint:ts": "tsc --noEmit && eslint --cache . && eslint --no-config-lookup -c wiki/eslint.config.mjs wiki/*.md",
+		"lint:ts": "tsc --noEmit && eslint --cache .",
 		"lint:json": "v8r -s config/.schema.json config/*.json && v8r -s data/.schema.json data/*.json && mocha dist/test/json.js",
 		"lint:md": "markdownlint-cli2 '**/*.md'",
 		"lint": "npm run lint:ts && npm run lint:json && npm run lint:md",
@@ -61,7 +61,7 @@
 		"coverage": "tsc --declaration false --target es2024 && npm run build:define && c8 npm run test:ci && node dist/script/coverage.js && open coverage/index.html",
 		"test:unit": "mocha dist/test/test.js",
 		"test:math": "mocha dist/test/math.js",
-		"test:clonenode": "CLONENODE=1 npm run test:unit",
+		"test:clonenode": "CLONENODE=1 mocha --require dist/test/env.js dist/test/test.js",
 		"test:parser": "LC_ALL=en.UTF-8 mocha dist/test/parserTests.js",
 		"test:perf": "mocha --reporter spec dist/test/perf.js",
 		"test": "npm run test:unit && npm run test:clonenode && npm run test:parser",
@@ -86,7 +86,7 @@
 		"@bhsd/cm-util": "^1.0.0",
 		"@bhsd/common": "^2.0.0",
 		"@bhsd/nodejs": "^1.0.0",
-		"@bhsd/stylelint-util": "^1.0.1",
+		"@bhsd/stylelint-util": "^1.0.2",
 		"binary-search": "^1.3.6",
 		"vscode-languageserver-types": "^3.17.5"
 	},
@@ -94,16 +94,16 @@
 		"color-name": "^2.0.0",
 		"entities": "^8.0.0",
 		"mathoid-texvcjs": "^0.6.0",
-		"prism-wiki": "^2.0.0",
+		"prism-wiki": "^2.1.0",
 		"prismjs": "^1.30.0",
-		"stylelint": "^17.6.0",
+		"stylelint": "^17.9.0",
 		"vscode-css-languageservice": "^6.3.10",
 		"vscode-html-languageservice": "^5.6.2",
 		"vscode-json-languageservice": "^5.7.2"
 	},
 	"devDependencies": {
 		"@bhsd/code-standard": "^2.2.0",
-		"@bhsd/test-util": "^1.0.0",
+		"@bhsd/test-util": "^1.1.0",
 		"@codemirror/lint": "^6.9.5",
 		"@eslint/markdown": "^8.0.1",
 		"@eslint-community/eslint-plugin-eslint-comments": "^4.7.1",
@@ -113,27 +113,31 @@
 		"@types/mocha": "^10.0.10",
 		"@types/node": "^24.11.0",
 		"@types/prismjs": "^1.26.6",
-		"@typescript-eslint/eslint-plugin": "^8.58.0",
-		"@typescript-eslint/parser": "^8.58.0",
+		"@typescript-eslint/eslint-plugin": "^8.59.0",
+		"@typescript-eslint/parser": "^8.59.0",
 		"c8": "^11.0.0",
 		"codejar-async": "^4.3.0",
 		"color-rgba": "^3.0.0",
 		"diff2html-cli": "^5.2.15",
-		"esbuild": "^0.27.7",
-		"eslint": "^10.2.0",
-		"eslint-plugin-jsdoc": "^62.7.1",
+		"esbuild": "^0.28.0",
+		"eslint": "^10.2.1",
+		"eslint-plugin-jsdoc": "^62.9.0",
 		"eslint-plugin-jsonc": "^3.1.2",
 		"eslint-plugin-n": "^17.24.0",
 		"eslint-plugin-promise": "^7.2.1",
 		"eslint-plugin-regexp": "^3.1.0",
 		"eslint-plugin-unicorn": "^64.0.0",
-		"markdownlint-cli2": "^0.21.0",
+		"markdownlint-cli2": "^0.22.1",
 		"mocha": "^11.7.5",
 		"monaco-editor": "~0.53.0",
-		"typescript": "^6.0.2",
+		"tsx": "^4.21.0",
+		"typescript": "^6.0.3",
 		"v8r": "^6.0.0",
 		"vscode-languageserver-textdocument": "^1.0.12"
 	},
+	"overrides": {
+		"eslint": "^10.2.1"
+	},
 	"engines": {
 		"node": "^20.19.0 || ^22.13.0 || >=24.11.0"
 	}