stream-markdown-parser 0.0.25 → 0.0.27

package/dist/index.js

@@ -250,6 +250,76 @@ function applyFixLinkInline(md) {
 
 //#endregion
 //#region src/plugins/fixLinkTokens.ts
+function textToken(content) {
+	return {
+		type: "text",
+		content,
+		raw: content
+	};
+}
+function pushEmOpen(arr, type) {
+	if (type === 1) arr.push({
+		type: "em_open",
+		tag: "em",
+		nesting: 1
+	});
+	else if (type === 2) arr.push({
+		type: "strong_open",
+		tag: "strong",
+		nesting: 1
+	});
+	else if (type === 3) {
+		arr.push({
+			type: "strong_open",
+			tag: "strong",
+			nesting: 1
+		});
+		arr.push({
+			type: "em_open",
+			tag: "em",
+			nesting: 1
+		});
+	}
+}
+function pushEmClose(arr, type) {
+	if (type === 1) arr.push({
+		type: "em_close",
+		tag: "em",
+		nesting: -1
+	});
+	else if (type === 2) arr.push({
+		type: "strong_close",
+		tag: "strong",
+		nesting: -1
+	});
+	else if (type === 3) {
+		arr.push({
+			type: "em_close",
+			tag: "em",
+			nesting: -1
+		});
+		arr.push({
+			type: "strong_close",
+			tag: "strong",
+			nesting: -1
+		});
+	}
+}
+function createLinkToken(text, href, loading) {
+	return {
+		type: "link",
+		loading,
+		href,
+		title: "",
+		text,
+		children: [{
+			type: "text",
+			content: text,
+			raw: text
+		}],
+		raw: String(`[${text}](${href})`)
+	};
+}
 function applyFixLinkTokens(md) {
 	md.core.ruler.after("inline", "fix_link_tokens", (state) => {
 		const toks = state.tokens ?? [];
@@ -266,7 +336,15 @@ function applyFixLinkTokens(md) {
 function fixLinkToken(tokens) {
 	if (tokens.length < 4) return tokens;
 	for (let i = 0; i <= tokens.length - 1; i++) {
+		if (i < 0) i = 0;
 		if (!tokens[i]) break;
+		if (tokens[i]?.type === "em_open" && tokens[i - 1]?.type === "text" && tokens[i - 1].content?.endsWith("*")) {
+			const beforeText = tokens[i - 1].content?.replace(/(\*+)$/, "") || "";
+			tokens[i - 1].content = beforeText;
+			tokens[i].type = "strong_open";
+			tokens[i].tag = "strong";
+			tokens[i].markup = "**";
+		}
 		if (tokens[i]?.type === "text" && tokens[i].content?.endsWith("(") && tokens[i + 1]?.type === "link_open") {
 			const match = tokens[i].content.match(/\[([^\]]+)\]/);
 			if (match) {
@@ -275,116 +353,55 @@ function fixLinkToken(tokens) {
 				const replacerTokens = [];
 				if (emphasisMatch) {
 					beforeText = beforeText.slice(0, emphasisMatch.index);
-					if (beforeText) replacerTokens.push({
-						type: "text",
-						content: beforeText,
-						raw: beforeText
-					});
+					if (beforeText) replacerTokens.push(textToken(beforeText));
 					const text = match[1];
 					const type = emphasisMatch[1].length;
-					if (type === 1) replacerTokens.push({
-						type: "em_open",
-						tag: "em",
-						nesting: 1
-					});
-					else if (type === 2) replacerTokens.push({
-						type: "strong_open",
-						tag: "strong",
-						nesting: 1
-					});
-					else if (type === 3) {
-						replacerTokens.push({
-							type: "strong_open",
-							tag: "strong",
-							nesting: 1
-						});
-						replacerTokens.push({
-							type: "em_open",
-							tag: "em",
-							nesting: 1
-						});
-					}
+					pushEmOpen(replacerTokens, type);
 					let href = tokens[i + 2]?.content || "";
 					if (tokens[i + 4]?.type === "text" && !tokens[i + 4].content?.startsWith(")")) {
 						href += tokens[i + 4]?.content || "";
 						tokens[i + 4].content = "";
 					}
-					replacerTokens.push({
-						type: "link",
-						loading: !tokens[i + 4]?.content?.startsWith(")"),
-						href,
-						title: "",
-						text,
-						children: [{
-							type: "text",
-							content: text,
-							raw: text
-						}],
-						raw: String(`[${text}](${href})`)
-					});
-					if (type === 1) replacerTokens.push({
-						type: "em_close",
-						tag: "em",
-						nesting: -1
-					});
-					else if (type === 2) replacerTokens.push({
-						type: "strong_close",
-						tag: "strong",
-						nesting: -1
-					});
-					else if (type === 3) {
-						replacerTokens.push({
-							type: "em_close",
-							tag: "em",
-							nesting: -1
-						});
-						replacerTokens.push({
-							type: "strong_close",
-							tag: "strong",
-							nesting: -1
-						});
-					}
+					replacerTokens.push(createLinkToken(text, href, !tokens[i + 4]?.content?.startsWith(")")));
+					pushEmClose(replacerTokens, type);
 					if (tokens[i + 4]?.type === "text") {
 						const afterText = tokens[i + 4].content?.replace(/^\)\**/, "");
-						if (afterText) replacerTokens.push({
-							type: "text",
-							content: afterText,
-							raw: afterText
-						});
+						if (afterText) replacerTokens.push(textToken(afterText));
 						tokens.splice(i, 5, ...replacerTokens);
 					} else tokens.splice(i, 4, ...replacerTokens);
 				} else {
-					if (beforeText) replacerTokens.push({
-						type: "text",
-						content: beforeText,
-						raw: beforeText
-					});
-					const text = match[1];
+					if (beforeText) replacerTokens.push(textToken(beforeText));
+					let text = match[1];
+					const emphasisMatch$1 = text.match(/^\*+/);
+					if (emphasisMatch$1) {
+						const type = emphasisMatch$1[0].length;
+						text = text.replace(/^\*+/, "").replace(/\*+$/, "");
+						let href$1 = tokens[i + 2]?.content || "";
+						if (tokens[i + 4]?.type === "text" && !tokens[i + 4].content?.startsWith(")")) {
+							href$1 += tokens[i + 4]?.content || "";
+							tokens[i + 4].content = "";
+						}
+						pushEmOpen(replacerTokens, type);
+						replacerTokens.push(createLinkToken(text, href$1, !tokens[i + 4]?.content?.startsWith(")")));
+						pushEmClose(replacerTokens, type);
+						if (tokens[i + 4]?.type === "text") {
+							const afterText = tokens[i + 4].content?.replace(/^\)/, "");
+							if (afterText) replacerTokens.push(textToken(afterText));
+							tokens.splice(i, 5, ...replacerTokens);
+						} else tokens.splice(i, 4, ...replacerTokens);
+						if (i === 0) i = replacerTokens.length - 1;
+						else i -= replacerTokens.length - 1;
+						continue;
+					}
 					let href = tokens[i + 2]?.content || "";
 					if (tokens[i + 4]?.type === "text" && !tokens[i + 4].content?.startsWith(")")) {
 						href += tokens[i + 4]?.content || "";
 						tokens[i + 4].content = "";
 					}
-					replacerTokens.push(...[{
-						type: "link",
-						loading: !tokens[i + 4]?.content?.startsWith(")"),
-						href,
-						title: "",
-						text,
-						children: [{
-							type: "text",
-							content: text,
-							raw: text
-						}],
-						raw: String(`[${text}](${href})`)
-					}]);
+					replacerTokens.push(createLinkToken(text, href, !tokens[i + 4]?.content?.startsWith(")")));
 					if (tokens[i + 4]?.type === "text") {
 						const afterText = tokens[i + 4].content?.replace(/^\)/, "");
-						if (afterText) replacerTokens.push({
-							type: "text",
-							content: afterText,
-							raw: afterText
-						});
+						if (afterText) replacerTokens.push(textToken(afterText));
 						tokens.splice(i, 5, ...replacerTokens);
 					} else tokens.splice(i, 4, ...replacerTokens);
 				}
@@ -403,25 +420,9 @@ function fixLinkToken(tokens) {
 						href += tokens[i + 3]?.content?.slice(0, m) || "";
 						tokens[i + 3].content = "";
 					}
-					replacerTokens.push({
-						type: "link",
-						loading,
-						href,
-						title: "",
-						text,
-						children: [{
-							type: "text",
-							content: text,
-							raw: text
-						}],
-						raw: String(`[${text}](${href})`)
-					});
+					replacerTokens.push(createLinkToken(text, href, loading));
 					const afterText = tokens[i + 3].content?.replace(/^\)\**/, "");
-					if (afterText) replacerTokens.push({
-						type: "text",
-						content: afterText,
-						raw: afterText
-					});
+					if (afterText) replacerTokens.push(textToken(afterText));
 					tokens.splice(i - 4, 8, ...replacerTokens);
 				} else {
 					replacerTokens.push({
@@ -440,24 +441,67 @@ function fixLinkToken(tokens) {
 					tokens.splice(i - 4, 7, ...replacerTokens);
 				}
 				continue;
+			} else if (tokens[i - 1].content === "](" && tokens[i - 3]?.type === "text" && tokens[i - 3].content?.endsWith(")")) if (tokens[i - 2]?.type === "strong_open") {
+				const [beforeText, linText] = tokens[i - 3].content?.split("[**") || [];
+				tokens[i + 1].content = linText || "";
+				tokens[i - 3].content = beforeText || "";
+				tokens[i - 1].content = "";
+			} else if (tokens[i - 2]?.type === "em_open") {
+				const [beforeText, linText] = tokens[i - 3].content?.split("[*") || [];
+				tokens[i + 1].content = linText || "";
+				tokens[i - 3].content = beforeText || "";
+				tokens[i - 1].content = "";
+			} else {
+				const [beforeText, linText] = tokens[i - 3].content?.split("[") || [];
+				tokens[i + 1].content = linText || "";
+				tokens[i - 3].content = beforeText || "";
+				tokens[i - 1].content = "";
 			}
 		}
-		if (tokens[i].type === "link_close" && tokens[i].nesting === -1 && tokens[i + 1]?.type === "text" && tokens[i - 1]?.type === "text" && tokens[i + 2]?.type !== "link_open") {
-			tokens[i - 2].loading = true;
+		if (tokens[i].type === "link_close" && tokens[i].nesting === -1 && tokens[i + 1]?.type === "text" && tokens[i - 1]?.type === "text") {
+			let loading = true;
 			const text = tokens[i - 1].content || "";
 			let href = tokens[i - 2].attrs?.[0]?.[1] || "";
 			let count = 3;
+			let deleteCount = 2;
+			const emphasisMatch = (tokens[i - 3]?.content || "").match(/^(\*+)$/);
+			const replacerTokens = [];
+			if (emphasisMatch) {
+				deleteCount += 1;
+				const type = emphasisMatch[1].length;
+				pushEmOpen(replacerTokens, type);
+			}
+			if (tokens[i].markup === "" || tokens[i + 1].type === "text" && (tokens[i + 1].content === "." || tokens[i + 1].content === "?")) loading = false;
 			if (tokens[i].markup === "linkify" && tokens[i + 1]?.type === "text" && !tokens[i + 1]?.content?.startsWith(" ")) {
 				const m = (tokens[i + 1]?.content ?? "").indexOf(")");
 				if (m === -1) {
 					href += tokens[i + 1]?.content?.slice(0, m) || "";
 					tokens[i + 1].content = "";
-				}
+				} else loading = false;
+				count += 1;
+			} else if (tokens[i + 1].type === "text" && tokens[i + 1]?.content?.startsWith("](")) {
 				count += 1;
+				for (let j = i + 1; j < tokens.length; j++) {
+					const type = emphasisMatch ? emphasisMatch[1].length : tokens[i - 3].markup.length;
+					const t = tokens[j];
+					if (type === 1 && t.type === "em_close") {
+						loading = false;
+						break;
+					} else if (type === 2 && t.type === "strong_close") {
+						loading = false;
+						break;
+					} else if (type === 3) {
+						if (t.type === "em_close" || t.type === "strong_close") {
+							loading = false;
+							break;
+						}
+					}
+					count += 1;
+				}
 			}
-			tokens.splice(i - 2, count, {
+			replacerTokens.push({
 				type: "link",
-				loading: false,
+				loading,
 				href,
 				title: "",
 				text,
@@ -468,37 +512,19 @@ function fixLinkToken(tokens) {
 				}],
 				raw: String(`[${text}](${href})`)
 			});
-		} else if (tokens[i].content?.startsWith("](") && tokens[i - 1].markup?.includes("*") && tokens[i - 4].type === "text" && tokens[i - 4].content?.endsWith("[")) {
+			if (emphasisMatch) {
+				const type = emphasisMatch[1].length;
+				pushEmClose(replacerTokens, type);
+			}
+			tokens.splice(i - deleteCount, count, ...replacerTokens);
+			i -= replacerTokens.length - 1;
+			continue;
+		} else if (tokens[i].content?.startsWith("](") && tokens[i - 1].markup?.includes("*") && tokens[i - 4]?.type === "text" && tokens[i - 4].content?.endsWith("[")) {
 			const type = tokens[i - 1].markup.length;
 			const replacerTokens = [];
-			const beforeText = tokens[i - 4].content.slice(0, tokens[i - 4].content.length - 1 - type);
-			if (beforeText) replacerTokens.push({
-				type: "text",
-				content: beforeText,
-				raw: beforeText
-			});
-			if (type === 1) replacerTokens.push({
-				type: "em_open",
-				tag: "em",
-				nesting: 1
-			});
-			else if (type === 2) replacerTokens.push({
-				type: "strong_open",
-				tag: "strong",
-				nesting: 1
-			});
-			else if (type === 3) {
-				replacerTokens.push({
-					type: "strong_open",
-					tag: "strong",
-					nesting: 1
-				});
-				replacerTokens.push({
-					type: "em_open",
-					tag: "em",
-					nesting: 1
-				});
-			}
+			const beforeText = tokens[i - 4].content.slice(0, tokens[i - 4].content.length - type);
+			if (beforeText) replacerTokens.push(textToken(beforeText));
+			pushEmOpen(replacerTokens, type);
 			const text = tokens[i - 2].content || "";
 			let href = tokens[i].content.slice(2);
 			let loading = true;
@@ -510,48 +536,11 @@ function fixLinkToken(tokens) {
 					tokens[i + 1].content = "";
 				}
 			}
-			replacerTokens.push({
-				type: "link",
-				loading,
-				href,
-				title: "",
-				text,
-				children: [{
-					type: "text",
-					content: text,
-					raw: text
-				}],
-				raw: String(`[${text}](${href})`)
-			});
-			if (type === 1) replacerTokens.push({
-				type: "em_close",
-				tag: "em",
-				nesting: -1
-			});
-			else if (type === 2) replacerTokens.push({
-				type: "strong_close",
-				tag: "strong",
-				nesting: -1
-			});
-			else if (type === 3) {
-				replacerTokens.push({
-					type: "em_close",
-					tag: "em",
-					nesting: -1
-				});
-				replacerTokens.push({
-					type: "strong_close",
-					tag: "strong",
-					nesting: -1
-				});
-			}
+			replacerTokens.push(createLinkToken(text, href, loading));
+			pushEmClose(replacerTokens, type);
 			if (tokens[i + 1]?.type === "text") {
 				const afterText = tokens[i + 1].content?.replace(/^\)\**/, "");
-				if (afterText) replacerTokens.push({
-					type: "text",
-					content: afterText,
-					raw: afterText
-				});
+				if (afterText) replacerTokens.push(textToken(afterText));
 				tokens.splice(i - 4, 8, ...replacerTokens);
 			} else if (tokens[i + 1]?.type === "link_open") tokens.splice(i - 4, 10, ...replacerTokens);
 			else tokens.splice(i - 4, 7, ...replacerTokens);
@@ -1062,7 +1051,7 @@ function applyMath(md, mathOpts) {
 		const s = state;
 		if (/^\*[^*]+/.test(s.src)) return false;
 		const delimiters = [
-			["$$", "$$"],
+			["$", "$"],
 			["\\(", "\\)"],
 			["(", ")"]
 		];
@@ -1167,8 +1156,8 @@ function applyMath(md, mathOpts) {
 							pushText(toPushBefore.slice(0, _match.index));
 							const strongToken = s.push("strong_open", "", 0);
 							strongToken.markup = _match[0];
-							const textToken = s.push("text", "", 0);
-							textToken.content = after;
+							const textToken$1 = s.push("text", "", 0);
+							textToken$1.content = after;
 							s.push("strong_close", "", 0);
 						} else pushText(toPushBefore);
 					}
@@ -1226,21 +1215,33 @@ function applyMath(md, mathOpts) {
 		let matched = false;
 		let openDelim = "";
 		let closeDelim = "";
-		for (const [open, close] of delimiters) if (lineText === open || lineText.startsWith(open)) if (open.includes("[")) {
-			if (lineText.replace("\\", "") === "[") {
-				if (startLine + 1 < endLine) {
+		for (const [open, close] of delimiters) {
+			const m = lineText.indexOf(open);
+			if (m !== -1) {
+				const beforeText = lineText.slice(0, m);
+				if (beforeText) {
+					const inline = s.push("inline", "", 0);
+					inline.content = beforeText;
+					inline.map = [startLine, startLine];
+					inline.children = [];
+				}
+				if (open.includes("[")) {
+					if (lineText.replace("\\", "") === "[") {
+						if (startLine + 1 < endLine) {
+							matched = true;
+							openDelim = open;
+							closeDelim = close;
+							break;
+						}
+						continue;
+					}
+				} else {
 					matched = true;
 					openDelim = open;
 					closeDelim = close;
 					break;
 				}
-				continue;
 			}
-		} else {
-			matched = true;
-			openDelim = open;
-			closeDelim = close;
-			break;
 		}
 		if (!matched) return false;
 		if (silent) return true;
@@ -1390,7 +1391,7 @@ function parseEmphasisToken(tokens, startIndex) {
 	let i = startIndex + 1;
 	const innerTokens = [];
 	while (i < tokens.length && tokens[i].type !== "em_close") {
-		emText += String(tokens[i].content ?? "");
+		emText += String(tokens[i].content ?? tokens[i]?.text ?? "");
 		innerTokens.push(tokens[i]);
 		i++;
 	}
@@ -2237,18 +2238,18 @@ function parseInlineTokens(tokens, raw, pPreToken) {
 		if (!nextToken && /[^\]]\s*\(\s*$/.test(content)) content = content.replace(/\(\s*$/, "");
 		if (handleCheckboxLike(content)) return;
 		const preToken = tokens[i - 1];
-		if (content === "[" && !nextToken?.markup?.includes("*") || content === "]" && !preToken.markup?.includes("*")) {
+		if (content === "[" && !nextToken?.markup?.includes("*") || content === "]" && !preToken?.markup?.includes("*")) {
 			i++;
 			return;
 		}
 		if (handleInlineCodeContent(content, token)) return;
-		if (handleEmphasisAndStrikethrough(content, token)) return;
 		if (handleInlineImageContent(content, token)) return;
+		if (handleInlineLinkContent(content, token)) return;
+		if (handleEmphasisAndStrikethrough(content, token)) return;
 		const textNode = parseTextToken({
 			...token,
 			content
 		});
-		if (handleInlineLinkContent(content, token)) return;
 		if (currentTextNode) {
 			currentTextNode.content += textNode.content.replace(/(\*+|\(|\\)$/, "");
 			currentTextNode.raw += textNode.raw;
@@ -2360,7 +2361,7 @@ function parseInlineTokens(tokens, raw, pPreToken) {
 		let textNodeContent = content.slice(0, linkStart);
 		const linkEnd = content.indexOf("](", linkStart);
 		if (linkEnd !== -1) {
-			const textToken = tokens[i + 2];
+			const textToken$1 = tokens[i + 2];
 			let text = content.slice(linkStart + 1, linkEnd);
 			if (text.includes("[")) {
 				const secondLinkStart = text.indexOf("[");
@@ -2369,7 +2370,7 @@ function parseInlineTokens(tokens, raw, pPreToken) {
 				text = content.slice(newLinkStart + 1, linkEnd);
 			}
 			const nextToken = tokens[i + 1];
-			if (content.endsWith("](") && nextToken?.type === "link_open" && textToken) {
+			if (content.endsWith("](") && nextToken?.type === "link_open" && textToken$1) {
 				const last = tokens[i + 4];
 				let index = 4;
 				let loading$1 = true;
@@ -2380,7 +2381,7 @@ function parseInlineTokens(tokens, raw, pPreToken) {
 				if (textNodeContent) pushText(textNodeContent, textNodeContent);
 				pushParsed({
 					type: "link",
-					href: String(textToken.content ?? ""),
+					href: String(textToken$1.content ?? ""),
 					title: null,
 					text,
 					children: [{
@@ -2396,8 +2397,82 @@ function parseInlineTokens(tokens, raw, pPreToken) {
 			const linkContentEnd = content.indexOf(")", linkEnd);
 			const href = linkContentEnd !== -1 ? content.slice(linkEnd + 2, linkContentEnd) : "";
 			const loading = linkContentEnd === -1;
+			let emphasisMatch = textNodeContent.match(/\*+$/);
+			if (emphasisMatch) textNodeContent = textNodeContent.replace(/\*+$/, "");
 			if (textNodeContent) pushText(textNodeContent, textNodeContent);
-			pushParsed({
+			if (!emphasisMatch) emphasisMatch = text.match(/^\*+/);
+			if (emphasisMatch) {
+				const type = emphasisMatch[0].length;
+				text = text.replace(/^\*+/, "").replace(/\*+$/, "");
+				const newTokens = [];
+				if (type === 1) newTokens.push({
+					type: "em_open",
+					tag: "em",
+					nesting: 1
+				});
+				else if (type === 2) newTokens.push({
+					type: "strong_open",
+					tag: "strong",
+					nesting: 1
+				});
+				else if (type === 3) {
+					newTokens.push({
+						type: "strong_open",
+						tag: "strong",
+						nesting: 1
+					});
+					newTokens.push({
+						type: "em_open",
+						tag: "em",
+						nesting: 1
+					});
+				}
+				newTokens.push({
+					type: "link",
+					href,
+					title: null,
+					text,
+					children: [{
+						type: "text",
+						content: text,
+						raw: text
+					}],
+					loading
+				});
+				if (type === 1) {
+					newTokens.push({
+						type: "em_close",
+						tag: "em",
+						nesting: -1
+					});
+					const { node } = parseEmphasisToken(newTokens, 0);
+					pushNode(node);
+				} else if (type === 2) {
+					newTokens.push({
+						type: "strong_close",
+						tag: "strong",
+						nesting: -1
+					});
+					const { node } = parseStrongToken(newTokens, 0);
+					pushNode(node);
+				} else if (type === 3) {
+					newTokens.push({
+						type: "em_close",
+						tag: "em",
+						nesting: -1
+					});
+					newTokens.push({
+						type: "strong_close",
+						tag: "strong",
+						nesting: -1
+					});
+					const { node } = parseStrongToken(newTokens, 0);
+					pushNode(node);
+				} else {
+					const { node } = parseEmphasisToken(newTokens, 0);
+					pushNode(node);
+				}
+			} else pushParsed({
 				type: "link",
 				href,
 				title: null,