wikiparser-node 1.41.0 → 1.42.0

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/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
          *

package/dist/lib/text.js

@@ -260,8 +260,7 @@ let AstText = (() => {
                     // Rule & Severity
                     let startIndex = start + index, endIndex = startIndex + length, rule, severity, endLine, endCol;
                     const nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], leftBracket = lbrace || lbrack, lConverter = error === '{' && previousChar === '-' && variants.length > 0, rConverter = error === '}' && nextChar === '-' && variants.length > 0, brokenExtLink = lbrack && nextType === 'free-ext-link' && !data.slice(index + 1).trim()
-                        || rbrack && previousType === 'free-ext-link'
-                            && !data.slice(0, index).includes(']');
+                        || rbrack && previousType === 'free-ext-link' && index === 0;
                     if (magicLink) {
                         rule = 'lonely-http';
                         error = error.toUpperCase();
@@ -571,9 +570,8 @@ let AstText = (() => {
             if (/\s$/u.test(this.data)) {
                 const spaces = [], mt = /\n[^\S\n]*$/u.exec(this.data);
                 let { nextSibling } = this, mt2 = null;
-                while (nextSibling && (nextSibling.is('comment')
-                    || nextSibling.is('category')
-                    || nextSibling.type === 'text')) {
+                while (nextSibling
+                    && (nextSibling.is('comment') || nextSibling.is('category') || nextSibling.type === 'text')) {
                     if (nextSibling.type === 'text') {
                         mt2 = mt && /^[^\S\n]*(?=\n)/u.exec(nextSibling.data);
                         if (mt2 || nextSibling.data.trim()) {

package/dist/map.d.ts

@@ -0,0 +1,66 @@
+import type { RedirectToken, RedirectTargetToken, OnlyincludeToken, IncludeToken, CommentToken, ExtToken, AttributesToken, AttributeToken, AtomToken, ArgToken, TranscludeToken, SyntaxToken, ParameterToken, HeadingToken, HtmlToken, TableToken, TrToken, TdToken, DoubleUnderscoreToken, HrToken, LinkToken, CategoryToken, FileToken, ImageParameterToken, QuoteToken, ExtLinkToken, MagicLinkToken, ListToken, DdToken, ConverterToken, ConverterFlagsToken, ConverterRuleToken, TranslateToken, TvarToken, HiddenToken, GalleryImageToken, ParamLineToken, ImagemapLinkToken, ListRangeToken } from './internal';
+export interface TokenTypeMap {
+    redirect: RedirectToken;
+    'redirect-syntax': SyntaxToken;
+    'redirect-target': RedirectTargetToken;
+    translate: TranslateToken;
+    'translate-attr': SyntaxToken;
+    tvar: TvarToken;
+    'tvar-name': SyntaxToken;
+    onlyinclude: OnlyincludeToken;
+    include: IncludeToken;
+    comment: CommentToken;
+    ext: ExtToken;
+    'ext-attrs': AttributesToken;
+    'ext-attr-dirty': AtomToken;
+    'ext-attr': AttributeToken;
+    'attr-key': AtomToken;
+    arg: ArgToken;
+    'arg-name': AtomToken;
+    hidden: HiddenToken;
+    'magic-word': TranscludeToken;
+    'magic-word-name': SyntaxToken;
+    'invoke-function': AtomToken;
+    'invoke-module': AtomToken;
+    template: TranscludeToken;
+    'template-name': AtomToken;
+    parameter: ParameterToken;
+    heading: HeadingToken;
+    'heading-trail': SyntaxToken;
+    html: HtmlToken;
+    'html-attrs': AttributesToken;
+    'html-attr-dirty': AtomToken;
+    'html-attr': AttributeToken;
+    table: TableToken;
+    tr: TrToken;
+    td: TdToken;
+    'table-syntax': SyntaxToken;
+    'table-attrs': AttributesToken;
+    'table-attr-dirty': AtomToken;
+    'table-attr': AttributeToken;
+    hr: HrToken;
+    'double-underscore': DoubleUnderscoreToken;
+    link: LinkToken;
+    'link-target': AtomToken;
+    category: CategoryToken;
+    file: FileToken;
+    'gallery-image': GalleryImageToken;
+    'imagemap-image': GalleryImageToken;
+    'image-parameter': ImageParameterToken;
+    quote: QuoteToken;
+    'ext-link': ExtLinkToken;
+    'ext-link-url': MagicLinkToken;
+    'free-ext-link': MagicLinkToken;
+    'magic-link': MagicLinkToken;
+    list: ListToken;
+    dd: DdToken;
+    converter: ConverterToken;
+    'converter-flags': ConverterFlagsToken;
+    'converter-flag': AtomToken;
+    'converter-rule': ConverterRuleToken;
+    'converter-rule-variant': AtomToken;
+    'param-line': ParamLineToken;
+    'imagemap-link': ImagemapLinkToken;
+    'list-range': ListRangeToken;
+}
+export type SelectedTokenTypes = keyof TokenTypeMap;

package/dist/map.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/mixin/attributesParent.d.ts

@@ -1,6 +1,7 @@
 export interface AttributesParentBase {
     /** all attributes / 全部属性 */
-    attributes: Record<string, string | true>;
+    get attributes(): Record<string, string>;
+    set attributes(attrs: Record<string, string | true>);
     /** class attribute in string / 以字符串表示的class属性 */
     className: string;
     /** class attribute in Set / 以Set表示的class属性 */
@@ -20,7 +21,7 @@ export interface AttributesParentBase {
      * 获取指定属性
      * @param key attribute name / 属性键
      */
-    getAttr(key: string): string | true | undefined;
+    getAttr(key: string): string | undefined;
     /**
      * Get all attribute names
      *
@@ -32,7 +33,7 @@ export interface AttributesParentBase {
      *
      * 获取全部属性
      */
-    getAttrs(): Record<string, string | true>;
+    getAttrs(): Record<string, string>;
     /**
      * Set the attribute
      *

package/dist/mixin/elementLike.d.ts

@@ -1,5 +1,7 @@
 import type { AstNodes, Token, HtmlToken, ExtToken } from '../internal';
+import type { TokenTypeMap, SelectedTokenTypes } from '../map';
 declare type ElementConstructor = abstract new (...args: any[]) => {
+    readonly parentNode: Token | undefined;
     readonly childNodes: readonly AstNodes[];
     detach?: () => void;
 };
@@ -12,12 +14,21 @@ export interface ElementLike {
     readonly lastElementChild: Token | undefined;
     /** number of child elements / 非文本子节点总数 */
     readonly childElementCount: number;
+    /**
+     * Get the closest ancestor node that matches the selector
+     *
+     * 最近的符合选择器的祖先节点
+     * @param selector selector / 选择器
+     */
+    closest<K extends SelectedTokenTypes>(selector: K): TokenTypeMap[K] | undefined;
+    closest<T = Token>(selector: string): T | undefined;
     /**
      * Get the first descendant that matches the selector
      *
      * 符合选择器的第一个后代节点
      * @param selector selector / 选择器
      */
+    querySelector<K extends SelectedTokenTypes>(selector: K): TokenTypeMap[K] | undefined;
     querySelector<T = Token>(selector: string): T | undefined;
     /**
      * Get all descendants that match the selector
@@ -25,6 +36,7 @@ export interface ElementLike {
      * 符合选择器的所有后代节点
      * @param selector selector / 选择器
      */
+    querySelectorAll<K extends SelectedTokenTypes>(selector: K): TokenTypeMap[K][];
     querySelectorAll<T = Token>(selector: string): T[];
     /**
      * Escape `=` and `|`
@@ -39,6 +51,7 @@ export interface ElementLike {
      * 类型选择器
      * @param types token types / 节点类型
      */
+    getElementByTypes<K extends SelectedTokenTypes>(types: K): TokenTypeMap[K] | undefined;
     getElementByTypes<T = Token>(types: string): T | undefined;
     /**
      * Get the first descendant with the id

package/dist/mixin/elementLike.js

@@ -7,30 +7,41 @@ const selector_1 = require("../util/selector");
 const constants_1 = require("../util/constants");
 /** @ignore */
 const elementLike = (constructor) => {
-    LINT: {
-        class ElementLike extends constructor {
-            /* NOT FOR BROWSER */
-            get children() {
-                return this.childNodes.filter((child) => child.type !== 'text');
-            }
-            get firstElementChild() {
-                return this.childNodes.find((child) => child.type !== 'text');
-            }
-            get lastElementChild() {
-                return this.childNodes.findLast((child) => child.type !== 'text');
-            }
-            get childElementCount() {
-                return this.children.length;
-            }
-            /* NOT FOR BROWSER END */
-            #getCondition(selector) {
-                return (0, selector_1.getCondition)(selector, 
-                // eslint-disable-next-line unicorn/no-negated-condition
-                !('type' in this) ?
-                    undefined :
-                    this);
+    class ElementLike extends constructor {
+        /* NOT FOR BROWSER */
+        get children() {
+            return this.childNodes.filter((child) => child.type !== 'text');
+        }
+        get firstElementChild() {
+            return this.childNodes.find((child) => child.type !== 'text');
+        }
+        get lastElementChild() {
+            return this.childNodes.findLast((child) => child.type !== 'text');
+        }
+        get childElementCount() {
+            return this.children.length;
+        }
+        /* NOT FOR BROWSER END */
+        #getCondition(selector) {
+            return (0, selector_1.getCondition)(selector, 
+            // eslint-disable-next-line unicorn/no-negated-condition
+            !('type' in this) ?
+                undefined :
+                this);
+        }
+        closest(selector) {
+            const condition = this.#getCondition(selector);
+            let { parentNode } = this;
+            while (parentNode) {
+                if (condition(parentNode)) {
+                    return parentNode;
+                }
+                ({ parentNode } = parentNode);
             }
-            getElementBy(condition) {
+            return undefined;
+        }
+        getElementBy(condition) {
+            LINT: {
                 const stack = [...this.childNodes].reverse();
                 while (stack.length > 0) {
                     const child = stack.pop(), { type, childNodes } = child;
@@ -46,10 +57,12 @@ const elementLike = (constructor) => {
                 }
                 return undefined;
             }
-            querySelector(selector) {
-                return this.getElementBy(this.#getCondition(selector));
-            }
-            getElementsBy(condition) {
+        }
+        querySelector(selector) {
+            LINT: return this.getElementBy(this.#getCondition(selector));
+        }
+        getElementsBy(condition) {
+            LINT: {
                 const stack = [...this.childNodes].reverse(), descendants = [];
                 while (stack.length > 0) {
                     const child = stack.pop(), { type, childNodes } = child;
@@ -65,36 +78,36 @@ const elementLike = (constructor) => {
                 }
                 return descendants;
             }
-            querySelectorAll(selector) {
-                return this.getElementsBy(this.#getCondition(selector));
-            }
-            escape() {
-                LSP: {
-                    for (const child of this.childNodes) {
-                        child.escape();
-                    }
-                    /* NOT FOR BROWSER */
-                    this.detach?.();
+        }
+        querySelectorAll(selector) {
+            LINT: return this.getElementsBy(this.#getCondition(selector));
+        }
+        escape() {
+            LSP: {
+                for (const child of this.childNodes) {
+                    child.escape();
                 }
+                /* NOT FOR BROWSER */
+                this.detach?.();
             }
-            /* NOT FOR BROWSER */
-            getElementByTypes(types) {
-                const typeSet = new Set(types.split(',').map(str => str.trim()));
-                return this.getElementBy((({ type }) => typeSet.has(type)));
-            }
-            getElementById(id) {
-                return this.getElementBy((token => 'id' in token && token.id === id));
-            }
-            getElementsByClassName(className) {
-                return this.getElementsBy((token => 'classList' in token && token.classList.has(className)));
-            }
-            getElementsByTagName(tag) {
-                return this.getElementsBy((({ type, name }) => name === tag && (type === 'html' || type === 'ext')));
-            }
         }
-        (0, debug_1.mixin)(ElementLike, constructor);
-        return ElementLike;
+        /* NOT FOR BROWSER */
+        getElementByTypes(types) {
+            const typeSet = new Set(types.split(',').map(str => str.trim()));
+            return this.getElementBy((({ type }) => typeSet.has(type)));
+        }
+        getElementById(id) {
+            return this.getElementBy((token => 'id' in token && token.id === id));
+        }
+        getElementsByClassName(className) {
+            return this.getElementsBy((token => 'classList' in token && token.classList.has(className)));
+        }
+        getElementsByTagName(tag) {
+            return this.getElementsBy((({ type, name }) => name === tag && (type === 'html' || type === 'ext')));
+        }
     }
+    (0, debug_1.mixin)(ElementLike, constructor);
+    return ElementLike;
 };
 exports.elementLike = elementLike;
 constants_1.mixins['elementLike'] = __filename;

package/dist/parser/selector.js

@@ -163,8 +163,8 @@ const matches = (token, step, scope, has) => {
             }
         }
         else if (selector.length === 4) { // 情形2：属性选择器
-            const [key, equal, val = '', i] = selector, isAttr = typeof token.hasAttr === 'function' && typeof token.getAttr === 'function';
-            if (!(key in token || isAttr && token.hasAttr(key))) {
+            const [key, equal, val = '', i] = selector;
+            if (!(key in token || typeof token.hasAttr === 'function' && token.hasAttr(key))) {
                 return equal === '!=';
             }
             const v = toCase(val, i), thisVal = getAttr(token, key);
@@ -234,7 +234,7 @@ const matches = (token, step, scope, has) => {
                 for (; node; node = node.parentNode) {
                     const lang = node.attributes?.['lang'];
                     if (lang !== undefined) {
-                        return typeof lang === 'string' && regex.test(lang);
+                        return regex.test(lang);
                     }
                 }
                 return false;