@sjcx/vorma 0.0.0-pre.2 → 0.0.0-pre.4

package/dist/build/assemble-artifacts.d.ts

@@ -1,5 +1,5 @@
+import { type ProductionBuildMetadata } from "@vorma/protocol";
 import { Effect } from "effect";
-import { type ProductionBuildMetadata } from "../universal/protocol.ts";
 import type { ClientBundle } from "./bundle-client.ts";
 import type { ApplicationGeneration } from "./generate-application.ts";
 export type ApplicationArtifact = {

package/dist/build/bundle-client.d.ts

@@ -1,7 +1,7 @@
+import { type ClientModule, type ClientViewModule } from "@vorma/protocol";
 import { Effect } from "effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
-import { type ClientModule, type ClientViewModule } from "../universal/protocol.ts";
 import type { ApplicationGeneration } from "./generate-application.ts";
 export type ClientBundleIssue = {
     readonly _tag: "ClientBundleIssue";

package/dist/build/cli.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
-import { C as encodeCanonicalJson, S as projectBrowserContracts, _ as createClientPublicUrlPlugin, a as acquireOutputOwnership, b as CLIENT_SHARED_PACKAGES, c as writeAndCheckApplicationGeneration, d as readTypescriptProjectRoots, f as runTypescriptOperation, g as createCssPublicAssets, h as resolveVormaConfig, i as publishApplicationArtifacts, l as collectPublicAssets, m as getGeneratedSourceDirectories, n as loadApplicationSourceLayout, o as checkOutputPath, p as withTypescriptProjects, r as preparePublicOutput, s as assembleApplicationGeneration, t as buildApplication, u as inspectProjects, v as compileServerApplication, w as toContentDigest, x as getClientViewEntries, y as containsRelativePath } from "../build-DcP5_DUV.js";
-import { g as DEVELOPMENT_PROTOCOL, y as FRAMEWORK_IDENTITY_PROTOCOL } from "../value-transport-Bst4Hk-n.js";
+import { C as projectBrowserContracts, S as getClientViewEntries, _ as createCssPublicAssets, a as acquireOutputOwnership, b as toContentDigest, c as writeAndCheckApplicationGeneration, d as readTypescriptProjectRoots, f as runTypescriptOperation, g as containsRelativePath, h as resolveVormaConfig, i as publishApplicationArtifacts, l as collectPublicAssets, m as getGeneratedSourceDirectories, n as loadApplicationSourceLayout, o as checkOutputPath, p as withTypescriptProjects, r as preparePublicOutput, s as assembleApplicationGeneration, t as buildApplication, u as inspectProjects, v as createClientPublicUrlPlugin, x as CLIENT_SHARED_PACKAGES, y as encodeCanonicalJson } from "../build-BeUTL6eX.js";
 import { t as VORMA_BUILD_PLUGIN_NAME } from "../build-invocation-D7Fu8gBK.js";
-import { VormaConfigSchema } from "../server/config/index.js";
 import { NodeChildProcessSpawner, NodeCrypto, NodeFileSystem, NodePath, NodeRuntime, NodeSocketServer, NodeStdio, NodeTerminal } from "@effect/platform-node-shared";
 import { Cause, Console, Deferred, Effect, Exit, Fiber, FileSystem, Layer, Path, Queue, Result, Schedule, Schema, ScopedRef, Stream } from "effect";
 import { Command, Flag } from "effect/unstable/cli";
 import { createFilter, createServer, loadConfigFromFile, normalizePath } from "vite";
-import { dirname, isAbsolute, posix, relative, sep } from "node:path";
+import { DEVELOPMENT_PROTOCOL, FRAMEWORK_IDENTITY_PROTOCOL } from "@vorma/protocol";
 import { RolldownMagicString } from "rolldown";
+import { dirname, isAbsolute, posix, relative, sep } from "node:path";
 import { createServer as createServer$1 } from "node:http";
+import { VormaConfigSchema } from "@vorma/server/config";
 import { FetchHttpClient, HttpClient } from "effect/unstable/http";
 import { ChildProcess } from "effect/unstable/process";
 import { watch } from "chokidar";
@@ -136,7 +136,7 @@ function readDevelopmentStylesheet(input) {
 }
 //#endregion
 //#region src/build/development-build.ts
-/** Prepares server bytes and native CSS concurrently after their generated inputs exist. */
+/** Prepares native CSS after the generation's public-asset inputs exist. */
 function prepareDevelopmentBuild(input) {
 	return Effect.gen(function* () {
 		const { generation, client, previous } = input;
@@ -144,24 +144,18 @@ function prepareDevelopmentBuild(input) {
 		const inputsChanged = previous === void 0 || previous.work.inspectSources || previous.work.capturePublicAssets;
 		return {
 			generation,
-			...yield* Effect.all({
-				server: previous === void 0 || previous.work.compileServer ? compileServerApplication({
-					generation: application,
-					sourcemap: "inline"
-				}) : Effect.succeed(previous.build.server),
-				stylesheet: Effect.gen(function* () {
-					if (previous !== void 0 && inputsChanged) client.updateInputsFn(toDevelopmentClientInputs(application, generation.sources));
-					if (previous !== void 0 && !previous.work.prepareCriticalCss) return previous.build.stylesheet;
-					const filePath = application.config.criticalCssEntryFilePath;
-					return filePath === void 0 ? {
-						css: "",
-						inputFilePaths: []
-					} : yield* readDevelopmentStylesheet({
-						server: client.server,
-						filePath
-					});
-				})
-			}, { concurrency: 2 })
+			stylesheet: yield* Effect.gen(function* () {
+				if (previous !== void 0 && inputsChanged) client.updateInputsFn(toDevelopmentClientInputs(application, generation.sources));
+				if (previous !== void 0 && !previous.work.prepareCriticalCss) return previous.build.stylesheet;
+				const filePath = application.config.criticalCssEntryFilePath;
+				return filePath === void 0 ? {
+					css: "",
+					inputFilePaths: []
+				} : yield* readDevelopmentStylesheet({
+					server: client.server,
+					filePath
+				});
+			})
 		};
 	});
 }
@@ -316,7 +310,10 @@ function startDevelopmentClient(inputs, port, recordChangeFn) {
 							return new RegExp(`^${normalizePath(file).replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(?:\\?.*)?$`);
 						})]
 					},
