wikiparser-node 1.40.0 → 1.42.0

package/config/jawiki.json

@@ -899,7 +899,7 @@
 			"EXPECTED_UNCONNECTED_PAGE": "EXPECTEDUNCONNECTEDPAGE"
 		}
 	],
-	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|wikipedia://|worldwind://|xmpp:",
+	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|wikipedia://|worldwind://|xmpp:|commonsfinder://",
 	"interwiki": [],
 	"img": {
 		"代替文=$1": "alt",
@@ -915,12 +915,14 @@
 		"中央": "center",
 		"center": "center",
 		"centre": "center",
+		"class=$1": "class",
 		"フレーム": "framed",
 		"frame": "framed",
 		"framed": "framed",
 		"enframed": "framed",
 		"フレームなし": "frameless",
 		"frameless": "frameless",
+		"lang=$1": "lang",
 		"左": "left",
 		"left": "left",
 		"リンク=$1": "link",
@@ -959,9 +961,7 @@
 		"upright=$1": "upright",
 		"upright $1": "upright",
 		"$1ピクセル": "width",
-		"$1px": "width",
-		"class=$1": "class",
-		"lang=$1": "lang"
+		"$1px": "width"
 	},
 	"redirection": [
 		"#転送",
@@ -971,5 +971,6 @@
 		"#redirect"
 	],
 	"variants": [],
-	"articlePath": "/wiki/$1"
+	"articlePath": "/wiki/$1",
+	"server": "//ja.wikipedia.org"
 }

package/config/llwiki.json

@@ -1011,5 +1011,6 @@
 		"zh-sg",
 		"zh-tw"
 	],
-	"articlePath": "/zh/$1"
+	"articlePath": "/zh/$1",
+	"server": "//llwiki.org"
 }

package/config/minimum.json

@@ -125,7 +125,7 @@
 		{},
 		{}
 	],
-	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|wikipedia://|worldwind://|xmpp:",
+	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|wikipedia://|worldwind://|xmpp:|commonsfinder://",
 	"interwiki": [],
 	"img": {},
 	"redirection": [

package/config/moegirl.json

@@ -997,5 +997,6 @@
 		"zh-hk",
 		"zh-tw"
 	],
-	"articlePath": "/$1"
+	"articlePath": "/$1",
+	"server": "https://zh.moegirl.org.cn"
 }

package/config/zhwiki.json

@@ -961,7 +961,7 @@
 			"EXPECTED_UNCONNECTED_PAGE": "EXPECTEDUNCONNECTEDPAGE"
 		}
 	],
-	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|wikipedia://|worldwind://|xmpp:",
+	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|wikipedia://|worldwind://|xmpp:|commonsfinder://",
 	"interwiki": [],
 	"img": {
 		"alt=$1": "alt",
@@ -1060,5 +1060,6 @@
 		"zh-sg",
 		"zh-tw"
 	],
-	"articlePath": "/wiki/$1"
+	"articlePath": "/wiki/$1",
+	"server": "//zh.wikipedia.org"
 }

package/dist/addon/attribute.js

@@ -163,7 +163,7 @@ attributes_1.AttributesToken.prototype.toggleAttr =
         key = (0, string_1.trimLc)(key);
         const attr = this.getAttrToken(key);
         /* c8 ignore next 3 */
