@marver-design/marver 0.3.1 → 0.5.0

package/dist/dev-DdeU-Jst.mjs

@@ -0,0 +1,162 @@
+import { n as NAME, r as PKG } from "./cli.mjs";
+import { o as loadConfig, s as detectHost } from "./manifest-C8FODq2S.mjs";
+import { n as tailwind3Css, r as tailwind4Plugin, t as marverPlugin } from "./plugin-BtSGAm2h.mjs";
+import { basename, dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { createLogger, createServer, searchForWorkspaceRoot } from "vite";
+import react from "@vitejs/plugin-react";
+import { createServer as createServer$1 } from "node:net";
+//#region src/server/dev.ts
+/** packageDir = the installed marver package root (dist/cli.js lives one level down). */
+function packageDir() {
+	return join(dirname(fileURLToPath(import.meta.url)), "..");
+}
+const portFree = (p) => new Promise((res) => {
+	const s = createServer$1();
+	s.once("error", () => res(false));
+	s.once("listening", () => s.close(() => res(true)));
+	s.listen(p, "127.0.0.1");
+});
+/** C1: a deterministic per-project port in [5200,5399] derived from the root path. Two projects
+*  never collide, and the same project always lands on the same port across restarts. */
+const projectPort = (root) => {
+	let h = 0;
+	for (let i = 0; i < root.length; i++) h = Math.imul(h, 31) + root.charCodeAt(i) | 0;
+	return 5200 + Math.abs(h) % 200;
+};
+/** Pick the port to serve on: the desired one if free, else a DETERMINISTIC per-project fallback -
+*  never a silent next-free drift, which made a bookmarked tab silently serve a DIFFERENT project. */
+async function pickPort(root, desired) {
+	if (await portFree(desired)) return {
+		port: desired,
+		fellBack: false
+	};
+	let p = projectPort(root);
+	for (let i = 0; i < 200; i++) {
+		if (p !== desired && await portFree(p)) return {
+			port: p,
+			fellBack: true
+		};
+		p = 5200 + (p - 5200 + 1) % 200;
+	}
+	return {
+		port: desired,
+		fellBack: true
+	};
+}
+async function dev(root, portFlag) {
+	const config = await loadConfig(root);
+	const host = detectHost(root);
+	const pkgDir = packageDir();
+	const clientDir = join(pkgDir, "src", "client");
+	const projectName = basename(root);
+	const desiredPort = portFlag ?? (config.port !== 5199 ? config.port : void 0) ?? projectPort(root);
+	const picked = await pickPort(root, desiredPort);
+	const plugins = [react()];
+	if (host.tailwind === 4) {
+		const tw = await tailwind4Plugin(root);
+		if (tw) plugins.push(...tw);
+		else console.warn(`[marver] tailwindcss v4 detected but @tailwindcss/vite could not be loaded - utility classes WILL be missing from frames. Fix: npm i -D @tailwindcss/vite (used only by the canvas, never by your app's build).`);
+	}
+	let css;
+	if (host.tailwind === 3) css = await tailwind3Css(root) ?? void 0;
+	plugins.push(marverPlugin({
+		root,
+		clientDir,
+		config,
+		detectedThemeCss: host.themeCss
+	}));
+	const logger = createLogger("info");
+	const noise = (msg) => /Sourcemap for .*node_modules.*points to/.test(msg);
+	const warnBase = logger.warn.bind(logger);
+	const warnOnceBase = logger.warnOnce.bind(logger);
+	logger.warn = (msg, opts) => {
+		if (!noise(msg)) warnBase(msg, opts);
+	};
+	logger.warnOnce = (msg, opts) => {
+		if (!noise(msg)) warnOnceBase(msg, opts);
+	};
+	const server = await createServer({
+		configFile: false,
+		root,
+		css,
+		customLogger: logger,
+		plugins,
+		server: {
+			port: picked.port,
+			strictPort: false,
+			fs: { allow: [.../* @__PURE__ */ new Set([
+				root,
+				pkgDir,
+				searchForWorkspaceRoot(root)
+			])] },
+			watch: { ignored: [
+				"**/design/manifest.json",
+				"**/design/boards/**",
+				"**/design/.local/**",
+				"**/design/.dist/**",
+				"**/design/comments/**",
+				"**/.next/**",
+				"**/.turbo/**",
+				"**/.vercel/**",
+				"**/.output/**",
+				"**/dist/**",
+				"**/build/**",
+				"**/out/**",
+				"**/coverage/**",
+				"**/.gstack/**",
+				"**/.git/**",
+				"**/.playwright-mcp/**"
+			] },
+			warmup: { clientFiles: [
+				join(clientDir, "frame-host", "main.tsx"),
+				join(clientDir, "frame-host", "bridge.js"),
+				join(clientDir, "content", "index.tsx"),
+				join(clientDir, "content", "diagram.tsx"),
+				join(clientDir, "content", "md.ts")
+			] }
+		},
+		resolve: {
+			dedupe: ["react", "react-dom"],
+			tsconfigPaths: true
+		},
+		optimizeDeps: {
+			exclude: [PKG],
+			include: [
+				"react",
+				"react-dom",
+				"react-dom/client",
+				"react/jsx-runtime",
+				"react/jsx-dev-runtime",
+				`${PKG} > marked`,
+				`${PKG} > mermaid`,
+				`${PKG} > html-to-image`
+			],
+			entries: [join(clientDir, "frame-host", "index.html"), "design/**/*.{tsx,jsx}"]
+		},
+		logLevel: "info"
+	});
+	await server.listen();
+	const addr = server.httpServer?.address();
+	const port = typeof addr === "object" && addr ? addr.port : picked.port;
+	if (picked.fellBack) console.log(`\n  port ${desiredPort} is in use - serving "${projectName}" on ${port} instead`);
+	console.log(`\n  ${NAME} · ${projectName} → http://localhost:${port}/\n`);
+	const { loadCollab, syncOnce } = await import("./sync-CkBk-tUk.mjs").then((n) => n.a);
+	if (loadCollab(root)) console.log(`  comments: syncing with the published canvas (design/.local/collab.json)\n`);
+	let syncing = false;
+	const tick = async () => {
+		if (syncing) return;
+		syncing = true;
+		try {
+			const collab = loadCollab(root);
+			if (collab) await syncOnce(root, collab).catch(() => {});
+		} finally {
+			syncing = false;
+		}
+	};
+	tick();
+	setInterval(tick, 3e4).unref();
+	return server;
+}
+//#endregion
+export { dev };

package/dist/{init-DolP_Ld4.mjs → init-DsCUmlCW.mjs}

@@ -1,5 +1,5 @@
 import { n as NAME } from "./cli.mjs";
-import { i as DEFAULTS, n as scanFrames, o as detectHost, r as writeManifest, s as readJson } from "./manifest-DW-T52MM.mjs";
+import { a as DEFAULTS, c as readJson, i as writeManifest, r as scanFrames, s as detectHost } from "./manifest-C8FODq2S.mjs";
 import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join, relative } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -133,6 +133,7 @@ function init(root, opts) {
 		refresh("tsconfig.json", [STANDALONE_TSCONFIG], tsconfigNow());
 	}
 	write(".gitignore", ".local/\n.dist/\n");
