@lofcz/platejs-markdown 53.3.5 → 53.4.10

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import * as platejs2 from "platejs";
 import { Descendant, NodeKey, Nullable, OmitFirst, PluginConfig, SlateEditor, TElement, TListElement, TNodeMap, TText, Value } from "platejs";
 import { MdxJsxFlowElement, MdxJsxFlowElement as MdMdxJsxFlowElement, MdxJsxTextElement, MdxJsxTextElement as MdMdxJsxTextElement } from "mdast-util-mdx";
+import { Token } from "marked";
 import { Plugin } from "unified";
 import { Options } from "remark-stringify";
-import { Token } from "marked";
 import baseRemarkMdx from "remark-mdx";
 import { Blockquote as MdBlockquote, Break as MdBreak, Code as MdCode, Content as MdContent, Definition as MdDefinition, Delete as MdDelete, Emphasis as MdEmphasis, FootnoteDefinition as MdFootnoteDefinition, FootnoteReference as MdFootnoteReference, Heading as MdHeading, Html as MdHtml, Image as MdImage, ImageReference as MdImageReference, InlineCode as MdInlineCode, Link as MdLink, LinkReference as MdLinkReference, List as MdList, ListItem as MdListItem, Paragraph as MdParagraph, PhrasingContent as MDPhrasingContent, Root, Root as MdRoot, RootContent as MdRootContent, Strong as MdStrong, Table as MdTable, TableCell as MdTableCell, TableRow as MdTableRow, Text as MdText, ThematicBreak as MdThematicBreak, Yaml as MdYaml } from "mdast";
 import { InlineMath as MdInlineMath, Math as MdMath } from "mdast-util-math";

package/dist/index.js

@@ -1,12 +1,12 @@
 import { ElementApi, KEYS, TextApi, bindFirst, createTSlatePlugin, getPluginKey, getPluginType, isUrl } from "platejs";
 import "mdast-util-mdx";
 import { normalizeDateValue } from "@platejs/date";
+import { Lexer, marked } from "marked";
 import kebabCase from "lodash/kebabCase.js";
 import { defaultHandlers, toMarkdown } from "mdast-util-to-markdown";
 import { unified } from "unified";
 import remarkStringify from "remark-stringify";
 import remarkParse from "remark-parse";
-import { marked } from "marked";
 import baseRemarkMdx from "remark-mdx";
 import { visit } from "unist-util-visit";
 
@@ -1456,7 +1456,7 @@ const slateToMdast = ({ children, options }) => {
 
 //#endregion
 //#region src/lib/rules/defaultRules.ts
-const BARE_AUTOLINK_PROTOCOL_REGEX = /^https?:\/\//i;
+const BARE_AUTOLINK_REGEX = /^https?:\/\/[^\s<>\\]+$/i;
 const LEADING_NEWLINE_REGEX = /^\n/;
 function isBoolean(value) {
 	return value === true || value === false || !!value && typeof value === "object" && Object.prototype.toString.call(value) === "[object Boolean]";
@@ -1527,10 +1527,14 @@ const defaultRules = {
 		}),
 		serialize: (node, options) => {
 			const children = convertNodesSerialize(node.children, options);
-			if (children.length === 1 && children[0]?.type === "text" && children[0].value === node.url && options.remarkStringifyOptions?.resourceLink !== true && BARE_AUTOLINK_PROTOCOL_REGEX.test(node.url ?? "")) return {
-				type: "html",
-				value: node.url
-			};
+			if (children.length === 1 && children[0]?.type === "text" && children[0].value === node.url && options.remarkStringifyOptions?.resourceLink !== true && BARE_AUTOLINK_REGEX.test(node.url ?? "")) {
+				const tokens = Lexer.lexInline(node.url, { gfm: true });
+				const token = tokens[0];
+				if (tokens.length === 1 && token?.type === "link" && token.href === node.url && token.text === node.url) return {
+					type: "html",
+					value: node.url
+				};
+			}
 			return {
 				children,
 				type: "link",
@@ -2407,16 +2411,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}>`;
 	});
 };
@@ -2505,6 +2529,7 @@ const remarkToSlate = function(options = {}) {
 
 //#endregion
 //#region src/lib/deserializer/utils/splitIncompleteMdx.ts
+const HTTP_AUTOLINK_REGEX = /^<https?:\/\/[^\s<>]*>/i;
 /** 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;
@@ -2519,6 +2544,11 @@ const splitIncompleteMdx = (data) => {
 			continue;
 		}
 		const tagStart = i;
+		const autolink = HTTP_AUTOLINK_REGEX.exec(data.slice(i));
+		if (autolink) {
+			i += autolink[0].length;
+			continue;
+		}
 		i++;
 		if (i >= len) {
 			cutPos = tagStart;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lofcz/platejs-markdown",
-  "version": "53.3.5",
+  "version": "53.4.10",
   "description": "Markdown serializer plugin for Plate",
   "keywords": [
     "markdown",
@@ -54,7 +54,7 @@
     "@plate/scripts": "1.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.3.4"
+    "platejs": "npm:@lofcz/platejs@53.4.9"
   },
   "peerDependencies": {
     "platejs": ">=53.3.3",