bini-router 1.0.4 → 1.0.5

package/dist/index.cjs

@@ -36,6 +36,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_fs = __toESM(require("fs"), 1);
 var import_path = __toESM(require("path"), 1);
+var import_child_process = require("child_process");
 var PAGE_FILES = ["page.tsx", "page.jsx", "page.ts", "page.js"];
 var LAYOUT_FILES = ["layout.tsx", "layout.jsx", "layout.ts", "layout.js"];
 var SUPPORTED_EXTS = [".tsx", ".jsx", ".ts", ".js"];
@@ -45,13 +46,13 @@ var API_EXTS = [".ts", ".js"];
 var DEBOUNCE_MS = 60;
 var EVENT_DEDUP_MS = 500;
 var EVENT_TTL_MS = 2e3;
+var APP_DIR = import_path.default.join(process.cwd(), "src/app");
+var API_DIR = import_path.default.join(process.cwd(), "src/app/api");
 function norm(p) {
   return p.replace(/\\/g, "/");
 }
 function isInDir(file, dir) {
-  const nFile = norm(file);
-  const nDir = norm(dir).replace(/\/$/, "");
-  return nFile.startsWith(nDir + "/") || nFile === nDir;
+  return norm(file).startsWith(norm(dir));
 }
 function readTsconfigAliases() {
   const aliases = {};
@@ -104,20 +105,20 @@ function getAppFile() {
   const ts = import_path.default.join(process.cwd(), "src/App.tsx");
   return import_fs.default.existsSync(ts) ? ts : import_path.default.join(process.cwd(), "src/App.jsx");
 }
-function resolveLayoutChain(pageDir, appDir) {
+function resolveLayoutChain(pageDir) {
   const chain = [];
   let current = pageDir;
   while (true) {
     const layout = findFile(current, LAYOUT_FILES);
     if (layout) chain.unshift(import_path.default.join(current, layout));
-    if (import_path.default.resolve(current) === import_path.default.resolve(appDir)) break;
+    if (import_path.default.resolve(current) === import_path.default.resolve(APP_DIR)) break;
     const parent = import_path.default.dirname(current);
     if (parent === current) break;
     current = parent;
   }
   return chain;
 }
-function scanRoutes(dir, appDir, baseRoute = "") {
+function scanRoutes(dir, baseRoute = "") {
   const routes = [];
   if (!import_fs.default.existsSync(dir)) return routes;
   let entries;
@@ -135,7 +136,7 @@ function scanRoutes(dir, appDir, baseRoute = "") {
     routes.push({
       routePath: `${baseRoute}/${base}`,
       filePath: import_path.default.join(dir, entry.name),
-      layouts: resolveLayoutChain(dir, appDir),
+      layouts: resolveLayoutChain(dir),
       dynamic: false
     });
   }
@@ -151,11 +152,11 @@ function scanRoutes(dir, appDir, baseRoute = "") {
       routes.push({
         routePath,
         filePath: import_path.default.join(fullPath, pageFile),
-        layouts: resolveLayoutChain(fullPath, appDir),
+        layouts: resolveLayoutChain(fullPath),
         dynamic: isDynamic
       });
     }
-    routes.push(...scanRoutes(fullPath, appDir, routePath));
+    routes.push(...scanRoutes(fullPath, routePath));
   }
   return routes;
 }
@@ -211,15 +212,15 @@ function renderChain(layouts, routesInChain, layoutNames, pageNames, layoutTitle
     `${pad}</Route>`
   ].join("\n");
 }
-function generateApp(appDir) {
+function generateApp() {
   const aliases = readTsconfigAliases();
-  const routes = scanRoutes(appDir, appDir);
-  const rootPage = findFile(appDir, PAGE_FILES);
+  const routes = scanRoutes(APP_DIR);
+  const rootPage = findFile(APP_DIR, PAGE_FILES);
   if (rootPage) {
     routes.unshift({
       routePath: "/",
-      filePath: import_path.default.join(appDir, rootPage),
-      layouts: resolveLayoutChain(appDir, appDir),
+      filePath: import_path.default.join(APP_DIR, rootPage),
+      layouts: resolveLayoutChain(APP_DIR),
       dynamic: false
     });
   }
@@ -234,8 +235,8 @@ function generateApp(appDir) {
     if (a.dynamic !== b.dynamic) return a.dynamic ? 1 : -1;
     return a.routePath.length - b.routePath.length;
   });
-  const notFoundFile = NOT_FOUND_FILES.find((f) => import_fs.default.existsSync(import_path.default.join(appDir, f)));
-  const notFound = notFoundFile && hasDefaultExport(import_path.default.join(appDir, notFoundFile)) ? notFoundFile : void 0;
+  const notFoundFile = NOT_FOUND_FILES.find((f) => import_fs.default.existsSync(import_path.default.join(APP_DIR, f)));
+  const notFound = notFoundFile && hasDefaultExport(import_path.default.join(APP_DIR, notFoundFile)) ? notFoundFile : void 0;
   const allLayouts = /* @__PURE__ */ new Set();
   for (const r of validRoutes) r.layouts.forEach((l) => {
     if (isUsableLayout(l)) allLayouts.add(l);
@@ -256,7 +257,7 @@ function generateApp(appDir) {
   for (const [fp, name] of layoutNames)
     lazyImports.push(`const ${name} = React.lazy(() => import('${toImportPath(fp, aliases)}'));`);
   if (notFound)
-    lazyImports.push(`const NotFound = React.lazy(() => import('${toImportPath(import_path.default.join(appDir, notFound), aliases)}'));`);
+    lazyImports.push(`const NotFound = React.lazy(() => import('${toImportPath(import_path.default.join(APP_DIR, notFound), aliases)}'));`);
   const emittedPages = /* @__PURE__ */ new Set();
   for (const r of validRoutes) {
     if (emittedPages.has(r.filePath)) continue;
@@ -318,7 +319,6 @@ function Spinner() {
 }
 
 // Renders nothing \u2014 just sets document.title when the layout mounts.
-// Placed outside ErrorBoundary so a layout crash doesn't block the title update.
 function TitleSetter({ title }: { title: string }) {
   React.useEffect(() => { document.title = title; }, [title]);
   return null;
@@ -348,12 +348,12 @@ ${catchAll}
 }
 `;
 }
-function parseAppMetadata(appDir) {
-  const layout = findFile(appDir, LAYOUT_FILES);
+function parseAppMetadata() {
+  const layout = findFile(APP_DIR, LAYOUT_FILES);
   if (!layout) return {};
   let src = "";
   try {
-    src = import_fs.default.readFileSync(import_path.default.join(appDir, layout), "utf8");
+    src = import_fs.default.readFileSync(import_path.default.join(APP_DIR, layout), "utf8");
   } catch {
     return {};
   }
@@ -515,7 +515,7 @@ function extractArrayRaw(source, key) {
   }
   return void 0;
 }
-function scanApiRoutes(dir, baseRoute = "") {
+function scanApiRoutes(dir = API_DIR, baseRoute = "") {
   const routes = [];
   if (!import_fs.default.existsSync(dir)) return routes;
   let entries;
@@ -544,136 +544,34 @@ function scanApiRoutes(dir, baseRoute = "") {
   }
   return routes;
 }
-async function buildHonoApp(apiDir, enableCors) {
-  const { Hono } = await import("hono");
-  const app = new Hono();
-  if (enableCors) {
-    const { cors } = await import("hono/cors");
-    app.use("*", cors({
-      origin: "*",
-      allowMethods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
-      allowHeaders: ["Content-Type", "Authorization"]
-    }));
-  }
-  for (const route of scanApiRoutes(apiDir)) {
-    const filePath = route.filePath;
-    app.all(route.routePath, async (c) => {
-      try {
-        const { pathToFileURL } = await import("url");
-        const mod = await import(pathToFileURL(filePath).href + "?t=" + Date.now());
-        const handler = mod.default;
-        if (!handler) return c.json({ error: "No default export" }, 500);
-        if (typeof handler.fetch === "function") return await handler.fetch(c.req.raw);
-        if (typeof handler === "function") {
-          return await handler(c.req.raw);
-        }
-        return c.json({ error: "Default export must be a function or Hono app" }, 500);
-      } catch (e) {
-        return c.json({ error: e.message }, 500);
-      }
-    });
-  }
-  return app;
-}
-async function handleApiRequest(req, res, next, apiDir, enableCors, getCache, setCache) {
-  try {
-    let app = getCache();
-    if (!app) {
-      app = await buildHonoApp(apiDir, enableCors);
-      setCache(app);
-    }
-    const host = req.headers.host ?? "localhost";
-    const url = `http://${host}/api${req.url}`;
-    const chunks = [];
-    for await (const chunk of req) chunks.push(chunk);
-    const body = chunks.length > 0 ? Buffer.concat(chunks) : void 0;
-    const webReq = new Request(url, {
-      method: req.method,
-      headers: req.headers,
-      body: body?.length ? body : void 0
-    });
-    const webRes = await app.fetch(webReq);
-    res.statusCode = webRes.status;
-    webRes.headers.forEach((v, k) => res.setHeader(k, v));
-    res.end(Buffer.from(await webRes.arrayBuffer()));
-  } catch (e) {
-    next(e);
-  }
-}
-function buildNitroRoutes(srcApiDir, enableCors) {
-  if (!import_fs.default.existsSync(srcApiDir)) return;
-  const routes = scanApiRoutes(srcApiDir);
-  if (!routes.length) return;
-  const cwd = process.cwd();
-  const nitroApiDir = import_path.default.join(cwd, "server", "routes", "api");
-  if (import_fs.default.existsSync(nitroApiDir)) {
-    import_fs.default.rmSync(nitroApiDir, { recursive: true, force: true });
-  }
-  import_fs.default.mkdirSync(nitroApiDir, { recursive: true });
-  for (const route of routes) {
-    const relFromApiDir = norm(import_path.default.relative(srcApiDir, route.filePath));
-    const outFile = import_path.default.join(nitroApiDir, relFromApiDir);
-    import_fs.default.mkdirSync(import_path.default.dirname(outFile), { recursive: true });
-    const importRel = norm(import_path.default.relative(import_path.default.dirname(outFile), route.filePath)).replace(/\.(ts|tsx)$/, "");
-    const importPath = importRel.startsWith(".") ? importRel : `./${importRel}`;
-    const code = [
-      `// Auto-generated by bini-router \u2014 DO NOT EDIT.`,
-      `// Source: ${norm(import_path.default.relative(cwd, route.filePath))}`,
-      `import { Hono } from 'hono';`,
-      ...enableCors ? [`import { cors } from 'hono/cors';`] : [],
-      `import { defineEventHandler, getRequestURL, getHeaders, readRawBody } from 'h3';`,
-      `import sourceHandler from '${importPath}';`,
-      ``,
-      `// Wrap the user's handler so we get a standard fetch() interface.`,
-      `// Supports:`,
-      `//   export default async function handler(req: Request) { ... }  \u2190 web standard`,
-      `//   export default new Hono()                                     \u2190 Hono app`,
-      `function makeApp(): Hono {`,
-      `  if (sourceHandler instanceof Hono) return sourceHandler;`,
-      `  const app = new Hono();`,
-      ...enableCors ? [`  app.use('*', cors({ origin: '*', allowMethods: ['GET','POST','PUT','PATCH','DELETE','OPTIONS'], allowHeaders: ['Content-Type','Authorization'] }));`] : [],
-      `  app.all('*', async c => {`,
-      `    try {`,
-      `      const res = await (sourceHandler as (req: Request) => Promise<Response>)(c.req.raw);`,
-      `      return res;`,
-      `    } catch (e: any) {`,
-      `      return c.json({ error: e.message ?? 'Internal server error' }, 500);`,
-      `    }`,
-      `  });`,
-      `  return app;`,
-      `}`,
-      ``,
-      `const app = makeApp();`,
-      ``,
-      `export default defineEventHandler(async (event) => {`,
-      `  // Manually reconstruct a Web Request from h3 event to avoid the`,
-      `  // toWebRequest() body-stream bug on Netlify/Lambda (h3 issue #578).`,
-      `  const url     = getRequestURL(event);`,
-      `  const headers = new Headers(getHeaders(event) as Record<string, string>);`,
-      `  const method  = (event.method ?? event.node?.req?.method ?? 'GET').toUpperCase();`,
-      `  const hasBody = !['GET', 'HEAD', 'OPTIONS'].includes(method);`,
-      `  let body: BodyInit | undefined;`,
-      `  if (hasBody) {`,
-      `    const raw = await readRawBody(event, false);`,
-      `    if (raw && raw.length > 0) body = raw;`,
-      `  }`,
-      `  const req = new Request(url.toString(), { method, headers, body });`,
-      `  return app.fetch(req);`,
-      `});`,
-      ``
-    ].join("\n");
-    import_fs.default.writeFileSync(outFile, code, "utf8");
-  }
-  console.log(`[bini-router] \u2713 Generated ${routes.length} Nitro route(s) in server/routes/api/
-`);
+function generateNitroApiEntry() {
+  const routes = scanApiRoutes();
+  if (!routes.length) return "";
+  const imports = [];
+  const registrations = [];
+  routes.forEach((route, i) => {
+    const relPath = import_path.default.relative(
+      import_path.default.join(process.cwd(), "server"),
+      route.filePath
+    ).replace(/\\/g, "/").replace(/\.(ts|js)$/, "");
+    imports.push(`import handler${i} from './${relPath}';`);
+    registrations.push(
+      `  app.all('${route.routePath}', async (c) => {    try { return await handler${i}(c.req.raw); }    catch (e) { return c.json({ error: e.message }, 500); }  });`
+    );
+  });
+  return `// Auto-generated by bini-router
+import { Hono } from 'hono';
+${imports.join("\n")}
+
+const app = new Hono();
+${registrations.join("\n")}
+
+export default app;
+`;
 }
-function biniroute(options = {}) {
-  const { cors: enableCors = true } = options;
-  const getAppDir = () => import_path.default.join(process.cwd(), options.appDir ?? "src/app");
-  const getApiDir = () => import_path.default.join(process.cwd(), options.apiDir ?? "src/app/api");
+function biniroute() {
   let debounceTimer = null;
   let lastGeneratedCode = "";
-  let honoCache = null;
   const eventLog = /* @__PURE__ */ new Map();
   function shouldProcess(file, event) {
     const key = `${file}:${event}`;
@@ -688,19 +586,18 @@ function biniroute(options = {}) {
     const base = import_path.default.basename(f, import_path.default.extname(f));
     const ext = import_path.default.extname(f);
     if (!SUPPORTED_EXTS.includes(ext)) return false;
-    if (!isInDir(nf, norm(getAppDir()))) return false;
-    if (isInDir(nf, norm(getApiDir()))) return false;
+    if (!isInDir(nf, norm(APP_DIR))) return false;
+    if (isInDir(nf, norm(API_DIR))) return false;
     if (base.startsWith("_")) return false;
     return true;
   }
   function isApiFile(f) {
     const nf = norm(f);
-    return isInDir(nf, norm(getApiDir())) && API_EXTS.includes(import_path.default.extname(f));
+    return isInDir(nf, norm(API_DIR)) && API_EXTS.includes(import_path.default.extname(f));
   }
   function applyApp() {
-    const dir = getAppDir();
-    if (!import_fs.default.existsSync(dir)) return null;
-    const code = generateApp(dir);
+    if (!import_fs.default.existsSync(APP_DIR)) return null;
+    const code = generateApp();
     if (code === lastGeneratedCode) return null;
     import_fs.default.writeFileSync(getAppFile(), code, "utf8");
     lastGeneratedCode = code;
@@ -718,19 +615,53 @@ function biniroute(options = {}) {
   function addSpaFallback(server) {
     server.middlewares.use((req, res, next) => {
       const url = req.url;
-      if (url.startsWith("/api") || url.includes(".")) return next();
+      if (url.includes(".")) return next();
       req.url = "/index.html";
       next();
     });
   }
+  function buildApiWithNitro() {
+    const routes = scanApiRoutes();
+    if (routes.length === 0) return;
+    console.log("\n\u{1F4E6} Building API routes with Nitro...");
+    const serverDir = import_path.default.join(process.cwd(), "server");
+    const apiDir = import_path.default.join(serverDir, "api");
+    import_fs.default.mkdirSync(apiDir, { recursive: true });
+    const entry = generateNitroApiEntry();
+    import_fs.default.writeFileSync(import_path.default.join(serverDir, "index.ts"), entry, "utf8");
+    routes.forEach((route) => {
+      const destPath = import_path.default.join(apiDir, import_path.default.basename(route.filePath));
+      import_fs.default.copyFileSync(route.filePath, destPath);
+    });
+    const nitroConfig = import_path.default.join(process.cwd(), "nitro.config.ts");
+    if (!import_fs.default.existsSync(nitroConfig)) {
+      const config = `import { defineNitroConfig } from 'nitropack/config';
+
+export default defineNitroConfig({
+  handlers: [
+    { route: '/api/**', handler: '~/server/index' }
+  ]
+});
+`;
+      import_fs.default.writeFileSync(nitroConfig, config, "utf8");
+    }
+    try {
+      (0, import_child_process.execSync)("npx nitropack build", {
+        stdio: "inherit",
+        cwd: process.cwd()
+      });
+      console.log("\u2705 API routes built successfully");
+    } catch (error) {
+      console.error("\u274C API build failed:", error);
+      process.exit(1);
+    }
+  }
   return {
     name: "bini-router",
     enforce: "pre",
-    // Strip `export const metadata = {...}` from all src/app files before
-    // @vitejs/plugin-react's Fast Refresh transform sees them.
     transform(code, id) {
       const nid = norm(id);
-      if (!isInDir(nid, norm(getAppDir()))) return;
+      if (!isInDir(nid, norm(APP_DIR))) return;
       const ext = import_path.default.extname(id);
       if (!SUPPORTED_EXTS.includes(ext)) return;
       if (!code.includes("export const metadata")) return;
@@ -765,89 +696,83 @@ function biniroute(options = {}) {
     buildStart() {
       applyApp();
     },
+    // This runs after Vite build is complete
     closeBundle() {
-      buildNitroRoutes(getApiDir(), enableCors);
+      buildApiWithNitro();
     },
     buildEnd() {
-      honoCache = null;
       if (debounceTimer) {
         clearTimeout(debounceTimer);
         debounceTimer = null;
       }
     },
     async configureServer(server) {
-      const appDir = getAppDir();
-      const apiDir = getApiDir();
-      if (!import_fs.default.existsSync(appDir)) return;
-      server.watcher.add(appDir);
+      if (!import_fs.default.existsSync(APP_DIR)) return;
+      server.watcher.add(APP_DIR);
       server.watcher.on("add", (f) => isPageFile(f) && shouldProcess(f, "add") && scheduleRegen(server, 300));
       server.watcher.on("unlink", (f) => isPageFile(f) && shouldProcess(f, "unlink") && scheduleRegen(server));
       server.watcher.on("change", (f) => isPageFile(f) && shouldProcess(f, "change") && scheduleRegen(server));
       server.watcher.on("change", (f) => {
         const base = import_path.default.basename(f, import_path.default.extname(f));
-        const inAppRoot = import_path.default.resolve(import_path.default.dirname(f)) === import_path.default.resolve(appDir);
+        const inAppRoot = import_path.default.resolve(import_path.default.dirname(f)) === import_path.default.resolve(APP_DIR);
         if (!inAppRoot || base !== "layout") return;
         server.moduleGraph.invalidateAll();
         server.ws.send({ type: "full-reload", path: "*" });
       });
       server.watcher.on("addDir", (d) => {
-        const nd = norm(d);
-        if (!isInDir(nd, norm(appDir)) || d.includes("node_modules") || isInDir(nd, norm(apiDir))) return;
+        if (!isInDir(norm(d), norm(APP_DIR)) || d.includes("node_modules") || d.includes("api")) return;
         setTimeout(() => PAGE_FILES.some((f) => import_fs.default.existsSync(import_path.default.join(d, f))) && scheduleRegen(server), 300);
       });
       server.watcher.on("unlinkDir", (d) => {
-        const nd = norm(d);
-        if (isInDir(nd, norm(appDir)) && !d.includes("node_modules") && !isInDir(nd, norm(apiDir)))
+        if (isInDir(norm(d), norm(APP_DIR)) && !d.includes("node_modules") && !d.includes("api"))
           scheduleRegen(server);
       });
-      if (import_fs.default.existsSync(apiDir)) {
-        server.watcher.add(apiDir);
-        const resetApi = () => {
-          honoCache = null;
-          server.ws.send({ type: "full-reload", path: "*" });
-        };
-        server.watcher.on("add", (f) => isApiFile(f) && resetApi());
-        server.watcher.on("unlink", (f) => isApiFile(f) && resetApi());
-        server.watcher.on("change", (f) => isApiFile(f) && resetApi());
-        server.middlewares.use(
-          "/api",
-          (req, res, next) => handleApiRequest(
-            req,
-            res,
-            next,
-            apiDir,
-            enableCors,
-            () => honoCache,
-            (v) => {
-              honoCache = v;
+      if (import_fs.default.existsSync(API_DIR)) {
+        server.middlewares.use("/api", async (req, res, next) => {
+          try {
+            const { Hono } = await import("hono");
+            const app = new Hono();
+            const routes = scanApiRoutes();
+            for (const route of routes) {
+              const mod = await import(route.filePath + "?t=" + Date.now());
+              const handler = mod.default;
+              if (typeof handler === "function") {
+                app.all(route.routePath, async (c) => {
+                  try {
+                    return await handler(c.req.raw);
+                  } catch (e) {
+                    return c.json({ error: e.message }, 500);
+                  }
+                });
+              }
             }
-          )
-        );
+            const url = `http://${req.headers.host}${req.url}`;
+            const chunks = [];
+            for await (const chunk of req) chunks.push(chunk);
+            const body = chunks.length > 0 ? Buffer.concat(chunks) : void 0;
+            const webReq = new Request(url, {
+              method: req.method,
+              headers: req.headers,
+              body
+            });
+            const webRes = await app.fetch(webReq);
+            res.statusCode = webRes.status;
+            webRes.headers.forEach((value, key) => res.setHeader(key, value));
+            const buffer = await webRes.arrayBuffer();
+            res.end(Buffer.from(buffer));
+          } catch (e) {
+            next(e);
+          }
+        });
       }
     },
     async configurePreviewServer(server) {
       addSpaFallback(server);
-      const apiDir = getApiDir();
-      if (!import_fs.default.existsSync(apiDir)) return;
-      server.middlewares.use(
-        "/api",
-        (req, res, next) => handleApiRequest(
-          req,
-          res,
-          next,
-          apiDir,
-          enableCors,
-          () => honoCache,
-          (v) => {
-            honoCache = v;
-          }
-        )
-      );
     },
     transformIndexHtml: {
       order: "pre",
       handler(html) {
-        const meta = parseAppMetadata(getAppDir());
+        const meta = parseAppMetadata();
         const title = meta.title ?? "Bini App";
         const vp = meta.viewport ?? "width=device-width, initial-scale=1.0";
         const lines = [];
@@ -875,18 +800,18 @@ function biniroute(options = {}) {
           lines.push(`<link rel="apple-touch-icon" href="${entry.url}"${sizes}${type} />`);
         }
         if (meta.openGraph?.title) {
-          lines.push(`<meta property="og:type"        content="${meta.openGraph.type ?? "website"}" />`);
-          lines.push(`<meta property="og:title"       content="${meta.openGraph.title}" />`);
+          lines.push(`<meta property="og:type" content="${meta.openGraph.type ?? "website"}" />`);
+          lines.push(`<meta property="og:title" content="${meta.openGraph.title}" />`);
           if (meta.openGraph.description) lines.push(`<meta property="og:description" content="${meta.openGraph.description}" />`);
-          if (meta.openGraph.url) lines.push(`<meta property="og:url"         content="${meta.openGraph.url}" />`);
-          if (meta.openGraph.image) lines.push(`<meta property="og:image"       content="${meta.openGraph.image}" />`);
+          if (meta.openGraph.url) lines.push(`<meta property="og:url" content="${meta.openGraph.url}" />`);
+          if (meta.openGraph.image) lines.push(`<meta property="og:image" content="${meta.openGraph.image}" />`);
         }
         if (meta.twitter?.title) {
-          lines.push(`<meta name="twitter:card"        content="${meta.twitter.card ?? "summary_large_image"}" />`);
-          lines.push(`<meta name="twitter:title"       content="${meta.twitter.title}" />`);
+          lines.push(`<meta name="twitter:card" content="${meta.twitter.card ?? "summary_large_image"}" />`);
+          lines.push(`<meta name="twitter:title" content="${meta.twitter.title}" />`);
           if (meta.twitter.description) lines.push(`<meta name="twitter:description" content="${meta.twitter.description}" />`);
-          if (meta.twitter.creator) lines.push(`<meta name="twitter:creator"     content="${meta.twitter.creator}" />`);
-          if (meta.twitter.image) lines.push(`<meta name="twitter:image"       content="${meta.twitter.image}" />`);
+          if (meta.twitter.creator) lines.push(`<meta name="twitter:creator" content="${meta.twitter.creator}" />`);
+          if (meta.twitter.image) lines.push(`<meta name="twitter:image" content="${meta.twitter.image}" />`);
         }
         const injected = lines.map((l) => `    ${l}`).join("\n");
         return html.replace(/<meta\s+charset[^>]*\/?>/gi, "").replace(/<meta\s+name="viewport"[^>]*\/?>/gi, "").replace(/<meta\s+name="description"[^>]*\/?>/gi, "").replace(/<meta\s+name="theme-color"[^>]*\/?>/gi, "").replace(/<meta\s+name="robots"[^>]*\/?>/gi, "").replace(/<meta\s+name="keywords"[^>]*\/?>/gi, "").replace(/<meta\s+name="author"[^>]*\/?>/gi, "").replace(/<meta\s+property="og:[^"]*"[^>]*\/?>/gi, "").replace(/<meta\s+name="twitter:[^"]*"[^>]*\/?>/gi, "").replace(/<link\s+rel="canonical"[^>]*\/?>/gi, "").replace(/<link\s+rel="manifest"[^>]*\/?>/gi, "").replace(/<link\s+rel="icon"[^>]*\/?>/gi, "").replace(/<link\s+rel="shortcut icon"[^>]*\/?>/gi, "").replace(/<link\s+rel="apple-touch-icon"[^>]*\/?>/gi, "").replace(/<title>.*?<\/title>/si, "").replace("</head>", `${injected}