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

package/dist/{build-DcP5_DUV.js → build-BeUTL6eX.js}

@@ -1,38 +1,23 @@
-import { c as compileUiPattern, m as ARTIFACT_PROTOCOL, s as compileEndpointPattern, t as EFFECT_TRANSPORT_TYPES, y as FRAMEWORK_IDENTITY_PROTOCOL } from "./value-transport-Bst4Hk-n.js";
 import { t as VORMA_BUILD_PLUGIN_NAME } from "./build-invocation-D7Fu8gBK.js";
-import { c as findConflictingDynamicParameterNames, f as matchesHttpMethod, o as createNestedRouteChains } from "./compile-Me8EOyMK.js";
-import { VormaConfigSchema } from "./server/config/index.js";
 import { Effect, FileSystem, Option, Record, Result, Schema } from "effect";
-import { build } from "vite";
+import { build, normalizePath } from "vite";
 import { blake3 } from "@noble/hashes/blake3.js";
 import { utf8ToBytes } from "@noble/hashes/utils.js";
 import { base32nopad } from "@scure/base";
-import { isAbsolute, join } from "node:path";
-import { RolldownMagicString, build as build$1 } from "rolldown";
+import { ARTIFACT_PROTOCOL, FRAMEWORK_IDENTITY_PROTOCOL, matchesHttpMethod } from "@vorma/protocol";
+import { RolldownMagicString } from "rolldown";
 import { readFile } from "node:fs/promises";
+import { join } from "node:path";
 import * as Path$1 from "effect/Path";
 import { SyntaxKind, TokenFlags, isAsExpression, isCallExpression, isElementAccessExpression, isExportSpecifier, isIdentifier, isImportClause, isImportSpecifier, isNamespaceImport, isNoSubstitutionTemplateLiteral, isNonNullExpression, isParenthesizedExpression, isPropertyAccessExpression, isSatisfiesExpression, isStringLiteral, isTypeAssertion, isTypeNode } from "typescript/unstable/ast";
-import { API, ElementFlags, SignatureKind, SymbolFlags } from "typescript/unstable/async";
+import { API, DiagnosticCategory, ElementFlags, SignatureKind, SymbolFlags } from "typescript/unstable/async";
 import { createTemplateHead, createTemplateMiddle, createTemplateTail } from "typescript/unstable/ast/factory";
+import { compileEndpointPattern, compileUiPattern, createNestedRouteChains, findConflictingDynamicParameterNames, parseUrlPathname } from "@vorma/protocol/path";
+import { VormaConfigSchema } from "@vorma/server/config";
 import * as FileSystem$1 from "effect/FileSystem";
+import { EFFECT_TRANSPORT_TYPES } from "@vorma/protocol/transport";
 import { pid, platform } from "node:process";
 import { transform } from "lightningcss";
