@samva/markup 0.5.0 → 0.6.0

package/dist/email/html.js

@@ -153,7 +153,8 @@ const attributes = (sink, tag, spec, props, origins) => {
 			if (text !== void 0) emitted.push(` ${name}="${escapeAttribute(text)}"`);
 			continue;
 		}
-		const attribute = EMAIL_GLOBAL_ATTRIBUTES[name] ?? spec.attributes[name];
+		const globalAttributes = EMAIL_GLOBAL_ATTRIBUTES;
+		const attribute = Object.hasOwn(globalAttributes, name) ? globalAttributes[name] : Object.hasOwn(spec.attributes, name) ? spec.attributes[name] : void 0;
 		if (attribute === void 0) {
 			const supported = [
 				...Object.keys(EMAIL_GLOBAL_ATTRIBUTES),

package/dist/email/jsx-dev-runtime.d.ts

@@ -1,5 +1,5 @@
-import { r as JsxSource } from "../source-locations-D6Te6Gy1.js";
-import { g as JSX, h as Fragment, m as EmailNode, p as EmailComponent } from "../elements-ChJULZlh.js";
+import { r as JsxSource } from "../source-locations-DrCM82Ym.js";
+import { g as JSX, h as Fragment, m as EmailNode, p as EmailComponent } from "../elements-BzjjnoCS.js";
 //#region src/email/jsx-dev-runtime.d.ts
 /** Development JSX retains compiler-provided origins directly on the semantic tree. */
 declare const jsxDEV: (type: string | EmailComponent<Record<string, unknown>> | typeof Fragment, props: Record<string, unknown> | null, _key?: unknown, _staticChildren?: boolean, source?: JsxSource) => EmailNode;

package/dist/email/jsx-runtime.d.ts

@@ -1,2 +1,2 @@
-import { C as reportEmailDiagnostic, S as rawMarkup, _ as currentEmailOrigins, b as jsxs, f as EmailChild, g as JSX, h as Fragment, m as EmailNode, p as EmailComponent, v as drainEmailDiagnostics, x as normalizeChildren, y as jsx } from "../elements-ChJULZlh.js";
+import { C as reportEmailDiagnostic, S as rawMarkup, _ as currentEmailOrigins, b as jsxs, f as EmailChild, g as JSX, h as Fragment, m as EmailNode, p as EmailComponent, v as drainEmailDiagnostics, x as normalizeChildren, y as jsx } from "../elements-BzjjnoCS.js";
 export { EmailChild, EmailComponent, EmailNode, Fragment, JSX, currentEmailOrigins, drainEmailDiagnostics, jsx, jsxs, normalizeChildren, rawMarkup, reportEmailDiagnostic };

package/dist/email/render.d.ts

@@ -1,9 +1,9 @@
-import { r as EmailDiagnostic } from "../diagnostics-eFM9A_TU.js";
-import { m as EmailNode } from "../elements-ChJULZlh.js";
+import { r as EmailDiagnostic } from "../diagnostics-BMYtBCQk.js";
+import { m as EmailNode } from "../elements-BzjjnoCS.js";
 import { EmittedPosition } from "./selection.js";
 import { SerializeEmailOptions } from "./html.js";
-import { r as TemplateDefinition } from "../template-G-QPcfmn.js";
-import { i as Stylesheet } from "../css-DoNc7CiC.js";
+import { r as TemplateDefinition } from "../template-DWftqh4x.js";
+import { i as Stylesheet } from "../css-COcFOT1y.js";
 //#region src/email/render.d.ts
 /** Classic Outlook lays a document out correctly only under a transitional doctype. */
 declare const EMAIL_DOCTYPE = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">";

package/dist/email/render.js

@@ -1,4 +1,4 @@
-import { i as renderEmail, n as bindStylesheets, r as compileEmail, t as EMAIL_DOCTYPE } from "../render-T6IFPnP4.js";
+import { i as renderEmail, n as bindStylesheets, r as compileEmail, t as EMAIL_DOCTYPE } from "../render-aaJBnsXK.js";
 import "./html.js";
 import "./diagnostics.js";
 import "./stylesheets.js";

package/dist/email/selection.d.ts

@@ -1,4 +1,4 @@
-import { i as JsxSourceLocation } from "../source-locations-D6Te6Gy1.js";
+import { i as JsxSourceLocation } from "../source-locations-DrCM82Ym.js";
 //#region src/email/selection.d.ts
 /**
  * The attribute a preview stamps so a click in a rendered document resolves to

package/dist/email/source-edit.d.ts

@@ -1,4 +1,4 @@
-import { i as JsxSourceLocation } from "../source-locations-D6Te6Gy1.js";
+import { i as JsxSourceLocation } from "../source-locations-DrCM82Ym.js";
 //#region src/email/source-edit.d.ts
 /** One exact source replacement; before text guards against concurrent changes. */
 interface SourceReplacement {

package/dist/email/stylesheets.d.ts

@@ -1,4 +1,4 @@
-import { i as Stylesheet } from "../css-DoNc7CiC.js";
+import { i as Stylesheet } from "../css-COcFOT1y.js";
 //#region src/email/stylesheets.d.ts
 /** Called by a compiler-generated stylesheet module at import time. */
 declare const registerStylesheet: (sheet: Stylesheet) => void;

package/dist/email/text.d.ts

@@ -1,4 +1,4 @@
-import { m as EmailNode } from "../elements-ChJULZlh.js";
+import { m as EmailNode } from "../elements-BzjjnoCS.js";
 //#region src/email/text.d.ts
 /** Derive the plain-text alternative from the semantic tree in reading order. */
 declare const deriveEmailText: (node: EmailNode) => string;

package/dist/emit.d.ts

@@ -1,5 +1,5 @@
-import { t as Diagnostic } from "./diagnostics-CqepLcpI.js";
-import { s as UnboundTemplateSourceLocations } from "./source-locations-D6Te6Gy1.js";
+import { t as Diagnostic } from "./diagnostics-OcQKQYSY.js";
+import { s as UnboundTemplateSourceLocations } from "./source-locations-DrCM82Ym.js";
 import { TemplateVariable } from "./render-template.js";
 //#region src/emit.d.ts
 /**

package/dist/footer.js

@@ -7,7 +7,7 @@
 * the placeholder. */
 const FOOTER_UNSUBSCRIBE_PLACEHOLDER = "%samva:unsubscribe-url%";
 const escapeText = (value) => value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
-const escapeAttribute = (value) => value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll("\"", "&quot;");
+const escapeAttribute = (value) => value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;").replaceAll("'", "&#39;");
 const isSafeUrl = (url) => /^(https?:|mailto:)/i.test(url.trim());
 const addressLines = (address) => {
 	const region = [
@@ -45,6 +45,9 @@ const renderFooterBlock = (input) => {
 	const containerPx = tokens.containerPx["xl"] ?? 600;
 	const fontSizePx = tokens.text["xs"]?.sizePx ?? 12;
 	const lineHeightPx = tokens.text["xs"]?.lineHeightPx ?? 18;
+	const fontFamilyAttribute = escapeAttribute(fontFamily);
+	const mutedColorAttribute = escapeAttribute(mutedColor);
+	const linkColorAttribute = escapeAttribute(linkColor);
 	const rows = [];
 	const textLines = [];
 	if (typeof footer.customHtml === "string" && footer.customHtml.trim().length > 0) rows.push(`<tr><td style="padding:0 0 12px 0;">${footer.customHtml}</td></tr>`);
@@ -61,20 +64,20 @@ const renderFooterBlock = (input) => {
 			}
 		}
 		if (footer.socialLinks !== void 0 && footer.socialLinks.length > 0) {
-			const links = footer.socialLinks.map((link) => isSafeUrl(link.url) ? `<a href="${escapeAttribute(link.url.trim())}" style="color:${linkColor};text-decoration:underline;" ses:no-track>${escapeText(link.label)}</a>` : escapeText(link.label));
+			const links = footer.socialLinks.map((link) => isSafeUrl(link.url) ? `<a href="${escapeAttribute(link.url.trim())}" style="color:${linkColorAttribute};text-decoration:underline;" ses:no-track>${escapeText(link.label)}</a>` : escapeText(link.label));
 			rows.push(`<tr><td style="padding:0 0 8px 0;">${links.join("<span style=\"padding:0 6px;\">·</span>")}</td></tr>`);
 			textLines.push(footer.socialLinks.map((link) => `${link.label}: ${link.url}`).join("  "));
 		}
 	}
 	if (unsubscribeUrl !== null) {
-		rows.push(`<tr><td style="padding:0;"><a href="${escapeAttribute(unsubscribeUrl)}" style="color:${mutedColor};text-decoration:underline;" ses:no-track>${escapeText(unsubscribeLabel)}</a></td></tr>`);
+		rows.push(`<tr><td style="padding:0;"><a href="${escapeAttribute(unsubscribeUrl)}" style="color:${mutedColorAttribute};text-decoration:underline;" ses:no-track>${escapeText(unsubscribeLabel)}</a></td></tr>`);
 		textLines.push(`${unsubscribeLabel}: ${unsubscribeUrl}`);
 	}
 	return {
 		html: rows.length === 0 ? "" : [
 			`<table role="presentation" cellpadding="0" cellspacing="0" border="0" width="100%" style="width:100%;border-collapse:collapse;">`,
 			`<tr><td align="center" style="padding:32px 16px;">`,
-			`<table role="presentation" cellpadding="0" cellspacing="0" border="0" width="${containerPx}" style="width:100%;max-width:${containerPx}px;border-collapse:collapse;font-family:${fontFamily};font-size:${fontSizePx}px;line-height:${lineHeightPx}px;color:${mutedColor};text-align:center;">`,
+			`<table role="presentation" cellpadding="0" cellspacing="0" border="0" width="${containerPx}" style="width:100%;max-width:${containerPx}px;border-collapse:collapse;font-family:${fontFamilyAttribute};font-size:${fontSizePx}px;line-height:${lineHeightPx}px;color:${mutedColorAttribute};text-align:center;">`,
 			...rows,
 			`</table>`,
 			`</td></tr>`,

package/dist/jsx-dev-runtime.d.ts

@@ -1,5 +1,5 @@
-import { r as JsxSource } from "./source-locations-D6Te6Gy1.js";
-import { a as JsxResult, i as JSX, n as Fragment, t as Component } from "./jsx-runtime-BI4gI19E.js";
+import { r as JsxSource } from "./source-locations-DrCM82Ym.js";
+import { a as JsxResult, i as JSX, n as Fragment, t as Component } from "./jsx-runtime-I-1nCtl2.js";
 //#region src/jsx-dev-runtime.d.ts
 interface JsxDevProps {
   readonly children?: unknown;

package/dist/{jsx-runtime-BI4gI19E.d.ts → jsx-runtime-I-1nCtl2.d.ts}

@@ -1,5 +1,5 @@
-import { f as ElementNode, n as Attribute, x as SmlNode } from "./ast-BLybiDxp.js";
-import { s as VariableRef } from "./variables-BnKs1iqb.js";
+import { f as ElementNode, n as Attribute, x as SmlNode } from "./ast-BrDtApwS.js";
+import { s as VariableRef } from "./variables-J_L3qxRa.js";
 //#region src/jsx-runtime.d.ts
 /** A component is a plain function of its props that returns a draft node. */
 type Component<P> = (props: P) => SmlNode;
@@ -54,4 +54,4 @@ declare namespace JSX {
 }
 //#endregion
 export { JsxResult as a, elementDraft as c, normalizeChildren as d, JSX as i, jsx as l, Fragment as n, SmlChild as o, FragmentDraft as r, SmlChildren as s, Component as t, jsxs as u };
-//# sourceMappingURL=jsx-runtime-BI4gI19E.d.ts.map
+//# sourceMappingURL=jsx-runtime-I-1nCtl2.d.ts.map

package/dist/jsx-runtime.d.ts

@@ -1,2 +1,2 @@
-import { a as JsxResult, c as elementDraft, d as normalizeChildren, i as JSX, l as jsx, n as Fragment, o as SmlChild, r as FragmentDraft, s as SmlChildren, t as Component, u as jsxs } from "./jsx-runtime-BI4gI19E.js";
+import { a as JsxResult, c as elementDraft, d as normalizeChildren, i as JSX, l as jsx, n as Fragment, o as SmlChild, r as FragmentDraft, s as SmlChildren, t as Component, u as jsxs } from "./jsx-runtime-I-1nCtl2.js";
 export { Component, Fragment, FragmentDraft, JSX, JsxResult, SmlChild, SmlChildren, elementDraft, jsx, jsxs, normalizeChildren };

package/dist/lexer.js

@@ -21,6 +21,7 @@ const CHAR_UNDERSCORE = 95;
 const CHAR_0 = 48;
 const CHAR_9 = 57;
 const CHAR_UPPER_A = 65;
+const CHAR_UPPER_X = 88;
 const CHAR_UPPER_Z = 90;
 const CHAR_LOWER_A = 97;
 const CHAR_LOWER_X = 120;
@@ -60,6 +61,10 @@ const NAMED_ENTITIES = {
 	apos: "'",
 	nbsp: "\xA0"
 };
+const numericEntityCodePoint = (digits, radix) => {
+	const codePoint = Number.parseInt(digits, radix);
+	return Number.isFinite(codePoint) && codePoint <= 1114111 ? codePoint : void 0;
+};
 /**
 * Validates the entity starting at `offset` (which points at `&`).
 * Returns the end offset (past `;`) or -1 when malformed.
@@ -68,7 +73,8 @@ const scanEntity = (source, offset) => {
 	let index = offset + 1;
 	if (source.charCodeAt(index) === CHAR_HASH) {
 		index++;
-		const hex = source.charCodeAt(index) === CHAR_LOWER_X;
+		const marker = source.charCodeAt(index);
+		const hex = marker === CHAR_LOWER_X || marker === CHAR_UPPER_X;
 		if (hex) index++;
 		const digitsStart = index;
 		while (index < source.length) {
@@ -77,11 +83,13 @@ const scanEntity = (source, offset) => {
 			index++;
 		}
 		if (index === digitsStart) return -1;
+		if (numericEntityCodePoint(source.slice(digitsStart, index), hex ? 16 : 10) === void 0) return -1;
 		return source.charCodeAt(index) === CHAR_SEMICOLON ? index + 1 : -1;
 	}
 	const nameStart = index;
 	while (index < source.length && isLetter(source.charCodeAt(index))) index++;
-	if (!(source.slice(nameStart, index) in NAMED_ENTITIES)) return -1;
+	const name = source.slice(nameStart, index);
+	if (!Object.hasOwn(NAMED_ENTITIES, name)) return -1;
 	return source.charCodeAt(index) === CHAR_SEMICOLON ? index + 1 : -1;
 };
 /** Decodes entities in text that already passed `scanEntity` validation. */
@@ -102,9 +110,13 @@ const decodeEntities = (raw) => {
 			break;
 		}
 		const body = raw.slice(ampersand + 1, semicolon);
-		if (body.startsWith("#x") || body.startsWith("#X")) result += String.fromCodePoint(Number.parseInt(body.slice(2), 16));
-		else if (body.startsWith("#")) result += String.fromCodePoint(Number.parseInt(body.slice(1), 10));
-		else result += NAMED_ENTITIES[body];
+		if (body.startsWith("#x") || body.startsWith("#X")) {
+			const codePoint = numericEntityCodePoint(body.slice(2), 16);
+			result += codePoint === void 0 ? raw.slice(ampersand, semicolon + 1) : String.fromCodePoint(codePoint);
+		} else if (body.startsWith("#")) {
+			const codePoint = numericEntityCodePoint(body.slice(1), 10);
+			result += codePoint === void 0 ? raw.slice(ampersand, semicolon + 1) : String.fromCodePoint(codePoint);
+		} else result += Object.hasOwn(NAMED_ENTITIES, body) ? NAMED_ENTITIES[body] : raw.slice(ampersand, semicolon + 1);
 		index = semicolon + 1;
 	}
 	return result;

package/dist/model.d.ts

@@ -1,4 +1,4 @@
-import { S as SmlTag, b as SmlDocument } from "./ast-BLybiDxp.js";
+import { S as SmlTag, b as SmlDocument } from "./ast-BrDtApwS.js";
 import { Result } from "better-result";
 //#region src/model.d.ts
 /** The subset of an element's attributes the navigator and agent tools read. */