-					optimizeDeps: { entries: [inputs.clientEntryFilePath, ...inputs.clientViewModules] },
+					optimizeDeps: {
+						exclude: [FRAMEWORK_IDENTITY_PROTOCOL.moduleSpecifiers.clientTransportTypes],
+						entries: [inputs.clientEntryFilePath, ...inputs.clientViewModules]
+					},
 					server: {
 						middlewareMode: true,
 						origin: listener.origin,
@@ -578,7 +575,10 @@ function prepareDevelopmentGeneration(input) {
 			inspection: prepared.sources.inspection,
 			publicAssets: prepared.publicAssets
 		});
-		if (previous === void 0 || previous.work.inspectSources || previous.work.capturePublicAssets) yield* writeAndCheckApplicationGeneration(application);
+		if (previous === void 0 || previous.work.inspectSources || previous.work.capturePublicAssets) yield* writeAndCheckApplicationGeneration(application, previous === void 0 || previous.work.inspectSources ? {
+			server: prepared.sources.inputs.serverRootFiles,
+			client: prepared.sources.inputs.clientRootFiles
+		} : void 0);
 		return {
 			application,
 			sources: prepared.sources.inputs
@@ -636,10 +636,12 @@ function getDevelopmentServerPort() {
 		return address.port;
 	}));
 }
