wikiparser-node 1.16.1 → 1.16.2

package/data/signatures.json

@@ -764,7 +764,7 @@
 					}
 				]
 			],
-			"description": "The unexpanded wikitext is rendered (more or less, for details see [Help:Templates](https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Templates#Usage))."
+			"description": "The unexpanded wikitext is rendered (more or less, for details see [help](https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Templates#Usage))."
 		},
 		{
 			"aliases": [
@@ -848,7 +848,7 @@
 					}
 				]
 			],
-			"description": "Alias for XML-style MediaWiki parser tags or extension tags. It allows a [pre-save transform of wiki code](https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Tag_extensions#How_do_I_render_wikitext_in_my_extension?) and [Extension:ParserFunctions](https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:ParserFunctions) within tags before the tag is processed. It also prevents parsing of tags in conditional paths that aren't executed (like in `#if` statements). Content between tags is passed as the first parameter, and any attributes for the tags can be passed as subsequent parameters."
+			"description": "Alias for XML-style MediaWiki parser tags or extension tags. It allows a [pre-save transform of wiki code](https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Tag_extensions#How_do_I_render_wikitext_in_my_extension?) and parser functions within tags before the tag is processed. It also prevents parsing of tags in conditional paths that aren't executed (like in `#if` statements). Content between tags is passed as the first parameter, and any attributes for the tags can be passed as subsequent parameters."
 		},
 		{
 			"aliases": [
@@ -1550,6 +1550,84 @@
 			],
 			"description": "This function will output the final, last value a variable has at the end of the page rendering. Naturally, the value will be inserted after the parser went over the entire wiki markup, so this function can't be used in other functions, expecting the right value is being used.\n\nThe `default value` will be used if the variable doesn't exist at the final page rendering stage or if its value is an empty string. The default will be expanded right where the function is used, so the parameter will be expanded, even if it won't be needed."
 		},