+	write(".gitattributes", "comments/*.jsonl merge=union\n");
 	write("scenes/_layout.tsx", readFileSync(join(templates, "root-layout.tsx"), "utf8"));
 	if (!existsSync(join(design, "boards"))) {
 		mkdirSync(join(design, "boards"), { recursive: true });

package/dist/{manifest-DW-T52MM.mjs → manifest-C8FODq2S.mjs}

@@ -247,6 +247,31 @@ function toFrameId(designRelPath) {
 	const noExt = designRelPath.split(sep).join("/").replace(FRAME_EXT, "");
 	return noExt.startsWith("scenes/") ? noExt.slice(7) : noExt;
 }
+/**
+* A7: which frames does a changed `design/**` file affect? Manifest + directory conventions,
+* NOT a module-graph walk (deterministic, cheap, may over-reload but never misses a
+* conventionally-affected frame). Returns:
+*   null  -> uncontrolled: leave to default Vite HMR (src/** deps, theme.css, config, assets)
+*   []    -> controlled but affects no current frame (e.g. a layout in an empty dir)
+*   [ids] -> controlled: the shell drives a rev-stamped reload of these frames
+*/
+function affectedFrameIds(absFile, root, manifest) {
+	const design = join(root, "design");
+	if (absFile !== design && !absFile.startsWith(design + sep)) return null;
+	const rel = relative(design, absFile).split(sep).join("/");
+	const name = rel.split("/").pop() ?? rel;
+	const designRel = `design/${rel}`;
+	const tsxFrames = manifest.frames.filter((f) => f.kind === "tsx");
+	if (name === "theme.css") return null;
+	if (rel === "providers.tsx" || rel === "providers.jsx") return tsxFrames.map((f) => f.id);
+	if (/(^|\/)(_layout\.(tsx|jsx)|_fixtures\.(ts|tsx|js|jsx|json))$/.test(rel)) {
+		const prefix = `design/${rel.slice(0, rel.length - name.length)}`;
+		return tsxFrames.filter((f) => f.file.startsWith(prefix)).map((f) => f.id);
+	}
+	const direct = manifest.frames.find((f) => f.file === designRel);
+	if (direct) return [direct.id];
+	return null;
+}
 function walk(dir, out = []) {
 	if (!existsSync(dir)) return out;
 	for (const e of readdirSync(dir, { withFileTypes: true })) {
@@ -399,4 +424,4 @@ function writeManifest(root, manifest) {
 }
 const hash = (s) => createHash("sha256").update(s).digest("hex");
 //#endregion
-export { loadConfig as a, DEFAULTS as i, scanFrames as n, detectHost as o, writeManifest as r, readJson as s, hash as t };
+export { DEFAULTS as a, readJson as c, writeManifest as i, hash as n, loadConfig as o, scanFrames as r, detectHost as s, affectedFrameIds as t };

package/dist/{plugin-Crp4CAma.mjs → plugin-BtSGAm2h.mjs}

@@ -1,7 +1,7 @@
 import { i as ROUTE, n as NAME, r as PKG } from "./cli.mjs";
-import { n as scanFrames, r as writeManifest, t as hash } from "./manifest-DW-T52MM.mjs";
+import { i as writeManifest, n as hash, r as scanFrames, t as affectedFrameIds } from "./manifest-C8FODq2S.mjs";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, watch, writeFileSync } from "node:fs";
-import { dirname, join, resolve, sep } from "node:path";
+import { basename, dirname, join, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 import { randomBytes } from "node:crypto";
 //#region src/server/api.ts
@@ -110,6 +110,10 @@ function apiMiddleware(root) {
 					} catch {
 						return json(res, 400, { error: "malformed JSON" });
 					}
+					if (body.mustExist && !existsSync(p)) return json(res, 409, {
+						error: "board no longer exists on disk",
+						gone: true
+					});
 					const current = existsSync(p) ? readFileSync(p, "utf8") : "";
 					if (current && body.baseHash !== hash(current)) {
 						let disk = null;
@@ -128,12 +132,126 @@ function apiMiddleware(root) {
 					return json(res, 200, { sha256: hash(next2) });
 				}
 			}
+			if (path === "me" && req.method === "GET") return json(res, 200, {
+				user: localProfile(root),
+				role: "owner",
+				local: true
+			});
+			if (path === "profile" && req.method === "POST") {
+				const raw = await readBody(req);
+				if (raw == null) return json(res, 400, { error: "body too large" });
+				let b;
+				try {
+					b = JSON.parse(raw);
+				} catch {
+					return json(res, 400, { error: "malformed JSON" });
+				}
+				const dir = join(root, "design", ".local");
+				mkdirSync(dir, { recursive: true });
+				const prof = {
+					...localProfile(root),
+					...typeof b.name === "string" && b.name.trim() ? { name: b.name.trim() } : {},
+					...typeof b.email === "string" ? { email: b.email.trim() } : {},
+					...typeof b.avatar === "string" ? { avatar: b.avatar || void 0 } : {}
+				};
+				atomicWrite(join(dir, "profile.json"), JSON.stringify(prof, null, 2) + "\n");
+				return json(res, 200, { user: prof });
+			}
+			if (path === "boards.rights" && req.method === "GET") {
+				const { listBoards } = await import("./comments-Ba8mU600.mjs").then((n) => n.n);
+				return json(res, 200, {
+					local: true,
+					stored: listBoards(join(root, "design", "comments"))
+				});
+			}
+			const cm = /^comments\/([a-z0-9][a-z0-9-]*)$/.exec(path);
+			if (cm) {
+				const { appendEvents, readLog } = await import("./comments-Ba8mU600.mjs").then((n) => n.n);
+				const dir = join(root, "design", "comments");
+				if (req.method === "GET") return json(res, 200, { events: readLog(dir, cm[1]) });
+				if (req.method === "POST") {
+					const raw = await readBody(req);
+					if (raw == null) return json(res, 400, { error: "body too large" });
+					let b;
+					try {
+						b = JSON.parse(raw);
+					} catch {
+						return json(res, 400, { error: "malformed JSON" });
+					}
+					const incoming = Array.isArray(b.events) ? b.events : [];
+					const me = localProfile(root);
+					const stamped = incoming.map((ev) => ({
+						...ev,
+						board: ev.board ?? cm[1],
+						author: ev.author ?? ([
+							"create",
+							"reply",
+							"react",
+							"edit"
+						].includes(ev.type) ? me : void 0)
+					}));
+					const fresh = appendEvents(dir, cm[1], stamped);
+					backgroundPush(root);
+					return json(res, 200, { accepted: fresh.length });
+				}
+			}
+			if (path === "sync" && req.method === "POST") {
+				const { loadCollab, syncOnce } = await import("./sync-CkBk-tUk.mjs").then((n) => n.a);
+				const collab = loadCollab(root);
+				if (!collab) return json(res, 200, { connected: false });
+				try {
+					return json(res, 200, {
+						connected: true,
+						boards: await syncOnce(root, collab)
+					});
+				} catch (err) {
+					return json(res, 502, {
+						connected: true,
+						error: err.message
+					});
+				}
+			}
 			json(res, 404, { error: "unknown endpoint" });
 		} catch (err) {
 			json(res, 500, { error: err.message });
 		}
 	};
 }
