litzjs 0.0.0 → 0.0.1

package/dist/client.js

@@ -477,7 +477,7 @@ async function performPreparedResourceRequest(resourcePath, operation, preparedR
 	notify(entry);
 	entry.inFlight = (async () => {
 		try {
-			const response = operation === "action" ? await fetch("/_litz/resource", {
+			const response = operation === "action" ? await fetch("/_litzjs/resource", {
 				method: "POST",
 				...require_internal_transport.createInternalActionRequestInit({
 					path: resourcePath,
@@ -487,7 +487,7 @@ async function performPreparedResourceRequest(resourcePath, operation, preparedR
 						search: normalizedRequest.search
 					}
 				}, payload)
-			}) : await fetch("/_litz/resource", {
+			}) : await fetch("/_litzjs/resource", {
 				method: "POST",
 				headers: {
 					"content-type": "application/json",
@@ -894,7 +894,7 @@ function createRouteFormComponent(routeId) {
 //#endregion
 //#region src/client/runtime.tsx
 async function fetchRouteLoader(path, request, target) {
-	return parseLoaderResponse(await fetch("/_litz/route", {
+	return parseLoaderResponse(await fetch("/_litzjs/route", {
 		method: "POST",
 		headers: {
 			"content-type": "application/json",
@@ -914,7 +914,7 @@ async function fetchRouteAction(path, request, payload) {
 		operation: "action",
 		request: normalizeRequest(request)
 	}, payload);
-	return parseActionResponse(await fetch("/_litz/action", {
+	return parseActionResponse(await fetch("/_litzjs/action", {
 		method: "POST",
 		headers: actionRequest.headers,
 		body: actionRequest.body

package/dist/client.mjs

@@ -474,7 +474,7 @@ async function performPreparedResourceRequest(resourcePath, operation, preparedR
 	notify(entry);
 	entry.inFlight = (async () => {
 		try {
-			const response = operation === "action" ? await fetch("/_litz/resource", {
+			const response = operation === "action" ? await fetch("/_litzjs/resource", {
 				method: "POST",
 				...createInternalActionRequestInit({
 					path: resourcePath,
@@ -484,7 +484,7 @@ async function performPreparedResourceRequest(resourcePath, operation, preparedR
 						search: normalizedRequest.search
 					}
 				}, payload)
-			}) : await fetch("/_litz/resource", {
+			}) : await fetch("/_litzjs/resource", {
 				method: "POST",
 				headers: {
 					"content-type": "application/json",
@@ -891,7 +891,7 @@ function createRouteFormComponent(routeId) {
 //#endregion
 //#region src/client/runtime.tsx
 async function fetchRouteLoader(path, request, target) {
-	return parseLoaderResponse(await fetch("/_litz/route", {
+	return parseLoaderResponse(await fetch("/_litzjs/route", {
 		method: "POST",
 		headers: {
 			"content-type": "application/json",
@@ -911,7 +911,7 @@ async function fetchRouteAction(path, request, payload) {
 		operation: "action",
 		request: normalizeRequest(request)
 	}, payload);
-	return parseActionResponse(await fetch("/_litz/action", {
+	return parseActionResponse(await fetch("/_litzjs/action", {
 		method: "POST",
 		headers: actionRequest.headers,
 		body: actionRequest.body

package/dist/vite.d.mts

@@ -10032,6 +10032,7 @@ type LitzPluginOptions = {
   api?: string[];
   resources?: string[];
   server?: string;
+  embedAssets?: boolean;
 };
 declare function litz(options?: LitzPluginOptions): Plugin[];
 declare function discoverServerEntry(root: string, configuredPath?: string): Promise<string | null>;

package/dist/vite.d.ts

@@ -10032,6 +10032,7 @@ type LitzPluginOptions = {
   api?: string[];
   resources?: string[];
   server?: string;
+  embedAssets?: boolean;
 };
 declare function litz(options?: LitzPluginOptions): Plugin[];
 declare function discoverServerEntry(root: string, configuredPath?: string): Promise<string | null>;

package/dist/vite.js

@@ -282,7 +282,6 @@ function litz(options = {}) {
 	let outputRootDir = node_path.default.resolve(root, "dist");
 	let clientOutDir = node_path.default.resolve(root, "dist/client");
 	let serverOutDir = node_path.default.resolve(root, "dist/server");
-	let serverRscOutDir = node_path.default.resolve(root, "dist/server/_rsc");
 	let routeManifest = [];
 	let layoutManifest = [];
 	let resourceManifest = [];
@@ -313,16 +312,18 @@ function litz(options = {}) {
 					outDir: node_path.default.join(baseOutDir, "client"),
 					manifest: true
 				} },
-				rsc: { build: { outDir: node_path.default.join(baseOutDir, "server", "_rsc") } },
-				ssr: { build: { outDir: node_path.default.join(baseOutDir, "server", "_ssr") } }
+				rsc: { build: { outDir: node_path.default.join(baseOutDir, "server") } },
+				ssr: { build: {
+					outDir: node_path.default.join(baseOutDir, "server"),
+					emptyOutDir: false
+				} }
 			} };
 		},
 		async configResolved(config) {
 			root = config.root;
 			outputRootDir = node_path.default.resolve(root, config.build.outDir || "dist");
 			clientOutDir = node_path.default.resolve(root, config.environments.client?.build.outDir || node_path.default.join("dist", "client"));
-			serverOutDir = node_path.default.resolve(root, node_path.default.join(config.build.outDir || "dist", "server"));
-			serverRscOutDir = node_path.default.resolve(root, config.environments.rsc?.build.outDir || node_path.default.join("dist", "server", "_rsc"));
+			serverOutDir = node_path.default.resolve(root, config.environments.rsc?.build.outDir || node_path.default.join("dist", "server"));
 			browserEntryPath = await discoverBrowserEntry(root);
 			serverEntryPath = await discoverServerEntry(root, options.server);
 			serverEntryFilePath = serverEntryPath ? node_path.default.resolve(root, serverEntryPath) : null;
@@ -440,10 +441,10 @@ export async function renderView(node, metadata = {}) {
 				hasRegisteredExitFinalizer = true;
 				process.once("exit", () => {
 					if (hasFinalizedServerArtifacts) return;
-					hasFinalizedServerArtifacts = finalizeServerArtifacts(serverOutDir, serverRscOutDir, clientOutDir, !serverEntryPath);
+					hasFinalizedServerArtifacts = finalizeServerArtifacts(serverOutDir, clientOutDir, options.embedAssets ?? false);
 				});
 			}
-			hasFinalizedServerArtifacts = finalizeServerArtifacts(serverOutDir, serverRscOutDir, clientOutDir, !serverEntryPath);
+			hasFinalizedServerArtifacts = finalizeServerArtifacts(serverOutDir, clientOutDir, options.embedAssets ?? false);
 		}
 	};
 	return [...rscPlugins, litzPlugin];
@@ -1125,21 +1126,11 @@ async function readJson(filePath) {
 	return JSON.parse(await (0, node_fs_promises.readFile)(filePath, "utf8"));
 }
 async function removeLegacyBuildArtifacts(outputRootDir) {
-	await Promise.all([
-		(0, node_fs_promises.rm)(node_path.default.join(outputRootDir, "index.html"), { force: true }),
-		(0, node_fs_promises.rm)(node_path.default.join(outputRootDir, "rsc"), {
-			force: true,
-			recursive: true
-		}),
-		(0, node_fs_promises.rm)(node_path.default.join(outputRootDir, "ssr"), {
-			force: true,
-			recursive: true
-		})
-	]);
+	await (0, node_fs_promises.rm)(node_path.default.join(outputRootDir, "index.html"), { force: true });
 }
-function finalizeServerArtifacts(serverOutDir, serverRscOutDir, clientOutDir, inlineClientAssets) {
-	const rscIndexPath = node_path.default.join(serverRscOutDir, "index.mjs");
-	const rscAssetsManifestPath = node_path.default.join(serverRscOutDir, "__vite_rsc_assets_manifest.js");
+function finalizeServerArtifacts(serverOutDir, clientOutDir, inlineClientAssets) {
+	const rscIndexPath = node_path.default.join(serverOutDir, "index.js");
+	const rscAssetsManifestPath = node_path.default.join(serverOutDir, "__vite_rsc_assets_manifest.js");
 	let rscEntrySource;
 	let rscAssetsManifestSource;
 	let documentHtml = "";
@@ -1178,18 +1169,10 @@ function finalizeServerArtifacts(serverOutDir, serverRscOutDir, clientOutDir, in
 		"globalThis.AsyncLocalStorage ??= __LitzAsyncLocalStorage;"
 	].join("\n");
 	const inlinedServerSource = rscEntrySource.replace("import assetsManifest from \"./__vite_rsc_assets_manifest.js\";", manifestBindingSource).replace(/import \* as __viteRscAsyncHooks from "node:async_hooks";\s*/g, "").replace(/const __viteRscAsyncHooks = require\("node:async_hooks"\);\s*/g, "").replace(/globalThis\.AsyncLocalStorage = __viteRscAsyncHooks\.AsyncLocalStorage;/g, asyncLocalStorageShimSource);
-	const bundledWrapperSource = bundleServerWrapper(serverRscOutDir, inlineClientAssets ? createInlineAssetServerWrapper(inlinedServerSource, documentHtml, clientAssets) : createServerModuleWrapper(inlinedServerSource));
+	const bundledWrapperSource = bundleServerWrapper(serverOutDir, inlineClientAssets ? createInlineAssetServerWrapper(inlinedServerSource, documentHtml, clientAssets) : createServerModuleWrapper(inlinedServerSource));
 	if (!bundledWrapperSource) return false;
 	(0, node_fs.mkdirSync)(serverOutDir, { recursive: true });
 	(0, node_fs.writeFileSync)(node_path.default.join(serverOutDir, "index.js"), bundledWrapperSource, "utf8");
-	(0, node_fs.rmSync)(serverRscOutDir, {
-		force: true,
-		recursive: true
-	});
-	(0, node_fs.rmSync)(node_path.default.join(serverOutDir, "_ssr"), {
-		force: true,
-		recursive: true
-	});
 	return true;
 }
 function createServerModuleWrapper(serverModuleSource) {
@@ -1269,7 +1252,8 @@ function transformServerModuleSource(serverModuleSource) {
 	}
 	if (!handlerDeclared) {
 		if (!defaultBinding) throw new Error("Unable to locate the default export in the bundled Litz server module.");
-		transformedStatements.push(createHandlerDeclaration(defaultBinding));
+		const binding = defaultBinding;
+		if (!(typescript.default.isIdentifier(binding) && binding.text === handlerName)) transformedStatements.push(createHandlerDeclaration(binding));
 	}
 	const printer = typescript.default.createPrinter({ newLine: typescript.default.NewLineKind.LineFeed });
 	const transformedSourceFile = typescript.default.factory.updateSourceFile(sourceFile, transformedStatements);
@@ -1317,7 +1301,7 @@ function createInlineAssetServerWrapper(serverModuleSource, documentHtml, client
 		"}",
 		"",
 		"function __litzjsShouldServeDocument(request, pathname) {",
-		"  if (pathname.startsWith('/_litz/') || pathname.startsWith('/api/')) {",
+		"  if (pathname.startsWith('/_litzjs/') || pathname.startsWith('/api/')) {",
 		"    return false;",
 		"  }",
 		"",
@@ -1355,9 +1339,9 @@ function createInlineAssetServerWrapper(serverModuleSource, documentHtml, client
 		""
 	].join("\n");
 }
-function bundleServerWrapper(serverRscOutDir, wrapperSource) {
-	const wrapperEntryPath = node_path.default.join(serverRscOutDir, "__litzjs_wrapped_server_entry.mjs");
-	const bundleOutDir = node_path.default.join(serverRscOutDir, "__litzjs_bundle_out");
+function bundleServerWrapper(serverOutDir, wrapperSource) {
+	const wrapperEntryPath = node_path.default.join(serverOutDir, "__litzjs_wrapped_server_entry.mjs");
+	const bundleOutDir = node_path.default.join(serverOutDir, "__litzjs_bundle_out");
 	const bundleScript = `
 const entryPath = process.env.LITZ_SERVER_ENTRY_PATH;
 const outDir = process.env.LITZ_SERVER_OUT_DIR;
@@ -1403,7 +1387,7 @@ if (!entryPath || !outDir) {
 	});
 	(0, node_fs.mkdirSync)(bundleOutDir, { recursive: true });
 	const result = (0, node_child_process.spawnSync)(process.execPath, ["-e", bundleScript], {
-		cwd: serverRscOutDir,
+		cwd: serverOutDir,
 		encoding: "utf8",
 		env: {
 			...process.env,

package/dist/vite.mjs

@@ -277,7 +277,6 @@ function litz(options = {}) {
 	let outputRootDir = path.resolve(root, "dist");
 	let clientOutDir = path.resolve(root, "dist/client");
 	let serverOutDir = path.resolve(root, "dist/server");
-	let serverRscOutDir = path.resolve(root, "dist/server/_rsc");
 	let routeManifest = [];
 	let layoutManifest = [];
 	let resourceManifest = [];
@@ -308,16 +307,18 @@ function litz(options = {}) {
 					outDir: path.join(baseOutDir, "client"),
 					manifest: true
 				} },
-				rsc: { build: { outDir: path.join(baseOutDir, "server", "_rsc") } },
-				ssr: { build: { outDir: path.join(baseOutDir, "server", "_ssr") } }
+				rsc: { build: { outDir: path.join(baseOutDir, "server") } },
+				ssr: { build: {
+					outDir: path.join(baseOutDir, "server"),
+					emptyOutDir: false
+				} }
 			} };
 		},
 		async configResolved(config) {
 			root = config.root;
 			outputRootDir = path.resolve(root, config.build.outDir || "dist");
 			clientOutDir = path.resolve(root, config.environments.client?.build.outDir || path.join("dist", "client"));
-			serverOutDir = path.resolve(root, path.join(config.build.outDir || "dist", "server"));
-			serverRscOutDir = path.resolve(root, config.environments.rsc?.build.outDir || path.join("dist", "server", "_rsc"));
+			serverOutDir = path.resolve(root, config.environments.rsc?.build.outDir || path.join("dist", "server"));
 			browserEntryPath = await discoverBrowserEntry(root);
 			serverEntryPath = await discoverServerEntry(root, options.server);
 			serverEntryFilePath = serverEntryPath ? path.resolve(root, serverEntryPath) : null;
@@ -435,10 +436,10 @@ export async function renderView(node, metadata = {}) {
 				hasRegisteredExitFinalizer = true;
 				process.once("exit", () => {
 					if (hasFinalizedServerArtifacts) return;
-					hasFinalizedServerArtifacts = finalizeServerArtifacts(serverOutDir, serverRscOutDir, clientOutDir, !serverEntryPath);
+					hasFinalizedServerArtifacts = finalizeServerArtifacts(serverOutDir, clientOutDir, options.embedAssets ?? false);
 				});
 			}
-			hasFinalizedServerArtifacts = finalizeServerArtifacts(serverOutDir, serverRscOutDir, clientOutDir, !serverEntryPath);
+			hasFinalizedServerArtifacts = finalizeServerArtifacts(serverOutDir, clientOutDir, options.embedAssets ?? false);
 		}
 	};
 	return [...rscPlugins, litzPlugin];
@@ -1120,21 +1121,11 @@ async function readJson(filePath) {
 	return JSON.parse(await readFile(filePath, "utf8"));
 }
 async function removeLegacyBuildArtifacts(outputRootDir) {
-	await Promise.all([
-		rm(path.join(outputRootDir, "index.html"), { force: true }),
-		rm(path.join(outputRootDir, "rsc"), {
-			force: true,
-			recursive: true
-		}),
-		rm(path.join(outputRootDir, "ssr"), {
-			force: true,
-			recursive: true
-		})
-	]);
+	await rm(path.join(outputRootDir, "index.html"), { force: true });
 }
-function finalizeServerArtifacts(serverOutDir, serverRscOutDir, clientOutDir, inlineClientAssets) {
-	const rscIndexPath = path.join(serverRscOutDir, "index.mjs");
-	const rscAssetsManifestPath = path.join(serverRscOutDir, "__vite_rsc_assets_manifest.js");
+function finalizeServerArtifacts(serverOutDir, clientOutDir, inlineClientAssets) {
+	const rscIndexPath = path.join(serverOutDir, "index.js");
+	const rscAssetsManifestPath = path.join(serverOutDir, "__vite_rsc_assets_manifest.js");
 	let rscEntrySource;
 	let rscAssetsManifestSource;
 	let documentHtml = "";
@@ -1173,18 +1164,10 @@ function finalizeServerArtifacts(serverOutDir, serverRscOutDir, clientOutDir, in
 		"globalThis.AsyncLocalStorage ??= __LitzAsyncLocalStorage;"
 	].join("\n");
 	const inlinedServerSource = rscEntrySource.replace("import assetsManifest from \"./__vite_rsc_assets_manifest.js\";", manifestBindingSource).replace(/import \* as __viteRscAsyncHooks from "node:async_hooks";\s*/g, "").replace(/const __viteRscAsyncHooks = require\("node:async_hooks"\);\s*/g, "").replace(/globalThis\.AsyncLocalStorage = __viteRscAsyncHooks\.AsyncLocalStorage;/g, asyncLocalStorageShimSource);
-	const bundledWrapperSource = bundleServerWrapper(serverRscOutDir, inlineClientAssets ? createInlineAssetServerWrapper(inlinedServerSource, documentHtml, clientAssets) : createServerModuleWrapper(inlinedServerSource));
+	const bundledWrapperSource = bundleServerWrapper(serverOutDir, inlineClientAssets ? createInlineAssetServerWrapper(inlinedServerSource, documentHtml, clientAssets) : createServerModuleWrapper(inlinedServerSource));
 	if (!bundledWrapperSource) return false;
 	mkdirSync(serverOutDir, { recursive: true });
 	writeFileSync(path.join(serverOutDir, "index.js"), bundledWrapperSource, "utf8");
-	rmSync(serverRscOutDir, {
-		force: true,
-		recursive: true
-	});
-	rmSync(path.join(serverOutDir, "_ssr"), {
-		force: true,
-		recursive: true
-	});
 	return true;
 }
 function createServerModuleWrapper(serverModuleSource) {
@@ -1264,7 +1247,8 @@ function transformServerModuleSource(serverModuleSource) {
 	}
 	if (!handlerDeclared) {
 		if (!defaultBinding) throw new Error("Unable to locate the default export in the bundled Litz server module.");
-		transformedStatements.push(createHandlerDeclaration(defaultBinding));
+		const binding = defaultBinding;
+		if (!(ts.isIdentifier(binding) && binding.text === handlerName)) transformedStatements.push(createHandlerDeclaration(binding));
 	}
 	const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
 	const transformedSourceFile = ts.factory.updateSourceFile(sourceFile, transformedStatements);
@@ -1312,7 +1296,7 @@ function createInlineAssetServerWrapper(serverModuleSource, documentHtml, client
 		"}",
 		"",
 		"function __litzjsShouldServeDocument(request, pathname) {",
-		"  if (pathname.startsWith('/_litz/') || pathname.startsWith('/api/')) {",
+		"  if (pathname.startsWith('/_litzjs/') || pathname.startsWith('/api/')) {",
 		"    return false;",
 		"  }",
 		"",
@@ -1350,9 +1334,9 @@ function createInlineAssetServerWrapper(serverModuleSource, documentHtml, client
 		""
 	].join("\n");
 }
-function bundleServerWrapper(serverRscOutDir, wrapperSource) {
-	const wrapperEntryPath = path.join(serverRscOutDir, "__litzjs_wrapped_server_entry.mjs");
-	const bundleOutDir = path.join(serverRscOutDir, "__litzjs_bundle_out");
+function bundleServerWrapper(serverOutDir, wrapperSource) {
+	const wrapperEntryPath = path.join(serverOutDir, "__litzjs_wrapped_server_entry.mjs");
+	const bundleOutDir = path.join(serverOutDir, "__litzjs_bundle_out");
 	const bundleScript = `
 const entryPath = process.env.LITZ_SERVER_ENTRY_PATH;
 const outDir = process.env.LITZ_SERVER_OUT_DIR;
@@ -1398,7 +1382,7 @@ if (!entryPath || !outDir) {
 	});
 	mkdirSync(bundleOutDir, { recursive: true });
 	const result = spawnSync(process.execPath, ["-e", bundleScript], {
-		cwd: serverRscOutDir,
+		cwd: serverOutDir,
 		encoding: "utf8",
 		env: {
 			...process.env,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "litzjs",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "description": "Client-first React framework with RSC support built on Vite",
   "keywords": [
     "framework",