-//#region src/universal/content-digest.ts
-/** BLAKE3 content identity, encoded as lowercase base32 without padding. */
-function toContentDigest(source) {
-	return encodeContentDigest(blake3(typeof source === "string" ? utf8ToBytes(source) : source));
-}
-/** Encodes an already computed BLAKE3 digest. */
-function encodeContentDigest(digest) {
-	return base32nopad.encode(digest).toLowerCase();
-}
-/** Canonical object ordering; array order carries framework semantics. */
-function encodeCanonicalJson(value) {
-	if (Array.isArray(value)) return `[${value.map(encodeCanonicalJson).join(",")}]`;
-	if (value !== null && typeof value === "object") return `{${Object.entries(value).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0).map(([key, item]) => `${JSON.stringify(key)}:${encodeCanonicalJson(item)}`).join(",")}}`;
-	return JSON.stringify(value);
-}
-//#endregion
 //#region src/build/browser-contracts.ts
 /**
 * The static contracts on which browser code and learned routing depend.
@@ -91,138 +76,20 @@ function getClientViewEntries(generation) {
 	});
 }
 //#endregion
-//#region src/build/contained-path.ts
-/** True when a `path.relative` result names the root or a descendant of it. */
-function containsRelativePath(input) {
-	return input.relativePath === "" || !input.absolute && input.relativePath !== ".." && !input.relativePath.startsWith(`..${input.separator}`);
-}
-/**
-* True when a module specifier names a package or one of its subpaths.
-* Relative, absolute, builtin, scheme, drive-letter, and virtual-module
-* specifiers never match; only the caller decides which of those to exclude
-* first.
-*/
-function matchesPackageSpecifier(input) {
-	return input.source === input.packageName || input.source.startsWith(`${input.packageName}/`);
-}
-/**
-* A `path.relative` result with platform separators converted to POSIX
-* separators, for generated module specifiers, output keys, and build
-* identities, which are POSIX even when the build runs on Windows.
-*/
-function toPosixRelativePath(input) {
-	return input.path.relative(input.from, input.to).split(input.path.sep).join("/");
+//#region src/build/content-digest.ts
+/** BLAKE3 content identity, encoded as lowercase base32 without padding. */
+function toContentDigest(source) {
+	return encodeContentDigest(blake3(typeof source === "string" ? utf8ToBytes(source) : source));
 }
-//#endregion
-//#region src/build/compile-server.ts
-/** Log codes reporting a specifier the compiler could not resolve. */
-const UNRESOLVED_LOG_CODE = /^UNRESOLVED/;
-const TERMINAL_STYLE = new RegExp(`${String.fromCharCode(27)}\\[[\\d;]*m`, "g");
-/** The plain first line of a compiler message, with the module it concerns. */
-function toLogSummary(log) {
-	const plain = log.message.replace(TERMINAL_STYLE, "");
-	const [firstLine] = plain.split("\n");
-	const summary = firstLine === void 0 ? plain : firstLine;
-	return log.id === void 0 ? summary : `${summary} (${log.id})`;
+/** Encodes an already computed BLAKE3 digest. */
+function encodeContentDigest(digest) {
+	return base32nopad.encode(digest).toLowerCase();
 }
-/**
-* Compiles the configured server entry and internal runtime
-* entry together into ECMAScript modules that run
-* without a TypeScript loader, a Vorma installation, or a bundler in the
-* target process. The compilation rewrites nothing in the application's
-* source. Effect remains a runtime peer shared with the containing application.
-*
-* Rolldown uses the configured server TypeScript project. The client's Vite
-* configuration does not configure server compilation.
-*
-* Production bytes must depend on the sources alone, so the debug comments
-* that name module paths relative to the build directory are off: the
-* checkout's location must not reach the artifact. Symlink resolution stays on
-* because an isolated package store reaches a package's own dependencies only
-* through the real path. Development source maps retain authored locations.
-*/
-function compileServerApplication(input) {
-	return Effect.gen(function* () {
-		const { generation } = input;
-		const { config } = generation;
-		const diagnostics = [];
-		const unresolvedImports = [];
-		let inputFilePaths = [];
-		const output = yield* Effect.tryPromise(() => {
-			return build$1({
-				input: {
-					entry: config.serverEntryFilePath,
-					runtime: config.generatedBuildFilePath
-				},
-				preserveEntrySignatures: "strict",
-				cwd: config.serverProjectDirectory,
-				platform: "node",
-				tsconfig: config.serverTsconfigFilePath,
-				write: false,
-				plugins: [{
-					name: "vorma:server-inputs",
-					generateBundle() {
-						inputFilePaths = [...this.getModuleIds()].filter(isAbsolute);
-					}
-				}],
-				external: (source, _importer, isResolved) => {
-					return !isResolved && (matchesPackageSpecifier({
-						source,
-						packageName: "effect"
-					}) || config.serverExternalPackages.some((packageName) => {
-						return matchesPackageSpecifier({
-							source,
-							packageName
-						});
-					}));
-				},
-				experimental: { attachDebugInfo: "none" },
-				onLog: (level, log) => {
-					const code = log.code === void 0 ? "" : log.code;
-					if (UNRESOLVED_LOG_CODE.test(code)) {
-						unresolvedImports.push(toLogSummary(log));
-						return;
-					}
-					diagnostics.push({
-						level,
-						code,
-						message: toLogSummary(log)
-					});
-				},
-				output: {
-					dir: config.serverGeneratedDirectory,
-					format: "es",
-					entryFileNames: (chunk) => {
-						return chunk.name === "runtime" ? ARTIFACT_PROTOCOL.compiledRuntimeFileName : ARTIFACT_PROTOCOL.compiledServerEntryFileName;
-					},
-					chunkFileNames: "[name]-[hash].mjs",
-					sourcemap: input.sourcemap
-				}
-			});
-		}).pipe(Effect.uninterruptible);
-		if (unresolvedImports.length > 0) return yield* Effect.fail(`The compiled server graph has unresolved imports: ${unresolvedImports.join("; ")}`);
-		const compiled = [];
-		for (const emitted of output.output) {
-			if (emitted.type !== "chunk") return yield* Effect.fail(`The server compilation emitted a file that is not a module: ${emitted.fileName}`);
-			if (!/^[^./][^/]*\.mjs$/.test(emitted.fileName)) return yield* Effect.fail(`The server compilation emitted a file outside its flat module directory: ${emitted.fileName}`);
-			compiled.push({
-				fileName: emitted.fileName,
-				source: emitted.code
-			});
-		}
-		const emittedFileNames = new Set(compiled.map((file) => file.fileName));
-		for (const entryFileName of [ARTIFACT_PROTOCOL.compiledServerEntryFileName, ARTIFACT_PROTOCOL.compiledRuntimeFileName]) if (!emittedFileNames.has(entryFileName)) return yield* Effect.fail(`The server compilation did not emit ${entryFileName}`);
-		return {
-			files: compiled,
-			diagnostics,
-			inputFilePaths
-		};
-	}).pipe(Effect.mapError((cause) => {
-		return {
-			_tag: "ServerCompilationIssue",
-			cause
-		};
-	}));
+/** Canonical object ordering; array order carries framework semantics. */
+function encodeCanonicalJson(value) {
+	if (Array.isArray(value)) return `[${value.map(encodeCanonicalJson).join(",")}]`;
+	if (value !== null && typeof value === "object") return `{${Object.entries(value).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0).map(([key, item]) => `${JSON.stringify(key)}:${encodeCanonicalJson(item)}`).join(",")}}`;
+	return JSON.stringify(value);
 }
 //#endregion
 //#region src/build/client-public-urls.ts
@@ -420,6 +287,20 @@ function stripQueryAndFragment(fileName) {
 	return index === -1 ? fileName : fileName.slice(0, index);
 }
 //#endregion
+//#region src/build/contained-path.ts
+/** True when a `path.relative` result names the root or a descendant of it. */
+function containsRelativePath(input) {
+	return input.relativePath === "" || !input.absolute && input.relativePath !== ".." && !input.relativePath.startsWith(`..${input.separator}`);
+}
+/**
+* A `path.relative` result with platform separators converted to POSIX
+* separators, for generated module specifiers, output keys, and build
+* identities, which are POSIX even when the build runs on Windows.
+*/
+function toPosixRelativePath(input) {
+	return input.path.relative(input.from, input.to).split(input.path.sep).join("/");
+}
+//#endregion
 //#region src/build/compare-text.ts
 /** Compares source-derived text by Unicode code units, independent of host locale. */
 function compareSourceText(input) {
@@ -804,54 +685,24 @@ async function createTypeRenderer(input) {
 	};
 }
 //#endregion
-//#region src/server/url-pathname.ts
-const URL_PATHNAME_PARSER_ORIGIN = "https://vorma.invalid";
-function parseHref(input) {
-	return new URL(input.value, input.base);
-}
-/** Parses the exact pathname representation used for request classification. */
-function parseUrlPathname(value) {
-	const parsed = Result.try({
-		try: () => parseHref({
-			value,
-			base: URL_PATHNAME_PARSER_ORIGIN
-		}),
-		catch: (cause) => makeUrlPathnameParseError({
-			value,
-			cause
-		})
-	});
-	if (Result.isFailure(parsed)) return Result.fail(parsed.failure);
-	if (!value.startsWith("/") || parsed.success.origin !== URL_PATHNAME_PARSER_ORIGIN || parsed.success.pathname !== value || parsed.success.search !== "" || parsed.success.hash !== "") return Result.fail(makeUrlPathnameParseError({ value }));
-	return Result.succeed(value);
-}
-function makeUrlPathnameParseError(input) {
-	return {
-		_tag: "UrlPathnameParseError",
-		value: input.value,
-		...input.cause === void 0 ? {} : { cause: input.cause }
-	};
-}
-//#endregion
 //#region src/build/resolve-config.ts
-/** The build reads no Vorma directory, in either entry directory, as application source. */
+/** The build excludes both projects' generated directories from application source. */
 function getGeneratedSourceDirectories(config) {
 	return [config.serverGeneratedDirectory, config.clientGeneratedDirectory];
 }
-/** Derives generated source, public assets, and build coordination from the entry directories. */
+/** Derives generated source, public assets, and build coordination from the tsconfig directories. */
 function getVormaOwnedPaths(input) {
 	const { path } = input;
 	const name = ARTIFACT_PROTOCOL.vormaDirectoryName;
-	const clientGeneratedDirectory = path.join(input.clientEntryDirectory, name);
-	const serverGeneratedDirectory = path.join(input.serverEntryDirectory, name);
+	const clientGeneratedDirectory = path.join(input.clientProjectDirectory, name);
+	const serverGeneratedDirectory = path.join(input.serverProjectDirectory, name);
 	return {
 		publicDirectory: path.join(clientGeneratedDirectory, ARTIFACT_PROTOCOL.publicDirectoryName),
 		ignoreFilePaths: [.../* @__PURE__ */ new Set([serverGeneratedDirectory, clientGeneratedDirectory])].map((directory) => path.join(directory, ARTIFACT_PROTOCOL.ignoreFileName)),
 		serverGeneratedDirectory,
 		clientGeneratedDirectory,
-		generatedBuildFilePath: path.join(serverGeneratedDirectory, ARTIFACT_PROTOCOL.generatedBuildFileName),
-		generatedServerContractsFilePath: path.join(serverGeneratedDirectory, ARTIFACT_PROTOCOL.generatedServerContractsFileName),
-		compiledServerEntryFilePath: path.join(serverGeneratedDirectory, ARTIFACT_PROTOCOL.compiledServerEntryFileName)
+		generatedRegistrationFilePath: path.join(serverGeneratedDirectory, ARTIFACT_PROTOCOL.registrationFileName),
+		generatedServerContractsFilePath: path.join(serverGeneratedDirectory, ARTIFACT_PROTOCOL.generatedServerContractsFileName)
 	};
 }
 /** Resolves every configured path once against the configuration file's directory. */
@@ -877,14 +728,12 @@ function resolveVormaConfig(input) {
 			message: `configFilePath must be absolute, got ${JSON.stringify(input.configFilePath)}`
 		});
 		const configDirectory = path.dirname(path.normalize(input.configFilePath));
-		const serverEntryFilePath = path.resolve(configDirectory, config.serverEntry);
 		const serverTsconfigFilePath = path.resolve(configDirectory, config.serverTsconfigFile);
 		const clientEntryFilePath = path.resolve(configDirectory, config.clientEntry);
 		const clientTsconfigFilePath = path.resolve(configDirectory, config.clientTsconfigFile);
 		return {
 			configFilePath: path.normalize(input.configFilePath),
 			configDirectory,
-			serverEntryFilePath,
 			serverTsconfigFilePath,
 			serverProjectDirectory: path.dirname(serverTsconfigFilePath),
 			clientEntryFilePath,
@@ -892,14 +741,13 @@ function resolveVormaConfig(input) {
 			publicAssetsSourceDirectory: path.resolve(configDirectory, config.publicAssetsDir),
 			viteConfigFilePath: path.resolve(configDirectory, config.viteConfigFile),
 			...config.criticalCssEntry === void 0 ? {} : { criticalCssEntryFilePath: path.resolve(configDirectory, config.criticalCssEntry) },
-			serverExternalPackages: config.serverExternalPackages === void 0 ? [] : config.serverExternalPackages,
 			publicAssetsBasePath: yield* Effect.fromResult(parsePublicAssetsBasePath(config.publicAssetsBasePath)),
 			bodySsr: config.bodySsr,
 			dev: config.dev,
 			...getVormaOwnedPaths({
 				path,
-				serverEntryDirectory: path.dirname(serverEntryFilePath),
-				clientEntryDirectory: path.dirname(clientEntryFilePath)
+				serverProjectDirectory: path.dirname(serverTsconfigFilePath),
+				clientProjectDirectory: path.dirname(clientTsconfigFilePath)
 			})
 		};
 	});
@@ -940,6 +788,9 @@ function readTypescriptProjectRoots(input) {
 }
 /** Checks actual compiler membership after generation, including restrictive files/include/exclude settings. */
 function checkGeneratedTypeInclusion(input) {
+	const serverFiles = input.serverFiles.filter((file) => !input.knownRootFiles?.server.has(normalizePath(file)));
+	const clientFiles = input.clientFiles.filter((file) => !input.knownRootFiles?.client.has(normalizePath(file)));
+	if (serverFiles.length === 0 && clientFiles.length === 0) return Effect.void;
 	return withTypescriptProjects({
 		...input,
 		useFn: (projects) => {
@@ -948,11 +799,11 @@ function checkGeneratedTypeInclusion(input) {
 					const missing = [];
 					for (const [project, files, config] of [[
 						projects.server,
-						input.serverFiles,
+						serverFiles,
 						input.serverTsconfigFilePath
 					], [
 						projects.client,
-						input.clientFiles,
+						clientFiles,
 						input.clientTsconfigFilePath
 					]]) for (const file of files) if (await project.program.getSourceFileMetadata(file) === void 0) missing.push({
 						project: config,
@@ -962,7 +813,7 @@ function checkGeneratedTypeInclusion(input) {
 				});
 				return yield* missing.length === 0 ? Effect.void : Effect.fail({
 					_tag: "TypescriptProjectError",
-					message: missing.map(({ project, file }) => `${project} does not include generated type file ${file}. Include the entry's _vorma directory in that TypeScript project.`).join("\n")
+					message: missing.map(({ project, file }) => `${project} does not include generated type file ${file}. Include the _vorma directory beside that tsconfig in its TypeScript project.`).join("\n")
 				});
 			});
 		}
@@ -980,7 +831,17 @@ function withTypescriptProjects(input) {
 					}), (snapshot) => Effect.promise(() => snapshot.dispose())),
 					...input
 				});
