@samva/vite 0.7.0 → 0.8.0

package/AGENTS.md

@@ -56,6 +56,10 @@ version your previews, checks, and builds use.
   entry's canonical `.tsx` source after checking that the file on disk is still the revision it
   read, so a change you saved elsewhere is not overwritten; reload the entry and retry. SMS and
   WhatsApp entries are read-only in the editor.
+- **Committing or hand-editing `.samva/brands`.** `samva:brand` resolves live first and falls
+  back to the snapshot `samva brands pull` writes there, warning when it is older than the live
+  brand. The API owns the brand, so the directory is gitignored and refreshed with `pull`; a
+  project with neither credentials nor a snapshot fails with `brand-unavailable`.
 
 ## Rules
 
@@ -84,4 +88,5 @@ version your previews, checks, and builds use.
 - `vite` with `samvaEditor()` configured serves the editor at the configured `route`; every entry
   should appear with its fixtures.
 - `exportEmailProject({ dir, out })` writes browsable HTML and text for every fixture and a
-  `catalog.json` with the asset mapping and findings, without Samva credentials.
+  `catalog.json` with the asset mapping and findings, without Samva credentials unless the project
+  imports `samva:brand` and has no snapshot.

package/README.md

@@ -102,7 +102,9 @@ client-specific proof.
 
 ## Theme, check, and publish
 
-A root `theme.css` uses Tailwind v4 `@theme` syntax. Theme changes recompile
+A root `theme.css` uses Tailwind v4 `@theme` syntax and may `@import` other project `.css` files
+and `samva:brand`; any other import is a compile error. Changes to the theme or a stylesheet it
+imports recompile
 local previews while preserving the last valid theme when an edit is temporarily
 invalid.
 
@@ -118,7 +120,27 @@ per rebuild and `--json` is one-shot. A successful fixture check does not prove
 input branch.
 
 Imported email assets require `assetBase` in `buildTemplates()` or `--asset-base` in CLI checks
-and builds, naming their actual HTTPS serving base. No credentials are needed for local work.
+and builds, naming their actual HTTPS serving base.
+
+## The organization brand
+
+A project that imports `samva:brand` (the default brand) or `samva:brand/<slug>` compiles against
+its organization's brand. The editor, `buildTemplates()`, and `exportEmailProject()` resolve it in
+this order:
+
+1. **Live.** With `SAMVA_API_KEY` in the environment or the project's `.env` (and `SAMVA_API_URL`
+   for another API), the brand is fetched directly. Without one, the `samva` CLI on `PATH` is asked
+   (`samva brands get --json`) and answers with your `samva login` session, which stays in the
+   operating-system keyring the CLI owns.
+2. **Snapshot.** `.samva/brands/<slug>.json`, written by `samva brands pull [slug]`, with a
+   `brand-offline` warning.
+3. **Neither.** The build fails with `brand-unavailable`, naming both fixes.
+
+When the live brand's digest differs from the snapshot's, the build warns with
+`brand-snapshot-stale`; run `samva brands pull` again. Warnings are build diagnostics and editor
+log lines; they never fail a build. The editor and `check --watch` reuse a resolution briefly,
+so a brand edited elsewhere arrives within seconds rather than on the next save. Keep `.samva` in
+`.gitignore`. A project that imports no brand needs no credentials for local work.
 
 For a hosted project, commit and push the checked TSX tree with ordinary Git, then publish one exact
 commit:
@@ -145,9 +167,13 @@ publication by default; later source edits do not change that publication.
 ```ts
 import { exportEmailProject } from "@samva/vite/project";
 
-const receipt = await exportEmailProject({ dir: ".", out: "dist/email" });
+const receipt = await exportEmailProject({ dir: "emails", root: ".", out: "dist/email" });
 ```
 
+`dir` holds the templates and `root` (default `dir`) is the project: its `theme.css` themes the
+export, as in `buildTemplates()`, `theme` names another file or `false` disables it, and
+`samva:brand` resolves as described above.
+
 Export writes `templates/<id>/<fixture>.html` and `.txt`, content-addressed files under `assets/`,
 and `catalog.json` with the asset mapping and findings. The default `../../assets` base resolves
 from each exported page. For delivery, supply the actual HTTPS `assetBase` and serve those bytes

package/dist/build.js

@@ -1,7 +1,7 @@
-import { n as resolveThemePath, r as discoverTemplateFiles, t as readProjectThemeCss } from "./theme-CBF6Czjm.js";
+import { c as projectThemePath, f as brandDiagnostics, i as isTemplateDefinition, l as readProjectThemeCss, m as loadBrandEnv, o as readEmailProject, p as createBrandResolver, s as renderEmailFixtures, u as resolveThemePath } from "./project-RON2Ei7d.js";
+import { t as discoverTemplateFiles } from "./discovery-D2eR-rzi.js";
 import { COMPILER_VERSION, emitModulePreview } from "./emit.js";
 import { createEmailRenderer } from "./email.js";
-import { isTemplateDefinition, readEmailProject, renderEmailFixtures } from "./project.js";
 import { dirname, parse, relative, resolve, sep } from "node:path";
 //#region src/build.ts
 /** Execute each email definition's fixtures; compile structured SMS/WhatsApp through their channel compiler. */
