@samva/markup 0.9.0 → 0.10.0

package/dist/{elements-cqldpaJt.d.ts → jsx-runtime-ylIOnaSf.d.ts}

@@ -1,77 +1,5 @@
 import { r as JsxSourceLocation } from "./source-locations-C8wCsiAy.js";
 import { r as EmailDiagnostic } from "./diagnostics-B-Gym34R.js";
-//#region src/email/jsx-runtime.d.ts
-/** Derived authoring tree; source stays canonical. Origins run from inner element to component call sites. */
-type EmailNode = {
-  readonly type: "Text";
-  readonly value: string;
-} | {
-  readonly type: "Element";
-  readonly tag: string;
-  readonly props: Readonly<Record<string, unknown>>;
-  readonly children: readonly EmailNode[];
-  readonly origins: readonly JsxSourceLocation[];
-  /**
-   * True when this element is written at `origins[0]`; false when a compiler
-   * primitive generated it and `origins[0]` is the call site that asked for
-   * it. Both point at the same authoring target, but only an authored element
-   * can have its own props edited there.
-   */
-  readonly authored: boolean;
-} | {
-  readonly type: "Fragment";
-  readonly children: readonly EmailNode[];
-} |
-/**
- * Compatibility markup a compiler primitive emits verbatim — conditional
- * comments and VML. Only the primitives in `./components` construct it;
- * nothing an author passes as a string reaches this node.
- */
-{
-  readonly type: "Raw";
-  readonly html: string;
-  readonly text: string;
-  readonly origins: readonly JsxSourceLocation[];
-};
-type EmailNodeOf<Type extends EmailNode["type"]> = Extract<EmailNode, {
-  readonly type: Type;
-}>;
-type EmailNodeFields<Type extends EmailNode["type"]> = Omit<EmailNodeOf<Type>, "type">;
-/** Constructors for the authoring tree. The tree is data; nothing here validates it. */
-declare const EmailNode: {
-  readonly Text: (fields: EmailNodeFields<"Text">) => EmailNodeOf<"Text">;
-  readonly Element: (fields: EmailNodeFields<"Element">) => EmailNodeOf<"Element">;
-  readonly Fragment: (fields: EmailNodeFields<"Fragment">) => EmailNodeOf<"Fragment">;
-  readonly Raw: (fields: EmailNodeFields<"Raw">) => EmailNodeOf<"Raw">;
-};
-type EmailChild = EmailNode | string | number | boolean | null | undefined | readonly EmailChild[];
-type EmailComponent<P = never> = (props: P) => EmailChild;
-declare const Fragment: unique symbol;
-/** Call sites enclosing the element being built, innermost first. */
-declare const currentEmailOrigins: () => readonly JsxSourceLocation[];
-/** Record a finding from inside a compiler primitive, located at the authoring call site. */
-declare const reportEmailDiagnostic: (diagnostic: Omit<EmailDiagnostic, "origins">) => void;
-/** Take and clear the findings primitives reported during a render. */
-declare const drainEmailDiagnostics: () => readonly EmailDiagnostic[];
-/** Normalize actual values without interpolation or recording proxies. */
-declare const normalizeChildren: (input: unknown) => EmailNode[];
-/** Compatibility markup emitted by a compiler primitive, with the text it stands for. */
-declare const rawMarkup: (html: string, text?: string) => EmailNode;
-/** Automatic JSX factory for ordinary HTML and synchronous imported components. */
-declare const jsx: (type: string | EmailComponent<Record<string, unknown>> | typeof Fragment, props: Record<string, unknown> | null) => EmailNode;
-declare const jsxs: typeof jsx;
-declare namespace JSX {
-  type Element = EmailNode;
-  type ElementType = string | EmailComponent | typeof Fragment;
-  interface ElementChildrenAttribute {
-    readonly children: object;
-  }
-  interface IntrinsicAttributes {
-    readonly key?: string | number | undefined;
-  }
-  interface IntrinsicElements extends EmailIntrinsicElements {}
-}
-//#endregion
 //#region src/email/elements.d.ts
 /** How one attribute is spelled and what values it accepts. */
 interface EmailAttributeSpec {
@@ -695,5 +623,77 @@ type ChildrenProp<Content extends EmailElementSpec["content"]> = Content extends
 /** Props each supported tag accepts, derived from `EMAIL_ELEMENTS`. */
 type EmailIntrinsicElements = { readonly [Tag in EmailTag]: EmailGlobalProps & AttributeProps<typeof EMAIL_GLOBAL_ATTRIBUTES> & AttributeProps<(typeof EMAIL_ELEMENTS)[Tag]["attributes"]> & ChildrenProp<(typeof EMAIL_ELEMENTS)[Tag]["content"]>; };
 //#endregion
-export { reportEmailDiagnostic as C, rawMarkup as S, currentEmailOrigins as _, EmailGlobalProps as a, jsxs as b, EmailStyle as c, isUrlAttribute as d, EmailChild as f, JSX as g, Fragment as h, EmailElementSpec as i, EmailTag as l, EmailNode as m, EMAIL_GLOBAL_ATTRIBUTES as n, EmailIntrinsicElements as o, EmailComponent as p, EmailAttributeSpec as r, EmailLayout as s, EMAIL_ELEMENTS as t, emailElement as u, drainEmailDiagnostics as v, normalizeChildren as x, jsx as y };
-//# sourceMappingURL=elements-cqldpaJt.d.ts.map
+//#region src/email/jsx-runtime.d.ts
+/** Derived authoring tree; source stays canonical. Origins run from inner element to component call sites. */
+type EmailNode = {
+  readonly type: "Text";
+  readonly value: string;
+} | {
+  readonly type: "Element";
+  readonly tag: string;
+  readonly props: Readonly<Record<string, unknown>>;
+  readonly children: readonly EmailNode[];
+  readonly origins: readonly JsxSourceLocation[];
+  /**
+   * True when this element is written at `origins[0]`; false when a compiler
+   * primitive generated it and `origins[0]` is the call site that asked for
+   * it. Both point at the same authoring target, but only an authored element
+   * can have its own props edited there.
+   */
+  readonly authored: boolean;
+} | {
+  readonly type: "Fragment";
+  readonly children: readonly EmailNode[];
+} |
+/**
+ * Compatibility markup a compiler primitive emits verbatim — conditional
+ * comments and VML. Only the primitives in `./components` construct it;
+ * nothing an author passes as a string reaches this node.
+ */
+{
+  readonly type: "Raw";
+  readonly html: string;
+  readonly text: string;
+  readonly origins: readonly JsxSourceLocation[];
+};
+type EmailNodeOf<Type extends EmailNode["type"]> = Extract<EmailNode, {
+  readonly type: Type;
+}>;
+type EmailNodeFields<Type extends EmailNode["type"]> = Omit<EmailNodeOf<Type>, "type">;
+/** Constructors for the authoring tree. The tree is data; nothing here validates it. */
+declare const EmailNode: {
+  readonly Text: (fields: EmailNodeFields<"Text">) => EmailNodeOf<"Text">;
+  readonly Element: (fields: EmailNodeFields<"Element">) => EmailNodeOf<"Element">;
+  readonly Fragment: (fields: EmailNodeFields<"Fragment">) => EmailNodeOf<"Fragment">;
+  readonly Raw: (fields: EmailNodeFields<"Raw">) => EmailNodeOf<"Raw">;
+};
+type EmailChild = EmailNode | string | number | boolean | null | undefined | readonly EmailChild[];
+type EmailComponent<P = never> = (props: P) => EmailChild;
+declare const Fragment: unique symbol;
+/** Call sites enclosing the element being built, innermost first. */
+declare const currentEmailOrigins: () => readonly JsxSourceLocation[];
+/** Record a finding from inside a compiler primitive, located at the authoring call site. */
+declare const reportEmailDiagnostic: (diagnostic: Omit<EmailDiagnostic, "origins">) => void;
+/** Take and clear the findings primitives reported during a render. */
+declare const drainEmailDiagnostics: () => readonly EmailDiagnostic[];
+/** Normalize actual values without interpolation or recording proxies. */
+declare const normalizeChildren: (input: unknown) => EmailNode[];
+/** Compatibility markup emitted by a compiler primitive, with the text it stands for. */
+declare const rawMarkup: (html: string, text?: string) => EmailNode;
+/** Automatic JSX factory for ordinary HTML and synchronous imported components. */
+declare const jsx: (type: string | EmailComponent<Record<string, unknown>> | typeof Fragment, props: Record<string, unknown> | null) => EmailNode;
+declare const jsxs: typeof jsx;
+declare namespace JSX {
+  type Element = EmailNode;
+  type ElementType = string | EmailComponent | typeof Fragment;
+  interface ElementChildrenAttribute {
+    readonly children: object;
+  }
+  interface IntrinsicAttributes {
+    readonly key?: string | number | undefined;
+  }
+  interface IntrinsicElements extends EmailIntrinsicElements {}
+}
+//#endregion
+export { isUrlAttribute as C, emailElement as S, EmailGlobalProps as _, JSX as a, EmailStyle as b, jsx as c, rawMarkup as d, reportEmailDiagnostic as f, EmailElementSpec as g, EmailAttributeSpec as h, Fragment as i, jsxs as l, EMAIL_GLOBAL_ATTRIBUTES as m, EmailComponent as n, currentEmailOrigins as o, EMAIL_ELEMENTS as p, EmailNode as r, drainEmailDiagnostics as s, EmailChild as t, normalizeChildren as u, EmailIntrinsicElements as v, EmailTag as x, EmailLayout as y };
+//# sourceMappingURL=jsx-runtime-ylIOnaSf.d.ts.map

package/dist/{profile-BH-OtdDA.js → profile-pWGtWZXF.js}

@@ -1,20 +1,119 @@
 import { n as isObject } from "./guards-eV1qLbf2.js";
 import { n as inputSchema, r as jsonSchema } from "./input-schema-zjkgrXn2.js";
-import { TEMPLATE_ID_PATTERN, TEMPLATE_NAME_PATTERN } from "./template.js";
-import { FORMATTER_NAMES } from "./fmt.js";
-import { isAssetPath } from "./email/assets.js";
-import { buildLineMap, lineColumn } from "./diagnostics.js";
+import { n as TEMPLATE_NAME_PATTERN, t as TEMPLATE_ID_PATTERN } from "./template-zLUjcwfF.js";
 import { n as RESERVED_FOOTER_ATTRIBUTES, t as BRAND_FOOTER_MARKER } from "./unsubscribe-link-CoesnQDU.js";
-import { EmailNode, drainEmailDiagnostics } from "./email/jsx-runtime.js";
-import { brandComponents } from "./email/brand.js";
-import { t as applyStylesheet } from "./cascade-t6kxlgEI.js";
-import { i as resolveFromDirectory, r as projectDirectory } from "./theme-imports-lvBw3AD1.js";
-import "./ir.js";
-import { a as WHATSAPP_HEADER_TYPES, i as WHATSAPP_CATEGORIES, n as SMS_CATEGORIES, r as WHATSAPP_ATTRIBUTES, t as SMS_ATTRIBUTES } from "./channel-specs-B6M_HlaV.js";
-import { EMAIL_ELEMENTS, emailElement } from "./email/elements.js";
-import { checkAttribute, serializeStyle } from "./email/html.js";
-import { Button, Column, Columns, Divider, Email, Image, Link, Section, Spacer, equalColumnWidth } from "./email/components.js";
-import { parse } from "@babel/parser";
+import { M as EMAIL_ELEMENTS, P as emailElement, a as Email, d as equalColumnWidth, i as Divider, l as Section, n as Column, o as Image, p as checkAttribute, r as Columns, s as Link, t as Button, u as Spacer, y as serializeStyle } from "./components-BZCqegS8.js";
+import { FORMATTER_NAMES } from "./fmt.js";
+import { i as drainEmailDiagnostics, t as EmailNode } from "./jsx-runtime-CBlexoeR.js";
+import { n as applyStylesheet } from "./ir-CLhlklKV.js";
+import { i as lineColumn, t as buildLineMap } from "./diagnostic-model-DJtqbETd.js";
+import { d as isAssetPath, i as brandComponents } from "./brand-C0MKTwmX.js";
+import { parse } from "css-tree";
+import { parse as parse$1 } from "@babel/parser";
+//#region src/email/theme-imports.ts
+/** The CSS and TSX specifier a template uses to reach its organization's brand. */
+const BRAND_SPECIFIER = "samva:brand";
+const BRAND_IMPORT = /^samva:brand(?:\/([a-z0-9](?:[a-z0-9-]{0,62}[a-z0-9])?))?$/;
+/** The brand a `samva:brand` specifier names: `undefined` slug means the default brand. */
+const parseBrandSpecifier = (specifier) => {
+	const match = BRAND_IMPORT.exec(specifier);
+	return match === null ? void 0 : { slug: match[1] };
+};
+/** The directory part of a project path, with no trailing slash (`""` at the root). */
+const projectDirectory = (path) => path.includes("/") ? path.slice(0, path.lastIndexOf("/")) : "";
+/** A relative or root-absolute stylesheet reference, resolved from a project directory. */
+const resolveFromDirectory = (directory, reference) => {
+	const segments = reference.startsWith("/") || directory === "" ? [] : directory.split("/");
+	for (const segment of reference.split("/")) {
+		if (segment === "" || segment === ".") continue;
+		if (segment === "..") {
+			if (segments.length === 0) return void 0;
+			segments.pop();
+		} else segments.push(segment);
+	}
+	return segments.length === 0 ? void 0 : segments.join("/");
+};
+const importTarget = (node) => {
+	if (node.type !== "Atrule" || node.prelude === null || node.prelude.type !== "AtrulePrelude") return { extra: true };
+	const parts = [...node.prelude.children].filter((part) => part.type !== "WhiteSpace");
+	const first = parts[0];
+	const target = first?.type === "String" ? first.value : first?.type === "Url" ? first.value : void 0;
+	return target === void 0 ? { extra: true } : {
+		target,
+		extra: parts.length > 1
+	};
+};
+/**
+* Walk the theme's `@import` graph. Project `.css` files resolve from the
+* importing file's directory; `samva:brand` and `samva:brand/<slug>` are
+* recorded for the brand the build supplies. Anything else is an error.
+*/
+const resolveThemeImports = (themePath, themeCss, files) => {
+	const stylesheets = /* @__PURE__ */ new Map([[themePath, themeCss]]);
+	const brandSpecifiers = /* @__PURE__ */ new Set();
+	const diagnostics = [];
+	const visit = (path, source, chain) => {
+		const lineMap = buildLineMap(source);
+		const ast = parse(source, {
+			positions: true,
+			parseValue: false,
+			parseRulePrelude: false
+		});
+		if (ast.type !== "StyleSheet") return;
+		for (const node of ast.children) {
+			if (node.type !== "Atrule" || node.name.toLowerCase() !== "import") continue;
+			const position = lineColumn(lineMap, node.loc?.start.offset ?? 0);
+			const origins = [{
+				fileName: path,
+				lineNumber: position.line,
+				columnNumber: position.column
+			}];
+			const refuse = (message) => diagnostics.push({
+				code: "css-import-unresolved",
+				severity: "error",
+				message,
+				origins
+			});
+			const { target, extra } = importTarget(node);
+			if (target === void 0) {
+				refuse(`${path}: @import needs a quoted stylesheet path or "samva:brand".`);
+				continue;
+			}
+			if (extra) {
+				refuse(`${path}: @import ${JSON.stringify(target)} takes no layer, supports or media conditions; the import order is the layering.`);
+				continue;
+			}
+			if (parseBrandSpecifier(target) !== void 0) {
+				brandSpecifiers.add(target);
+				continue;
+			}
+			if (!/^\.{0,2}\//.test(target) || !/\.css$/i.test(target.replace(/[?#].*$/, ""))) {
+				refuse(`${path}: @import ${JSON.stringify(target)} is not a project stylesheet or "samva:brand". The compiler supplies Tailwind itself; import project .css files by relative path.`);
+				continue;
+			}
+			const resolved = resolveFromDirectory(projectDirectory(path), target.replace(/[?#].*$/, ""));
+			const content = resolved === void 0 ? void 0 : files[resolved];
+			if (resolved === void 0 || typeof content !== "string") {
+				refuse(`${path}: @import ${JSON.stringify(target)} names no stylesheet in the project.`);
+				continue;
+			}
+			if (chain.includes(resolved)) {
+				refuse(`${path}: @import ${JSON.stringify(target)} imports itself through ${chain.join(" → ")}.`);
+				continue;
+			}
+			if (stylesheets.has(resolved)) continue;
+			stylesheets.set(resolved, content);
+			visit(resolved, content, [...chain, resolved]);
+		}
+	};
+	visit(themePath, themeCss, [themePath]);
+	return {
+		stylesheets,
+		brandSpecifiers: [...brandSpecifiers].sort(),
+		diagnostics
+	};
+};
+//#endregion
 //#region src/sml/diagnostics.ts
 /** Collects the findings of one compile. Every finding carries a code, a location and a fix. */
 var Findings = class {
@@ -125,7 +224,7 @@ const parseSource = (path, source) => {
 	const position = (offset) => lineColumn(lines, offset);
 	let program;
 	try {
-		program = parse(source, {
+		program = parse$1(source, {
 			plugins: ["typescript", "jsx"],
 			sourceType: "module"
 		}).program;
@@ -163,6 +262,32 @@ const isValueNode = (node) => {
 	return true;
 };
 //#endregion
+//#region src/channel-specs.ts
+const SMS_CATEGORIES = [
+	"transactional",
+	"promotional",
+	"service_implicit"
+];
+const WHATSAPP_CATEGORIES = [
+	"marketing",
+	"utility",
+	"authentication"
+];
+const WHATSAPP_HEADER_TYPES = [
+	"text",
+	"image",
+	"video",
+	"document"
+];
+/** The attributes `<Sms>` accepts. */
+const SMS_ATTRIBUTES = ["category"];
+/** The attributes `<WhatsApp>` accepts. */
+const WHATSAPP_ATTRIBUTES = [
+	"name",
+	"language",
+	"category"
+];
+//#endregion
 //#region src/whatsapp-template.ts
 const isConcat = (value) => typeof value === "object" && value !== null && "concat" in value;
 /**
@@ -976,10 +1101,10 @@ const runBuiltinComponent = (call) => {
 		return [];
 	}
 	const exported = binding.imported;
-	const isEmail = binding.kind === "markup" && specifier === "@samva/markup/email/components";
+	const isEmail = binding.kind === "markup" && specifier === "@samva/markup/email";
 	const isBrand = binding.kind === "brand";
 	if (!(isEmail || isBrand)) {
-		lowerer.error(ctx, node, "unknown-component", `<${call.name}> is not a component the profile can read.`, "Import components from @samva/markup/email/components, samva:brand, or the project.");
+		lowerer.error(ctx, node, "unknown-component", `<${call.name}> is not a component the profile can read.`, "Import components from @samva/markup/email, samva:brand, or the project.");
 		return [];
 	}
 	let fn;
@@ -2187,7 +2312,7 @@ var Lowerer = class {
 			value: local.value
 		};
 		if (fn === void 0 || !/Function|Arrow/.test(fn.value.type)) {
-			this.error(ctx, node, "unknown-component", `<${name}> is not a component the profile can read.`, "Import it from @samva/markup/email/components, or from a project file that exports it as a function.");
+			this.error(ctx, node, "unknown-component", `<${name}> is not a component the profile can read.`, "Import it from @samva/markup/email, or from a project file that exports it as a function.");
 			return [];
 		}
 		return this.partial(ctx, node, attributes, name, fn.module, fn.value);
@@ -3407,6 +3532,8 @@ const lowerProject = (options, project, findings, inputs) => {
 //#region src/sml/project.ts
 const MARKUP_SPECIFIER = "@samva/markup";
 const MARKUP_PREFIX = "@samva/markup/";
+/** Entries a template could import that moved; each is reported with its replacement. */
+const MOVED_MARKUP_ENTRIES = { "@samva/markup/email/components": "@samva/markup/email" };
 const SCRIPT_EXTENSIONS = [".tsx", ".ts"];
 /** Resolve a relative specifier to a project file, or `undefined`. */
 const resolveSpecifier = (from, specifier, files) => {
@@ -3486,6 +3613,12 @@ const loadProject = (files, entryPath, findings, loadOptions = {}) => {
 					const imported = child(node, "imported");
 					return imported === void 0 ? local(node) : text(imported, "name") ?? text(imported, "value") ?? local(node);
 				};
+				const moved = MOVED_MARKUP_ENTRIES[specifier];
+				if (moved !== void 0) {
+					findings.add(parsed, child(statement, "source") ?? statement, "moved-import", `\`${specifier}\` moved to \`${moved}\`; the imported names are unchanged.`, `Import from "${moved}".`);
+					failed = true;
+					break;
+				}
 				if (specifier === MARKUP_SPECIFIER || specifier.startsWith(MARKUP_PREFIX)) {
 					for (const item of specifiers) {
 						if (text(item, "importKind") === "type") continue;
@@ -3665,6 +3798,6 @@ const introducedProfileErrors = (before, after) => {
 	return added;
 };
 //#endregion
-export { lowerProject as a, completed as i, introducedProfileErrors as n, Findings as o, loadProject as r, checkStaticProfile as t };
+export { lowerProject as a, WHATSAPP_HEADER_TYPES as c, parseBrandSpecifier as d, projectDirectory as f, completed as i, Findings as l, resolveThemeImports as m, introducedProfileErrors as n, SMS_CATEGORIES as o, resolveFromDirectory as p, loadProject as r, WHATSAPP_CATEGORIES as s, checkStaticProfile as t, BRAND_SPECIFIER as u };
 
-//# sourceMappingURL=profile-BH-OtdDA.js.map
+//# sourceMappingURL=profile-pWGtWZXF.js.map