wikilint 2.48.0 → 3.0.0

package/dist/src/index.js

@@ -55,7 +55,7 @@ const debug_1 = require("../util/debug");
 const index_1 = __importDefault(require("../index"));
 const element_1 = require("../lib/element");
 const text_1 = require("../lib/text");
-const lintSelectors = ['category', 'html-attr#id,ext-attr#id,table-attr#id'];
+const lintSelectors = ['category', 'html-attr#id,ext-attr#id,table-attr#id', 'ext#indicator'];
 /**
  * base class for all tokens
  *
@@ -113,6 +113,7 @@ class Token extends element_1.AstElement {
             return this;
         }
         /* c8 ignore start */
+        // eslint-disable-next-line unicorn/prefer-combined-guards
         if (this.#stage >= constants_1.MAX_STAGE) {
             return this;
         }
@@ -301,7 +302,7 @@ class Token extends element_1.AstElement {
         }
         const { parseList } = require('../parser/list');
         const { firstChild, type, name } = this, lines = firstChild.toString().split('\n'), state = { lastPrefix: '' };
-        let i = type === 'root' || type === 'ext-inner' && name === 'poem' ? 0 : 1;
+        let i = type === 'root' || type === 'ext-inner' && (0, debug_1.isIsolated)(name) ? 0 : 1;
         for (; i < lines.length; i++) {
             lines[i] = parseList(lines[i], state, this.#config, this.#accum);
         }
@@ -385,18 +386,24 @@ class Token extends element_1.AstElement {
             const { lintConfig } = index_1.default, { computeEditInfo, fix: needFix, ignoreDisables, configurationComment } = lintConfig;
             let errors = super.lint(start, re);
             if (this.type === 'root') {
-                const record = new Map(), r = 'no-duplicate', s = ['category', 'id'].map(key => lintConfig.getSeverity(r, key)), wikitext = this.toString(), selector = lintSelectors.filter((_, i) => s[i]).join();
-                if (selector) {
+                const r = 'no-duplicate', s = ['category', 'id', 'indicator'].map(key => lintConfig.getSeverity(r, key)), msgs = ['category', 'id', 'name'], wikitext = this.toString();
+                for (let i = 0; i < s.length; i++) {
+                    const severity = s[i];
+                    if (!severity) {
+                        continue;
+                    }
+                    const record = new Map(), selector = lintSelectors[i];
                     for (const cat of this.querySelectorAll(selector)) {
                         let key;
-                        if (cat.is('category')) {
+                        if (i === 0) { // category
                             key = cat.name;
                         }
-                        else {
-                            const value = cat.getValue();
-                            if (value) {
-                                key = `#${value}`;
-                            }
+                        else if (i === 1) { // id
+                            key = cat.getValue().replace(/\s+/gu, '_');
+                        }
+                        else { // indicator
+                            key = cat.getAttr('name')
+                                ?.replace(/\s+/gu, '_');
                         }
                         if (key) {
                             const thisCat = record.get(key);
@@ -409,11 +416,10 @@ class Token extends element_1.AstElement {
                         }
                     }
                     for (const [key, value] of record) {
-                        if (value.size > 1 && !key.startsWith('#mw-customcollapsible-')) {
-                            const isCat = !key.startsWith('#'), msg = `duplicate-${isCat ? 'category' : 'id'}`, severity = s[isCat ? 0 : 1];
+                        if (value.size > 1 && (i !== 1 || !key.startsWith('mw-customcollapsible-'))) {
                             errors.push(...[...value].map(cat => {
-                                const e = (0, lint_1.generateForSelf)(cat, { start: cat.getAbsoluteIndex() }, r, msg, severity);
-                                if (computeEditInfo && isCat) {
+                                const e = (0, lint_1.generateForSelf)(cat, { start: cat.getAbsoluteIndex() }, r, `duplicate-${msgs[i]}`, severity);
+                                if (computeEditInfo && i === 0) {
                                     e.suggestions = [(0, lint_1.fixByRemove)(e)];
                                 }
                                 return e;
@@ -495,5 +501,40 @@ class Token extends element_1.AstElement {
                 }
             });
     }
+    /**
+     * 构建列表
+     * @param recursive 是否递归
+     */
+    #buildLists(recursive) {
+        PRINT: for (let i = 0; i < this.length; i++) {
+            const child = this.childNodes[i];
+            if (child.is('list') || child.is('dd')) {
+                child.getRange();
+            }
+            else if (recursive && child.type !== 'text') {
+                child.#buildLists(true);
+            }
+        }
+    }
+    /** @private */
+    buildLists() {
+        PRINT: this.#buildLists(true);
+    }
+    /** @private */
+    concat(elements) {
+        PRINT: {
+            if (elements.length === 0) {
+                return;
+            }
+            const { childNodes, lastChild } = this, first = elements[0], last = elements.at(-1);
+            for (const element of elements) {
+                element.setAttribute('parentNode', this);
+            }
+            lastChild?.setAttribute('nextSibling', first);
+            first.setAttribute('previousSibling', lastChild);
+            last.setAttribute('nextSibling', undefined);
+            this.setAttribute('childNodes', [...childNodes, ...elements]);
+        }
+    }
 }
 exports.Token = Token;

package/dist/src/link/base.js

@@ -124,7 +124,7 @@ let LinkBaseToken = (() => {
         /** @private */
         toString(skip) {
             const str = super.toString(skip, this.#delimiter);
-            if (this.#bracket) { // NOT FOR TEMPLATE
+            if (this.#bracket) { // eslint-disable-line unicorn/prefer-ternary
                 return `[[${str}]]`;
             }
             return str;
@@ -137,7 +137,7 @@ let LinkBaseToken = (() => {
                     'trim']()
                 : `${target.trim()}|${(0, string_1.text)(childNodes.slice(1)
                     .filter(({ type: t, name }) => t !== 'image-parameter' || name !== 'invalid'), '|')}`;
-            if (this.#bracket) { // NOT FOR TEMPLATE
+            if (this.#bracket) { // eslint-disable-line unicorn/prefer-ternary
                 return `[[${str}]]`;
             }
             return str;

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

@@ -5,7 +5,7 @@ import type { Token, AtomToken } from '../../internal';
  * category
  *
  * 分类
- * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ * @classdesc `{childNodes: [AtomToken, Token?]}`
  */
 export declare abstract class CategoryToken extends LinkBaseToken {
     readonly childNodes: readonly [AtomToken] | readonly [AtomToken, Token];

package/dist/src/link/category.js

@@ -6,7 +6,7 @@ const base_1 = require("./base");
  * category
  *
  * 分类
- * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ * @classdesc `{childNodes: [AtomToken, Token?]}`
  */
 class CategoryToken extends base_1.LinkBaseToken {
     get type() {

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

@@ -6,7 +6,7 @@ import type { Token, AtomToken } from '../../internal';
  * internal link
  *
  * 内链
- * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ * @classdesc `{childNodes: [AtomToken, Token?]}`
  */
 export declare abstract class LinkToken extends LinkBaseToken {
     readonly childNodes: readonly [AtomToken] | readonly [AtomToken, Token];

package/dist/src/link/index.js

@@ -12,7 +12,7 @@ const base_1 = require("./base");
  * internal link
  *
  * 内链
- * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ * @classdesc `{childNodes: [AtomToken, Token?]}`
  */
 class LinkToken extends base_1.LinkBaseToken {
     get type() {

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

@@ -7,7 +7,7 @@ import type { Token, AtomToken } from '../../internal';
  * target of a redirect
  *
  * 重定向目标
- * @classdesc `{childNodes: [AtomToken, ?NoincludeToken]}`
+ * @classdesc `{childNodes: [AtomToken, NoincludeToken?]}`
  */
 export declare abstract class RedirectTargetToken extends LinkBaseToken {
     readonly childNodes: readonly [AtomToken] | readonly [AtomToken, NoincludeToken];

package/dist/src/link/redirectTarget.js

@@ -12,7 +12,7 @@ const noinclude_1 = require("../nowiki/noinclude");
  * target of a redirect
  *
  * 重定向目标
- * @classdesc `{childNodes: [AtomToken, ?NoincludeToken]}`
+ * @classdesc `{childNodes: [AtomToken, NoincludeToken?]}`
  */
 class RedirectTargetToken extends base_1.LinkBaseToken {
     get type() {

package/dist/src/magicLink.d.ts

@@ -3,17 +3,18 @@ import { Token } from './index';
 import type { LintError } from '../base';
 import type { AstText, CommentToken, IncludeToken, NoincludeToken, TranscludeToken } from '../internal';
 declare type ExtLinkTypes = 'free-ext-link' | 'ext-link-url' | 'magic-link';
+declare type Child = CommentToken | IncludeToken | NoincludeToken | TranscludeToken;
 /**
  * free external link
  *
  * 自由外链
- * @classdesc `{childNodes: (AstText|CommentToken|IncludeToken|NoincludeToken)[]}`
+ * @classdesc `{childNodes: (AstText|CommentToken|IncludeToken|NoincludeToken|TranscludeToken)[]}`
  */
 export declare abstract class MagicLinkToken extends Token {
     #private;
-    readonly childNodes: readonly (AstText | CommentToken | IncludeToken | NoincludeToken | TranscludeToken)[];
+    readonly childNodes: readonly (AstText | Child)[];
     abstract get firstChild(): AstText | TranscludeToken;
-    abstract get lastChild(): AstText | CommentToken | IncludeToken | NoincludeToken | TranscludeToken;
+    abstract get lastChild(): AstText | Child;
     get type(): ExtLinkTypes;
     /**
      * text of the link

package/dist/src/magicLink.js

@@ -15,7 +15,7 @@ const spaceRegex = new RegExp(`${space}+`, 'gu');
  * free external link
  *
  * 自由外链
- * @classdesc `{childNodes: (AstText|CommentToken|IncludeToken|NoincludeToken)[]}`
+ * @classdesc `{childNodes: (AstText|CommentToken|IncludeToken|NoincludeToken|TranscludeToken)[]}`
  */
 class MagicLinkToken extends index_2.Token {
     #type;

package/dist/src/multiLine/gallery.d.ts

@@ -3,7 +3,7 @@ import { GalleryImageToken } from '../link/galleryImage';
 import { CommentLineToken } from '../nowiki/commentLine';
 import type { Config, LintError } from '../../base';
 import type { AstText, Token } from '../../internal';
-declare type Child = GalleryImageToken | CommentLineToken | AstText;
+declare type Child = GalleryImageToken | CommentLineToken;
 /**
  * `<gallery>`
  * @classdesc `{childNodes: (GalleryImageToken|CommentLineToken|AstText)[]}`
@@ -11,9 +11,9 @@ declare type Child = GalleryImageToken | CommentLineToken | AstText;
 export declare abstract class GalleryToken extends MultiLineToken {
     #private;
     readonly name: 'gallery';
-    readonly childNodes: readonly Child[];
-    abstract get firstChild(): Child | undefined;
-    abstract get lastChild(): Child | undefined;
+    readonly childNodes: readonly (AstText | Child)[];
+    abstract get firstChild(): AstText | Child | undefined;
+    abstract get lastChild(): AstText | Child | undefined;
     /** @param inner 标签内部wikitext */
     constructor(inner?: string, config?: Config, accum?: Token[]);
 }

package/dist/src/multiLine/gallery.js

@@ -28,7 +28,7 @@ class GalleryToken extends index_2.MultiLineToken {
                     continue;
                 }
                 const [, file, alt] = matches;
-                if (this.#checkFile(file)) {
+                if (this.#checkFile(file)) { // eslint-disable-line unicorn/prefer-ternary
                     // @ts-expect-error abstract class
                     super.insertAt(new galleryImage_1.GalleryImageToken('gallery', file, alt, config, accum));
                 }

package/dist/src/multiLine/imagemap.d.ts

@@ -5,17 +5,19 @@ import { GalleryImageToken } from '../link/galleryImage';
 import { ImagemapLinkToken } from '../singleLine/imagemapLink';
 import type { LintError } from '../../base';
 import type { AstText, Token } from '../../internal';
+declare type Child = GalleryImageToken | CommentLineToken | ImagemapLinkToken;
 /**
  * `<imagemap>`
- * @classdesc `{childNodes: [...CommentLineToken[], GalleryImageToken, ...(CommentLineToken|ImagemapLinkToken|AstText)[]]}`
+ * @classdesc `{childNodes: (GalleryImageToken|CommentLineToken|ImagemapLinkToken|AstText)[]]}`
  */
 export declare abstract class ImagemapToken extends MultiLineToken {
     readonly name: 'imagemap';
-    readonly childNodes: readonly (GalleryImageToken | CommentLineToken | ImagemapLinkToken | AstText)[];
+    readonly childNodes: readonly (Child | AstText)[];
     abstract get firstChild(): GalleryImageToken | CommentLineToken | undefined;
-    abstract get lastChild(): GalleryImageToken | CommentLineToken | ImagemapLinkToken | AstText | undefined;
+    abstract get lastChild(): Child | AstText | undefined;
     /** 图片 */
     get image(): GalleryImageToken | undefined;
     /** @param inner 标签内部wikitext */
     constructor(inner?: string, config?: Parser.Config, accum?: Token[]);
 }
+export {};

package/dist/src/multiLine/imagemap.js

@@ -14,7 +14,7 @@ const galleryImage_1 = require("../link/galleryImage");
 const imagemapLink_1 = require("../singleLine/imagemapLink");
 /**
  * `<imagemap>`
- * @classdesc `{childNodes: [...CommentLineToken[], GalleryImageToken, ...(CommentLineToken|ImagemapLinkToken|AstText)[]]}`
+ * @classdesc `{childNodes: (GalleryImageToken|CommentLineToken|ImagemapLinkToken|AstText)[]]}`
  */
 class ImagemapToken extends index_2.MultiLineToken {
     /** 图片 */

package/dist/src/nested.d.ts

@@ -8,7 +8,7 @@ declare type Child = ExtToken | NoincludeToken | CommentToken | IncludeToken | A
  * extension tag that has a nested structure
  *
  * 嵌套式的扩展标签
- * @classdesc `{childNodes: (ExtToken|NoincludeToken|CommentToken)[]}`
+ * @classdesc `{childNodes: (ExtToken|NoincludeToken|CommentToken|IncludeToken|ArgToken|TranscludeToken)[]}`
  */
 export declare abstract class NestedToken extends Token {
     #private;

package/dist/src/nested.js

@@ -20,7 +20,7 @@ const childTypes = new Set(['comment', 'include', 'arg', 'template', 'magic-word
  * extension tag that has a nested structure
  *
  * 嵌套式的扩展标签
- * @classdesc `{childNodes: (ExtToken|NoincludeToken|CommentToken)[]}`
+ * @classdesc `{childNodes: (ExtToken|NoincludeToken|CommentToken|IncludeToken|ArgToken|TranscludeToken)[]}`
  */
 class NestedToken extends index_2.Token {
     #tags;

package/dist/src/nowiki/list.js

@@ -22,11 +22,14 @@ class ListToken extends listBase_1.ListBaseToken {
         LINT: {
             const rule = 'syntax-like', s = index_1.default.lintConfig.getSeverity(rule, 'redirect'), { innerText } = this;
             if (s && innerText === '#') {
-                // eslint-disable-next-line prefer-const
                 let { nextSibling } = this;
+                PRINT: if (nextSibling?.is('list-range')) {
+                    nextSibling = nextSibling.firstChild;
+                }
                 if (nextSibling?.type === 'text' && linkTypes.has(nextSibling.nextSibling?.type)) {
-                    /^redirect\s*(?::\s*)?$/iu; // eslint-disable-line @typescript-eslint/no-unused-expressions
-                    const re = new RegExp(String.raw `^(?:${this.getAttribute('config').redirection.join('|')})\s*(?::\s*)?$`, 'iu');
+                    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+                    /^redirect[^\S\n]*(?::[^\S\n]*)?$/iu;
+                    const re = new RegExp(String.raw `^(?:${this.getAttribute('config').redirection.join('|')})[^\S\n]*(?::[^\S\n]*)?$`, 'iu');
                     if (re.test(`#${nextSibling.data}`)) {
                         const e = (0, lint_1.generateForSelf)(nextSibling, { start: start + 1 }, rule, 'redirect-like', s);
                         e.startIndex--;

package/dist/src/nowiki/listBase.d.ts

@@ -1,5 +1,29 @@
+import { AstText } from '../../lib/text';
+import { Token } from '../index';
 import { NowikiBaseToken } from './base';
+import type { DdToken, ListToken } from '../../internal';
+export interface ListRangeToken extends Token {
+    readonly type: 'list-range';
+    readonly previousSibling: ListToken | DdToken;
+    readonly nextSibling: DdToken | AstText | undefined;
+}
 /** `;:*#` */
 export declare abstract class ListBaseToken extends NowikiBaseToken {
     abstract get type(): 'dd' | 'list';
+    /** whether to contain `;` / 是否包含`;` */
+    get dt(): boolean;
+    /**
+     * number of indentation
+     *
+     * 缩进数
+     * @since v1.16.5
+     */
+    get indent(): number;
+    /**
+     * Get the range of the list
+     *
+     * 获取列表行的范围
+     * @throws `Error` if the token has no parent node
+     */
+    getRange(): ListRangeToken;
 }

package/dist/src/nowiki/listBase.js

@@ -1,8 +1,112 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListBaseToken = void 0;
+const debug_1 = require("../../util/debug");
+const text_1 = require("../../lib/text");
+const index_1 = require("../index");
 const base_1 = require("./base");
 /** `;:*#` */
 class ListBaseToken extends base_1.NowikiBaseToken {
+    /** whether to contain `;` / 是否包含`;` */
+    get dt() {
+        PRINT: return this.innerText.includes(';');
+    }
+    /**
+     * number of indentation
+     *
+     * 缩进数
+     * @since v1.16.5
+     */
+    get indent() {
+        PRINT: return this.innerText.split(':').length - 1;
+    }
+    /**
+     * Get the range of the list
+     *
+     * 获取列表行的范围
+     * @throws `Error` if the token has no parent node
+     */
+    getRange() {
+        PRINT: {
+            const { parentNode } = this;
+            if (!parentNode) {
+                throw new Error('There is no parent node!');
+            }
+            let { nextSibling } = this;
+            if (nextSibling?.is('list-range')) {
+                return nextSibling;
+            }
+            const { dt, type } = this;
+            let nDt = 0;
+            while (nextSibling && (nextSibling.type !== 'text' || !nextSibling.data.includes('\n'))) {
+                if (type === 'list') {
+                    if (nextSibling.is('dd')) {
+                        nDt -= nextSibling.indent;
+                        if (dt && nDt < 0) {
+                            break;
+                        }
+                    }
+                    else if (nextSibling.is('list') && nextSibling.dt) {
+                        nDt++;
+                    }
+                }
+                else if (nextSibling.is('dd')) {
+                    break;
+                }
+                ({ nextSibling } = nextSibling);
+            }
+            let start, end, contents;
+            if (nextSibling && nextSibling.type !== 'text') {
+                const { childNodes } = parentNode;
+                start = childNodes.indexOf(this) + 1;
+                end = childNodes.indexOf(nextSibling);
+                contents = childNodes.slice(start, end);
+            }
+            else {
+                if (type === 'list') {
+                    while (this.previousSibling?.is('list')) {
+                        this.setText(this.previousSibling.innerText + this.innerText);
+                        this.previousSibling.removeInternal();
+                    }
+                    for (let i = 0; i < nDt; i++) {
+                        const token = this.nextSibling;
+                        this.setText(this.innerText + token.innerText);
+                        token.removeInternal();
+                    }
+                    if (parentNode.is('list-range')) {
+                        parentNode.previousSibling.setText(parentNode.previousSibling.innerText + this.innerText);
+                        this.removeInternal();
+                        return parentNode;
+                    }
+                }
+                const { childNodes } = parentNode;
+                start = childNodes.indexOf(this) + 1;
+                if (nextSibling) {
+                    const { data } = nextSibling, offset = data.indexOf('\n'), text = new text_1.AstText(data.slice(0, offset));
+                    end = childNodes.indexOf(nextSibling);
+                    contents = childNodes.slice(start, end);
+                    const last = contents.at(-1);
+                    if (last) {
+                        last.setAttribute('nextSibling', text);
+                        text.setAttribute('previousSibling', last);
+                    }
+                    contents.push(text);
+                    nextSibling.setAttribute('data', data.slice(offset));
+                }
+                else {
+                    end = childNodes.length;
+                    contents = childNodes.slice(start);
+                }
+            }
+            const token = debug_1.Shadow.run(() => {
+                const t = new index_1.Token(undefined, this.getAttribute('config'));
+                t.type = 'list-range';
+                return t;
+            });
+            token.concat(contents); // eslint-disable-line unicorn/no-unused-builtin-method-return
+            (0, debug_1.setChildNodes)(parentNode, start, end - start, [token]);
+            return token;
+        }
+    }
 }
 exports.ListBaseToken = ListBaseToken;

package/dist/src/paramLine.d.ts

@@ -6,7 +6,7 @@ import type { ParamTagToken, FuncTagToken } from '../internal';
  * parameter of certain extension tags
  *
  * 某些扩展标签的参数
- * @classdesc `{childNodes: [AtomToken] | [AtomToken, AtomToken]}`
+ * @classdesc `{childNodes: [AtomToken, AtomToken?]}`
  */
 export declare abstract class ParamLineToken extends Token {
     readonly name: string;

package/dist/src/paramLine.js

@@ -49,7 +49,7 @@ const skipTypes = new Set(['comment', 'include', 'noinclude']);
  * parameter of certain extension tags
  *
  * 某些扩展标签的参数
- * @classdesc `{childNodes: [AtomToken] | [AtomToken, AtomToken]}`
+ * @classdesc `{childNodes: [AtomToken, AtomToken?]}`
  */
 let ParamLineToken = (() => {
     let _classDecorators = [(0, gapped_1.gapped)()];

package/dist/src/pre.d.ts

@@ -2,15 +2,16 @@ import { Token } from './index';
 import { NoincludeToken } from './nowiki/noinclude';
 import type { Config, LintError } from '../base';
 import type { AstText, AttributesToken, ExtToken, ConverterToken } from '../internal';
+declare type Child = NoincludeToken | ConverterToken;
 /**
  * `<pre>`
  * @classdesc `{childNodes: (AstText|NoincludeToken|ConverterToken)[]}`
  */
 export declare abstract class PreToken extends Token {
     readonly name: 'pre';
-    readonly childNodes: readonly (NoincludeToken | ConverterToken | AstText)[];
-    abstract get firstChild(): NoincludeToken | ConverterToken | AstText | undefined;
-    abstract get lastChild(): NoincludeToken | ConverterToken | AstText | undefined;
+    readonly childNodes: readonly (Child | AstText)[];
+    abstract get firstChild(): Child | AstText | undefined;
+    abstract get lastChild(): Child | AstText | undefined;
     abstract get nextSibling(): undefined;
     abstract get previousSibling(): AttributesToken | undefined;
     abstract get parentNode(): ExtToken | undefined;
@@ -18,3 +19,4 @@ export declare abstract class PreToken extends Token {
     /** @class */
     constructor(wikitext?: string, config?: Config, accum?: Token[]);
 }
+export {};

package/dist/src/redirect.d.ts

@@ -6,7 +6,7 @@ import type { Config, LintError } from '../base';
  * redirect
  *
  * 重定向
- * @classdesc `{childNodes: [SyntaxToken, LinkToken]}`
+ * @classdesc `{childNodes: [SyntaxToken, RedirectTargetToken]}`
  */
 export declare abstract class RedirectToken extends Token {
     #private;

package/dist/src/redirect.js

@@ -44,7 +44,7 @@ const redirectTarget_1 = require("./link/redirectTarget");
  * redirect
  *
  * 重定向
- * @classdesc `{childNodes: [SyntaxToken, LinkToken]}`
+ * @classdesc `{childNodes: [SyntaxToken, RedirectTargetToken]}`
  */
 let RedirectToken = (() => {
     let _classDecorators = [(0, hidden_1.hiddenToken)(false, false), noEscape_1.noEscape];

package/dist/src/singleLine/charinsertLine.d.ts

@@ -6,7 +6,7 @@ import type { Token, CharinsertToken, AstText } from '../../internal';
  * lines in `<charinsert>`
  *
  * `<charinsert>` 的行
- * @classdesc `{childNodes: (AstText | ExtToken)[]}`
+ * @classdesc `{childNodes: (AstText|ExtToken)[]}`
  */
 export declare abstract class CharinsertLineToken extends SingleLineToken {
     readonly childNodes: readonly (AstText | ExtToken)[];

package/dist/src/singleLine/charinsertLine.js

@@ -13,7 +13,7 @@ const ext_1 = require("../tagPair/ext");
  * lines in `<charinsert>`
  *
  * `<charinsert>` 的行
- * @classdesc `{childNodes: (AstText | ExtToken)[]}`
+ * @classdesc `{childNodes: (AstText|ExtToken)[]}`
  */
 class CharinsertLineToken extends index_2.SingleLineToken {
     get type() {

package/dist/src/table/index.d.ts

@@ -6,13 +6,13 @@ import type { TableCoords } from './trBase';
 export type TableTokens = TableToken | TrToken | TdToken;
 /** @extends {Array<TableCoords[]>} */
 export declare class Layout extends Array<TableCoords[]> {
-    abstract static from(arr: TableCoords[][]): Layout;
+    static from: (arr: TableCoords[][]) => Layout;
 }
 /**
  * table
  *
  * 表格
- * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken[], ...TrToken[], ?SyntaxToken]}`
+ * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...TdToken[], ...TrToken[], SyntaxToken?]}`
  */
 export declare abstract class TableToken extends TrBaseToken {
     readonly childNodes: readonly [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[], SyntaxToken] | readonly [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[]];

package/dist/src/table/index.js

@@ -53,7 +53,7 @@ exports.Layout = Layout;
  * table
  *
  * 表格
- * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken[], ...TrToken[], ?SyntaxToken]}`
+ * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...TdToken[], ...TrToken[], SyntaxToken?]}`
  */
 let TableToken = (() => {
     let _classSuper = trBase_1.TrBaseToken;

package/dist/src/table/tr.d.ts

@@ -5,7 +5,7 @@ import type { Token, TdToken, TableToken, SyntaxToken, AttributesToken } from '.
  * table row that contains the newline at the beginning but not at the end
  *
  * 表格行，含开头的换行，不含结尾的换行
- * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken[]]}`
+ * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...TdToken[]]}`
  */
 export declare abstract class TrToken extends TrBaseToken {
     readonly childNodes: readonly [SyntaxToken, AttributesToken, ...TdToken[]];

package/dist/src/table/tr.js

@@ -6,7 +6,7 @@ const trBase_1 = require("./trBase");
  * table row that contains the newline at the beginning but not at the end
  *
  * 表格行，含开头的换行，不含结尾的换行
- * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken[]]}`
+ * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...TdToken[]]}`
  */
 class TrToken extends trBase_1.TrBaseToken {
     get type() {

package/dist/src/tag/index.d.ts

@@ -1,17 +1,18 @@
 import { Token } from '../index';
 import type { Config } from '../../base';
 import type { AttributesToken, SyntaxToken } from '../../internal';
+declare type Child = AttributesToken | SyntaxToken;
 /**
  * HTML tag
  *
  * HTML标签
- * @classdesc `{childNodes: [AttributesToken]}`
+ * @classdesc `{childNodes: [AttributesToken|SyntaxToken]}`
  */
 export declare abstract class TagToken extends Token {
     #private;
-    readonly childNodes: readonly [AttributesToken | SyntaxToken];
-    abstract get firstChild(): AttributesToken | SyntaxToken;
-    abstract get lastChild(): AttributesToken | SyntaxToken;
+    readonly childNodes: readonly [Child];
+    abstract get firstChild(): Child;
+    abstract get lastChild(): Child;
     abstract get type(): 'html' | 'tvar';
     abstract get selfClosing(): boolean | undefined;
     /** whether to be a closing tag / 是否是闭合标签 */
@@ -21,7 +22,7 @@ export declare abstract class TagToken extends Token {
      * @param attr 标签属性
      * @param closing 是否闭合
      */
-    constructor(tag: string, attr: AttributesToken | SyntaxToken, closing: boolean, config?: Config, accum?: Token[]);
+    constructor(tag: string, attr: Child, closing: boolean, config?: Config, accum?: Token[]);
     /**
      * Find the matching tag
      *
@@ -29,3 +30,4 @@ export declare abstract class TagToken extends Token {
      */
     findMatchingTag(): this | undefined;
 }
+export {};