wikiparser-node 1.7.1 → 1.8.0

package/dist/addon/token.js

@@ -77,62 +77,79 @@ index_1.Token.prototype.sections =
         if (this.type !== 'root') {
             return undefined;
         }
-        const { childNodes } = this, headings = [...childNodes.entries()]
+        const { childNodes, length } = this, headings = [...childNodes.entries()]
             .filter((entry) => entry[1].type === 'heading')
-            .map(([i, { level }]) => [i, level]), lastHeading = [-1, -1, -1, -1, -1, -1], sections = new Array(headings.length);
+            .map(([i, { level }]) => [i, level]), lastHeading = [-1, -1, -1, -1, -1, -1], sections = headings.map(([i]) => {
+            const range = this.createRange();
+            range.setStart(this, i);
+            return range;
+        });
         for (let i = 0; i < headings.length; i++) {
             const [index, level] = headings[i];
             for (let j = level; j < 6; j++) {
                 const last = lastHeading[j];
                 if (last >= 0) {
-                    sections[last] = childNodes.slice(headings[last][0], index);
+                    sections[last].setEnd(this, index);
                 }
                 lastHeading[j] = j === level ? i : -1;
             }
         }
         for (const last of lastHeading) {
             if (last >= 0) {
-                sections[last] = childNodes.slice(headings[last][0]);
+                sections[last].setEnd(this, length);
             }
         }
