@zenbujs/core 0.0.3 → 0.0.5

package/dist/loaders/zenbu.mjs

@@ -1,15 +1,9 @@
-import { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { execFileSync } from "node:child_process";
 //#region src/loaders/zenbu.ts
 const verbose = process.env.ZENBU_VERBOSE === "1";
-const { subscribe } = createRequire(import.meta.url)("@parcel/watcher");
-let registerWatcherClosable = () => {};
-try {
-	const pause = await import("@zenbujs/hmr/pause");
-	registerWatcherClosable = typeof pause.registerWatcherClosable === "function" ? pause.registerWatcherClosable : registerWatcherClosable;
-} catch {}
 const loaderName = "zenbu-loader";
 let tracePort = null;
 const stats = {
@@ -18,50 +12,34 @@ const stats = {
 	loadCount: 0,
 	loadMs: 0
 };
-const barrels = /* @__PURE__ */ new Map();
-const dirWatchers = /* @__PURE__ */ new Map();
+let resolvedPayload = null;
+let resolvedPluginSourceFiles = [];
+/**
+* Number of times we've materialized the plugin root since boot. 
+*/
+let pluginsRootInvocations = 0;
 function initialize(data) {
-	if (!data?.tracePort) return;
-	tracePort = data.tracePort;
-	tracePort.on("message", (msg) => {
-		if (msg !== "flush") return;
-		try {
-			tracePort?.postMessage({
-				name: loaderName,
-				...stats
-			});
-		} catch {}
-		stats.resolveCount = 0;
-		stats.resolveMs = 0;
-		stats.loadCount = 0;
-		stats.loadMs = 0;
-	});
-	tracePort.unref?.();
-}
-function parseJsonc(str) {
-	let result = "";
-	let i = 0;
-	while (i < str.length) if (str[i] === "\"") {
-		let j = i + 1;
-		while (j < str.length) if (str[j] === "\\") j += 2;
-		else if (str[j] === "\"") {
-			j++;
-			break;
-		} else j++;
-		result += str.slice(i, j);
-		i = j;
-	} else if (str[i] === "/" && str[i + 1] === "/") {
-		i += 2;
-		while (i < str.length && str[i] !== "\n") i++;
-	} else if (str[i] === "/" && str[i + 1] === "*") {
-		i += 2;
-		while (i < str.length && !(str[i] === "*" && str[i + 1] === "/")) i++;
-		i += 2;
-	} else {
-		result += str[i];
-		i++;
+	if (data?.payload) {
+		resolvedPayload = data.payload;
+		resolvedPluginSourceFiles = data.pluginSourceFiles ?? [];
+	}
+	if (data?.tracePort) {
+		tracePort = data.tracePort;
+		tracePort.on("message", (msg) => {
+			if (msg !== "flush") return;
+			try {
+				tracePort?.postMessage({
+					name: loaderName,
+					...stats
+				});
+			} catch {}
+			stats.resolveCount = 0;
+			stats.resolveMs = 0;
+			stats.loadCount = 0;
+			stats.loadMs = 0;
+		});
+		tracePort.unref?.();
 	}
-	return JSON.parse(result.replace(/,\s*([\]}])/g, "$1"));
 }
 function globRegex(filePattern) {
 	return new RegExp(`^${filePattern.replace(/\./g, "\\.").replace(/\*/g, ".*")}$`);
@@ -72,94 +50,105 @@ function expandGlob(pattern) {
 	if (!fs.existsSync(dir)) return [];
 	return fs.readdirSync(dir).filter((file) => regex.test(file)).map((file) => path.resolve(dir, file));
 }
-function snapshotDir(dir, regex) {
-	if (!fs.existsSync(dir)) return /* @__PURE__ */ new Set();
-	try {
-		return new Set(fs.readdirSync(dir).filter((file) => regex.test(file)));
-	} catch {
-		return /* @__PURE__ */ new Set();
-	}
-}
-function handleDirEvent(dir, filename) {
-	for (const entry of barrels.values()) for (const glob of entry.globs) {
-		if (glob.dir !== dir) continue;
-		if (!glob.regex.test(filename)) continue;
-		const nextSnapshot = snapshotDir(dir, glob.regex);
-		if (!(nextSnapshot.size !== glob.snapshot.size || [...nextSnapshot].some((file) => !glob.snapshot.has(file)))) continue;
-		glob.snapshot = nextSnapshot;
-		try {
-			entry.hot?.invalidate?.();
-			if (verbose) console.log(`[zenbu-loader] invalidated barrel (${filename} added/removed in ${dir})`);
-		} catch (err) {
-			console.error("[zenbu-loader] invalidate failed:", err);
-		}
-		break;
-	}
-}
-function ensureDirWatcher(dir) {
-	if (dirWatchers.has(dir)) return;
-	if (!fs.existsSync(dir)) return;
-	let subscription = null;
-	let closed = false;
-	subscribe(dir, (err, events) => {
-		if (err) return;
-		for (const event of events) {
-			if (path.dirname(event.path) !== dir) continue;
-			handleDirEvent(dir, path.basename(event.path));
-		}
-	}).then((sub) => {
-		if (closed) sub.unsubscribe().catch(() => {});
-		else subscription = sub;
-	}).catch((err) => {
-		console.error(`[zenbu-loader] subscribe failed for ${dir}:`, err);
-	});
-	const closable = { close: () => {
-		closed = true;
-		if (subscription) return subscription.unsubscribe().catch(() => {});
-	} };
-	registerWatcherClosable(closable);
-	dirWatchers.set(dir, closable);
-}
 function buildSource(imports) {
 	return imports.map((specifier) => `import ${JSON.stringify(specifier)}\n`).join("");
 }
-function readPluginList(configPath) {
-	const config = parseJsonc(fs.readFileSync(configPath, "utf8"));
-	if (!config || typeof config !== "object" || !Array.isArray(config.plugins)) return [];
-	return Array.from(new Set(config.plugins.filter((plugin) => typeof plugin === "string")));
+/**
+* Read the resolved config from the process global. setup-gate populates
+* this before registering our loader, so by the time `load()` is invoked
+* the snapshot is always present.
+*
+* We can't `await import("zenbu.config.ts")` from inside `load()` because
+* Node's ESM loader serializes load hooks — a dynamic import re-enters the
+* loader chain and deadlocks. Pre-resolving in setup-gate sidesteps that.
+*/
+function resolveConfigViaSubprocess(projectDir) {
+	const here = path.dirname(fileURLToPath(import.meta.url));
+	const candidates = [path.resolve(here, "..", "cli", "resolve-config.mjs"), path.resolve(here, "..", "..", "dist", "cli", "resolve-config.mjs")];
+	const resolverScript = candidates.find((c) => fs.existsSync(c));
+	if (!resolverScript) throw new Error(`[zenbu-loader] resolve-config.mjs not found (looked in: ${candidates.join(", ")})`);
+	/**
+	* this takes ~100ms and can be heavily optimized, but its a fine solution for now
+	*/
+	const env = {
+		...process.env,
+		ELECTRON_RUN_AS_NODE: "1"
+	};
+	const out = execFileSync(process.execPath, [resolverScript, projectDir], {
+		encoding: "utf8",
+		timeout: 1e3,
+		env,
+		stdio: [
+			"ignore",
+			"pipe",
+			"inherit"
+		]
+	});
+	return JSON.parse(out);
+}
+function getResolvedConfig(configPath) {
+	if (pluginsRootInvocations === 0) {
+		pluginsRootInvocations += 1;
+		if (!resolvedPayload) throw new Error("[zenbu-loader] zenbu config not resolved before loader registration. setup-gate must pass it via register(specifier, { data: { payload, pluginSourceFiles } }).");
+		return {
+			payload: resolvedPayload,
+			pluginSourceFiles: resolvedPluginSourceFiles
+		};
+	}
+	pluginsRootInvocations += 1;
+	const fresh = resolveConfigViaSubprocess(path.dirname(configPath));
+	resolvedPayload = fresh.payload;
+	resolvedPluginSourceFiles = fresh.pluginSourceFiles;
+	return fresh;
 }
-function buildPluginRoot(configPath) {
+/**
+* Generate the top-level plugins barrel. The first import is the registry
+* setup module; ESM evaluates left-to-right in import order, so by the time
+* the plugin barrels start importing service files, `replacePlugins(...)` and
+* `registerAppEntrypoint(...)` have already populated the runtime registry.
+*/
+function buildPluginsRoot(payload) {
+	const registryUrl = `zenbu:registry?data=${encodeURIComponent(JSON.stringify(payload))}`;
+	const barrelUrls = payload.plugins.map((p) => `zenbu:barrel?plugin=${encodeURIComponent(JSON.stringify(p))}`);
 	return {
-		source: `${buildSource(readPluginList(configPath).map((manifestPath) => `zenbu:barrel?manifest=${encodeURIComponent(path.resolve(manifestPath))}`))}import.meta.hot?.accept()\n`,
-		watchPaths: new Set([configPath])
+		source: `${buildSource([registryUrl, ...barrelUrls])}import.meta.hot?.accept()\n`,
+		barrelUrls
 	};
 }
-function buildBarrel(manifestPath) {
-	const manifest = parseJsonc(fs.readFileSync(manifestPath, "utf8"));
-	const baseDir = path.dirname(manifestPath);
-	const entries = manifest && typeof manifest === "object" && Array.isArray(manifest.services) ? manifest.services.filter((entry) => typeof entry === "string") : [];
+/**
+* Generate the registry-setup module body. Side-effect only — no exports.
+* Imported FIRST by the plugins root so its `replacePlugins` /
+* `registerAppEntrypoint` calls run before any plugin's service files
+* evaluate.
+*/
+function buildRegistryModule(payload) {
+	return [
+		"import { replacePlugins, registerAppEntrypoint } from \"@zenbujs/core/runtime\"",
+		`replacePlugins(${JSON.stringify(payload.plugins)})`,
+		`registerAppEntrypoint(${JSON.stringify(payload.appEntrypoint)}, ${JSON.stringify(payload.splashPath)})`,
+		"import.meta.hot?.accept()"
+	].join("\n") + "\n";
+}
+/**
+* Generate a per-plugin barrel: just service-file imports anchored at the
+* plugin's `dir`. Glob-form entries get expanded via `fs.readdirSync` and
+* glob directories are registered with `context.hot.watch()` so dynohot
+* reloads the generated barrel when service files are added/removed.
+*/
+function buildPluginBarrel(plugin) {
 	const imports = [];
-	const watchPaths = new Set([manifestPath]);
-	const globs = [];
-	for (const entry of entries) {
-		const resolved = path.resolve(baseDir, entry);
+	const watchPaths = new Set([plugin.dir]);
+	for (const entry of plugin.services) {
+		const resolved = path.isAbsolute(entry) ? entry : path.resolve(plugin.dir, entry);
 		if (resolved.includes("*")) {
 			const dir = path.dirname(resolved);
-			const regex = globRegex(path.basename(resolved));
 			watchPaths.add(dir);
-			globs.push({
-				dir,
-				regex,
-				snapshot: snapshotDir(dir, regex)
-			});
 			for (const file of expandGlob(resolved)) imports.push(pathToFileURL(file).href);
-		} else if (resolved.endsWith(".json") || resolved.endsWith(".jsonc")) imports.push(`zenbu:barrel?manifest=${encodeURIComponent(resolved)}`);
-		else imports.push(pathToFileURL(resolved).href);
+		} else imports.push(pathToFileURL(resolved).href);
 	}
 	return {
 		source: `${buildSource(imports)}import.meta.hot?.accept()\n`,
-		watchPaths,
-		globs
+		watchPaths
 	};
 }
 const CORE_PACKAGE_ROOT_FOR_LOADER = (() => {
@@ -224,9 +213,30 @@ function loadImpl(url, context, nextLoad) {
 	if (url.startsWith("zenbu:plugins?")) {
 		const params = new URL(url).searchParams;
 		const configPath = decodeURIComponent(params.get("config") ?? "");
-		const { source, watchPaths } = buildPluginRoot(configPath);
-		if (context.hot?.watch) for (const watchPath of watchPaths) context.hot.watch(pathToFileURL(watchPath));
-		if (verbose) console.log(`[zenbu-loader] generated plugin root for ${path.basename(configPath)} (${source.split("\n").filter(Boolean).length} imports, ${watchPaths.size} watches)`);
+		const { payload, pluginSourceFiles } = getResolvedConfig(configPath);
+		const { source, barrelUrls } = buildPluginsRoot(payload);
+		if (context.hot?.watch) {
+			context.hot.watch(pathToFileURL(configPath));
+			for (const file of pluginSourceFiles) context.hot.watch(pathToFileURL(file));
+		}
+		if (verbose) console.log(`[zenbu-loader] generated plugin root for ${path.basename(configPath)} (${payload.plugins.length} plugins, ${barrelUrls.length} barrels)`);
+		return {
+			format: "module",
+			source,
+			shortCircuit: true
+		};
+	}
+	if (url.startsWith("zenbu:registry?")) {
+		const params = new URL(url).searchParams;
+		const data = decodeURIComponent(params.get("data") ?? "");
+		let payload;
+		try {
+			payload = JSON.parse(data);
+		} catch (err) {
+			throw new Error(`[zenbu-loader] bad registry payload: ${err.message}`);
+		}
+		const source = buildRegistryModule(payload);
+		if (verbose) console.log(`[zenbu-loader] emitted registry module (${payload.plugins.length} plugins, entrypoint=${path.basename(payload.appEntrypoint)})`);
 		return {
 			format: "module",
 			source,
@@ -235,17 +245,16 @@ function loadImpl(url, context, nextLoad) {
 	}
 	if (url.startsWith("zenbu:barrel?")) {
 		const params = new URL(url).searchParams;
-		const manifestPath = decodeURIComponent(params.get("manifest") ?? "");
-		const { source, watchPaths, globs } = buildBarrel(manifestPath);
-		if (context.hot?.watch) for (const watchPath of watchPaths) context.hot.watch(pathToFileURL(watchPath));
-		if (context.hot) {
-			barrels.set(url, {
-				hot: context.hot,
-				globs
-			});
-			for (const glob of globs) ensureDirWatcher(glob.dir);
+		const pluginRaw = decodeURIComponent(params.get("plugin") ?? "");
+		let plugin;
+		try {
+			plugin = JSON.parse(pluginRaw);
+		} catch (err) {
+			throw new Error(`[zenbu-loader] bad plugin payload: ${err.message}`);
 		}
-		if (verbose) console.log(`[zenbu-loader] generated barrel for ${path.basename(manifestPath)} (${source.split("\n").filter(Boolean).length} imports, ${watchPaths.size} watches, ${globs.length} globs)`);
+		const { source, watchPaths } = buildPluginBarrel(plugin);
+		if (context.hot?.watch) for (const watchPath of watchPaths) context.hot.watch(pathToFileURL(watchPath));
+		if (verbose) console.log(`[zenbu-loader] generated barrel for plugin ${plugin.name} (${source.split("\n").filter(Boolean).length} imports, ${watchPaths.size} watches)`);
 		return {
 			format: "module",
 			source,

package/dist/{monorepo-CQeQBIpa.mjs → monorepo-3avKJwzJ.mjs}

@@ -3,12 +3,15 @@ import os from "node:os";
 import path from "node:path";
 import { execFileSync } from "node:child_process";
 //#region src/cli/commands/monorepo.ts
+/**
+* todo: should only be exposed when an env var is passed
+*/
 const MARKER_FILE = ".zenbu-dev-link";
 const DEFAULT_MONOREPO = path.join(os.homedir(), ".zenbu", "plugins", "zenbu");
 function resolveProjectDir() {
 	const cwd = process.cwd();
-	if (fs.existsSync(path.join(cwd, "zenbu.plugin.json")) || fs.existsSync(path.join(cwd, "zenbu")) || fs.existsSync(path.join(cwd, MARKER_FILE))) return cwd;
-	console.error("zen monorepo: not in a zenbu project (no zenbu.plugin.json or zenbu/ found)");
+	if (fs.existsSync(path.join(cwd, "zenbu.config.ts")) || fs.existsSync(path.join(cwd, "zenbu")) || fs.existsSync(path.join(cwd, MARKER_FILE))) return cwd;
+	console.error("zen monorepo: not in a zenbu project (no zenbu.config.ts or zenbu/ found)");
 	process.exit(1);
 }
 function resolveMonorepoPath(explicit) {

package/dist/node-loader.mjs

@@ -1,4 +1,4 @@
-import { n as require_lib, t as zenbuAdviceTransform } from "./transform-DJH3vN4b.mjs";
+import { n as require_lib, t as zenbuAdviceTransform } from "./transform-CmFYPmt8.mjs";
 import { fileURLToPath } from "node:url";
 //#region ../advice/src/node-loader.ts
 var import_lib = require_lib();

package/dist/{publish-source-BJdpDAFH.mjs → publish-source-Dill72NS.mjs}

@@ -1,14 +1,19 @@
-import { n as loadBuildConfig, t as findBuildConfig } from "./load-build-config-DozuRhAN.mjs";
-import { n as init, r as push } from "./mirror-sync-BN59kMCG.mjs";
+import { t as loadConfig } from "./load-config-xMf2wxH8.mjs";
+import { n as init, r as push } from "./mirror-sync-PDzxhf1w.mjs";
 import fs from "node:fs";
 import path from "node:path";
-import fsp from "node:fs/promises";
 import { execFileSync } from "node:child_process";
+import fsp from "node:fs/promises";
 //#region src/cli/commands/publish-source.ts
 function resolveProjectDir() {
 	const cwd = process.cwd();
-	if (fs.existsSync(path.join(cwd, "zenbu.plugin.json"))) return cwd;
-	console.error("zen publish:source: no zenbu.plugin.json found in current directory");
+	for (const name of [
+		"zenbu.config.ts",
+		"zenbu.config.mts",
+		"zenbu.config.js",
+		"zenbu.config.mjs"
+	]) if (fs.existsSync(path.join(cwd, name))) return cwd;
+	console.error("zen publish:source: no zenbu.config.ts found in current directory");
 	process.exit(1);
 }
 function currentSourceSha(projectDir) {
@@ -85,7 +90,8 @@ function logResult(action, result, mirrorUrl) {
 async function runPublishSource(argv) {
 	const projectDir = resolveProjectDir();
 	const flags = parseFlags(argv);
-	const config = await loadBuildConfig(flags.config ? path.resolve(projectDir, flags.config) : findBuildConfig(projectDir));
+	const { resolved } = await loadConfig(projectDir);
+	const config = resolved.build;
 	const target = flags.target ?? config.mirror?.target;
 	if (!target) {
 		console.error("zen publish:source: no mirror target specified (config.mirror.target or --target)");

package/dist/react.d.mts

@@ -1,6 +1,6 @@
-import { f as CollectionRefBrand, h as InferCollectionItem, n as connectReplica, o as ClientProxy, p as CollectionRefValue, u as CollectionState, y as SchemaShape } from "./index-CPZ5d6Hl.mjs";
-import { c as ResolvedServiceRouter, l as ZenbuRegister, o as ResolvedDbRoot, s as ResolvedEvents } from "./registry-Dh_e7HU1.mjs";
-import { n as EventProxy, r as RouterProxy } from "./index-Bhlbyrn7.mjs";
+import { f as CollectionRefBrand, h as InferCollectionItem, n as connectReplica, o as ClientProxy, p as CollectionRefValue, u as CollectionState, y as SchemaShape } from "./index-M_lSNBrq.mjs";
+import { c as ResolvedServiceRouter, l as ZenbuRegister, o as ResolvedDbRoot, s as ResolvedEvents } from "./registry-eX6e2oql.mjs";
+import { n as EventProxy, r as RouterProxy } from "./index-C-ALz_SH.mjs";
 import * as _$react from "react";
 import { ReactNode } from "react";
 

package/dist/react.mjs

@@ -1,5 +1,5 @@
-import { i as dbStringify, r as dbParse, t as connectReplica } from "./transport-BMSzG2-F.mjs";
-import { t as connectRpc } from "./src-pELM4_iH.mjs";
+import { i as dbStringify, r as dbParse, t as connectReplica } from "./transport-F2hv_OEm.mjs";
+import { t as connectRpc } from "./src-Cven45mq.mjs";
 import { createContext, createElement, useCallback, useContext, useEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
 //#region ../kyju/src/v2/react/index.ts
 function createKyjuReact() {

package/dist/{registry-Dh_e7HU1.d.mts → registry-eX6e2oql.d.mts}

@@ -1,4 +1,4 @@
-import { n as SchemaRoot } from "./schema-DMoSkwUx.mjs";
+import { n as SchemaRoot } from "./schema-Dl85YjXW.mjs";
 
 //#region src/registry.d.ts
 type CoreEvents = {

package/dist/registry.d.mts

@@ -1,2 +1,2 @@
-import { a as Events, c as ResolvedServiceRouter, i as CoreServiceRouter, l as ZenbuRegister, n as CoreEvents, o as ResolvedDbRoot, r as CorePreloads, s as ResolvedEvents, t as CoreDbSections } from "./registry-Dh_e7HU1.mjs";
+import { a as Events, c as ResolvedServiceRouter, i as CoreServiceRouter, l as ZenbuRegister, n as CoreEvents, o as ResolvedDbRoot, r as CorePreloads, s as ResolvedEvents, t as CoreDbSections } from "./registry-eX6e2oql.mjs";
 export { CoreDbSections, CoreEvents, CorePreloads, CoreServiceRouter, Events, ResolvedDbRoot, ResolvedEvents, ResolvedServiceRouter, ZenbuRegister };

package/dist/{reloader-lLAJ3lqg.mjs → reloader-DzEO8kJr.mjs}

@@ -1,6 +1,7 @@
-import { i as runtime, t as Service } from "./runtime-DUFKDIe4.mjs";
-import { t as createLogger } from "./log-CyKv8hQg.mjs";
-import { a as zenbuVitePlugins } from "./vite-plugins-Bh3SCOw-.mjs";
+import { n as __exportAll } from "./chunk-DsiFFCwN.mjs";
+import { Service, runtime } from "./runtime.mjs";
+import { t as createLogger } from "./log-6rzaCV0I.mjs";
+import { a as zenbuVitePlugins } from "./vite-plugins-Do7liKi_.mjs";
 import os from "node:os";
 import path, { resolve } from "node:path";
 import { createHash } from "node:crypto";
@@ -15,6 +16,7 @@ const DB_CONFIG_JSON = path.join(INTERNAL_DIR, "db.json");
 path.join(INTERNAL_DIR, "plugin-setup-state.json");
 //#endregion
 //#region src/services/reloader.ts
+var reloader_exports = /* @__PURE__ */ __exportAll({ ReloaderService: () => ReloaderService });
 const log = createLogger("reloader");
 function safeCacheSegment(value) {
 	return value.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 64) || "renderer";
@@ -161,4 +163,4 @@ var ReloaderService = class extends Service {
 };
 runtime.register(ReloaderService, import.meta);
 //#endregion
-export { DB_CONFIG_JSON as n, INTERNAL_DIR as r, ReloaderService as t };
+export { INTERNAL_DIR as i, reloader_exports as n, DB_CONFIG_JSON as r, ReloaderService as t };