wikiparser-node 1.4.3 → 1.4.4

package/README.en.md

@@ -8,7 +8,7 @@
 
 # Introduction
 
-wikiparser-node is an offline [Wikitext](https://www.mediawiki.org/wiki/Wikitext) parser developed by Bhsd for the [Node.js](https://nodejs.org/) environment. It can parse almost all wiki syntax and generate an [Abstract Syntax Tree (AST)](https://en.wikipedia.org/wiki/Abstract_syntax_tree). It also allows for easy querying and modification of the AST, and returns the modified wikitext.
+wikiparser-node is an offline [Wikitext](https://www.mediawiki.org/wiki/Wikitext) parser developed by Bhsd for the [Node.js](https://nodejs.org/) environment. It can parse almost all wiki syntax and generate an [Abstract Syntax Tree (AST)](https://en.wikipedia.org/wiki/Abstract_syntax_tree) ([Try it online](https://bhsd-harry.github.io/wikiparser-node/#editor)). It also allows for easy querying and modification of the AST, and returns the modified wikitext.
 
 # Other Versions
 

package/README.md

@@ -8,7 +8,7 @@
 
 # 简介
 
-wikiparser-node 是一款由 Bhsd 开发的基于 [Node.js](https://nodejs.org/) 环境的离线[维基文本](https://www.mediawiki.org/wiki/Wikitext)语法解析器，可以解析几乎全部的维基语法并生成[语法树](https://en.wikipedia.org/wiki/Abstract_syntax_tree)，还可以很方便地对语法树进行查询和修改，最后返回修改后的维基文本。
+wikiparser-node 是一款由 Bhsd 开发的基于 [Node.js](https://nodejs.org/) 环境的离线[维基文本](https://www.mediawiki.org/wiki/Wikitext)语法解析器，可以解析几乎全部的维基语法并生成[语法树](https://en.wikipedia.org/wiki/Abstract_syntax_tree)（[在线解析](https://bhsd-harry.github.io/wikiparser-node/#editor)），还可以很方便地对语法树进行查询和修改，最后返回修改后的维基文本。
 
 # 其他版本
 

package/dist/lib/element.js

@@ -116,16 +116,21 @@ class AstElement extends node_1.AstNode {
     normalize() {
         const childNodes = [...this.childNodes];
         for (let i = childNodes.length - 1; i >= 0; i--) {
-            const { type, data } = childNodes[i], prev = childNodes[i - 1];
+            const { type, data } = childNodes[i];
             if (type !== 'text' || this.getGaps(i - 1)) {
                 //
             }
             else if (data === '') {
                 childNodes.splice(i, 1);
+                /* NOT FOR BROWSER */
             }
-            else if (prev?.type === 'text') {
-                prev.setAttribute('data', prev.data + data);
-                childNodes.splice(i, 1);
+            else {
+                const prev = childNodes[i - 1];
+                if (prev?.type === 'text') {
+                    prev.setAttribute('data', prev.data + data);
+                    childNodes.splice(i, 1);
+                }
+                /* NOT FOR BROWSER END */
             }
         }
         this.setAttribute('childNodes', childNodes);

package/dist/src/attributes.js

@@ -179,7 +179,7 @@ class AttributesToken extends index_2.Token {
     /** @override */
     print() {
         return String(this)
-            ? `<span class="wpb-${this.type}">${this.childNodes.map(child => child.print(child instanceof atom_1.AtomToken && child.text().trim() ? { class: 'attr-dirty' } : undefined)).join('')}</span>`
+            ? `<span class="wpb-${this.type}">${this.childNodes.map(child => child.print(child instanceof atom_1.AtomToken ? { class: 'attr-dirty' } : undefined)).join('')}</span>`
             : '';
     }
     /* NOT FOR BROWSER */

package/dist/src/html.js

@@ -155,11 +155,15 @@ let HtmlToken = (() => {
         }
         /** @override */
         text() {
-            const { closing, name } = this, tag = `${this.#tag}${closing ? '' : super.text()}`, { html } = this.getAttribute('config');
-            if (html[2].includes(name)) {
-                return closing && name !== 'br' ? '' : `<${tag}>`;
+            const { closing, 
+            /* NOT FOR BROWSER */
+            name, } = this, { html: [, , voidTags] } = this.getAttribute('config'), tag = `${this.#tag}${closing ? '' : super.text()}`;
+            /* NOT FOR BROWSER */
+            if (voidTags.includes(name)) {
+                return closing && name !== 'br' ? '' : `<${tag}/>`;
             }
-            return `<${closing ? '/' : ''}${tag}${this.#selfClosing && html[1].includes(name) ? '/' : ''}>`;
+            /* NOT FOR BROWSER END */
+            return `<${closing ? '/' : ''}${tag}${this.#selfClosing ? '/' : ''}>`;
         }
         /** @private */
         getAttribute(key) {
@@ -271,11 +275,9 @@ let HtmlToken = (() => {
         }
         /** @override */
         print() {
-            const { closing, name } = this, { html } = this.getAttribute('config');
             return super.print({
                 pre: `&lt;${this.closing ? '/' : ''}${this.#tag}`,
                 post: `${this.#selfClosing ? '/' : ''}&gt;`,
-                class: closing && html[2].includes(name) && name !== 'br' ? 'html-invalid' : 'html',
             });
         }
         /** @override */

package/dist/src/imageParameter.js

@@ -186,9 +186,7 @@ class ImageParameterToken extends index_2.Token {
     /** @override */
     print() {
         if (this.#syntax) {
-            return this.name === 'invalid'
-                ? `<span class="wpb-image-invalid">${this.#syntax.replace('$1', (0, string_1.print)(this.childNodes))}</span>`
-                : `<span class="wpb-image-parameter">${this.#syntax.replace('$1', `<span class="wpb-image-caption">${(0, string_1.print)(this.childNodes)}</span>`)}</span>`;
+            return `<span class="wpb-image-parameter">${this.#syntax.replace('$1', `<span class="wpb-image-caption">${(0, string_1.print)(this.childNodes)}</span>`)}</span>`;
         }
         return super.print({ class: 'image-caption' });
     }

package/dist/src/table/index.js

@@ -43,6 +43,16 @@ class TableToken extends trBase_1.TrBaseToken {
         if (!this.closed) {
             errors.push((0, lint_1.generateForChild)(this.firstChild, { start }, index_1.default.msg('unclosed $1', 'table')));
         }
+        /* NOT FOR BROWSER */
+        const layout = this.getLayout(), { length } = layout;
+        if (length > 1) {
+            const j = new Array(length - 1).fill(undefined)
+                .findIndex((_, i) => layout[i].length !== layout[i + 1].length) + 1;
+            if (j) {
+                errors.push((0, lint_1.generateForChild)(this.getNthRow(j), { start }, 'inconsistent table layout', 'warning'));
+            }
+        }
+        /* NOT FOR BROWSER END */
         return errors;
     }
     /**

package/i18n/zh-hans.json

@@ -21,6 +21,7 @@
 	"HTML tag in table attributes": "表格属性中的HTML标签",
 	"illegal attribute name": "非法的属性名",
 	"illegal module name": "非法的模块名称",
+	"inconsistent table layout": "不一致的表格布局",
 	"insecure style": "不安全的样式",
 	"internal link in an external link": "外链中的内链",
 	"invalid content in <$1>": "<$1>内的无效内容",

package/i18n/zh-hant.json

@@ -21,6 +21,7 @@
 	"HTML tag in table attributes": "表格屬性中的HTML標籤",
 	"illegal attribute name": "非法的屬性名",
 	"illegal module name": "非法的模組名稱",
+	"inconsistent table layout": "不一致的表格佈局",
 	"insecure style": "不安全的樣式",
 	"internal link in an external link": "外部連結中的內部連結",
 	"invalid content in <$1>": "<$1>內的無效內容",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.4.3",
+	"version": "1.4.4",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -31,7 +31,7 @@
 		"declaration": "grep -rl --include='*.d.ts' '@private' dist/ | xargs bash sed.sh -i -E '/^\\s+\\/\\*\\* @private/,+1d'; node ./dist/bin/declaration.js",
 		"prepublishOnly": "npm run build && rm dist/internal.js dist/base.js dist/[pu]*/*.d.ts",
 		"build": "bash build.sh",
-		"diff": "git diff --ignore-all-space --color-moved",
+		"diff": "bash diff.sh",
 		"diff:stat": "f() { git diff --stat --ignore-all-space --color=always $1 $2 -- . ':!extensions/' ':!bin/' | grep '\\.ts'; }; f",
 		"lint:ts": "tsc --noEmit && eslint --cache .",
 		"lint:json": "ajv -s config/.schema.json -d 'config/*.json' --strict=true --strict-required=false",