-        if (attr && attr.getValue() !== true) {
+        if (attr && attr.getValue() !== '') {
             throw new RangeError(`${key} attribute is not Boolean!`);
         }
         if (attr) {

package/dist/addon/transclude.js

@@ -18,9 +18,7 @@ const atom_1 = require("../src/atom");
  */
 const format = (token) => {
     const { lastChild, type } = token, isParameter = lastChild.is('parameter');
-    if (!(type === 'template'
-        ? isParameter && lastChild.anon
-        : lastChild.is('magic-word-name'))
+    if (!(type === 'template' ? isParameter && lastChild.anon : lastChild.is('magic-word-name'))
         && !lastChild.toString().endsWith('\n')) {
         (isParameter ? lastChild.lastChild : lastChild).insertAt('\n');
     }

package/dist/base.d.mts

@@ -9,13 +9,14 @@ export interface Config {
     readonly parserFunction: [Record<string, string>, Record<string, string>, string[], string[]];
     readonly doubleUnderscore: [string[], string[], Record<string, string>, Record<string, string>];
     readonly protocol: string;
-    readonly interwiki: string[];
     readonly img: Record<string, string>;
     readonly redirection: string[];
     readonly variants: string[];
     articlePath?: string;
     readonly conversionTable?: [string, string][];
     readonly redirects?: [string, string][];
+    readonly interwiki: string[];
+    server?: string;
 }
 export type ConfigData = Omit<Config, 'excludes'>;
 export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'translate' | 'translate-attr' | 'translate-inner' | 'tvar' | 'tvar-name' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'magic-link' | 'list' | 'dd' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'imagemap-link' | 'list-range';
@@ -298,8 +299,9 @@ export interface LanguageService {
     [Symbol.dispose](): void;
 }
 export type SeverityLevel = 0 | 1 | 2 | false | 'off' | 'warning' | 'error';
-export type LintConfigValue = SeverityLevel | [SeverityLevel, Record<string, SeverityLevel>?];
-export type LintRuleConfig = Partial<Record<LintError.Rule, LintConfigValue>>;
+export type FullLintConfigValue = [SeverityLevel, Record<string, SeverityLevel>?];
+export type LintConfigValue = SeverityLevel | FullLintConfigValue | Record<string, SeverityLevel>;
+export type LintRuleConfig<T = LintConfigValue> = Partial<Record<LintError.Rule, T>>;
 export interface FullLintConfig {
     rules: LintRuleConfig;
     configurationComment?: string;

package/dist/base.d.ts

@@ -9,13 +9,14 @@ export interface Config {
     readonly parserFunction: [Record<string, string>, Record<string, string>, string[], string[]];
     readonly doubleUnderscore: [string[], string[], Record<string, string>, Record<string, string>];
     readonly protocol: string;
-    readonly interwiki: string[];
     readonly img: Record<string, string>;
     readonly redirection: string[];
     readonly variants: string[];
     articlePath?: string;
     readonly conversionTable?: [string, string][];
     readonly redirects?: [string, string][];
+    readonly interwiki: string[];
+    server?: string;
 }
 export type ConfigData = Omit<Config, 'excludes'>;
 export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'translate' | 'translate-attr' | 'translate-inner' | 'tvar' | 'tvar-name' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'magic-link' | 'list' | 'dd' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'imagemap-link' | 'list-range';
@@ -298,8 +299,9 @@ export interface LanguageService {
     [Symbol.dispose](): void;
 }
 export type SeverityLevel = 0 | 1 | 2 | false | 'off' | 'warning' | 'error';
-export type LintConfigValue = SeverityLevel | [SeverityLevel, Record<string, SeverityLevel>?];
-export type LintRuleConfig = Partial<Record<LintError.Rule, LintConfigValue>>;
+export type FullLintConfigValue = [SeverityLevel, Record<string, SeverityLevel>?];
+export type LintConfigValue = SeverityLevel | FullLintConfigValue | Record<string, SeverityLevel>;
+export type LintRuleConfig<T = LintConfigValue> = Partial<Record<LintError.Rule, T>>;
 export interface FullLintConfig {
     rules: LintRuleConfig;
     configurationComment?: string;

package/dist/bin/config.js

@@ -40,7 +40,7 @@ const filterGadget = (id) => {
     const n = Number(id);
     return n < 2300 || n > 2303; // Gadget, Gadget talk, Gadget definition, Gadget definition talk
 };
-const pkg = "wikiparser-node", version = "1.40.0";
+const pkg = "wikiparser-node", version = "1.42.0";
 /**
  * Get the parser configuration for a Wikimedia Foundation project.
  * @param site site nickname
@@ -78,13 +78,7 @@ exports.default = async (site, url, user, force, internal) => {
                 'User-Agent': `${pkg}/${version} (https://www.npmjs.com/package/${pkg}; ${user}) Node.js/${process.version}`,
             },
         }
-        : undefined, m = await (await fetch(`${url}/load.php?modules=ext.CodeMirror.data|ext.CodeMirror`, headers)).text(), params = {
-        action: 'query',
-        meta: 'siteinfo',
-        siprop: 'general|magicwords|functionhooks|namespaces|namespacealiases',
-        format: 'json',
-        formatversion: '2',
-    }, { general: { articlepath, variants, langconversion }, magicwords, namespaces, namespacealiases, functionhooks, } = (await (await fetch(`${url}/api.php?${new URLSearchParams(params).toString()}`, headers)).json()).query, tempFile = path_1.default.join(__dirname, 'mw.js');
+        : undefined, m = await (await fetch(`${url}/load.php?modules=ext.CodeMirror.data|ext.CodeMirror`, headers)).text(), tempFile = path_1.default.join(__dirname, 'mw.js');
     fs_1.default.writeFileSync(tempFile, m);
     const { stdout, stderr } = (0, child_process_1.spawnSync)(process.execPath, [
         '-r',
@@ -108,13 +102,19 @@ exports.default = async (site, url, user, force, internal) => {
     catch {
         throw new RangeError('Extension:CodeMirror is not installed!');
     }
-    const ns = Object.entries(namespaces).filter(([id]) => filterGadget(id))
+    const params = {
+        action: 'query',
+        meta: 'siteinfo',
+        siprop: `general|magicwords|namespaces|namespacealiases${mwConfig.functionHooks ? '' : '|functionhooks'}`,
+        format: 'json',
+        formatversion: '2',
+    }, { general: { articlepath, server, variants, langconversion }, magicwords, namespaces, namespacealiases, functionhooks, } = (await (await fetch(`${url}/api.php?${new URLSearchParams(params).toString()}`, headers)).json()).query, ns = Object.entries(namespaces).filter(([id]) => filterGadget(id))
         .flatMap(([id, { name, canonical = '' }]) => [
         [id, name],
         ...name === canonical ? [] : [[id, canonical]],
     ]), config = {
         ...(0, cm_util_1.getParserConfig)(require(path_1.default.join(dir, 'minimum.json')), mwConfig),
-        ...(0, cm_util_1.getKeywords)(magicwords),
+        ...!(mwConfig.imageKeywords && mwConfig.redirection) && (0, cm_util_1.getKeywords)(magicwords),
         variants: langconversion ? (0, cm_util_1.getVariants)(variants) : [],
         namespaces: Object.fromEntries(ns),
         nsid: Object.fromEntries([
@@ -122,6 +122,7 @@ exports.default = async (site, url, user, force, internal) => {
             ...namespacealiases.filter(({ id }) => filterGadget(id)).map(({ id, alias }) => [alias.toLowerCase(), id]),
         ]),
         articlePath: articlepath,
+        server,
     }, { doubleUnderscore, parserFunction, variable } = config;
     doubleUnderscore[0] = [];
     doubleUnderscore[1] = [];

package/dist/index.js

@@ -378,8 +378,7 @@ const Parser = {
                 [name] = entry;
             }
             const { firstChild, length } = debug_1.Shadow.internal(() => this.parse(`{{${name}:${args.join('|')}}}`, false, 2), this);
-            result = length === 1 && firstChild.is('magic-word')
-                && constants_1.functionHooks.get(lcName)(firstChild);
+            result = length === 1 && firstChild.is('magic-word') && constants_1.functionHooks.get(lcName)(firstChild);
         }
         else {
             const { expandMagicWord } = require('./render/magicWords');

package/dist/lib/element.d.ts

@@ -2,6 +2,7 @@ import { AstNode } from './node';
 import type { TokenTypes, LintError, AST } from '../base';
 import type { ElementLike } from '../mixin/elementLike';
 import type { AstNodes, AstText, Token, FileToken, LinkToken, RedirectTargetToken, ExtLinkToken, MagicLinkToken, ImageParameterToken, TranscludeToken } from '../internal';
+import type { TokenTypeMap, SelectedTokenTypes } from '../map';
 declare type LinkTokens = LinkToken | RedirectTargetToken | ExtLinkToken | MagicLinkToken | ImageParameterToken;
 export interface CaretPosition {
     readonly offsetNode: AstNodes;
@@ -54,13 +55,6 @@ export declare abstract class AstElement extends AstNode {
      * @throws `RangeError` 不能插入祖先或子节点
      */
     insertAt<T extends AstNodes>(node: T, i?: number): T;
-    /**
-     * Get the closest ancestor node that matches the selector
-     *
-     * 最近的符合选择器的祖先节点
-     * @param selector selector / 选择器
-     */
-    closest<T = Token>(selector: string): T | undefined;
     /**
      * Insert a batch of child nodes at the end
      *
@@ -120,7 +114,8 @@ export declare abstract class AstElement extends AstNode {
      * 检查是否符合选择器
      * @param selector selector / 选择器
      */
-    matches<T>(selector: string): this is T;
+    matches<K extends SelectedTokenTypes>(selector: K): this is TokenTypeMap[K];
+    matches<T extends Token>(selector: string): this is T;
     /**
      * Insert a batch of child nodes at the start
      *

package/dist/lib/element.js

@@ -40,13 +40,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstElement = void 0;
 const string_1 = require("../util/string");
 const debug_1 = require("../util/debug");
-const selector_1 = require("../util/selector");
 const node_1 = require("./node");
 const elementLike_1 = require("../mixin/elementLike");
 /* NOT FOR BROWSER */
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const constants_1 = require("../util/constants");
+const selector_1 = require("../util/selector");
 const readOnly_1 = require("../mixin/readOnly");
 /**
  * HTMLElement-like
@@ -113,8 +113,7 @@ let AstElement = (() => {
         }
         /** all internal, external and free external links / 所有内链、外链和自由外链 */
         get links() {
-            return this.querySelectorAll('link,redirect-target,ext-link,free-ext-link,magic-link,image-parameter#link').filter(({ parentNode }) => !parentNode?.is('image-parameter')
-                || parentNode.name !== 'link');
+            return this.querySelectorAll('link,redirect-target,ext-link,free-ext-link,magic-link,image-parameter#link').filter(({ parentNode }) => !parentNode?.is('image-parameter') || parentNode.name !== 'link');
         }
         /** all templates and modules / 所有模板和模块 */
         get embeds() {
@@ -165,23 +164,6 @@ let AstElement = (() => {
             (0, debug_1.setChildNodes)(this, i, 0, [node]);
             return node;
         }
-        /**
-         * Get the closest ancestor node that matches the selector
-         *
-         * 最近的符合选择器的祖先节点
-         * @param selector selector / 选择器
-         */
-        closest(selector) {
-            const condition = (0, selector_1.getCondition)(selector, this);
-            let { parentNode } = this;
-            while (parentNode) {
-                if (condition(parentNode)) {
-                    return parentNode;
-                }
-                ({ parentNode } = parentNode);
-            }
-            return undefined;
-        }
         /** @private */
         isInside(type) {
             return this.closest(`${type},ext`)?.type === type;
@@ -404,12 +386,6 @@ let AstElement = (() => {
             }
             this.setAttribute('childNodes', childNodes);
         }
-        /**
-         * Check if the current element matches the selector
-         *
-         * 检查是否符合选择器
-         * @param selector selector / 选择器
-         */
         matches(selector) {
             return (0, selector_1.getCondition)(selector, this)(this);
         }

package/dist/lib/lintConfig.js

@@ -15,8 +15,8 @@ const dict = new Map([
     ['error', 'error'],
 ]);
 const defaultLintRuleConfig = {
-    'arg-in-ext': 1,
-    'blank-alt': 1,
+    'arg-in-ext': [1],
+    'blank-alt': [1],
     'bold-header': [
         1,
         {
@@ -50,7 +50,7 @@ const defaultLintRuleConfig = {
         // value: 2,
         },
     ],
-    'insecure-style': 2,
+    'insecure-style': [2],
     'invalid-gallery': [
         2,
         {
@@ -75,14 +75,14 @@ const defaultLintRuleConfig = {
         // name: 2,
         },
     ],
-    'invalid-isbn': 2,
+    'invalid-isbn': [2],
     'invalid-json': [
         2,
         {
             duplicate: 1,
         },
     ],
-    'invalid-url': 1,
+    'invalid-url': [1],
     'lonely-apos': [
         1,
         {
@@ -113,7 +113,7 @@ const defaultLintRuleConfig = {
         // ref: 2,
         },
     ],
-    'no-arg': 1,
+    'no-arg': [1],
     'no-duplicate': [
         2,
         {
@@ -147,8 +147,8 @@ const defaultLintRuleConfig = {
             // references: 2,
         },
     ],
-    'obsolete-attr': 1,
-    'obsolete-tag': 1,
+    'obsolete-attr': [1],
+    'obsolete-tag': [1],
     'parsing-order': [
         2,
         {
@@ -185,7 +185,7 @@ const defaultLintRuleConfig = {
         // redirect: 2,
         },
     ],
-    'table-layout': 1,
+    'table-layout': [1],
     'tag-like': [
         2,
         {
@@ -193,17 +193,17 @@ const defaultLintRuleConfig = {
             invalid: 1,
         },
     ],
-    'unbalanced-header': 2,
+    'unbalanced-header': [2],
     'unclosed-comment': [
         1,
         {
         // include: 1,
         },
     ],
-    'unclosed-quote': 1,
-    'unclosed-table': 2,
-    unescaped: 2,
-    'unknown-page': 1,
+    'unclosed-quote': [1],
+    'unclosed-table': [2],
+    unescaped: [2],
+    'unknown-page': [1],
     'unmatched-tag': [
         1,
         {
@@ -250,7 +250,7 @@ const defaultLintRuleConfig = {
             warn: 1,
         },
     ],
-    'invalid-math': 2,
+    'invalid-math': [2],
 };
 const defaultLintConfig = {
     configurationComment: 'lint',
@@ -267,8 +267,9 @@ const validateSeverity = (severity) => dict.has(severity);
  * 验证设置值是否符合规范
  * @param value 设置值
  */
-const validateConfigValue = (value) => validateSeverity(value)
-    || Array.isArray(value) && validateSeverity(value[0]) && (value.length === 1 || typeof value[1] === 'object');
+const validateConfigValue = (value) => validateSeverity(value) || (Array.isArray(value)
+    ? validateSeverity(value[0]) && (value.length === 1 || typeof value[1] === 'object')
+    : typeof value === 'object');
 /**
  * 设置语法检查规则
  * @param obj 语法检查设置对象
@@ -285,7 +286,16 @@ const set = (obj, key, value) => {
         return false;
     }
     if (validateConfigValue(value)) {
-        obj[key] = value;
+        if (Array.isArray(value)) {
+            obj[key] = value;
+        }
+        else if (typeof value === 'object') {
+            const [base, options = {}] = defaultLintRuleConfig[key];
+            obj[key] = [base, { ...clone(options), ...value }];
+        }
+        else {
+            obj[key] = [value];
+        }
         return true;
     }
     /* c8 ignore next */
@@ -308,11 +318,8 @@ class LintRuleConfiguration {
     }
     /** @implements */
     getSeverity(rule, key) {
-        const value = this[rule];
-        if (typeof value !== 'object') {
-            return dict.get(value);
-        }
-        return key ? dict.get(value[1]?.[key]) ?? dict.get(value[0]) : dict.get(value[0]);
+        const [base, options] = this[rule], severity = dict.get(base);
+        return key ? dict.get(options?.[key]) ?? severity : severity;
     }
 }
 /** 语法检查设置 */

package/dist/lib/lsp.d.ts

@@ -3,6 +3,7 @@ import { Token } from '../src/index';
 import type { Range, Position, ColorInformation, ColorPresentation, FoldingRange, DocumentLink, Location, WorkspaceEdit, Diagnostic as DiagnosticBase, TextEdit, Hover, SignatureHelp, InlayHint, CodeAction, DocumentSymbol } from 'vscode-languageserver-types';
 import type { Config, LanguageService as LanguageServiceBase, CompletionItem, SignatureData } from '../base';
 import type { AttributeToken } from '../internal';
+import type { TokenTypeMap, SelectedTokenTypes } from '../map';
 export interface QuickFixData extends TextEdit {
     title: string;
     fix: boolean;
@@ -128,6 +129,7 @@ export declare class LanguageService implements LanguageServiceBase {
      * @since v1.16.3
      */
     provideInlayHints(text: string): Promise<InlayHint[]>;
+    querySelectorAll<T = Token>(selector: string): T[];
     /**
      * Provide refactoring actions
      *

package/dist/lib/lsp.js

@@ -158,15 +158,6 @@ const getRefName = (token) => getRefAttr(token, refTags, nameAttrs);
  * @param token `group` attribute token
  */
 const getRefGroup = (token) => getRefAttr(token, referencesTags, groupAttrs);
-/**
- * Get the attribute of a `<ref>` tag.
- * @param token extension token
- * @param target attribute name
- */
-const getRefTagAttr = (token, target) => {
-    const attr = token?.getAttr(target);
-    return attr !== true && attr || false;
-};
 /**
  * Get the effective name of a token.
  * @param token
@@ -682,8 +673,7 @@ class LanguageService {
                 }),
                 ...match.startsWith('#')
                     ? []
-                    : getCompletion(root.querySelectorAll('template').filter(token => token !== cur)
-                        .map(token => {
+                    : getCompletion(root.querySelectorAll('template').filter(token => token !== cur).map(token => {
                         const { name } = token;
                         if (colon) {
                             return name;
@@ -1173,8 +1163,7 @@ class LanguageService {
      * @param position position / 位置
      */
     async provideReferences(text, position) {
-        const root = await this.#queue(text), { offsetNode, offset } = caretPositionFromWord(root, this.#text, position), element = offsetNode.type === 'text' ? offsetNode.parentNode : offsetNode, node = offset === 0
-            && (element.is('ext-attr-dirty') || element.is('html-attr-dirty'))
+        const root = await this.#queue(text), { offsetNode, offset } = caretPositionFromWord(root, this.#text, position), element = offsetNode.type === 'text' ? offsetNode.parentNode : offsetNode, node = offset === 0 && (element.is('ext-attr-dirty') || element.is('html-attr-dirty'))
             ? element.parentNode.parentNode
             : element, { type } = node, refName = getRefName(node), refGroup = getRefGroup(node);
         if (!refName && !refGroup && !referenceTypes.has(type)) {
@@ -1201,13 +1190,13 @@ class LanguageService {
         }
         const ext = node.is('ext') && node.name === 'ref'
             ? node
-            : node.closest('ext#ref'), refName = getRefTagAttr(ext, 'name');
+            : node.closest('ext#ref'), refName = ext?.getAttr('name');
         if (!refName) {
             return undefined;
         }
-        const refGroup = getRefTagAttr(ext, 'group'), refs = root.querySelectorAll('ext#ref').filter(token => token.innerText
-            && getRefTagAttr(token, 'name') === refName
-            && getRefTagAttr(token, 'group') === refGroup).reverse().map(({ lastChild }) => ({
+        const refGroup = ext.getAttr('group'), refs = root.querySelectorAll('ext#ref').filter(token => token.innerText
+            && token.getAttr('name') === refName
+            && token.getAttr('group') === refGroup).reverse().map(({ lastChild }) => ({
             range: createNodeRange(lastChild),
         }));
         return refs.length === 0 ? undefined : refs;
@@ -1244,7 +1233,7 @@ class LanguageService {
         if (!node) {
             return undefined;
         }
-        const { type } = node, refName = getRefName(node), refNameGroup = refName && getRefTagAttr(node.parentNode.parentNode, 'group'), refGroup = getRefGroup(node), name = getName(node), refs = root.querySelectorAll(type).filter(token => {
+        const { type } = node, refName = getRefName(node), refNameGroup = refName && node.parentNode.parentNode.getAttr('group'), refGroup = getRefGroup(node), name = getName(node), refs = root.querySelectorAll(type).filter(token => {
             const { type: t } = token.parentNode;
             if (type === 'link-target' && t !== 'link' && t !== 'redirect-target') {
                 return false;
@@ -1252,7 +1241,7 @@ class LanguageService {
             return type === 'attr-value'
                 ? getRefGroup(token) === refGroup
                     || getRefName(token) === refName
-                        && getRefTagAttr(token.parentNode.parentNode, 'group') === refNameGroup
+                        && token.parentNode.parentNode.getAttr('group') === refNameGroup
                 : getName(token) === name;
         });
         return refs.length === 0
@@ -1452,7 +1441,6 @@ class LanguageService {
         }
         return hints;
     }
-    /** @private */
     querySelectorAll(selector) {
         return this.#done.querySelectorAll(selector);
     }

package/dist/lib/node.d.ts

@@ -1,6 +1,7 @@
 import type { AstNode as AstNodeBase, TokenTypes, LintError } from '../base';
 import type { NodeLike } from '../mixin/nodeLike';
 import type { AstText, Token } from '../internal';
+import type { TokenTypeMap, SelectedTokenTypes } from '../map';
 export type AstNodes = AstText | Token;
 export interface Dimension {
     readonly height: number;
@@ -136,6 +137,7 @@ export declare abstract class AstNode implements AstNodeBase {
      * @param type token type / 节点类型
      * @since v1.10.0
      */
+    is<K extends SelectedTokenTypes>(type: K): this is TokenTypeMap[K];
     is<T extends Token>(type: TokenTypes): this is T;
     /**
      * Get the text and the start/end positions of all lines

package/dist/lib/node.js

@@ -371,13 +371,6 @@ let AstNode = (() => {
                 ...this.getRootNode().posFromIndex(this.getAbsoluteIndex()),
             };
         }
-        /**
-         * Whether to be of a certain type
-         *
-         * 是否是某种类型的节点
-         * @param type token type / 节点类型
-         * @since v1.10.0
-         */
         is(type) {
             return this.type === type;
         }

package/dist/lib/range.d.ts

@@ -211,13 +211,6 @@ export declare class AstRange {
      * @since v1.23.0
      */
     getRootNode(): AstNodes;
-    /**
-     * Get the closest ancestor node that matches the selector
-     *
-     * 最近的符合选择器的祖先节点
-     * @param selector selector / 选择器
-     */
-    closest<T = Token>(selector: string): T | undefined;
     /**
      * Insert a batch of child nodes at the end
      *

package/dist/lib/range.js

@@ -146,6 +146,11 @@ let AstRange = (() => {
         get childNodes() {
             return this.extractContents();
         }
+        /** @private */
+        get parentNode() {
+            const { commonAncestorContainer } = this;
+            return commonAncestorContainer.type === 'text' ? commonAncestorContainer.parentNode : commonAncestorContainer;
+        }
         /**
          * 检查起点和终点的设置是否有效
          * @throws `RangeError` 起点和终点不是兄弟节点
@@ -601,20 +606,6 @@ let AstRange = (() => {
         getRootNode() {
             return (this.#endContainer ?? this.startContainer).getRootNode();
         }
-        /**
-         * Get the closest ancestor node that matches the selector
-         *
-         * 最近的符合选择器的祖先节点
-         * @param selector selector / 选择器
-         */
-        closest(selector) {
-            const { commonAncestorContainer } = this;
-            if (commonAncestorContainer.type === 'text') {
-                const { parentNode } = commonAncestorContainer;
-                return parentNode?.matches(selector) ? parentNode : parentNode?.closest(selector);
-            }
-            return commonAncestorContainer.closest(selector);
-        }
         /**
          * Insert a batch of child nodes at the end
          *