wikiparser-node 0.3.0 → 0.4.0

package/src/tagPair/ext.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const attributeParent = require('../../mixin/attributeParent'),
-	/** @type {Parser} */ Parser = require('../..'),
+	Parser = require('../..'),
 	TagPairToken = require('.');
 
 /**
@@ -11,35 +11,46 @@ const attributeParent = require('../../mixin/attributeParent'),
 class ExtToken extends attributeParent(TagPairToken) {
 	type = 'ext';
 
+	/** @override */
+	get closed() {
+		return super.closed;
+	}
+
 	/**
-	 * @param {string} name
-	 * @param {string|undefined} closing
+	 * @param {string} name 标签名
+	 * @param {string} attr 标签属性
+	 * @param {string} inner 内部wikitext
+	 * @param {string|undefined} closed 是否封闭
 	 * @param {accum} accum
 	 */
-	constructor(name, attr = '', inner = '', closing = undefined, config = Parser.getConfig(), accum = []) {
-		attr = !attr || /^\s/.test(attr) ? attr : ` ${attr}`;
+	constructor(name, attr = '', inner = '', closed = undefined, config = Parser.getConfig(), accum = []) {
+		attr = !attr || attr.trimStart() !== attr ? attr : ` ${attr}`;
+		const AttributeToken = require('../attribute');
 		const lcName = name.toLowerCase(),
-			AttributeToken = require('../attribute'),
 			attrToken = new AttributeToken(attr, 'ext-attr', lcName, config, accum),
 			newConfig = structuredClone(config),
 			ext = new Set(newConfig.ext);
 		let /** @type {acceptable} */ acceptable, /** @type {Token} */ innerToken;
 		switch (lcName) {
 			case 'choose':
-				ext.add('option');
-				// fall through
-			case 'ref':
 			case 'option':
+			case 'ref':
 			case 'poem':
 			case 'indicator':
 			case 'tab':
 			case 'tabs':
-			case 'pre': {
+			case 'pre':
+			case 'combobox':
+			case 'combooption': {
 				ext.delete(lcName);
-				newConfig.ext = [...ext];
+				newConfig.ext = [
+					...ext,
+					...lcName === 'choose' ? ['option'] : [],
+					...lcName === 'combobox' ? ['combooption'] : [],
+				];
 				const Token = require('..');
 				acceptable = {AttributeToken: 0, Token: 1};
-				innerToken = new Token(inner, newConfig, false, accum);
+				innerToken = new Token(inner, newConfig, true, accum);
 				break;
 			}
 			case 'gallery': {
@@ -50,6 +61,7 @@ class ExtToken extends attributeParent(TagPairToken) {
 				innerToken = new GalleryToken(inner, newConfig, accum);
 				break;
 			}
+
 			/*
 			 * 更多定制扩展的代码示例：
 			 * ```
@@ -74,23 +86,19 @@ class ExtToken extends attributeParent(TagPairToken) {
 		if (lcName === 'pre') {
 			innerToken.setAttribute('stage', Parser.MAX_STAGE - 1);
 		}
-		super(name, attrToken, innerToken, closing, config, accum, acceptable);
-		Object.defineProperty(this, 'closed', {value: true, enumerable: false, writable: false, configurable: false});
+		super(name, attrToken, innerToken, closed, config, accum, acceptable);
 	}
 
+	/** @override */
 	cloneNode() {
 		const inner = this.lastElementChild.cloneNode(),
 			tags = this.getAttribute('tags'),
 			config = this.getAttribute('config'),
-			attr = this.firstElementChild.toString(),
+			attr = String(this.firstElementChild),
 			token = Parser.run(() => new ExtToken(tags[0], attr, '', this.selfClosing ? undefined : tags[1], config));
 		token.lastElementChild.safeReplaceWith(inner);
 		return token;
 	}
-
-	get innerText() {
-		return this.selfClosing ? '' : this.lastElementChild.text();
-	}
 }
 
 Parser.classes.ExtToken = __filename;

package/src/tagPair/include.js

@@ -1,41 +1,46 @@
 'use strict';
 
 const hidden = require('../../mixin/hidden'),
-	/** @type {Parser} */ Parser = require('../..'),
+	Parser = require('../..'),
 	TagPairToken = require('.');
 
 /**
  * `<includeonly>`或`<noinclude>`
- * @classdesc `{childNodes: [string, string]}`
+ * @classdesc `{childNodes: [AstText, AstText]}`
  */
 class IncludeToken extends hidden(TagPairToken) {
 	type = 'include';
 
 	/**
-	 * @param {string} name
-	 * @param {string|undefined} inner
-	 * @param {string|undefined} closing
+	 * @param {string} name 标签名
+	 * @param {string} attr 标签属性
+	 * @param {string|undefined} inner 内部wikitext
+	 * @param {string|undefined} closed 是否封闭
 	 * @param {accum} accum
 	 */
-	constructor(name, attr = '', inner = undefined, closing = undefined, config = Parser.getConfig(), accum = []) {
-		super(name, attr, inner ?? '', inner !== undefined ? closing ?? '' : closing, config, accum, {String: [0, 1]});
+	constructor(name, attr = '', inner = undefined, closed = undefined, config = Parser.getConfig(), accum = []) {
+		super(name, attr, inner ?? '', inner === undefined ? closed : closed ?? '', config, accum, {AstText: [0, 1]});
 	}
 
-	/** @this {IncludeToken & {firstChild: string, lastChild: string}} */
+	/** @override */
 	cloneNode() {
 		const tags = this.getAttribute('tags'),
 			config = this.getAttribute('config'),
-			inner = this.selfClosing ? undefined : this.lastChild,
+			inner = this.selfClosing ? undefined : String(this.lastChild),
 			closing = this.selfClosing || !this.closed ? undefined : tags[1],
-			token = Parser.run(() => new IncludeToken(tags[0], this.firstChild, inner, closing, config));
+			token = Parser.run(() => new IncludeToken(tags[0], String(this.firstChild), inner, closing, config));
 		return token;
 	}
 
-	/** @param {string} str */
+	/**
+	 * @override
+	 * @param {string} str 新文本
+	 */
 	setText(str) {
 		return super.setText(str, 1);
 	}
 
+	/** 清除标签属性 */
 	removeAttr() {
 		super.setText('', 0);
 	}

package/src/tagPair/index.js

@@ -1,30 +1,57 @@
 'use strict';
 
 const fixedToken = require('../../mixin/fixedToken'),
-	/** @type {Parser} */ Parser = require('../..'),
+	Parser = require('../..'),
 	Token = require('..');
 
 /**
  * 成对标签
- * @classdesc `{childNodes: [string|AttributeToken, string|Token]}`
+ * @classdesc `{childNodes: [AstText|AttributeToken, AstText|Token]}`
  */
 class TagPairToken extends fixedToken(Token) {
-	selfClosing;
-	closed;
+	#selfClosing;
+	#closed;
 	#tags;
 
+	/** getter */
+	get selfClosing() {
+		return this.#selfClosing;
+	}
+
+	set selfClosing(value) {
+		value = Boolean(value);
+		if (value !== this.#selfClosing && this.lastChild.text()) {
+			Parser.warn(`<${this.name}>标签内部的${value ? '文本将被隐藏' : '原有文本将再次可见'}！`);
+		}
+		this.#selfClosing = value;
+	}
+
+	/** getter */
+	get closed() {
+		return this.#closed;
+	}
+
+	set closed(value) {
+		this.#closed ||= Boolean(value);
+	}
+
+	/** 内部wikitext */
+	get innerText() {
+		return this.#selfClosing ? undefined : this.lastChild.text();
+	}
+
 	/**
-	 * @param {string} name
-	 * @param {string|Token} attr
-	 * @param {string|Token} inner
-	 * @param {string|undefined} closing - 约定`undefined`表示自闭合，`''`表示未闭合
+	 * @param {string} name 标签名
+	 * @param {string|Token} attr 标签属性
+	 * @param {string|Token} inner 内部wikitext
+	 * @param {string|undefined} closed 是否封闭；约定`undefined`表示自闭合，`''`表示未闭合
 	 * @param {accum} accum
 	 */
-	constructor(name, attr, inner, closing, config = Parser.getConfig(), accum = []) {
+	constructor(name, attr, inner, closed, config = Parser.getConfig(), accum = []) {
 		super(undefined, config, true);
-		this.setAttribute('name', name.toLowerCase()).#tags = [name, closing || name];
-		this.selfClosing = closing === undefined;
-		this.closed = closing !== '';
+		this.setAttribute('name', name.toLowerCase()).#tags = [name, closed || name];
+		this.#selfClosing = closed === undefined;
+		this.#closed = closed !== '';
 		this.append(attr, inner);
 		let index = accum.indexOf(attr);
 		if (index === -1) {
@@ -37,44 +64,52 @@ class TagPairToken extends fixedToken(Token) {
 	}
 
 	/**
+	 * @override
 	 * @template {string} T
-	 * @param {T} key
+	 * @param {T} key 属性键
 	 * @returns {TokenAttribute<T>}
 	 */
 	getAttribute(key) {
-		if (key === 'tags') {
-			return [...this.#tags];
-		}
-		return super.getAttribute(key);
+		return key === 'tags' ? [...this.#tags] : super.getAttribute(key);
 	}
 
-	toString() {
-		const {closed, firstChild, lastChild, nextSibling, name, selfClosing} = this,
+	/**
+	 * @override
+	 * @param {string} selector
+	 */
+	toString(selector) {
+		const {firstChild, lastChild, nextSibling, name} = this,
 			[opening, closing] = this.#tags;
-		if (!closed && nextSibling) {
+		if (selector && this.matches(selector)) {
+			return '';
+		} else if (!this.#closed && nextSibling) {
 			Parser.error(`自动闭合 <${name}>`, lastChild);
-			this.closed = true;
+			this.#closed = true;
 		}
-		return selfClosing
+		return this.#selfClosing
 			? `<${opening}${String(firstChild)}/>`
-			: `<${opening}${String(firstChild)}>${String(lastChild)}${this.closed ? `</${closing}>` : ''}`;
+			: `<${opening}${String(firstChild)}>${String(lastChild)}${this.#closed ? `</${closing}>` : ''}`;
 	}
 
+	/** @override */
 	getPadding() {
 		return this.#tags[0].length + 1;
 	}
 
+	/** @override */
 	getGaps() {
 		return 1;
 	}
 
-	/** @returns {string} */
+	/**
+	 * @override
+	 * @returns {string}
+	 */
 	text() {
-		const {closed, firstChild, selfClosing} = this,
-			[opening, closing] = this.#tags;
-		return selfClosing
-			? `<${opening}${typeof firstChild === 'string' ? firstChild : firstChild.text()}/>`
-			: `<${opening}${super.text('>')}${closed ? `</${closing}>` : ''}`;
+		const [opening, closing] = this.#tags;
+		return this.#selfClosing
+			? `<${opening}${this.firstChild.text()}/>`
+			: `<${opening}${super.text('>')}${this.#closed ? `</${closing}>` : ''}`;
 	}
 }