swift-rust 0.2.1 → 1.0.1

package/bin/build.mjs

@@ -5,6 +5,7 @@ import {
   mkdirSync,
   readdirSync,
   writeFileSync,
+  readFileSync,
   rmSync,
   cpSync,
   openSync,
@@ -27,9 +28,9 @@ let PORT = PORT_START;
 const ROUTE_TIMEOUT_MS = 30_000;
 const HEALTH_TIMEOUT_MS = 30_000;
 
-const PAGE_EXTENSIONS = new Set(["page.tsx", "page.ts", "page.jsx", "page.js"]);
 const CATCH_PARAM = /^\[\.{3}([^\]]+)\]$/;
 const NAMED_PARAM = /^\[([^\]]+)\]$/;
+const PAGE_EXTENSIONS = ["page.tsx", "page.ts", "page.jsx", "page.js"];
 const NOT_FOUND_FILES = ["not-found.tsx", "not-found.ts", "not-found.jsx", "not-found.js"];
 
 const c = {
@@ -41,6 +42,16 @@ const useColor = process.stdout.isTTY !== false && !process.env.NO_COLOR;
 const paint = (color, s) => (useColor ? `${c[color]}${s}${c.reset}` : s);
 const fmtMs = (ms) => (ms < 1000 ? `${Math.round(ms)}ms` : `${(ms / 1000).toFixed(2)}s`);
 
+let activeLogFile = null;
+
+function findPageFile(dir) {
+  for (const ext of PAGE_EXTENSIONS) {
+    const p = join(dir, ext);
+    if (existsSync(p)) return p;
+  }
+  return null;
+}
+
 function discoverPages(dir, base = "") {
   const pages = [];
   if (!existsSync(dir)) return pages;
@@ -48,15 +59,24 @@ function discoverPages(dir, base = "") {
     if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
     const full = join(dir, entry.name);
     if (entry.isDirectory()) {
-      const match = entry.name.match(CATCH_PARAM);
-      if (match) {
-        pages.push({ type: "catchall", dir: full, base, paramName: match[1] });
+      const catchAll = entry.name.match(CATCH_PARAM);
+      if (catchAll) {
+        const pageFile = findPageFile(full);
+        if (pageFile) {
+          pages.push({ type: "catchall", dir: full, file: pageFile, base, paramName: catchAll[1] });
+        }
         continue;
       }
       const named = entry.name.match(NAMED_PARAM);
-      const segment = named ? `[${named[1]}]` : entry.name;
-      pages.push(...discoverPages(full, base + "/" + segment));
-    } else if (PAGE_EXTENSIONS.has(entry.name)) {
+      if (named) {
+        const pageFile = findPageFile(full);
+        if (pageFile) {
+          pages.push({ type: "dynamic", dir: full, file: pageFile, base, paramName: named[1] });
+        }
+        continue;
+      }
+      pages.push(...discoverPages(full, base + "/" + entry.name));
+    } else if (PAGE_EXTENSIONS.includes(entry.name)) {
       pages.push({ type: "static", file: full, route: base || "/" });
     }
   }
@@ -71,9 +91,9 @@ function findNotFoundFile(dir) {
   return null;
 }
 
-async function enumerateCatchAll(page) {
-  for (const ext of ["tsx", "ts", "jsx", "js"]) {
-    const p = join(page.dir, `page.${ext}`);
+async function enumerateParams(page) {
+  for (const ext of PAGE_EXTENSIONS) {
+    const p = join(page.dir, ext);
     if (!existsSync(p)) continue;
     try {
       const mod = await import(`${p}?t=${Date.now()}`);
@@ -85,13 +105,12 @@ async function enumerateCatchAll(page) {
   return [];
 }
 
-function routesFromCatchAllParams(catchall, params) {
+function routesFromParams(base, paramName, params) {
   return params
     .map((p) => {
-      const v = p[catchall.paramName];
-      const arr = Array.isArray(v) ? v : v != null ? [String(v)] : [];
-      if (arr.length === 0) return null;
-      return catchall.base + "/" + arr.join("/");
+      const v = p[paramName];
+      if (v == null) return null;
+      return base + "/" + (Array.isArray(v) ? v.join("/") : String(v));
     })
     .filter(Boolean);
 }
@@ -130,7 +149,7 @@ function startDevServer(port, logFile) {
   const runtime = findBun();
   const stdio = logFile
     ? ["ignore", openSync(logFile, "w"), "inherit"]
-    : ["ignore", "ignore", "inherit"];
+    : ["ignore", "inherit", "inherit"];
   const proc = spawn(runtime, [devServer, "--port", String(port), "--hostname", HOST], {
     stdio,
     env: { ...process.env, NO_COLOR: "1", SWIFT_RUST_BUILD: "1" },
@@ -167,6 +186,16 @@ async function fetchRoute(pathname, timeoutMs = ROUTE_TIMEOUT_MS) {
   }
 }
 
+function tailDevLog(lines = 40) {
+  if (!activeLogFile || !existsSync(activeLogFile)) return [];
+  try {
+    const all = readFileSync(activeLogFile, "utf8").split("\n");
+    return all.slice(-lines);
+  } catch {
+    return [];
+  }
+}
+
 function stripHmrScript(html) {
   return html.replace(/\s*<script src="\/_swift-rust\/hmr-client\.js"[^>]*>\s*<\/script>/g, "");
 }
@@ -178,27 +207,28 @@ function writeStaticFile(outDir, pathname, html) {
   writeFileSync(outPath, html);
 }
 
-function writeConfigJson(outDir, hasPublic) {
-  const headers = [
-    { key: "Cache-Control", value: "public, max-age=0, must-revalidate" },
-  ];
+// Writes a literal file (e.g. 404.html) at static/<name>, NOT static/<name>/index.html.
+function writeRawFile(outDir, name, contents) {
+  const outPath = join(outDir, name);
+  mkdirSync(dirname(outPath), { recursive: true });
+  writeFileSync(outPath, contents);
+}
+
+function writeConfigJson(outDir, _hasPublic) {
+  // Build Output API v3 config. Only schema-valid fields here — unknown
+  // top-level fields or route properties are rejected at "Deploying outputs".
   const config = {
     version: 3,
-    framework: { slug: "swift-rust", name: "Swift Rust" },
     routes: [
       { src: "/_swift-rust/static/(.*)", headers: { "Cache-Control": "public, max-age=31536000, immutable" } },
       { src: "/fonts/(.*)", headers: { "Cache-Control": "public, max-age=31536000, immutable" } },
-      ...(hasPublic
-        ? [{ src: "/(.*)", headers: { "Cache-Control": "public, max-age=31536000, immutable" }, "isr-per-page": false }]
-        : []),
       { handle: "filesystem" },
       { src: "^(.*)$", status: 404, dest: "/404.html" },
     ],
     overrides: {
-      "404": { path: "404", contentType: "text/html; charset=utf-8" },
+      "404.html": { path: "404", contentType: "text/html; charset=utf-8" },
     },
   };
-  if (!hasPublic) config.routes = config.routes.filter((r) => !r["isr-per-page"]);
   writeFileSync(join(outDir, "config.json"), `${JSON.stringify(config, null, 2)}\n`);
 }
 
@@ -220,13 +250,25 @@ async function main() {
   const pages = discoverPages(APP_DIR);
   const staticRoutes = pages.filter((p) => p.type === "static").map((p) => p.route);
   const catchalls = pages.filter((p) => p.type === "catchall");
+  const dynamics = pages.filter((p) => p.type === "dynamic");
   process.stdout.write(`  ${paint("dim", "•")} static routes: ${paint("bold", String(staticRoutes.length))}\n`);
+
   for (const ca of catchalls) {
-    const params = await enumerateCatchAll(ca);
-    const routes = routesFromCatchAllParams(ca, params);
+    const params = await enumerateParams(ca);
+    const routes = routesFromParams(ca.base, ca.paramName, params);
     for (const r of routes) staticRoutes.push(r);
     process.stdout.write(`  ${paint("dim", "•")} catch-all ${paint("cyan", ca.base + "/[...]")}: ${paint("bold", String(routes.length))}\n`);
   }
+  for (const dyn of dynamics) {
+    const params = await enumerateParams(dyn);
+    if (params.length === 0) {
+      process.stdout.write(`  ${paint("dim", "•")} dynamic ${paint("cyan", dyn.base + "/[" + dyn.paramName + "]")}: ${paint("yellow", "needs serverless function (skipped for v0.1.0)")}\n`);
+      continue;
+    }
+    const routes = routesFromParams(dyn.base, dyn.paramName, params);
+    for (const r of routes) staticRoutes.push(r);
+    process.stdout.write(`  ${paint("dim", "•")} dynamic ${paint("cyan", dyn.base + "/[" + dyn.paramName + "]")}: ${paint("bold", String(routes.length))}\n`);
+  }
 
   const allRoutes = [...new Set(staticRoutes)].sort();
   process.stdout.write(`  ${paint("dim", "•")} total: ${paint("bold", String(allRoutes.length))}\n\n`);
@@ -234,7 +276,9 @@ async function main() {
   process.stdout.write(`  ${paint("dim", "starting dev server on " + HOST + ":" + PORT_START + "…")}\n`);
   PORT = await findFreePort(PORT_START);
   process.stdout.write(`  ${paint("dim", "using port " + PORT + "\n")}\n`);
-  const proc = startDevServer(PORT, null);
+  activeLogFile = process.env.SWIFT_RUST_BUILD_LOG || "/tmp/swift-rust-build-dev.log";
+  try { unlinkSync(activeLogFile); } catch {}
+  const proc = startDevServer(PORT, activeLogFile);
   let okCount = 0;
   let skipCount = 0;
   let failCount = 0;
@@ -255,7 +299,9 @@ async function main() {
           process.stdout.write(`  ${paint("dim", "○")} ${route} ${paint("dim", "(404, skipped)")}\n`);
         } else {
           failCount++;
+          const snippet = body.replace(/<[^>]+>/g, " ").replace(/\s+/g, " ").trim().slice(0, 160);
           process.stdout.write(`  ${paint("yellow", "!")} ${route} ${paint("dim", `(${status})`)}\n`);
+          if (snippet) process.stdout.write(`      ${paint("dim", snippet)}\n`);
         }
       } catch (e) {
         failCount++;
@@ -263,13 +309,21 @@ async function main() {
       }
     }
 
+    if (failCount > 0) {
+      const tail = tailDevLog(30);
+      if (tail.length) {
+        process.stdout.write(`\n  ${paint("dim", "dev server tail:")}\n`);
+        for (const line of tail) process.stdout.write(`    ${paint("dim", line)}\n`);
+      }
+    }
+
     const notFoundFile = findNotFoundFile(APP_DIR);
     if (notFoundFile) {
       try {
         const { status, body } = await fetchRoute("/_not_found_");
         if (status === 200 || status === 404) {
           const html = stripHmrScript(body).replace(/<title>[^<]*<\/title>/, "<title>404 · Swift Rust</title>");
-          writeStaticFile(STATIC_DIR, "/404.html", html);
+          writeRawFile(STATIC_DIR, "404.html", html);
           process.stdout.write(`\n  ${paint("green", "✓")} 404.html\n`);
         }
       } catch (e) {
@@ -277,7 +331,7 @@ async function main() {
       }
     }
     if (!existsSync(join(STATIC_DIR, "404.html"))) {
-      writeStaticFile(STATIC_DIR, "/404.html", `<!DOCTYPE html>
+      writeRawFile(STATIC_DIR, "404.html", `<!DOCTYPE html>
 <html lang="en"><head><meta charset="utf-8" /><title>404 · Swift Rust</title></head>
 <body><main style="font-family:system-ui;padding:4rem;text-align:center">
 <h1>404</h1><p>This page could not be found.</p><a href="/">← Back home</a>
@@ -293,6 +347,17 @@ async function main() {
       process.stdout.write(`  ${paint("green", "✓")} copied public/\n`);
     }
 
+    // App-directory metadata icons (app/favicon.ico, app/icon.svg, …) → static root.
+    // The <link> tags are already baked into the rendered HTML by the dev server.
+    const APP_ICON_FILES = ["favicon.ico", "favicon.svg", "icon.svg", "icon.png", "apple-icon.png"];
+    for (const name of APP_ICON_FILES) {
+      const src = join(APP_DIR, name);
+      if (existsSync(src)) {
+        cpSync(src, join(STATIC_DIR, name));
+        process.stdout.write(`  ${paint("green", "✓")} ${name}\n`);
+      }
+    }
+
     writeConfigJson(OUT_DIR, hasPublic);
 
     const total = Date.now() - start;

package/bin/dev-server.mjs

@@ -690,11 +690,38 @@ function errorOverlayHTML(message, stack, extra) {
   return renderErrorOverlay({ message, stack, ...(extra || {}) });
 }
 
+// Metadata icon files looked up at the root of the app directory (app/ or
+// app/src/), Next.js App Router style. Found files are served from the site
+// root and auto-linked in <head>.
+const APP_ICON_FILES = ["favicon.ico", "favicon.svg", "icon.svg", "icon.png", "apple-icon.png"];
+
+function discoverAppIcons() {
+  const icons = [];
+  for (const name of APP_ICON_FILES) {
+    const file = join(APP_DIR, name);
+    if (existsSync(file) && statSync(file).isFile()) icons.push({ name, file });
+  }
+  return icons;
+}
+
+function buildAppIconsLinkTags() {
+  return discoverAppIcons()
+    .map(({ name }) => {
+      const ext = extname(name).toLowerCase();
+      if (name.startsWith("apple-icon")) return `<link rel="apple-touch-icon" href="/${name}" />`;
+      if (ext === ".ico") return `<link rel="icon" href="/${name}" sizes="any" />`;
+      if (ext === ".svg") return `<link rel="icon" href="/${name}" type="image/svg+xml" />`;
+      return `<link rel="icon" href="/${name}" />`;
+    })
+    .join("\n");
+}
+
 async function buildHead(head) {
   const css = await getProcessedGlobalsCss();
   const fontLink = buildGoogleFontsLinkTag();
   return [
     head || "",
+    buildAppIconsLinkTags(),
     fontLink,
     css ? `<style data-swift-rust-globals>${escapeForStyleTag(css)}</style>` : "",
   ].filter(Boolean).join("\n");
@@ -954,6 +981,22 @@ async function handleRequest(req, res) {
     return;
   }
 
+  // App-directory metadata icons (app/favicon.ico, app/icon.svg, …) served
+  // from the site root, Next.js style.
+  {
+    const iconName = pathname.replace(/^\/+/, "");
+    if (APP_ICON_FILES.includes(iconName)) {
+      const candidate = join(APP_DIR, iconName);
+      if (existsSync(candidate) && statSync(candidate).isFile()) {
+        const ext = extname(candidate).toLowerCase();
+        const mime = { ".ico": "image/x-icon", ".svg": "image/svg+xml", ".png": "image/png" }[ext] || "application/octet-stream";
+        res.writeHead(200, { "Content-Type": mime });
+        res.end(readFileSync(candidate));
+        return;
+      }
+    }
+  }
+
   if (existsSync(PUBLIC_DIR)) {
     const safe = pathname.replace(/\.\.+/g, "").replace(/^\/+/, "");
     const candidate = join(PUBLIC_DIR, safe);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swift-rust",
-  "version": "0.2.1",
+  "version": "1.0.1",
   "description": "The full-stack React framework powered with Rust + Bun. TSX-first, Rust rendering, 10x faster than Next.js, single binary deploy.",
   "license": "MIT",
   "homepage": "https://swift-rust.dev",
@@ -87,11 +87,11 @@
   },
   "dependencies": {
     "@dotenvx/dotenvx": "^1.0.0",
-    "@swift-rust/env": "0.2.0",
-    "@swift-rust/font": "0.2.0",
-    "@swift-rust/image": "1.0.0",
-    "@swift-rust/pdf": "0.2.0",
-    "@swift-rust/video": "0.2.0",
+    "@swift-rust/env": "workspace:*",
+    "@swift-rust/font": "workspace:*",
+    "@swift-rust/image": "workspace:*",
+    "@swift-rust/pdf": "workspace:*",
+    "@swift-rust/video": "workspace:*",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },