@samva/markup 0.10.0 → 0.11.0

package/AGENTS.md

@@ -30,7 +30,11 @@ Authoring entries are what a template file imports:
   mode) and `BrandFooter` (company, postal address, social links and the unsubscribe row the send
   path fills). The compiler binds them to the brand the build resolves; add
   `"types": ["@samva/markup/samva-brand"]` to the project's tsconfig for `tsc`. In `theme.css`,
-  `@import "samva:brand";` layers the brand theme; `samva:brand/<slug>` names one brand.
+  `@import "samva:brand";` layers the brand theme; `samva:brand/<slug>` names one brand. These are
+  Samva's brand plugin (`samvaBrandPlugin` from `@samva/markup/brand`), the default; a host that
+  delivers mail itself passes its own `BrandPlugin` as `brandPlugin` to `compileTemplate`,
+  `renderIr` and `renderBrandFooter` to rename the brand import, the footer markers, the
+  unsubscribe placeholder and the unsubscribe link's no-track marker.
 
 Tooling entries are what a host (Vite, the CLI, the editor, the API, the template agent) imports:
 

package/CHANGELOG.md

@@ -1,3 +1,37 @@
+## @samva/markup@0.11.0
+
+### Breaking: `@samva/markup` reads brand and footer names from a brand plugin
+
+Templates do not change: `samva:brand`, `BrandLogo`, `BrandFooter` and the unsubscribe row work as
+before, because Samva's brand plugin is the default.
+
+A host that compiles or renders templates can pass its own `BrandPlugin` as `brandPlugin` to
+`compileTemplate`, `transformProject`, `projectBrandSpecifier`, `parseBrandSpecifier`,
+`checkStaticProfile`, `renderIr`, `compileEmail`, `renderBrandFooter`, `renderBrandSample`,
+`brandComponents`, `renderedFooterMarkers` and `withoutUnsubscribeRow`. The plugin names the brand
+import, the attributes that mark the footer and its unsubscribe row, the unsubscribe link's URL
+placeholder, and the attribute that marks that link as untracked.
+
+`BrandFooter`'s unsubscribe link now carries `data-samva-no-track` instead of SES's
+`ses:no-track`. A host that delivers mail through SES turns the marker into `ses:no-track` before it
+sends.
+
+`@samva/markup/brand` exports `samvaBrandPlugin` and the `BrandPlugin` type in place of
+`FOOTER_ATTRIBUTE`, `UNSUBSCRIBE_ROW_ATTRIBUTE` and `UNSUBSCRIBE_URL_PLACEHOLDER`; read
+`samvaBrandPlugin.footerAttribute`, `.unsubscribeRowAttribute` and `.unsubscribeUrlPlaceholder`.
+`@samva/markup/compiler` no longer exports `BRAND_SPECIFIER`; read `samvaBrandPlugin.specifier`.
+
+### Breaking: supply brand resolution to the authoring toolchain
+
+`@samva/vite` accepts `brandResolver` and `brandPlugin` on the editor plugin and its dev, project,
+build, render and export APIs. A brand import without a resolver fails with `brand-unavailable`.
+Standalone callers supply a resolver; the package does not read Samva credentials, invoke the
+Samva CLI or load Samva brand snapshots. The `offline` option and Samva snapshot helpers move to
+the CLI.
+
+`samva templates dev`, `check`, `build`, `render`, `snapshot` and `export` supply the Samva resolver
+and brand plugin, preserving live lookup, cached snapshots and brand diagnostics.
+
 ## @samva/markup@0.10.0
 
 ### Breaking: `@samva/markup` publishes 17 entries in two tiers

package/dist/{assets-BIsyMQ92.d.ts → assets-B0yseju_.d.ts}

@@ -1,3 +1,4 @@
+import { t as BrandPlugin } from "./brand-plugin-CHhcei-j.js";
 import { r as EmailDiagnostic } from "./diagnostics-B-Gym34R.js";
 import { r as EmailNode } from "./jsx-runtime-ylIOnaSf.js";
 //#region src/email/brand.d.ts
@@ -24,17 +25,13 @@ interface EmailBrandFooter {
   readonly socialLinks?: readonly EmailBrandSocialLink[] | undefined;
 }
 interface EmailBrand {
-  /** The brand's slug; `samva:brand/<slug>` must name it. */
+  /** The brand's slug; a `<specifier>/<slug>` brand import must name it. */
   readonly slug: string;
   /** Brand theme CSS in the closed grammar `parseBrandCss` accepts. */
   readonly css: string;
   readonly assets?: EmailBrandAssets | undefined;
   readonly footer?: EmailBrandFooter | undefined;
 }
