@samva/vite 0.3.0 → 0.5.0

package/dist/editor/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>Samva editor</title>
-    <script type="module" crossorigin src="./assets/index-Cot9JDdw.js"></script>
+    <script type="module" crossorigin src="./assets/index-BZ-5-1V0.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-Cg4x6ewh.css">
   </head>
   <body>

package/dist/emit.js

@@ -1,6 +1,6 @@
-import { Result } from "effect";
 import { COMPILER_VERSION, compileSource } from "@samva/markup/compile";
 import { emitModule } from "@samva/markup/emit";
+import { Result } from "better-result";
 //#region src/emit.ts
 const countRepairable = (diagnostics) => diagnostics.filter((diagnostic) => diagnostic.repair !== void 0).length;
 const uniquePlaceholders = (source) => source === void 0 ? [] : [...new Set([...source.matchAll(/{{\s*([A-Za-z_][\w.-]*)\s*}}/g)].map((match) => match[1] ?? ""))].filter(Boolean).sort();
@@ -20,16 +20,16 @@ const validationSummary = (source, emitDiagnostics, compiled) => {
 /** Compile one source into its channel-polymorphic preview. */
 const compiledPreview = (source) => {
 	const probe = compileSource(source);
-	if (Result.isFailure(probe)) return {
+	if (Result.isError(probe)) return {
 		channel: "unknown",
 		compileOk: false,
 		compiled: {
 			channel: "unknown",
 			ok: false,
-			diagnostics: probe.failure.diagnostics
+			diagnostics: probe.error.diagnostics
 		}
 	};
-	const compiled = probe.success;
+	const compiled = probe.value;
 	if (compiled.channel === "sms") return {
 		channel: "sms",
 		compileOk: true,

package/dist/index.js

@@ -7,7 +7,6 @@ import { open, readFile, realpath, rename, rm, stat } from "node:fs/promises";
 import { extname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 import { checkEmailCompatibility, emailSelections } from "@samva/markup/compiler";
-import { Predicate } from "effect";
 import { createServerModuleRunner, loadEnv } from "vite";
 import { createHash, randomUUID } from "node:crypto";
 const hashSource = (source) => createHash("sha256").update(source, "utf8").digest("hex").slice(0, 16);
@@ -248,12 +247,39 @@ var EditorFileStore = class {
 	async catalog() {
 		return this.ensureLoaded();
 	}
-	/** Re-evaluate discovery and every TSX entry after template/dependency/theme HMR. */
+	/**
+	* Re-evaluate discovery and every TSX entry after template/dependency/theme HMR.
+	* `changed` names the file whose change asked for this refresh.
+	*
+	* This store writes template files itself, so an editor save comes back as a
+	* change event indistinguishable from an author's own edit in another program.
+	* Re-running the project for it costs a second full evaluation — the price of
+	* one save is the whole catalog, twice — and republishes the document with no
+	* client attached, which is exactly how a foreign edit reaches the editor. A
+	* changed file that still holds the bytes its current entry was built from is
+	* already evaluated, so there is nothing to publish and nothing to rebuild.
+	* Every other path, and every file whose bytes have moved, is a real change.
+	*/
 	async refreshAll(options = {}) {
 		const loading = this.initialLoad;
 		if (loading !== void 0) await loading;
 		else if (!this.loaded) return this.ensureLoaded();
-		return this.serialize(() => this.rebuild(options.documents ?? true));
+		return this.serialize(async () => await this.alreadyBuilt(options.changed) ? this.catalogSnapshot() : this.rebuild(options.documents ?? true));
+	}
+	/**
+	* True when `path` is a discovered entry whose file still holds the exact bytes
+	* that entry was evaluated from. Read inside the mutation queue, so a save's own
+	* rebuild has already landed by the time its change event asks.
+	*/
+	async alreadyBuilt(path) {
+		if (path === void 0) return false;
+		const id = this.idFor(path);
+		if (id === void 0) return false;
+		const entry = this.entries.get(id);
+		if (entry === void 0 || entry.template.stale || entry.authoredSource === void 0) return false;
+		const resolved = await this.resolvePath(id);
+		if (resolved === void 0) return false;
+		return await readFile(resolved, "utf8").catch(() => void 0) === entry.authoredSource;
 	}
 	async list() {
 		return (await this.catalog()).templates;
@@ -355,43 +381,51 @@ var EditorFileStore = class {
 	* Show another declared fixture of an email document. It re-renders the same
 	* build, so the revision does not move; the resulting document reaches every
 	* watcher on the change stream, attributed to the client that asked.
+	*
+	* It runs in the mutation queue for the same reason a save does: the viewed
+	* fixture is part of the entry, and a rebuild that straddled the switch would
+	* take its own snapshot from before it and its evaluation from after it, then
+	* publish the difference with no client — the reader's own fixture switch,
+	* returned to them as somebody else's edit.
 	*/
 	async viewFixture(id, fixture, client) {
 		if (!this.loaded) await this.ensureLoaded();
-		const entry = this.entries.get(id);
-		if (entry === void 0) return {
-			ok: false,
-			kind: "missing",
-			error: "template not found"
-		};
-		if (entry.content.channel !== "email") return {
-			ok: false,
-			kind: "refused",
-			error: `A ${entry.content.channel} template renders no fixture.`
-		};
-		if (!entry.content.fixtures.includes(fixture)) return {
-			ok: false,
-			kind: "refused",
-			error: `Template declares no fixture named ${JSON.stringify(fixture)}.`
-		};
-		const meta = this.session.get(id);
-		this.session.set(id, {
-			...meta,
-			metadata: meta?.metadata ?? {},
-			fixture
-		});
-		const loaded = await this.load(id, entry);
-		if (loaded.entry === void 0) {
-			if (loaded.diagnostics.length > 0) this.diagnostics.set(id, loaded.diagnostics);
-			return {
+		return this.serialize(async () => {
+			const entry = this.entries.get(id);
+			if (entry === void 0) return {
+				ok: false,
+				kind: "missing",
+				error: "template not found"
+			};
+			if (entry.content.channel !== "email") return {
 				ok: false,
 				kind: "refused",
-				error: `Template ${id} could not be re-rendered.`
+				error: `A ${entry.content.channel} template renders no fixture.`
 			};
-		}
-		this.entries.set(id, loaded.entry);
-		this.publishEntry(id, loaded.entry, client);
-		return { ok: true };
+			if (!entry.content.fixtures.includes(fixture)) return {
+				ok: false,
+				kind: "refused",
+				error: `Template declares no fixture named ${JSON.stringify(fixture)}.`
+			};
+			const meta = this.session.get(id);
+			this.session.set(id, {
+				...meta,
+				metadata: meta?.metadata ?? {},
+				fixture
+			});
+			const loaded = await this.load(id, entry);
+			if (loaded.entry === void 0) {
+				if (loaded.diagnostics.length > 0) this.diagnostics.set(id, loaded.diagnostics);
+				return {
+					ok: false,
+					kind: "refused",
+					error: `Template ${id} could not be re-rendered.`
+				};
+			}
+			this.entries.set(id, loaded.entry);
+			this.publishEntry(id, loaded.entry, client);
+			return { ok: true };
+		});
 	}
 	publishEntry(id, entry, client) {
 		const change = {
@@ -413,6 +447,10 @@ var EditorFileStore = class {
 	}
 };
 //#endregion
+//#region src/internal/guards.ts
+/** A non-null, non-array object, narrowed for property access. */
+const isObject = (input) => typeof input === "object" && input !== null && !Array.isArray(input);
+//#endregion
 //#region src/editor.ts
 const DEFAULT_ROUTE = "/";
 const MODULE_EXTENSIONS = /* @__PURE__ */ new Set([
@@ -536,11 +574,11 @@ const LOCAL_RENDER = { relativeUrls: true };
 */
 const variablesOf = (definition) => {
 	const properties = definition.schema.schema["properties"];
-	if (!Predicate.isObject(properties)) return [];
+	if (!isObject(properties)) return [];
 	const required = definition.schema.schema["required"];
 	const names = Array.isArray(required) ? required : [];
 	return Object.entries(properties).map(([name, property]) => {
-		const examples = Predicate.isObject(property) ? property["examples"] : void 0;
+		const examples = isObject(property) ? property["examples"] : void 0;
 		const example = Array.isArray(examples) ? examples[0] : void 0;
 		return {
 			name,
@@ -740,6 +778,9 @@ const samvaEditor = (options = {}) => {
 			const refreshTheme = () => {
 				queueStoreRefresh(server, () => store.refreshAll({ documents: true }));
 			};
+			let burst = /* @__PURE__ */ new Set();
+			let burstShape = false;
+			let burstQueued = false;
 			const refreshTsxDependents = (path, shapeChange) => {
 				const ssr = server.environments.ssr;
 				if (ssr === void 0) return;
@@ -747,18 +788,31 @@ const samvaEditor = (options = {}) => {
 				const directTemplate = path.endsWith(".tsx") && store.idFor(path) !== void 0;
 				const potentialModuleShapeChange = shapeChange && changedModules.size === 0 && MODULE_EXTENSIONS.has(extname(path));
 				if (!directTemplate && changedModules.size === 0 && !potentialModuleShapeChange) return;
+				burst.add(path);
+				burstShape ||= shapeChange;
+				if (burstQueued) return;
+				burstQueued = true;
 				queueStoreRefresh(server, async () => {
+					const paths = burst;
+					const shape = burstShape;
+					burst = /* @__PURE__ */ new Set();
+					burstShape = false;
+					burstQueued = false;
 					const invalidated = /* @__PURE__ */ new Set();
 					const collectImporters = (module) => {
 						if (invalidated.has(module)) return;
 						invalidated.add(module);
 						for (const importer of module.importers) collectImporters(importer);
 					};
-					for (const module of changedModules) collectImporters(module);
-					if (shapeChange) ssr.moduleGraph.invalidateAll();
+					for (const changed of paths) for (const module of ssr.moduleGraph.getModulesByFile(changed) ?? []) collectImporters(module);
+					if (shape) ssr.moduleGraph.invalidateAll();
 					else for (const module of invalidated) ssr.moduleGraph.invalidateModule(module);
 					moduleRunner.evaluatedModules.clear();
-					return store.refreshAll({ documents: true });
+					const only = paths.size === 1 ? [...paths][0] : void 0;
+					return store.refreshAll({
+						documents: true,
+						changed: only
+					});
 				});
 			};
 			const onChange = (path) => {
@@ -850,7 +904,7 @@ const samvaEditor = (options = {}) => {
 								if (error instanceof EditorBodyTooLarge) return sendJson(res, 413, { error: error.message });
 								return sendJson(res, 400, { error: "malformed JSON body" });
 							}
-							if (!Predicate.isObject(body) || body["kind"] !== "authoredSource" || typeof body["baseRev"] !== "string" || typeof body["authoredSource"] !== "string") return sendJson(res, 400, { error: "Expected a revision-bound authored source update." });
+							if (!isObject(body) || body["kind"] !== "authoredSource" || typeof body["baseRev"] !== "string" || typeof body["authoredSource"] !== "string") return sendJson(res, 400, { error: "Expected a revision-bound authored source update." });
 							if (Buffer.byteLength(body["authoredSource"], "utf8") > 1048576) return sendJson(res, 413, { error: "Authored source exceeds the 1 MiB limit." });
 							const outcome = await store.saveSource(id, body["baseRev"], body["authoredSource"], query.get("client") ?? void 0);
 							if (outcome.ok) return sendJson(res, 200, { rev: outcome.rev });
@@ -872,7 +926,7 @@ const samvaEditor = (options = {}) => {
 						} catch {
 							return sendJson(res, 400, { error: "malformed JSON body" });
 						}
-						if (!Predicate.isObject(body) || typeof body["fixture"] !== "string") return sendJson(res, 400, { error: "malformed JSON body" });
+						if (!isObject(body) || typeof body["fixture"] !== "string") return sendJson(res, 400, { error: "malformed JSON body" });
 						const outcome = await store.viewFixture(id, body["fixture"], query.get("client") ?? void 0);
 						if (outcome.ok) return sendJson(res, 200, {});
 						return sendJson(res, outcome.kind === "missing" ? 404 : 422, { error: outcome.error });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samva/vite",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Unified Vite editor for Samva email, SMS, and WhatsApp templates",
   "keywords": [
     "email",
@@ -70,10 +70,10 @@
   },
   "dependencies": {
     "@babel/parser": "^8.0.4",
-    "@samva/markup": "^0.3.0",
+    "@samva/markup": "^0.5.0",
+    "better-result": "3.0.1",
     "caniemail": "2.0.2",
     "css-tree": "3.2.1",
-    "effect": "4.0.0-rc.112",
     "tailwindcss": "^4.3.3"
   },
   "devDependencies": {