wikiparser-node 0.8.0 → 0.8.1

package/lib/text.js

@@ -5,7 +5,59 @@ const Parser = require('..'),
 	AstElement = require('./element');
 
 const errorSyntax = /https?:|\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|<\s*\/?([a-z]\w*)(?=[\s/>])/giu,
-	errorSyntaxUrl = /\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|<\s*\/?([a-z]\w*)(?=[\s/>])/giu;
+	errorSyntaxUrl = /\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|<\s*\/?([a-z]\w*)(?=[\s/>])/giu,
+	disallowedTags = [
+		'html',
+		'base',
+		'head',
+		'style',
+		'title',
+		'body',
+		'menu',
+		'a',
+		'area',
+		'audio',
+		'img',
+		'map',
+		'track',
+		'video',
+		'embed',
+		'iframe',
+		'object',
+		'picture',
+		'source',
+		'canvas',
+		'script',
+		'col',
+		'colgroup',
+		'tbody',
+		'tfoot',
+		'thead',
+		'button',
+		'datalist',
+		'fieldset',
+		'form',
+		'input',
+		'label',
+		'legend',
+		'meter',
+		'optgroup',
+		'option',
+		'output',
+		'progress',
+		'select',
+		'textarea',
+		'details',
+		'dialog',
+		'slot',
+		'template',
+		'dir',
+		'frame',
+		'frameset',
+		'marquee',
+		'param',
+		'xmp',
+	];
 
 /** 文本节点 */
 class AstText extends AstNode {
@@ -58,7 +110,7 @@ class AstText extends AstNode {
 		if (errors.length > 0) {
 			const root = this.getRootNode(),
 				{top, left} = root.posFromIndex(start),
-				allowedTags = new Set([this.#config.ext, this.#config.html].flat(2));
+				tags = new Set([this.#config.ext, this.#config.html, disallowedTags].flat(2));
 			return errors.map(/** @returns {LintError} */ ({0: error, 1: prefix, 2: tag, index}) => {
 				if (prefix) {
 					index += prefix.length;
@@ -89,7 +141,7 @@ class AstText extends AstNode {
 							}
 						// no default
 					}
-				} else if (char === '<' && !allowedTags.has(tag.toLowerCase())) {
+				} else if (char === '<' && !tags.has(tag.toLowerCase())) {
 					return false;
 				}
 				return {

package/package.json

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

package/src/attribute.js

@@ -79,7 +79,17 @@ const stages = {'ext-attr': 0, 'html-attr': 2, 'table-attr': 3},
 		link: new Set(['itemprop', 'href', 'title']),
 		gallery: new Set(['mode', 'showfilename', 'caption', 'perrow', 'widths', 'heights', 'showthumbnails', 'type']),
 		poem: new Set(['compact', 'align']),
-		categorytree: new Set(['align', 'hideroot', 'onlyroot', 'depth', 'mode', 'hideprefix']),
+		categorytree: new Set([
+			'align',
+			'hideroot',
+			'onlyroot',
+			'depth',
+			'mode',
+			'hideprefix',
+			'namespaces',
+			'showcount',
+			'notranslations',
+		]),
 		combooption: new Set(['name', 'for', 'inline', 'align']),
 	},
 	empty = new Set(),

package/src/imageParameter.js

@@ -126,26 +126,27 @@ class ImageParameterToken extends Token {
 	 * @param {accum} accum
 	 */
 	constructor(str, config = Parser.getConfig(), accum = []) {
+		let mt;
 		const regexes = Object.entries(config.img).map(
 				/** @returns {[string, string, RegExp]} */
 				([syntax, param]) => [syntax, param, new RegExp(`^(\\s*)${syntax.replace('$1', '(.*)')}(\\s*)$`, 'u')],
 			),
-			param = regexes.find(([,, regex]) => regex.test(str));
+			param = regexes.find(([, key, regex]) => {
+				mt = regex.exec(str);
+				return mt && (mt.length !== 4 || ImageParameterToken.#validate(key, mt[2], config, true));
+			});
 		if (param) {
-			const mt = param[2].exec(str);
-			if (mt.length !== 4 || ImageParameterToken.#validate(param[1], mt[2], config, true)) {
-				if (mt.length === 3) {
-					super(undefined, config, true, accum);
-					this.#syntax = str;
-				} else {
-					super(mt[2], config, true, accum, {
-						'Stage-2': ':', '!HeadingToken': ':',
-					});
-					this.#syntax = `${mt[1]}${param[0]}${mt[3]}`;
-				}
-				this.setAttribute('name', param[1]);
-				return;
+			if (mt.length === 3) {
+				super(undefined, config, true, accum);
+				this.#syntax = str;
+			} else {
+				super(mt[2], config, true, accum, {
+					'Stage-2': ':', '!HeadingToken': ':',
+				});
+				this.#syntax = `${mt[1]}${param[0]}${mt[3]}`;
 			}
+			this.setAttribute('name', param[1]);
+			return;
 		}
 		super(str, {...config, excludes: [...config.excludes, 'list']}, true, accum);
 		this.setAttribute('name', 'caption').setAttribute('stage', 7);

package/src/transclude.js

@@ -195,12 +195,14 @@ class TranscludeToken extends Token {
 	 * @complexity `n`
 	 */
 	text() {
-		const {childNodes, firstChild, modifier} = this;
-		return `{{${modifier}${modifier && ':'}${
-			this.type === 'magic-word'
-				? `${firstChild.text()}${childNodes.length > 1 ? ':' : ''}${text(childNodes.slice(1), '|')}`
-				: super.text('|')
-		}}}`;
+		const {childNodes, firstChild, modifier, type, name} = this;
+		return type === 'magic-word' && name === 'vardefine'
+			? ''
+			: `{{${modifier}${modifier && ':'}${
+				this.type === 'magic-word'
+					? `${firstChild.text()}${childNodes.length > 1 ? ':' : ''}${text(childNodes.slice(1), '|')}`
+					: super.text('|')
+			}}}`;
 	}
 
 	/** @override */
@@ -330,7 +332,7 @@ class TranscludeToken extends Token {
 			this.typeError('getArgs', 'String', 'Number');
 		}
 		copy ||= !Parser.debugging && externalUse('getArgs');
-		const keyStr = String(key).trim();
+		const keyStr = String(key).replace(/^[ \t\n\0\v]+|(?<=[^ \t\n\0\v])[ \t\n\0\v]+$/gu, '');
 		let args;
 		if (Object.hasOwn(this.#args, keyStr)) {
 			args = this.#args[keyStr];