wikiparser-node 1.33.0 → 1.34.0

package/dist/src/table/index.js

@@ -307,6 +307,7 @@ let TableToken = (() => {
             }
             return super.insertAt(token, i);
         }
+        /** @private */
         getRowCount() {
             return super.getRowCount()
                 + this.childNodes.filter(child => child.is('tr') && child.getRowCount()).length;

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

@@ -51,7 +51,6 @@ export declare abstract class TdToken extends TableBaseToken {
      */
     isIndependent(): boolean;
     getAttr<T extends string>(key: T): TdAttrGetter<T>;
-    escape(): void;
     cloneNode(): this;
     /**
      * Move to a new line

package/dist/src/table/td.js

@@ -261,6 +261,7 @@ let TdToken = (() => {
                 return (key === 'rowspan' || key === 'colspan' ? parseInt(value) || 1 : value);
             }
         }
+        /** @private */
         escape() {
             LSP: {
                 super.escape();

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

@@ -48,5 +48,4 @@ export declare abstract class HtmlToken extends TagToken {
      * @throws `Error` 无法修复无效自封闭标签
      */
     fix(): void;
-    getRange(): AstRange | undefined;
 }

package/dist/src/tag/html.js

@@ -339,6 +339,7 @@ let HtmlToken = (() => {
             }
             return result;
         }
+        /** @private */
         getRange() {
             const { selfClosing, name } = this, { html: [, selfClosingTags, voidTags] } = this.getAttribute('config');
             if (voidTags.includes(name) || selfClosing && selfClosingTags.includes(name)) {

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

@@ -23,7 +23,6 @@ export declare abstract class TvarToken extends TagToken {
      * @param closing 是否闭合
      */
     constructor(tag: string, attr: string, closing: boolean, config?: Config, accum?: Token[]);
-    afterBuild(): void;
     cloneNode(): this;
     /**
      * Set the tvar name.

package/dist/src/tag/tvar.js

@@ -117,6 +117,7 @@ let TvarToken = (() => {
             }
             this.setAttribute('name', name);
         }
+        /** @private */
         afterBuild() {
             super.afterBuild();
             if (!this.closing) {

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

@@ -1,5 +1,5 @@
 import { Token } from '../index';
-import type { Config } from '../../base';
+import type { Config, AST } from '../../base';
 import type { AstNodes } from '../../internal';
 /**
  * Paired tags
@@ -10,13 +10,15 @@ export declare abstract class TagPairToken extends Token {
     #private;
     readonly name: string;
     closed: boolean;
-    selfClosing: boolean;
     abstract get type(): 'ext' | 'include' | 'translate';
     readonly childNodes: readonly [AstNodes, AstNodes];
     abstract get firstChild(): AstNodes;
     abstract get lastChild(): AstNodes;
     /** inner wikitext / 内部wikitext */
     get innerText(): string | undefined;
+    /** whether to be self-closing / 是否自封闭 */
+    get selfClosing(): boolean;
+    set selfClosing(value: boolean);
     /**
      * @param name 标签名
      * @param attr 标签属性

package/dist/src/tagPair/index.js

@@ -43,6 +43,7 @@ const noEscape_1 = require("../../mixin/noEscape");
 const index_1 = require("../index");
 /* NOT FOR BROWSER */
 const constants_1 = require("../../util/constants");
+const debug_1 = require("../../util/debug");
 const fixed_1 = require("../../mixin/fixed");
 const index_2 = __importDefault(require("../../index"));
 /* NOT FOR BROWSER END */
@@ -67,12 +68,30 @@ let TagPairToken = (() => {
             __runInitializers(_classThis, _classExtraInitializers);
         }
         #tags;
+        #selfClosing;
         closed;
-        selfClosing;
         /** inner wikitext / 内部wikitext */
         get innerText() {
-            return this.selfClosing ? undefined : this.lastChild.text();
+            return this.#selfClosing ? undefined : this.lastChild.text();
         }
+        /** whether to be self-closing / 是否自封闭 */
+        get selfClosing() {
+            return this.#selfClosing;
+        }
+        /* NOT FOR BROWSER */
+        set selfClosing(value) {
+            this.#selfClosing = Boolean(value);
+            if (value) {
+                const { lastChild } = this;
+                if (lastChild.type === 'text') {
+                    lastChild.replaceData('');
+                }
+                else {
+                    lastChild.replaceChildren();
+                }
+            }
+        }
+        /* NOT FOR BROWSER END */
         /**
          * @param name 标签名
          * @param attr 标签属性
@@ -84,14 +103,14 @@ let TagPairToken = (() => {
             this.setAttribute('name', name.toLowerCase());
             this.#tags = [name, closed || name];
             this.closed = closed !== '';
-            this.selfClosing = closed === undefined;
+            this.#selfClosing = closed === undefined;
             this.append(attr, inner);
             const index = typeof attr === 'string' ? -1 : accum.indexOf(attr);
             accum.splice(index === -1 ? Infinity : index, 0, this);
         }
         /** @private */
         toString(skip) {
-            const { selfClosing, firstChild, lastChild, 
+            const { firstChild, lastChild, 
             /* NOT FOR BROWSER */
             nextSibling, name, closed, type, } = this, [opening, closing] = this.#tags;
             /* NOT FOR BROWSER */
@@ -101,14 +120,14 @@ let TagPairToken = (() => {
                 this.closed = true;
             }
             /* NOT FOR BROWSER END */
-            return selfClosing
+            return this.#selfClosing
                 ? `<${opening}${firstChild.toString(skip)}/>`
                 : `<${opening}${firstChild.toString(skip)}>${lastChild.toString(skip)}${this.closed ? `</${closing}>` : ''}`;
         }
         /** @private */
         text() {
             const [opening, closing] = this.#tags;
-            return this.selfClosing
+            return this.#selfClosing
                 ? `<${opening}${this.firstChild.text()}/>`
                 : `<${opening}${super.text('>')}${this.closed ? `</${closing}>` : ''}`;
         }
@@ -125,11 +144,32 @@ let TagPairToken = (() => {
         print() {
             PRINT: {
                 const [opening, closing] = this.#tags;
-                return super.print(this.selfClosing
+                return super.print(this.#selfClosing
                     ? { pre: `&lt;${opening}`, post: '/&gt;' }
                     : { pre: `&lt;${opening}`, sep: '&gt;', post: this.closed ? `&lt;/${closing}&gt;` : '' });
             }
         }
+        /** @private */
+        json(_, start = this.getAbsoluteIndex()) {
+            LSP: {
+                const json = super.json(undefined, start);
+                json['selfClosing'] = this.#selfClosing;
+                return json;
+            }
+        }
+        /* NOT FOR BROWSER */
+        /** @private */
+        afterBuild() {
+            super.afterBuild();
+            const /** @implements */ tagPairListener = (e, data) => {
+                /* istanbul ignore if */
+                if (this.#selfClosing && e.prevTarget === this.lastChild && this.lastChild.toString()) {
+                    (0, debug_1.undo)(e, data);
+                    throw new Error('A self-closing tag does not have inner content.');
+                }
+            };
+            this.addEventListener(['insert', 'replace', 'text'], tagPairListener);
+        }
     };
     return TagPairToken = _classThis;
 })();

package/dist/src/tagPair/translate.d.ts

@@ -11,7 +11,6 @@ export declare abstract class TranslateToken extends TagPairToken implements Omi
     #private;
     name: 'translate';
     closed: true;
-    selfClosing: false;
     readonly childNodes: readonly [SyntaxToken, Token];
     abstract get firstChild(): SyntaxToken;
     abstract get lastChild(): Token;
@@ -20,6 +19,7 @@ export declare abstract class TranslateToken extends TagPairToken implements Omi
     abstract get firstElementChild(): SyntaxToken;
     abstract get lastElementChild(): Token;
     get type(): 'translate';
+    get selfClosing(): false;
     /**
      * @param attr 标签属性
      * @param inner 内部wikitext

package/dist/src/tagPair/translate.js

@@ -64,6 +64,9 @@ let TranslateToken = (() => {
         get type() {
             return 'translate';
         }
+        get selfClosing() {
+            return false;
+        }
         /**
          * @param attr 标签属性
          * @param inner 内部wikitext
@@ -89,7 +92,6 @@ let TranslateToken = (() => {
             __runInitializers(this, _instanceExtraInitializers);
             /* PRINT ONLY */
             this.seal('closed', true);
-            this.seal('selfClosing', true);
         }
         /** @private */
         toString(skip) {

package/dist/src/transclude.js

@@ -274,8 +274,8 @@ let TranscludeToken = (() => {
                  * 当继续bubble到`template`时，处理并删除`oldKey`和`newKey`。
                  * @implements
                  */
-                const transcludeListener = (e, data) => {
-                    const { prevTarget } = e, { oldKey, newKey } = data;
+                const transcludeListener = ({ prevTarget }, data) => {
+                    const { oldKey, newKey } = data;
                     if (typeof oldKey === 'string') {
                         delete data.oldKey;
                         delete data.newKey;

package/dist/util/diff.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.info = exports.error = exports.loadChalk = exports.diff = exports.cmd = void 0;
+exports.info = exports.error = exports.diff = exports.cmd = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
+const util_1 = __importDefault(require("util"));
 const child_process_1 = require("child_process");
 /* istanbul ignore next */
 process.on('unhandledRejection', e => {
@@ -76,29 +77,17 @@ const diff = async (oldStr, newStr, uid) => {
     await Promise.allSettled([promises_1.default.unlink(oldFile), promises_1.default.unlink(newFile)]);
 };
 exports.diff = diff;
-let chalk;
-/* istanbul ignore next */
-const loadChalk = () => {
-    if (chalk === undefined) {
-        try {
-            chalk = require('chalk');
-        }
-        catch {
-            chalk = null;
-        }
-    }
-    return chalk;
-};
-exports.loadChalk = loadChalk;
 /* istanbul ignore next */
 /** @implements */
 const error = (msg, ...args) => {
-    console.error((0, exports.loadChalk)()?.red(msg) ?? msg, ...args);
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    console.error(util_1.default.styleText?.('red', msg) ?? msg, ...args);
 };
 exports.error = error;
 /* istanbul ignore next */
 /** @implements */
 const info = (msg, ...args) => {
-    console.info((0, exports.loadChalk)()?.green(msg) ?? msg, ...args);
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    console.info(util_1.default.styleText?.('green', msg) ?? msg, ...args);
 };
 exports.info = info;

package/extensions/dist/base.js

@@ -1,6 +1,6 @@
 (() => {
 var _a;
-const version = '1.33.0', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
+const version = '1.34.0', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
     ? src.replace(file, '')
     : `https://testingcf.jsdelivr.net/npm/wikiparser-node@${version}`;
 const workerJS = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.33.0",
+	"version": "1.34.0",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -23,6 +23,7 @@
 		"!/extensions/*-page.css",
 		"/printed/README",
 		"/errors/README",
+		"/logo.png",
 		"/config/",
 		"!/config/mediawikiwiki.json",
 		"!/config/testwiki.json",
@@ -81,13 +82,12 @@
 	},
 	"dependencies": {
 		"@bhsd/cm-util": "^0.1.0",
-		"@bhsd/common": "^1.0.1",
+		"@bhsd/common": "^1.2.0",
 		"@bhsd/stylelint-util": "^0.1.0",
 		"binary-search": "^1.3.6",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {
-		"chalk": "^4.1.2",
 		"color-name": "^2.0.0",
 		"entities": "^7.0.0",
 		"mathoid-texvcjs": "^0.6.0",