devframe 0.9.1 → 0.9.3

package/dist/{_shared-DqbKCAew.d.mts → _shared-BPovvJW8.d.mts}

@@ -1,4 +1,4 @@
-import { d as ConnectionMeta, l as McpRouteOptions, n as DevframeDefinition, r as DevframeDeploymentKind } from "./devframe-BlLEZR-x.mjs";
+import { F as DevframeDefinition, G as McpRouteOptions, I as DevframeDeploymentKind, t as ConnectionMeta } from "./context-_i51nYOs.mjs";
 //#region src/adapters/_shared.d.ts
 /**
  * Resolve the mount base path for a devframe's SPA. Hosted adapters

package/dist/adapters/build.d.mts

@@ -1,4 +1,4 @@
-import { n as DevframeDefinition } from "../devframe-BlLEZR-x.mjs";
+import { F as DevframeDefinition, V as DevframeSnapshotRpcEntry, o as DevframeNodeContext } from "../context-_i51nYOs.mjs";
 import { o as StaticAssetsSource } from "../remote-assets-Bg4gCUZ_.mjs";
 //#region src/adapters/build.d.ts
 interface CreateBuildOptions {
@@ -37,5 +37,14 @@ interface CreateBuildOptions {
  *     `/devframe/`, or any base, no rewriting required.
  */
 declare function createBuild(d: DevframeDefinition, options?: CreateBuildOptions): Promise<void>;
+/**
+ * Attach a `dump` to each {@link DevframeRpcOptions.snapshot} target so the
+ * static collector bakes it, even though the (service-owned) definition
+ * declares no dump of its own. A bare method id becomes `snapshot: true`
+ * (bakes the no-arg call); `{ method, inputs }` bakes one record per resolved
+ * argument-tuple by running the target's own handler, with the first tuple's
+ * output as the fallback.
+ */
+declare function applySnapshotRpc(ctx: DevframeNodeContext, entries: readonly DevframeSnapshotRpcEntry[] | undefined): void;
 //#endregion
-export { CreateBuildOptions, createBuild };
+export { CreateBuildOptions, applySnapshotRpc, createBuild };

package/dist/adapters/build.mjs

@@ -1,11 +1,11 @@
 import { s as colors } from "../nostics-CzECRXpE.mjs";
 import { n as strictJsonStringify } from "../serialization-BGzEwAdr.mjs";
 import { DEVFRAME_CONNECTION_META_FILENAME, DEVFRAME_RPC_DUMP_DIRNAME, DEVFRAME_RPC_DUMP_MANIFEST_FILENAME } from "../constants.mjs";
-import { t as collectStaticRpcDump } from "../static-BPZ1_OPA.mjs";
+import { t as collectStaticRpcDump } from "../static-DV_qUSRS.mjs";
 import { n as structuredCloneStringify } from "../structured-clone-CbAV5rFI.mjs";
-import { t as diagnostics } from "../diagnostics-Di8ytitn.mjs";
-import { t as createHostContext } from "../context-Bdkakk8S.mjs";
-import { t as resolveStaticAssetsSource } from "../remote-assets-DRfY2RjX.mjs";
+import { t as diagnostics } from "../diagnostics-BXWW3VK-.mjs";
+import { t as createHostContext } from "../context-CQW0lSw8.mjs";
+import { t as resolveStaticAssetsSource } from "../remote-assets-DezQmPQU.mjs";
 import { t as createH3DevframeHost } from "../host-h3-fRbF9yor.mjs";
 import process from "node:process";
 import { dirname, resolve } from "pathe";
@@ -34,7 +34,7 @@ async function createBuild(d, options = {}) {
 		origin: "http://localhost",
 		appName: d.id
 	});