-				return yield* Result.isFailure(projects) ? Effect.fail(projects.failure) : input.useFn(projects.success);
+				if (Result.isFailure(projects)) return yield* Effect.fail(projects.failure);
+				const errors = (yield* runTypescriptOperation(() => {
+					return Promise.all([projects.success.server.program.getConfigFileParsingDiagnostics(), projects.success.client.program.getConfigFileParsingDiagnostics()]);
+				})).flat().filter((diagnostic) => {
+					return diagnostic.category === DiagnosticCategory.Error;
+				});
+				if (errors.length > 0) return yield* Effect.fail({
+					_tag: "TypescriptProjectError",
+					message: errors.map((error) => `${error.fileName}: TS${error.code}: ${error.text}`).join("\n")
+				});
+				return yield* input.useFn(projects.success);
 			}));
 		}
 	});
@@ -1523,12 +1384,11 @@ async function inspectClientProject(input) {
 		sourceTexts
 	});
 }
-/** Whether a symbol is the `getPublicUrl` declared by `vorma/client`, however the module reached it. */
+/** Whether a symbol is the `getPublicUrl` declared by `@vorma/client`, however the module reached it. */
 async function matchesPublicUrlSymbol(input) {
 	const symbol = (input.symbol.flags & SymbolFlags.Alias) !== 0 ? await input.checker.getAliasedSymbol(input.symbol) : input.symbol;
 	if (symbol.name !== "getPublicUrl") return false;
-	const declaration = symbol.declarations[0];
-	return declaration !== void 0 && String(declaration.path).endsWith("/vorma/dist/client/index.d.ts");
+	return (await symbol.getJsDocTags(input.checker)).some((tag) => tag.name === "vormaPublicAsset");
 }
 /** Every call of `getPublicUrl` in one file. A use that is not a direct call with a string literal cannot be replaced by the build. */
 async function collectPublicUrlSites(input) {
@@ -1889,7 +1749,7 @@ function collectPublicAssets(config) {
 				source: [
 					"// Code generated by Vorma. DO NOT EDIT.",
 					"",
-					"import \"vorma/client\";",
+					"import \"@vorma/client\";",
 					"",
 					renderAssetKeyDeclaration({
 						assets,
@@ -1897,7 +1757,7 @@ function collectPublicAssets(config) {
 						prefix: "export type PublicAssetKey ="
 					}),
 					"",
-					"declare module \"vorma/client\" {",
+					"declare module \"@vorma/client\" {",
 					"	interface ClientApplicationContracts {",
 					"		readonly assets: PublicAssetKey;",
 					"	}",
@@ -1926,14 +1786,6 @@ function atAssetPath(input) {
 }
 //#endregion
 //#region src/build/render-server-generated.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.
-*/
-function getPublicDirectoryRelativeUrl(input) {
-	return `${input.path.relative(input.serverGeneratedDirectory, input.publicDirectory).split(input.path.sep).map((segment) => encodeURIComponent(segment)).join("/")}/`;
-}
 /** One namespace import per source file that exports a registered declaration, in a stable order. */
 function createModuleNamespaces(input) {
 	const identifiers = /* @__PURE__ */ new Map();
@@ -1969,28 +1821,23 @@ function renderGeneratedBuildModule(input) {
 			"// Code generated by Vorma. DO NOT EDIT.",
 			"",
 			...modules.imports.map((moduleImport) => {
-				return `import * as ${moduleImport.identifier} from ${JSON.stringify(moduleImport.specifier)};`;
+				const specifier = moduleImport.specifier.split("/").map(encodeURIComponent).join("/");
+				return `import * as ${moduleImport.identifier} from ${JSON.stringify(specifier)};`;
 			}),
 			"",
 			"/** Every registerable declaration that the server project exports, in source order. */",
-			...input.declarations.length === 0 ? ["export const registeredDeclarations = [] as const;"] : [
+			...input.declarations.length === 0 ? ["export const registeredDeclarations = [];"] : [
 				"export const registeredDeclarations = [",
 				...input.declarations.map((declaration) => {
 					return `\t${modules.getIdentifier(declaration.filePath)}[${JSON.stringify(declaration.exportName)}],`;
 				}),
-				"] as const;"
+				"];"
 			],
-			"",
-			"/** Resolves public files relative to this compiled deployment. */",
-			"export const publicAssetDirectoryUrl = new URL(",
-			`\t${JSON.stringify(input.publicDirectoryRelativeUrl)},`,
-			"	import.meta.url,",
-			").href;",
 			""
 		].join("\n")
 	};
 }
-/** 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. */
 function renderGeneratedServerContracts(input) {
 	const serverModuleSpecifier = JSON.stringify(FRAMEWORK_IDENTITY_PROTOCOL.moduleSpecifiers.server);
 	const routeSearchTypes = input.model.segments.map((segment) => {
@@ -2178,7 +2025,9 @@ function renderGeneratedClientTransport(input) {
 			...entries.length === 0 ? [] : [`import { ${entries.join(", ")} } from ${moduleSpecifier};`],
 			`import type { TransportTypeEntry } from ${moduleSpecifier};`,
 			"",
-			`export const transportTypeEntries = [${entries.join(", ")}] satisfies ReadonlyArray<TransportTypeEntry>;`,
+			"export function getTransportTypeEntries(): ReadonlyArray<TransportTypeEntry> {",
+			`  return [${entries.join(", ")}];`,
+			"}",
 			""
 		].join("\n")
 	};
@@ -2186,7 +2035,7 @@ function renderGeneratedClientTransport(input) {
 //#endregion
 //#region src/build/generate-application.ts
 /** Writes correlated generated sources and verifies their native TypeScript inclusion. */
-function writeAndCheckApplicationGeneration(generation) {
+function writeAndCheckApplicationGeneration(generation, knownRootFiles) {
 	return Effect.gen(function* () {
 		yield* Effect.all([writeApplicationGeneration(generation), writeGeneratedServerApplication({ generation })], {
 			concurrency: 2,
@@ -2194,6 +2043,7 @@ function writeAndCheckApplicationGeneration(generation) {
 		});
 		yield* checkGeneratedTypeInclusion({
 			...generation.config,
+			...knownRootFiles === void 0 ? {} : { knownRootFiles },
 			serverFiles: [generation.config.generatedServerContractsFilePath],
 			clientFiles: [generation.clientContracts.filePath, generation.publicAssets.types.filePath]
 		});
@@ -2273,7 +2123,7 @@ function writeApplicationGeneration(generation) {
 	];
 	const plannedSourceFiles = [
 		...outputs.map((output) => output.filePath),
-		generation.config.generatedBuildFilePath,
+		generation.config.generatedRegistrationFilePath,
 		generation.config.generatedServerContractsFilePath
 	];
 	return Effect.forEach([...generation.config.ignoreFilePaths.map((filePath) => {
@@ -2295,7 +2145,7 @@ function writeApplicationGeneration(generation) {
 	})));
 }
 /** Matches the generated source files the build owns by name, so a name an earlier build used and this one does not is removed. */
-const GENERATED_SOURCE_FILE_NAME = /\.gen\.(d\.)?ts$/;
+const GENERATED_SOURCE_FILE_NAME = /(?:\.gen\.(?:d\.)?ts|\.mjs)$/;
 function removeStaleGeneratedSource(input) {
 	return Effect.gen(function* () {
 		const fileSystem = yield* FileSystem$1.FileSystem;
@@ -2321,7 +2171,7 @@ function removeStaleGeneratedSource(input) {
 }
 /**
 * Writes the internal registration module and the application
-* contract types before server compilation.
+* contract types before application startup.
 */
 function writeGeneratedServerApplication(input) {
 	return Effect.gen(function* () {
@@ -2329,12 +2179,7 @@ function writeGeneratedServerApplication(input) {
 		const { config, model, inspection } = input.generation;
 		const buildModule = renderGeneratedBuildModule({
 			declarations: model.serverDeclarations,
-			publicDirectoryRelativeUrl: getPublicDirectoryRelativeUrl({
-				path,
-				serverGeneratedDirectory: config.serverGeneratedDirectory,
-				publicDirectory: config.publicDirectory
-			}),
-			filePath: config.generatedBuildFilePath,
+			filePath: config.generatedRegistrationFilePath,
 			path
 		});
 		const contracts = renderGeneratedServerContracts({
@@ -2484,36 +2329,19 @@ function preparePublicOutput(config) {
 		yield* fileSystem.makeDirectory(directory, { recursive: true });
 	});
 }
-/** Publishes compiled server modules and private metadata for the completed browser build. */
+/** Publishes private metadata for the completed browser build. */
 function publishApplicationArtifacts(input) {
 	return Effect.gen(function* () {
 		const fileSystem = yield* FileSystem$1.FileSystem;
 		const path = yield* Path$1.Path;
 		const config = input.generation.config;
-		if (input.server !== void 0) yield* removeCompiledServerModules(config.serverGeneratedDirectory);
-		const files = (input.server?.files ?? []).map((file) => {
-			return {
-				filePath: path.join(config.serverGeneratedDirectory, file.fileName),
-				source: file.source
-			};
-		});
-		yield* Effect.forEach(files, (file) => {
-			return Effect.gen(function* () {
-				yield* fileSystem.makeDirectory(path.dirname(file.filePath), { recursive: true });
-				yield* typeof file.source === "string" ? fileSystem.writeFileString(file.filePath, file.source) : fileSystem.writeFile(file.filePath, file.source);
-			});
-		}, {
-			concurrency: 16,
-			discard: true
-		});
 		const metadataPath = path.join(config.serverGeneratedDirectory, ARTIFACT_PROTOCOL.productionMetadataFileName);
 		const temporaryPath = `${metadataPath}.tmp`;
 		yield* fileSystem.writeFileString(temporaryPath, JSON.stringify(input.artifacts.metadata));
 		yield* fileSystem.rename(temporaryPath, metadataPath);
 		return {
 			clientBuildId: input.artifacts.metadata.clientBuildId,
-			publicDirectory: config.publicDirectory,
-			serverEntryPath: config.compiledServerEntryFilePath
+			publicDirectory: config.publicDirectory
 		};
 	}).pipe(Effect.mapError((cause) => {
 		return {
@@ -2522,27 +2350,6 @@ function publishApplicationArtifacts(input) {
 		};
 	}));
 }
-/** Generated TypeScript source shares this directory and is not compiled output. */
-function removeCompiledServerModules(directory) {
-	return Effect.gen(function* () {
-		const fileSystem = yield* FileSystem$1.FileSystem;
-		const path = yield* Path$1.Path;
-		if (!(yield* fileSystem.exists(directory))) return;
-		const fileNames = (yield* fileSystem.readDirectory(directory)).filter((fileName) => {
-			return fileName.endsWith(ARTIFACT_PROTOCOL.compiledServerModuleExtension);
-		});
-		yield* Effect.forEach(fileNames, (fileName) => {
-			const filePath = path.join(directory, fileName);
-			return checkOutputPath({
-				filePath,
-				rootDirectory: directory
-			}).pipe(Effect.andThen(fileSystem.remove(filePath)));
-		}, {
-			concurrency: 16,
-			discard: true
-		});
-	});
-}
 //#endregion
 //#region src/build/source-layout.ts
 /** Loads the configured source layout before any application module executes. */
@@ -2551,10 +2358,15 @@ function loadApplicationSourceLayout(config) {
 		const fileSystem = yield* FileSystem$1.FileSystem;
 		const path = yield* Path$1.Path;
 		const requiredPaths = {
-			serverEntryFilePath: {
-				field: "serverEntry",
-				path: config.serverEntryFilePath,
-				expectedType: "File"
+			serverRootDirectory: {
+				field: "serverTsconfigFile",
+				path: path.dirname(config.serverTsconfigFilePath),
+				expectedType: "Directory"
+			},
+			clientRootDirectory: {
+				field: "clientTsconfigFile",
+				path: path.dirname(config.clientTsconfigFilePath),
+				expectedType: "Directory"
 			},
 			serverTsconfigFilePath: {
 				field: "serverTsconfigFile",
@@ -2619,17 +2431,21 @@ function loadApplicationSourceLayout(config) {
 			_tag: "ApplicationSourceLayoutIssues",
 			issues
 		});
-		const { criticalCssEntryFilePath, ...canonical } = canonicalPaths.success;
+		const { serverRootDirectory, clientRootDirectory, criticalCssEntryFilePath, ...canonical } = canonicalPaths.success;
+		if (serverRootDirectory === clientRootDirectory) return yield* Effect.fail({
+			_tag: "ApplicationSourceLayoutIssues",
+			issues: [{
+				field: "clientTsconfigFile",
+				path: config.clientTsconfigFilePath,
+				expectedType: "File",
+				message: `serverTsconfigFile and clientTsconfigFile must be in different directories. Both project roots resolve to ${serverRootDirectory} and would share the same _vorma output.`
+			}]
+		});
 		const canonicalConfig = {
 			...config,
 			...canonical,
 			serverProjectDirectory: path.dirname(canonical.serverTsconfigFilePath),
-			...criticalCssEntryFilePath === void 0 ? {} : { criticalCssEntryFilePath },
-			...getVormaOwnedPaths({
-				path,
-				serverEntryDirectory: path.dirname(canonical.serverEntryFilePath),
-				clientEntryDirectory: path.dirname(canonical.clientEntryFilePath)
-			})
+			...criticalCssEntryFilePath === void 0 ? {} : { criticalCssEntryFilePath }
 		};
 		const publicSource = canonicalConfig.publicAssetsSourceDirectory;
 		const publicOutput = canonicalConfig.publicDirectory;
@@ -3207,27 +3023,14 @@ function buildApplication(input) {
 		yield* preparePublicOutput(resolved);
 		const generation = yield* prepareApplicationGeneration(resolved);
 		yield* writeAndCheckApplicationGeneration(generation);
-		const { artifacts, server } = yield* Effect.all({
-			artifacts: bundleClient(generation).pipe(Effect.flatMap((client) => {
-				return assembleApplicationArtifacts({
-					generation,
-					client
-				});
-			})),
-			server: compileServerApplication({
-				generation,
-				sourcemap: false
-			})
-		}, { concurrency: 2 });
-		yield* Effect.forEach(server.diagnostics, (diagnostic) => {
-			return Effect.logWarning(`Server compilation ${diagnostic.level}${diagnostic.code === "" ? "" : ` (${diagnostic.code})`}: ${diagnostic.message}`);
-		}, { discard: true });
 		return yield* publishApplicationArtifacts({
 			generation,
-			artifacts,
-			server
+			artifacts: yield* assembleApplicationArtifacts({
+				generation,
+				client: yield* bundleClient(generation)
+			})
 		});
 	}));
 }
 //#endregion
-export { encodeCanonicalJson as C, projectBrowserContracts as S, createClientPublicUrlPlugin as _, acquireOutputOwnership as a, CLIENT_SHARED_PACKAGES as b, writeAndCheckApplicationGeneration as c, readTypescriptProjectRoots as d, runTypescriptOperation as f, createCssPublicAssets as g, resolveVormaConfig as h, publishApplicationArtifacts as i, collectPublicAssets as l, getGeneratedSourceDirectories as m, loadApplicationSourceLayout as n, checkOutputPath as o, withTypescriptProjects as p, preparePublicOutput as r, assembleApplicationGeneration as s, buildApplication as t, inspectProjects as u, compileServerApplication as v, toContentDigest as w, getClientViewEntries as x, containsRelativePath as y };
+export { projectBrowserContracts as C, getClientViewEntries as S, createCssPublicAssets as _, acquireOutputOwnership as a, toContentDigest as b, writeAndCheckApplicationGeneration as c, readTypescriptProjectRoots as d, runTypescriptOperation as f, containsRelativePath as g, resolveVormaConfig as h, publishApplicationArtifacts as i, collectPublicAssets as l, getGeneratedSourceDirectories as m, loadApplicationSourceLayout as n, checkOutputPath as o, withTypescriptProjects as p, preparePublicOutput as r, assembleApplicationGeneration as s, buildApplication as t, inspectProjects as u, createClientPublicUrlPlugin as v, CLIENT_SHARED_PACKAGES as x, encodeCanonicalJson as y };