@depup/react-email__render 2.0.6-depup.0 → 2.1.0-depup.4

package/dist/node/index.cjs

@@ -1,4 +1,5 @@
-//#region rolldown:runtime
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -6,16 +7,12 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") {
-		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-			key = keys[i];
-			if (!__hasOwnProp.call(to, key) && key !== except) {
-				__defProp(to, key, {
-					get: ((k) => from[k]).bind(null, key),
-					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-				});
-			}
-		}
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
 	}
 	return to;
 };
@@ -23,17 +20,17 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-
 //#endregion
 let prettier_plugins_html = require("prettier/plugins/html");
 prettier_plugins_html = __toESM(prettier_plugins_html);
 let prettier_standalone = require("prettier/standalone");
 let html_to_text = require("html-to-text");
+let entities_lib_decode_js = require("entities/lib/decode.js");
+let html5parser = require("html5parser");
 let react = require("react");
 react = __toESM(react);
 let react_jsx_runtime = require("react/jsx-runtime");
 let node_stream = require("node:stream");
-
 //#region src/shared/utils/pretty.ts
 function getHtmlNode(path) {
 	const topNode = path.node;
@@ -94,7 +91,6 @@ const pretty = (str, options = {}) => {
 		...options
 	});
 };
-
 //#endregion
 //#region src/shared/utils/to-plain-text.ts
 const plainTextSelectors = [
@@ -112,6 +108,10 @@ const plainTextSelectors = [
 			linkBrackets: false,
 			hideLinkHrefIfSameAsText: true
 		}
+	},
+	{
+		selector: "[data-text-format=\"dataTable\"]",
+		format: "dataTable"
 	}
 ];
 function toPlainText(html, options) {
@@ -121,7 +121,278 @@ function toPlainText(html, options) {
 		selectors: [...plainTextSelectors, ...options?.selectors ?? []]
 	});
 }
