@sjcx/vorma 0.0.0-pre.5 → 0.0.0-pre.6

package/dist/build/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-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 { 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-Dy9VE6xO.js";
 import { t as VORMA_BUILD_PLUGIN_NAME } from "../build-invocation-D7Fu8gBK.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";
@@ -41,7 +41,7 @@ function assembleDevelopmentArtifacts(input) {
 	const clientViews = Object.fromEntries(getClientViewEntries(generation).map((view) => {
 		return [view.pattern, {
 			...toModule(view.id),
-			exportNames: view.exportNames
+			exportName: view.exportName
 		}];
 	}));
 	return { metadata: {
@@ -274,9 +274,6 @@ function startDevelopmentClient(inputs, port, recordChangeFn) {
 		let configurationRevision = 0;
 		let coordinatedRestart = false;
 		let views = inputs.views;
-		const virtualSources = new Map(views.flatMap((view) => {
-			return view.source === void 0 ? [] : [[view.id, view.source]];
-		}));
 		let declared = false;
 		let inspection;
 		let finishInspectionFn;
@@ -352,13 +349,12 @@ function startDevelopmentClient(inputs, port, recordChangeFn) {
 			},
 			resolveId(source) {
 				if (source === "\0vorma:development-browser") return source;
-				if (virtualSources.has(source)) return source;
 				return source === FRAMEWORK_IDENTITY_PROTOCOL.moduleSpecifiers.clientTransportTypes ? inputs.clientTransport.filePath : null;
 			},
 			async load(id) {
 				if (id === "\0vorma:development-browser") return renderDevelopmentBrowserSource();
 				if (inputs.clientSourceTexts[id.split("?", 1)[0] ?? id] !== void 0) await inspection;
-				return virtualSources.get(id) ?? null;
+				return null;
 			},
 			async hotUpdate() {
 				if (await inspection) return [];
@@ -465,18 +461,11 @@ function startDevelopmentClient(inputs, port, recordChangeFn) {
 				const publicAssetsChanged = JSON.stringify(inputs.publicFilemap) !== JSON.stringify(next.publicFilemap);
 				inputs = next;
 				views = next.views;
-				const previousVirtualIds = new Set(virtualSources.keys());
-				virtualSources.clear();
-				for (const view of views) if (view.source !== void 0) virtualSources.set(view.id, view.source);
 				publicUrls.api.updateInputFn(getPublicUrlInput(next));
 				publicCss.updatePublicAssetsFn(next);
 				for (const environment of Object.values(server.environments)) {
 					const graph = environment.moduleGraph;
 					for (const filePath of replacedFiles) for (const module of graph.getModulesByFile(filePath) ?? []) graph.invalidateModule(module);
-					for (const id of previousVirtualIds) {
-						const module = graph.getModuleById(id);
-						if (module !== void 0) graph.invalidateModule(module);
-					}
 					if (publicAssetsChanged) {
 						for (const module of graph.idToModuleMap.values()) if (module.type === "css") graph.invalidateModule(module);
 					}

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

@@ -4,8 +4,7 @@ export declare const CLIENT_SHARED_PACKAGES: string[];
 export type ClientViewEntry = {
     readonly pattern: string;
     readonly id: string;
-    readonly exportNames: ReadonlyArray<string>;
-    readonly source: string | undefined;
+    readonly exportName: string;
 };
-/** Keeps value identity checks inside the selected route's normal module load. */
+/** Projects each validated view declaration into one browser entry. */
 export declare function getClientViewEntries(generation: ApplicationGeneration): ReadonlyArray<ClientViewEntry>;

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

@@ -18,7 +18,6 @@ export type ApplicationModel = {
     readonly uiLoaders: ReadonlyArray<InspectedUiLoader>;
     readonly endpoints: ReadonlyArray<InspectedEndpoint>;
     readonly clientViews: ReadonlyArray<InspectedClientView>;
-    readonly clientViewCandidates: ReadonlyMap<string, ReadonlyArray<InspectedClientView>>;
     /** The authored view modules in stable order, for generated type imports. */
     readonly clientViewModules: ReadonlyArray<string>;
     readonly clientApplication: DeclarationSource;
@@ -35,6 +34,10 @@ export type ApplicationModelIssue = {
     readonly patterns: ReadonlyArray<string>;
     readonly sources: ReadonlyArray<DeclarationSource>;
     readonly cause: ConflictingDynamicParameterNameError;
+} | {
+    readonly _tag: "DuplicateClientView";
+    readonly pattern: string;
+    readonly sources: ReadonlyArray<DeclarationSource>;
 };
 /** Joins the inspected declarations and views into one validated model. */
 export declare function compileApplicationModel(inspection: InspectedProjects): Result.Result<ApplicationModel, ReadonlyArray<ApplicationModelIssue>>;

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

@@ -21,7 +21,7 @@ export declare function assembleDevelopmentArtifacts(input: {
                 depUrls: ReadonlyArray<string>;
                 cssBundleUrls: ReadonlyArray<string>;
                 staticAssetUrls: ReadonlyArray<string>;
-                exportNames: readonly string[];
+                exportName: string;
             };
         };
         criticalCss: string;

package/dist/build/index.js

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

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

@@ -22,13 +22,12 @@ export type InspectedEndpointError = {
 };
 export type InspectedEndpoint = DeclarationSource & {
     readonly kind: "Endpoint";
-    readonly operation: "query" | "mutation" | "stream";
+    readonly operation: "query" | "mutation";
     readonly method: HttpMethod;
     readonly pattern: string;
     readonly input: string | undefined;
     readonly inputTransport: InputTransportKind;
-    readonly output: string | undefined;
-    readonly event: string | undefined;
+    readonly output: string;
     readonly errors: ReadonlyArray<InspectedEndpointError>;
 };
 export type InspectedServerDeclaration = InspectedUiLoader | InspectedEndpoint;

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

@@ -34,8 +34,7 @@ function projectBrowserContracts(inspection) {
 			operation: declaration.operation,
 			inputTransport: declaration.inputTransport,
 			input: declaration.inputTransport === "formData" ? "FormData" : declaration.input ?? "undefined",
-			output: declaration.output ?? "undefined",
-			event: declaration.event ?? "undefined",
+			output: declaration.output,
 			errors: Object.fromEntries(declaration.errors.map((error) => {
 				return [error.tag, error.fields];
 			}))
@@ -55,24 +54,14 @@ const CLIENT_SHARED_PACKAGES = [
 	"react",
 	"react-dom"
 ];
-/** Keeps value identity checks inside the selected route's normal module load. */
+/** Projects each validated view declaration into one browser entry. */
 function getClientViewEntries(generation) {
-	return [...generation.model.clientViewCandidates].flatMap(([pattern, candidates], index) => {
-		const first = candidates[0];
-		if (first === void 0) return [];
-		if (candidates.every((candidate) => candidate.filePath === first.filePath)) return [{
-			pattern,
-			id: first.filePath,
-			exportNames: candidates.map((candidate) => candidate.exportName),
-			source: void 0
-		}];
-		const exportNames = candidates.map((_candidate, candidateIndex) => `candidate${candidateIndex}`);
-		return [{
-			pattern,
-			id: `\0vorma:view-candidates:${index}`,
-			exportNames,
-			source: candidates.map((candidate, candidateIndex) => `export { ${JSON.stringify(candidate.exportName)} as ${exportNames[candidateIndex]} } from ${JSON.stringify(candidate.filePath)};`).join("\n")
-		}];
+	return generation.model.clientViews.map((view) => {
+		return {
+			pattern: view.pattern,
+			id: view.filePath,
+			exportName: view.exportName
+		};
 	});
 }
 //#endregion
@@ -1178,7 +1167,6 @@ async function inspectEndpoint(input) {
 		literals[name] = literal.success;
 	}
 	const operation = literals.kind;
-	if (operation === "stream") return Result.fail(makeIssue(source, "StreamEndpoint is an unimplemented declaration scaffold and cannot be built. Mount native Effect streaming handlers on the application's server."));
 	if (operation !== "query" && operation !== "mutation") return Result.fail(makeIssue(source, `unknown endpoint kind ${operation}`));
 	const method = literals.method;
 	if (!matchesHttpMethod(method)) return Result.fail(makeIssue(source, `unknown endpoint method ${method}`));
@@ -1200,22 +1188,19 @@ async function inspectEndpoint(input) {
 		type: inputType
 	});
 	if (Result.isFailure(endpointInput)) return Result.fail(endpointInput.failure);
-	const output = await renderOptionalContract({
+	const outputType = await readPropertyType({
 		checker,
+		type: input.types,
+		name: "output"
+	});
+	if (outputType === void 0) return Result.fail(makeIssue(source, "an endpoint must have an output contract"));
+	const output = await renderContract({
 		renderer,
 		source,
 		field: "output",
-		types: input.types
+		type: outputType
 	});
 	if (Result.isFailure(output)) return Result.fail(output.failure);
-	const event = await renderOptionalContract({
-		checker,
-		renderer,
-		source,
-		field: "event",
-		types: input.types
-	});
-	if (Result.isFailure(event)) return Result.fail(event.failure);
 	const errors = await inspectEndpointErrors({
 		checker,
 		renderer,
@@ -1232,7 +1217,6 @@ async function inspectEndpoint(input) {
 		input: endpointInput.success,
 		inputTransport,
 		output: output.success,
-		event: event.success,
 		errors: errors.success
 	});
 }
@@ -1544,6 +1528,11 @@ function compileApplicationModel(inspection) {
 			view
 		});
 	}
+	for (const [pattern, sources] of viewSources) if (sources.length > 1) issues.push({
+		_tag: "DuplicateClientView",
+		pattern,
+		sources
+	});
 	const endpointSources = /* @__PURE__ */ new Map();
 	for (const endpoint of endpoints) {
 		const registered = compileEndpointPattern(endpoint.pattern);
@@ -1599,10 +1588,6 @@ function compileApplicationModel(inspection) {
 		uiLoaders: [...loaderSources.values()].flatMap((sources) => sources.slice(0, 1)),
 		endpoints: [...endpointSources.values()].flatMap((sources) => sources.slice(0, 1)),
 		clientViews: [...viewSources.values()].flatMap((sources) => sources.slice(0, 1)),
-		clientViewCandidates: new Map([...viewSources.values()].flatMap((sources) => {
-			const first = sources[0];
-			return first === void 0 ? [] : [[first.pattern, sources]];
-		})),
 		clientViewModules: [...new Set(clientViews.map((view) => view.filePath))].sort((left, right) => compareSourceText({
 			left,
 			right
@@ -1922,8 +1907,7 @@ function renderGeneratedClientContracts(input) {
 		return renderTypeEntry(`${endpoint.method} ${endpoint.pattern}`, {
 			kind: JSON.stringify(endpoint.operation),
 			input: endpoint.inputTransport === "formData" ? "FormData" : endpoint.input ?? "undefined",
-			output: endpoint.output ?? "undefined",
-			event: endpoint.event ?? "undefined",
+			output: endpoint.output,
 			errors: renderErrorTypes(endpoint.errors)
 		});
 	});
@@ -2600,7 +2584,7 @@ function assembleApplicationArtifacts(input) {
 		const clientViews = Object.fromEntries(Object.entries(client.clientViews).map(([pattern, module]) => {
 			return [pattern, {
 				...addCssAssetUrls(module),
-				exportNames: module.exportNames
+				exportName: module.exportName
 			}];
 		}));
 		const files = [...byFile.values()].sort((left, right) => compareSourceText({
@@ -2764,7 +2748,7 @@ function bundleClient(generation) {
 			const module = entries.get(view.id);
 			return module === void 0 ? Effect.fail(`Vite did not preserve the view module ${view.id}`) : Effect.succeed([view.pattern, {
 				...module,
-				exportNames: view.exportNames
+				exportName: view.exportName
 			}]);
 		}).pipe(Effect.map(Object.fromEntries));
 		return {
@@ -2856,9 +2840,6 @@ function toJavascriptAssetUrl(input) {
 async function runClientBuild(generation, publicCss, viewEntries) {
 	const manifestFiles = /* @__PURE__ */ new Set();
 	const immutableFiles = /* @__PURE__ */ new Set();
-	const virtualViewSources = new Map(viewEntries.flatMap((entry) => {
-		return entry.source === void 0 ? [] : [[entry.id, entry.source]];
-	}));
 	let criticalCss = "";
 	let criticalCssFileName;
 	const captured = {};
@@ -2900,12 +2881,8 @@ async function runClientBuild(generation, publicCss, viewEntries) {
 			});
 		},
 		resolveId(source) {
-			if (virtualViewSources.has(source)) return source;
 			return source === FRAMEWORK_IDENTITY_PROTOCOL.moduleSpecifiers.clientTransportTypes ? generation.clientTransport.filePath : null;
 		},
-		load(id) {
-			return virtualViewSources.get(id) ?? null;
-		},
 		config(config) {
 			const workerPlugins = config.worker?.plugins;
 			return {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sjcx/vorma",
-	"version": "0.0.0-pre.5",
+	"version": "0.0.0-pre.6",
 	"type": "module",
 	"sideEffects": false,
 	"license": "MIT",
@@ -22,8 +22,8 @@
 		"@effect/platform-node-shared": "^4.0.0-rc.115",
 		"@noble/hashes": "^2.4.0",
 		"@scure/base": "^2.4.0",
-		"@vorma/primitives": "npm:@sjcx/vorma-primitives@0.0.0-pre.5",
-		"@vorma/protocol": "npm:@sjcx/vorma-protocol@0.0.0-pre.5",
+		"@vorma/primitives": "npm:@sjcx/vorma-primitives@0.0.0-pre.6",
+		"@vorma/protocol": "npm:@sjcx/vorma-protocol@0.0.0-pre.6",
 		"chokidar": "^5.0.0",
 		"lightningcss": "^1.33.0",
 		"rolldown": "^1.2.6",