@tschk/moonshine-deploy-vercel 0.3.5 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tschk/moonshine-deploy-vercel",
-  "version": "0.3.5",
+  "version": "0.4.0",
   "license": "ISC",
   "type": "module",
   "main": "./src/index.ts",
@@ -15,16 +15,16 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@tschk/moonshine-adapter-conformance": "^0.3.5",
-    "@tschk/moonshine-compiler": "^0.3.5",
-    "@tschk/moonshine-framework": "^0.3.5",
-    "@tschk/moonshine-react": "^0.3.5",
-    "@tschk/moonshine-router": "^0.3.5",
-    "@tschk/moonshine-server": "^0.3.5"
+    "@tschk/moonshine-compiler": "^0.3.6",
+    "@tschk/moonshine-framework": "^0.3.6",
+    "@tschk/moonshine-react": "^0.3.6",
+    "@tschk/moonshine-router": "^0.3.6",
+    "@tschk/moonshine-server": "^0.3.6"
   },
   "devDependencies": {
     "@types/bun": "1.3.14",
-    "typescript": "7.0.2"
+    "typescript": "7.0.2",
+    "@tschk/moonshine-adapter-conformance": "^0.3.6"
   },
   "files": [
     "src"

package/src/index.ts

@@ -6,11 +6,9 @@ import type {
   DeploymentAdapter,
   MoonshineManifest,
   RouteArtifact,
-} from "@tschk/moonshine-framework";
-import type {
   Harness,
   HarnessFactory,
-} from "@tschk/moonshine-adapter-conformance";
+} from "@tschk/moonshine-framework";
 
 type VercelRoute = {
   src: string;
@@ -63,19 +61,21 @@ async function copyAssets(
   assets: MoonshineManifest["assets"],
   outDir: string,
 ): Promise<void> {
-  for (const asset of assets) {
-    const source = isAbsolute(asset.file)
-      ? asset.file
-      : resolve(outDir, asset.file);
-    const target = resolve(
-      outDir,
-      (asset.path ?? asset.file).replace(/^\/+/, ""),
-    );
-    await mkdir(dirname(target), { recursive: true });
-    if (source !== target) {
-      await copyFile(source, target);
-    }
-  }
+  await Promise.all(
+    assets.map(async (asset) => {
+      const source = isAbsolute(asset.file)
+        ? asset.file
+        : resolve(outDir, asset.file);
+      const target = resolve(
+        outDir,
+        (asset.path ?? asset.file).replace(/^\/+/, ""),
+      );
+      await mkdir(dirname(target), { recursive: true });
+      if (source !== target) {
+        await copyFile(source, target);
+      }
+    }),
+  );
 }
 
 function validateRuntime(
@@ -114,9 +114,45 @@ function routeToRegex(path: string): string {
     .replace(/:([^/]+)/g, "(?<$1>[^/]+)")}$`;
 }
 
-function staticSlug(path: string): string {
+function staticSlug(path: string, usedSlugs: Set<string>): string {
   if (path === "/") return "index";
-  return path.replace(/^\/+/, "").replace(/\//g, "-");
+  let slug = path.replace(/^\/+/, "").replace(/\//g, "-");
+  if (!usedSlugs.has(slug)) {
+    usedSlugs.add(slug);
+    return slug;
+  }
+  let i = 1;
+  while (usedSlugs.has(`${slug}-${i}`)) i++;
+  usedSlugs.add(`${slug}-${i}`);
+  return `${slug}-${i}`;
+}
+
+async function mapConcurrent<T, R>(
+  items: T[],
+  fn: (item: T) => Promise<R>,
+  concurrency: number,
+): Promise<R[]> {
+  const results = new Array<R>(items.length);
+  const errors: unknown[] = [];
+  let index = 0;
+
+  const worker = async () => {
+    while (index < items.length) {
+      const i = index++;
+      try {
+        results[i] = await fn(items[i]);
+      } catch (e) {
+        errors.push(e);
+      }
+    }
+  };
+
+  await Promise.all(
+    Array.from({ length: Math.min(concurrency, items.length) }, worker),
+  );
+
+  if (errors.length > 0) throw errors[0];
+  return results;
 }
 
 async function prerenderRoute(route: RouteArtifact): Promise<string> {
@@ -155,31 +191,38 @@ export const vercelAdapter: DeploymentAdapter = {
     await mkdir(functionsDir, { recursive: true });
 
     const config: VercelConfig = { version: 3, routes: [] };
+    const usedSlugs = new Set<string>();
 
-    for (const route of resolvedManifest.routes) {
-      if (route.mode === "static" && !route.path.includes("*")) {
-        const html = await prerenderRoute(route);
-        const slug = staticSlug(route.path);
-        await writeFile(resolve(staticDir, `${slug}.html`), html);
-        config.routes.push({
-          src: routeToRegex(route.path),
-          dest: `/${slug}.html`,
-        });
-      } else {
-        const funcDir = resolve(functionsDir, `${route.id}.func`);
-        await mkdir(funcDir, { recursive: true });
+    const routesConfig = await mapConcurrent(
+      resolvedManifest.routes,
+      async (route) => {
+        if (route.mode === "static" && !route.path.includes("*")) {
+          const html = await prerenderRoute(route);
+          const slug = staticSlug(route.path, usedSlugs);
+          await writeFile(resolve(staticDir, `${slug}.html`), html);
+          return {
+            src: routeToRegex(route.path),
+            dest: `/${slug}.html`,
+          };
+        } else {
+          const funcDir = resolve(functionsDir, `${route.id}.func`);
+          await mkdir(funcDir, { recursive: true });
 
-        const runtime = route.runtime === "vercel-edge" ? "edge" : "nodejs20.x";
-        const vcConfig = { runtime, handler: "index.ts" };
-        if (runtime !== "edge") {
-          (vcConfig as Record<string, string>).launcherType = "Nodejs";
-        }
-        await writeFile(
-          resolve(funcDir, ".vc-config.json"),
-          JSON.stringify(vcConfig, null, 2) + "\n",
-        );
+          const runtime =
+            route.runtime === "vercel-edge" ? "edge" : "nodejs20.x";
+          const vcConfig: Record<string, string> = {
+            runtime,
+            handler: "index.ts",
+          };
+          if (runtime !== "edge") {
+            vcConfig.launcherType = "Nodejs";
+          }
+          await writeFile(
+            resolve(funcDir, ".vc-config.json"),
+            JSON.stringify(vcConfig, null, 2) + "\n",
+          );
 
-        const functionEntry = `import { createRequestHandler } from "@tschk/moonshine-server";
+          const functionEntry = `import { createRequestHandler } from "@tschk/moonshine-server";
 import { reactRenderer } from "@tschk/moonshine-react";
 import manifest from "../../manifest.json" with { type: "json" };
 
@@ -187,28 +230,33 @@ const fetch = createRequestHandler({ manifest, renderer: reactRenderer });
 
 export default { fetch };
 `;
-        await writeFile(resolve(funcDir, "index.ts"), functionEntry);
+          await writeFile(resolve(funcDir, "index.ts"), functionEntry);
 
-        config.routes.push({
-          src: routeToRegex(route.path),
-          dest: `/${route.id}`,
-        });
-      }
-    }
+          return {
+            src: routeToRegex(route.path),
+            dest: `/${route.id}`,
+          };
+        }
+      },
+      20,
+    );
+    config.routes.push(...routesConfig);
 
-    for (const asset of resolvedManifest.assets) {
-      const source = isAbsolute(asset.file)
-        ? asset.file
-        : resolve(outDir, asset.file);
-      const target = resolve(
-        staticDir,
-        (asset.path ?? asset.file).replace(/^\/+/, ""),
-      );
-      await mkdir(dirname(target), { recursive: true });
-      if (source !== target) {
-        await copyFile(source, target);
-      }
-    }
+    await Promise.all(
+      resolvedManifest.assets.map(async (asset) => {
+        const source = isAbsolute(asset.file)
+          ? asset.file
+          : resolve(outDir, asset.file);
+        const target = resolve(
+          staticDir,
+          (asset.path ?? asset.file).replace(/^\/+/, ""),
+        );
+        await mkdir(dirname(target), { recursive: true });
+        if (source !== target) {
+          await copyFile(source, target);
+        }
+      }),
+    );
 
     await writeFile(
       resolve(vercelOutput, "manifest.json"),