@samva/markup 0.5.0 → 0.7.0

package/dist/presets/showcase.d.ts

@@ -1,2 +1,2 @@
-import { a as ShowcaseProjectId, c as showcaseProject, d as showcaseSourcePath, i as ShowcaseProject, l as showcaseProjectPaths, n as OwnedShowcaseId, o as ShowcaseProvenance, r as SHOWCASE_ROOT, s as isShowcaseProjectId, t as BrandRecreationShowcaseId, u as showcaseProjects } from "../showcase-dvJMn-Lo.js";
+import { a as ShowcaseProjectId, c as showcaseProject, d as showcaseSourcePath, i as ShowcaseProject, l as showcaseProjectPaths, n as OwnedShowcaseId, o as ShowcaseProvenance, r as SHOWCASE_ROOT, s as isShowcaseProjectId, t as BrandRecreationShowcaseId, u as showcaseProjects } from "../showcase-DGZAWn4Z.js";
 export { BrandRecreationShowcaseId, OwnedShowcaseId, SHOWCASE_ROOT, ShowcaseProject, ShowcaseProjectId, ShowcaseProvenance, isShowcaseProjectId, showcaseProject, showcaseProjectPaths, showcaseProjects, showcaseSourcePath };

package/dist/presets.d.ts

@@ -1,2 +1,2 @@
-import { a as PresetMeta, c as presetCatalog, i as PresetId, n as EmailPresetVariable, o as PresetVariable, r as PresetCategory, s as RECOMMENDED_THEME, t as EmailPresetId } from "./catalog-Db0UcCTg.js";
+import { a as PresetMeta, c as presetCatalog, i as PresetId, n as EmailPresetVariable, o as PresetVariable, r as PresetCategory, s as RECOMMENDED_THEME, t as EmailPresetId } from "./catalog-60eaYC7b.js";
 export { EmailPresetId, EmailPresetVariable, PresetCategory, PresetId, PresetMeta, PresetVariable, RECOMMENDED_THEME, presetCatalog };

package/dist/printer.d.ts

@@ -1,4 +1,4 @@
-import { b as SmlDocument } from "./ast-BLybiDxp.js";
+import { b as SmlDocument } from "./ast-BrDtApwS.js";
 //#region src/printer.d.ts
 declare const printSml: (document: SmlDocument) => string;
 //#endregion

package/dist/{render-T6IFPnP4.js → render-aaJBnsXK.js}

@@ -6,22 +6,33 @@ import { EmailCompileError, hasBlockingDiagnostic } from "./email/diagnostics.js
 import { snapshotStylesheets } from "./email/stylesheets.js";
 import { deriveEmailText } from "./email/text.js";
 //#region src/email/css-values.ts