-/** Marks the block the send path recognizes as the template's own footer. */
-declare const FOOTER_ATTRIBUTE = "data-samva-footer";
-/** Marks the footer row that carries the unsubscribe link. */
-declare const UNSUBSCRIBE_ROW_ATTRIBUTE = "data-samva-unsubscribe";
 /** Every class the brand components use, compiled for any project that imports them. */
 declare const BRAND_COMPONENT_CLASSES: readonly ["dark:hidden!", "hidden", "dark:block!", "text-xs", "text-gray-500", "text-center", "font-semibold", "underline"];
 interface BrandLogoProps {
@@ -54,8 +51,8 @@ interface BrandComponents {
   readonly BrandLogo: (props: BrandLogoProps) => EmailNode | null;
   readonly BrandFooter: (props: BrandFooterProps) => EmailNode | null;
 }
-/** Bind `BrandLogo` and `BrandFooter` to one brand. */
-declare const brandComponents: (brand: EmailBrand) => BrandComponents;
+/** Bind `BrandLogo` and `BrandFooter` to one brand, marked as the plugin names. */
+declare const brandComponents: (brand: EmailBrand, plugin?: BrandPlugin) => BrandComponents;
 /** What a rendered message says about the footer it carries. */
 interface RenderedFooterMarkers {
   /** The message renders `BrandFooter` (or claims to, with the marker). */
@@ -63,8 +60,8 @@ interface RenderedFooterMarkers {
   /** The message carries the unsubscribe placeholder link only `BrandFooter` can write. */
   readonly unsubscribeLink: boolean;
 }
-/** Read the footer markers from rendered HTML. */
-declare const renderedFooterMarkers: (html: string) => RenderedFooterMarkers;
+/** Read the plugin's footer markers from rendered HTML. */
+declare const renderedFooterMarkers: (html: string, plugin?: BrandPlugin) => RenderedFooterMarkers;
 /**
  * Drop the unsubscribe row from a rendered message, for a send that resolved
  * no unsubscribe group: there is no link to put there, so the row goes.
@@ -72,7 +69,7 @@ declare const renderedFooterMarkers: (html: string) => RenderedFooterMarkers;
 declare const withoutUnsubscribeRow: (rendered: {
   readonly html?: string | undefined;
   readonly text?: string | undefined;
-}) => {
+}, plugin?: BrandPlugin) => {
   readonly html: string | undefined;
   readonly text: string | undefined;
 };
@@ -114,5 +111,5 @@ declare const isExternalAsset: (reference: string) => boolean;
  */
 declare const checkAssetBase: (base: string) => readonly EmailDiagnostic[];
 //#endregion
-export { withoutUnsubscribeRow as C, renderedFooterMarkers as S, EmailBrandSocialLink as _, assetUrl as a, UNSUBSCRIBE_ROW_ATTRIBUTE as b, isExternalAsset as c, BrandFooterProps as d, BrandLogoProps as f, EmailBrandFooter as g, EmailBrandAssets as h, assetEntry as i, BRAND_COMPONENT_CLASSES as l, EmailBrandAddress as m, AssetEntry as n, checkAssetBase as o, EmailBrand as p, AssetManifest as r, isAssetPath as s, ASSET_CONTENT_TYPES as t, BrandComponents as u, FOOTER_ATTRIBUTE as v, brandComponents as x, RenderedFooterMarkers as y };
-//# sourceMappingURL=assets-BIsyMQ92.d.ts.map
+export { EmailBrandSocialLink as _, assetUrl as a, renderedFooterMarkers as b, isExternalAsset as c, BrandFooterProps as d, BrandLogoProps as f, EmailBrandFooter as g, EmailBrandAssets as h, assetEntry as i, BRAND_COMPONENT_CLASSES as l, EmailBrandAddress as m, AssetEntry as n, checkAssetBase as o, EmailBrand as p, AssetManifest as r, isAssetPath as s, ASSET_CONTENT_TYPES as t, BrandComponents as u, RenderedFooterMarkers as v, withoutUnsubscribeRow as x, brandComponents as y };
+//# sourceMappingURL=assets-B0yseju_.d.ts.map

package/dist/{brand-C0MKTwmX.js → brand-DTctcDmf.js}

@@ -1,4 +1,4 @@
-import { i as UNSUBSCRIBE_URL_PLACEHOLDER, r as UNSUBSCRIBE_LINK, t as BRAND_FOOTER_MARKER } from "./unsubscribe-link-CoesnQDU.js";
+import { D as samvaBrandPlugin, O as BRAND_FOOTER_MARKER, k as UNSUBSCRIBE_LINK, r as escapeAttribute } from "./html-DjPxwjLi.js";
 import { a as jsx, n as Fragment } from "./jsx-runtime-CBlexoeR.js";
 //#region src/email/assets.ts
 /** Files a template may import, and what they are served as. */
@@ -61,10 +61,6 @@ const checkAssetBase = (base) => /^(https:\/\/|\.{1,2}\/|\/)/i.test(base) ? [] :
 }];
 //#endregion
 //#region src/email/brand.ts
-/** Marks the block the send path recognizes as the template's own footer. */
-const FOOTER_ATTRIBUTE = "data-samva-footer";
-/** Marks the footer row that carries the unsubscribe link. */
-const UNSUBSCRIBE_ROW_ATTRIBUTE = "data-samva-unsubscribe";
 /** Every class the brand components use, compiled for any project that imports them. */
 const BRAND_COMPONENT_CLASSES = [
 	"dark:hidden!",
@@ -97,8 +93,8 @@ const row = (children, props = {}) => jsx("tr", {
 		children
 	})
 });
-/** Bind `BrandLogo` and `BrandFooter` to one brand. */
-const brandComponents = (brand) => {
+/** Bind `BrandLogo` and `BrandFooter` to one brand, marked as the plugin names. */
+const brandComponents = (brand, plugin = samvaBrandPlugin) => {
 	const assets = brand.assets ?? {};
 	const footer = brand.footer ?? {};
 	const BrandLogo = ({ width = 120, alt, align, className }) => {
@@ -145,8 +141,8 @@ const brandComponents = (brand) => {
 			className: "text-gray-500 underline",
 			children: link.label
 		})])));