-
+//#endregion
+//#region src/shared/utils/unstable-to-plain-text.ts
+const SKIPPED_TAGS = new Set([
+	"img",
+	"noscript",
+	"script",
+	"style",
+	"template"
+]);
+const WHITESPACE_RUN = /([ \t\n\r\f\u200b]+)/;
+const TAG_BLOCKS = {
+	article: {
+		open: 2,
+		close: 2
+	},
+	aside: {
+		open: 2,
+		close: 2
+	},
+	blockquote: {
+		open: 2,
+		close: 2,
+		prefix: {
+			first: "> ",
+			rest: "> "
+		}
+	},
+	div: {
+		open: 2,
+		close: 2
+	},
+	footer: {
+		open: 2,
+		close: 2
+	},
+	form: {
+		open: 2,
+		close: 2
+	},
+	h1: {
+		open: 3,
+		close: 2
+	},
+	h2: {
+		open: 3,
+		close: 2
+	},
+	h3: {
+		open: 3,
+		close: 2
+	},
+	h4: {
+		open: 3,
+		close: 2
+	},
+	h5: {
+		open: 3,
+		close: 2
+	},
+	h6: {
+		open: 3,
+		close: 2
+	},
+	header: {
+		open: 2,
+		close: 2
+	},
+	hr: {
+		open: 2,
+		close: 2
+	},
+	main: {
+		open: 2,
+		close: 2
+	},
+	nav: {
+		open: 2,
+		close: 2
+	},
+	p: {
+		open: 2,
+		close: 2
+	},
+	pre: {
+		open: 2,
+		close: 2
+	},
+	section: {
+		open: 2,
+		close: 2
+	},
+	table: {
+		open: 2,
+		close: 2
+	}
+};
+function unstableToPlainText(html) {
+	const tree = (0, html5parser.parse)(html, { setAttributeMap: true });
+	const body = findBody(tree);
+	const blocks = [{
+		block: {
+			open: 0,
+			close: 0
+		},
+		text: [],
+		leading: 0,
+		stash: 0,
+		space: false
+	}];
+	const stack = [{
+		parent: body,
+		children: body?.body ?? tree,
+		index: 0,
+		pre: false,
+		opened: false,
+		textFrom: 0,
+		orderedList: void 0
+	}];
+	while (stack.length > 0) {
+		const frame = stack[stack.length - 1];
+		const node = frame.children[frame.index];
+		if (node === void 0) {
+			stack.pop();
+			exitElement(frame.parent, frame);
+			continue;
+		}
+		frame.index += 1;
+		enterNode(node, frame);
+	}
+	function top() {
+		return blocks[blocks.length - 1];
+	}
+	function writeWord(value) {
+		const block = top();
+		if (block.stash > 0) block.text.push("\n".repeat(block.stash));
+		else if (block.space && block.text.length > 0) block.text.push(" ");
+		block.stash = 0;
+		block.space = false;
+		block.text.push(value);
+	}
+	function enterNode(node, frame) {
+		if (node.type === html5parser.SyntaxKind.Text) {
+			const value = (0, entities_lib_decode_js.decodeHTML)(node.value);
+			if (frame.pre) {
+				if (value.length > 0) writeWord(value);
+			} else {
+				const segments = value.split(WHITESPACE_RUN);
+				for (let i = 0; i < segments.length; i++) {
+					const segment = segments[i];
+					if (segment.length === 0) continue;
+					if (i % 2 === 1) top().space = true;
+					else writeWord(segment);
+				}
+			}
+			return;
+		}
+		if (SKIPPED_TAGS.has(node.name) || (0, entities_lib_decode_js.decodeHTMLAttribute)(node.attributeMap?.["data-skip-in-text"]?.value?.value ?? "") === "true") return;
+		const parentTag = frame.parent?.name;
+		let block = TAG_BLOCKS[node.name];
+		let orderedList;
+		if (node.name === "ul") {
+			const breaks = parentTag === "li" ? 1 : 2;
+			block = {
+				open: breaks,
+				close: breaks
+			};
+		} else if (node.name === "li" && parentTag === "ul") block = {
+			open: 1,
+			close: 1,
+			prefix: (stack[stack.length - 2]?.parent)?.name === "li" ? {
+				first: "* ",
+				rest: "  "
+			} : {
+				first: " * ",
+				rest: "   "
+			}
+		};
+		else if (node.name === "ol") {
+			const nested = parentTag === "li";
+			const parsedStart = Number.parseInt((0, entities_lib_decode_js.decodeHTMLAttribute)(node.attributeMap?.start?.value?.value ?? "1"), 10);
+			const start = Number.isNaN(parsedStart) ? 1 : parsedStart;
+			const itemCount = node.body?.filter((child) => child.type === html5parser.SyntaxKind.Tag && child.name === "li").length ?? 0;
+			let prefixLength = 0;
+			for (let index = start; index < start + itemCount; index++) {
+				const prefix = `${nested ? "" : " "}${index}. `;
+				prefixLength = Math.max(prefixLength, prefix.length);
+			}
+			const breaks = nested ? 1 : 2;
+			block = {
+				open: breaks,
+				close: breaks
+			};
+			orderedList = {
+				next: start,
+				prefixLength,
+				nested
+			};
+		} else if (node.name === "li" && parentTag === "ol" && frame.orderedList) {
+			const list = frame.orderedList;
+			block = {
+				open: 1,
+				close: 1,
+				prefix: {
+					first: `${list.nested ? "" : " "}${list.next++}. `.padEnd(list.prefixLength),
+					rest: " ".repeat(list.prefixLength)
+				}
+			};
+		}
+		if (block) blocks.push({
+			block,
+			text: [],
+			leading: block.open,
+			stash: 0,
+			space: false
+		});
+		if (node.name === "hr") writeWord("-".repeat(40));
+		else if (node.name === "br") {
+			top().space = false;
+			top().text.push("\n");
+		}
+		stack.push({
+			parent: node,
+			children: node.body ?? [],
+			index: 0,
+			pre: frame.pre || node.name === "pre",
+			opened: block !== void 0,
+			textFrom: top().text.length,
+			orderedList
+		});
+	}
+	function exitElement(element, frame) {
+		if (element === void 0) return;
+		if (element.name === "a") {
+			const href = (0, entities_lib_decode_js.decodeHTMLAttribute)(element.attributeMap?.href?.value?.value ?? "").replace(/^mailto:/, "");
+			if (href.length > 0 && !href.startsWith("#")) {
+				const anchorText = top().text.slice(frame.textFrom).join("");
+				if (anchorText !== href) {
+					if (anchorText.length > 0) top().space = true;
+					writeWord(href);
+				}
+			}
+		}
+		if (frame.opened) closeBlock();
+	}
+	function closeBlock() {
+		const child = blocks.pop();
+		if (child === void 0) return;
+		const parent = blocks[blocks.length - 1];
+		let content = child.text.join("");
+		const prefix = child.block.prefix;
+		if (prefix !== void 0) {
+			const trimmed = content.replace(/^\n+|\n+$/g, "");
+			content = prefix.first + trimmed.replaceAll("\n", `\n${prefix.rest}`);
+		}
+		const breaks = Math.max(parent.stash, child.leading);
+		if (parent.text.length > 0) {
+			parent.text.push("\n".repeat(breaks));
+			if (content.length > 0) parent.text.push(content);
+		} else {
+			if (content.length > 0) parent.text.push(content);
+			parent.leading = breaks;
+		}
+		parent.stash = Math.max(child.stash, child.block.close);
+	}
+	return blocks[0].text.join("");
+}
+function findBody(tree) {
+	for (const child of tree) {
+		if (child.type !== html5parser.SyntaxKind.Tag || child.name !== "html") continue;
+		for (const inner of child.body ?? []) if (inner.type === html5parser.SyntaxKind.Tag && inner.name === "body") return inner;
+	}
+}
 //#endregion
 //#region src/shared/error-boundary.tsx
 function createErrorBoundary(reject) {
@@ -135,7 +406,43 @@ function createErrorBoundary(reject) {
 		}
 	};
 }
