@lofcz/platejs-markdown 53.1.4 → 53.2.1

package/dist/index.d.ts

@@ -324,7 +324,7 @@ declare const htmlToJsx: (html: string) => string;
 //#endregion
 //#region src/lib/deserializer/utils/markdownToSlateNodesSafely.d.ts
 declare const markdownToSlateNodesSafely: (editor: SlateEditor, data: string, options?: Omit<DeserializeMdOptions, "editor">) => (platejs2.TText | {
-  children: platejs2.Descendant[] | {
+  children: Descendant[] | {
     text: string;
   }[];
   type: string;

package/dist/index.js

@@ -1149,7 +1149,7 @@ const serializeMdWithSourceMap = (editor, options) => {
 		const startLine = info.now.line;
 		const emitted = handler(node, parent, state, info);
 		const source = node?.data?.sourceMap;
-		if (source && emitted.trim()) pushSegment(source, emitted, startLine, startLine + (emitted.replace(/(?:\r?\n|\r)+$/g, "").split(/\r?\n|\r/g).length - 1));
+		if (source) pushSegment(source, emitted, startLine, startLine + (emitted.replace(/(?:\r?\n|\r)+$/g, "").split(/\r?\n|\r/g).length - 1));
 		if (type === "table" && Array.isArray(node?.children)) for (let r = 0; r < node.children.length; r++) {
 			const line = r === 0 ? startLine : startLine + 1 + r;
 			const cells = node.children[r]?.children;
@@ -1501,6 +1501,23 @@ const groupInlineChildrenIntoParagraphs = (editor, children = []) => {
 		type: paragraphType
 	}];
 };
+const normalizeParagraphLineBreaks = (children, options) => children.flatMap((child) => {
+	const text = child.text;
+	if (text === "" && options.preserveEmptyParagraphs !== false) return [{
+		...child,
+		text: "​"
+	}];
+	if (typeof text !== "string" || !text.includes("\n")) return [child];
+	return text.split("\n").flatMap((part, index, parts) => {
+		const nodes = [];
+		if (part) nodes.push({
+			...child,
+			text: part
+		});
+		if (index < parts.length - 1) nodes.push({ type: "break" });
+		return nodes;
+	});
+});
 const defaultRules = {
 	a: {
 		deserialize: (mdastNode, deco, options) => ({
@@ -1985,15 +2002,7 @@ const defaultRules = {
 			return elements.length === 1 ? elements[0] : elements;
 		},
 		serialize: (node, options) => {
-			let enrichedChildren = node.children;
-			enrichedChildren = enrichedChildren.map((child) => {
-				if (child.text === "\n") return { type: "break" };
-				if (child.text === "" && options.preserveEmptyParagraphs !== false) return {
-					...child,
-					text: "​"
-				};
-				return child;
-			});
+			const enrichedChildren = normalizeParagraphLineBreaks(node.children, options);
 			const convertedNodes = convertNodesSerialize(enrichedChildren, options);
 			if (convertedNodes.length > 0 && enrichedChildren.at(-1).type === "break") {
 				convertedNodes.at(-1).type = "html";
@@ -2487,8 +2496,9 @@ const remarkToSlate = function(options = {}) {
 
 //#endregion
 //#region src/lib/deserializer/utils/splitIncompleteMdx.ts
-/** Check if character is valid for tag name: A-Z / a-z / 0-9 / - _ : */
-const isNameChar = (c) => c >= 48 && c <= 57 || c >= 65 && c <= 90 || c >= 97 && c <= 122 || c === 45 || c === 95 || c === 58;
+/** Check if character is valid for tag name: A-Z / a-z / 0-9 / $ - . _ : */
+const isNameChar = (c) => c >= 48 && c <= 57 || c >= 65 && c <= 90 || c >= 97 && c <= 122 || c === 36 || c === 45 || c === 46 || c === 95 || c === 58;
+const isNameBoundary = (c) => c === 47 || c === 62 || c === 9 || c === 10 || c === 12 || c === 13 || c === 32;
 const splitIncompleteMdx = (data) => {
 	const stack = [];
 	const len = data.length;
@@ -2517,6 +2527,11 @@ const splitIncompleteMdx = (data) => {
 			break;
 		}
 		const tagName = data.slice(nameStart, i).toLowerCase();
+		const next = data.codePointAt(i);
+		if (next !== void 0 && !isNameBoundary(next)) {
+			cutPos = tagStart;
+			break;
+		}
 		let inQuote = null;
 		let foundTagEnd = false;
 		let selfClosing = false;
@@ -2557,18 +2572,45 @@ const splitIncompleteMdx = (data) => {
 
 //#endregion
 //#region src/lib/deserializer/utils/markdownToSlateNodesSafely.ts
+const isPlainTextNode = (node) => TextApi.isText(node) && Object.keys(node).every((key) => key === "text");
+const isSplitInsideTableRow = (completeString) => {
+	return completeString.slice(completeString.lastIndexOf("\n") + 1).includes("|");
+};
+const markdownToSlateNodesWithoutMdx = (editor, data, options) => markdownToSlateNodes(editor, data, {
+	...options,
+	withoutMdx: true
+});
+const markdownToSlateNodesWithMdxFallback = (editor, data, options) => {
+	try {
+		return markdownToSlateNodes(editor, data, options);
+	} catch {
+		return markdownToSlateNodesWithoutMdx(editor, data, options);
+	}
+};
+const appendInlineNodesToLastTextContainer = (editor, node, inlineNodes) => {
+	if (!ElementApi.isElement(node) || editor.api.isVoid(node)) return false;
+	const paragraphType = getPluginType(editor, KEYS.p);
+	if (node.type === paragraphType || node.children.some((child) => TextApi.isText(child))) {
+		const lastChild = node.children.at(-1);
+		if (isPlainTextNode(lastChild) && inlineNodes.every((inlineNode) => isPlainTextNode(inlineNode))) {
+			lastChild.text += inlineNodes.map((inlineNode) => inlineNode.text).join("");
+			return true;
+		}
+		node.children.push(...inlineNodes);
+		return true;
+	}
+	for (let i = node.children.length - 1; i >= 0; i--) if (appendInlineNodesToLastTextContainer(editor, node.children[i], inlineNodes)) return true;
+	return false;
+};
 const markdownToSlateNodesSafely = (editor, data, options) => {
 	const result = splitIncompleteMdx(data);
-	if (!Array.isArray(result)) return markdownToSlateNodes(editor, data, {
-		...options,
-		withoutMdx: true
-	});
+	if (!Array.isArray(result)) return markdownToSlateNodesWithoutMdx(editor, data, options);
 	const [completeString, incompleteString] = result;
 	const incompleteNodes = deserializeInlineMd(editor, incompleteString, {
 		...options,
 		withoutMdx: true
 	});
-	const completeNodes = markdownToSlateNodes(editor, completeString, options);
+	const completeNodes = markdownToSlateNodesWithMdxFallback(editor, completeString, options);
 	const newBlock = {
 		children: incompleteNodes,
 		type: getPluginType(editor, KEYS.p)
@@ -2576,10 +2618,25 @@ const markdownToSlateNodesSafely = (editor, data, options) => {
 	if (completeNodes.length === 0) return [newBlock];
 	const lastBlock = completeNodes.at(-1);
 	if (ElementApi.isElement(lastBlock) && editor.api.isVoid(lastBlock)) return [...completeNodes, newBlock];
-	if (ElementApi.isElement(lastBlock) && lastBlock?.children) {
-		lastBlock.children.push(...incompleteNodes);
-		return completeNodes;
+	const tableType = getPluginType(editor, KEYS.table);
+	if (ElementApi.isElement(lastBlock) && lastBlock.type === tableType) {
+		if (isSplitInsideTableRow(completeString)) {
+			const withoutMdxNodes = markdownToSlateNodesWithoutMdx(editor, data, options);
+			const tableOrdinal = completeNodes.filter((node) => ElementApi.isElement(node) && node.type === tableType).indexOf(lastBlock);
+			let fallbackTableIndex = -1;
+			let seenTables = -1;
+			for (const [index, node] of withoutMdxNodes.entries()) if (ElementApi.isElement(node) && node.type === tableType) {
+				seenTables += 1;
+				if (seenTables === tableOrdinal) {
+					fallbackTableIndex = index;
+					break;
+				}
+			}
+			if (fallbackTableIndex !== -1) return [...completeNodes.slice(0, -1), ...withoutMdxNodes.slice(fallbackTableIndex)];
+		}
+		return [...completeNodes, newBlock];
 	}
+	if (ElementApi.isElement(lastBlock) && appendInlineNodesToLastTextContainer(editor, lastBlock, incompleteNodes)) return completeNodes;
 	return completeNodes;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lofcz/platejs-markdown",
-  "version": "53.1.4",
+  "version": "53.2.1",
   "description": "Markdown serializer plugin for Plate",
   "keywords": [
     "markdown",
@@ -52,8 +52,9 @@
     "remark-gfm": "4.0.1",
     "remark-math": "6.0.0",
     "@plate/scripts": "1.0.0",
-    "platejs": "npm:@lofcz/platejs@53.1.1",
-    "@platejs/footnote": "npm:@lofcz/platejs-footnote@53.0.0"
+    "@platejs/footnote": "npm:@lofcz/platejs-footnote@53.0.0",
+    "@platejs/table": "npm:@lofcz/platejs-table@53.1.8",
+    "platejs": "npm:@lofcz/platejs@53.1.1"
   },
   "peerDependencies": {
     "platejs": ">=53.0.0",