+		{
+			"aliases": [
+				"#lst",
+				"#section"
+			],
+			"signatures": [
+				[
+					{
+						"label": "article"
+					},
+					{
+						"label": "chapter"
+					}
+				]
+			],
+			"description": "Transclude a section called *chapter* from a page called *article*. The target article defines the location of the section."
+		},
+		{
+			"aliases": [
+				"#lstx",
+				"#section-x"
+			],
+			"signatures": [
+				[
+					{
+						"label": "article"
+					},
+					{
+						"label": "chapter"
+					}
+				],
+				[
+					{
+						"label": "article"
+					},
+					{
+						"label": "chapter"
+					},
+					{
+						"label": "replacement text"
+					}
+				]
+			],
+			"description": "Transclude a page, but exclude a specified section. Optionally, you may add replacement text to the excluded section. The replacement text will appear in the area where the section is skipped (excluded)."
+		},
+		{
+			"aliases": [
+				"#lsth",
+				"#section-h"
+			],
+			"signatures": [
+				[
+					{
+						"label": "article"
+					}
+				],
+				[
+					{
+						"label": "article"
+					},
+					{
+						"label": "section X"
+					}
+				],
+				[
+					{
+						"label": "article"
+					},
+					{
+						"label": "section X"
+					},
+					{
+						"label": "section Y"
+					}
+				]
+			],
+			"description": "Transclude the introduction of a page (i.e. the content before the first heading), or the whole content of the first occurrence of the *section X* (which includes all its sub-sections but excludes the heading of *section X* itself), or the content from the first occurrence of *section X* (excluding the heading of *section X* itself) until it reaches the next occurrence of *section Y*. Note that *section Y* acts as a stop point so the transclusion doesn't contain the content of *section Y*."
+		},
 		{
 			"aliases": [
 				"currentyear",
@@ -2637,13 +2715,13 @@
 			"aliases": [
 				"!"
 			],
-			"description": "Used to include a vertical bar (pipe).\n\nSee [Help:Extension:ParserFunctions#Escaping pipe characters in tables](https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:ParserFunctions#Escaping_pipe_characters_in_tables) for further explanation."
+			"description": "Used to include a vertical bar (pipe).\n\nSee [help](https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:ParserFunctions#Escaping_pipe_characters_in_tables) for further explanation."
 		},
 		{
 			"aliases": [
 				"="
 			],
-			"description": "Used to include an equal sign.\n\nSee [Help:Extension:ParserFunctions#Raw equal signs](https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:ParserFunctions#Raw_equal_signs) for further explanation."
+			"description": "Used to include an equal sign.\n\nSee [help](https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:ParserFunctions#Raw_equal_signs) for further explanation."
 		},
 		{
 			"aliases": [

package/dist/addon/table.js

@@ -9,6 +9,12 @@ const tr_1 = require("../src/table/tr");
 const index_2 = require("../src/table/index");
 const td_1 = require("../src/table/td");
 const trBase_1 = require("../src/table/trBase");
+/**
+ * 比较两个数
+ * @param a
+ * @param b
+ */
+const compare = (a, b) => a - b;
 /**
  * 检查坐标形式
  * @param coords 坐标
@@ -75,7 +81,7 @@ const format = (cells, attr = {}, multi) => {
  * @param token 待填充的单元格
  */
 const fill = (y, rowToken, layout, maxCol, token) => {
-    const rowLayout = layout[y], childNodes = [...rowToken.childNodes].reverse(), index = childNodes.findIndex(child => child instanceof td_1.TdToken && child.subtype !== 'caption'), pos = index > 0 ? childNodes.length - index : undefined;
+    const rowLayout = layout[y], index = rowToken.childNodes.findLastIndex(child => child instanceof td_1.TdToken && child.subtype !== 'caption'), pos = index > 0 ? index + 1 : undefined;
     debug_1.Shadow.run(() => {
         for (let i = 0; i < maxCol; i++) {
             if (!rowLayout[i]) {
@@ -104,7 +110,7 @@ index_2.TableToken.prototype.toRawCoords =
         }
         else if (rowLayout || y > 0) {
             return x === rowLayout?.length
-                ? { row: y, column: (rowLayout.reverse().find(({ row }) => row === y)?.column ?? -1) + 1, start: true }
+                ? { row: y, column: (rowLayout.findLast(({ row }) => row === y)?.column ?? -1) + 1, start: true }
                 : undefined;
         }
         return { row: 0, column: 0, start: true };
@@ -280,7 +286,7 @@ index_2.TableToken.prototype.removeTableCol =
 index_2.TableToken.prototype.mergeCells =
     /** @implements */
     function (xlim, ylim) {
-        const layout = this.getLayout(), maxCol = Math.max(...layout.map(({ length }) => length)), [xmin, xmax] = xlim.map(x => x < 0 ? x + maxCol : x).sort(debug_1.compare), [ymin, ymax] = ylim.map(y => y < 0 ? y + layout.length : y).sort(debug_1.compare), set = new Set(layout.slice(ymin, ymax).flatMap(rowLayout => rowLayout.slice(xmin, xmax)));
+        const layout = this.getLayout(), maxCol = Math.max(...layout.map(({ length }) => length)), [xmin, xmax] = xlim.map(x => x < 0 ? x + maxCol : x).sort(compare), [ymin, ymax] = ylim.map(y => y < 0 ? y + layout.length : y).sort(compare), set = new Set(layout.slice(ymin, ymax).flatMap(rowLayout => rowLayout.slice(xmin, xmax)));
         if ([...layout[ymin - 1] ?? [], ...layout[ymax] ?? []].some(coords => set.has(coords))
             || layout.some(rowLayout => set.has(rowLayout[xmin - 1]) || set.has(rowLayout[xmax]))) {
             throw new RangeError('The area to be merged overlaps with the outer area!');

package/dist/addon/token.js

@@ -40,36 +40,6 @@ index_2.Token.prototype.createElement = /** @implements */ function (tagName, {
     /* istanbul ignore next */
     throw new RangeError(`Invalid tag name: ${tagName}`);
 };
-index_2.Token.prototype.caretPositionFromIndex = /** @implements */ function (index) {
-    if (index === undefined) {
-        return undefined;
-    }
-    const { length } = this.toString();
-    if (index >= length || index < -length) {
-        return undefined;
-    }
-    index += index < 0 ? length : 0;
-    let self = this, acc = 0, start = 0;
-    while (self.type !== 'text') {
-        const { childNodes } = self;
-        acc += self.getAttribute('padding');
-        for (let i = 0; acc <= index && i < childNodes.length; i++) {
-            const cur = childNodes[i], l = cur.toString().length;
-            acc += l;
-            if (acc > index) {
-                self = cur;
-                acc -= l;
-                start = acc;
-                break;
-            }
-            acc += self.getGaps(i);
-        }
-        if (self.childNodes === childNodes) {
-            return { offsetNode: self, offset: index - start };
-        }
-    }
-    return { offsetNode: self, offset: index - start };
-};
 index_2.Token.prototype.sections = /** @implements */ function () {
     if (this.type !== 'root') {
         return undefined;
@@ -322,75 +292,88 @@ index_2.Token.prototype.solveConst = /** @implements */ function () {
     return debug_1.Shadow.run(() => expand(this.toString(), this.getAttribute('config'), this.getAttribute('include'), false).parse());
 };
 index_2.Token.prototype.toHtml = /** @implements */ function () {
-    if (this.type !== 'root') {
-        return this.cloneNode().toHtmlInternal();
-    }
-    const expanded = this.expand();
-    constants_1.states.set(expanded, { headings: new Set() });
-    const lines = expanded.toHtmlInternal().split('\n'), blockElems = 'table|h1|h2|h3|h4|h5|h6|pre|p|ul|ol|dl', antiBlockElems = 'td|th', openRegex = new RegExp(String.raw `<(?:${blockElems}|\/(?:${antiBlockElems})|\/?(?:tr|caption|dt|dd|li))\b`, 'iu'), closeRegex = new RegExp(String.raw `<(?:\/(?:${blockElems})|${antiBlockElems}|\/?(?:center|blockquote|div|hr|figure))\b`, 'iu');
-    let output = '', inBlockElem = false, pendingPTag = false, inBlockquote = false, lastParagraph = '';
-    const /** @ignore */ closeParagraph = () => {
-        if (lastParagraph) {
-            const result = `</${lastParagraph}>\n`;
-            lastParagraph = '';
-            return result;
-        }
-        return '';
-    };
-    for (let line of lines) {
-        const openMatch = openRegex.test(line), closeMatch = closeRegex.test(line);
-        if (openMatch || closeMatch) {
-            const blockquote = /<(\/?)blockquote[\s>](?!.*<\/?blockquote[\s>])/iu.exec(line)?.[1];
-            inBlockquote = blockquote === undefined ? inBlockquote : blockquote === '';
-            pendingPTag = false;
-            output += closeParagraph();
-            inBlockElem = !closeMatch;
-        }
-        else if (!inBlockElem) {
-            if (line.startsWith(' ') && (lastParagraph === 'pre' || line.trim()) && !inBlockquote) {
-                if (lastParagraph !== 'pre') {
-                    pendingPTag = false;
-                    output += `${closeParagraph()}<pre>`;
-                    lastParagraph = 'pre';
-                }
-                line = line.slice(1);
+    const { viewOnly } = index_1.default;
+    index_1.default.viewOnly = false;
+    let html;
+    if (this.type === 'root') {
+        const expanded = this.expand();
+        constants_1.states.set(expanded, { headings: new Set() });
+        const lines = expanded.toHtmlInternal().split('\n'), blockElems = 'table|h1|h2|h3|h4|h5|h6|pre|p|ul|ol|dl', antiBlockElems = 'td|th';
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+        /<(?:table|\/(?:td|th)|\/?(?:tr|caption|dt|dd|li))\b/iu;
+        const openRegex = new RegExp(String.raw `<(?:${blockElems}|\/(?:${antiBlockElems})|\/?(?:tr|caption|dt|dd|li))\b`, 'iu');
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+        /<(?:\/(?:h1|h2)|td|th|\/?(?:center|blockquote|div|hr|figure))\b/iu;
+        const closeRegex = new RegExp(String.raw `<(?:\/(?:${blockElems})|${antiBlockElems}|\/?(?:center|blockquote|div|hr|figure))\b`, 'iu');
+        let output = '', inBlockElem = false, pendingPTag = false, inBlockquote = false, lastParagraph = '';
+        const /** @ignore */ closeParagraph = () => {
+            if (lastParagraph) {
+                const result = `</${lastParagraph}>\n`;
+                lastParagraph = '';
+                return result;
             }
-            else if (/^(?:<link\b[^>]*>\s*)+$/iu.test(line)) {
-                if (pendingPTag) {
-                    output += closeParagraph();
-                    pendingPTag = false;
-                }
+            return '';
+        };
+        for (let line of lines) {
+            const openMatch = openRegex.test(line), closeMatch = closeRegex.test(line);
+            if (openMatch || closeMatch) {
+                const blockquote = /<(\/?)blockquote[\s>](?!.*<\/?blockquote[\s>])/iu.exec(line)?.[1];
+                inBlockquote = blockquote === undefined ? inBlockquote : blockquote === '';
+                pendingPTag = false;
+                output += closeParagraph();
+                inBlockElem = !closeMatch;
             }
-            else if (!line.trim()) {
-                if (pendingPTag) {
-                    output += `${pendingPTag}<br>`;
+            else if (!inBlockElem) {
+                if (line.startsWith(' ') && (lastParagraph === 'pre' || line.trim()) && !inBlockquote) {
+                    if (lastParagraph !== 'pre') {
+                        pendingPTag = false;
+                        output += `${closeParagraph()}<pre>`;
+                        lastParagraph = 'pre';
+                    }
+                    line = line.slice(1);
+                }
+                else if (/^(?:<link\b[^>]*>\s*)+$/iu.test(line)) {
+                    if (pendingPTag) {
+                        output += closeParagraph();
+                        pendingPTag = false;
+                    }
+                }
+                else if (!line.trim()) {
+                    if (pendingPTag) {
+                        output += `${pendingPTag}<br>`;
+                        pendingPTag = false;
+                        lastParagraph = 'p';
+                    }
+                    else if (lastParagraph === 'p') {
+                        pendingPTag = '</p><p>';
+                    }
+                    else {
+                        output += closeParagraph();
+                        pendingPTag = '<p>';
+                    }
+                }
+                else if (pendingPTag) {
+                    output += pendingPTag;
                     pendingPTag = false;
                     lastParagraph = 'p';
                 }
-                else if (lastParagraph === 'p') {
-                    pendingPTag = '</p><p>';
-                }
-                else {
-                    output += closeParagraph();
-                    pendingPTag = '<p>';
+                else if (lastParagraph !== 'p') {
+                    output += `${closeParagraph()}<p>`;
+                    lastParagraph = 'p';
                 }
             }
-            else if (pendingPTag) {
-                output += pendingPTag;
-                pendingPTag = false;
-                lastParagraph = 'p';
-            }
-            else if (lastParagraph !== 'p') {
-                output += `${closeParagraph()}<p>`;
-                lastParagraph = 'p';
+            if (!pendingPTag) {
+                output += `${line}\n`;
             }
         }
-        if (!pendingPTag) {
-            output += `${line}\n`;
-        }
+        output += closeParagraph();
+        constants_1.states.delete(expanded);
+        html = output.trimEnd();
+    }
+    else {
+        html = this.cloneNode().toHtmlInternal();
     }
-    output += closeParagraph();
-    constants_1.states.delete(expanded);
-    return output.trimEnd();
+    index_1.default.viewOnly = viewOnly;
+    return html;
 };
 constants_1.classes['ExtendedToken'] = __filename;

package/dist/addon/transclude.js

@@ -133,9 +133,9 @@ transclude_1.TranscludeToken.prototype.fixDuplication =
             }
             else if (aggressive && (anonCount ? /\D\d+$/u : /(?:^|\D)\d+$/u).test(key)) {
                 let last;
-                // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-                /^a\d+$/u;
-                const str = key.slice(0, -/(?<!\d)\d+$/u.exec(key)[0].length), regex = new RegExp(String.raw `^${(0, string_1.escapeRegExp)(str)}\d+$`, 'u'), series = this.getAllArgs().filter(({ name }) => regex.test(name)), ordered = series.every(({ name }, i) => {
+                const str = key.slice(0, -/(?<!\d)\d+$/u.exec(key)[0].length);
+                /^a\d+$/u; // eslint-disable-line @typescript-eslint/no-unused-expressions
+                const regex = new RegExp(String.raw `^${(0, string_1.escapeRegExp)(str)}\d+$`, 'u'), series = this.getAllArgs().filter(({ name }) => regex.test(name)), ordered = series.every(({ name }, i) => {
                     const j = Number(name.slice(str.length)), cmp = j <= i + 1 && (i === 0 || j >= last || name === key);
                     last = j;
                     return cmp;

package/dist/base.d.mts

@@ -1,4 +1,4 @@
-import type { Range, Position, ColorInformation, ColorPresentation, CompletionItem as CompletionItemBase, CompletionItemKind, FoldingRange, DocumentLink, Location, WorkspaceEdit, Diagnostic, Hover, DocumentSymbol, CodeAction, SignatureHelp } from 'vscode-languageserver-types';
+import type { Range, Position, ColorInformation, ColorPresentation, CompletionItem as CompletionItemBase, CompletionItemKind, FoldingRange, DocumentLink, Location, WorkspaceEdit, Diagnostic, Hover, SignatureHelp, InlayHint, DocumentSymbol, CodeAction } from 'vscode-languageserver-types';
 export interface Config {
     ext: string[];
     readonly html: [string[], string[], string[]];
@@ -95,6 +95,8 @@ interface Token extends AstNode {
     querySelectorAll<T = Token>(selector: string): T[];
     /** 保存为JSON */
     json(): AST;
+    /** 生成HTML */
+    toHtml(): string;
 }
 interface SignatureParameter {
     label: string;
@@ -138,7 +140,7 @@ export interface LanguageService {
      * 提供语法检查
      * @param wikitext 源代码
      */
-    provideDiagnostics(wikitext: string): Promise<Diagnostic[]>;
+    provideDiagnostics(wikitext: string, warning?: boolean): Promise<Diagnostic[]>;
     /**
      * 提供折叠范围
      * @param text 源代码
@@ -186,6 +188,11 @@ export interface LanguageService {
      * @param position 位置
      */
     provideSignatureHelp(text: string, position: Position): Promise<SignatureHelp | undefined>;
+    /**
+     * 提供 CodeLens
+     * @param text 源代码
+     */
+    provideInlayHints(text: string): Promise<InlayHint[]>;
     /**
      * 提供快速修复建议
      * @param diagnostics 语法诊断信息
@@ -200,6 +207,7 @@ export interface LanguageService {
 export interface Parser {
     config: Config | string;
     i18n: Record<string, string> | string | undefined;
+    viewOnly: boolean;
     /** 获取当前的解析设置 */
     getConfig(): Config;
     /**

package/dist/base.d.ts

@@ -1,4 +1,4 @@
-import type { Range, Position, ColorInformation, ColorPresentation, CompletionItem as CompletionItemBase, CompletionItemKind, FoldingRange, DocumentLink, Location, WorkspaceEdit, Diagnostic, Hover, DocumentSymbol, CodeAction, SignatureHelp } from 'vscode-languageserver-types';
+import type { Range, Position, ColorInformation, ColorPresentation, CompletionItem as CompletionItemBase, CompletionItemKind, FoldingRange, DocumentLink, Location, WorkspaceEdit, Diagnostic, Hover, SignatureHelp, InlayHint, DocumentSymbol, CodeAction } from 'vscode-languageserver-types';
 export interface Config {
     ext: string[];
     readonly html: [string[], string[], string[]];
@@ -95,6 +95,8 @@ interface Token extends AstNode {
     querySelectorAll<T = Token>(selector: string): T[];
     /** 保存为JSON */
     json(): AST;
+    /** 生成HTML */
+    toHtml(): string;
 }
 interface SignatureParameter {
     label: string;
@@ -138,7 +140,7 @@ export interface LanguageService {
      * 提供语法检查
      * @param wikitext 源代码
      */
-    provideDiagnostics(wikitext: string): Promise<Diagnostic[]>;
+    provideDiagnostics(wikitext: string, warning?: boolean): Promise<Diagnostic[]>;
     /**
      * 提供折叠范围
      * @param text 源代码
@@ -186,6 +188,11 @@ export interface LanguageService {
      * @param position 位置
      */
     provideSignatureHelp(text: string, position: Position): Promise<SignatureHelp | undefined>;
+    /**
+     * 提供 CodeLens
+     * @param text 源代码
+     */
+    provideInlayHints(text: string): Promise<InlayHint[]>;
     /**
      * 提供快速修复建议
      * @param diagnostics 语法诊断信息
@@ -200,6 +207,7 @@ export interface LanguageService {
 export interface Parser {
     config: Config | string;
     i18n: Record<string, string> | string | undefined;
+    viewOnly: boolean;
     /** 获取当前的解析设置 */
     getConfig(): Config;
     /**

package/dist/index.d.ts

@@ -4,7 +4,6 @@ import type { LanguageService } from './lib/lsp';
 import type { Token } from './internal';
 declare interface Parser extends ParserBase {
     rules: readonly LintError.Rule[];
-    viewOnly: boolean;
     conversionTable: Map<string, string>;
     redirects: Map<string, string>;
     templateDir?: string;

package/dist/index.js

@@ -251,12 +251,12 @@ const Parser = {
     },
     /** @implements */
     isInterwiki(title, { interwiki } = Parser.getConfig()) {
-        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-        /^(zh|en)\s*:/diu;
-        return interwiki.length > 0
-            ? new RegExp(String.raw `^(${interwiki.join('|')})\s*:`, 'diu')
-                .exec(title.replaceAll('_', ' ').replace(/^\s*:?\s*/u, ''))
-            : null;
+        if (interwiki.length > 0) {
+            /^(zh|en)\s*:/diu; // eslint-disable-line @typescript-eslint/no-unused-expressions
+            const re = new RegExp(String.raw `^(${interwiki.join('|')})\s*:`, 'diu');
+            return re.exec(title.replaceAll('_', ' ').replace(/^\s*:?\s*/u, ''));
+        }
+        return null;
     },
     /* istanbul ignore next */
     /** @implements */

package/dist/lib/attributes.d.ts

@@ -0,0 +1,24 @@
+import type { TokenTypes } from '../base';
+import type { Title } from '../lib/title';
+import type { Token } from '../internal';
+declare type Target = Token & {
+    link?: string | Title;
+};
+/** 用于选择器的属性 */
+export declare class Attributes {
+    #private;
+    token: Target;
+    type: TokenTypes;
+    constructor(token: Token);
+    get link(): string | Title | undefined;
+    get invalid(): boolean;
+    get siblings(): Token[] | undefined;
+    get siblingsOfType(): Token[] | undefined;
+    get siblingsCount(): number;
+    get siblingsCountOfType(): number;
+    get index(): number;
+    get indexOfType(): number;
+    get lastIndex(): number;
+    get lastIndexOfType(): number;
+}
+export {};

package/dist/lib/attributes.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Attributes = void 0;
+/* eslint-disable jsdoc/require-jsdoc */
+const constants_1 = require("../util/constants");
+/** 用于选择器的属性 */
+class Attributes {
+    token;
+    type;
+    #link;
+    #invalid;
+    #siblings;
+    #siblingsOfType;
+    #siblingsCount;
+    #siblingsCountOfType;
+    #index;
+    #indexOfType;
+    #lastIndex;
+    #lastIndexOfType;
+    constructor(token) {
+        this.token = token;
+        this.type = token.type;
+    }
+    get link() {
+        this.#link ??= this.token.link;
+        return this.#link;
+    }
+    get invalid() {
+        this.#invalid ??= this.type === 'table-inter'
+            || this.type === 'image-parameter' && this.token.name === 'invalid';
+        return this.#invalid;
+    }
+    get siblings() {
+        this.#siblings ??= this.token.parentNode?.children;
+        return this.#siblings;
+    }
+    get siblingsOfType() {
+        this.#siblingsOfType ??= this.siblings?.filter(({ type }) => type === this.type);
+        return this.#siblingsOfType;
+    }
+    get siblingsCount() {
+        this.#siblingsCount ??= this.siblings?.length ?? 1;
+        return this.#siblingsCount;
+    }
+    get siblingsCountOfType() {
+        this.#siblingsCountOfType ??= this.siblingsOfType?.length ?? 1;
+        return this.#siblingsCountOfType;
+    }
+    get index() {
+        this.#index ??= (this.siblings?.indexOf(this.token) ?? 0) + 1;
+        return this.#index;
+    }
+    get indexOfType() {
+        this.#indexOfType ??= (this.siblingsOfType?.indexOf(this.token) ?? 0) + 1;
+        return this.#indexOfType;
+    }
+    get lastIndex() {
+        this.#lastIndex ??= this.siblingsCount - this.index + 1;
+        return this.#lastIndex;
+    }
+    get lastIndexOfType() {
+        this.#lastIndexOfType ??= this.siblingsCountOfType - this.indexOfType + 1;
+        return this.#lastIndexOfType;
+    }
+}
+exports.Attributes = Attributes;
+constants_1.classes['Attributes'] = __filename;

package/dist/lib/element.js

@@ -34,7 +34,7 @@ class AstElement extends node_1.AstNode {
     }
     /** 末位非文本子节点 */
     get lastElementChild() {
-        return this.children[this.childElementCount - 1];
+        return this.childNodes.findLast((child) => child.type !== 'text');
     }
     /** 非文本子节点总数 */
     get childElementCount() {
@@ -55,16 +55,12 @@ class AstElement extends node_1.AstNode {
     /** 内部高度 */
     get clientHeight() {
         const { innerText } = this;
-        return typeof innerText === 'string' ? innerText.split('\n').length : undefined;
+        return innerText?.split('\n').length;
     }
     /** 内部宽度 */
     get clientWidth() {
         const { innerText } = this;
-        if (typeof innerText === 'string') {
-            const lines = innerText.split('\n');
-            return lines.at(-1).length;
-        }
-        return undefined;
+        return innerText?.split('\n').pop().length;
     }
     constructor() {
         super();
@@ -83,12 +79,16 @@ class AstElement extends node_1.AstNode {
          * @param i 移除位置
          */
         const remove = (i) => {
+            /* NOT FOR BROWSER */
             childNodes[i].setAttribute('parentNode', undefined);
+            /* NOT FOR BROWSER END */
             childNodes.splice(i, 1);
+            childNodes[i - 1]?.setAttribute('nextSibling', childNodes[i]);
+            childNodes[i]?.setAttribute('previousSibling', childNodes[i - 1]);
         };
         for (let i = childNodes.length - 1; i >= 0; i--) {
             const { type, data } = childNodes[i];
-            if (type !== 'text' || this.getGaps(i - 1)) {
+            if (type !== 'text' || childNodes.length === 1 || this.getGaps(i - (i && 1))) {
                 //
             }
             else if (data === '') {
@@ -128,7 +128,7 @@ class AstElement extends node_1.AstNode {
         if (node.contains(this)) {
             throw new RangeError('Cannot insert an ancestor node!');
         }
-        else if (this.childNodes.includes(node)) {
+        else if (node.parentNode === this) {
             throw new RangeError('Cannot insert its own child node!');
         }
         this.verifyChild(i, 1);