-
+//#endregion
+//#region src/shared/utils/strip-image-preload-links.ts
+/**
+* React injects `<link rel="preload" as="image" />` resource hints into the
+* document `<head>` for every `<img>` it renders during server-side rendering.
+*
+* These hints are meant for browsers loading a web page, where they can speed
+* up the initial paint. In an email they are dead weight: email clients ignore
+* `<link rel="preload">`, and the tags only add noise to the rendered HTML.
+*
+* @see https://github.com/resend/react-email/issues/3034
+*
+* This removes only those auto-injected image preload links, leaving every
+* other `<link>` (stylesheets, fonts, user-authored non-image preloads, ...)
+* untouched. It parses each `<link>` tag's attributes instead of relying on a
+* fixed string match, so it is not affected by attribute order or spacing.
+*/
+const stripImagePreloadLinks = (html) => {
+	return html.replace(/<link\b[^>]*\/?>/gi, (tag) => isImagePreloadLink(tag) ? "" : tag);
+};
+const isImagePreloadLink = (tag) => {
+	const attributes = parseAttributes(tag);
+	return attributes.rel === "preload" && attributes.as === "image";
+};
+const ATTRIBUTE_PATTERN = /([a-z][a-z0-9-]*)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'>]+)))?/gi;
+/**
+* Parses the attributes of a single, already-isolated HTML tag string (e.g.
+* `<link rel="preload" as="image" href="..." />`) into a name → value map.
+* Attribute names are lower-cased; values are read from double, single, or
+* unquoted forms.
+*/
+const parseAttributes = (tag) => {
+	const attributeSection = tag.replace(/^<[a-z][a-z0-9-]*/i, "");
+	const attributes = {};
+	for (const [, name, doubleQuoted, singleQuoted, unquoted] of attributeSection.matchAll(ATTRIBUTE_PATTERN)) attributes[name.toLowerCase()] = doubleQuoted ?? singleQuoted ?? unquoted ?? "";
+	return attributes;
+};
 //#endregion
 //#region src/node/read-stream.ts
 const readStream = async (stream) => {
@@ -177,7 +484,6 @@ const readStream = async (stream) => {
 	}
 	return result;
 };
