wikiparser-node 0.2.2 → 0.2.3

package/config/default.json

@@ -646,65 +646,28 @@
 		"wikt",
 		"wiktionary",
 		"zhwiki",
-		"acronym",
-		"c2find",
+		"cc",
 		"cm",
-		"dictionary",
-		"drumcorpswiki",
-		"dwjwiki",
-		"elibre",
-		"emacswiki",
 		"enmoe",
-		"enwiki",
-		"foldoc",
-		"foxwiki",
-		"freebsdman",
-		"gentoo-wiki",
-		"hammondwiki",
-		"hrwiki",
+		"enwp",
+		"fandom",
+		"ghia",
+		"huiji",
 		"jamoe",
-		"kmwiki",
+		"jawp",
 		"library",
-		"linuxwiki",
-		"lojban",
-		"lqwiki",
-		"mcwiki",
-		"meatball",
-		"memoryalpha",
 		"meta",
-		"metawiki",
-		"mozillawiki",
-		"oeis",
-		"openwiki",
 		"phab",
 		"pmid",
-		"pythoninfo",
-		"rfc",
-		"s23wiki",
-		"seattlewireless",
-		"senseislibrary",
 		"shoutwiki",
-		"sourceforge",
-		"squeak",
-		"theopedia",
-		"tmbw",
-		"tmnet",
 		"translatewiki",
-		"twiki",
-		"uncyclopedia",
-		"unreal",
-		"usemod",
-		"wiki",
-		"wikif1",
-		"wikihow",
 		"zhmoe",
 		"zhmoegirl",
 		"zhtest",
+		"zhwp",
 		"文库",
-		"维基中文",
-		"维基日文",
-		"维基英文",
 		"萌娘共享",
