@samva/markup 0.4.0 → 0.5.0

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-DwXzmqIY.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-dvJMn-Lo.d.ts}

@@ -1,4 +1,4 @@
-import { r as PresetCategory } from "./catalog-Ck1tAGwO.js";
+import { r as PresetCategory } from "./catalog-Db0UcCTg.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-dvJMn-Lo.d.ts.map

package/dist/{source-locations-BCJQnIfU.d.ts → source-locations-D6Te6Gy1.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-BLybiDxp.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-D6Te6Gy1.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-D6Te6Gy1.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-G-QPcfmn.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-ChJULZlh.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-G-QPcfmn.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-G-QPcfmn.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-CqepLcpI.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/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({

package/dist/tsx-tracer.d.ts

@@ -1,6 +1,6 @@
-import { s as Span } from "./diagnostics-oveE-laV.js";
+import { a as Span } from "./diagnostics-CqepLcpI.js";
 import { SmlOp } from "./ops.js";
-import { Result } from "effect";
+import { Result } from "better-result";
 //#region src/tsx-tracer.d.ts
 /** The closed set of reasons a rendered heading cannot be mapped safely. */
 type TsxHeadingDiagnosticCode = "tsx-invalid-authored-source" | "tsx-invalid-emitted-source" | "tsx-target-not-found" | "tsx-unsupported-target" | "tsx-ambiguous-target" | "tsx-dynamic-target";
@@ -9,9 +9,7 @@ interface TsxHeadingDiagnostic {
   readonly message: string;
   readonly span: Span;
 }
-declare const TsxHeadingTraceError_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: "TsxHeadingTraceError";
-} & Readonly<A>;
+declare const TsxHeadingTraceError_base: import("better-result").TaggedErrorClass<"TsxHeadingTraceError">;
 declare class TsxHeadingTraceError extends TsxHeadingTraceError_base<{
   readonly diagnostics: ReadonlyArray<TsxHeadingDiagnostic>;
 }> {}
@@ -62,8 +60,8 @@ interface TraceTsxHeadingInput {
 interface ReplaceTsxHeadingTextInput extends TraceTsxHeadingInput {
   readonly text: string;
 }
-type TsxHeadingTrace = Result.Result<TsxHeadingSourceTarget, TsxHeadingTraceError>;
-type TsxHeadingEdit = Result.Result<string, TsxHeadingTraceError>;
+type TsxHeadingTrace = Result<TsxHeadingSourceTarget, TsxHeadingTraceError>;
+type TsxHeadingEdit = Result<string, TsxHeadingTraceError>;
 /** Resolve one rendered Heading to one direct-literal JSX text range. */
 declare const traceTsxHeadingTarget: (input: TraceTsxHeadingInput) => TsxHeadingTrace;
 /** Replace only the mapped literal bytes; all other authored TSX stays untouched. */
@@ -80,9 +78,7 @@ interface TsxSmlDiagnostic {
   readonly message: string;
   readonly span: Span;
 }
-declare const TsxSmlOpsError_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: "TsxSmlOpsError";
-} & Readonly<A>;
+declare const TsxSmlOpsError_base: import("better-result").TaggedErrorClass<"TsxSmlOpsError">;
 declare class TsxSmlOpsError extends TsxSmlOpsError_base<{
   readonly diagnostics: ReadonlyArray<TsxSmlDiagnostic>;
 }> {}
@@ -100,7 +96,7 @@ interface ApplyTsxSmlOpsInput {
   /** SML operations evaluated against the emitted-source id snapshot. */
   readonly ops: ReadonlyArray<SmlOp>;
 }
-type TsxSmlOpsResult = Result.Result<string, TsxSmlOpsError>;
+type TsxSmlOpsResult = Result<string, TsxSmlOpsError>;
 /**
  * Apply semantic editor operations to the authored TSX entry.
  *