-
 //#endregion
 //#region src/node/render.tsx
 const render = async (node, options) => {
@@ -205,7 +511,9 @@ const render = async (node, options) => {
 			const ErrorBoundary = createErrorBoundary(reject);
 			const stream = reactDOMServer.renderToPipeableStream(/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ErrorBoundary, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react.Suspense, { children: node }) }), {
 				async onAllReady() {
-					html = await readStream(stream);
+					html = await readStream(stream).then((s) => {
+						return s.replaceAll("\0", "");
+					});
 					resolve();
 				},
 				onError(error) {
@@ -215,14 +523,15 @@ const render = async (node, options) => {
 			});
 		}
 	});
-	if (options?.plainText) return toPlainText(html, options.htmlToTextOptions);
+	html = stripImagePreloadLinks(html);
+	if (options?.plainText) return options.unstableTextConversion ? unstableToPlainText(html) : toPlainText(html, options.htmlToTextOptions);
 	const document = `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">${html.replace(/<!DOCTYPE.*?>/, "")}`;
 	if (options?.pretty) return pretty(document);
 	return document;
 };
-
 //#endregion
 exports.plainTextSelectors = plainTextSelectors;
 exports.pretty = pretty;
 exports.render = render;
-exports.toPlainText = toPlainText;
+exports.toPlainText = toPlainText;
+exports.unstableToPlainText = unstableToPlainText;

package/dist/node/index.d.cts

@@ -24,6 +24,16 @@ type Options = {
    * @see https://github.com/html-to-text/node-html-to-text
    */
   htmlToTextOptions?: HtmlToTextOptions;
+  unstableTextConversion?: false;
+} | {
+  plainText?: true;
+  /**
+   * Converts to plain text with an in-house formatter instead of
+   * html-to-text, so it doesn't take `htmlToTextOptions`.
+   *
+   * @see {@link unstableToPlainText}
+   */
+  unstableTextConversion: true;
 });
 //#endregion
 //#region src/shared/utils/pretty.d.ts
@@ -33,8 +43,11 @@ declare const pretty: (str: string, options?: Options$1) => Promise<string>;
 declare const plainTextSelectors: SelectorDefinition[];
 declare function toPlainText(html: string, options?: HtmlToTextOptions): string;
 //#endregion
+//#region src/shared/utils/unstable-to-plain-text.d.ts
+declare function unstableToPlainText(html: string): string;
+//#endregion
 //#region src/node/render.d.ts
 declare const render: (node: React.ReactNode, options?: Options) => Promise<string>;
 //#endregion
-export { Options, plainTextSelectors, pretty, render, toPlainText };
+export { Options, plainTextSelectors, pretty, render, toPlainText, unstableToPlainText };
 //# sourceMappingURL=index.d.cts.map

package/dist/node/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","names":[],"sources":["../../src/shared/options.ts","../../src/shared/utils/pretty.ts","../../src/shared/utils/to-plain-text.ts","../../src/node/render.tsx"],"sourcesContent":[],"mappings":";;;;KAIY,OAAA;;;AAAZ;;;;ACyHA;;;;ECvHa;AASb;;;;ACRA;;;;;sBHoB0B;;;;cCkGb,gCAAgC,cAAY;;;cCvH5C,oBAAoB;iBASjB,WAAA,yBAAoC;;;cCRvC,eAAsB,KAAA,CAAM,qBAAqB,YAAO"}
+{"version":3,"file":"index.d.cts","names":[],"sources":["../../src/shared/options.ts","../../src/shared/utils/pretty.ts","../../src/shared/utils/to-plain-text.ts","../../src/shared/utils/unstable-to-plain-text.ts","../../src/node/render.tsx"],"mappings":";;;;KAKY,OAAA;;;AAAZ;EAIE,MAAA;AAAA;EAmByC;;;EAbrC,SAAA;AAAA;EAaoB;;;EAPpB,SAAA;EAkBsB;;;;;ACsF5B;EDjGM,iBAAA,GAAoB,iBAAA;EACpB,sBAAA;AAAA;EAGA,SAAA;EC6FuC;;;;;;EDtFvC,sBAAA;AAAA;;;cCsFO,MAAA,GAAU,GAAA,UAAa,OAAA,GAAS,SAAA,KAAY,OAAA;;;cCvH5C,kBAAA,EAAoB,kBAAA;AAAA,iBAUjB,WAAA,CAAY,IAAA,UAAc,OAAA,GAAU,iBAAA;;;iBC6DpC,mBAAA,CAAoB,IAAA;;;cCpEvB,MAAA,GAAgB,IAAA,EAAM,KAAA,CAAM,SAAA,EAAW,OAAA,GAAU,OAAA,KAAO,OAAA"}