+		"萌娘文库",
 		"萌百"
 	],
 	"img": {

package/config/moegirl.json

@@ -578,20 +578,14 @@
 	],
 	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|worldwind://|xmpp:",
 	"interwiki": [
-		"arxiv",
 		"commons",
-		"doi",
-		"imdb",
-		"jawiki",
 		"mediawikiwiki",
 		"metawikimedia",
 		"mw",
-		"wikia",
 		"wikibooks",
 		"wikidata",
 		"wikimedia",
 		"wikinews",
-		"wikiinfo",
 		"wikipedia",
 		"wikiquote",
 		"wikisource",
@@ -600,66 +594,31 @@
 		"wikivoyage",
 		"wikt",
 		"wiktionary",
-		"zhwiki",
-		"acronym",
-		"c2find",
+		"cc",
 		"cm",
-		"dictionary",
-		"drumcorpswiki",
-		"dwjwiki",
-		"elibre",
-		"emacswiki",
+		"en",
 		"enmoe",
-		"enwiki",
-		"foldoc",
-		"foxwiki",
-		"freebsdman",
-		"gentoo-wiki",
-		"hammondwiki",
-		"hrwiki",
+		"enwp",
+		"fandom",
+		"ghia",
+		"huiji",
+		"ja",
 		"jamoe",
-		"kmwiki",
+		"jawp",
 		"library",
-		"linuxwiki",
-		"lojban",
-		"lqwiki",
-		"mcwiki",
-		"meatball",
-		"memoryalpha",
 		"meta",
-		"metawiki",
-		"mozillawiki",
-		"oeis",
-		"openwiki",
 		"phab",
 		"pmid",
-		"pythoninfo",
-		"rfc",
-		"s23wiki",
-		"seattlewireless",
-		"senseislibrary",
 		"shoutwiki",
-		"sourceforge",
-		"squeak",
-		"theopedia",
-		"tmbw",
-		"tmnet",
 		"translatewiki",
-		"twiki",
-		"uncyclopedia",
-		"unreal",
-		"usemod",
-		"wiki",
-		"wikif1",
-		"wikihow",
+		"zh",
 		"zhmoe",
 		"zhmoegirl",
 		"zhtest",
+		"zhwp",
 		"文库",
-		"维基中文",
-		"维基日文",
-		"维基英文",
 		"萌娘共享",
+		"萌娘文库",
 		"萌百"
 	],
 	"img": {

package/errors/2022-12-07T10:07:09.577Z

@@ -0,0 +1 @@
+<!---->:

package/errors/2022-12-07T10:07:09.577Z.err

@@ -0,0 +1,11 @@
+Error: ListToken 不可删除元素！
+    at ListToken.removeAt (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/mixin/fixedToken.js:14:9)
+    at ListToken.replaceChildren (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/lib/element.js:232:9)
+    at ListToken.build (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/src/index.js:500:8)
+    at Token.build (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/src/index.js:504:11)
+    at Token.parse (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/src/index.js:533:19)
+    at /Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/index.js:135:11
+    at Object.run (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/index.js:33:19)
+    at Object.parse (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/index.js:125:8)
+    at REPL8:1:10
+    at Script.runInThisContext (node:vm:130:12)

package/errors/2022-12-07T10:07:09.577Z.json

@@ -0,0 +1,5 @@
+{
+	"stage": 11,
+	"include": false,
+	"config": "./config/default"
+}

package/errors/2022-12-07T10:22:31.325Z

@@ -0,0 +1 @@
+<!---->:

package/errors/2022-12-07T10:22:31.325Z.err

@@ -0,0 +1,11 @@
+Error: ListToken 不可删除元素！
+    at ListToken.removeAt (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/mixin/fixedToken.js:14:9)
+    at ListToken.replaceChildren (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/lib/element.js:232:9)
+    at ListToken.build (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/src/index.js:500:8)
+    at Token.build (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/src/index.js:504:11)
+    at Token.parse (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/src/index.js:533:19)
+    at /Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/index.js:135:11
+    at Object.run (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/index.js:33:19)
+    at Object.parse (/Users/mengxiwu/Documents/CCM-RP/node/wikiparser-node/index.js:125:8)
+    at REPL68:1:10
+    at Script.runInThisContext (node:vm:130:12)

package/errors/2022-12-07T10:22:31.325Z.json

@@ -0,0 +1,5 @@
+{
+	"stage": 11,
+	"include": false,
+	"config": "./config/default"
+}

package/lib/element.js

@@ -673,18 +673,11 @@ class AstElement extends AstNode {
 	}
 
 	/**
-	 * 不作为特殊语法的文字
-	 * @returns {[number, string][]}
+	 * @returns {boolean}
 	 * @complexity `n`
 	 */
-	plain() {
-		const index = this.getAbsoluteIndex();
-		return this.childNodes.flatMap((node, i) => {
-			if (node instanceof AstElement) {
-				return node.plain();
-			}
-			return node ? [[index + this.getRelativeIndex(i), node]] : [];
-		});
+	get eof() {
+		return this.type === 'root' || !this.nextSibling && this.parentElement.eof;
 	}
 
 	/**
@@ -743,6 +736,11 @@ class AstElement extends AstNode {
 		}
 		Parser.info(`${indent}</${type}>`);
 	}
+
+	/** @param {number} n */
+	getLine(n) {
+		return this.toString().split('\n', n + 1).at(-1);
+	}
 }
 
 Parser.classes.AstElement = __filename;

package/mixin/hidden.js

@@ -11,11 +11,6 @@ const hidden = constructor => class extends constructor {
 	text() {
 		return '';
 	}
-
-	/** @returns {[number, string][]} */
-	plain() {
-		return [];
-	}
 };
 
 Parser.mixins.hidden = __filename;

package/package.json

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

package/parser/hrAndDoubleUnderscore.js

@@ -10,7 +10,7 @@ const parseHrAndDoubleUnderscore = (firstChild, config = Parser.getConfig(), acc
 	const HrToken = require('../src/nowiki/hr'),
 		DoubleUnderscoreToken = require('../src/nowiki/doubleUnderscore'),
 		{doubleUnderscore} = config;
-	return firstChild.replace(/^-{4,}/mg, m => {
+	return firstChild.replace(/(?<=^(?:\x00\d+c\x7f)*)-{4,}/mg, m => {
 		new HrToken(m.length, config, accum);
 		return `\x00${accum.length - 1}r\x7f`;
 	}).replace(new RegExp(`__(${doubleUnderscore.flat().join('|')})__`, 'ig'), /** @param {string} p1 */(m, p1) => {

package/parser/list.js

@@ -7,13 +7,13 @@ const /** @type {Parser} */ Parser = require('..');
  * @param {accum} accum
  */
 const parseList = (text, config = Parser.getConfig(), accum = []) => {
-	const mt = text.match(/^(?:[;:*#]|\x00\d+c\x7f)*[;:*#]/);
+	const mt = text.match(/^((?:\x00\d+c\x7f)*)([;:*#]+)/);
 	if (!mt) {
 		return text;
 	}
 	const ListToken = require('../src/nowiki/list'),
-		[prefix] = mt;
-	text = `\x00${accum.length}d\x7f${text.slice(prefix.length)}`;
+		[total, comment, prefix] = mt;
+	text = `${comment}\x00${accum.length}d\x7f${text.slice(total.length)}`;
 	new ListToken(prefix, config, accum);
 	let dt = prefix.split(';').length - 1;
 	if (!dt) {

package/parser/table.js

@@ -36,6 +36,9 @@ const parseTable = ({firstChild, type}, config = Parser.getConfig(), accum = [])
 		const line = outLine.slice(spaces.length),
 			matchesStart = line.match(/^(:*)((?:\s|\x00\d+c\x7f)*)({\||{\x00\d+!\x7f|\x00\d+{\x7f)(.*)/);
 		if (matchesStart) {
+			while (top && top.type !== 'td') {
+				top = stack.pop();
+			}
 			const [, indent, moreSpaces, tableSyntax, attr] = matchesStart;
 			if (indent) {
 				new DdToken(indent, config, accum);

package/src/arg.js

@@ -73,11 +73,6 @@ class ArgToken extends Token {
 		return `{{{${text(this.children.slice(0, 2), '|')}}}}`;
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		return this.childNodes.length > 1 ? this.children[1].plain() : [];
-	}
-
 	/** @complexity `n` */
 	removeRedundant() {
 		Parser.run(() => {

package/src/attribute.js

@@ -82,7 +82,7 @@ class AttributeToken extends Token {
 	 * @param {accum} accum
 	 */
 	constructor(attr, type, name, config = Parser.getConfig(), accum = []) {
-		super(attr, config, type !== 'ext-attr', accum, {[`Stage-${stages[type]}`]: ':'});
+		super(attr, config, true, accum, {[`Stage-${stages[type]}`]: ':'});
 		this.type = type;
 		this.setAttribute('name', name).#parseAttr();
 	}
@@ -253,11 +253,6 @@ class AttributeToken extends Token {
 		return this.type === 'table-attr' ? normalizeSpace(str) : str;
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		return [];
-	}
-
 	/**
 	 * @param {number} i
 	 * @complexity `n`

package/src/converter.js

@@ -19,7 +19,7 @@ class ConverterToken extends Token {
 	 * @param {accum} accum
 	 */
 	constructor(flags, rules, config = Parser.getConfig(), accum = []) {
-		super(undefined, config, false, accum);
+		super(undefined, config, true, accum);
 		this.append(new ConverterFlagsToken(flags, config, accum));
 		if (rules.length) {
 			const [firstRule] = rules,
@@ -65,11 +65,6 @@ class ConverterToken extends Token {
 		return `-{${flags.text()}|${text(rules, ';')}}-`;
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		return this.children.slice(1).flatMap(child => child.plain());
-	}
-
 	/** @this {ConverterToken & {firstChild: ConverterFlagsToken}} */
 	getAllFlags() {
 		return this.firstChild.getAllFlags();

package/src/converterFlags.js

@@ -17,7 +17,7 @@ class ConverterFlagsToken extends Token {
 	 * @param {accum} accum
 	 */
 	constructor(flags, config = Parser.getConfig(), accum = []) {
-		super(undefined, config, false, accum, {AtomToken: ':'});
+		super(undefined, config, true, accum, {AtomToken: ':'});
 		this.append(...flags.map(flag => new AtomToken(flag, 'converter-flag', config, accum)));
 	}
 
@@ -86,11 +86,6 @@ class ConverterFlagsToken extends Token {
 		return super.text(';');
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		return [];
-	}
-
 	/**
 	 * @param {string} flag
 	 * @returns {AtomToken[]}

package/src/converterRule.js

@@ -120,15 +120,6 @@ class ConverterRuleToken extends Token {
 		return super.text(':');
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		const {firstElementChild, lastElementChild, unidirectional} = this;
-		if (unidirectional) {
-			return [...firstElementChild.plain(), ...lastElementChild.plain()];
-		}
-		return lastElementChild.plain();
-	}
-
 	noConvert() {
 		for (let i = this.childNodes.length - 2; i >= 0; i--) {
 			super.removeAt(i);

package/src/extLink.js

@@ -77,14 +77,6 @@ class ExtLinkToken extends Token {
 		return `[${super.text(' ').replaceAll('\n', ' ')}]`;
 	}
 
-	/**
-	 * @returns {[number, string][]}
-	 * @complexity `n`
-	 */
-	plain() {
-		return this.childNodes.length === 1 ? [] : this.lastElementChild.plain();
-	}
-
 	/** @this {ExtLinkToken & {firstElementChild: MagicLinkToken}} */
 	getUrl() {
 		return this.firstElementChild.getUrl();

package/src/gallery.js

@@ -0,0 +1,31 @@
+'use strict';
+
+const /** @type {Parser} */ Parser = require('..'),
+	Token = require('.'),
+	FileToken = require('./link/file');
+
+/**
+ * 扩展标签
+ * @classdesc `{childNodes: [...FileToken]}`
+ */
+class GalleryToken extends Token {
+	type = 'ext-inner';
+	name = 'gallery';
+
+	/** @param {accum} accum */
+	constructor(wikitext = '', config = Parser.getConfig(), accum = []) {
+		super(undefined, config, true, accum, {FileToken: ':'});
+		for (const line of wikitext.split('\n')) {
+			const [link, ...text] = line.split('|'),
+				title = Parser.normalizeTitle(link, 6, false, config);
+			this.appendChild(new FileToken(link, text.length ? text.join('|') : undefined, title, config, accum));
+		}
+	}
+
+	toString() {
+		return super.toString('\n');
+	}
+}
+
+Parser.classes.GalleryToken = __filename;
+module.exports = GalleryToken;

package/src/heading.js

@@ -63,11 +63,6 @@ class HeadingToken extends fixedToken(sol(Token)) {
 		return `${this.prependNewLine()}${equals}${this.firstElementChild.text()}${equals}${this.appendNewLine()}`;
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		return this.firstElementChild.plain();
-	}
-
 	/** @param {number} n */
 	setLevel(n) {
 		if (typeof n !== 'number') {

package/src/html.js

@@ -62,11 +62,6 @@ class HtmlToken extends attributeParent(fixedToken(Token)) {
 		return `<${this.closing ? '/' : ''}${this.#tag}${super.text()}${this.selfClosing ? '/' : ''}>`;
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		return [];
-	}
-
 	/** @param {string} tag */
 	replaceTag(tag) {
 		const name = tag.toLowerCase();

package/src/link/category.js

@@ -12,6 +12,7 @@ class CategoryToken extends LinkToken {
 	type = 'category';
 	sortkey = '';
 
+	setLangLink = undefined;
 	setFragment = undefined;
 	asSelfLink = undefined;
 	pipeTrick = undefined;
@@ -74,11 +75,6 @@ class CategoryToken extends LinkToken {
 		return `[[${this.firstElementChild.text()}]]`;
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		return [];
-	}
-
 	/** @param {string} text */
 	setSortkey(text) {
 		this.setLinkText(text);

package/src/link/file.js

@@ -15,6 +15,7 @@ class FileToken extends LinkToken {
 	/** @type {Set<string>} */ #keys = new Set();
 	/** @type {Record<string, Set<ImageParameterToken>>} */ #args = {};
 
+	setLangLink = undefined;
 	setFragment = undefined;
 	asSelfLink = undefined;
 	setLinkText = undefined;

package/src/link/index.js

@@ -90,7 +90,8 @@ class LinkToken extends Token {
 	}
 
 	toString() {
-		return `[[${super.toString('|')}]]`;
+		const str = super.toString('|');
+		return this.parentElement?.matches('ext-inner#gallery') ? str : `[[${str}]]`;
 	}
 
 	getPadding() {
@@ -105,11 +106,6 @@ class LinkToken extends Token {
 		return `[[${super.text('|')}]]`;
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		return this.childNodes.length === 1 ? [] : this.lastElementChild.plain();
-	}
-
 	/** @param {string} link */
 	setTarget(link) {
 		link = String(link);
@@ -128,6 +124,33 @@ class LinkToken extends Token {
 		this.firstElementChild.safeReplaceWith(firstChild);
 	}
 
+	/**
+	 * @param {string} lang
+	 * @param {string} link
+	 */
+	setLangLink(lang, link) {
+		if (typeof lang !== 'string') {
+			this.typeError('setLangLink', 'String');
+		}
+		link = String(link).trim();
+		if (link.startsWith('#')) {
+			throw new SyntaxError(`跨语言链接不能仅为fragment！`);
+		} else if (link.startsWith(':')) {
+			link = link.slice(1);
+		}
+		const root = Parser.parse(`[[${lang}:${link}]]`, this.getAttribute('include'), 6, this.getAttribute('config')),
+			/** @type {Token & {firstElementChild: LinkToken}} */ {childNodes: {length}, firstElementChild} = root;
+		if (length !== 1 || firstElementChild?.type !== 'link' || firstElementChild.childNodes.length !== 1
+			|| firstElementChild.interwiki !== lang.toLowerCase()
+		) {
+			throw new SyntaxError(`非法的跨语言链接目标：${lang}:${link}`);
+		}
+		const {firstChild} = firstElementChild;
+		root.destroy();
+		firstElementChild.destroy();
+		this.firstElementChild.safeReplaceWith(firstChild);
+	}
+
 	/** @param {string} fragment */
 	#setFragment(fragment, page = true) {
 		fragment = String(fragment).replace(/[<>[]#|=!]/g, p => encodeURIComponent(p));

package/src/nowiki/dd.js

@@ -29,11 +29,6 @@ class DdToken extends NowikiToken {
 		this.seal(['dt', 'ul', 'ol', 'indent']).#update(str);
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		return [];
-	}
-
 	/** @param {string} str */
 	setText(str) {
 		const src = this.type === 'dd' ? ':' : ';:*#';

package/src/nowiki/hr.js

@@ -24,11 +24,6 @@ class HrToken extends sol(NowikiToken) {
 		return Parser.run(() => new HrToken(this.firstChild.length, this.getAttribute('config')));
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		return [];
-	}
-
 	/** @param {string} str */
 	setText(str) {
 		if (!/^-{4,}$/.test(str)) {

package/src/nowiki/index.js

@@ -16,7 +16,7 @@ class NowikiToken extends fixedToken(Token) {
 	 * @param {accum} accum
 	 */
 	constructor(wikitext, config = Parser.getConfig(), accum = []) {
-		super(wikitext, config, false, accum);
+		super(wikitext, config, true, accum);
 	}
 
 	/** @this {NowikiToken & {firstChild: string}} */

package/src/nowiki/quote.js

@@ -26,11 +26,6 @@ class QuoteToken extends NowikiToken {
 		}
 		return super.setText(str);
 	}
-
-	/** @returns {[number, string][]} */
-	plain() {
-		return [];
-	}
 }
 
 Parser.classes.QuoteToken = __filename;

package/src/onlyinclude.js

@@ -15,7 +15,7 @@ class OnlyincludeToken extends Token {
 	 * @param {accum} accum
 	 */
 	constructor(inner, config = Parser.getConfig(), accum = []) {
-		super(inner, config, false, accum);
+		super(inner, config, true, accum);
 	}
 
 	cloneNode() {

package/src/parameter.js

@@ -85,11 +85,6 @@ class ParameterToken extends fixedToken(Token) {
 		return this.anon ? this.lastElementChild.text() : super.text('=');
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		return this.lastElementChild.plain();
-	}
-
 	/**
 	 * @param {ParameterToken} token
 	 * @complexity `n`

package/src/syntax.js

@@ -60,11 +60,6 @@ class SyntaxToken extends Token {
 		return super.getAttribute(key);
 	}
 
-	/** @returns {[number, string][]} */
-	plain() {
-		return [];
-	}
-
 	/**
 	 * @param {...string|Token} elements
 	 * @complexity `n`

package/src/tagPair/ext.js

@@ -79,6 +79,10 @@ class ExtToken extends attributeParent(TagPairToken) {
 		token.lastElementChild.safeReplaceWith(inner);
 		return token;
 	}
+
+	get innerText() {
+		return this.selfClosing ? '' : this.lastElementChild.text();
+	}
 }
 
 Parser.classes.ExtToken = __filename;

package/src/tagPair/index.js

@@ -21,7 +21,7 @@ class TagPairToken extends fixedToken(Token) {
 	 * @param {accum} accum
 	 */
 	constructor(name, attr, inner, closing, config = Parser.getConfig(), accum = []) {
-		super(undefined, config);
+		super(undefined, config, true);
 		this.setAttribute('name', name.toLowerCase()).#tags = [name, closing || name];
 		this.selfClosing = closing === undefined;
 		this.closed = closing !== '';
@@ -76,15 +76,6 @@ class TagPairToken extends fixedToken(Token) {
 			? `<${opening}${typeof firstChild === 'string' ? firstChild : firstChild.text()}/>`
 			: `<${opening}${super.text('>')}${closed ? `</${closing}>` : ''}`;
 	}
-
-	/** @returns {[number, string][]} */
-	plain() {
-		const {lastChild} = this;
-		if (typeof lastChild === 'string') {
-			return lastChild ? [[this.getAbsoluteIndex() + this.getRelativeIndex(1), lastChild]] : [];
-		}
-		return lastChild.plain();
-	}
 }
 
 Parser.classes.TagPairToken = __filename;

package/src/transclude.js

@@ -209,10 +209,6 @@ class TranscludeToken extends Token {
 		}}}`;
 	}
 
-	plain() {
-		return this.getAllArgs().flatMap(child => child.plain());
-	}
-
 	/**
 	 * @param {number|ParameterToken} addedToken
 	 * @complexity `n`