@lofcz/platejs-markdown 53.3.4 → 53.4.4

package/dist/index.js

@@ -1561,17 +1561,26 @@ const defaultRules = {
 	},
 	callout: {
 		deserialize: (mdastNode, deco, options) => {
-			const props = parseAttributes(mdastNode.attributes);
+			const { type: calloutType, variant, ...rest } = parseAttributes(mdastNode.attributes);
+			const normalize = (value) => {
+				if (typeof value !== "string") return;
+				const trimmed = value.trim().toLowerCase();
+				return trimmed.length > 0 ? trimmed : void 0;
+			};
+			const resolvedVariant = normalize(calloutType) ?? normalize(variant);
 			return {
 				children: convertChildrenDeserialize(mdastNode.children, deco, options),
 				type: getPluginType(options.editor, KEYS.callout),
-				...props
+				...resolvedVariant ? { variant: resolvedVariant } : {},
+				...rest
 			};
 		},
 		serialize(slateNode, options) {
-			const { children, type, ...rest } = slateNode;
+			const { children, type: _type, variant, ...rest } = slateNode;
+			const attrs = { ...rest };
+			if (typeof variant === "string" && variant.length > 0) attrs.type = variant;
 			return {
-				attributes: propsToAttributes(rest),
+				attributes: propsToAttributes(attrs),
 				children: convertNodesSerialize(children, options),
 				name: "callout",
 				type: "mdxJsxFlowElement"
@@ -2398,16 +2407,36 @@ const BOOL_ATTR_REGEXES = Array.from(BOOL_ATTRS.entries()).map(([htmlAttr, jsxAt
 	reg: new RegExp(`(\\s|^)${htmlAttr}(\\s|/?>|$)`, "gi")
 }));
 const ATTR_RENAMES = [[/(\s)class=/g, "$1className="], [/(\s)for=/g, "$1htmlFor="]];
+/**
+* True HTML void usage (`<br>`, `<img src>`, `<source src>` with no body)
+* should become self-closing JSX. A matching close tag means the name is
+* being used as an MDX/JSX component with children — e.g. a custom
+* `<source>…</source>` excerpt. Forcing `/>` there leaves a stray
+* `</source>` that remark-mdx throws on; `deserializeMd` then swallows
+* the error and dumps the entire document as raw paragraphs.
+*
+* When another open of the same name appears before the next close, this
+* open is treated as void (HTML `<source>` inside `<video>` sitting
+* beside a later paired component).
+*/
+const shouldForceVoidClose = (source, tagName, afterOpenIndex) => {
+	const rest = source.slice(afterOpenIndex);
+	const nextOpen = rest.search(new RegExp(`<${tagName}\\b`, "i"));
+	const nextClose = rest.search(new RegExp(`<\\/${tagName}\\s*>`, "i"));
+	if (nextClose === -1) return true;
+	if (nextOpen === -1) return false;
+	return nextOpen < nextClose;
+};
 const htmlToJsx = (html) => {
 	if (!html || typeof html !== "string") return html;
-	return html.replace(/<!--([\s\S]*?)-->/g, "{/*$1*/}").replace(/<([a-zA-Z0-9]+)\b([^>]*?)(\/?)>/gi, (_match, tagName, attrs, selfClosing) => {
+	return html.replace(/<!--([\s\S]*?)-->/g, "{/*$1*/}").replace(/<([a-zA-Z0-9]+)\b([^>]*?)(\/?)>/gi, (match, tagName, attrs, selfClosing, offset, source) => {
 		let a = attrs;
 		ATTR_RENAMES.forEach(([pattern, replacement]) => {
 			a = a.replace(pattern, replacement);
 		});
 		a = a.replace(/(^|\s)([a-zA-Z0-9_-]+)=([^{ \t\n\r"'>]+?)(?=\s|\/?>|$)/g, "$1$2=\"$3\"");
 		for (const { reg, jsxAttr } of BOOL_ATTR_REGEXES) a = a.replace(reg, `$1${jsxAttr}="true"$2`);
-		const closing = VOID_ELEMENTS.has(tagName.toLowerCase()) ? " /" : selfClosing;
+		const closing = VOID_ELEMENTS.has(tagName.toLowerCase()) && (selfClosing === "/" || shouldForceVoidClose(source, tagName, offset + match.length)) ? " /" : selfClosing;
 		return `<${tagName}${a.trimEnd()}${closing}>`;
 	});
 };

package/package.json

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