-/** Runs the authored server entry; its Effect scope owns process termination. */
+/** Runs the configured server command; its Effect scope owns process termination. */
 function startDevelopmentServerProcess(input) {
 	return Effect.gen(function* () {
-		const process = yield* ChildProcess.make(globalThis.process.execPath, ["--enable-source-maps", input.layout.compiledServerEntryFilePath], {
+		const [executable, ...args] = input.command;
+		const process = yield* ChildProcess.make(executable, args, {
+			cwd: input.configDirectory,
 			env: { [DEVELOPMENT_PROTOCOL.serverPortEnvironmentVariable]: String(input.port) },
 			extendEnv: true,
 			stdin: "ignore",
@@ -823,7 +825,8 @@ function classifyDevelopmentChanges(input) {
 		const revalidate = compileDevelopmentPatterns(layout.dev?.revalidateClientOnChange ?? []);
 		let restartConfiguration = false;
 		let inspectSources = false;
-		let compileServer = false;
+		let restartServer = false;
+		let restartVite = false;
 		let capturePublicAssets = false;
 		let prepareCriticalCss = false;
 		let revalidateClient = false;
@@ -835,7 +838,8 @@ function classifyDevelopmentChanges(input) {
 			const clientSource = inputs.sources.clientFiles.has(filePath) || inputs.sources.clientRootFiles.has(filePath);
 			const resolutionSource = inputs.sources.resolutionFiles.has(filePath);
 			inspectSources ||= serverSource || clientSource || resolutionSource;
-			compileServer ||= serverSource || resolutionSource || inputs.serverFiles.has(filePath);
+			restartServer ||= serverSource || resolutionSource;
+			restartVite ||= resolutionSource;
 			capturePublicAssets ||= containsFilePath({
 				path,
 				directory: layout.publicAssetsSourceDirectory,
@@ -855,12 +859,13 @@ function classifyDevelopmentChanges(input) {
 			const serverMembershipChanged = differsFromPreviousFiles(inputs.sources.serverRootFiles, roots.server);
 			const clientMembershipChanged = differsFromPreviousFiles(inputs.sources.clientRootFiles, roots.client);
 			inspectSources ||= serverMembershipChanged || clientMembershipChanged;
-			compileServer ||= serverMembershipChanged;
+			restartServer ||= serverMembershipChanged;
 		}
 		return {
 			restartConfiguration,
 			inspectSources,
-			compileServer,
+			restartServer,
+			restartVite,
 			capturePublicAssets,
 			prepareCriticalCss: layout.criticalCssEntryFilePath !== void 0 && (prepareCriticalCss || capturePublicAssets),
 			revalidateClient
@@ -896,8 +901,16 @@ function loadDevelopmentConfig(configPath) {
 				};
 			}
 		});
+		const config = yield* Schema.decodeUnknownEffect(VormaConfigSchema)(loaded?.config);
+		if (config.dev === void 0) return yield* Effect.fail({
+			_tag: "ConfigLoadError",
+			message: "vorma dev requires dev.serverCommand in the Vorma configuration"
+		});
 		return {
-			config: yield* Schema.decodeUnknownEffect(VormaConfigSchema)(loaded?.config),
+			config: {
+				...config,
+				dev: config.dev
+			},
 			configFilePath,
 			dependencies: loaded?.dependencies ?? []
 		};
@@ -990,7 +1003,6 @@ function runDevelopmentSession(input) {
 		yield* input.watcher.watchPathsFn({
 			paths: [
 				...input.loaded.dependencies,
-				path.dirname(resolved.serverEntryFilePath),
 				path.dirname(resolved.clientEntryFilePath),
 				path.dirname(resolved.serverTsconfigFilePath),
 				path.dirname(resolved.clientTsconfigFilePath),
@@ -1062,7 +1074,8 @@ function runDevelopmentSession(input) {
 			};
 			const fiber = yield* Effect.scoped(Effect.gen(function* () {
 				const server = yield* startDevelopmentServerProcess({
-					layout,
+					command: input.loaded.config.dev.serverCommand,
+					configDirectory: layout.configDirectory,
 					port: input.port
 				});
 				announced = true;
@@ -1096,7 +1109,6 @@ function runDevelopmentSession(input) {
 			return Effect.gen(function* () {
 				inputs = {
 					sources: next.generation.sources,
-					serverFiles: new Set(next.server.inputFilePaths.map(normalizePath)),
 					criticalCssFiles: new Set(next.stylesheet.inputFilePaths.map(normalizePath)),
 					configurationFiles: new Set(input.loaded.dependencies.map(normalizePath)),
 					viteConfigurationFiles: new Set(client.server.config.configFileDependencies)
@@ -1109,7 +1121,6 @@ function runDevelopmentSession(input) {
 				yield* input.watcher.watchPathsFn({
 					paths: [
 						...sourcePaths,
-						...inputs.serverFiles,
 						...inputs.criticalCssFiles,
 						...inputs.configurationFiles,
 						layout.configFilePath,
@@ -1123,7 +1134,6 @@ function runDevelopmentSession(input) {
 		}
 		yield* publishApplicationArtifacts({
 			generation: generation.application,
-			server: build.server,
 			artifacts
 		});
 		yield* startApplication;
@@ -1150,7 +1160,7 @@ function runDevelopmentSession(input) {
 					if (preparingRevision === revision) pendingPaths.clear();
 					return;
 				}
-				if (work.compileServer || work.restartConfiguration) notifyFn({ kind: "rebuilding" });
+				if (work.restartServer || work.restartConfiguration) notifyFn({ kind: "rebuilding" });
 				if (work.restartConfiguration) {
 					const next = yield* loadDevelopmentConfig(layout.configFilePath);
 					const nextLayout = yield* resolveVormaConfig(next).pipe(Effect.flatMap(loadApplicationSourceLayout));
@@ -1174,7 +1184,7 @@ function runDevelopmentSession(input) {
 							work
 						}
 					});
-				})), work.compileServer ? stopApplication : Effect.void], { concurrency: 2 });
+				})), work.restartServer ? stopApplication : Effect.void], { concurrency: 2 });
 				const previousArtifacts = artifacts;
 				head = yield* client.readHeadHtml;
 				const nextArtifacts = assembleDevelopmentArtifacts({
@@ -1182,14 +1192,13 @@ function runDevelopmentSession(input) {
 					client,
 					developmentHeadHtml: head
 				});
-				const restartVite = work.compileServer || JSON.stringify(previousArtifacts.metadata.clientViews) !== JSON.stringify(nextArtifacts.metadata.clientViews);
-				const reload = restartVite || previousArtifacts.metadata.clientBuildId !== nextArtifacts.metadata.clientBuildId;
+				const restartVite = work.restartVite || JSON.stringify(previousArtifacts.metadata.clientViews) !== JSON.stringify(nextArtifacts.metadata.clientViews);
+				const reload = work.restartServer || restartVite || previousArtifacts.metadata.clientBuildId !== nextArtifacts.metadata.clientBuildId;
 				yield* publishApplicationArtifacts({
 					generation: next.generation.application,
-					artifacts: nextArtifacts,
-					...work.compileServer ? { server: next.server } : {}
+					artifacts: nextArtifacts
 				});
-				if (work.compileServer) yield* startApplication;
+				if (work.restartServer) yield* startApplication;
 				client.resumeInspectionFn(reload);
 				if (restartVite) {
 					yield* client.restart;

package/dist/build/compile-application.d.ts

@@ -1,7 +1,7 @@
 import type { CompiledNestedPattern, PatternCompileError } from "@vorma/primitives/matcher";
+import { type ConflictingDynamicParameterNameError } from "@vorma/protocol/path";
+import { type PathWireError } from "@vorma/protocol/path";
 import { Result } from "effect";
-import { type ConflictingDynamicParameterNameError } from "../server/graph/pattern-conflicts.ts";
-import { type PathWireError } from "../universal/path-wire.ts";
 import type { DeclarationSource, InspectedClientView, InspectedEndpoint, InspectedProjects, InspectedServerDeclaration, InspectedUiLoader } from "./inspect-projects.ts";
 export type ApplicationSegment = {
     /** The authored pattern, as the loader or the view wrote it. */

package/dist/build/development-artifacts.d.ts

@@ -1,4 +1,4 @@
-import type { ClientModule } from "../universal/protocol.ts";
+import type { ClientModule } from "@vorma/protocol";
 import type { DevelopmentBuild, DevelopmentClient } from "./development-build.ts";
 export declare function toDevelopmentModuleUrl(input: {
     readonly origin: string;

package/dist/build/development-build.d.ts

@@ -1,18 +1,16 @@
 import { Effect } from "effect";
-import { type CompiledServer } from "./compile-server.ts";
 import type { startDevelopmentClient } from "./development-client.ts";
 import type { DevelopmentGeneration } from "./development-generation.ts";
 import type { DevelopmentWork } from "./development-work.ts";
 export type DevelopmentClient = Effect.Success<ReturnType<typeof startDevelopmentClient>>;
 export type DevelopmentBuild = {
     readonly generation: DevelopmentGeneration;
-    readonly server: CompiledServer;
     readonly stylesheet: {
         readonly css: string;
         readonly inputFilePaths: ReadonlyArray<string>;
     };
 };
-/** Prepares server bytes and native CSS concurrently after their generated inputs exist. */
+/** Prepares native CSS after the generation's public-asset inputs exist. */
 export declare function prepareDevelopmentBuild(input: {
     readonly generation: DevelopmentGeneration;
     readonly client: DevelopmentClient;
@@ -21,10 +19,9 @@ export declare function prepareDevelopmentBuild(input: {
         readonly work: DevelopmentWork;
     };
 }): Effect.Effect<{
-    server: CompiledServer;
+    generation: DevelopmentGeneration;
     stylesheet: {
         readonly css: string;
         readonly inputFilePaths: ReadonlyArray<string>;
     };
-    generation: DevelopmentGeneration;
-}, import("./development-stylesheet.ts").DevelopmentStylesheetIssue | import("./compile-server.ts").ServerCompilationIssue, never>;
+}, import("./development-stylesheet.ts").DevelopmentStylesheetIssue, never>;

package/dist/build/development-server-process.d.ts

@@ -1,5 +1,4 @@
 import { Effect } from "effect";
-import type { ApplicationSourceLayout } from "./source-layout.ts";
 export type DevelopmentServerExit = {
     readonly _tag: "DevelopmentServerExit";
     readonly exitCode: number;
@@ -10,9 +9,10 @@ export type DevelopmentServerReadinessIssue = {
 };
 /** Reserves a port until the enclosing allocation scope closes. */
 export declare function getDevelopmentServerPort(): Effect.Effect<number, import("effect/unstable/socket/SocketServer").SocketServerError, import("effect/Scope").Scope>;
-/** Runs the authored server entry; its Effect scope owns process termination. */
+/** Runs the configured server command; its Effect scope owns process termination. */
 export declare function startDevelopmentServerProcess(input: {
-    readonly layout: ApplicationSourceLayout;
+    readonly command: readonly [string, ...Array<string>];
+    readonly configDirectory: string;
     readonly port: number;
 }): Effect.Effect<{
     process: import("effect/unstable/process/ChildProcessSpawner").ChildProcessHandle;

package/dist/build/development-work.d.ts

@@ -5,14 +5,14 @@ import type { ApplicationSourceLayout } from "./source-layout.ts";
 export type DevelopmentWork = {
     readonly restartConfiguration: boolean;
     readonly inspectSources: boolean;
-    readonly compileServer: boolean;
+    readonly restartServer: boolean;
+    readonly restartVite: boolean;
     readonly capturePublicAssets: boolean;
     readonly prepareCriticalCss: boolean;
     readonly revalidateClient: boolean;
 };
 export type DevelopmentInputs = {
     readonly sources: DevelopmentSourceInputs;
-    readonly serverFiles: ReadonlySet<string>;
     readonly configurationFiles: ReadonlySet<string>;
     readonly viteConfigurationFiles: ReadonlySet<string>;
     readonly criticalCssFiles: ReadonlySet<string>;
@@ -25,7 +25,8 @@ export declare function classifyDevelopmentChanges(input: {
 }): Effect.Effect<{
     restartConfiguration: boolean;
     inspectSources: boolean;
-    compileServer: boolean;
+    restartServer: boolean;
+    restartVite: boolean;
     capturePublicAssets: boolean;
     prepareCriticalCss: boolean;
     revalidateClient: boolean;

package/dist/build/generate-application.d.ts

@@ -7,7 +7,7 @@ import { type PublicAssetIssue, type PublicAssetProjection } from "./public-asse
 import type { GeneratedSource } from "./render-source-text.ts";
 import type { ConfigResolutionError } from "./resolve-config.ts";
 import type { ApplicationSourceLayout, ApplicationSourceLayoutIssues } from "./source-layout.ts";
-import { type TypescriptProjectError } from "./typescript-projects.ts";
+import { type TypescriptProjectRoots, type TypescriptProjectError } from "./typescript-projects.ts";
 export type ApplicationModelIssues = {
     readonly _tag: "ApplicationModelIssues";
     readonly issues: ReadonlyArray<ApplicationModelIssue>;
@@ -29,14 +29,14 @@ export type ApplicationGeneration = {
     readonly config: ApplicationSourceLayout;
     readonly model: ApplicationModel;
     readonly inspection: InspectedProjects;
-    /** The declaration augmenting `vorma/client` with this application's contracts: types only. */
+    /** The declaration augmenting `@vorma/client` with this application's contracts: types only. */
     readonly clientContracts: GeneratedSource;
     /** Runtime adapters for the Effect data types that occur in this application's contracts. */
     readonly clientTransport: GeneratedSource;
     readonly publicAssets: PublicAssetProjection;
 };
 /** Writes correlated generated sources and verifies their native TypeScript inclusion. */
-export declare function writeAndCheckApplicationGeneration(generation: ApplicationGeneration): Effect.Effect<void, GeneratedApplicationWriteError | TypescriptProjectError, FileSystem.FileSystem | Path.Path>;
+export declare function writeAndCheckApplicationGeneration(generation: ApplicationGeneration, knownRootFiles?: TypescriptProjectRoots): Effect.Effect<void, GeneratedApplicationWriteError | TypescriptProjectError, FileSystem.FileSystem | Path.Path>;
 /** Reads both projects through the checker, captures public assets, and prepares generated build inputs without publishing them. */
 export declare function prepareApplicationGeneration(sourceLayout: ApplicationSourceLayout): Effect.Effect<ApplicationGeneration, ApplicationGenerationError, FileSystem.FileSystem | Path.Path>;
 /** Reads declarations and public URL call sites independently of public asset hashing. */
@@ -55,7 +55,7 @@ export declare function assembleApplicationGeneration(input: {
 export declare function writeApplicationGeneration(generation: ApplicationGeneration): Effect.Effect<void, GeneratedApplicationWriteError, FileSystem.FileSystem | Path.Path>;
 /**
  * Writes the internal registration module and the application
- * contract types before server compilation.
+ * contract types before application startup.
  */
 export declare function writeGeneratedServerApplication(input: {
     readonly generation: ApplicationGeneration;

package/dist/build/index.d.ts

@@ -1,5 +1,5 @@
+import type { VormaConfig } from "@vorma/server/config";
 import { Effect } from "effect";
-import type { VormaConfig } from "../server/config/index.ts";
 /**
  * Builds and publishes one production application while holding all generated
  * output ownership. `configFilePath` is the absolute path of the configuration
@@ -11,5 +11,4 @@ export declare function buildApplication(input: {
 }): Effect.Effect<{
     clientBuildId: string;
     publicDirectory: string;
-    serverEntryPath: string;
-}, import("./assemble-artifacts.ts").ArtifactAssemblyIssue | import("./publish-artifacts.ts").ArtifactPublicationIssue | import("./bundle-client.ts").ClientBundleIssue | import("./generate-application.ts").GeneratedApplicationWriteError | import("./output-ownership.ts").OutputOwnershipIssue | import("effect/PlatformError").PlatformError | import("./compile-server.ts").ServerCompilationIssue | import("./generate-application.ts").ApplicationGenerationError, import("effect/FileSystem").FileSystem | import("effect/Path").Path>;
+}, import("./assemble-artifacts.ts").ArtifactAssemblyIssue | import("./publish-artifacts.ts").ArtifactPublicationIssue | import("./bundle-client.ts").ClientBundleIssue | import("./generate-application.ts").GeneratedApplicationWriteError | import("./output-ownership.ts").OutputOwnershipIssue | import("effect/PlatformError").PlatformError | import("./generate-application.ts").ApplicationGenerationError, import("effect/FileSystem").FileSystem | import("effect/Path").Path>;

package/dist/build/index.js

@@ -1,2 +1,2 @@
-import { t as buildApplication } from "../build-DcP5_DUV.js";
+import { t as buildApplication } from "../build-BeUTL6eX.js";
 export { buildApplication };

package/dist/build/inspect-projects.d.ts

@@ -1,7 +1,7 @@
+import type { HttpMethod, InputTransportKind } from "@vorma/protocol";
+import type { EffectTransportMarkKind } from "@vorma/protocol/transport";
 import { Effect } from "effect";
 import * as Path from "effect/Path";
-import type { HttpMethod, InputTransport } from "../server/graph/declarations.ts";
-import type { EffectTransportMarkKind } from "../universal/value-transport.ts";
 import type { ApplicationSourceLayout } from "./source-layout.ts";
 import { type TypescriptProjectError, type TypescriptProjects } from "./typescript-projects.ts";
 export type DeclarationSource = {
@@ -26,7 +26,7 @@ export type InspectedEndpoint = DeclarationSource & {
     readonly method: HttpMethod;
     readonly pattern: string;
     readonly input: string | undefined;
-    readonly inputTransport: InputTransport["kind"];
+    readonly inputTransport: InputTransportKind;
     readonly output: string | undefined;
     readonly event: string | undefined;
     readonly errors: ReadonlyArray<InspectedEndpointError>;

package/dist/build/load-config.d.ts

@@ -2,31 +2,33 @@ import { Effect, Path, Schema } from "effect";
 type ConfigLoadError = {
     readonly _tag: "ConfigLoadError";
     readonly message: string;
-    readonly cause: unknown;
+    readonly cause?: unknown;
 };
 /** Vite's configuration loader recompiles configuration dependencies on each development restart. */
 export declare function loadDevelopmentConfig(configPath: string): Effect.Effect<{
     config: {
-        readonly importMeta: {
+        importMeta: {
             readonly url: string;
         };
-        readonly serverEntry: string;
-        readonly serverTsconfigFile: string;
-        readonly clientEntry: string;
-        readonly clientTsconfigFile: string;
-        readonly publicAssetsDir: string;
-        readonly viteConfigFile: string;
-        readonly criticalCssEntry?: string;
-        readonly serverExternalPackages?: readonly string[];
-        readonly publicAssetsBasePath: string;
-        readonly bodySsr?: boolean;
-        readonly dev?: {
+        serverTsconfigFile: string;
+        clientEntry: string;
+        clientTsconfigFile: string;
+        publicAssetsDir: string;
+        viteConfigFile: string;
+        criticalCssEntry?: string;
+        publicAssetsBasePath: string;
+        bodySsr?: boolean;
+        dev: {
+            readonly serverCommand: readonly [string, ...string[]];
             readonly revalidateClientOnChange?: readonly string[];
         };
     };
     configFilePath: string;
     dependencies: string[];
-}, ConfigLoadError | Schema.SchemaError, Path.Path>;
+}, ConfigLoadError | Schema.SchemaError | {
+    _tag: "ConfigLoadError";
+    message: string;
+}, Path.Path>;
 /**
  * Imports the explicitly selected configuration using the CLI host's module
  * loader and reports the absolute path of the file it was loaded from,
@@ -37,17 +39,16 @@ export declare function loadVormaConfig(configPath: string): Effect.Effect<{
         readonly importMeta: {
             readonly url: string;
         };
-        readonly serverEntry: string;
         readonly serverTsconfigFile: string;
         readonly clientEntry: string;
         readonly clientTsconfigFile: string;
         readonly publicAssetsDir: string;
         readonly viteConfigFile: string;
         readonly criticalCssEntry?: string;
-        readonly serverExternalPackages?: readonly string[];
         readonly publicAssetsBasePath: string;
         readonly bodySsr?: boolean;
         readonly dev?: {
+            readonly serverCommand: readonly [string, ...string[]];
             readonly revalidateClientOnChange?: readonly string[];
         };
     };

package/dist/build/publish-artifacts.d.ts

@@ -2,7 +2,6 @@ import { Effect } from "effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
 import type { ApplicationArtifacts } from "./assemble-artifacts.ts";
-import type { CompiledServer } from "./compile-server.ts";
 import type { ApplicationGeneration } from "./generate-application.ts";
 import type { ApplicationSourceLayout } from "./source-layout.ts";
 export type ArtifactPublicationIssue = {
@@ -11,13 +10,11 @@ export type ArtifactPublicationIssue = {
 };
 /** Prepares one public output before Vite adds its browser files to it. */
 export declare function preparePublicOutput(config: ApplicationSourceLayout): Effect.Effect<void, import("./output-ownership.ts").OutputOwnershipIssue | import("effect/PlatformError").PlatformError, FileSystem.FileSystem | Path.Path>;
-/** Publishes compiled server modules and private metadata for the completed browser build. */
+/** Publishes private metadata for the completed browser build. */
 export declare function publishApplicationArtifacts(input: {
     readonly artifacts: ApplicationArtifacts;
-    readonly server?: CompiledServer;
     readonly generation: ApplicationGeneration;
 }): Effect.Effect<{
     clientBuildId: string;
     publicDirectory: string;
-    serverEntryPath: string;
 }, ArtifactPublicationIssue, FileSystem.FileSystem | Path.Path>;

package/dist/build/render-client-transport.d.ts

@@ -1,4 +1,4 @@
-import { type EffectTransportMarkKind } from "../universal/value-transport.ts";
+import { type EffectTransportMarkKind } from "@vorma/protocol/transport";
 import type { GeneratedSource } from "./render-source-text.ts";
 /**
  * Selects generic value adapters without generating application schemas or route

package/dist/build/render-server-generated.d.ts

@@ -3,24 +3,13 @@ import type { ApplicationModel } from "./compile-application.ts";
 import type { DeclarationSource } from "./inspect-projects.ts";
 import { type PublicAssetProjection } from "./public-assets.ts";
 import { type GeneratedSource } from "./render-source-text.ts";
-/**
- * The URL of the published public directory relative to a compiled server
- * module. Every compiled module sits directly in the server entry's Vorma
- * directory, so one relative URL locates the bytes from all of them.
- */
-export declare function getPublicDirectoryRelativeUrl(input: {
-    readonly path: Path.Path;
-    readonly serverGeneratedDirectory: string;
-    readonly publicDirectory: string;
-}): string;
 /** Renders registration imports independently of final browser output. */
 export declare function renderGeneratedBuildModule(input: {
     readonly declarations: ReadonlyArray<DeclarationSource>;
-    readonly publicDirectoryRelativeUrl: string;
     readonly filePath: string;
     readonly path: Path.Path;
 }): GeneratedSource;
-/** Renders the declaration that augments `vorma/server` with this application's patterns, search types, and asset keys. */
+/** Renders the declaration that augments `@vorma/server` with this application's patterns, search types, and asset keys. */
 export declare function renderGeneratedServerContracts(input: {
     readonly model: ApplicationModel;
     readonly publicAssets: PublicAssetProjection;

package/dist/build/render-types.d.ts

@@ -1,6 +1,6 @@
+import type { EffectTransportMarkKind } from "@vorma/protocol/transport";
 import { Result } from "effect";
 import { type Checker, type Emitter, type Program, type Symbol as TypeSymbol, type Type } from "typescript/unstable/async";
-import type { EffectTransportMarkKind } from "../universal/value-transport.ts";
 export type TypeRenderIssue = {
     readonly _tag: "UnrenderableContractType";
     readonly reason: string;

package/dist/build/resolve-config.d.ts

@@ -1,12 +1,11 @@
+import { type VormaConfig } from "@vorma/server/config";
 import { Effect } from "effect";
 import * as Path from "effect/Path";
-import { type VormaConfig } from "../server/config/index.ts";
 export type PublicAssetsBasePath = "/" | `/${string}/`;
 export type ResolvedVormaConfig = {
     readonly configFilePath: string;
     /** The directory of the configuration file; every configured path is relative to it. */
     readonly configDirectory: string;
-    readonly serverEntryFilePath: string;
     readonly serverTsconfigFilePath: string;
     /** The directory containing the server tsconfig, used as the compiler's working directory. */
     readonly serverProjectDirectory: string;
@@ -15,7 +14,6 @@ export type ResolvedVormaConfig = {
     readonly publicAssetsSourceDirectory: string;
     readonly viteConfigFilePath: string;
     readonly criticalCssEntryFilePath?: string;
-    readonly serverExternalPackages: ReadonlyArray<string>;
     readonly publicAssetsBasePath: PublicAssetsBasePath;
     readonly bodySsr: VormaConfig["bodySsr"];
     readonly dev: VormaConfig["dev"];
@@ -25,17 +23,16 @@ export type VormaOwnedPaths = {
     readonly ignoreFilePaths: ReadonlyArray<string>;
     readonly serverGeneratedDirectory: string;
     readonly clientGeneratedDirectory: string;
-    readonly generatedBuildFilePath: string;
+    readonly generatedRegistrationFilePath: string;
     readonly generatedServerContractsFilePath: string;
-    readonly compiledServerEntryFilePath: string;
 };
-/** The build reads no Vorma directory, in either entry directory, as application source. */
+/** The build excludes both projects' generated directories from application source. */
 export declare function getGeneratedSourceDirectories(config: VormaOwnedPaths): ReadonlyArray<string>;
-/** Derives generated source, public assets, and build coordination from the entry directories. */
+/** Derives generated source, public assets, and build coordination from the tsconfig directories. */
 export declare function getVormaOwnedPaths(input: {
     readonly path: Path.Path;
-    readonly serverEntryDirectory: string;
-    readonly clientEntryDirectory: string;
+    readonly serverProjectDirectory: string;
+    readonly clientProjectDirectory: string;
 }): VormaOwnedPaths;
 export type ConfigResolutionError = {
     readonly _tag: "ConfigResolutionError";

package/dist/build/source-layout.d.ts

@@ -1,12 +1,12 @@
 import { Effect } from "effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
-import { type ResolvedVormaConfig } from "./resolve-config.ts";
+import type { ResolvedVormaConfig } from "./resolve-config.ts";
 declare const APPLICATION_SOURCE_LAYOUT_BRAND: unique symbol;
 export type ApplicationSourceLayout = ResolvedVormaConfig & {
     readonly [APPLICATION_SOURCE_LAYOUT_BRAND]: true;
 };
-export type ApplicationSourcePathField = "serverEntry" | "serverTsconfigFile" | "clientEntry" | "clientTsconfigFile" | "publicAssetsDir" | "viteConfigFile" | "criticalCssEntry";
+export type ApplicationSourcePathField = "serverTsconfigFile" | "clientEntry" | "clientTsconfigFile" | "publicAssetsDir" | "viteConfigFile" | "criticalCssEntry";
 export type ApplicationSourceLayoutIssue = {
     readonly field: ApplicationSourcePathField;
     readonly path: string;