-	const resolved = resolveStaticAssetsSource(distSource, host.getStorageDir("project"));
+	const resolved = resolveStaticAssetsSource(distSource, host.getStorageDir("project"), d.importMetaUrl);
 	if (typeof resolved === "string") {
 		console.log(colors.cyan`[devframe] copying SPA from ${resolved} -> ${outDir}`);
 		await fs$1.cp(resolved, outDir, { recursive: true });
@@ -45,11 +45,13 @@ async function createBuild(d, options = {}) {
 	const ctx = await createHostContext({
 		cwd: process.cwd(),
 		mode: "build",
-		host
+		host,
+		importMetaUrl: d.importMetaUrl
 	});
-	for (const input of d.services ?? []) ctx.services.install(input, { resolveFrom: d.packageName });
-	await d.setup(ctx);
+	for (const input of d.services ?? []) ctx.services.install(input, { resolveFrom: d.importMetaUrl });
 	await ctx.services.ready();
+	await d.setup(ctx);
+	applySnapshotRpc(ctx, d.rpc?.snapshot);
 	await fs$1.mkdir(resolve(outDir, DEVFRAME_RPC_DUMP_DIRNAME), { recursive: true });
 	const jsonSerializableMethods = [];
 	for (const def of ctx.rpc.definitions.values()) if (def.jsonSerializable === true) jsonSerializableMethods.push(def.name);
@@ -69,5 +71,40 @@ async function createBuild(d, options = {}) {
 	await fs$1.writeFile(resolve(outDir, DEVFRAME_RPC_DUMP_MANIFEST_FILENAME), JSON.stringify(dump.manifest, null, 2), "utf-8");
 	console.log(colors.green`[devframe] built "${d.id}" -> ${outDir}`);
 }
+/**
+* Attach a `dump` to each {@link DevframeRpcOptions.snapshot} target so the
+* static collector bakes it, even though the (service-owned) definition
+* declares no dump of its own. A bare method id becomes `snapshot: true`
+* (bakes the no-arg call); `{ method, inputs }` bakes one record per resolved
+* argument-tuple by running the target's own handler, with the first tuple's
+* output as the fallback.
+*/
+function applySnapshotRpc(ctx, entries) {
+	for (const entry of entries ?? []) {
+		const method = typeof entry === "string" ? entry : entry.method;
+		const def = ctx.rpc.definitions.get(method);
+		if (!def) {
+			diagnostics.DF0072({ method });
+			continue;
+		}
+		if (typeof entry === "string") {
+			def.snapshot = true;
+			continue;
+		}
+		const inputsSpec = entry.inputs;
+		def.dump = async (dumpCtx, handler) => {
+			const tuples = typeof inputsSpec === "function" ? await inputsSpec(dumpCtx) : inputsSpec;
+			const records = [];
+			for (const input of tuples) records.push({
+				inputs: [...input],
+				output: await handler(...input)
+			});
+			return {
+				records,
+				fallback: records[0]?.output
+			};
+		};
+	}
+}
 //#endregion
-export { createBuild };
+export { applySnapshotRpc, createBuild };

package/dist/adapters/cac.d.mts

@@ -1,4 +1,4 @@
-import { Ft as CliFlagsSchema, It as InferCliFlags, Lt as defineCliFlags, Rt as parseCliFlags, n as DevframeDefinition } from "../devframe-BlLEZR-x.mjs";
+import { Dt as parseCliFlags, Et as defineCliFlags, F as DevframeDefinition, Tt as InferCliFlags, wt as CliFlagsSchema } from "../context-_i51nYOs.mjs";
 import { CAC } from "cac";
 import { H3 } from "h3";
 //#region src/adapters/cac.d.ts

package/dist/adapters/cac.mjs

@@ -1,7 +1,7 @@
 import { s as colors } from "../nostics-CzECRXpE.mjs";
 import { r as resolveDevServerPort } from "../_shared-BM3PdYli.mjs";
 import { createBuild } from "./build.mjs";
-import { t as createDevServer } from "../dev-C8VHtuPP.mjs";
+import { t as createDevServer } from "../dev-lpIvwagf.mjs";
 import process from "node:process";
 import cac$1 from "cac";
 //#region src/adapters/flags.ts

package/dist/adapters/dev.d.mts

@@ -1,8 +1,8 @@
-import { _ as DevframeNodeRpcSession, c as DevframeWsOptions, l as McpRouteOptions, n as DevframeDefinition, s as DevframeSseOptions, u as DevframeAuthHandler } from "../devframe-BlLEZR-x.mjs";
-import { d as DevframeRpcConnection, n as WsOriginRegistry, u as DevframeNodeRpcSessionMeta } from "../ws-server-D1d3QM9f.mjs";
+import { d as DevframeRpcConnection, n as WsOriginRegistry, u as DevframeNodeRpcSessionMeta } from "../ws-server-DLtEoLdR.mjs";
+import { Ct as DevframeAuthHandler, F as DevframeDefinition, G as McpRouteOptions, U as DevframeSseOptions, W as DevframeWsOptions, s as DevframeNodeRpcSession } from "../context-_i51nYOs.mjs";
 import { o as StaticAssetsSource } from "../remote-assets-Bg4gCUZ_.mjs";
-import { c as StartedServer } from "../instance-shell-0iw-cQ5V.mjs";
-import { a as resolveMcpConnectionMeta, i as resolveDevServerPort, t as ResolveDevServerPortOptions } from "../_shared-DqbKCAew.mjs";
+import { c as StartedServer } from "../instance-shell-BHvBIGP4.mjs";
+import { a as resolveMcpConnectionMeta, i as resolveDevServerPort, t as ResolveDevServerPortOptions } from "../_shared-BPovvJW8.mjs";
 import { H3 } from "h3";
 //#region src/adapters/dev.d.ts
 interface CreateDevServerOptions {

package/dist/adapters/dev.mjs

@@ -1,3 +1,3 @@
 import { i as resolveMcpConnectionMeta, r as resolveDevServerPort } from "../_shared-BM3PdYli.mjs";
-import { t as createDevServer } from "../dev-C8VHtuPP.mjs";
+import { t as createDevServer } from "../dev-lpIvwagf.mjs";
 export { createDevServer, resolveDevServerPort, resolveMcpConnectionMeta };

package/dist/adapters/embedded.d.mts

@@ -1,4 +1,4 @@
-import { g as DevframeNodeContext, n as DevframeDefinition } from "../devframe-BlLEZR-x.mjs";
+import { F as DevframeDefinition, o as DevframeNodeContext } from "../context-_i51nYOs.mjs";
 //#region src/adapters/embedded.d.ts
 interface CreateEmbeddedOptions {
   /** Target context the devframe is registered into. Required. */

package/dist/adapters/embedded.mjs

@@ -9,7 +9,8 @@
 * effective default follows the hosted rule of `def.basePath ?? '/__<id>/'`.
 */
 async function createEmbedded(d, options) {
-	for (const input of d.services ?? []) options.ctx.services.install(input, { resolveFrom: d.packageName });
+	for (const input of d.services ?? []) options.ctx.services.install(input, { resolveFrom: d.importMetaUrl });
+	await options.ctx.services.ready();
 	await d.setup(options.ctx);
 }
 //#endregion

package/dist/adapters/initiate.d.mts

@@ -1,7 +1,7 @@
-import { $ as DevframeStorageScope, _ as DevframeNodeRpcSession, c as DevframeWsOptions, d as ConnectionMeta, g as DevframeNodeContext, l as McpRouteOptions, n as DevframeDefinition, s as DevframeSseOptions, u as DevframeAuthHandler } from "../devframe-BlLEZR-x.mjs";
-import { d as DevframeRpcConnection, n as WsOriginRegistry, u as DevframeNodeRpcSessionMeta } from "../ws-server-D1d3QM9f.mjs";
+import { d as DevframeRpcConnection, n as WsOriginRegistry, u as DevframeNodeRpcSessionMeta } from "../ws-server-DLtEoLdR.mjs";
+import { Ct as DevframeAuthHandler, F as DevframeDefinition, G as McpRouteOptions, U as DevframeSseOptions, W as DevframeWsOptions, bt as DevframeStorageScope, o as DevframeNodeContext, s as DevframeNodeRpcSession, t as ConnectionMeta } from "../context-_i51nYOs.mjs";
 import { o as StaticAssetsSource } from "../remote-assets-Bg4gCUZ_.mjs";
-import { c as StartedServer, f as DevframeInstanceRecord } from "../instance-shell-0iw-cQ5V.mjs";
+import { c as StartedServer, f as DevframeInstanceRecord } from "../instance-shell-BHvBIGP4.mjs";
 import { Buffer } from "node:buffer";
 import { IncomingMessage, Server, ServerResponse } from "node:http";
 import { Duplex } from "node:stream";

package/dist/adapters/initiate.mjs

@@ -1,2 +1,2 @@
-import { n as getInstanceInternals, r as initDevframe } from "../dev-C8VHtuPP.mjs";
+import { n as getInstanceInternals, r as initDevframe } from "../dev-lpIvwagf.mjs";
 export { getInstanceInternals, initDevframe };

package/dist/adapters/mcp.d.mts

@@ -1,4 +1,4 @@
-import { g as DevframeNodeContext, n as DevframeDefinition } from "../devframe-BlLEZR-x.mjs";
+import { F as DevframeDefinition, o as DevframeNodeContext } from "../context-_i51nYOs.mjs";
 import { H3 } from "h3";
 import "@modelcontextprotocol/server";
 //#region src/adapters/mcp/build-server.d.ts

package/dist/adapters/mcp.mjs

@@ -1,2 +1,2 @@
-import { i as createMcpServer, n as mountMcpHttp, r as createMcpFetchHandler } from "../http-BbHCU5Zs.mjs";
+import { i as createMcpServer, n as mountMcpHttp, r as createMcpFetchHandler } from "../http-BKiqHcXX.mjs";
 export { createMcpFetchHandler, createMcpServer, mountMcpHttp };

package/dist/cli/main.mjs

@@ -1,6 +1,6 @@
 import { t as Diagnostic } from "../nostics-CzECRXpE.mjs";
-import { t as diagnostics } from "../diagnostics-Di8ytitn.mjs";
-import { n as listLiveDevframeInstances, r as probeDevframeOrigin } from "../instance-registry-CHunhMi5.mjs";
+import { t as diagnostics } from "../diagnostics-BXWW3VK-.mjs";
+import { n as listLiveDevframeInstances, r as probeDevframeOrigin } from "../instance-registry-BjlMQbFB.mjs";
 import { t as toAgentToolName } from "../agent-tool-name-EgfoFO8C.mjs";
 import process from "node:process";
 import { joinURL } from "ufo";

package/dist/client/index.d.mts

@@ -1,8 +1,8 @@
-import { E as DevframeRpcServerFunctions, H as DevframeSettings, J as ScopedServerFunctions, M as DevframeServiceMeta, Mt as EventEmitter, P as DevframeServiceScopeOf, R as DevframeServicesState, T as DevframeRpcClientFunctions, X as SettingsForNamespace, Y as ScopedSharedStates, b as RpcSharedStateGetOptions, d as ConnectionMeta, gt as SharedState, ot as StreamReader, q as ScopedRpcFn, st as StreamSink, x as RpcSharedStateHost } from "../devframe-BlLEZR-x.mjs";
-import { f as RpcCacheManager, p as RpcCacheOptions } from "../index-tdrk1bzV.mjs";
-import { _ as RpcFunctionDefinition, w as RpcFunctionsCollector } from "../types-Djq7CBXh.mjs";
-import { t as SseRpcChannelOptions } from "../sse-client-CFBOIaUi.mjs";
-import { t as WsRpcChannelOptions } from "../ws-client-DhjNyQo3.mjs";
+import { f as RpcCacheManager, p as RpcCacheOptions } from "../index-DOg4S5wk.mjs";
+import { _ as RpcFunctionDefinition, w as RpcFunctionsCollector } from "../types-BBLeGfpt.mjs";
+import { Q as DevframeServiceScopeOf, X as DevframeServiceMeta, _t as DevframeRpcServerFunctions, b as StreamSink, d as RpcSharedStateHost, dt as ScopedRpcFn, ft as ScopedServerFunctions, gt as DevframeRpcClientFunctions, k as SharedState, mt as SettingsForNamespace, nt as DevframeServicesState, ot as DevframeSettings, pt as ScopedSharedStates, t as ConnectionMeta, u as RpcSharedStateGetOptions, y as StreamReader, zt as EventEmitter } from "../context-_i51nYOs.mjs";
+import { t as SseRpcChannelOptions } from "../sse-client-CdGD_B8_.mjs";
+import { t as WsRpcChannelOptions } from "../ws-client-Bo2t6hES.mjs";
 import { BirpcOptions, BirpcReturn } from "birpc";
 //#region src/client/connection.d.ts
 interface DevframeConnection {

package/dist/client/index.mjs

@@ -1,7 +1,7 @@
-import { t as hash } from "../hash-KtDZYXDN.mjs";
+import { t as hash } from "../hash-DdPnc4k3.mjs";
 import { colors } from "../utils/colors.mjs";
 import { createEventEmitter } from "../utils/events.mjs";
-import { t as createSharedState } from "../shared-state-fRRbRUtD.mjs";
+import { t as createSharedState } from "../shared-state-DoXutg_U.mjs";
 import { i as structuredCloneStringify, n as structuredCloneParse, t as structuredCloneDeserialize } from "../structured-clone-CgtQ61SA.mjs";
 import { createStreamReader, createStreamSink } from "../utils/streaming-channel.mjs";
 import { defineDiagnostics } from "nostics";

package/dist/{context-CXhjygJU.mjs → context-BUJGvlje.mjs}

@@ -1,5 +1,5 @@
 import { n as randomToken } from "./crypto-token-XCqTSMg9.mjs";
-import { t as createStorage } from "./storage-D4a99Ung.mjs";
+import { t as createStorage } from "./storage-BXNVhKyR.mjs";
 import { n as revokeAuthToken, t as revokeActiveConnectionsForToken } from "./revoke-3Q6aDKWk.mjs";
 import { join } from "pathe";
 //#region src/node/hub-internals/context.ts

package/dist/{context-dqyXS6o3.d.mts → context-CO7eZHJy.d.mts}

@@ -1,4 +1,4 @@
-import { g as DevframeNodeContext, gt as SharedState } from "./devframe-BlLEZR-x.mjs";
+import { k as SharedState, o as DevframeNodeContext } from "./context-_i51nYOs.mjs";
 //#region src/node/hub-internals/context.d.ts
 interface InternalAnonymousAuthStorage {
   trusted: Record<string, {

package/dist/{context-Bdkakk8S.mjs → context-CQW0lSw8.mjs}

@@ -4,10 +4,10 @@ import { RpcFunctionsCollectorBase } from "./rpc/index.mjs";
 import { defineRpcFunction } from "./index.mjs";
 import { t as DEVFRAME_EVENTS } from "./events-DKfSmoTj.mjs";
 import { DEVFRAME_SERVICES_STATE_KEY } from "./constants.mjs";
-import { t as diagnostics$1 } from "./diagnostics-Di8ytitn.mjs";
-import { r as createEventEmitter, t as DevframeAgentHost } from "./host-agent-BDdcOXhG.mjs";
-import { n as createDebug, t as resolveStaticAssetsSource } from "./remote-assets-DRfY2RjX.mjs";
-import { t as createStorage } from "./storage-D4a99Ung.mjs";
+import { t as diagnostics$1 } from "./diagnostics-BXWW3VK-.mjs";
+import { r as createEventEmitter, t as DevframeAgentHost } from "./host-agent-B84av916.mjs";
+import { n as createDebug, t as resolveStaticAssetsSource } from "./remote-assets-DezQmPQU.mjs";
+import { t as createStorage } from "./storage-BXNVhKyR.mjs";
 import { createRequire } from "node:module";
 import { createSharedState } from "devframe/utils/shared-state";
 import process from "node:process";
@@ -776,10 +776,10 @@ function toRequireBase(resolveFrom) {
 }
 /**
 * Normalize an `install()` `resolveFrom` into a resolution base. Paths and
-* file URLs pass through; a bare npm package name (the common case: the
-* declaring plugin's `packageName`) resolves to that package's location from
-* `cwd`, so a service it declares resolves against the plugin's own
-* dependencies. An unresolvable package name reads as no base (the caller's
+* file URLs pass through (the common case: the declaring plugin's
+* `importMetaUrl`, so a service it declares resolves against the plugin's own
+* dependencies); a bare npm package name resolves to that package's location
+* from `cwd`. An unresolvable package name reads as no base (the caller's
 * workspace fallbacks apply).
 */
 function expandResolveFrom(resolveFrom, cwd) {
@@ -809,7 +809,12 @@ async function importServicePackage(pkg, resolveFroms) {
 			lastError = error;
 			continue;
 		}
-		return await import(pathToFileURL(resolved).href);
+		return await import(
+			/* webpackIgnore: true */
+			/* @vite-ignore */
+			/* turbopackIgnore: true */
+			pathToFileURL(resolved).href
+);
 	}
 	throw lastError;
 }
@@ -880,14 +885,27 @@ function satisfiesVersionRange(version, range) {
 	if (alternatives.length === 0) return true;
 	return alternatives.some((alternative) => alternative.split(/\s+/).every((comparator) => satisfiesComparator(parsed, comparator)));
 }
+function isPlainObject(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/** Deep-merge two values with the service option-set rules (see below). */
+function deepMergeTwo(a, b) {
+	if (Array.isArray(a) && Array.isArray(b)) return [.../* @__PURE__ */ new Set([...a, ...b])];
+	if (isPlainObject(a) && isPlainObject(b)) {
+		const out = { ...a };
+		for (const key of Object.keys(b)) out[key] = key in a ? deepMergeTwo(a[key], b[key]) : b[key];
+		return out;
+	}
+	return b;
+}
 /**
 * Default option-set merge when a service declares no `mergeOptions`:
-* shallow-merge plain objects in declaration order (later sets win); any
-* non-object set collapses the merge to "last one wins".
+* deep-merge in declaration order — objects recurse, arrays union-dedupe,
+* scalars take the later value. Covers the built-in services (`roots` /
+* `langs` union, `themes` per-key last-wins) without a custom hook.
 */
-function shallowMergeOptionSets(sets) {
-	if (sets.some((set) => typeof set !== "object" || set === null || Array.isArray(set))) return sets[sets.length - 1];
-	return Object.assign({}, ...sets);
+function deepMergeOptionSets(sets) {
+	return sets.reduce((merged, set) => deepMergeTwo(merged, set));
 }
 //#endregion
 //#region src/node/host-services.ts
@@ -1068,7 +1086,7 @@ var DevframeServicesHostImpl = class {
 			});
 		}
 		const sets = entries.map((entry) => entry.input.options).filter((options) => options !== void 0);
-		const options = def.mergeOptions ? def.mergeOptions(sets) : sets.length > 0 ? shallowMergeOptionSets(sets) : void 0;
+		const options = def.mergeOptions ? def.mergeOptions(sets) : sets.length > 0 ? deepMergeOptionSets(sets) : void 0;
 		if (!this.context) throw diagnostics$1.DF0070({
 			package: pkg,
 			reason: "this services host has no node context to install into"
@@ -1101,15 +1119,17 @@ var DevframeServicesHostImpl = class {
 //#region src/node/host-views.ts
 var DevframeViewHost = class {
 	context;
+	importMetaUrl;
 	/**
 	* @internal
 	*/
 	buildStaticDirs = [];
-	constructor(context) {
+	constructor(context, importMetaUrl) {
 		this.context = context;
+		this.importMetaUrl = importMetaUrl;
 	}
-	hostStatic(baseUrl, source) {
-		const resolved = resolveStaticAssetsSource(source, this.context.host.getStorageDir("project"));
+	hostStatic(baseUrl, source, defaultResolveFrom = this.importMetaUrl) {
+		const resolved = resolveStaticAssetsSource(source, this.context.host.getStorageDir("project"), defaultResolveFrom);
 		if (typeof resolved === "string" && !existsSync(resolved)) throw diagnostics$1.DF0008({ distDir: resolved });
 		this.buildStaticDirs.push({
 			baseUrl,
@@ -1301,7 +1321,7 @@ function createScopedNodeContext(context, namespace) {
 * `commands` when mounted into Vite DevTools.
 */
 async function createHostContext(options) {
-	const { cwd, workspaceRoot = cwd, mode, host, builtinRpcDeclarations = [] } = options;
+	const { cwd, workspaceRoot = cwd, mode, host, importMetaUrl, builtinRpcDeclarations = [] } = options;
 	const context = {
 		cwd,
 		workspaceRoot,
@@ -1316,7 +1336,7 @@ async function createHostContext(options) {
 		scope: void 0
 	};
 	const rpcHost = new RpcFunctionsHostImpl(context);
-	const viewsHost = new DevframeViewHost(context);
+	const viewsHost = new DevframeViewHost(context, importMetaUrl);
 	const diagnosticsHost = new DevframeDiagnosticsHost(context, [diagnostics$1, diagnostics]);
 	context.rpc = rpcHost;
 	context.views = viewsHost;