wikiparser-node 1.21.1 → 1.21.2

package/coverage/badge.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="98" height="20" role="img" aria-label="Coverage: 86%"><title>Coverage: 86%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="98" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="63" height="20" fill="#555"/><rect x="63" width="35" height="20" fill="#4c1"/><rect width="98" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="325" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="530">Coverage</text><text x="325" y="140" transform="scale(.1)" fill="#fff" textLength="530">Coverage</text><text aria-hidden="true" x="795" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">86%</text><text x="795" y="140" transform="scale(.1)" fill="#fff" textLength="250">86%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="98" height="20" role="img" aria-label="Coverage: 87%"><title>Coverage: 87%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="98" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="63" height="20" fill="#555"/><rect x="63" width="35" height="20" fill="#4c1"/><rect width="98" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="325" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="530">Coverage</text><text x="325" y="140" transform="scale(.1)" fill="#fff" textLength="530">Coverage</text><text aria-hidden="true" x="795" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">87%</text><text x="795" y="140" transform="scale(.1)" fill="#fff" textLength="250">87%</text></g></svg>

package/dist/addon/table.js

@@ -211,7 +211,7 @@ index_2.TableToken.prototype.insertTableRow =
         // @ts-expect-error abstract class
         const token = debug_1.Shadow.run(() => new tr_1.TrToken('\n|-', undefined, this.getAttribute('config')));
         token.setAttr(attr);
-        if (reference?.type === 'table') { // `row === 0`且表格自身是有效行
+        if (reference?.is('table')) { // `row === 0`且表格自身是有效行
             reference = this.prependTableRow();
         }
         this.insertBefore(token, reference);
@@ -289,7 +289,7 @@ index_2.TableToken.prototype.removeTableRow =
                 }
             }
         }
-        const row = rows[y], rowToken = row.type === 'tr' ? row : this.prependTableRow();
+        const row = rows[y], rowToken = row.is('tr') ? row : this.prependTableRow();
         rowToken.remove();
         return rowToken;
     };
@@ -387,7 +387,7 @@ index_2.TableToken.prototype.replicateTableRow =
     /** @implements */
     function (row) {
         let rowToken = this.getNthRow(row);
-        if (rowToken.type === 'table') {
+        if (rowToken.is('table')) {
             rowToken = this.prependTableRow();
         }
         const replicated = this.insertBefore(rowToken.cloneNode(), rowToken);
@@ -438,7 +438,7 @@ index_2.TableToken.prototype.moveTableRowBefore =
             }
         }
         let beforeToken = this.getNthRow(before);
