ignotum 0.0.5 → 0.0.6

package/dist/cli/bin.mjs

@@ -29658,6 +29658,7 @@ const Sha256 = Schema.String.check(Schema.isPattern(/^[0-9a-f]{64}$/)).pipe(Sche
 const ArtifactKind = Schema.Literals([
 	"ClientAsset",
 	"ClientDocument",
+	"ClientManifest",
 	"ClientPublicFile",
 	"ClientShell",
 	"FunctionBundle",
@@ -29680,13 +29681,26 @@ const ArtifactFile = Schema.Struct({
 });
 const ClientRoute = Schema.Struct({
 	pathname: ClientPath,
-	artifact: ArtifactPath
+	artifact: ArtifactReference
 });
 const DeploymentInventory = Schema.Struct({
 	formatVersion: Schema.Literal(1),
-	client: Schema.Struct({ routes: Schema.Array(ClientRoute) }),
 	files: Schema.Array(ArtifactFile)
 });
+const ClientManifest = Schema.Struct({
+	formatVersion: Schema.Literal(1),
+	shell: ArtifactReference,
+	routes: Schema.Array(ClientRoute)
+});
+const ClientRoutingRoute = Schema.Struct({
+	pathname: ClientPath,
+	artifact: ArtifactPath
+});
+Schema.Struct({
+	formatVersion: Schema.Literal(1),
+	shell: ArtifactPath,
+	routes: Schema.Array(ClientRoutingRoute)
+});
 const SchemaSnapshotField = Schema.Struct({
 	name: Schema.String,
 	value: ValueDescriptor
@@ -29711,8 +29725,10 @@ const ServerBuildManifest = Schema.Struct({
 	functions: Schema.Array(ServerFunctionArtifact)
 });
 const deploymentInventoryPath = ArtifactPath.make("inventory.json");
-const clientShellPath = ArtifactPath.make("client/_shell.html");
-const clientAssetPathPrefix = `${ArtifactPath.make("client/_ignotum/assets")}/`;
+const clientManifestPath = ArtifactPath.make("client/manifest.json");
+const clientShellPath = ArtifactPath.make("client/shell.html");
+const clientAssetPathPrefix = `${ArtifactPath.make("client/assets")}/`;
+const clientRoutePathPrefix = `${ArtifactPath.make("client/routes")}/`;
 const clientPublicFileExtensions = [
 	".avif",
 	".gif",
@@ -29823,7 +29839,7 @@ var IdGenerator = class IdGenerator extends Context.Service()("@ignotum/shared/i
 };
 //#endregion
 //#region package.json
-var version = "0.0.5";
+var version = "0.0.6";
 //#endregion
 //#region src/cli/codegen.ts
 const generatedHeader = "// Generated by `ignotum codegen`. Do not edit.";
@@ -30221,11 +30237,11 @@ const contentType = (path) => {
 };
 const isClientPublicFile = (path) => clientPublicFileExtensions.some((extension) => path.toLowerCase().endsWith(extension));
 const artifactKind = (path) => {
+	if (path === clientManifestPath) return "ClientManifest";
 	if (path === clientShellPath) return "ClientShell";
 	if (path.startsWith(clientAssetPathPrefix)) return "ClientAsset";
-	if (path.startsWith("client/_ignotum/")) return void 0;
-	if (path.startsWith("client/") && path.endsWith(".html")) return "ClientDocument";
-	if (path.startsWith("client/") && isClientPublicFile(path)) return "ClientPublicFile";
+	if (path.startsWith(clientRoutePathPrefix) && path.endsWith(".html")) return "ClientDocument";
+	if (path.startsWith(clientRoutePathPrefix) && isClientPublicFile(path)) return "ClientPublicFile";
 	if (path === serverManifestPath) return "ServerManifest";
 	if (path === schemaSnapshotPath) return "SchemaSnapshot";
 	if (path.startsWith("server/functions/") && path.endsWith(".mjs.map")) return "SourceMap";
@@ -30242,18 +30258,16 @@ const makeArtifactFile = Effect.fn("Deployment.makeArtifactFile")(function* (inp
 		contentType: contentType(input.path)
 	};
 });
-const makeInventoryFromNormalized = Effect.fn("Deployment.makeInventoryFromNormalized")(function* (files, routes) {
+const makeInventoryFromNormalized = Effect.fn("Deployment.makeInventoryFromNormalized")(function* (files) {
 	const inventoryFiles = yield* Effect.forEach(files, makeArtifactFile, { concurrency: "unbounded" });
 	return {
 		formatVersion: 1,
-		client: { routes: Array$1.sortWith(routes, (route) => route.pathname, String$1.Order) },
 		files: Array$1.sortWith(inventoryFiles, (file) => file.path, String$1.Order)
 	};
 });
 const validateDeploymentInventory = Effect.fn("Deployment.validateDeploymentInventory")(function* (inventory) {
 	if (inventory.files.length > deploymentArtifactLimits.fileCount) return yield* invalid$3(`Deployment inventories may contain at most ${deploymentArtifactLimits.fileCount} files.`);
 	const paths = /* @__PURE__ */ new Set();
-	const entries = /* @__PURE__ */ new Map();
 	let previousPath;
 	let serverBytes = 0;
 	let totalBytes = 0;
@@ -30267,34 +30281,22 @@ const validateDeploymentInventory = Effect.fn("Deployment.validateDeploymentInve
 		}
 		if (paths.has(file.path)) return yield* invalid$3(`Duplicate deployment inventory path '${file.path}'.`, file.path);
 		paths.add(file.path);
-		entries.set(file.path, file);
 		if (previousPath !== void 0 && String$1.Order(previousPath, file.path) >= 0) return yield* invalid$3("Deployment inventory files must be sorted by path.", file.path);
 		previousPath = file.path;
 		const expectedKind = artifactKind(file.path);
 		if (expectedKind === void 0 || expectedKind !== file.kind) return yield* invalid$3(`Deployment inventory kind '${file.kind}' does not match '${file.path}'.`, file.path);
 	}
-	for (const path of [serverManifestPath, schemaSnapshotPath]) if (!paths.has(path)) return yield* invalid$3(`Artifact file '${path}' is missing.`, path);
-	const routedArtifacts = /* @__PURE__ */ new Map();
-	let previousRoute;
-	for (const route of inventory.client.routes) {
-		if (previousRoute !== void 0 && String$1.Order(previousRoute, route.pathname) >= 0) return yield* invalid$3("Client routes must be sorted by pathname.", route.pathname);
-		previousRoute = route.pathname;
-		const entry = entries.get(route.artifact);
-		if (entry === void 0) return yield* invalid$3(`Client route '${route.pathname}' references missing artifact '${route.artifact}'.`, route.artifact);
-		if (entry.kind !== "ClientDocument" && entry.kind !== "ClientPublicFile") return yield* invalid$3(`Client route '${route.pathname}' cannot reference artifact kind '${entry.kind}'.`, route.artifact);
-		routedArtifacts.set(route.artifact, (routedArtifacts.get(route.artifact) ?? 0) + 1);
-	}
-	for (const file of inventory.files) {
-		const routeCount = routedArtifacts.get(file.path) ?? 0;
-		if (file.kind === "ClientDocument" && routeCount === 0) return yield* invalid$3(`Client document '${file.path}' has no route.`, file.path);
-		if (file.kind === "ClientPublicFile" && routeCount !== 1) return yield* invalid$3(`Client public file '${file.path}' must have exactly one route.`, file.path);
-	}
-	if (!paths.has(clientShellPath) && inventory.client.routes.length === 0) return yield* invalid$3("A deployment must contain a client shell or an exact client route.");
+	for (const path of [
+		clientManifestPath,
+		clientShellPath,
+		serverManifestPath,
+		schemaSnapshotPath
+	]) if (!paths.has(path)) return yield* invalid$3(`Artifact file '${path}' is missing.`, path);
 });
-const makeDeploymentInventory = Effect.fn("Deployment.makeDeploymentInventory")(function* (inputs, routes = []) {
+const makeDeploymentInventory = Effect.fn("Deployment.makeDeploymentInventory")(function* (inputs) {
 	const files = yield* normalizeFiles(inputs);
 	if (files.some((file) => file.path === deploymentInventoryPath)) return yield* invalid$3(`${deploymentInventoryPath} cannot include itself in the deployment inventory.`, deploymentInventoryPath);
-	const inventory = yield* makeInventoryFromNormalized(files, routes);
+	const inventory = yield* makeInventoryFromNormalized(files);
 	const encoded = `${encodeCanonical(DeploymentInventory, inventory)}\n`;
 	return {
 		inventory,
@@ -30317,6 +30319,24 @@ const findFile = (files, path) => {
 	return file === void 0 ? Effect.fail(invalid$3(`Artifact file '${path}' is missing.`, path)) : Effect.succeed(file);
 };
 const sameReference = (entry, reference) => entry.path === reference.path && entry.size === reference.size && entry.sha256 === reference.sha256;
+const validateClientManifest = Effect.fn("Deployment.validateClientManifest")(function* (manifest, inventory) {
+	if (manifest.shell.path !== clientShellPath) return yield* invalid$3(`The client manifest must reference '${clientShellPath}' as its shell.`, manifest.shell.path);
+	const entries = new Map(inventory.files.map((file) => [file.path, file]));
+	const shellEntry = entries.get(manifest.shell.path);
+	if (shellEntry === void 0 || shellEntry.kind !== "ClientShell" || !sameReference(shellEntry, manifest.shell)) return yield* invalid$3(`The client shell reference for '${manifest.shell.path}' does not match the inventory.`, manifest.shell.path);
+	const referencedPaths = /* @__PURE__ */ new Set();
+	let previousRoute;
+	for (const route of manifest.routes) {
+		if (previousRoute !== void 0 && String$1.Order(previousRoute, route.pathname) >= 0) return yield* invalid$3("Client routes must be sorted by pathname.", route.pathname);
+		previousRoute = route.pathname;
+		if (referencedPaths.has(route.artifact.path)) return yield* invalid$3(`Client artifact path '${route.artifact.path}' is referenced more than once.`, route.artifact.path);
+		referencedPaths.add(route.artifact.path);
+		const entry = entries.get(route.artifact.path);
+		if (entry === void 0 || !sameReference(entry, route.artifact)) return yield* invalid$3(`The client route reference for '${route.artifact.path}' does not match the inventory.`, route.artifact.path);
+		if (entry.kind !== "ClientDocument" && entry.kind !== "ClientPublicFile") return yield* invalid$3(`Client route '${route.pathname}' cannot reference artifact kind '${entry.kind}'.`, route.artifact.path);
+	}
+	for (const file of inventory.files) if ((file.kind === "ClientDocument" || file.kind === "ClientPublicFile") && !referencedPaths.has(file.path)) return yield* invalid$3(`Client route artifact '${file.path}' has no route.`, file.path);
+});
 const validateManifest = Effect.fn("Deployment.validateManifest")(function* (manifest, inventory) {
 	if (manifest.schema.path !== schemaSnapshotPath) return yield* invalid$3(`The server manifest must reference '${schemaSnapshotPath}'.`, manifest.schema.path);
 	const entries = new Map(inventory.files.map((file) => [file.path, file]));
@@ -30357,17 +30377,28 @@ Effect.fn("Deployment.validateDeploymentMetadata")(function* (input) {
 		path: schemaSnapshotPath,
 		bytes: input.schemaBytes
 	};
-	const metadataFiles = [manifestFile, schemaFile];
+	const clientManifestFile = {
+		path: clientManifestPath,
+		bytes: input.clientManifestBytes
+	};
+	const metadataFiles = [
+		clientManifestFile,
+		manifestFile,
+		schemaFile
+	];
 	const entries = new Map(input.inventory.files.map((file) => [file.path, file]));
 	for (const file of metadataFiles) {
 		const entry = entries.get(file.path);
 		const actual = yield* makeArtifactFile(file);
 		if (entry === void 0 || encodeCanonical(ArtifactFile, actual) !== encodeCanonical(ArtifactFile, entry)) return yield* invalid$3(`Artifact file '${file.path}' does not match the deployment inventory.`, file.path);
 	}
+	const clientManifest = yield* decodeJsonFile(ClientManifest, clientManifestFile);
 	const manifest = yield* decodeJsonFile(ServerBuildManifest, manifestFile);
 	const schema = yield* decodeJsonFile(SchemaSnapshot, schemaFile);
+	yield* validateClientManifest(clientManifest, input.inventory);
 	yield* validateManifest(manifest, input.inventory);
 	return {
+		clientManifest,
 		inventory: input.inventory,
 		manifest,
 		schema
@@ -30379,14 +30410,18 @@ const validateDeploymentArtifact = Effect.fn("Deployment.validateDeploymentArtif
 	const payloadFiles = files.filter((file) => file.path !== deploymentInventoryPath);
 	const inventory = yield* decodeJsonFile(DeploymentInventory, inventoryFile);
 	yield* validateDeploymentInventory(inventory);
-	const actualInventory = yield* makeInventoryFromNormalized(payloadFiles, inventory.client.routes);
+	const actualInventory = yield* makeInventoryFromNormalized(payloadFiles);
 	if (encodeCanonical(DeploymentInventory, inventory) !== encodeCanonical(DeploymentInventory, actualInventory)) return yield* invalid$3("The deployment inventory does not match the artifact files.");
+	const clientManifestFile = yield* findFile(files, clientManifestPath);
 	const manifestFile = yield* findFile(files, serverManifestPath);
 	const schemaFile = yield* findFile(files, schemaSnapshotPath);
+	const clientManifest = yield* decodeJsonFile(ClientManifest, clientManifestFile);
 	const manifest = yield* decodeJsonFile(ServerBuildManifest, manifestFile);
 	const schema = yield* decodeJsonFile(SchemaSnapshot, schemaFile);
+	yield* validateClientManifest(clientManifest, inventory);
 	yield* validateManifest(manifest, inventory);
 	return {
+		clientManifest,
 		inventory,
 		manifest,
 		schema
@@ -31001,10 +31036,10 @@ const copyPublicFiles = Effect.fn("Deploy.copyPublicFiles")(function* (appDirect
 		const pathname = `/${relativePath}`;
 		return {
 			bytes,
-			destination: path.join(outputDirectory, entry),
+			destination: path.join(outputDirectory, "routes", entry),
 			route: {
 				pathname: ClientPath.make(pathname),
-				artifact: ArtifactPath.make(`client/${relativePath}`)
+				artifact: yield* artifactReference(ArtifactPath.make(`client/routes/${relativePath}`), bytes)
 			},
 			source
 		};
@@ -31035,15 +31070,15 @@ const buildClient = Effect.fn("Deploy.buildClient")(function* (appDirectory, out
 	const output = yield* runViteBuild("client", {
 		appType: "spa",
 		build: {
-			assetsDir: "_ignotum/assets",
+			assetsDir: "assets",
 			emptyOutDir: true,
 			outDir: outputDirectory,
 			rolldownOptions: {
 				input: clientEntryId,
 				output: {
-					assetFileNames: (asset) => asset.names.some((name) => name.endsWith(".css")) ? "_ignotum/assets/styles-[hash][extname]" : "_ignotum/assets/[name]-[hash][extname]",
-					chunkFileNames: "_ignotum/assets/chunks/[name]-[hash].js",
-					entryFileNames: "_ignotum/assets/main-[hash].js"
+					assetFileNames: (asset) => asset.names.some((name) => name.endsWith(".css")) ? "assets/styles-[hash][extname]" : "assets/[name]-[hash][extname]",
+					chunkFileNames: "assets/chunks/[name]-[hash].js",
+					entryFileNames: "assets/main-[hash].js"
 				}
 			},
 			sourcemap: false
@@ -31079,27 +31114,35 @@ const buildClient = Effect.fn("Deploy.buildClient")(function* (appDirectory, out
 	let icon;
 	if (clientFiles.iconPath !== void 0) {
 		const bytes = yield* fileSystem.readFile(clientFiles.iconPath);
-		const fileName = `icon-${yield* sha256(bytes)}.svg`;
-		const assetsDirectory = path.join(outputDirectory, "_ignotum", "assets");
+		const fileName = `icon-${(yield* sha256(bytes)).slice(0, 16)}.svg`;
+		const assetsDirectory = path.join(outputDirectory, "assets");
 		yield* fileSystem.makeDirectory(assetsDirectory, { recursive: true });
 		yield* fileSystem.writeFile(path.join(assetsDirectory, fileName), bytes);
 		icon = `/_ignotum/assets/${fileName}`;
 	}
-	const shellPath = path.join(outputDirectory, "_shell.html");
+	const shellPath = path.join(outputDirectory, "shell.html");
 	const document = renderClientDocument({
 		icon,
 		scripts: [{
-			source: entryFile,
+			source: `_ignotum/${entryFile}`,
 			type: "External"
 		}],
-		styles,
+		styles: styles.map((style) => `_ignotum/${style}`),
 		title
 	});
-	yield* fileSystem.writeFileString(shellPath, document);
+	const shellBytes = utf8Bytes(document);
+	yield* fileSystem.writeFile(shellPath, shellBytes);
 	const publicBuild = yield* copyPublicFiles(appDirectory, outputDirectory);
+	const manifest = {
+		formatVersion: 1,
+		shell: yield* artifactReference(clientShellPath, shellBytes),
+		routes: publicBuild.routes
+	};
+	const manifestPath = path.join(outputDirectory, "manifest.json");
+	yield* fileSystem.writeFileString(manifestPath, `${encodeCanonical(ClientManifest, manifest)}\n`);
 	return {
 		assets: output.length + (icon === void 0 ? 0 : 1) + publicBuild.files,
-		routes: publicBuild.routes,
+		manifestPath,
 		shellPath
 	};
 });
@@ -31495,7 +31538,7 @@ const buildDeploymentArtifact = Effect.fn("Deploy.buildArtifact")(function* (app
 		const client = yield* buildClient(appDirectory, clientOutput);
 		const server = yield* buildServer(appDirectory, serverOutput, codegen.functionModules);
 		const payloadFiles = yield* readArtifactDirectory(stagingDirectory);
-		const inventory = yield* makeDeploymentInventory(payloadFiles, client.routes);
+		const inventory = yield* makeDeploymentInventory(payloadFiles);
 		yield* fileSystem.writeFile(path.join(stagingDirectory, deploymentInventoryPath), inventory.bytes);
 		const artifactFiles = yield* readArtifactDirectory(stagingDirectory);
 		yield* validateDeploymentArtifact(artifactFiles);