wikiparser-node 0.4.0 → 0.6.1

package/lib/ranges.js

@@ -62,12 +62,11 @@ class Range {
 
 	/**
 	 * 将Range转换为针对特定数组的下标集
-	 * @param {number|any[]} arr 参考数组
+	 * @param {number|*[]} arr 参考数组
 	 * @complexity `n`
 	 */
 	applyTo(arr) {
-		return new Array(typeof arr === 'number' ? arr : arr.length).fill().map((_, i) => i)
-			.slice(this.start, this.end)
+		return new Array(typeof arr === 'number' ? arr : arr.length).fill().map((_, i) => i).slice(this.start, this.end)
 			.filter((_, j) => j % this.step === 0);
 	}
 }
@@ -100,7 +99,7 @@ class Ranges extends Array {
 
 	/**
 	 * 将Ranges转换为针对特定Array的下标集
-	 * @param {number|any[]} arr 参考数组
+	 * @param {number|*[]} arr 参考数组
 	 * @complexity `n`
 	 */
 	applyTo(arr) {

package/lib/text.js

@@ -23,6 +23,68 @@ class AstText extends AstNode {
 		});
 	}
 
+	/** 输出字符串 */
+	toString() {
+		return this.data;
+	}
+
+	/**
+	 * 修改内容
+	 * @param {string} text 新内容
+	 */
+	#setData(text) {
+		text = String(text);
+		const {data} = this,
+			e = new Event('text', {bubbles: true});
+		this.setAttribute('data', text);
+		if (data !== text) {
+			this.dispatchEvent(e, {oldText: data, newText: text});
+		}
+		return this;
+	}
+
+	/**
+	 * 替换字符串
+	 * @param {string} text 替换的字符串
+	 */
+	replaceData(text = '') {
+		this.#setData(text);
+	}
+
+	static errorSyntax = /[{}]+|\[{2,}|\[(?!(?:(?!https?\b)[^[])*\])|(?<=^|\])([^[]*?)\]+|<(?=\s*\/?\w+[\s/>])/giu;
+
+	/**
+	 * Linter
+	 * @param {number} start 起始位置
+	 * @returns {LintError[]}
+	 */
+	lint(start = 0) {
+		const {data} = this,
+			errors = [...data.matchAll(AstText.errorSyntax)];
+		if (errors.length > 0) {
+			const {top, left} = this.getRootNode().posFromIndex(start);
+			return errors.map(({0: error, 1: prefix, index}) => {
+				if (prefix) {
+					index += prefix.length;
+					error = error.slice(prefix.length);
+				}
+				const lines = data.slice(0, index).split('\n'),
+					startLine = lines.length + top - 1,
+					{length} = lines.at(-1),
+					startCol = lines.length > 1 ? length : left + length;
+				return {
+					message: `孤立的"${error[0]}"`,
+					severity: error[0] === '{' || error[0] === '}' ? 'error' : 'warning',
+					startLine,
+					endLine: startLine,
+					startCol,
+					endCol: startCol + error.length,
+				};
+			});
+		}
+		return [];
+	}
+
 	/** 复制 */
 	cloneNode() {
 		return new AstText(this.data);
@@ -33,6 +95,7 @@ class AstText extends AstNode {
 	 * @template {string} T
 	 * @param {T} key 属性键
 	 * @returns {TokenAttribute<T>}
+	 * @throws `Error` 文本节点没有子节点
 	 */
 	getAttribute(key) {
 		return key === 'verifyChild'
@@ -42,35 +105,14 @@ class AstText extends AstNode {
 			: super.getAttribute(key);
 	}
 
-	/** 输出字符串 */
-	toString() {
-		return this.data;
-	}
-
 	/** @override */
 	text() {
 		return this.data;
 	}
 
-	/**
-	 * 修改内容
-	 * @param {string} text 新内容
-	 */
-	#setData(text) {
-		text = String(text);
-		const {data} = this,
-			e = new Event('text', {bubbles: true});
-		this.setAttribute('data', text);
-		if (data !== text) {
-			this.dispatchEvent(e, {oldText: data, newText: text});
-		}
-		return this;
-	}
-
 	/**
 	 * 在后方添加字符串
 	 * @param {string} text 添加的字符串
-	 * @throws `Error` 禁止外部调用
 	 */
 	appendData(text) {
 		this.#setData(this.data + text);
@@ -80,8 +122,6 @@ class AstText extends AstNode {
 	 * 删减字符串
 	 * @param {number} offset 起始位置
 	 * @param {number} count 删减字符数
-	 * @throws `RangeError` 错误的删减位置
-	 * @throws `Error` 禁止外部调用
 	 */
 	deleteData(offset, count) {
 		this.#setData(this.data.slice(0, offset) + this.data.slice(offset + count));
@@ -91,22 +131,11 @@ class AstText extends AstNode {
 	 * 插入字符串
 	 * @param {number} offset 插入位置
 	 * @param {string} text 待插入的字符串
-	 * @throws `RangeError` 错误的插入位置
-	 * @throws `Error` 禁止外部调用
 	 */
 	insertData(offset, text) {
 		this.#setData(this.data.slice(0, offset) + text + this.data.slice(offset));
 	}
 
-	/**
-	 * 替换字符串
-	 * @param {string} text 替换的字符串
-	 * @throws `Error` 禁止外部调用
-	 */
-	replaceData(text = '') {
-		this.#setData(text);
-	}
-
 	/**
 	 * 提取子串
 	 * @param {number} offset 起始位置
@@ -123,9 +152,9 @@ class AstText extends AstNode {
 	 * @throws `Error` 没有父节点
 	 */
 	splitText(offset) {
-		if (typeof offset !== 'number') {
+		if (!Number.isInteger(offset)) {
 			this.typeError('splitText', 'Number');
-		} else if (offset > this.length || offset < -this.length || !Number.isInteger(offset)) {
+		} else if (offset > this.length || offset < -this.length) {
 			throw new RangeError(`错误的断开位置！${offset}`);
 		}
 		const {parentNode, data} = this;

package/lib/title.js

@@ -4,13 +4,13 @@ const Parser = require('..');
 
 /** MediaWiki页面标题对象 */
 class Title {
+	valid = true;
+	ns = 0;
 	title = '';
 	main = '';
 	prefix = '';
-	ns = 0;
 	interwiki = '';
 	fragment = '';
-	valid = true;
 
 	/**
 	 * @param {string} title 标题（含或不含命名空间前缀）
@@ -39,24 +39,25 @@ class Title {
 		}
 		this.ns = nsid[namespace.toLowerCase()];
 		const i = title.indexOf('#');
+		let fragment = '';
 		if (i !== -1) {
-			const fragment = title.slice(i + 1).trimEnd();
+			fragment = title.slice(i + 1).trimEnd();
 			if (fragment.includes('%')) {
 				try {
-					this.fragment = decodeURIComponent(fragment);
+					fragment = decodeURIComponent(fragment);
 				} catch {}
 			} else if (fragment.includes('.')) {
 				try {
-					this.fragment = decodeURIComponent(fragment.replaceAll('.', '%'));
+					fragment = decodeURIComponent(fragment.replaceAll('.', '%'));
 				} catch {}
 			}
-			this.fragment ||= fragment;
 			title = title.slice(0, i).trim();
 		}
+		this.valid = Boolean(title || fragment) && !/\0\d+[eh!+-]\x7F|[<>[\]{}|]/u.test(title);
 		this.main = title && `${title[0].toUpperCase()}${title.slice(1)}`;
 		this.prefix = `${namespace}${namespace && ':'}`;
-		this.title = `${iw ? `${this.interwiki}:` : ''}${this.prefix}${this.main}`;
-		this.valid = Boolean(this.main || this.fragment) && !/\0\d+[eh!+-]\x7F|[<>[\]{}|]/u.test(this.title);
+		this.title = `${iw ? `${this.interwiki}:` : ''}${this.prefix}${this.main.replaceAll(' ', '_')}`;
+		this.fragment = fragment;
 	}
 
 	/** @override */

package/mixin/fixedToken.js

@@ -28,11 +28,11 @@ const fixedToken = Constructor => class extends Constructor {
 	 * @throws `Error`
 	 */
 	insertAt(token, i = this.childNodes.length) {
-		if (!Parser.running) {
-			throw new Error(`${this.constructor.name} 不可插入元素！`);
+		if (Parser.running) {
+			super.insertAt(token, i);
+			return token;
 		}
-		super.insertAt(token, i);
-		return token;
+		throw new Error(`${this.constructor.name} 不可插入元素！`);
 	}
 };
 

package/mixin/hidden.js

@@ -9,6 +9,8 @@ const Parser = require('..');
  * @returns {T}
  */
 const hidden = Constructor => class extends Constructor {
+	static hidden = true;
+
 	/** 没有可见部分 */
 	text() { // eslint-disable-line class-methods-use-this
 		return '';

package/mixin/sol.js

@@ -9,25 +9,34 @@ const Parser = require('..'),
  * @param {T} Constructor 基类
  * @returns {T}
  */
-const sol = Constructor => class extends Constructor {
+const sol = Constructor => class SolToken extends Constructor {
 	/**
-	 * 在前方插入newline
+	 * 是否可以视为root节点
 	 * @this {Token}
+	 * @param {boolean} includeHeading 是否包括HeadingToken
+	 */
+	#isRoot(includeHeading) {
+		const {parentNode, type} = this;
+		return parentNode?.type === 'root'
+			|| parentNode?.type === 'ext-inner' && (includeHeading || type !== 'heading' && parentNode.name === 'poem');
+	}
+
+	/**
+	 * 在前方插入newline
+	 * @this {SolToken & Token}
 	 */
 	prependNewLine() {
-		const {previousVisibleSibling = '', parentNode} = this;
-		return (previousVisibleSibling || parentNode?.type !== 'root') && String(previousVisibleSibling).at(-1) !== '\n'
+		return (this.previousVisibleSibling || !this.#isRoot()) && String(this.previousVisibleSibling).at(-1) !== '\n'
 			? '\n'
 			: '';
 	}
 
 	/**
 	 * 在后方插入newline
-	 * @this {Token}
+	 * @this {SolToken & Token}
 	 */
 	appendNewLine() {
-		const {nextVisibleSibling = '', parentNode} = this;
-		return (nextVisibleSibling || parentNode?.type !== 'root') && String(nextVisibleSibling ?? '')[0] !== '\n'
+		return (this.nextVisibleSibling || !this.#isRoot(true)) && String(this.nextVisibleSibling ?? '')[0] !== '\n'
 			? '\n'
 			: '';
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikiparser-node",
-  "version": "0.4.0",
+  "version": "0.6.1",
   "description": "A Node.js parser for MediaWiki markup with AST",
   "keywords": [
     "mediawiki",
@@ -13,13 +13,24 @@
   },
   "license": "GPL-3.0",
   "author": "Bhsd",
+  "files": [
+    "/index.js",
+    "/parser/",
+    "/util/",
+    "/lib/",
+    "/src/",
+    "/config/",
+    "/mixin/",
+    "/tool/"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/bhsd-harry/wikiparser-node.git"
   },
   "scripts": {
-    "test": "node test/test.js",
-    "real": "node test/real.js"
+    "test": "eslint . && node test/test.js",
+    "real": "node test/real.js",
+    "single": "node --prof test/single.js && node --prof-process isolate-0x*-v8.log > test/processed.txt && rm isolate-0x*-v8.log"
   },
   "devDependencies": {
     "@types/node": "^17.0.23",

package/parser/brackets.js

@@ -57,12 +57,18 @@ const parseBrackets = (text, config = Parser.getConfig(), accum = []) => {
 				{length} = accum;
 			lastIndex = curIndex + close.length; // 这不是最终的lastIndex
 			parts.at(-1).push(text.slice(topPos, curIndex));
-			const ch = close.length === 2 ? marks[removeComment(parts[0][0])] ?? 't' : 't'; // 标记{{!}}等
-			let skip = false;
+			let skip = false,
+				ch = 't';
 			if (close.length === 3) {
 				const ArgToken = require('../src/arg');
 				new ArgToken(parts.map(part => part.join('=')), config, accum);
 			} else {
+				const name = removeComment(parts[0][0]);
+				if (name in marks) {
+					ch = marks[name]; // 标记{{!}}等
+				} else if (/^(?:fullurl|canonicalurl|filepath):./iu.test(name)) {
+					ch = 'm';
+				}
 				try {
 					const TranscludeToken = require('../src/transclude');
 					new TranscludeToken(parts[0][0], parts.slice(1), config, accum);

package/parser/commentAndExt.js

@@ -35,7 +35,7 @@ const parseCommentAndExt = (text, config = Parser.getConfig(), accum = [], inclu
 			+ `<(${noincludeRegex})(\\s[^>]*?)?(?:/>|>(.*?)(?:</(\\5\\s*)>|$))`, // <noinclude>
 			'gisu',
 		);
-	return text.replace(
+	return text.replaceAll(
 		regex,
 		/** @type {function(...string): string} */
 		(substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {

package/parser/converter.js

@@ -22,7 +22,7 @@ const parseConverter = (wikitext, config = Parser.getConfig(), accum = []) => {
 				str = wikitext.slice(top.index + 2, index),
 				i = str.indexOf('|'),
 				[flags, text] = i === -1 ? [[], str] : [str.slice(0, i).split(';'), str.slice(i + 1)],
-				temp = text.replace(/(&[#a-z\d]+);/iu, '$1\x01'),
+				temp = text.replaceAll(/(&[#a-z\d]+);/giu, '$1\x01'),
 				variants = `(?:${config.variants.join('|')})`,
 				rules = temp.split(new RegExp(`;(?=\\s*(?:${variants}|[^;]*?=>\\s*${variants})\\s*:)`, 'u'))
 					.map(rule => rule.replaceAll('\x01', ';'));

package/parser/externalLinks.js

@@ -11,10 +11,10 @@ const {extUrlChar} = require('../util/string'),
 const parseExternalLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
 	const ExtLinkToken = require('../src/extLink');
 	const regex = new RegExp(
-		`\\[((?:${config.protocol}|//)${extUrlChar})(\\p{Zs}*)([^\\]\x01-\x08\x0A-\x1F\uFFFD]*)\\]`,
+		`\\[((?:${config.protocol}|//)${extUrlChar}|\0\\d+m\x7F)(\\p{Zs}*)([^\\]\x01-\x08\x0A-\x1F\uFFFD]*)\\]`,
 		'giu',
 	);
-	return wikitext.replace(regex, /** @type {function(...string): string} */ (_, url, space, text) => {
+	return wikitext.replaceAll(regex, /** @type {function(...string): string} */ (_, url, space, text) => {
 		const {length} = accum,
 			mt = /&[lg]t;/u.exec(url);
 		if (mt) {

package/parser/hrAndDoubleUnderscore.js

@@ -1,18 +1,19 @@
 'use strict';
 
-const Parser = require('..'),
-	AstText = require('../lib/text');
+const Parser = require('..');
 
 /**
  * 解析\<hr\>和状态开关
- * @param {{firstChild: AstText, type: string}} root 根节点
+ * @param {Token & {firstChild: AstText}} root 根节点
  * @param {accum} accum
  */
-const parseHrAndDoubleUnderscore = ({firstChild: {data}, type}, config = Parser.getConfig(), accum = []) => {
-	const HrToken = require('../src/nowiki/hr'),
+const parseHrAndDoubleUnderscore = ({firstChild: {data}, type, name}, config = Parser.getConfig(), accum = []) => {
+	const AstText = require('../lib/text'),
+		Token = require('../src'),
+		HrToken = require('../src/nowiki/hr'),
 		DoubleUnderscoreToken = require('../src/nowiki/doubleUnderscore');
 	const {doubleUnderscore} = config;
-	if (type !== 'root') {
+	if (type !== 'root' && (type !== 'ext-inner' || name !== 'poem')) {
 		data = `\0${data}`;
 	}
 	data = data.replaceAll(/^((?:\0\d+c\x7F)*)(-{4,})/gmu, (_, lead, m) => {
@@ -28,7 +29,7 @@ const parseHrAndDoubleUnderscore = ({firstChild: {data}, type}, config = Parser.
 			return m;
 		},
 	);
-	return type === 'root' ? data : data.slice(1);
+	return type === 'root' || type === 'ext-inner' && name === 'poem' ? data : data.slice(1);
 };
 
 Parser.parsers.parseHrAndDoubleUnderscore = __filename;

package/parser/links.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const Parser = require('..'),
-	Token = require('../src');
+const Parser = require('..');
 
 /**
  * 解析内部链接
@@ -10,17 +9,17 @@ const Parser = require('..'),
  */
 const parseLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
 	const parseQuotes = require('./quotes.js');
-	const regex = /^([^\n<>[\]{}|]+)(?:\|(.*?[^\]]))?\]\](.*)$/su,
-		regexImg = /^([^\n<>[\]{}|]+)\|(.*)$/su,
+	const regex = /^((?:(?!\0\d+!\x7F)[^\n<>[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]]))?\]\](.*)$/su,
+		regexImg = /^((?:(?!\0\d+!\x7F)[^\n<>[\]{}|])+)(\||\0\d+!\x7F)(.*)$/su,
 		regexExt = new RegExp(`^\\s*(?:${config.protocol})`, 'iu'),
 		bits = wikitext.split('[[');
 	let s = bits.shift();
 	for (let i = 0; i < bits.length; i++) {
-		let mightBeImg, link, text, after;
+		let mightBeImg, link, delimiter, text, after;
 		const x = bits[i],
 			m = regex.exec(x);
 		if (m) {
-			[, link, text, after] = m;
+			[, link, delimiter, text, after] = m;
 			if (after[0] === ']' && text?.includes('[')) {
 				text += ']';
 				after = after.slice(1);
@@ -29,7 +28,7 @@ const parseLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
 			const m2 = regexImg.exec(x);
 			if (m2) {
 				mightBeImg = true;
-				[, link, text] = m2;
+				[, link, delimiter, text] = m2;
 			}
 		}
 		if (link === undefined || regexExt.test(link) || /\0\d+[exhbru]\x7F/u.test(link)) {
@@ -75,7 +74,7 @@ const parseLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
 			}
 			text = parseLinks(text, config, accum);
 			if (!found) {
-				s += `[[${link}|${text}`;
+				s += `[[${link}${delimiter}${text}`;
 				continue;
 			}
 		}
@@ -89,7 +88,7 @@ const parseLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
 				LinkToken = require('../src/link/category');
 			}
 		}
-		new LinkToken(link, text, title, config, accum);
+		new LinkToken(link, text, title, config, accum, delimiter);
 	}
 	return s;
 };

package/parser/magicLinks.js

@@ -11,7 +11,7 @@ const {extUrlChar} = require('../util/string'),
 const parseMagicLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
 	const MagicLinkToken = require('../src/magicLink');
 	const regex = new RegExp(`\\b(?:${config.protocol})(${extUrlChar})`, 'giu');
-	return wikitext.replace(regex, /** @param {string} p1 */ (m, p1) => {
+	return wikitext.replaceAll(regex, /** @param {string} p1 */ (m, p1) => {
 		let trail = '',
 			url = m;
 		const m2 = /&(?:lt|gt|nbsp|#x0*(?:3[ce]|a0)|#0*(?:6[02]|160));/iu.exec(url);

package/parser/selector.js

@@ -46,7 +46,7 @@ const /** @type {pseudo[]} */ simplePseudos = [
 		['&', '&'],
 	],
 	pseudoRegex = new RegExp(`:(${complexPseudos.join('|')})$`, 'u'),
-	regularRegex = /[[(,>+~]|\s+/u, // eslint-disable-line regexp/no-super-linear-move
+	regularRegex = /[[(,>+~]|\s+/u,
 	attributeRegex = /^\s*(\w+)\s*(?:([~|^$*!]?=)\s*("[^"]*"|'[^']*'|[^\s[\]]+)(?:\s+(i))?\s*)?\]/u,
 	functionRegex = /^(\s*"[^"]*"\s*|\s*'[^']*'\s*|[^()]*)\)/u;
 
@@ -164,11 +164,11 @@ const parseSelector = selector => {
 		}
 		mt = regex.exec(sanitized);
 	}
-	if (regex !== regularRegex) {
-		throw new SyntaxError(`非法的选择器！\n${selector}\n检测到未闭合的'${regex === attributeRegex ? '[' : '('}'`);
+	if (regex === regularRegex) {
+		pushSimple(step, sanitized);
+		return stack;
 	}
-	pushSimple(step, sanitized);
-	return stack;
+	throw new SyntaxError(`非法的选择器！\n${selector}\n检测到未闭合的'${regex === attributeRegex ? '[' : '('}'`);
 };
 
 Parser.parsers.parseSelector = __filename;

package/parser/table.js

@@ -1,22 +1,23 @@
 'use strict';
 
 const Parser = require('..'),
-	AstText = require('../lib/text');
+	AstText = require('../lib/text'),
+	Token = require('../src'),
+	TableToken = require('../src/table'),
+	TrToken = require('../src/table/tr'),
+	TdToken = require('../src/table/td');
 
 /**
  * 解析表格，注意`tr`和`td`包含开头的换行
- * @param {{firstChild: AstText, type: string}} root 根节点
+ * @param {Token & {firstChild: AstText}} root 根节点
  * @param {accum} accum
  */
-const parseTable = ({firstChild: {data}, type}, config = Parser.getConfig(), accum = []) => {
-	const Token = require('../src'),
-		TableToken = require('../src/table'),
-		TrToken = require('../src/table/tr'),
-		TdToken = require('../src/table/td'),
-		DdToken = require('../src/nowiki/dd');
+const parseTable = ({firstChild: {data}, type, name}, config = Parser.getConfig(), accum = []) => {
 	const /** @type {TrToken[]} */ stack = [],
 		lines = data.split('\n');
-	let out = type === 'root' ? '' : `\n${lines.shift()}`;
+	let out = type === 'root' || type === 'parameter-value' || type === 'ext-inner' && name === 'poem'
+		? ''
+		: `\n${lines.shift()}`;
 
 	/**
 	 * 向表格中插入纯文本
@@ -28,13 +29,13 @@ const parseTable = ({firstChild: {data}, type}, config = Parser.getConfig(), acc
 			out += str;
 			return;
 		}
-		const {lastElementChild} = top;
-		if (lastElementChild.isPlain()) {
-			lastElementChild.setText(String(lastElementChild) + str);
+		const /** @type {Token}} */ {lastChild} = top;
+		if (lastChild.constructor === Token) {
+			lastChild.setText(String(lastChild) + str);
 		} else {
 			const token = new Token(str, config, true, accum);
 			token.type = 'table-inter';
-			top.appendChild(token.setAttribute('stage', 3));
+			top.insertAt(token.setAttribute('stage', 3));
 		}
 	};
 	for (const outLine of lines) {
@@ -48,6 +49,7 @@ const parseTable = ({firstChild: {data}, type}, config = Parser.getConfig(), acc
 			}
 			const [, indent, moreSpaces, tableSyntax, attr] = matchesStart;
 			if (indent) {
+				const DdToken = require('../src/nowiki/dd');
 				new DdToken(indent, config, accum);
 			}
 			push(`\n${spaces}${indent && `\0${accum.length - 1}d\x7F`}${moreSpaces}\0${accum.length}b\x7F`, top);
@@ -82,7 +84,7 @@ const parseTable = ({firstChild: {data}, type}, config = Parser.getConfig(), acc
 			}
 			const tr = new TrToken(`\n${spaces}${row}`, attr, config, accum);
 			stack.push(top, tr);
-			top.appendChild(tr);
+			top.insertAt(tr);
 		} else {
 			if (top.type === 'td') {
 				top = stack.pop();
@@ -95,14 +97,14 @@ const parseTable = ({firstChild: {data}, type}, config = Parser.getConfig(), acc
 				lastSyntax = `\n${spaces}${cell}`;
 			while (mt) {
 				const td = new TdToken(lastSyntax, attr.slice(lastIndex, mt.index), config, accum);
-				top.appendChild(td);
+				top.insertAt(td);
 				({lastIndex} = regex);
 				[lastSyntax] = mt;
 				mt = regex.exec(attr);
 			}
 			const td = new TdToken(lastSyntax, attr.slice(lastIndex), config, accum);
 			stack.push(top, td);
-			top.appendChild(td);
+			top.insertAt(td);
 		}
 	}
 	return out.slice(1);