package/dist/node/index.d.mts

@@ -24,6 +24,16 @@ type Options = {
    * @see https://github.com/html-to-text/node-html-to-text
    */
   htmlToTextOptions?: HtmlToTextOptions;
+  unstableTextConversion?: false;
+} | {
+  plainText?: true;
+  /**
+   * Converts to plain text with an in-house formatter instead of
+   * html-to-text, so it doesn't take `htmlToTextOptions`.
+   *
+   * @see {@link unstableToPlainText}
+   */
+  unstableTextConversion: true;
 });
 //#endregion
 //#region src/shared/utils/pretty.d.ts
@@ -33,8 +43,11 @@ declare const pretty: (str: string, options?: Options$1) => Promise<string>;
 declare const plainTextSelectors: SelectorDefinition[];
 declare function toPlainText(html: string, options?: HtmlToTextOptions): string;
 //#endregion
+//#region src/shared/utils/unstable-to-plain-text.d.ts
+declare function unstableToPlainText(html: string): string;
+//#endregion
 //#region src/node/render.d.ts
 declare const render: (node: React.ReactNode, options?: Options) => Promise<string>;
 //#endregion
-export { Options, plainTextSelectors, pretty, render, toPlainText };
+export { Options, plainTextSelectors, pretty, render, toPlainText, unstableToPlainText };
 //# sourceMappingURL=index.d.mts.map

package/dist/node/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/shared/options.ts","../../src/shared/utils/pretty.ts","../../src/shared/utils/to-plain-text.ts","../../src/node/render.tsx"],"sourcesContent":[],"mappings":";;;;KAIY,OAAA;;;AAAZ;;;;ACyHA;;;;ECvHa;AASb;;;;ACRA;;;;;sBHoB0B;;;;cCkGb,gCAAgC,cAAY;;;cCvH5C,oBAAoB;iBASjB,WAAA,yBAAoC;;;cCRvC,eAAsB,KAAA,CAAM,qBAAqB,YAAO"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/shared/options.ts","../../src/shared/utils/pretty.ts","../../src/shared/utils/to-plain-text.ts","../../src/shared/utils/unstable-to-plain-text.ts","../../src/node/render.tsx"],"mappings":";;;;KAKY,OAAA;;;AAAZ;EAIE,MAAA;AAAA;EAmByC;;;EAbrC,SAAA;AAAA;EAaoB;;;EAPpB,SAAA;EAkBsB;;;;;ACsF5B;EDjGM,iBAAA,GAAoB,iBAAA;EACpB,sBAAA;AAAA;EAGA,SAAA;EC6FuC;;;;;;EDtFvC,sBAAA;AAAA;;;cCsFO,MAAA,GAAU,GAAA,UAAa,OAAA,GAAS,SAAA,KAAY,OAAA;;;cCvH5C,kBAAA,EAAoB,kBAAA;AAAA,iBAUjB,WAAA,CAAY,IAAA,UAAc,OAAA,GAAU,iBAAA;;;iBC6DpC,mBAAA,CAAoB,IAAA;;;cCpEvB,MAAA,GAAgB,IAAA,EAAM,KAAA,CAAM,SAAA,EAAW,OAAA,GAAU,OAAA,KAAO,OAAA"}