-		rows.push(row(unsubscribeLink(unsubscribeLabel), {
-			[UNSUBSCRIBE_ROW_ATTRIBUTE]: "",
+		rows.push(row(unsubscribeLink(unsubscribeLabel, plugin), {
+			[plugin.unsubscribeRowAttribute]: "",
 			[BRAND_FOOTER_MARKER]: true
 		}));
 		return jsx("table", {
@@ -155,7 +151,7 @@ const brandComponents = (brand) => {
 			border: 0,
 			cellpadding: 0,
 			cellspacing: 0,
-			[FOOTER_ATTRIBUTE]: "",
+			[plugin.footerAttribute]: "",
 			[BRAND_FOOTER_MARKER]: true,
 			children: jsx("tbody", { children: jsx("tr", { children: jsx("td", {
 				align: "center",
@@ -178,31 +174,29 @@ const brandComponents = (brand) => {
 };
 /**
 * The unsubscribe link. Its href is the placeholder, which no author-written
-* link may carry: the serializer accepts it only on this node, and marks it so
-* click tracking never rewrites it.
+* link may carry: the serializer accepts it only on this node, and writes the
+* plugin's no-track marker on it so click tracking never rewrites it.
 */
-const unsubscribeLink = (label) => jsx("a", {
-	href: UNSUBSCRIBE_URL_PLACEHOLDER,
+const unsubscribeLink = (label, plugin) => jsx("a", {
+	href: plugin.unsubscribeUrlPlaceholder,
 	className: "text-gray-500 underline",
 	[UNSUBSCRIBE_LINK]: true,
 	children: label
 });
-const UNSUBSCRIBE_ROW = new RegExp(`<tr ${UNSUBSCRIBE_ROW_ATTRIBUTE}=""[^>]*>[\\s\\S]*?</tr>`, "g");
-const UNSUBSCRIBE_HREF = `href="${UNSUBSCRIBE_URL_PLACEHOLDER}"`;
-/** Read the footer markers from rendered HTML. */
-const renderedFooterMarkers = (html) => ({
-	footer: html.includes(`${FOOTER_ATTRIBUTE}=""`),
-	unsubscribeLink: html.includes(UNSUBSCRIBE_HREF)
+/** Read the plugin's footer markers from rendered HTML. */
+const renderedFooterMarkers = (html, plugin = samvaBrandPlugin) => ({
+	footer: html.includes(`${plugin.footerAttribute}=""`),
+	unsubscribeLink: html.includes(`href="${escapeAttribute(plugin.unsubscribeUrlPlaceholder)}"`)
 });
 /**
 * Drop the unsubscribe row from a rendered message, for a send that resolved
 * no unsubscribe group: there is no link to put there, so the row goes.
 */
-const withoutUnsubscribeRow = (rendered) => ({
-	html: rendered.html?.replace(UNSUBSCRIBE_ROW, ""),
-	text: rendered.text?.split("\n").filter((line) => !line.includes(UNSUBSCRIBE_URL_PLACEHOLDER)).join("\n")
+const withoutUnsubscribeRow = (rendered, plugin = samvaBrandPlugin) => ({
+	html: rendered.html?.replace(new RegExp(`<tr ${plugin.unsubscribeRowAttribute}=""[^>]*>[\\s\\S]*?</tr>`, "g"), ""),
+	text: rendered.text?.split("\n").filter((line) => !line.includes(plugin.unsubscribeUrlPlaceholder)).join("\n")
 });
 //#endregion
-export { renderedFooterMarkers as a, assetEntry as c, isAssetPath as d, isExternalAsset as f, brandComponents as i, assetUrl as l, FOOTER_ATTRIBUTE as n, withoutUnsubscribeRow as o, UNSUBSCRIBE_ROW_ATTRIBUTE as r, ASSET_CONTENT_TYPES as s, BRAND_COMPONENT_CLASSES as t, checkAssetBase as u };
+export { ASSET_CONTENT_TYPES as a, checkAssetBase as c, withoutUnsubscribeRow as i, isAssetPath as l, brandComponents as n, assetEntry as o, renderedFooterMarkers as r, assetUrl as s, BRAND_COMPONENT_CLASSES as t, isExternalAsset as u };
 
-//# sourceMappingURL=brand-C0MKTwmX.js.map
+//# sourceMappingURL=brand-DTctcDmf.js.map

package/dist/brand-plugin-CHhcei-j.d.ts

@@ -0,0 +1,32 @@
+//#region src/email/brand-plugin.d.ts
+/**
+ * How a template reaches its brand and how the footer `BrandFooter` renders is
+ * marked for the send path that delivers it. The compiler and the IR renderer
+ * read every brand import, footer marker and unsubscribe link from the plugin
+ * a build passes; `samvaBrandPlugin` is the default.
+ */
+interface BrandPlugin {
+  /**
+   * The module and stylesheet specifier a template imports its brand from.
+   * `<specifier>/<slug>` names one brand; the bare specifier names the default.
+   */
+  readonly specifier: string;
+  /** Marks the block `BrandFooter` renders, so the send path finds a template's own footer. */
+  readonly footerAttribute: `data-${string}`;
+  /** Marks the footer row that carries the unsubscribe link, so a send can drop it. */
+  readonly unsubscribeRowAttribute: `data-${string}`;
+  /** The unsubscribe link's href; the send path substitutes each delivery's URL for it. */
+  readonly unsubscribeUrlPlaceholder: string;
+  /**
+   * Written on the unsubscribe link, so the send path delivers it without
+   * click tracking: a rewritten link would carry another recipient's token.
+   */
+  readonly noTrackAttribute: `data-${string}`;
+}
+/** The brand a specifier names: `undefined` slug means the default brand; `undefined` when it names none. */
+declare const parseBrandSpecifier: (specifier: string, plugin?: BrandPlugin) => {
+  readonly slug: string | undefined;
+} | undefined;
+//#endregion
+export { parseBrandSpecifier as n, BrandPlugin as t };
+//# sourceMappingURL=brand-plugin-CHhcei-j.d.ts.map

package/dist/brand.d.ts

@@ -1,13 +1,15 @@
-import { C as withoutUnsubscribeRow, S as renderedFooterMarkers, _ as EmailBrandSocialLink, a as assetUrl, b as UNSUBSCRIBE_ROW_ATTRIBUTE, c as isExternalAsset, d as BrandFooterProps, f as BrandLogoProps, g as EmailBrandFooter, h as EmailBrandAssets, i as assetEntry, l as BRAND_COMPONENT_CLASSES, m as EmailBrandAddress, n as AssetEntry, o as checkAssetBase, p as EmailBrand, r as AssetManifest, s as isAssetPath, t as ASSET_CONTENT_TYPES, u as BrandComponents, v as FOOTER_ATTRIBUTE, x as brandComponents, y as RenderedFooterMarkers } from "./assets-BIsyMQ92.js";
+import { t as BrandPlugin } from "./brand-plugin-CHhcei-j.js";
+import { _ as EmailBrandSocialLink, a as assetUrl, b as renderedFooterMarkers, c as isExternalAsset, d as BrandFooterProps, f as BrandLogoProps, g as EmailBrandFooter, h as EmailBrandAssets, i as assetEntry, l as BRAND_COMPONENT_CLASSES, m as EmailBrandAddress, n as AssetEntry, o as checkAssetBase, p as EmailBrand, r as AssetManifest, s as isAssetPath, t as ASSET_CONTENT_TYPES, u as BrandComponents, v as RenderedFooterMarkers, x as withoutUnsubscribeRow, y as brandComponents } from "./assets-B0yseju_.js";
 import { t as Diagnostic } from "./diagnostic-model-DxthUZBT.js";
 import { Result } from "better-result";
-//#region src/internal/unsubscribe-link.d.ts
+//#region src/email/samva-brand-plugin.d.ts
 /**
- * The per-recipient unsubscribe URL is not known at render: the send path
- * substitutes each delivery's link for this placeholder, or removes the
- * unsubscribe row when the send resolved no unsubscribe group.
+ * Samva's brand plugin, the compiler's default. A template imports its
+ * organization's brand from `samva:brand`, and Samva's send path fills
+ * `%samva:unsubscribe-url%` per delivery and turns `data-samva-no-track` into
+ * its email provider's own no-track marker.
  */
-declare const UNSUBSCRIBE_URL_PLACEHOLDER = "%samva:unsubscribe-url%";
+declare const samvaBrandPlugin: BrandPlugin;
 //#endregion
 //#region src/theme-css.d.ts
 /** One `@font-face` a brand declares. `src` is the declaration value as authored. */
@@ -67,8 +69,8 @@ declare const brandForegroundDefaults: (brand: BrandCss) => {
  * build compiles the same default and the stored CSS never carries it.
  */
 declare const brandThemeVariables: (brand: BrandCss) => Readonly<Record<string, string>>;
-/** The stylesheet Tailwind compiles for `@import "samva:brand"`: `brandThemeVariables` and the font faces. */
+/** The stylesheet Tailwind compiles for the theme's brand import: `brandThemeVariables` and the font faces. */
 declare const brandTailwindCss: (brand: BrandCss) => string;
 //#endregion
-export { ASSET_CONTENT_TYPES, AssetEntry, AssetManifest, BRAND_COLOR_VARIABLE, BRAND_COMPONENT_CLASSES, BRAND_FOREGROUND_VARIABLE, BrandComponents, BrandCss, BrandFontFace, BrandFooterProps, BrandLogoProps, EmailBrand, EmailBrandAddress, EmailBrandAssets, EmailBrandFooter, EmailBrandSocialLink, FOOTER_ATTRIBUTE, RenderedFooterMarkers, UNSUBSCRIBE_ROW_ATTRIBUTE, UNSUBSCRIBE_URL_PLACEHOLDER, assetEntry, assetUrl, brandComponents, brandForegroundDefaults, brandTailwindCss, brandThemeVariables, checkAssetBase, contrastForeground, darkVariableName, isAssetPath, isExternalAsset, parseBrandCss, printBrandCss, renderedFooterMarkers, withoutUnsubscribeRow };
+export { ASSET_CONTENT_TYPES, AssetEntry, AssetManifest, BRAND_COLOR_VARIABLE, BRAND_COMPONENT_CLASSES, BRAND_FOREGROUND_VARIABLE, BrandComponents, BrandCss, BrandFontFace, BrandFooterProps, BrandLogoProps, type BrandPlugin, EmailBrand, EmailBrandAddress, EmailBrandAssets, EmailBrandFooter, EmailBrandSocialLink, RenderedFooterMarkers, assetEntry, assetUrl, brandComponents, brandForegroundDefaults, brandTailwindCss, brandThemeVariables, checkAssetBase, contrastForeground, darkVariableName, isAssetPath, isExternalAsset, parseBrandCss, printBrandCss, renderedFooterMarkers, samvaBrandPlugin, withoutUnsubscribeRow };
 //# sourceMappingURL=brand.d.ts.map

package/dist/brand.js

@@ -1,4 +1,4 @@
-import { i as UNSUBSCRIBE_URL_PLACEHOLDER } from "./unsubscribe-link-CoesnQDU.js";
-import { a as brandThemeVariables, c as parseBrandCss, i as brandTailwindCss, l as printBrandCss, n as BRAND_FOREGROUND_VARIABLE, o as contrastForeground, r as brandForegroundDefaults, s as darkVariableName, t as BRAND_COLOR_VARIABLE } from "./theme-css-JtRCm1fb.js";
-import { a as renderedFooterMarkers, c as assetEntry, d as isAssetPath, f as isExternalAsset, i as brandComponents, l as assetUrl, n as FOOTER_ATTRIBUTE, o as withoutUnsubscribeRow, r as UNSUBSCRIBE_ROW_ATTRIBUTE, s as ASSET_CONTENT_TYPES, t as BRAND_COMPONENT_CLASSES, u as checkAssetBase } from "./brand-C0MKTwmX.js";
-export { ASSET_CONTENT_TYPES, BRAND_COLOR_VARIABLE, BRAND_COMPONENT_CLASSES, BRAND_FOREGROUND_VARIABLE, FOOTER_ATTRIBUTE, UNSUBSCRIBE_ROW_ATTRIBUTE, UNSUBSCRIBE_URL_PLACEHOLDER, assetEntry, assetUrl, brandComponents, brandForegroundDefaults, brandTailwindCss, brandThemeVariables, checkAssetBase, contrastForeground, darkVariableName, isAssetPath, isExternalAsset, parseBrandCss, printBrandCss, renderedFooterMarkers, withoutUnsubscribeRow };
+import { D as samvaBrandPlugin } from "./html-DjPxwjLi.js";
+import { a as brandThemeVariables, c as parseBrandCss, i as brandTailwindCss, l as printBrandCss, n as BRAND_FOREGROUND_VARIABLE, o as contrastForeground, r as brandForegroundDefaults, s as darkVariableName, t as BRAND_COLOR_VARIABLE } from "./theme-css-CEUrDpqq.js";
+import { a as ASSET_CONTENT_TYPES, c as checkAssetBase, i as withoutUnsubscribeRow, l as isAssetPath, n as brandComponents, o as assetEntry, r as renderedFooterMarkers, s as assetUrl, t as BRAND_COMPONENT_CLASSES, u as isExternalAsset } from "./brand-DTctcDmf.js";
+export { ASSET_CONTENT_TYPES, BRAND_COLOR_VARIABLE, BRAND_COMPONENT_CLASSES, BRAND_FOREGROUND_VARIABLE, assetEntry, assetUrl, brandComponents, brandForegroundDefaults, brandTailwindCss, brandThemeVariables, checkAssetBase, contrastForeground, darkVariableName, isAssetPath, isExternalAsset, parseBrandCss, printBrandCss, renderedFooterMarkers, samvaBrandPlugin, withoutUnsubscribeRow };

package/dist/compiler.d.ts

@@ -1,7 +1,8 @@
+import { n as parseBrandSpecifier, t as BrandPlugin } from "./brand-plugin-CHhcei-j.js";
 import { a as TemplateDiagnostic, r as EmailDiagnostic } from "./diagnostics-B-Gym34R.js";
 import { r as EmailNode } from "./jsx-runtime-ylIOnaSf.js";
-import { n as AssetEntry, p as EmailBrand, u as BrandComponents } from "./assets-BIsyMQ92.js";
-import { C as Compound, D as EmittedPosition, S as CompiledSelector, T as matchesSelector, _ as Specificity, b as parseStylesheet, ct as TemplateIr, g as CssRule, h as CssDeclaration, r as RenderedEmail, v as Stylesheet, w as classListOf, x as Ancestry, y as compileSelector } from "./render-BPonDpCl.js";
+import { n as AssetEntry, p as EmailBrand, u as BrandComponents } from "./assets-B0yseju_.js";
+import { C as Compound, D as EmittedPosition, S as CompiledSelector, T as matchesSelector, _ as Specificity, b as parseStylesheet, ct as TemplateIr, g as CssRule, h as CssDeclaration, r as RenderedEmail, v as Stylesheet, w as classListOf, x as Ancestry, y as compileSelector } from "./render-DQKz4Aco.js";
 import { a as TEMPLATE_NAME_PATTERN, n as EmailContent } from "./template-DMPwxMSq.js";
 import { caniemail } from "caniemail";
 //#region src/email/compatibility.d.ts
@@ -156,12 +157,14 @@ interface TailwindOutput {
 }
 /**
  * What the project theme's `@import`s resolve to, already checked by
- * `resolveThemeImports`: project stylesheets by path, and the brand theme
- * `samva:brand` stands for.
+ * `resolveThemeImports`: project stylesheets by path, and the brand theme the
+ * brand plugin's specifier stands for.
  */
 interface TailwindImports {
   readonly stylesheets: ReadonlyMap<string, string>;
   readonly brandCss?: string | undefined;
+  /** Names the brand import; `samvaBrandPlugin` when omitted. */
+  readonly brandPlugin?: BrandPlugin | undefined;
 }
 /** Compile the discovered class set into CSS with the pinned Tailwind release. */
 declare const compileTailwind: (candidates: Iterable<string>, options?: TailwindOptions, imports?: TailwindImports) => Promise<TailwindOutput>;
@@ -182,10 +185,12 @@ interface TransformOptions {
   /** `false` compiles no Tailwind at all. */
   readonly tailwind?: TailwindOptions | false | undefined;
   /**
-   * The brand `samva:brand` resolves to, supplied by the host. A project that
-   * imports `samva:brand` with no brand here fails to compile.
+   * The brand the brand import resolves to, supplied by the host. A project
+   * that imports a brand with no brand here fails to compile.
    */
   readonly brand?: EmailBrand | undefined;
+  /** Names the brand import and marks the footer `BrandFooter` renders; `samvaBrandPlugin` when omitted. */
+  readonly brandPlugin?: BrandPlugin | undefined;
 }
 interface ProjectTransform {
   readonly assets: readonly AssetEntry[];
@@ -196,23 +201,15 @@ interface ProjectTransform {
   readonly diagnostics: readonly EmailDiagnostic[];
 }
 /**
- * The `samva:brand` specifier a project imports — from its theme's `@import`s
- * or its TSX — so a host can fetch that brand before it compiles. `undefined`
- * when the project imports no brand. A project that names two brands gets the
+ * The brand specifier a project imports — from its theme's `@import`s or its
+ * TSX — so a host can fetch that brand before it compiles. `undefined` when
+ * the project imports no brand. A project that names two brands gets the
  * first here and a refusal from the compile.
  */
-declare const projectBrandSpecifier: (files: Readonly<Record<string, string | Uint8Array>>, themePath?: string) => string | undefined;
+declare const projectBrandSpecifier: (files: Readonly<Record<string, string | Uint8Array>>, themePath?: string, brandPlugin?: BrandPlugin) => string | undefined;
 /** Read a whole project, then compile the classes its scripts used. */
 declare const transformProject: (files: Readonly<Record<string, string | Uint8Array>>, options: TransformOptions) => Promise<ProjectTransform>;
 //#endregion
-//#region src/email/theme-imports.d.ts
-/** The CSS and TSX specifier a template uses to reach its organization's brand. */
-declare const BRAND_SPECIFIER = "samva:brand";
-/** The brand a `samva:brand` specifier names: `undefined` slug means the default brand. */
-declare const parseBrandSpecifier: (specifier: string) => {
-  readonly slug: string | undefined;
-} | undefined;
-//#endregion
 //#region src/email/brand-footer.d.ts
 /** A footer block for the send path to append, and its plain-text tail. */
 interface RenderedBrandFooter {
@@ -223,15 +220,16 @@ interface RenderedBrandFooter {
  * Render `BrandFooter` against a brand on its own, for the send path to
  * append to a message whose template renders no footer of its own. It
  * compiles the same component, styled by the same brand theme, a template
- * would get from `samva:brand`. Without `unsubscribe` the unsubscribe row is
+ * would get from its brand import. Without `unsubscribe` the unsubscribe row is
  * left out.
  */
 declare const renderBrandFooter: (brand: EmailBrand, options: {
   readonly unsubscribe: boolean;
+  readonly brandPlugin?: BrandPlugin | undefined;
 }) => Promise<RenderedBrandFooter>;
 /**
- * Render content against a brand as a project whose `theme.css` is
- * `@import "samva:brand";` renders it: Tailwind compiles the brand theme for
+ * Render content against a brand as a project whose `theme.css` imports only
+ * the brand renders it: Tailwind compiles the brand theme for
  * the classes the content names, `BrandLogo` and `BrandFooter` are bound to the
  * brand, and the render inlines the result. A brand preview renders through
  * this, so it shows what a template importing the brand compiles to.
@@ -240,7 +238,7 @@ declare const renderBrandSample: (brand: EmailBrand, sample: {
   /** Every class the content names; nothing is discovered from source here. */
   readonly classes: readonly string[];
   readonly render: (components: BrandComponents) => EmailContent;
-}) => Promise<RenderedEmail>;
+}, brandPlugin?: BrandPlugin) => Promise<RenderedEmail>;
 //#endregion
 //#region src/sml/lower-project.d.ts
 interface CompiledTemplate {
@@ -285,12 +283,12 @@ declare const checkTemplateCompatibility: (ir: TemplateIr, fixtures: Readonly<Re
  * and the entry's path. Imports of files that are absent are trusted to exist, and the brand,
  * Tailwind and theme are not resolved, so the result holds only findings the source itself owns.
  */
-declare const checkStaticProfile: (files: string | Readonly<Record<string, string | Uint8Array>>, entry?: string) => readonly TemplateDiagnostic[];
+declare const checkStaticProfile: (files: string | Readonly<Record<string, string | Uint8Array>>, entry?: string, brandPlugin?: BrandPlugin) => readonly TemplateDiagnostic[];
 /**
  * The errors in `after` that `before` did not already have, compared by code and message so a
  * finding that only moved does not count as new.
  */
 declare const introducedProfileErrors: (before: readonly TemplateDiagnostic[], after: readonly TemplateDiagnostic[]) => readonly TemplateDiagnostic[];
 //#endregion
-export { type Ancestry, type AppliedStyles, BRAND_SPECIFIER, COMPATIBILITY_PROVENANCE, type ClassDiscovery, type CompatibilityInput, type CompatibilityProvenance, type CompileTemplateOptions, type CompiledSelector, type CompiledTemplate, type Compound, type CssDeclaration, type CssRule, EMAIL_CLIENT_MATRIX, ESSENTIAL_CONSTRUCTS, type EmailClientTarget, type EmailContent, type ProjectTransform, type RenderedBrandFooter, type Specificity, type Stylesheet, TAILWIND_VERSION, TEMPLATE_NAME_PATTERN, type TailwindLimits, type TailwindOptions, type TailwindOutput, type TransformOptions, applyStylesheet, checkEmailCompatibility, checkStaticProfile, checkTemplateCompatibility, classListOf, compileSelector, compileTailwind, compileTemplate, discoverClassCandidates, downlevelColors, downlevelMediaQuery, finalizeValue, foldCalc, formatColor, hasBlockingCompatibility, introducedProfileErrors, matchesSelector, parseBrandSpecifier, parseColor, parseStylesheet, projectBrandSpecifier, renderBrandFooter, renderBrandSample, renderHeadCss, resolveVariables, transformProject, unknownCoverage };
+export { type Ancestry, type AppliedStyles, COMPATIBILITY_PROVENANCE, type ClassDiscovery, type CompatibilityInput, type CompatibilityProvenance, type CompileTemplateOptions, type CompiledSelector, type CompiledTemplate, type Compound, type CssDeclaration, type CssRule, EMAIL_CLIENT_MATRIX, ESSENTIAL_CONSTRUCTS, type EmailClientTarget, type EmailContent, type ProjectTransform, type RenderedBrandFooter, type Specificity, type Stylesheet, TAILWIND_VERSION, TEMPLATE_NAME_PATTERN, type TailwindLimits, type TailwindOptions, type TailwindOutput, type TransformOptions, applyStylesheet, checkEmailCompatibility, checkStaticProfile, checkTemplateCompatibility, classListOf, compileSelector, compileTailwind, compileTemplate, discoverClassCandidates, downlevelColors, downlevelMediaQuery, finalizeValue, foldCalc, formatColor, hasBlockingCompatibility, introducedProfileErrors, matchesSelector, parseBrandSpecifier, parseColor, parseStylesheet, projectBrandSpecifier, renderBrandFooter, renderBrandSample, renderHeadCss, resolveVariables, transformProject, unknownCoverage };
 //# sourceMappingURL=compiler.d.ts.map

package/dist/compiler.js

@@ -1,13 +1,13 @@
 import { n as isObject } from "./guards-eV1qLbf2.js";
 import { n as TEMPLATE_NAME_PATTERN } from "./template-zLUjcwfF.js";
-import { k as renderIr } from "./components-BZCqegS8.js";
-import { c as parseBrandCss, d as formatColor, f as parseColor, i as brandTailwindCss, u as downlevelColors } from "./theme-css-JtRCm1fb.js";
-import { a as downlevelMediaQuery, c as renderHeadCss, i as matchesSelector, l as resolveVariables, n as applyStylesheet, o as finalizeValue, r as classListOf, s as foldCalc, u as unquote } from "./ir-CLhlklKV.js";
+import { D as samvaBrandPlugin, T as parseBrandSpecifier, _ as renderIr, w as brandSpecifierPattern } from "./html-DjPxwjLi.js";
+import { c as parseBrandCss, d as formatColor, f as parseColor, i as brandTailwindCss, u as downlevelColors } from "./theme-css-CEUrDpqq.js";
+import { a as downlevelMediaQuery, c as renderHeadCss, i as matchesSelector, l as resolveVariables, n as applyStylesheet, o as finalizeValue, r as classListOf, s as foldCalc, u as unquote } from "./ir-De6pTH51.js";
 import { i as lineColumn, t as buildLineMap } from "./diagnostic-model-DJtqbETd.js";
-import { a as lowerProject, d as parseBrandSpecifier, f as projectDirectory, i as completed, l as Findings, m as resolveThemeImports, n as introducedProfileErrors, p as resolveFromDirectory, r as loadProject, t as checkStaticProfile, u as BRAND_SPECIFIER } from "./profile-pWGtWZXF.js";
-import { c as assetEntry, d as isAssetPath, i as brandComponents, l as assetUrl, o as withoutUnsubscribeRow, t as BRAND_COMPONENT_CLASSES, u as checkAssetBase } from "./brand-C0MKTwmX.js";
+import { a as lowerProject, d as resolveFromDirectory, f as resolveThemeImports, i as completed, l as Findings, n as introducedProfileErrors, r as loadProject, t as checkStaticProfile, u as projectDirectory } from "./profile-PUfi3GPH.js";
+import { c as checkAssetBase, i as withoutUnsubscribeRow, l as isAssetPath, n as brandComponents, o as assetEntry, s as assetUrl, t as BRAND_COMPONENT_CLASSES } from "./brand-DTctcDmf.js";
 import { t as EmailCompileError } from "./diagnostics-CnKFefKz.js";
-import { n as compileEmail, r as renderEmailContent } from "./render-BQmfh94k.js";
+import { n as compileEmail, r as renderEmailContent } from "./render-D2ht57ZZ.js";
 import { caniemail, parseHtml, rawData } from "caniemail";
 import { generate, ident, parse, walk } from "css-tree";
 import { parse as parse$1 } from "@babel/parser";
@@ -869,7 +869,7 @@ const compileTailwind = async (candidates, options = {}, imports = { stylesheets
 				base,
 				content: builtIn
 			});
-			if (/^samva:brand(?:\/|$)/.test(id)) {
+			if (parseBrandSpecifier(id, imports.brandPlugin) !== void 0) {
 				if (imports.brandCss === void 0) throw new TypeError(`${id} has no brand in this build`);
 				return Promise.resolve({
 					path: id,
@@ -1047,12 +1047,12 @@ const readFile = async (id, source, options, assets) => {
 };
 /** The Tailwind sheet's stylesheet origin. */
 const TAILWIND_ORIGIN = ".samva-tailwind.css";
-/** `samva:brand` / `samva:brand/<slug>` as a module specifier in an import or export. */
-const BRAND_MODULE_SPECIFIER = /(\b(?:from|import)\s*\(?\s*)(["'])(samva:brand(?:\/[a-z0-9](?:[a-z0-9-]{0,62}[a-z0-9])?)?)\2/g;
-/** The `samva:brand` specifiers a script imports, with where it asks for each. */
-const scriptBrandImports = (path, source) => {
+/** The brand specifier, bare or with a slug, as a module specifier in an import or export. */
+const brandModuleSpecifier = (plugin) => new RegExp(`(\\b(?:from|import)\\s*\\(?\\s*)(["'])(${brandSpecifierPattern(plugin)})\\2`, "g");
+/** The brand specifiers a script imports, with where it asks for each. */
+const scriptBrandImports = (path, source, plugin) => {
 	const lines = buildLineMap(source);
-	return [...source.matchAll(BRAND_MODULE_SPECIFIER)].map((match) => {
+	return [...source.matchAll(brandModuleSpecifier(plugin))].map((match) => {
 		const at = lineColumn(lines, match.index + match[1].length);
 		return {
 			specifier: match[3],
@@ -1065,15 +1065,15 @@ const scriptBrandImports = (path, source) => {
 	});
 };
 /**
-* The `samva:brand` specifier a project imports — from its theme's `@import`s
-* or its TSX — so a host can fetch that brand before it compiles. `undefined`
-* when the project imports no brand. A project that names two brands gets the
+* The brand specifier a project imports — from its theme's `@import`s or its
+* TSX — so a host can fetch that brand before it compiles. `undefined` when
+* the project imports no brand. A project that names two brands gets the
 * first here and a refusal from the compile.
 */
-const projectBrandSpecifier = (files, themePath = "theme.css") => {
+const projectBrandSpecifier = (files, themePath = "theme.css", brandPlugin = samvaBrandPlugin) => {
 	const theme = files[themePath];
-	const fromTheme = typeof theme === "string" ? resolveThemeImports(themePath, theme, files).brandSpecifiers : [];
-	const fromScripts = Object.keys(files).sort().filter((path) => SCRIPT.test(path) && typeof files[path] === "string").flatMap((path) => scriptBrandImports(path, files[path])).map((request) => request.specifier);
+	const fromTheme = typeof theme === "string" ? resolveThemeImports(themePath, theme, files, brandPlugin).brandSpecifiers : [];
+	const fromScripts = Object.keys(files).sort().filter((path) => SCRIPT.test(path) && typeof files[path] === "string").flatMap((path) => scriptBrandImports(path, files[path], brandPlugin)).map((request) => request.specifier);
 	return [...fromTheme, ...fromScripts][0];
 };
 /**
@@ -1083,11 +1083,11 @@ const projectBrandSpecifier = (files, themePath = "theme.css") => {
 * outside its grammar refuses the whole compile: a theme that silently lost a
 * layer would ship the wrong look.
 */
-const resolveTheme = (files, tailwind, brand) => {
+const resolveTheme = (files, tailwind, brand, brandPlugin) => {
 	const refusals = [];
 	const css = tailwind?.css;
 	const themePath = tailwind?.cssPath ?? "theme.css";
-	const imports = css === void 0 ? void 0 : resolveThemeImports(themePath, css, files);
+	const imports = css === void 0 ? void 0 : resolveThemeImports(themePath, css, files, brandPlugin);
 	refusals.push(...imports?.diagnostics ?? []);
 	const themeOrigin = {
 		fileName: themePath,
@@ -1098,7 +1098,7 @@ const resolveTheme = (files, tailwind, brand) => {
 		specifier,
 		origin: themeOrigin
 	}));
-	const scriptRequests = Object.keys(files).sort().filter((path) => SCRIPT.test(path) && typeof files[path] === "string").flatMap((path) => scriptBrandImports(path, files[path]));
+	const scriptRequests = Object.keys(files).sort().filter((path) => SCRIPT.test(path) && typeof files[path] === "string").flatMap((path) => scriptBrandImports(path, files[path], brandPlugin));
 	const requests = [...cssRequests, ...scriptRequests];
 	const specifiers = [...new Set(requests.map((request) => request.specifier))];
 	if (specifiers.length > 1) refusals.push({
@@ -1109,7 +1109,7 @@ const resolveTheme = (files, tailwind, brand) => {
 	});
 	else if (specifiers.length === 1) {
 		const specifier = specifiers[0];
-		const named = parseBrandSpecifier(specifier)?.slug;
+		const named = parseBrandSpecifier(specifier, brandPlugin)?.slug;
 		const origins = [requests[0].origin];
 		if (brand === void 0) refusals.push({
 			code: "brand-unavailable",
@@ -1150,6 +1150,7 @@ const resolveTheme = (files, tailwind, brand) => {
 	return {
 		stylesheets: imports?.stylesheets ?? /* @__PURE__ */ new Map(),
 		brandCss,
+		brandPlugin,
 		brandModule: scriptRequests.length > 0 ? brand : void 0
 	};
 };
@@ -1160,7 +1161,7 @@ const transformProject = async (files, options) => {
 	const stylesheets = /* @__PURE__ */ new Map();
 	const classes = /* @__PURE__ */ new Set();
 	const wanted = options.tailwind === false ? void 0 : options.tailwind ?? {};
-	const theme = resolveTheme(files, wanted, options.brand);
+	const theme = resolveTheme(files, wanted, options.brand, options.brandPlugin ?? samvaBrandPlugin);
 	if (theme.brandModule !== void 0) for (const name of BRAND_COMPONENT_CLASSES) classes.add(name);
 	const paths = Object.keys(files).sort();
 	const binaries = new Map(await Promise.all(paths.filter(isAssetPath).map(async (path) => [path, await readFile(path, files[path], options)])));
@@ -1194,12 +1195,12 @@ const transformProject = async (files, options) => {
 //#endregion
 //#region src/email/brand-footer.ts
 /** The brand theme as Tailwind compiles it; a theme outside the grammar is a compile refusal. */
-const brandTheme = (brand) => {
+const brandTheme = (brand, plugin) => {
 	const parsed = parseBrandCss(brand.css);
 	if (parsed.isErr()) throw new EmailCompileError({ diagnostics: parsed.error.map((finding) => ({
 		code: finding.code,
 		severity: "error",
-		message: `samva:brand: ${finding.message}`,
+		message: `${plugin.specifier}: ${finding.message}`,
 		origins: []
 	})) });
 	return brandTailwindCss(parsed.value);
@@ -1208,22 +1209,23 @@ const brandTheme = (brand) => {
 * Render `BrandFooter` against a brand on its own, for the send path to
 * append to a message whose template renders no footer of its own. It
 * compiles the same component, styled by the same brand theme, a template
-* would get from `samva:brand`. Without `unsubscribe` the unsubscribe row is
+* would get from its brand import. Without `unsubscribe` the unsubscribe row is
 * left out.
 */
 const renderBrandFooter = async (brand, options) => {
-	const tailwind = await compileTailwind(BRAND_COMPONENT_CLASSES, { css: brandTheme(brand) });
-	const node = brandComponents(brand).BrandFooter({});
+	const plugin = options.brandPlugin ?? samvaBrandPlugin;
+	const tailwind = await compileTailwind(BRAND_COMPONENT_CLASSES, { css: brandTheme(brand, plugin) });
+	const node = brandComponents(brand, plugin).BrandFooter({});
 	if (node === null) return {
 		html: "",
 		text: ""
 	};
-	const styled = applyStylesheet(node, parseStylesheet(tailwind.css, { origin: "samva:brand" }));
-	const compiled = compileEmail(styled.tree);
+	const styled = applyStylesheet(node, parseStylesheet(tailwind.css, { origin: plugin.specifier }));
+	const compiled = compileEmail(styled.tree, { brandPlugin: plugin });
 	const rendered = options.unsubscribe ? compiled : withoutUnsubscribeRow({
 		html: compiled.html,
 		text: compiled.text
-	});
+	}, plugin);
 	const text = (rendered.text ?? "").trim();
 	return {
 		html: rendered.html ?? "",
@@ -1231,26 +1233,27 @@ const renderBrandFooter = async (brand, options) => {
 	};
 };
 /**
-* Render content against a brand as a project whose `theme.css` is
-* `@import "samva:brand";` renders it: Tailwind compiles the brand theme for
+* Render content against a brand as a project whose `theme.css` imports only
+* the brand renders it: Tailwind compiles the brand theme for
 * the classes the content names, `BrandLogo` and `BrandFooter` are bound to the
 * brand, and the render inlines the result. A brand preview renders through
 * this, so it shows what a template importing the brand compiles to.
 */
-const renderBrandSample = async (brand, sample) => {
-	const tailwind = await compileTailwind([...BRAND_COMPONENT_CLASSES, ...sample.classes], { css: "@import \"samva:brand\";" }, {
+const renderBrandSample = async (brand, sample, brandPlugin = samvaBrandPlugin) => {
+	const tailwind = await compileTailwind([...BRAND_COMPONENT_CLASSES, ...sample.classes], { css: `@import ${JSON.stringify(brandPlugin.specifier)};` }, {
 		stylesheets: /* @__PURE__ */ new Map(),
-		brandCss: brandTheme(brand)
+		brandCss: brandTheme(brand, brandPlugin),
+		brandPlugin
 	});
-	const components = brandComponents(brand);
-	return renderEmailContent(parseStylesheet(tailwind.css, { origin: "samva:brand" }), () => sample.render(components));
+	const components = brandComponents(brand, brandPlugin);
+	return renderEmailContent(parseStylesheet(tailwind.css, { origin: brandPlugin.specifier }), () => sample.render(components), { brandPlugin });
 };
 //#endregion
 //#region src/sml/compile.ts
 /** Compile a project's entry template to IR without evaluating any of it. */
 const compileTemplate = async (options) => {
 	const findings = new Findings();
-	const project = loadProject(options.files, options.entry, findings);
+	const project = loadProject(options.files, options.entry, findings, { brandPlugin: options.brandPlugin ?? samvaBrandPlugin });
 	if (project === void 0) return completed(findings, void 0);
 	let transformed;
 	try {
@@ -1307,6 +1310,6 @@ const checkTemplateCompatibility = (ir, fixtures, options = {}) => {
 	return findings;
 };
 //#endregion
-export { BRAND_SPECIFIER, COMPATIBILITY_PROVENANCE, EMAIL_CLIENT_MATRIX, ESSENTIAL_CONSTRUCTS, TAILWIND_VERSION, TEMPLATE_NAME_PATTERN, applyStylesheet, checkEmailCompatibility, checkStaticProfile, checkTemplateCompatibility, classListOf, compileSelector, compileTailwind, compileTemplate, discoverClassCandidates, downlevelColors, downlevelMediaQuery, finalizeValue, foldCalc, formatColor, hasBlockingCompatibility, introducedProfileErrors, matchesSelector, parseBrandSpecifier, parseColor, parseStylesheet, projectBrandSpecifier, renderBrandFooter, renderBrandSample, renderHeadCss, resolveVariables, transformProject, unknownCoverage };
+export { COMPATIBILITY_PROVENANCE, EMAIL_CLIENT_MATRIX, ESSENTIAL_CONSTRUCTS, TAILWIND_VERSION, TEMPLATE_NAME_PATTERN, applyStylesheet, checkEmailCompatibility, checkStaticProfile, checkTemplateCompatibility, classListOf, compileSelector, compileTailwind, compileTemplate, discoverClassCandidates, downlevelColors, downlevelMediaQuery, finalizeValue, foldCalc, formatColor, hasBlockingCompatibility, introducedProfileErrors, matchesSelector, parseBrandSpecifier, parseColor, parseStylesheet, projectBrandSpecifier, renderBrandFooter, renderBrandSample, renderHeadCss, resolveVariables, transformProject, unknownCoverage };
 
 //# sourceMappingURL=compiler.js.map