-/** Expand `var(--x, fallback)` against the collected custom properties. */
-const resolveVariables = (value, variables, depth = 0) => {
+const MAX_RESOLVED_VALUE_LENGTH = 65536;
+const MAX_RESOLUTION_WORK = 262144;
+const resolveVariablesWithin = (value, variables, depth, budget, work) => {
+	if (value.length > work.remaining) return void 0;
+	work.remaining -= value.length;
+	if (value.length > budget) return void 0;
 	if (depth > 8 || !value.includes("var(")) return value;
-	let result = "";
-	let rest = value;
-	while (rest.length > 0) {
-		const start = rest.indexOf("var(");
+	const chunks = [];
+	let length = 0;
+	const append = (chunk) => {
+		length += chunk.length;
+		if (length > budget) return false;
+		chunks.push(chunk);
+		return true;
+	};
+	let cursor = 0;
+	while (cursor < value.length) {
+		const start = value.indexOf("var(", cursor);
 		if (start < 0) {
-			result += rest;
+			if (!append(value.slice(cursor))) return void 0;
 			break;
 		}
-		result += rest.slice(0, start);
+		if (!append(value.slice(cursor, start))) return void 0;
 		let level = 0;
 		let end = -1;
-		for (let index = start + 3; index < rest.length; index++) if (rest[index] === "(") level += 1;
-		else if (rest[index] === ")") {
+		for (let index = start + 3; index < value.length; index++) if (value[index] === "(") level += 1;
+		else if (value[index] === ")") {
 			level -= 1;
 			if (level === 0) {
 				end = index;
@@ -29,20 +40,26 @@ const resolveVariables = (value, variables, depth = 0) => {
 			}
 		}
 		if (end < 0) {
-			result += rest.slice(start);
+			if (!append(value.slice(start))) return void 0;
 			break;
 		}
-		const body = rest.slice(start + 4, end);
+		const body = value.slice(start + 4, end);
 		const comma = body.indexOf(",");
 		const name = (comma < 0 ? body : body.slice(0, comma)).trim();
 		const fallback = comma < 0 ? void 0 : body.slice(comma + 1).trim();
 		const replacement = variables[name] ?? fallback;
-		result += replacement === void 0 ? rest.slice(start, end + 1) : resolveVariables(replacement, variables, depth + 1);
-		rest = rest.slice(end + 1);
+		const resolved = replacement === void 0 ? value.slice(start, end + 1) : resolveVariablesWithin(replacement, variables, depth + 1, budget - length, work);
+		if (resolved === void 0 || !append(resolved)) return void 0;
+		cursor = end + 1;
 	}
-	return result;
+	return chunks.join("");
 };
 /**
+* Expand `var(--x, fallback)` against the collected custom properties.
+* Values whose expansion exceeds the render-time budget are left as authored.
+*/
+const resolveVariables = (value, variables, depth = 0) => resolveVariablesWithin(value, variables, depth, MAX_RESOLVED_VALUE_LENGTH, { remaining: MAX_RESOLUTION_WORK }) ?? value;
+/**
 * Fold a constant `calc()` to a plain value. Tailwind writes every spacing
 * utility as `calc(var(--spacing) * n)`, and classic Outlook does not implement
 * `calc()` at all, so an unfolded value is a silently missing style. An
@@ -589,4 +606,4 @@ const renderEmailWith = (stylesheet, template, data, options) => {
 //#endregion
 export { applyStylesheet as a, downlevelMediaQuery as c, renderHeadCss as d, resolveVariables as f, renderEmail as i, finalizeValue as l, bindStylesheets as n, classListOf as o, compileEmail as r, matchesSelector as s, EMAIL_DOCTYPE as t, foldCalc as u };
 
-//# sourceMappingURL=render-T6IFPnP4.js.map
+//# sourceMappingURL=render-aaJBnsXK.js.map

package/dist/render-template.d.ts

@@ -1,8 +1,8 @@
-import { i as SmlParseError } from "./diagnostics-CqepLcpI.js";
-import { b as SmlDocument } from "./ast-BLybiDxp.js";
-import { s as UnboundTemplateSourceLocations } from "./source-locations-D6Te6Gy1.js";
-import { a as VariableKind, l as Variables } from "./variables-BnKs1iqb.js";
-import { a as JsxResult } from "./jsx-runtime-BI4gI19E.js";
+import { i as SmlParseError } from "./diagnostics-OcQKQYSY.js";
+import { b as SmlDocument } from "./ast-BrDtApwS.js";
+import { s as UnboundTemplateSourceLocations } from "./source-locations-DrCM82Ym.js";
+import { a as VariableKind, l as Variables } from "./variables-J_L3qxRa.js";
+import { a as JsxResult } from "./jsx-runtime-I-1nCtl2.js";
 import { Result } from "better-result";
 //#region src/render-template.d.ts
 /**

package/dist/render-template.js

@@ -1,5 +1,5 @@
 import { mapJsxSourceLocations } from "./source-locations.js";
-import { i as parsePredicate, n as collectPredicateVariables } from "./predicate-DwXzmqIY.js";
+import { i as parsePredicate, n as collectPredicateVariables } from "./predicate-BI6uRRM-.js";
 import { isRootTag } from "./ast.js";
 import { createVariablesProxy } from "./variables.js";
 import { parseSml } from "./parser.js";

package/dist/{showcase-dvJMn-Lo.d.ts → showcase-DGZAWn4Z.d.ts}

@@ -1,4 +1,4 @@
-import { r as PresetCategory } from "./catalog-Db0UcCTg.js";
+import { r as PresetCategory } from "./catalog-60eaYC7b.js";
 //#region presets/showcase.d.ts
 /**
  * The showcase projects: presets authored as complete editable projects under
@@ -453,4 +453,4 @@ declare const showcaseSourcePath: (project: ShowcaseProject) => string;
 declare const showcaseProjectPaths: (project: ShowcaseProject) => ReadonlyArray<string>;
 //#endregion
 export { ShowcaseProjectId as a, showcaseProject as c, showcaseSourcePath as d, ShowcaseProject as i, showcaseProjectPaths as l, OwnedShowcaseId as n, ShowcaseProvenance as o, SHOWCASE_ROOT as r, isShowcaseProjectId as s, BrandRecreationShowcaseId as t, showcaseProjects as u };
-//# sourceMappingURL=showcase-dvJMn-Lo.d.ts.map
+//# sourceMappingURL=showcase-DGZAWn4Z.d.ts.map

package/dist/{source-locations-D6Te6Gy1.d.ts → source-locations-DrCM82Ym.d.ts}

@@ -1,4 +1,4 @@
-import { f as ElementNode, x as SmlNode } from "./ast-BLybiDxp.js";
+import { f as ElementNode, x as SmlNode } from "./ast-BrDtApwS.js";
 //#region src/source-locations.d.ts
 /**
  * The source payload emitted by the JSX development transform. The transform
@@ -64,4 +64,4 @@ declare const mapJsxSourceLocations: (draft: ElementNode, parsed: ElementNode) =
 declare const sameTemplateSourceLocations: (left: UnboundTemplateSourceLocations, right: UnboundTemplateSourceLocations) => boolean;
 //#endregion
 export { SourceLocationUnavailableReason as a, attachJsxSourceLocation as c, mapJsxSourceLocations as d, sameTemplateSourceLocations as f, JsxSourceLocation as i, completeJsxSourceLocation as l, JSX_SOURCE_LOCATION_PROP as n, TemplateSourceLocations as o, JsxSource as r, UnboundTemplateSourceLocations as s, JSX_SOURCE_LOCATION as t, jsxSourceLocationOf as u };
-//# sourceMappingURL=source-locations-D6Te6Gy1.d.ts.map
+//# sourceMappingURL=source-locations-DrCM82Ym.d.ts.map

package/dist/source-locations.d.ts

@@ -1,2 +1,2 @@
-import { a as SourceLocationUnavailableReason, c as attachJsxSourceLocation, d as mapJsxSourceLocations, f as sameTemplateSourceLocations, i as JsxSourceLocation, l as completeJsxSourceLocation, n as JSX_SOURCE_LOCATION_PROP, o as TemplateSourceLocations, r as JsxSource, s as UnboundTemplateSourceLocations, t as JSX_SOURCE_LOCATION, u as jsxSourceLocationOf } from "./source-locations-D6Te6Gy1.js";
+import { a as SourceLocationUnavailableReason, c as attachJsxSourceLocation, d as mapJsxSourceLocations, f as sameTemplateSourceLocations, i as JsxSourceLocation, l as completeJsxSourceLocation, n as JSX_SOURCE_LOCATION_PROP, o as TemplateSourceLocations, r as JsxSource, s as UnboundTemplateSourceLocations, t as JSX_SOURCE_LOCATION, u as jsxSourceLocationOf } from "./source-locations-DrCM82Ym.js";
 export { JSX_SOURCE_LOCATION, JSX_SOURCE_LOCATION_PROP, JsxSource, JsxSourceLocation, SourceLocationUnavailableReason, TemplateSourceLocations, UnboundTemplateSourceLocations, attachJsxSourceLocation, completeJsxSourceLocation, jsxSourceLocationOf, mapJsxSourceLocations, sameTemplateSourceLocations };

package/dist/{template-G-QPcfmn.d.ts → template-DWftqh4x.d.ts}

@@ -1,4 +1,4 @@
-import { m as EmailNode } from "./elements-ChJULZlh.js";
+import { m as EmailNode } from "./elements-BzjjnoCS.js";
 import { r as InputSchema } from "./input-schema-7dPFVvNE.js";
 import { StandardJSONSchemaV1 } from "@standard-schema/spec";
 //#region src/template.d.ts
@@ -57,4 +57,4 @@ type TemplateInput<T extends {
 }> = Parameters<T["render"]>[0];
 //#endregion
 export { TemplateRuntime as a, TemplateInput as i, TEMPLATE_NAME_PATTERN as n, defineEmail as o, TemplateDefinition as r, isTemplateDefinition as s, EmailContent as t };
-//# sourceMappingURL=template-G-QPcfmn.d.ts.map
+//# sourceMappingURL=template-DWftqh4x.d.ts.map

package/dist/template.d.ts

@@ -1,2 +1,2 @@
-import { a as TemplateRuntime, i as TemplateInput, n as TEMPLATE_NAME_PATTERN, o as defineEmail, r as TemplateDefinition, s as isTemplateDefinition, t as EmailContent } from "./template-G-QPcfmn.js";
+import { a as TemplateRuntime, i as TemplateInput, n as TEMPLATE_NAME_PATTERN, o as defineEmail, r as TemplateDefinition, s as isTemplateDefinition, t as EmailContent } from "./template-DWftqh4x.js";
 export { EmailContent, TEMPLATE_NAME_PATTERN, TemplateDefinition, TemplateInput, TemplateRuntime, defineEmail, isTemplateDefinition };

package/dist/theme-css.d.ts

@@ -1,4 +1,4 @@
-import { t as Diagnostic } from "./diagnostics-CqepLcpI.js";
+import { t as Diagnostic } from "./diagnostics-OcQKQYSY.js";
 import { o as TokenOverrides } from "./theme-6ApjjiBo.js";
 import { Result } from "better-result";
 //#region src/theme-css.d.ts

package/dist/theme.js

@@ -16,7 +16,30 @@
 * quoted CSS string `\/` is identical to `/`, but the HTML tokenizer no longer
 * matches `<\/style>` as a raw-text end tag.
 */
-const escapeCssString = (value) => value.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/<\//g, "<\\/");
+const escapeCssString = (value) => value.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/[\u0000-\u001f\u007f]/g, (character) => `\\${character.charCodeAt(0).toString(16)} `).replace(/<\//g, "<\\/");
+const FONT_FAMILY_NAME = /^-?[a-zA-Z][a-zA-Z0-9 -]*$/;
+const SINGLE_QUOTED_FONT_FAMILY = /^'[^'\\<\u0000-\u001f\u007f]*'$/;
+const DOUBLE_QUOTED_FONT_FAMILY = /^"[^"\\<\u0000-\u001f\u007f]*"$/;
+const splitFontStack = (value) => {
+	const families = [];
+	let start = 0;
+	let quote;
+	for (let index = 0; index < value.length; index++) {
+		const character = value[index];
+		if (quote !== void 0) {
+			if (character === quote) quote = void 0;
+		} else if (character === "'" || character === "\"") quote = character;
+		else if (character === ",") {
+			families.push(value.slice(start, index).trim());
+			start = index + 1;
+		}
+	}
+	families.push(value.slice(start).trim());
+	return families;
+};
+const safeFontStack = (value) => {
+	return splitFontStack(value).every((family) => FONT_FAMILY_NAME.test(family) || SINGLE_QUOTED_FONT_FAMILY.test(family) || DOUBLE_QUOTED_FONT_FAMILY.test(family)) ? value : `'${escapeCssString(value)}'`;
+};
 /**
 * Flatten persisted font tokens into the compiler's two font fields, so the
 * server (apps/api) and the in-browser canvas (apps/web) produce byte-identical
@@ -31,7 +54,7 @@ const flattenFontTokens = (tokens) => {
 	const fontFamilies = {};
 	const fontFaces = {};
 	for (const [name, token] of Object.entries(tokens)) {
-		fontFamilies[name] = `'${escapeCssString(token.family)}', ${token.fallback}`;
+		fontFamilies[name] = `'${escapeCssString(token.family)}', ${safeFontStack(token.fallback)}`;
 		if (token.faces != null) fontFaces[name] = {
 			family: token.family,
 			faces: token.faces

package/dist/tsx-source-instrumentation.d.ts

@@ -1,7 +1,16 @@
 //#region src/tsx-source-instrumentation.d.ts
 declare const TsxSourceInstrumentationError_base: import("better-result").TaggedErrorClass<"TsxSourceInstrumentationError">;
+/**
+ * The authored TSX could not be instrumented. `location` is the 1-based line
+ * and column the refusal points at, when the parser or the offending attribute
+ * names one.
+ */
 declare class TsxSourceInstrumentationError extends TsxSourceInstrumentationError_base<{
   readonly message: string;
+  readonly location: {
+    readonly line: number;
+    readonly column: number;
+  } | undefined;
   readonly cause?: unknown;
 }> {}
 /**

package/dist/tsx-source-instrumentation.js

@@ -4,6 +4,11 @@ import { buildLineMap, lineColumn } from "./diagnostics.js";
 import { TaggedError } from "better-result";
 import { parse } from "@babel/parser";
 //#region src/tsx-source-instrumentation.ts
+/**
+* The authored TSX could not be instrumented. `location` is the 1-based line
+* and column the refusal points at, when the parser or the offending attribute
+* names one.
+*/
 var TsxSourceInstrumentationError = class extends TaggedError("TsxSourceInstrumentationError") {};
 const isAstNode = (value) => isObject(value) && typeof value.type === "string" && typeof value.start === "number" && typeof value.end === "number";
 const walkAst = (value, visit) => {
@@ -23,6 +28,15 @@ const jsxIdentifier = (value) => {
 	return typeof value.name === "string" ? value.name : void 0;
 };
 const parseErrorMessage = (error) => isObject(error) && typeof error.message === "string" ? error.message : "The authored TSX could not be parsed for preview instrumentation.";
+/** Babel reports a 1-based line and a 0-based column. */
+const parseErrorLocation = (error) => {
+	if (!isObject(error) || !isObject(error.loc)) return void 0;
+	const { line, column } = error.loc;
+	return typeof line === "number" && typeof column === "number" ? {
+		line,
+		column: column + 1
+	} : void 0;
+};
 const marker = (fileName, source, offset, token) => {
 	const position = lineColumn(buildLineMap(source), offset);
 	return ` ${JSX_SOURCE_LOCATION_PROP}={${JSON.stringify({
@@ -53,7 +67,8 @@ const instrumentTsxSourceForPreview = (source, fileName, token, jsxImportSource
 	} catch (error) {
 		throw new TsxSourceInstrumentationError({
 			cause: error,
-			message: parseErrorMessage(error)
+			message: parseErrorMessage(error),
+			location: parseErrorLocation(error)
 		});
 	}
 	const edits = [];
@@ -78,7 +93,10 @@ const instrumentTsxSourceForPreview = (source, fileName, token, jsxImportSource
 		const attributes = openingElement.attributes;
 		if (Array.isArray(attributes)) for (const attribute of attributes) {
 			if (!isAstNode(attribute) || attribute.type !== "JSXAttribute") continue;
-			if (jsxIdentifier(attribute.name) === "__samva_source_location") throw new TsxSourceInstrumentationError({ message: `The reserved JSX prop ${JSX_SOURCE_LOCATION_PROP} cannot be authored directly.` });
+			if (jsxIdentifier(attribute.name) === "__samva_source_location") throw new TsxSourceInstrumentationError({
+				message: `The reserved JSX prop ${JSX_SOURCE_LOCATION_PROP} cannot be authored directly.`,
+				location: lineColumn(buildLineMap(source), attribute.start)
+			});
 		}
 		const closingLength = source.slice(openingElement.end - 2, openingElement.end) === "/>" ? 2 : 1;
 		edits.push({

package/dist/tsx-tracer.d.ts

@@ -1,4 +1,4 @@
-import { a as Span } from "./diagnostics-CqepLcpI.js";
+import { a as Span } from "./diagnostics-OcQKQYSY.js";
 import { SmlOp } from "./ops.js";
 import { Result } from "better-result";
 //#region src/tsx-tracer.d.ts

package/dist/tsx-tracer.js

@@ -3,7 +3,7 @@ import { buildLineMap } from "./diagnostics.js";
 import { SML_TAGS, componentNameForSmlTag, smlTagForComponentName } from "./ast.js";
 import { decodeEntities } from "./lexer.js";
 import { parseSml } from "./parser.js";
-import { applyOps } from "./ops.js";
+import { r as applyOps } from "./ops-2aiiYO7m.js";
 import { Result, TaggedError } from "better-result";
 import { parse } from "@babel/parser";
 //#region src/tsx-tracer.ts
@@ -138,11 +138,11 @@ const headingText = (node) => {
 };
 const parseAuthored = (source) => {
 	try {
-		const parsed = parse(source, {
+		const { program } = parse(source, {
 			plugins: ["typescript", "jsx"],
 			sourceType: "module"
 		});
-		return Result.ok(parsed.program);
+		return isAstNode(program) ? Result.ok(program) : Result.err(diagnostic("tsx-invalid-authored-source", "The authored TSX parsed without a location."));
 	} catch (error) {
 		return Result.err(diagnostic("tsx-invalid-authored-source", error instanceof Error ? error.message : "The authored TSX could not be parsed."));
 	}

package/dist/{variables-BnKs1iqb.d.ts → variables-J_L3qxRa.d.ts}

@@ -1,4 +1,4 @@
-import { r as PredicateAst } from "./predicate-Bmvgw7Ao.js";
+import { r as PredicateAst } from "./predicate-M-05Nd7R.js";
 //#region src/variables.d.ts
 /** Brand carried by every VariableRef, keyed off a private symbol. */
 declare const VARIABLE_REF: unique symbol;
@@ -74,4 +74,4 @@ declare const createVariablesProxy: <T extends Record<string, unknown>>() => {
 };
 //#endregion
 export { VariableKind as a, VariableRefBrand as c, isPredicateRef as d, isVariableRef as f, VARIABLE_REF as i, Variables as l, PREDICATE_REF as n, VariableRecorder as o, printPredicateRef as p, PredicateRef as r, VariableRef as s, CollectedVariable as t, createVariablesProxy as u };
-//# sourceMappingURL=variables-BnKs1iqb.d.ts.map
+//# sourceMappingURL=variables-J_L3qxRa.d.ts.map

package/dist/variables.d.ts

@@ -1,2 +1,2 @@
-import { a as VariableKind, c as VariableRefBrand, d as isPredicateRef, f as isVariableRef, i as VARIABLE_REF, l as Variables, n as PREDICATE_REF, o as VariableRecorder, p as printPredicateRef, r as PredicateRef, s as VariableRef, t as CollectedVariable, u as createVariablesProxy } from "./variables-BnKs1iqb.js";
+import { a as VariableKind, c as VariableRefBrand, d as isPredicateRef, f as isVariableRef, i as VARIABLE_REF, l as Variables, n as PREDICATE_REF, o as VariableRecorder, p as printPredicateRef, r as PredicateRef, s as VariableRef, t as CollectedVariable, u as createVariablesProxy } from "./variables-J_L3qxRa.js";
 export { CollectedVariable, PREDICATE_REF, PredicateRef, VARIABLE_REF, VariableKind, VariableRecorder, VariableRef, VariableRefBrand, Variables, createVariablesProxy, isPredicateRef, isVariableRef, printPredicateRef };

package/dist/variables.js

@@ -1,5 +1,5 @@
 import { t as hasProperty } from "./guards-eV1qLbf2.js";
-import { a as printPredicate } from "./predicate-DwXzmqIY.js";
+import { a as printPredicate } from "./predicate-BI6uRRM-.js";
 //#region src/variables.ts
 const PLACEHOLDER_SPAN = {
 	start: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samva/markup",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Type-safe authoring and compilation primitives for Samva templates",
   "keywords": [
     "email",
@@ -279,16 +279,16 @@
   "devDependencies": {
     "@babel/parser": "^8.0.4",
     "@css-inline/css-inline-wasm": "0.15.0",
-    "@effect/vitest": "4.0.0-rc.112",
+    "@effect/vitest": "4.0.0-rc.117",
     "@types/css-tree": "3.2.0",
     "caniemail": "2.0.2",
     "css-tree": "3.2.1",
-    "effect": "4.0.0-rc.112",
+    "effect": "4.0.0-rc.117",
     "tailwindcss": "^4.3.3",
     "tsdown": "^0.22.13",
     "typescript": "^7.0.2",
     "vitest": "^4.1.11",
-    "zod": "4.5.2"
+    "zod": "4.6.5"
   },
   "peerDependencies": {
     "@babel/parser": "^8.0.4",