-        sections.unshift(childNodes.slice(0, headings[0]?.[0]));
+        const range = this.createRange();
+        range.setStart(this, 0);
+        range.setEnd(this, headings[0]?.[0] ?? length);
+        sections.unshift(range);
         return sections;
     };
 index_1.Token.prototype.findEnclosingHtml =
     /** @implements */
     function (tag) {
         tag = tag?.toLowerCase();
-        if (tag !== undefined && !this.getAttribute('config').html.slice(0, 2).flat().includes(tag)) {
+        const { html } = this.getAttribute('config'), normalTags = new Set(html[0]), voidTags = new Set(html[2]);
+        if (tag !== undefined && !html.slice(0, 2).flat().includes(tag)) {
             throw new RangeError(`非法的标签或空标签：${tag}`);
         }
         const { parentNode } = this;
         if (!parentNode) {
             return undefined;
         }
-        const isHtml = (0, debug_1.isToken)('html'), { childNodes, length } = parentNode, index = childNodes.indexOf(this);
-        let i;
-        for (i = index - 1; i >= 0; i--) {
-            const child = childNodes[i];
-            if (isHtml(child) && (!tag || child.name === tag) && !child.selfClosing && !child.closing) {
-                break;
+        const isHtml = (0, debug_1.isToken)('html'), 
+        /**
+         * 检查是否为指定的 HTML 标签
+         * @param node 节点
+         * @param name 标签名
+         * @param closing 是否为闭合标签
+         */
+        checkHtml = (node, name, closing) => isHtml(node)
+            && (!name && !voidTags.has(node.name) || node.name === name)
+            && (normalTags.has(node.name) || !node.selfClosing)
+            && node.closing === closing;
+        const { childNodes, length } = parentNode, index = childNodes.indexOf(this);
+        let i = index - 1, j = length;
+        for (; i >= 0; i--) {
+            const open = childNodes[i];
+            if (checkHtml(open, tag, false)) {
+                for (j = index + 1; j < length; j++) {
+                    const close = childNodes[j];
+                    if (checkHtml(close, open.name, true)) {
+                        break;
+                    }
+                }
+                if (j < length) {
+                    break;
+                }
             }
         }
         if (i === -1) {
             return parentNode.findEnclosingHtml(tag);
         }
-        const opening = childNodes[i];
-        for (i = index + 1; i < length; i++) {
-            const child = childNodes[i];
-            if (isHtml(child) && child.name === opening.name && !child.selfClosing && child.closing) {
-                break;
-            }
-        }
-        if (i === length) {
-            return parentNode.findEnclosingHtml(tag);
-        }
         const range = this.createRange();
-        range.setStartBefore(opening);
-        range.setEnd(parentNode, i + 1);
+        range.setStart(parentNode, i);
+        range.setEnd(parentNode, j + 1);
         return range;
     };
 index_1.Token.prototype.redoQuotes =

package/dist/lib/element.d.ts

@@ -22,10 +22,6 @@ export declare abstract class AstElement extends AstNode {
     get outerText(): string;
     /** 不可见 */
     get hidden(): boolean;
-    /** 后一个可见的兄弟节点 */
-    get nextVisibleSibling(): AstNodes | undefined;
-    /** 前一个可见的兄弟节点 */
-    get previousVisibleSibling(): AstNodes | undefined;
     /** 内部高度 */
     get clientHeight(): number | undefined;
     /** 内部宽度 */
@@ -99,8 +95,6 @@ export declare abstract class AstElement extends AstNode {
      * @param start
      */
     json(file?: string, start?: number): AST;
-    /** 销毁 */
-    destroy(): void;
     /**
      * 检查是否符合选择器
      * @param selector 选择器
@@ -126,11 +120,6 @@ export declare abstract class AstElement extends AstNode {
      * @param tag 标签名
      */
     getElementsByTagName<T = Token>(tag: string): T[];
-    /**
-     * 获取某一行的wikitext
-     * @param n 行号
-     */
-    getLine(n: number): string | undefined;
     /**
      * 在开头批量插入子节点
      * @param elements 插入节点

package/dist/lib/element.js

@@ -69,22 +69,6 @@ class AstElement extends node_1.AstNode {
     get hidden() {
         return this.text() === '';
     }
-    /** 后一个可见的兄弟节点 */
-    get nextVisibleSibling() {
-        let { nextSibling } = this;
-        while (nextSibling?.text() === '') {
-            ({ nextSibling } = nextSibling);
-        }
-        return nextSibling;
-    }
-    /** 前一个可见的兄弟节点 */
-    get previousVisibleSibling() {
-        let { previousSibling } = this;
-        while (previousSibling?.text() === '') {
-            ({ previousSibling } = previousSibling);
-        }
-        return previousSibling;
-    }
     /** 内部高度 */
     get clientHeight() {
         const { innerText } = this;
@@ -347,14 +331,6 @@ class AstElement extends node_1.AstNode {
         return json;
     }
     /* NOT FOR BROWSER */
-    /** 销毁 */
-    destroy() {
-        this.parentNode?.destroy();
-        for (const child of this.childNodes) {
-            child.setAttribute('parentNode', undefined);
-        }
-        Object.setPrototypeOf(this, null);
-    }
     /** 是否受保护。保护条件来自Token，这里仅提前用于:required和:optional伪选择器。 */
     #isProtected() {
         const { parentNode } = this;
@@ -583,13 +559,6 @@ class AstElement extends node_1.AstNode {
     getElementsByTagName(tag) {
         return this.#getElementsBy((({ type, name }) => name === tag && (type === 'html' || type === 'ext')));
     }
-    /**
-     * 获取某一行的wikitext
-     * @param n 行号
-     */
-    getLine(n) {
-        return String(this).split('\n', n + 1)[n];
-    }
     /**
      * 在开头批量插入子节点
      * @param elements 插入节点

package/dist/lib/node.d.ts

@@ -19,6 +19,7 @@ export declare abstract class AstNode implements AstNodeBase {
     type: TokenTypes | 'text';
     data?: string | undefined;
     readonly childNodes: readonly AstNodes[];
+    abstract text(): string;
     abstract lint(): LintError[];
     abstract print(): string;
     /** 首位子节点 */
@@ -39,6 +40,10 @@ export declare abstract class AstNode implements AstNodeBase {
     get nextElementSibling(): Token | undefined;
     /** 前一个非文本兄弟节点 */
     get previousElementSibling(): Token | undefined;
+    /** 后一个可见的兄弟节点 */
+    get nextVisibleSibling(): AstNodes | undefined;
+    /** 前一个可见的兄弟节点 */
+    get previousVisibleSibling(): AstNodes | undefined;
     /** 是否具有根节点 */
     get isConnected(): boolean;
     /** 后方是否还有其他节点（不含后代） */
@@ -51,6 +56,15 @@ export declare abstract class AstNode implements AstNodeBase {
     get style(): Position & Dimension & {
         padding: number;
     };
+    /** 字体样式 */
+    get font(): {
+        bold: boolean;
+        italic: boolean;
+    };
+    /** 是否粗体 */
+    get bold(): boolean;
+    /** 是否斜体 */
+    get italic(): boolean;
     constructor();
     /** 获取根节点 */
     getRootNode(): Token | this;
@@ -142,4 +156,11 @@ export declare abstract class AstNode implements AstNodeBase {
     indexFromPos(top: number, left: number): number | undefined;
     /** 获取当前节点的行列位置和大小 */
     getBoundingClientRect(): Dimension & Position;
+    /** 销毁 */
+    destroy(): void;
+    /**
+     * 获取某一行的wikitext
+     * @param n 行号
+     */
+    getLine(n: number): string | undefined;
 }

package/dist/lib/node.js

@@ -4,6 +4,7 @@ exports.AstNode = void 0;
 const assert = require("assert/strict");
 const EventEmitter = require("events");
 const constants_1 = require("../util/constants");
+const debug_1 = require("../util/debug");
 /**
  * 计算字符串的行列数
  * @param str 字符串
@@ -79,6 +80,22 @@ class AstNode {
         const childNodes = this.parentNode?.childNodes, i = childNodes?.indexOf(this);
         return childNodes?.slice(0, i).reverse().find((child) => child.type !== 'text');
     }
+    /** 后一个可见的兄弟节点 */
+    get nextVisibleSibling() {
+        let { nextSibling } = this;
+        while (nextSibling?.text() === '') {
+            ({ nextSibling } = nextSibling);
+        }
+        return nextSibling;
+    }
+    /** 前一个可见的兄弟节点 */
+    get previousVisibleSibling() {
+        let { previousSibling } = this;
+        while (previousSibling?.text() === '') {
+            ({ previousSibling } = previousSibling);
+        }
+        return previousSibling;
+    }
     /** 是否具有根节点 */
     get isConnected() {
         return this.getRootNode().type === 'root';
@@ -111,6 +128,34 @@ class AstNode {
     get fixed() {
         return false;
     }
+    /** 字体样式 */
+    get font() {
+        const { parentNode } = this, acceptable = parentNode?.getAttribute('acceptable');
+        if (!parentNode || acceptable && !('QuoteToken' in acceptable)) {
+            return { bold: false, italic: false };
+        }
+        const { childNodes } = parentNode, index = childNodes.indexOf(this), isQuote = (0, debug_1.isToken)('quote');
+        let bold = false, italic = false;
+        for (let i = index - 1; i >= 0; i--) {
+            const child = childNodes[i];
+            if (isQuote(child)) {
+                bold = child.bold ? !bold : bold;
+                italic = child.italic ? !italic : italic;
+            }
+            else if (child.type === 'text' && child.data.includes('\n')) {
+                break;
+            }
+        }
+        return { bold, italic };
+    }
+    /** 是否粗体 */
+    get bold() {
+        return this.font.bold;
+    }
+    /** 是否斜体 */
+    get italic() {
+        return this.font.italic;
+    }
     constructor() {
         Object.defineProperty(this, 'childNodes', { writable: false });
         Object.freeze(this.childNodes);
@@ -415,6 +460,21 @@ class AstNode {
     getBoundingClientRect() {
         return { ...this.#getDimension(), ...this.getRootNode().posFromIndex(this.getAbsoluteIndex()) };
     }
+    /** 销毁 */
+    destroy() {
+        this.parentNode?.destroy();
+        for (const child of this.childNodes) {
+            child.setAttribute('parentNode', undefined);
+        }
+        Object.setPrototypeOf(this, null);
+    }
+    /**
+     * 获取某一行的wikitext
+     * @param n 行号
+     */
+    getLine(n) {
+        return String(this).split('\n', n + 1)[n];
+    }
 }
 exports.AstNode = AstNode;
 constants_1.classes['AstNode'] = __filename;

package/dist/src/index.d.ts

@@ -119,12 +119,12 @@ export declare class Token extends AstElement {
     /** 深拷贝节点 */
     cloneNode(): this;
     /** 获取全部章节 */
-    sections(): (AstText | Token)[][] | undefined;
+    sections(): AstRange[] | undefined;
     /**
      * 获取指定章节
      * @param n 章节序号
      */
-    section(n: number): (AstText | Token)[] | undefined;
+    section(n: number): AstRange | undefined;
     /**
      * 获取指定的外层HTML标签
      * @param tag HTML标签名

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

@@ -3,11 +3,16 @@ import type { LintError, AST } from '../../base';
 /** `''`和`'''` */
 export declare abstract class QuoteToken extends NowikiBaseToken {
     readonly type = "quote";
-    /** 是否粗体 */
+    /** @override */
     get bold(): boolean;
-    /** 是否斜体 */
+    /** @override */
     get italic(): boolean;
     /** @override */
+    get font(): {
+        bold: boolean;
+        italic: boolean;
+    };
+    /** @override */
     lint(start?: number): LintError[];
     /** @override */
     json(): AST;

package/dist/src/nowiki/quote.js

@@ -57,14 +57,20 @@ let QuoteToken = (() => {
             __runInitializers(_classThis, _classExtraInitializers);
         }
         type = 'quote';
-        /** 是否粗体 */
+        /** @override */
         get bold() {
             return this.innerText.length !== 2;
         }
-        /** 是否斜体 */
+        /** @override */
         get italic() {
             return this.innerText.length !== 3;
         }
+        /* NOT FOR BROWSER */
+        /** @override */
+        get font() {
+            return { bold: this.bold, italic: this.italic };
+        }
+        /* NOT FOR BROWSER END */
         /** @override */
         lint(start = this.getAbsoluteIndex()) {
             const { previousSibling, nextSibling, bold } = this, message = index_1.default.msg('lonely "$1"', `'`), errors = [];

package/dist/util/string.js

@@ -11,7 +11,7 @@ exports.extUrlChar = `(?:${commonExtUrlChar}|\0\\d+[c!~]\x7F)*`;
  */
 const factory = (regex, replace) => (str) => str.replace(regex, replace);
 /** 清理解析专用的不可见字符 */
-exports.tidy = factory(/[\0\x7F]/gu, '');
+exports.tidy = factory(/[\0\x7F]|\r$/gmu, '');
 /** remove half-parsed comment-like tokens */
 exports.removeComment = factory(/\0\d+c\x7F/gu, '');
 /** escape special chars for RegExp constructor */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.7.1",
+	"version": "1.8.0",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",

package/dist/addon/table.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/addon/token.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/addon/transclude.d.ts

@@ -1 +0,0 @@
-export {};