-        if (beforeToken.type === 'table') {
+        if (beforeToken.is('table')) {
             beforeToken = this.prependTableRow();
         }
         this.insertBefore(rowToken, beforeToken);
@@ -447,7 +447,7 @@ index_2.TableToken.prototype.moveTableRowBefore =
 index_2.TableToken.prototype.moveTableRowAfter =
     /** @implements */
     function (y, after) {
-        const layout = this.getLayout(), afterToken = this.getNthRow(after), cells = afterToken.childNodes.filter(child => child.type === 'td' && child.subtype !== 'caption');
+        const layout = this.getLayout(), afterToken = this.getNthRow(after), cells = afterToken.childNodes.filter(child => child.is('td') && child.subtype !== 'caption');
         try {
             strict_1.default.deepEqual(occupied(layout, y), occupied(layout, after, true, cells));
         }

package/dist/addon/token.js

@@ -15,7 +15,41 @@ const include_1 = require("../src/tagPair/include");
 const ext_1 = require("../src/tagPair/ext");
 const html_1 = require("../src/html");
 const attributes_1 = require("../src/attributes");
-const blockElems = 'table|h1|h2|h3|h4|h5|h6|pre|p|ul|ol|dl', antiBlockElems = 'td|th';
+const blockElems = 'table|h1|h2|h3|h4|h5|h6|pre|p|ul|ol|dl', antiBlockElems = 'td|th', solvedMagicWords = new Set([
+    'if',
+    'ifeq',
+    'ifexist',
+    'switch',
+]), expandedMagicWords = new Set([
+    'currentmonth',
+    'currentmonth1',
+    'currentmonthname',
+    'currentmonthnamegen',
+    'currentmonthabbrev',
+    'currentday',
+    'currentday2',
+    'currentdayname',
+    'currentyear',
+    'currenttime',
+    'currenthour',
+    'currentweek',
+    'currentdow',
+    'currenttimestamp',
+    'localmonth',
+    'localmonth1',
+    'localmonthname',
+    'localmonthnamegen',
+    'localmonthabbrev',
+    'localday',
+    'localday2',
+    'localdayname',
+    'localyear',
+    'localtime',
+    'localhour',
+    'localweek',
+    'localdow',
+    'localtimestamp',
+]);
 // 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');
@@ -54,11 +88,12 @@ const parseIf = (accum, prev, effective) => {
  * @param config
  * @param include
  * @param context 模板调用环境
+ * @param now 当前时间
  * @param accum
  * @param stack 模板调用栈
  */
-const expand = (wikitext, config, include, context, accum = [], stack = []) => {
-    const magicWords = new Set(['if', 'ifeq', 'ifexist', 'switch']), n = accum.length, token = new index_2.Token(wikitext, config, accum);
+const expand = (wikitext, config, include, context, now = index_1.default.now ?? new Date(), accum = [], stack = []) => {
+    const n = accum.length, token = new index_2.Token(wikitext, config, accum);
     token.type = 'root';
     token.parseOnce(0, include);
     if (context !== false) {
@@ -129,9 +164,82 @@ const expand = (wikitext, config, include, context, accum = [], stack = []) => {
                 else if (stack.includes(title)) {
                     return `${prev}<span class="error">Template loop detected: [[${title}]]</span>`;
                 }
-                return implicitNewLine(expand(index_1.default.templates.get(title), config, true, target, accum, [...stack, title]).toString(), prev);
+                return implicitNewLine(expand(index_1.default.templates.get(title), config, true, target, now, accum, [...stack, title]).toString(), prev);
             }
-            else if (!magicWords.has(name)) {
+            else if (expandedMagicWords.has(name)) {
+                if (context === false) {
+                    return m;
+                }
+                switch (name) {
+                    case 'currentyear':
+                        return `${prev}${now.getUTCFullYear()}`;
+                    case 'currentmonth':
+                        return prev + String(now.getUTCMonth() + 1).padStart(2, '0');
+                    case 'currentmonth1':
+                        return `${prev}${now.getUTCMonth() + 1}`;
+                    case 'currentmonthname':
+                    case 'currentmonthnamegen':
+                        return prev + now.toLocaleString('default', { month: 'long', timeZone: 'UTC' });
+                    case 'currentmonthabbrev':
+                        return prev + now.toLocaleString('default', { month: 'short', timeZone: 'UTC' });
+                    case 'currentday':
+                        return `${prev}${now.getUTCDate()}`;
+                    case 'currentday2':
+                        return prev + String(now.getUTCDate()).padStart(2, '0');
+                    case 'currentdow':
+                        return `${prev}${now.getUTCDay()}`;
+                    case 'currentdayname':
+                        return prev + now.toLocaleString('default', { weekday: 'long', timeZone: 'UTC' });
+                    case 'currenttime':
+                        return `${prev}${String(now.getUTCHours()).padStart(2, '0')}:${String(now.getUTCMinutes()).padStart(2, '0')}`;
+                    case 'currenthour':
+                        return prev + String(now.getUTCHours()).padStart(2, '0');
+                    case 'currentweek': {
+                        const firstDay = new Date(Date.UTC(now.getUTCFullYear(), 0, 1));
+                        return `${prev}${Math.ceil((now.getTime() - firstDay.getTime()) / 1e3 / 60 / 60 / 24 / 7)}`;
+                    }
+                    case 'currenttimestamp':
+                        return prev + now.toISOString().slice(0, 19)
+                            .replace(/[-:T]/gu, '');
+                    case 'localyear':
+                        return `${prev}${now.getFullYear()}`;
+                    case 'localmonth':
+                        return prev + String(now.getMonth() + 1).padStart(2, '0');
+                    case 'localmonth1':
+                        return `${prev}${now.getMonth() + 1}`;
+                    case 'localmonthname':
+                    case 'localmonthnamegen':
+                        return prev + now.toLocaleString('default', { month: 'long' });
+                    case 'localmonthabbrev':
+                        return prev + now.toLocaleString('default', { month: 'short' });
+                    case 'localday':
+                        return `${prev}${now.getDate()}`;
+                    case 'localday2':
+                        return prev + String(now.getDate()).padStart(2, '0');
+                    case 'localdow':
+                        return `${prev}${now.getDay()}`;
+                    case 'localdayname':
+                        return prev + now.toLocaleString('default', { weekday: 'long' });
+                    case 'localtime':
+                        return `${prev}${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
+                    case 'localhour':
+                        return prev + String(now.getHours()).padStart(2, '0');
+                    case 'localweek': {
+                        const firstDay = new Date(now.getFullYear(), 0, 1);
+                        return `${prev}${Math.ceil((now.getTime() - firstDay.getTime()) / 1e3 / 60 / 60 / 24 / 7)}`;
+                    }
+                    case 'localtimestamp':
+                        return prev
+                            + String(now.getFullYear())
+                            + String(now.getMonth() + 1).padStart(2, '0')
+                            + String(now.getDate()).padStart(2, '0')
+                            + String(now.getHours()).padStart(2, '0')
+                            + String(now.getMinutes()).padStart(2, '0')
+                            + String(now.getSeconds()).padStart(2, '0');
+                    // no default
+                }
+            }
+            else if (!solvedMagicWords.has(name)) {
                 return m;
             }
             else if (length < 3 || name === 'ifeq' && length === 3) {
@@ -308,8 +416,9 @@ index_2.Token.prototype.createElement = /** @implements */ function (tagName, {
         () => new include_1.IncludeToken(tagName, '', undefined, selfClosing ? undefined : tagName, config));
     }
     else if (config.ext.includes(tagName)) {
+        return debug_1.Shadow.run(
         // @ts-expect-error abstract class
-        return debug_1.Shadow.run(() => new ext_1.ExtToken(tagName, '', undefined, selfClosing ? undefined : '', config, include));
+        () => new ext_1.ExtToken(tagName, '', undefined, selfClosing ? undefined : '', config, include));
     }
     else if (config.html.some(tags => tags.includes(tagName))) {
         return debug_1.Shadow.run(() => {
@@ -328,7 +437,7 @@ index_2.Token.prototype.sections = /** @implements */ function () {
         return undefined;
     }
     const { childNodes, length } = this, headings = [...childNodes.entries()]
-        .filter((entry) => entry[1].type === 'heading')
+        .filter((entry) => entry[1].is('heading'))
         .map(([i, { level }]) => [i, level]), lastHeading = [-1, -1, -1, -1, -1, -1], sections = headings.map(([i]) => {
         const range = this.createRange();
         range.setStart(this, i);

package/dist/bin/config.js

@@ -6,7 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
-const assert_1 = __importDefault(require("assert"));
+const strict_1 = __importDefault(require("assert/strict"));
 const cm_1 = require("@bhsd/common/dist/cm");
 const diff_1 = require("../util/diff");
 /**
@@ -145,10 +145,10 @@ exports.default = async (site, url, force, internal) => {
         const oldConfig = arrToObj(require(file)), newConfig = arrToObj(config);
         for (const [k, v] of Object.entries(newConfig)) {
             try {
-                assert_1.default.deepStrictEqual(oldConfig[k], v);
+                strict_1.default.deepStrictEqual(oldConfig[k], v);
             }
             catch (e) {
-                if (e instanceof assert_1.default.AssertionError) {
+                if (e instanceof strict_1.default.AssertionError) {
                     (0, diff_1.error)(`Configuration mismatch for "${k}"`);
                     delete e.actual;
                     delete e.expected;

package/dist/index.d.ts

@@ -13,6 +13,13 @@ declare interface Parser extends ParserBase {
     templates: Map<string, string>;
     warning: boolean;
     debugging: boolean;
+    /**
+     * Specify the current time of the parser
+     *
+     * 指定解析器的当前时间
+     * @since v1.21.2
+     */
+    now?: Date;
     /**
      * Normalize page title
      *

package/dist/lib/element.d.ts

@@ -224,6 +224,7 @@ export declare abstract class AstElement extends AstNode {
      * Escape `=` and `|`
      *
      * 转义 `=` 和 `|`
+     * @since v1.18.3
      */
     escape(): void;
 }

package/dist/lib/element.js

@@ -582,6 +582,7 @@ let AstElement = (() => {
          * Escape `=` and `|`
          *
          * 转义 `=` 和 `|`
+         * @since v1.18.3
          */
         escape() {
             for (const child of this.childNodes) {

package/dist/lib/lsp.d.ts

@@ -127,6 +127,7 @@ export declare class LanguageService implements LanguageServiceBase {
      *
      * 提供 CodeLens
      * @param text source Wikitext / 源代码
+     * @since v1.16.3
      */
     provideInlayHints(text: string): Promise<InlayHint[]>;
     /**
@@ -149,6 +150,7 @@ export declare class LanguageService implements LanguageServiceBase {
      * 设置目标维基百科
      * @param wiki Wikipedia URL / 维基百科网址
      * @throws `RangeError` 不是有效的维基百科网址
+     * @since v1.18.1
      */
     setTargetWikipedia(wiki: string): Promise<void>;
 }

package/dist/lib/lsp.js

@@ -63,7 +63,7 @@ exports.isAttr = isAttr;
  * Check if a token is an HTML attribute.
  * @param token
  */
-const isHtmlAttr = (token) => token.type === 'html-attr' || token.type === 'table-attr';
+const isHtmlAttr = (token) => token.is('html-attr') || token.is('table-attr');
 /**
  * Check if all child nodes are plain text or comments.
  * @param token
@@ -651,7 +651,7 @@ class LanguageService {
             if (t === 'magic-word' && n !== 'invoke') {
                 return undefined;
             }
-            const key = this.#text.slice(cur.getAbsoluteIndex(), root.indexFromPos(line, character)).trimStart(), [mod, func] = t === 'magic-word' ? transclusion.getModule() : [];
+            const key = this.#text.slice(cur.getAbsoluteIndex(), root.indexFromPos(line, character)).trimStart(), { module: mod, function: func } = transclusion;
             return key
                 ? getCompletion(root.querySelectorAll('parameter').filter(token => {
                     if (token === parentNode
@@ -663,8 +663,7 @@ class LanguageService {
                     else if (t === 'template') {
                         return true;
                     }
-                    const [m, f] = token.parentNode.getModule();
-                    return m === mod && f === func;
+                    return token.parentNode.module === mod && token.parentNode.function === func;
                 }).map(({ name }) => name), 'Variable', key, position, type === 'parameter-value' ? '=' : '')
                 : undefined;
             /* NOT FOR BROWSER ONLY */
@@ -1302,6 +1301,7 @@ class LanguageService {
      *
      * 提供 CodeLens
      * @param text source Wikitext / 源代码
+     * @since v1.16.3
      */
     async provideInlayHints(text) {
         const root = await this.#queue(text);
@@ -1391,6 +1391,7 @@ class LanguageService {
      * 设置目标维基百科
      * @param wiki Wikipedia URL / 维基百科网址
      * @throws `RangeError` 不是有效的维基百科网址
+     * @since v1.18.1
      */
     async setTargetWikipedia(wiki) {
         const mt = /^https?:\/\/([^./]+)\.wikipedia\.org/iu.exec(wiki);

package/dist/lib/node.d.ts

@@ -72,11 +72,26 @@ export declare abstract class AstNode implements AstNodeBase {
     get style(): Position & Dimension & {
         padding: number;
     };
-    /** font weigth and style / 字体样式 */
+    /**
+     * font weigth and style
+     *
+     * 字体样式
+     * @since v.1.8.0
+     */
     get font(): Font;
-    /** whether to be bold / 是否粗体 */
+    /**
+     * whether to be bold
+     *
+     * 是否粗体
+     * @since v.1.8.0
+     */
     get bold(): boolean;
-    /** whether to be italic / 是否斜体 */
+    /**
+     * whether to be italic
+     *
+     * 是否斜体
+     * @since v.1.8.0
+     */
     get italic(): boolean;
     constructor();
     /**
@@ -124,12 +139,14 @@ export declare abstract class AstNode implements AstNodeBase {
      *
      * 是否是某种类型的节点
      * @param type token type / 节点类型
+     * @since v1.10.0
      */
     is<T extends Token>(type: TokenTypes): this is T;
     /**
      * Get the text and the start/end positions of all lines
      *
      * 获取所有行的wikitext和起止位置
+     * @since v1.16.3
      */
     getLines(): [string, number, number][];
     /**

package/dist/lib/node.js

@@ -124,22 +124,37 @@ class AstNode {
     get fixed() {
         return false;
     }
-    /** font weigth and style / 字体样式 */
+    /**
+     * font weigth and style
+     *
+     * 字体样式
+     * @since v.1.8.0
+     */
     get font() {
         const { bold, italic, b = 0, i = 0 } = this.#getFont();
         return { bold: bold && b >= 0, italic: italic && i >= 0 };
     }
-    /** whether to be bold / 是否粗体 */
+    /**
+     * whether to be bold
+     *
+     * 是否粗体
+     * @since v.1.8.0
+     */
     get bold() {
         return this.font.bold;
     }
-    /** whether to be italic / 是否斜体 */
+    /**
+     * whether to be italic
+     *
+     * 是否斜体
+     * @since v.1.8.0
+     */
     get italic() {
         return this.font.italic;
     }
     constructor() {
-        Object.defineProperty(this, 'childNodes', { writable: false });
         if (!index_1.default.viewOnly) {
+            Object.defineProperty(this, 'childNodes', { writable: false });
             Object.freeze(this.childNodes);
         }
     }
@@ -177,16 +192,18 @@ class AstNode {
             default:
                 /* NOT FOR BROWSER */
                 if (Object.hasOwn(this, key)) {
-                    const descriptor = Object.getOwnPropertyDescriptor(this, key);
-                    if (this.#optional.has(key)) {
-                        descriptor.enumerable = Boolean(value);
+                    const descriptor = Object.getOwnPropertyDescriptor(this, key), bool = Boolean(value), optional = this.#optional.has(key) && descriptor.enumerable !== bool;
+                    if (optional) {
+                        descriptor.enumerable = bool;
                     }
-                    const oldValue = this[key], frozen = typeof oldValue === 'object' && Object.isFrozen(oldValue);
-                    Object.defineProperty(this, key, { ...descriptor, value });
-                    if (frozen && typeof value === 'object') {
+                    const oldValue = this[key];
+                    if (typeof value === 'object' && typeof oldValue === 'object' && Object.isFrozen(oldValue)) {
                         Object.freeze(value);
                     }
-                    return;
+                    if (optional || !descriptor.writable) {
+                        Object.defineProperty(this, key, { ...descriptor, value });
+                        return;
+                    }
                 }
                 /* NOT FOR BROWSER END */
                 this[key] = value; // eslint-disable-line @typescript-eslint/no-explicit-any
@@ -309,6 +326,7 @@ class AstNode {
      *
      * 是否是某种类型的节点
      * @param type token type / 节点类型
+     * @since v1.10.0
      */
     is(type) {
         return this.type === type;
@@ -317,6 +335,7 @@ class AstNode {
      * Get the text and the start/end positions of all lines
      *
      * 获取所有行的wikitext和起止位置
+     * @since v1.16.3
      */
     getLines() {
         return (0, lint_1.cache)(this.#lines, () => {
@@ -340,12 +359,15 @@ class AstNode {
             this.#optional.add(key);
         }
         /* NOT FOR BROWSER END */
-        Object.defineProperty(this, key, {
-            enumerable: !permanent && Boolean(this[key]),
-            configurable: true,
-            /* NOT FOR BROWSER */
-            writable: false,
-        });
+        const enumerable = !permanent && Boolean(this[key]);
+        if (!enumerable || !index_1.default.viewOnly) {
+            Object.defineProperty(this, key, {
+                enumerable,
+                configurable: true,
+                /* NOT FOR BROWSER */
+                writable: index_1.default.viewOnly,
+            });
+        }
     }
     /* PRINT ONLY END */
     /* NOT FOR BROWSER */

package/dist/lib/text.d.ts

@@ -72,6 +72,7 @@ export declare class AstText extends AstNode {
      * Escape `=` and `|`
      *
      * 转义 `=` 和 `|`
+     * @since v1.1.4
      */
     escape(): void;
     /**
@@ -79,6 +80,7 @@ export declare class AstText extends AstNode {
      *
      * 生成HTML
      * @param nowrap whether to disable line-wrapping / 是否不换行
+     * @since v1.10.0
      */
     toHtml(nowrap?: boolean): string;
 }

package/dist/lib/text.js

@@ -176,14 +176,16 @@ let AstText = (() => {
         /** @param text 包含文本 */
         constructor(text) {
             super();
-            /* NOT FOR BROWSER */
-            Object.defineProperties(this, {
-                data: {
-                    value: text,
-                    writable: false,
-                },
-                childNodes: { enumerable: false, configurable: false },
-            });
+            if (index_1.default.viewOnly) {
+                this.data = text;
+                /* NOT FOR BROWSER */
+            }
+            else {
+                Object.defineProperties(this, {
+                    data: { value: text, writable: false },
+                    childNodes: { enumerable: false, configurable: false },
+                });
+            }
         }
         /** @private */
         toString(skip) {
@@ -453,6 +455,7 @@ let AstText = (() => {
          * Escape `=` and `|`
          *
          * 转义 `=` 和 `|`
+         * @since v1.1.4
          */
         escape() {
             const { TranscludeToken } = require('../src/transclude');
@@ -479,6 +482,7 @@ let AstText = (() => {
          *
          * 生成HTML
          * @param nowrap whether to disable line-wrapping / 是否不换行
+         * @since v1.10.0
          */
         toHtml(nowrap) {
             const { data } = this;
@@ -489,8 +493,9 @@ 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.type === 'comment' || nextSibling.type === '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()) {
@@ -500,7 +505,7 @@ let AstText = (() => {
                             spaces.push(nextSibling);
                         }
                     }
-                    else if (mt && nextSibling.type === 'category') {
+                    else if (mt && nextSibling.is('category')) {
                         const trimmed = this.data.trimEnd();
                         if (this.data !== trimmed) {
                             const { length } = trimmed;
@@ -513,7 +518,7 @@ let AstText = (() => {
                     }
                     ({ nextSibling } = nextSibling);
                 }
-                if (mt2 || nextSibling?.type === 'table') {
+                if (mt2 || nextSibling?.is('table')) {
                     if (mt) {
                         this.deleteData(mt.index + (mt2 ? 0 : 1));
                         if (mt2) {

package/dist/lib/title.d.ts

@@ -26,7 +26,9 @@ export declare class Title {
     /** full title / 完整标题 */
     get title(): string;
     /**
-     * file extension / 扩展名
+     * file extension
+     *
+     * 扩展名
      * @since v1.1.0
      */
     get extension(): string | undefined;

package/dist/lib/title.js

@@ -56,7 +56,9 @@ class Title {
         return this.getRedirection()[1];
     }
     /**
-     * file extension / 扩展名
+     * file extension
+     *
+     * 扩展名
      * @since v1.1.0
      */
     get extension() {

package/dist/mixin/sol.js

@@ -20,7 +20,7 @@ const sol = (self) => (constructor) => {
                     : '\n';
             }
             return parentNode?.type === 'root'
-                || type === 'list' && parentNode?.type === 'list-range'
+                || type === 'list' && parentNode?.is('list-range')
                 || type !== 'heading' && parentNode?.type === 'ext-inner' && parentNode.name === 'poem'
                 ? ''
                 : '\n';

package/dist/parser/list.js

@@ -16,17 +16,20 @@ const constants_1 = require("../util/constants");
  * @param accum
  */
 const parseList = (wikitext, state, config, accum) => {
-    const mt = /^((?:\0\d+[cno]\x7F)*)([;:*#]+\s*)/u.exec(wikitext);
+    const mt = /^((?:\0\d+[cno]\x7F)*)([;:*#]+)(\s*)/u.exec(wikitext);
     if (!mt) {
         state.lastPrefix = '';
         return wikitext;
     }
-    const [total, comment, prefix] = mt, prefix2 = prefix.replace(/;/gu, ':'), commonPrefixLength = (0, html_1.getCommon)(prefix2, state.lastPrefix), parts = (commonPrefixLength > 1 ? prefix.slice(commonPrefixLength - 1) : prefix).split(/(?=;)/u), isDt = parts[0].startsWith(';');
+    const [total, comment, prefix, space] = mt, prefix2 = prefix.replace(/;/gu, ':'), commonPrefixLength = (0, html_1.getCommon)(prefix2, state.lastPrefix), parts = ((commonPrefixLength > 1 ? prefix.slice(commonPrefixLength - 1) : prefix) + space)
+        .split(/(?=;)/u), isDt = parts[0].startsWith(';');
     let dt = parts.length - (isDt ? 0 : 1);
     if (commonPrefixLength > 1) {
         const commonPrefix = prefix.slice(0, commonPrefixLength - 1);
         if (isDt) {
-            parts.unshift(commonPrefix);
+            const commonPrefixes = commonPrefix.split(/(?=;)/u);
+            parts.unshift(...commonPrefixes);
+            dt += commonPrefix.includes(';') ? commonPrefixes.length : 0;
         }
         else {
             parts[0] = commonPrefix + parts[0];

package/dist/parser/table.js

@@ -19,7 +19,7 @@ const isTr = (token) => token.lastChild.constructor !== index_1.Token;
  * @param top 当前解析的表格或表格行
  * @param stack 表格栈
  */
-const pop = (top, stack) => top.type === 'td' ? stack.pop() : top;
+const pop = (top, stack) => top.is('td') ? stack.pop() : top;
 /**
  * 解析表格，注意`tr`和`td`包含开头的换行
  * @param {Token & {firstChild: AstText}} root 根节点
@@ -92,7 +92,7 @@ const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
         }
         else if (row) {
             top = pop(top, stack);
-            if (top.type === 'tr') {
+            if (top.is('tr')) {
                 top = stack.pop();
             }
             // @ts-expect-error abstract class