+function localProfile(root) {
+	try {
+		const c = JSON.parse(readFileSync(join(root, "design", ".local", "collab.json"), "utf8"));
+		if (typeof c?.email === "string" && c.email) return {
+			email: c.email,
+			name: c.name ?? "Designer"
+		};
+	} catch {}
+	try {
+		const p = JSON.parse(readFileSync(join(root, "design", ".local", "profile.json"), "utf8"));
+		if (typeof p?.name === "string") return {
+			email: p.email ?? "",
+			name: p.name,
+			avatar: p.avatar
+		};
+	} catch {}
+	return {
+		email: "",
+		name: "Designer"
+	};
+}
+let pushTimer = null;
+/** Debounced fire-and-forget push after a local write; failures are silent - the
+*  30s sync loop is the reliability layer, this is just latency. */
+function backgroundPush(root) {
+	if (pushTimer) return;
+	pushTimer = setTimeout(async () => {
+		pushTimer = null;
+		try {
+			const { loadCollab, syncOnce } = await import("./sync-CkBk-tUk.mjs").then((n) => n.a);
+			const collab = loadCollab(root);
+			if (collab) await syncOnce(root, collab);
+		} catch {}
+	}, 1500);
+}
 //#endregion
 //#region src/server/routes.ts
 /**
@@ -259,6 +377,20 @@ const VIRTUAL_CONFIG = "virtual:sh-config";
 const VIRTUAL_DATA = "virtual:sh-data";
 function marverPlugin(ctx) {
 	const { root, clientDir, config } = ctx;
+	let manifest = scanFrames(root);
+	let devServer = null;
+	const bootId = String(process.hrtime.bigint());
+	let invRev = 0;
+	const pendingInv = /* @__PURE__ */ new Set();
+	const flushInv = debounce(() => {
+		if (!devServer || !pendingInv.size) return;
+		const frameIds = [...pendingInv];
+		pendingInv.clear();
+		devServer.ws.send("sh:frame-invalidated", {
+			frameIds,
+			revision: `${bootId}:${++invRev}`
+		});
+	}, 120);
 	/** Theme resolution: design/theme.css wrapper > configured > detected > empty (spec §5.4). */
 	const themeFile = () => {
 		const wrapper = join(root, "design", "theme.css");
@@ -269,6 +401,7 @@ function marverPlugin(ctx) {
 	};
 	return {
 		name: "marver",
+		enforce: "pre",
 		resolveId(id) {
 			if (id === VIRTUAL_THEME) return themeFile() ?? "\0virtual:sh-theme.css";
 			if (id === VIRTUAL_CONFIG) return "\0virtual:sh-config";
@@ -293,7 +426,8 @@ function marverPlugin(ctx) {
 					themes: config.themes,
 					zoomSpeed: config.zoomSpeed,
 					noTheme: themeFile() == null,
-					setup: setupPending
+					setup: setupPending,
+					projectName: basename(root)
 				})}`;
 			}
 			if (id === "\0virtual:sh-data") return "export default null";
@@ -308,19 +442,27 @@ function marverPlugin(ctx) {
 				const bridge = "/@fs/" + join(clientDir, "frame-host", "bridge.js").split("\\").join("/") + "?html=1";
 				return {
 					html,
-					tags: [{
-						tag: "script",
-						attrs: { type: "module" },
-						children: `import '${VIRTUAL_THEME}'`,
-						injectTo: "head-prepend"
-					}, {
-						tag: "script",
-						attrs: {
-							type: "module",
-							src: bridge
+					tags: [
+						{
+							tag: "script",
+							children: `(function(){var a=Element.prototype.attachShadow;if(a)Element.prototype.attachShadow=function(i){if(i&&i.mode==='closed')window.__mvClosedShadow=1;return a.call(this,i)};})();`,
+							injectTo: "head-prepend"
 						},
-						injectTo: "head-prepend"
-					}]
+						{
+							tag: "script",
+							attrs: { type: "module" },
+							children: `import '${VIRTUAL_THEME}'`,
+							injectTo: "head-prepend"
+						},
+						{
+							tag: "script",
+							attrs: {
+								type: "module",
+								src: bridge
+							},
+							injectTo: "head-prepend"
+						}
+					]
 				};
 			}
 		},
@@ -330,9 +472,16 @@ function marverPlugin(ctx) {
 		* Edits to loaded frames keep normal HMR (modules present + file exists → pass through).
 		*/
 		handleHotUpdate(hctx) {
-			if (![join(root, "design", "scenes"), join(root, "design", "components")].some((w) => hctx.file.startsWith(w))) return;
-			if (!existsSync(hctx.file)) return [];
-			if (hctx.modules.length === 0) return [];
+			const affected = affectedFrameIds(hctx.file, root, manifest);
+			if (affected === null) {
+				if ([join(root, "design", "scenes"), join(root, "design", "components")].some((w) => hctx.file.startsWith(w)) && !existsSync(hctx.file)) return [];
+				return;
+			}
+			if (affected.length) {
+				for (const id of affected) pendingInv.add(id);
+				flushInv();
+			}
+			return [];
 		},
 		configureServer(server) {
 			server.middlewares.use((req, res, next) => {
@@ -359,8 +508,9 @@ function marverPlugin(ctx) {
 			});
 			server.middlewares.use(apiMiddleware(root));
 			server.middlewares.use(routesMiddleware(server, clientDir));
+			devServer = server;
 			const regen = debounce(() => {
-				const manifest = scanFrames(root);
+				manifest = scanFrames(root);
 				if (writeManifest(root, manifest)) server.ws.send("sh:manifest", manifest);
 			}, 150);
 			const watched = [join(root, "design", "scenes"), join(root, "design", "components")];

package/dist/rolldown-runtime-D7D4PA-g.mjs

@@ -0,0 +1,13 @@
+//#region \0rolldown/runtime.js
+var __defProp = Object.defineProperty;
+var __exportAll = (all, no_symbols) => {
+	let target = {};
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
+	return target;
+};
+//#endregion
+export { __exportAll as t };