wikiparser-node 1.1.3 → 1.1.4

package/config/.schema.json

@@ -30,15 +30,15 @@
 					"type": "string"
 				}
 			},
-			"required": [
-				"6",
-				"10"
-			],
 			"additionalProperties": false
 		},
 		"nsid": {
 			"description": "namespace IDs",
 			"type": "object",
+			"required": [
+				"file",
+				"category"
+			],
 			"additionalProperties": {
 				"type": "integer"
 			}

package/config/minimum.json

@@ -70,11 +70,11 @@
 			"img"
 		]
 	],
-	"namespaces": {
-		"6": "File",
-		"10": "Template"
+	"namespaces": {},
+	"nsid": {
+		"file": 6,
+		"category": 14
 	},
-	"nsid": {},
 	"parserFunction": [
 		{
 			"#language": "language",

package/dist/addon/table.js

@@ -114,7 +114,7 @@ table_1.TableToken.prototype.getLayout =
             const rowLayout = layout[i];
             let j = 0, k = 0, last;
             for (const cell of rows[i].childNodes.slice(2)) {
-                if (cell instanceof td_1.TdToken) {
+                if (cell.type === 'td') {
                     if (cell.isIndependent()) {
                         last = cell.subtype !== 'caption';
                     }
@@ -478,7 +478,7 @@ table_1.TableToken.prototype.moveTableRowBefore =
 table_1.TableToken.prototype.moveTableRowAfter =
     /** @implements */
     function (y, after) {
-        const layout = this.getLayout(), afterToken = this.getNthRow(after), cells = afterToken.childNodes.filter(child => child instanceof td_1.TdToken && child.subtype !== 'caption'), 
+        const layout = this.getLayout(), afterToken = this.getNthRow(after), cells = afterToken.childNodes.filter(child => child.type === 'td' && child.subtype !== 'caption'), 
         /** @ignore */
         occupied = (i, oneRow = false) => layout[i].map(({ row, column }, j) => row === i && (!oneRow || cells[column].rowspan === 1) ? j : undefined).filter(j => j !== undefined);
         try {

package/dist/index.d.ts

@@ -18,11 +18,6 @@ declare interface Parser extends ParserBase {
      * @param selfLink 是否允许selfLink
      */
     normalizeTitle(title: string, defaultNs?: number, include?: boolean, config?: Config, halfParsed?: boolean, decode?: boolean, selfLink?: boolean): Title;
-    /**
-     * @override
-     * @param include 是否嵌入
-     * @param maxStage 最大解析层级
-     */
     parse(wikitext: string, include?: boolean, maxStage?: number, config?: Config): Token;
     /**
      * 是否是跨维基链接

package/dist/lib/element.d.ts

@@ -47,7 +47,7 @@ export declare abstract class AstElement extends AstNode {
      * 插入子节点
      * @param node 待插入的子节点
      * @param i 插入位置
-     * @throws `RangeError` 不能插入祖先节点
+     * @throws `RangeError` 不能插入祖先或子节点
      */
     insertAt<T extends AstNodes>(node: T, i?: number): T;
     /**

package/dist/lib/element.js

@@ -4,7 +4,6 @@ exports.AstElement = void 0;
 const fs = require("fs");
 const path = require("path");
 const string_1 = require("../util/string");
-const debug_1 = require("../util/debug");
 const constants_1 = require("../util/constants");
 const selector_1 = require("../parser/selector");
 const ranges_1 = require("./ranges");
@@ -149,35 +148,32 @@ class AstElement extends node_1.AstNode {
      */
     removeAt(i) {
         this.verifyChild(i);
-        const childNodes = [...this.childNodes], e = new Event('remove', { bubbles: true }), [node] = childNodes.splice(i, 1);
+        const childNodes = [...this.childNodes], [node] = childNodes.splice(i, 1);
         node.setAttribute('parentNode', undefined);
         this.setAttribute('childNodes', childNodes);
-        this.dispatchEvent(e, { position: i, removed: node });
         return node;
     }
     /**
      * 插入子节点
      * @param node 待插入的子节点
      * @param i 插入位置
-     * @throws `RangeError` 不能插入祖先节点
+     * @throws `RangeError` 不能插入祖先或子节点
      */
     insertAt(node, i = this.length) {
         if (node.contains(this)) {
             Parser.error('不能插入祖先节点！', node);
             throw new RangeError('不能插入祖先节点！');
         }
-        this.verifyChild(i, 1);
-        const childNodes = [...this.childNodes], e = new Event('insert', { bubbles: true }), j = debug_1.Shadow.running ? -1 : childNodes.indexOf(node);
-        if (j === -1) {
-            node.parentNode?.removeChild(node);
-            node.setAttribute('parentNode', this);
-        }
-        else {
-            childNodes.splice(j, 1);
+        const childNodes = [...this.childNodes];
+        if (childNodes.includes(node)) {
+            Parser.error('不能插入子节点！', node);
+            throw new RangeError('不能插入子节点！');
         }
+        this.verifyChild(i, 1);
+        node.parentNode?.removeChild(node);
+        node.setAttribute('parentNode', this);
         childNodes.splice(i, 0, node);
         this.setAttribute('childNodes', childNodes);
-        this.dispatchEvent(e, { position: i < 0 ? i + this.length - 1 : i, inserted: node });
         return node;
     }
     /**

package/dist/lib/node.d.ts

@@ -126,7 +126,7 @@ export declare abstract class AstNode implements AstNodeBase {
      * @param e 事件对象
      * @param data 事件数据
      */
-    dispatchEvent(e: Event, data: unknown): void;
+    dispatchEvent(e: Event, data: AstEventData): void;
     /** 获取所有祖先节点 */
     getAncestors(): Token[];
     /**

package/dist/lib/text.d.ts

@@ -15,6 +15,7 @@ export declare class AstText extends AstNode {
     /**
      * @override
      * @param start
+     * @throws `Error` 孤立文本节点
      */
     lint(start?: number): LintError[];
     /**
@@ -56,10 +57,6 @@ export declare class AstText extends AstNode {
      * @throws `Error` 没有父节点
      */
     splitText(offset: number): AstText;
-    /**
-     * @override
-     * @param j 字符位置
-     * @throws `RangeError` 超出文本长度范围
-     */
-    getRelativeIndex(j?: number): number;
+    /** 转义 `=` */
+    escape(): void;
 }

package/dist/lib/text.js

@@ -56,7 +56,6 @@ const errorSyntax = /https?:\/\/|\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\
     'param',
     'xmp',
 ];
-const entities = { '&': 'amp', '<': 'lt', '>': 'gt' };
 /** 文本节点 */
 class AstText extends node_1.AstNode {
     type = 'text';
@@ -87,9 +86,14 @@ class AstText extends node_1.AstNode {
     /**
      * @override
      * @param start
+     * @throws `Error` 孤立文本节点
      */
     lint(start = this.getAbsoluteIndex()) {
-        const { data, parentNode, nextSibling, previousSibling } = this, type = parentNode?.type, name = parentNode?.name, nextType = nextSibling?.type, previousType = previousSibling?.type, errorRegex = type === 'free-ext-link' || type === 'ext-link-url' || type === 'image-parameter' && name === 'link'
+        const { data, parentNode, nextSibling, previousSibling } = this;
+        if (!parentNode) {
+            throw new Error('无法对孤立文本节点进行语法分析！');
+        }
+        const { type, name } = parentNode, nextType = nextSibling?.type, previousType = previousSibling?.type, errorRegex = type === 'free-ext-link' || type === 'ext-link-url' || type === 'image-parameter' && name === 'link'
             ? errorSyntaxUrl
             : errorSyntax, errors = [...data.matchAll(errorRegex)], { ext, html } = this.getRootNode().getAttribute('config');
         if (errors.length > 0) {
@@ -133,7 +137,7 @@ class AstText extends node_1.AstNode {
         const { data } = this, e = new Event('text', { bubbles: true });
         this.setAttribute('data', text);
         if (data !== text) {
-            this.dispatchEvent(e, { oldText: data, newText: text });
+            this.dispatchEvent(e, { type: 'text', oldText: data });
         }
     }
     /**
@@ -145,6 +149,7 @@ class AstText extends node_1.AstNode {
     }
     /** @override */
     print() {
+        const entities = { '&': 'amp', '<': 'lt', '>': 'gt' };
         return this.data.replace(/[&<>]/gu, p => `&${entities[p]};`);
     }
     /* NOT FOR BROWSER */
@@ -204,11 +209,7 @@ class AstText extends node_1.AstNode {
         parentNode.setAttribute('childNodes', childNodes);
         return newText;
     }
-    /**
-     * @override
-     * @param j 字符位置
-     * @throws `RangeError` 超出文本长度范围
-     */
+    /** @private */
     getRelativeIndex(j) {
         if (j === undefined) {
             return super.getRelativeIndex();
@@ -218,6 +219,17 @@ class AstText extends node_1.AstNode {
         }
         return j;
     }
+    /** 转义 `=` */
+    escape() {
+        const { TranscludeToken } = require('../src/transclude');
+        for (let i = this.data.lastIndexOf('='); i >= 0; i = this.data.lastIndexOf('=', i - 1)) {
+            if (i < this.length - 1) {
+                this.splitText(i + 1);
+            }
+            this.after(new TranscludeToken('=', [], this.parentNode.getAttribute('config')));
+            this.setAttribute('data', this.data.slice(0, i));
+        }
+    }
 }
 exports.AstText = AstText;
 constants_1.classes['AstText'] = __filename;

package/dist/mixin/fixed.js

@@ -19,7 +19,7 @@ const fixed = (constructor) => {
             throw new Error(`${this.constructor.name} 不可删除元素！`);
         }
         /** @ignore */
-        insertAt(token, i = this.length) {
+        insertAt(token, i) {
             if (debug_1.Shadow.running) {
                 return super.insertAt(token, i);
             }

package/dist/src/gallery.js

@@ -109,7 +109,7 @@ class GalleryToken extends index_1.Token {
      * @param i 插入位置
      * @throws `SyntaxError` 非法的文件名
      */
-    insertImage(file, i = this.length) {
+    insertImage(file, i) {
         if (this.#checkFile(file)) {
             const token = debug_1.Shadow.run(() => new galleryImage_1.GalleryImageToken('gallery', file, undefined, this.getAttribute('config')));
             token.afterBuild();
@@ -118,7 +118,7 @@ class GalleryToken extends index_1.Token {
         throw new SyntaxError(`非法的文件名：${file}`);
     }
     /** @ignore */
-    insertAt(token, i = 0) {
+    insertAt(token, i = this.length) {
         if (typeof token === 'string' && token.trim() || token instanceof hidden_1.HiddenToken) {
             throw new RangeError('请勿向图库中插入不可见内容！');
         }

package/dist/src/imageParameter.js

@@ -208,7 +208,7 @@ class ImageParameterToken extends index_1.Token {
         return this.#syntax && !this.#syntax.includes('$1');
     }
     /** @ignore */
-    insertAt(token, i = this.length) {
+    insertAt(token, i) {
         if (!debug_1.Shadow.running && this.#isVoid()) {
             throw new Error(`图片参数 ${this.name} 不接受自定义输入！`);
         }

package/dist/src/imagemap.js

@@ -113,7 +113,7 @@ class ImagemapToken extends index_1.Token {
         return super.print({ sep: '\n' });
     }
     /** @ignore */
-    insertAt(token, i = 0) {
+    insertAt(token, i) {
         const { image } = this;
         if (!image && (typeof token === 'string' || token.type === 'imagemap-link' || token.type === 'text')) {
             throw new Error('当前缺少一张合法图片！');

package/dist/src/index.js

@@ -366,6 +366,8 @@ class Token extends element_1.AstElement {
             }
         }
         super.insertAt(token, i);
+        const e = new Event('insert', { bubbles: true });
+        this.dispatchEvent(e, { type: 'insert', position: i < 0 ? i + this.length - 1 : i, inserted: token });
         if (token.constructor === Token && this.getAttribute('plain')) {
             Parser.warn('您正将一个普通节点作为另一个普通节点的子节点，请考虑要不要执行 flatten 方法。');
         }
@@ -409,7 +411,10 @@ class Token extends element_1.AstElement {
                 }
             }
         }
-        return super.removeAt(i);
+        const node = super.removeAt(i);
+        const e = new Event('remove', { bubbles: true });
+        this.dispatchEvent(e, { type: 'remove', position: i, removed: node });
+        return node;
     }
     /**
      * 替换为同类节点
@@ -441,7 +446,7 @@ class Token extends element_1.AstElement {
             token.type = 'plain';
         }
         const e = new Event('replace', { bubbles: true });
-        token.dispatchEvent(e, { position: i, oldToken: this, newToken: token });
+        token.dispatchEvent(e, { type: 'replace', position: i, oldToken: this, newToken: token });
     }
     /**
      * 创建HTML注释

package/dist/src/magicLink.d.ts

@@ -1,7 +1,7 @@
 import * as Parser from '../index';
 import { Token } from './index';
 import type { LintError } from '../base';
-import type { AstText, CommentToken, IncludeToken, NoincludeToken } from '../internal';
+import type { AstNodes, AstText, CommentToken, IncludeToken, NoincludeToken, TranscludeToken } from '../internal';
 declare const MagicLinkToken_base: (abstract new (...args: any[]) => {
     "__#5@#pattern": RegExp;
     afterBuild(): void;
@@ -20,12 +20,12 @@ declare const MagicLinkToken_base: (abstract new (...args: any[]) => {
  */
 export declare class MagicLinkToken extends MagicLinkToken_base {
     type: 'free-ext-link' | 'ext-link-url';
-    childNodes: (AstText | CommentToken | IncludeToken | NoincludeToken)[];
-    abstract get children(): (CommentToken | IncludeToken | NoincludeToken)[];
-    abstract get firstChild(): AstText | CommentToken | IncludeToken | NoincludeToken;
-    abstract get firstElementChild(): CommentToken | IncludeToken | NoincludeToken | undefined;
-    abstract get lastChild(): AstText | CommentToken | IncludeToken | NoincludeToken;
-    abstract get lastElementChild(): CommentToken | IncludeToken | NoincludeToken | undefined;
+    childNodes: (AstText | CommentToken | IncludeToken | NoincludeToken | TranscludeToken)[];
+    abstract get children(): (CommentToken | IncludeToken | NoincludeToken | TranscludeToken)[];
+    abstract get firstChild(): AstText | TranscludeToken;
+    abstract get firstElementChild(): CommentToken | IncludeToken | NoincludeToken | TranscludeToken | undefined;
+    abstract get lastChild(): AstText | CommentToken | IncludeToken | NoincludeToken | TranscludeToken;
+    abstract get lastElementChild(): CommentToken | IncludeToken | NoincludeToken | TranscludeToken | undefined;
     /** 协议 */
     get protocol(): string | undefined;
     /** @throws `Error` 特殊外链无法更改协议n */
@@ -42,6 +42,15 @@ export declare class MagicLinkToken extends MagicLinkToken_base {
     lint(start?: number): LintError[];
     /** @override */
     cloneNode(): this;
+    /**
+     * @override
+     * @param token 待插入的节点
+     * @param i 插入位置
+     * @throws `RangeError` 插入`{{!}}`或`{{=}}`以外的魔术字或模板
+     */
+    insertAt(token: string, i?: number): AstText;
+    /** @ignore */
+    insertAt<T extends AstNodes>(token: T, i?: number): T;
     /**
      * 获取网址
      * @throws `Error` 非标准协议
@@ -54,5 +63,7 @@ export declare class MagicLinkToken extends MagicLinkToken_base {
     setTarget(url: string): void;
     /** 是否是模板或魔术字参数 */
     isParamValue(): boolean;
+    /** 转义 `=` */
+    escape(): void;
 }
 export {};

package/dist/src/magicLink.js

@@ -4,6 +4,7 @@ exports.MagicLinkToken = void 0;
 const lint_1 = require("../util/lint");
 const debug_1 = require("../util/debug");
 const constants_1 = require("../util/constants");
+const string_1 = require("../util/string");
 const syntax_1 = require("../mixin/syntax");
 const Parser = require("../index");
 const index_1 = require("./index");
@@ -30,7 +31,11 @@ class MagicLinkToken extends (0, syntax_1.syntax)(index_1.Token) {
     }
     /** 和内链保持一致 */
     get link() {
-        return this.text();
+        const map = { '!': '|', '=': '=' };
+        return (0, string_1.text)(this.childNodes.map(child => {
+            const { type, name } = child;
+            return type === 'magic-word' && name in map ? map[name] : child;
+        }));
     }
     set link(url) {
         this.setTarget(url);
@@ -42,7 +47,7 @@ class MagicLinkToken extends (0, syntax_1.syntax)(index_1.Token) {
      */
     constructor(url, doubleSlash = false, config = Parser.getConfig(), accum = []) {
         super(url, config, accum, {
-            'Stage-1': ':', '!ExtToken': '',
+            'Stage-1': '1:', '!ExtToken': '', AstText: ':', TranscludeToken: ':',
         });
         this.type = doubleSlash ? 'ext-link-url' : 'free-ext-link';
         this.setAttribute('pattern', new RegExp(`^(?:${config.protocol}${doubleSlash ? '|//' : ''})`, 'iu'));
@@ -86,21 +91,34 @@ class MagicLinkToken extends (0, syntax_1.syntax)(index_1.Token) {
             return token;
         });
     }
+    /** @ignore */
+    insertAt(token, i) {
+        if (typeof token !== 'string') {
+            const { type, name } = token;
+            if (type === 'template') {
+                throw new RangeError(`${this.constructor.name} 不可插入模板！`);
+            }
+            else if (!debug_1.Shadow.running && type === 'magic-word' && name !== '!' && name !== '=') {
+                throw new RangeError(`${this.constructor.name} 不可插入 \`{{!}}\` 或 \`{{=}}\` 以外的魔术字！`);
+            }
+        }
+        return super.insertAt(token, i);
+    }
     /**
      * 获取网址
      * @throws `Error` 非标准协议
      */
     getUrl() {
-        let url = this.text();
-        if (url.startsWith('//')) {
-            url = `https:${url}`;
+        let { link } = this;
+        if (link.startsWith('//')) {
+            link = `https:${link}`;
         }
         try {
-            return new URL(url);
+            return new URL(link);
         }
         catch (e) {
             if (e instanceof TypeError && e.message === 'Invalid URL') {
-                throw new Error(`非标准协议的外部链接：${url}`);
+                throw new Error(`非标准协议的外部链接：${link}`);
             }
             throw e;
         }
@@ -110,13 +128,21 @@ class MagicLinkToken extends (0, syntax_1.syntax)(index_1.Token) {
      * @param url 含协议的网址
      */
     setTarget(url) {
-        const { childNodes } = Parser.parse(url, this.getAttribute('include'), 1, this.getAttribute('config'));
+        const { childNodes } = Parser.parse(url, this.getAttribute('include'), 2, this.getAttribute('config'));
         this.replaceChildren(...childNodes);
     }
     /** 是否是模板或魔术字参数 */
     isParamValue() {
         return this.closest('parameter')?.getValue() === this.text();
     }
+    /** 转义 `=` */
+    escape() {
+        for (const child of this.childNodes) {
+            if (child.type === 'text') {
+                child.escape();
+            }
+        }
+    }
 }
 exports.MagicLinkToken = MagicLinkToken;
 constants_1.classes['MagicLinkToken'] = __filename;

package/dist/src/nested.js

@@ -67,7 +67,7 @@ class NestedToken extends index_1.Token {
      * @param i 插入位置
      * @throws `TypeError` 不是许可的标签
      */
-    insertAt(token, i = this.length) {
+    insertAt(token, i) {
         if (typeof token !== 'string' && token.type === 'ext' && !this.#tags.includes(token.name)) {
             throw new TypeError(`${this.constructor.name}只能以${this.#tags.join('或')}标签作为子节点！`);
         }

package/dist/src/parameter.d.ts

@@ -78,5 +78,7 @@ export declare class ParameterToken extends ParameterToken_base {
      * @throws `RangeError` 更名造成重复参数
      */
     rename(key: string, force?: boolean): void;
+    /** 转义 `=` */
+    escape(): void;
 }
 export {};

package/dist/src/parameter.js

@@ -193,6 +193,14 @@ class ParameterToken extends (0, fixed_1.fixed)(index_1.Token) {
         }
         this.firstChild.replaceChildren(...root.childNodes);
     }
+    /** 转义 `=` */
+    escape() {
+        for (const child of this.lastChild.childNodes) {
+            if (child.type === 'text') {
+                child.escape();
+            }
+        }
+    }
 }
 exports.ParameterToken = ParameterToken;
 constants_1.classes['ParameterToken'] = __filename;

package/dist/src/table/index.js

@@ -52,7 +52,7 @@ class TableToken extends trBase_1.TrBaseToken {
      */
     close(syntax = '\n|}', halfParsed = false) {
         const config = this.getAttribute('config'), accum = this.getAttribute('accum'), inner = halfParsed ? [syntax] : Parser.parse(syntax, this.getAttribute('include'), 2, config).childNodes;
-        if (!(this.lastChild instanceof syntax_1.SyntaxToken)) {
+        if (this.lastChild.type !== 'table-syntax') {
             const token = debug_1.Shadow.run(() => super.insertAt(new syntax_1.SyntaxToken(undefined, closingPattern, 'table-syntax', config, accum, {
                 'Stage-1': ':', '!ExtToken': '', TranscludeToken: ':',
             })));

package/dist/util/debug.js

@@ -29,7 +29,7 @@ exports.Shadow = {
  */
 const undo = (e, data) => {
     const { target, type } = e;
-    switch (type) {
+    switch (data.type) {
         case 'remove': {
             const childNodes = [...target.childNodes];
             childNodes.splice(data.position, 0, data.removed);
@@ -40,6 +40,7 @@ const undo = (e, data) => {
         case 'insert': {
             const childNodes = [...target.childNodes];
             childNodes.splice(data.position, 1);
+            data.inserted.setAttribute('parentNode', undefined);
             target.setAttribute('childNodes', childNodes);
             break;
         }
@@ -47,6 +48,7 @@ const undo = (e, data) => {
             const { parentNode } = target, childNodes = [...parentNode.childNodes];
             childNodes.splice(data.position, 1, data.oldToken);
             data.oldToken.setAttribute('parentNode', parentNode);
+            data.newToken.setAttribute('parentNode', undefined);
             parentNode.setAttribute('childNodes', childNodes);
             break;
         }

package/dist/util/string.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSpace = exports.print = exports.noWrap = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.removeComment = exports.extUrlChar = exports.extUrlCharFirst = void 0;
 exports.extUrlCharFirst = '(?:\\[[\\da-f:.]+\\]|[^[\\]<>"\\0-\\x1F\\x7F\\p{Zs}\\uFFFD])';
-exports.extUrlChar = '(?:[^[\\]<>"\\0-\\x1F\\x7F\\p{Zs}\\uFFFD]|\\0\\d+c\\x7F)*';
+exports.extUrlChar = '(?:[^[\\]<>"\\0-\\x1F\\x7F\\p{Zs}\\uFFFD]|\\0\\d+[c!~]\\x7F)*';
 /**
  * remove half-parsed comment-like tokens
  * @param str 原字符串
@@ -26,7 +26,7 @@ exports.text = text;
  * decode HTML entities
  * @param str 原字符串
  */
-const decodeHtml = (str) => str.replace(/&#(\d+|x[\da-f]+);/giu, (_, code) => String.fromCodePoint(Number(`${code[0].toLowerCase() === 'x' ? '0' : ''}${code}`)));
+const decodeHtml = (str) => str.replace(/&#(\d+|x[\da-f]+);/giu, (_, code) => String.fromCodePoint(Number(`${code.toLowerCase().startsWith('x') ? '0' : ''}${code}`)));
 exports.decodeHtml = decodeHtml;
 /**
  * escape newlines
@@ -53,7 +53,7 @@ const normalizeSpace = (token) => {
     if (token) {
         for (const child of token.childNodes) {
             if (child.type === 'text') {
-                child.replaceData(child.data.replaceAll('\n', ' '));
+                child.replaceData(child.data.replace(/\n+/gu, ' '));
             }
         }
     }

package/package.json

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