wikiparser-node 0.0.0 → 0.0.1

package/package.json

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

package/parser/links.js

@@ -35,8 +35,13 @@ const parseLinks = (firstChild, config = Parser.getConfig(), accum = []) => {
 			s += `[[${x}`;
 			continue;
 		}
-		const page = link.includes('%') ? decodeURIComponent(link) : link,
-			force = link.trim().startsWith(':');
+		let page = link;
+		if (link.includes('%')) {
+			try {
+				page = decodeURIComponent(link);
+			} catch {}
+		}
+		const force = link.trim().startsWith(':');
 		if (force && mightBeImg) {
 			s += `[[${x}`;
 			continue;

package/parser/table.js

@@ -8,7 +8,8 @@ const /** @type {Parser} */ Parser = require('..');
  * @param {accum} accum
  */
 const parseTable = ({firstChild, type}, config = Parser.getConfig(), accum = []) => {
-	const TableToken = require('../src/table'),
+	const Token = require('../src'),
+		TableToken = require('../src/table'),
 		TrToken = require('../src/table/tr'),
 		TdToken = require('../src/table/td'),
 		/** @type {TrToken[]} */ stack = [],
@@ -19,13 +20,13 @@ const parseTable = ({firstChild, type}, config = Parser.getConfig(), accum = [])
 			out += str;
 			return;
 		}
-		const {lastElementChild, lastChild} = top;
-		if (top instanceof TdToken) {
+		const {lastElementChild} = top;
+		if (lastElementChild.isPlain()) {
 			lastElementChild.setText(lastElementChild.firstChild + str, 0);
-		} else if (typeof lastChild === 'string') {
-			top.setText(lastChild + str, 2);
 		} else {
-			top.appendChild(str);
+			const token = new Token(str, config, true, accum);
+			token.type = 'table-inter';
+			top.appendChild(token.setAttribute('stage', 3));
 		}
 	};
 	for (const outLine of lines) {

package/src/extLink.js

@@ -52,7 +52,7 @@ class ExtLinkToken extends Token {
 	}
 
 	toString() {
-		return `[${super.toString(this.#space)}]`;
+		return `[${this.firstElementChild.toString()}${this.#space}${this.children[1]?.toString() ?? ''}]`;
 	}
 
 	getPadding() {

package/src/imageParameter.js

@@ -19,10 +19,9 @@ class ImageParameterToken extends Token {
 	 * @param {string} value
 	 */
 	static #validate(key, value, config = Parser.getConfig()) {
-		value = value.trim();
+		value = value.replace(/\x00\d+t\x7f/g, '').trim();
 		if (key === 'width') {
-			const mt = value.match(/^(\d*)(?:x(\d*))?$/);
-			return Number(mt?.[1]) > 0 || Number(mt?.[2]) > 0;
+			return /^\d*(?:x\d*)?$/.test(value);
 		} else if (['alt', 'class', 'manualthumb', 'frameless', 'framed', 'thumbnail'].includes(key)) {
 			return true;
 		} else if (key === 'link') {
@@ -68,7 +67,7 @@ class ImageParameterToken extends Token {
 					super(mt[2], config, true, accum, {'Stage-2': ':', '!HeadingToken': ':'});
 					this.#syntax = `${mt[1]}${param[0]}${mt[3]}`;
 				}
-				this.setAttribute('name', param[1]).setAttribute('stage', 7);
+				this.setAttribute('name', param[1]).setAttribute('stage', Parser.MAX_STAGE);
 				return;
 			}
 		}

package/src/table/index.js

@@ -50,7 +50,7 @@ class Layout extends Array {
 
 /**
  * 表格
- * @classdesc `{childNodes: [SyntaxToken, AttributeToken, ?(string|Token), ...TdToken, ...TrToken, ?SyntaxToken]}`
+ * @classdesc `{childNodes: [SyntaxToken, AttributeToken, ?Token, ...TdToken, ...TrToken, ?SyntaxToken]}`
  */
 class TableToken extends TrToken {
 	type = 'table';
@@ -65,7 +65,7 @@ class TableToken extends TrToken {
 	constructor(syntax, attr = '', config = Parser.getConfig(), accum = []) {
 		super(syntax, attr, config, accum, TableToken.openingPattern);
 		this.setAttribute('acceptable', {
-			String: 2, Token: 2, SyntaxToken: [0, -1], AttributeToken: 1, TdToken: '2:', TrToken: '2:',
+			Token: 2, SyntaxToken: [0, -1], AttributeToken: 1, TdToken: '2:', TrToken: '2:',
 		});
 	}
 

package/src/table/tr.js

@@ -9,7 +9,7 @@ const attributeParent = require('../../mixin/attributeParent'),
 
 /**
  * 表格行，含开头的换行，不含结尾的换行
- * @classdesc `{childNodes: [SyntaxToken, AttributeToken, ?(string|Token), ...TdToken]}`
+ * @classdesc `{childNodes: [SyntaxToken, AttributeToken, ?Token, ...TdToken]}`
  */
 class TrToken extends attributeParent(Token, 1) {
 	type = 'tr';
@@ -21,7 +21,7 @@ class TrToken extends attributeParent(Token, 1) {
 	 * @param {accum} accum
 	 */
 	constructor(syntax, attr = '', config = Parser.getConfig(), accum = [], pattern = TrToken.openingPattern) {
-		super(undefined, config, true, accum, {String: 2, Token: 2, SyntaxToken: 0, AttributeToken: 1, TdToken: '2:'});
+		super(undefined, config, true, accum, {Token: 2, SyntaxToken: 0, AttributeToken: 1, TdToken: '2:'});
 		this.append(
 			new SyntaxToken(syntax, pattern, 'table-syntax', config, accum, {
 				'Stage-1': ':', '!ExtToken': '', TranscludeToken: ':',