@samva/markup 0.4.0 → 0.6.0

package/dist/presets/public-preview-artifacts.js

@@ -3,7 +3,7 @@ import { registerPublicCorpusEntry } from "./corpus.js";
 import { publicTemplates } from "./public-gallery.js";
 import { presetEmailAssets, presetEmailFixtures, presetModuleSource } from "./sources.js";
 import { publicTemplatePreviews } from "./public-preview.js";
-import { Result } from "effect";
+import { Result } from "better-result";
 //#region presets/public-preview-artifacts.ts
 const renderFrames = [
 	{
@@ -50,15 +50,15 @@ const buildPublicTemplatePreviewArtifact = (template) => {
 		corpus: template.corpus,
 		facets: template.facets
 	});
-	if (Result.isFailure(registration)) return Result.fail({
+	if (Result.isError(registration)) return Result.err({
 		presetId: template.presetId,
-		message: `public corpus registration failed: ${registration.failure.message}`
+		message: `public corpus registration failed: ${registration.error.message}`
 	});
 	const source = presetModuleSource(template.presetId);
 	const fixture = presetEmailFixtures[template.presetId]?.default;
 	const preset = presetCatalog.find((entry) => entry.id === template.presetId);
 	const preview = publicTemplatePreviews[template.presetId];
-	if (source === void 0 || preset === void 0 || fixture === void 0) return Result.fail({
+	if (source === void 0 || preset === void 0 || fixture === void 0) return Result.err({
 		presetId: template.presetId,
 		message: "canonical preset source is missing"
 	});
@@ -66,13 +66,13 @@ const buildPublicTemplatePreviewArtifact = (template) => {
 	const assets = new Set(presetEmailAssets[template.presetId]);
 	for (const asset of preview.assets) {
 		const value = sampleData[asset.variable];
-		if (typeof value !== "string") return Result.fail({
+		if (typeof value !== "string") return Result.err({
 			presetId: template.presetId,
 			message: `sample data is missing a string asset: ${asset.variable}`
 		});
 		assets.add(value);
 	}
-	return Result.succeed({
+	return Result.ok({
 		presetId: template.presetId,
 		slug: template.slug,
 		subject: fixture.subject,
@@ -80,6 +80,7 @@ const buildPublicTemplatePreviewArtifact = (template) => {
 		quality: preview.quality,
 		source,
 		html: fixture.html,
+		text: fixture.text,
 		assets: [...assets],
 		renders: renderInputs(template.slug, fixture.html)
 	});
@@ -90,10 +91,10 @@ const buildPublicTemplatePreviewArtifactsFor = (templates) => {
 	const issues = [];
 	for (const template of templates) {
 		const artifact = buildPublicTemplatePreviewArtifact(template);
-		if (Result.isSuccess(artifact)) artifacts.push(artifact.success);
-		else issues.push(artifact.failure);
+		if (Result.isOk(artifact)) artifacts.push(artifact.value);
+		else issues.push(artifact.error);
 	}
-	return issues.length > 0 ? Result.fail(issues) : Result.succeed(artifacts);
+	return issues.length > 0 ? Result.err(issues) : Result.ok(artifacts);
 };
 /** Build the complete canonical public gallery. */
 const buildPublicTemplatePreviewArtifacts = () => buildPublicTemplatePreviewArtifactsFor(publicTemplates);

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-C_xgl6hz.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-Ck1tAGwO.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 { w as SmlDocument } from "./ast-63I-VLQx.js";
+import { b as SmlDocument } from "./ast-BrDtApwS.js";
 //#region src/printer.d.ts
 declare const printSml: (document: SmlDocument) => string;
 //#endregion

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

@@ -1,27 +1,38 @@
+import { n as isObject } from "./guards-eV1qLbf2.js";
 import { EmailNode, drainEmailDiagnostics } from "./email/jsx-runtime.js";
 import { declarationValue, kebab, serializeEmailHtml } from "./email/html.js";
 import { PREHEADER_ATTRIBUTE, preheaderNode } from "./email/components.js";
 import { EmailCompileError, hasBlockingDiagnostic } from "./email/diagnostics.js";
 import { snapshotStylesheets } from "./email/stylesheets.js";
 import { deriveEmailText } from "./email/text.js";
-import { Predicate } from "effect";
 //#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
@@ -276,7 +293,7 @@ const compareRank = (left, right) => {
 const outranks = (left, right) => compareRank(left, right) >= 0;
 /** An authored `style` object becomes declarations with the same normalization the serializer uses. */
 const inlineDeclarations = (style) => {
-	if (!Predicate.isObject(style) || Array.isArray(style)) return [];
+	if (!isObject(style) || Array.isArray(style)) return [];
 	const output = [];
 	for (const [property, value] of Object.entries(style)) {
 		if (value === void 0 || value === null) continue;
@@ -344,7 +361,7 @@ const applyStylesheet = (root, sheet, options = {}) => {
 	const visitChildren = (children, ancestry, variables, writing) => {
 		const previous = [];
 		const visit = (nodes) => nodes.map((child) => {
-			if (child._tag === "Element") {
+			if (child.type === "Element") {
 				const result = applyTo(child, {
 					element: child,
 					parent: ancestry,
@@ -353,7 +370,7 @@ const applyStylesheet = (root, sheet, options = {}) => {
 				previous.push(child);
 				return result;
 			}
-			if (child._tag === "Fragment") return EmailNode.Fragment({ children: visit(child.children) });
+			if (child.type === "Fragment") return EmailNode.Fragment({ children: visit(child.children) });
 			return child;
 		});
 		return visit(children);
@@ -419,11 +436,11 @@ const applyStylesheet = (root, sheet, options = {}) => {
 			children: visitChildren(element.children, ancestry, variables, writing)
 		});
 	};
-	const tree = root._tag === "Element" ? applyTo(root, {
+	const tree = root.type === "Element" ? applyTo(root, {
 		element: root,
 		parent: void 0,
 		previous: []
-	}, sheet.variables, horizontalWriting) : root._tag === "Fragment" ? EmailNode.Fragment({ children: visitChildren(root.children, void 0, sheet.variables, horizontalWriting) }) : root;
+	}, sheet.variables, horizontalWriting) : root.type === "Fragment" ? EmailNode.Fragment({ children: visitChildren(root.children, void 0, sheet.variables, horizontalWriting) }) : root;
 	for (const [name, origins] of unmatched) diagnostics.push({
 		code: "unmatched-class",
 		severity: "warning",
@@ -457,7 +474,7 @@ const compileEmail = (node, options = {}) => {
 };
 /** The preview text already present in the tree, from `<Email preheader>`. */
 const declaredPreheader = (node) => {
-	switch (node._tag) {
+	switch (node.type) {
 		case "Text":
 		case "Raw": return;
 		case "Fragment": return node.children.reduce((found, child) => found ?? declaredPreheader(child), void 0);
@@ -471,14 +488,14 @@ const declaredPreheader = (node) => {
 /** Put the hidden preview block first inside `<body>`, or first overall when there is no shell. */
 const withPreheader = (node, text) => {
 	const insert = (current) => {
-		if (current._tag === "Fragment") {
+		if (current.type === "Fragment") {
 			for (const [index, child] of current.children.entries()) {
 				const replaced = insert(child);
 				if (replaced !== void 0) return EmailNode.Fragment({ children: current.children.with(index, replaced) });
 			}
 			return;
 		}
-		if (current._tag !== "Element") return void 0;
+		if (current.type !== "Element") return void 0;
 		if (current.tag === "body") return EmailNode.Element({
 			...current,
 			children: [preheaderNode(text), ...current.children]
@@ -496,14 +513,14 @@ const withPreheader = (node, text) => {
 /** Put the retained rules in a `<style>` at the end of `<head>`. */
 const withHeadCss = (node, css) => {
 	const insert = (current) => {
-		if (current._tag === "Fragment") {
+		if (current.type === "Fragment") {
 			for (const [index, child] of current.children.entries()) {
 				const replaced = insert(child);
 				if (replaced !== void 0) return EmailNode.Fragment({ children: current.children.with(index, replaced) });
 			}
 			return;
 		}
-		if (current._tag !== "Element") return void 0;
+		if (current.type !== "Element") return void 0;
 		if (current.tag === "head") return EmailNode.Element({
 			...current,
 			children: [...current.children, EmailNode.Element({
@@ -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-ykQhtMs_.js.map
+//# sourceMappingURL=render-aaJBnsXK.js.map

package/dist/render-template.d.ts

@@ -1,9 +1,9 @@
-import { o as SmlParseError } from "./diagnostics-oveE-laV.js";
-import { w as SmlDocument } from "./ast-63I-VLQx.js";
-import { c as UnboundTemplateSourceLocations } from "./source-locations-BCJQnIfU.js";
-import { a as VariableKind, l as Variables } from "./variables-if1VrV34.js";
-import { a as JsxResult } from "./jsx-runtime-C5k_Zq0A.js";
-import { Result } from "effect";
+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
 /**
  * A template is a named function of the recording proxy returning the draft
@@ -39,7 +39,7 @@ interface RenderedTemplate {
  * that is a programmer error in the user's build, so it propagates rather than
  * becoming a diagnostic.
  */
-declare const renderTemplate: <T extends Record<string, unknown>>(template: Template<T>) => Result.Result<RenderedTemplate, SmlParseError>;
+declare const renderTemplate: <T extends Record<string, unknown>>(template: Template<T>) => Result<RenderedTemplate, SmlParseError>;
 //#endregion
 export { RenderedTemplate, Template, TemplateVariable, renderTemplate };
 //# sourceMappingURL=render-template.d.ts.map

package/dist/render-template.js

@@ -1,10 +1,10 @@
 import { mapJsxSourceLocations } from "./source-locations.js";
-import { i as parsePredicate, n as collectPredicateVariables } from "./predicate-CvkzT-a2.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";
 import { printSml } from "./printer.js";
-import { Result } from "effect";
+import { Result } from "better-result";
 //#region src/render-template.ts
 /**
 * Runs a template function and returns its canonical document, source, and
@@ -23,9 +23,9 @@ const renderTemplate = (template) => {
 		root
 	});
 	const parsed = parseSml(source);
-	if (Result.isFailure(parsed)) return Result.fail(parsed.failure);
-	const document = parsed.success;
-	return Result.succeed({
+	if (Result.isError(parsed)) return Result.err(parsed.error);
+	const document = parsed.value;
+	return Result.ok({
 		document,
 		source,
 		variables: collectVariableSchema(document, recorder),
@@ -52,7 +52,7 @@ const collectVariableSchema = (document, recorder) => {
 			if (attribute.value.kind !== "string") continue;
 			if (node.tag === "If" && attribute.name === "test") {
 				const parsed = parsePredicate(attribute.value.value, 0);
-				if (Result.isSuccess(parsed)) for (const name of collectPredicateVariables(parsed.success)) (insideIf ? conditional : unconditional).add(name);
+				if (Result.isOk(parsed)) for (const name of collectPredicateVariables(parsed.value)) (insideIf ? conditional : unconditional).add(name);
 				continue;
 			}
 			for (const match of attribute.value.value.matchAll(INTERPOLATION_PATTERN)) {

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

@@ -1,4 +1,4 @@
-import { r as PresetCategory } from "./catalog-Ck1tAGwO.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-C_xgl6hz.d.ts.map
+//# sourceMappingURL=showcase-DGZAWn4Z.d.ts.map

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

@@ -1,5 +1,4 @@
-import { E as SmlNode, m as ElementNode } from "./ast-63I-VLQx.js";
-import { Schema } from "effect";
+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
@@ -17,14 +16,6 @@ interface JsxSourceLocation {
   readonly lineNumber: number;
   readonly columnNumber: number;
 }
-/** JSON-safe source location shape shared by preview and editor contracts. */
-declare const JsxSourceLocation: Schema.Struct<{
-  readonly fileName: Schema.String;
-  readonly lineNumber: Schema.Int;
-  readonly columnNumber: Schema.Int;
-}>;
-/** Reasons a preview cannot safely expose an authored source map. */
-declare const SourceLocationUnavailableReason: Schema.Literals<readonly ["no-source-metadata", "structure-mismatch", "duplicate-source-origin", "render-failed", "stale-preview"]>;
 /**
  * Runtime-only carrier for JSX source metadata. It is global so separately
  * bundled `jsx-dev-runtime` and `render-template` entries still agree on the
@@ -38,7 +29,7 @@ declare const JSX_SOURCE_LOCATION_PROP: "__samva_source_location";
  * currently provide no source metadata, so that path reports a typed absence
  * rather than guessing from output order.
  */
-type SourceLocationUnavailableReason = typeof SourceLocationUnavailableReason.Type;
+type SourceLocationUnavailableReason = "no-source-metadata" | "structure-mismatch" | "duplicate-source-origin" | "render-failed" | "stale-preview";
 type UnboundTemplateSourceLocations = {
   readonly kind: "available";
   /** Parsed SML node id → the JSX origin that produced that element. */
@@ -57,19 +48,6 @@ type TemplateSourceLocations = {
   readonly kind: "unavailable";
   readonly reason: SourceLocationUnavailableReason;
 };
-/** JSON-safe schema for a parsed-node-id → JSX-origin map. */
-declare const TemplateSourceLocationsSchema: Schema.Union<readonly [Schema.Struct<{
-  readonly kind: Schema.Literal<"available">;
-  readonly revision: Schema.String;
-  readonly byNodeId: Schema.$Record<Schema.String, Schema.Struct<{
-    readonly fileName: Schema.String;
-    readonly lineNumber: Schema.Int;
-    readonly columnNumber: Schema.Int;
-  }>>;
-}>, Schema.Struct<{
-  readonly kind: Schema.Literal<"unavailable">;
-  readonly reason: Schema.Literals<readonly ["no-source-metadata", "structure-mismatch", "duplicate-source-origin", "render-failed", "stale-preview"]>;
-}>]>;
 /** Normalize the optional payload accepted by `jsxDEV`. */
 declare const completeJsxSourceLocation: (source: JsxSource | null | undefined) => JsxSourceLocation | undefined;
 /** Attach a source origin without changing the serialized draft shape. */
@@ -85,5 +63,5 @@ declare const mapJsxSourceLocations: (draft: ElementNode, parsed: ElementNode) =
 /** Compare source-map statuses for the emission determinism guard. */
 declare const sameTemplateSourceLocations: (left: UnboundTemplateSourceLocations, right: UnboundTemplateSourceLocations) => boolean;
 //#endregion
-export { SourceLocationUnavailableReason as a, UnboundTemplateSourceLocations as c, jsxSourceLocationOf as d, mapJsxSourceLocations as f, JsxSourceLocation as i, attachJsxSourceLocation as l, JSX_SOURCE_LOCATION_PROP as n, TemplateSourceLocations as o, sameTemplateSourceLocations as p, JsxSource as r, TemplateSourceLocationsSchema as s, JSX_SOURCE_LOCATION as t, completeJsxSourceLocation as u };
-//# sourceMappingURL=source-locations-BCJQnIfU.d.ts.map
+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-DrCM82Ym.d.ts.map

package/dist/source-locations.d.ts

@@ -1,2 +1,2 @@
-import { a as SourceLocationUnavailableReason, c as UnboundTemplateSourceLocations, d as jsxSourceLocationOf, f as mapJsxSourceLocations, i as JsxSourceLocation, l as attachJsxSourceLocation, n as JSX_SOURCE_LOCATION_PROP, o as TemplateSourceLocations, p as sameTemplateSourceLocations, r as JsxSource, s as TemplateSourceLocationsSchema, t as JSX_SOURCE_LOCATION, u as completeJsxSourceLocation } from "./source-locations-BCJQnIfU.js";
-export { JSX_SOURCE_LOCATION, JSX_SOURCE_LOCATION_PROP, JsxSource, JsxSourceLocation, SourceLocationUnavailableReason, TemplateSourceLocations, TemplateSourceLocationsSchema, UnboundTemplateSourceLocations, attachJsxSourceLocation, completeJsxSourceLocation, jsxSourceLocationOf, mapJsxSourceLocations, sameTemplateSourceLocations };
+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/source-locations.js

@@ -1,19 +1,5 @@
-import { Predicate, Schema } from "effect";
+import { t as hasProperty } from "./guards-eV1qLbf2.js";
 //#region src/source-locations.ts
-/** JSON-safe source location shape shared by preview and editor contracts. */
-const JsxSourceLocation = Schema.Struct({
-	fileName: Schema.String,
-	lineNumber: Schema.Int.check(Schema.isGreaterThanOrEqualTo(1)),
-	columnNumber: Schema.Int.check(Schema.isGreaterThanOrEqualTo(1))
-});
-/** Reasons a preview cannot safely expose an authored source map. */
-const SourceLocationUnavailableReason = Schema.Literals([
-	"no-source-metadata",
-	"structure-mismatch",
-	"duplicate-source-origin",
-	"render-failed",
-	"stale-preview"
-]);
 /**
 * Runtime-only carrier for JSX source metadata. It is global so separately
 * bundled `jsx-dev-runtime` and `render-template` entries still agree on the
@@ -22,15 +8,6 @@ const SourceLocationUnavailableReason = Schema.Literals([
 const JSX_SOURCE_LOCATION = Symbol.for("@samva/markup/jsx-source-location");
 /** Internal JSX prop used only by an editor preview source transform. */
 const JSX_SOURCE_LOCATION_PROP = "__samva_source_location";
-/** JSON-safe schema for a parsed-node-id → JSX-origin map. */
-const TemplateSourceLocationsSchema = Schema.Union([Schema.Struct({
-	kind: Schema.Literal("available"),
-	revision: Schema.String,
-	byNodeId: Schema.Record(Schema.String, JsxSourceLocation)
-}), Schema.Struct({
-	kind: Schema.Literal("unavailable"),
-	reason: SourceLocationUnavailableReason
-})]);
 /** Normalize the optional payload accepted by `jsxDEV`. */
 const completeJsxSourceLocation = (source) => {
 	if (source?.fileName === void 0 || source.lineNumber === void 0 || source.columnNumber === void 0) return;
@@ -50,7 +27,7 @@ const attachJsxSourceLocation = (node, source) => {
 		writable: false
 	});
 };
-const isJsxSourceLocation = (value) => Predicate.hasProperty(value, "fileName") && typeof value.fileName === "string" && Predicate.hasProperty(value, "lineNumber") && typeof value.lineNumber === "number" && Number.isInteger(value.lineNumber) && Predicate.hasProperty(value, "columnNumber") && typeof value.columnNumber === "number" && Number.isInteger(value.columnNumber);
+const isJsxSourceLocation = (value) => hasProperty(value, "fileName") && typeof value.fileName === "string" && hasProperty(value, "lineNumber") && typeof value.lineNumber === "number" && Number.isInteger(value.lineNumber) && hasProperty(value, "columnNumber") && typeof value.columnNumber === "number" && Number.isInteger(value.columnNumber);
 /** Read the ephemeral origin, if this draft element has one. */
 const jsxSourceLocationOf = (node) => {
 	if (node.kind !== "element") return void 0;
@@ -120,6 +97,6 @@ const sameTemplateSourceLocations = (left, right) => {
 	return true;
 };
 //#endregion
-export { JSX_SOURCE_LOCATION, JSX_SOURCE_LOCATION_PROP, JsxSourceLocation, SourceLocationUnavailableReason, TemplateSourceLocationsSchema, attachJsxSourceLocation, completeJsxSourceLocation, jsxSourceLocationOf, mapJsxSourceLocations, sameTemplateSourceLocations };
+export { JSX_SOURCE_LOCATION, JSX_SOURCE_LOCATION_PROP, attachJsxSourceLocation, completeJsxSourceLocation, jsxSourceLocationOf, mapJsxSourceLocations, sameTemplateSourceLocations };
 
 //# sourceMappingURL=source-locations.js.map

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

@@ -1,6 +1,6 @@
-import { m as EmailNode } from "./elements-DtwKlFVH.js";
-import { r as InputSchema } from "./input-schema-BIfzI63B.js";
-import { StandardJSONSchemaV1 } from "effect/StandardSchema";
+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
 /** One actual-input render owns all of a message's authored content. */
 interface EmailContent {
@@ -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-Dy5yOPyp.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-Dy5yOPyp.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/template.js

@@ -1,8 +1,8 @@
-import { inputSchema } from "./input-schema.js";
-import { Predicate } from "effect";
+import { n as isObject } from "./guards-eV1qLbf2.js";
+import { n as inputSchema } from "./input-schema-zjkgrXn2.js";
 //#region src/template.ts
 /** Classify an evaluated module export without executing helpers as templates. */
-const isTemplateDefinition = (value) => Predicate.isObject(value) && typeof value.id === "string" && typeof value.render === "function" && Predicate.isObject(value.schema);
+const isTemplateDefinition = (value) => isObject(value) && typeof value.id === "string" && typeof value.render === "function" && isObject(value.schema);
 /**
 * The one naming contract for a template id and a fixture key: a letter, a digit or `_` first,
 * then those plus `.`, `_` and `-`.

package/dist/theme-css.d.ts

@@ -1,6 +1,6 @@
-import { t as Diagnostic } from "./diagnostics-oveE-laV.js";
+import { t as Diagnostic } from "./diagnostics-OcQKQYSY.js";
 import { o as TokenOverrides } from "./theme-6ApjjiBo.js";
-import { Result } from "effect";
+import { Result } from "better-result";
 //#region src/theme-css.d.ts
 /**
  * `TokenOverrides` plus `tracking`. The compiler's `TokenOverrides` names its
@@ -12,7 +12,7 @@ interface ParsedTheme extends TokenOverrides {
   /** tracking-{name} → letter-spacing in em (negative allowed). */
   readonly tracking?: Readonly<Record<string, number>> | undefined;
 }
-declare const parseThemeCss: (css: string) => Result.Result<ParsedTheme, ReadonlyArray<Diagnostic>>;
+declare const parseThemeCss: (css: string) => Result<ParsedTheme, ReadonlyArray<Diagnostic>>;
 /**
  * Serialize a ParsedTheme to `@theme` CSS. Light tokens go in the top-level
  * `@theme` block; `colorsDark` (colors-only, matching the parser) goes in the

package/dist/theme-css.js

@@ -1,4 +1,4 @@
-import { Result } from "effect";
+import { Result } from "better-result";
 //#region src/theme-css.ts
 const CHAR_TAB = 9;
 const CHAR_LINE_FEED = 10;
@@ -441,7 +441,7 @@ const parseThemeCss = (css) => {
 		start: 0,
 		end: Math.min(1, length)
 	});
-	if (diagnostics.length > 0) return Result.fail(diagnostics);
+	if (diagnostics.length > 0) return Result.err(diagnostics);
 	const nonEmpty = (entries) => Object.keys(entries).length > 0 ? entries : void 0;
 	const colors = nonEmpty(accumulator.colors);
 	const colorsDark = nonEmpty(accumulator.colorsDark);
@@ -452,7 +452,7 @@ const parseThemeCss = (css) => {
 	const fontFamilies = nonEmpty(accumulator.fontFamilies);
 	const containerPx = nonEmpty(accumulator.containerPx);
 	const tracking = nonEmpty(accumulator.tracking);
-	return Result.succeed({
+	return Result.ok({
 		colors,
 		colorsDark,
 		spacingPx: accumulator.spacingPx,

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,5 @@
 //#region src/tsx-source-instrumentation.d.ts
-declare const TsxSourceInstrumentationError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
-  readonly _tag: "TsxSourceInstrumentationError";
-} & Readonly<A>;
+declare const TsxSourceInstrumentationError_base: import("better-result").TaggedErrorClass<"TsxSourceInstrumentationError">;
 declare class TsxSourceInstrumentationError extends TsxSourceInstrumentationError_base<{
   readonly message: string;
   readonly cause?: unknown;

package/dist/tsx-source-instrumentation.js

@@ -1,17 +1,17 @@
+import { n as isObject } from "./guards-eV1qLbf2.js";
 import { JSX_SOURCE_LOCATION_PROP } from "./source-locations.js";
 import { buildLineMap, lineColumn } from "./diagnostics.js";
-import { Data, Predicate } from "effect";
+import { TaggedError } from "better-result";
 import { parse } from "@babel/parser";
 //#region src/tsx-source-instrumentation.ts
-var TsxSourceInstrumentationError = class extends Data.TaggedError("TsxSourceInstrumentationError") {};
-const isRecord = (value) => Predicate.isObject(value) && !Array.isArray(value);
-const isAstNode = (value) => isRecord(value) && typeof value.type === "string" && typeof value.start === "number" && typeof value.end === "number";
+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) => {
 	if (Array.isArray(value)) {
 		for (const item of value) walkAst(item, visit);
 		return;
 	}
-	if (!isRecord(value)) return;
+	if (!isObject(value)) return;
 	if (isAstNode(value)) visit(value);
 	for (const [key, child] of Object.entries(value)) {
 		if (key === "loc" || key === "extra" || key === "comments" || key === "tokens") continue;
@@ -22,7 +22,7 @@ const jsxIdentifier = (value) => {
 	if (!isAstNode(value) || value.type !== "JSXIdentifier") return void 0;
 	return typeof value.name === "string" ? value.name : void 0;
 };
-const parseErrorMessage = (error) => isRecord(error) && typeof error.message === "string" ? error.message : "The authored TSX could not be parsed for preview instrumentation.";
+const parseErrorMessage = (error) => isObject(error) && typeof error.message === "string" ? error.message : "The authored TSX could not be parsed for preview instrumentation.";
 const marker = (fileName, source, offset, token) => {
 	const position = lineColumn(buildLineMap(source), offset);
 	return ` ${JSX_SOURCE_LOCATION_PROP}={${JSON.stringify({