Merge branch 'work-32' into develop

src/parser.pegjs

@@ -386,7 +386,7 @@ fnArg
 // inline: text
 
 text
-	= . { return createNode('text', { text: text() }); }
+	= .
 
 //
 // General

src/util.ts

-import { MfmNode, MfmText } from './node';
+import { MfmNode } from './node';
 
 export function createNode(type: string, props?: Record<string, any>, children?: MfmNode[]): MfmNode {
 	const node: any = { type };
@@ -11,66 +11,36 @@ export function createNode(type: string, props?: Record<string, any>, children?:
 	return node;
 }
 
-/**
- * @param predicate specifies whether to group the previous item and the current item
- * @returns grouped items
-*/
-export function groupContinuous<T>(arr: T[], predicate: (prev: T, current: T) => boolean): T[][] {
-	const dest: any[][] = [];
+export function mergeText(nodes: (MfmNode | string)[]): MfmNode[] {
+	const dest: MfmNode[] = [];
+	const storedChars: string[] = [];
+
+	/**
+	 * Generate a text node from the stored chars, And push it.
+	*/
+	function generateText() {
+		if (storedChars.length > 0) {
+			const textNode = createNode('text', { text: storedChars.join('') });
+			dest.push(textNode);
+			storedChars.length = 0;
+		}
+	}
 
-	for (let i = 0; i < arr.length; i++) {
-		if (i != 0 && predicate(arr[i - 1], arr[i])) {
-			dest[dest.length - 1].push(arr[i]);
+	for (const node of nodes) {
+		if (typeof node == 'string') {
+			// Store the char.
+			storedChars.push(node);
 		}
 		else {
-			dest.push([arr[i]]);
+			generateText();
+			dest.push(node);
 		}
 	}
+	generateText();
 
 	return dest;
 }
 
-export function mergeGroupedTrees(groupedTrees: MfmNode[][]): MfmNode[] {
-	return groupedTrees.reduce((acc, val) => acc.concat(val), ([] as MfmNode[]));
-}
-
-export function mergeText(trees: MfmNode[] | undefined, recursive?: boolean): MfmNode[] | undefined {
-	let dest: MfmNode[];
-	let groupes: MfmNode[][];
-
-	if (trees == null) {
-		return trees;
-	}
-
-	// group trees
-	groupes = groupContinuous(trees, (prev, current) => prev.type == current.type);
-
-	// concatinate text
-	groupes = groupes.map((group) => {
-		if (group[0].type == 'text') {
-			return [
-				createNode('text', {
-					text: group.map(i => (i as MfmText).props.text).join('')
-				})
-			];
-		}
-		return group;
-	});
-
-	// merge groups
-	dest = mergeGroupedTrees(groupes);
-
-	if (recursive) {
-		return dest.map(tree => {
-			// apply recursively to children
-			return createNode(tree.type, tree.props, recursive ? mergeText(tree.children) : tree.children);
-		});
-	}
-	else {
-		return dest;
-	}
-}
-
 export function stringifyNode(node: MfmNode): string {
 	switch(node.type) {
 		// block