@@ -38,17 +38,30 @@ const createTemplateBuildSession = async (dir, options = {}) => {
 	let closed = false;
 	let emailRenderer;
 	let previousTheme;
+	let previousBrand;
+	const brands = createBrandResolver({
+		root,
+		env: await loadBrandEnv(root)
+	});
 	const build = async () => {
 		server.moduleGraph.invalidateAll();
 		const themeCss = await readProjectThemeCss(themePath);
-		if (emailRenderer !== void 0 && themeCss !== previousTheme) {
+		const files = await discoverTemplateFiles(templatesDir);
+		const sourceFiles = await readEmailProject(root);
+		const themeFile = themePath === void 0 ? void 0 : projectThemePath(root, themePath);
+		const brandResolution = await brands.resolve(themeFile === void 0 || themeCss === void 0 ? sourceFiles : {
+			...sourceFiles,
+			[themeFile]: themeCss
+		}, themeFile);
+		const brand = brandResolution.ok ? brandResolution.brand : void 0;
+		const brandFindings = brandDiagnostics(brandResolution);
+		if (emailRenderer !== void 0 && (themeCss !== previousTheme || brand?.digest !== previousBrand)) {
 			await emailRenderer.close();
 			emailRenderer = void 0;
 		}
 		previousTheme = themeCss;
+		previousBrand = brand?.digest;
 		emailRenderer?.invalidate();
-		const files = await discoverTemplateFiles(templatesDir);
-		const sourceFiles = await readEmailProject(root);
 		const entries = [];
 		const emailIds = /* @__PURE__ */ new Map();
 		for (const file of files) {
@@ -84,7 +97,11 @@ const createTemplateBuildSession = async (dir, options = {}) => {
 				const preview = await (async () => {
 					emailRenderer ??= await createEmailRenderer({
 						assetBase: options.assetBase ?? "",
-						...themeCss === void 0 ? {} : { tailwind: { css: themeCss } }
+						...themeCss === void 0 || themeFile === void 0 ? {} : { tailwind: {
+							css: themeCss,
+							cssPath: themeFile
+						} },
+						...brand === void 0 ? {} : { brand }
 					});
 					const loaded = await emailRenderer.load(sourceFiles, entryPath, entryPath);
 					const template = loaded.template;
@@ -106,7 +123,7 @@ const createTemplateBuildSession = async (dir, options = {}) => {
 						},
 						diagnostics: fixture.diagnostics
 					}));
-					const diagnostics = [...loaded.compiled.diagnostics];
+					const diagnostics = [...brandFindings, ...loaded.compiled.diagnostics];
 					if (fixtures.length === 0) diagnostics.push(emailFinding("missing-fixtures", `${template.id} must declare at least one fixture for check and build.`));
 					if (loaded.compiled.assets.length > 0 && options.assetBase === void 0) diagnostics.push(emailFinding("missing-asset-base", "Imported email assets require --asset-base with their HTTPS serving origin."));
 					if (loaded.compiled.assets.length > 0 && options.assetBase !== void 0 && !/^https:\/\//i.test(options.assetBase)) diagnostics.push(emailFinding("invalid-asset-base", "Email check and build require an HTTPS --asset-base; relative URLs belong to templates export."));
@@ -126,7 +143,13 @@ const createTemplateBuildSession = async (dir, options = {}) => {
 							fixtures
 						}]
 					};
-				})().catch(emailFailure);
+				})().catch((cause) => {
+					const failure = emailFailure(cause);
+					return {
+						...failure,
+						diagnostics: [...brandFindings, ...failure.diagnostics]
+					};
+				});
 				entries.push({
 					id: file.id,
 					kind: file.kind,

package/dist/{theme-CBF6Czjm.js → discovery-D2eR-rzi.js}

@@ -1,5 +1,5 @@
-import { readFile, readdir } from "node:fs/promises";
-import { isAbsolute, join, relative, resolve, sep } from "node:path";
+import { readdir } from "node:fs/promises";
+import { join, relative, sep } from "node:path";
 //#region src/discovery.ts
 const isTemplateFile = (name) => name.endsWith(".tsx");
 const toPosix = (value) => sep === "/" ? value : value.split(sep).join("/");
@@ -29,22 +29,7 @@ const discoverTemplateFiles = async (dir) => {
 	await walk(dir);
 	return found.sort((a, b) => a.id < b.id ? -1 : a.id > b.id ? 1 : 0);
 };
-/**
-* Resolves the `theme` plugin option to an absolute path, or `undefined` when
-* theming is explicitly disabled (`theme: false`). A string is taken relative to
-* `root` (absolute strings pass through); the default is `<root>/theme.css`.
-*/
-const resolveThemePath = (root, option) => {
-	if (option === false) return void 0;
-	const file = option ?? "theme.css";
-	return isAbsolute(file) ? file : resolve(root, file);
-};
-/** Read authored Tailwind CSS verbatim; the email compiler validates its syntax. */
-const readProjectThemeCss = async (path) => path === void 0 ? void 0 : readFile(path, "utf8").catch((cause) => {
-	if (cause.code === "ENOENT") return void 0;
-	throw cause;
-});
 //#endregion
-export { resolveThemePath as n, discoverTemplateFiles as r, readProjectThemeCss as t };
+export { discoverTemplateFiles as t };
 
-//# sourceMappingURL=theme-CBF6Czjm.js.map
+//# sourceMappingURL=discovery-D2eR-rzi.js.map