clawfire 0.6.8 → 0.6.10

package/dist/dev.js

@@ -3330,7 +3330,7 @@ var FirebaseSetup = class {
     return { success: true, message: `Web app "${displayName}" selected.` };
   }
   // ─── Deploy ─────────────────────────────────────────────────────────
-  async deployHosting() {
+  async deployHosting(targets = "hosting") {
     const firebaseJsonPath = resolve5(this.projectDir, "firebase.json");
     if (!existsSync6(firebaseJsonPath)) {
       return { success: false, message: "firebase.json not found. Enable hosting first." };
@@ -3343,12 +3343,12 @@ var FirebaseSetup = class {
     } catch {
       return { success: false, message: "Invalid firebase.json." };
     }
+    const timeoutMs = targets.includes("functions") ? 3e5 : 12e4;
     try {
       const output = await this.execTimeout(
         "firebase",
-        ["deploy", "--only", "hosting", "--json"],
-        12e4
-        // 2 min timeout
+        ["deploy", "--only", targets, "--json"],
+        timeoutMs
       );
       let url = "";
       try {
@@ -3371,12 +3371,147 @@ var FirebaseSetup = class {
           url = `https://${state.projectId}.web.app`;
         }
       }
-      return { success: true, url: url || void 0, message: "Hosting deployed successfully!" };
+      const label = targets.includes("functions") ? "Hosting + Functions" : "Hosting";
+      return { success: true, url: url || void 0, message: `${label} deployed successfully!` };
     } catch (err) {
       const msg = err instanceof Error ? err.message : "Unknown error";
       return { success: false, message: `Deploy failed: ${msg}` };
     }
   }
+  // ─── Full Deploy Pipeline ────────────────────────────────────────────
+  /**
+   * Sync environment variables to functions/.env for production.
+   * Copies project root .env vars + injects CLAWFIRE_FIREBASE_CONFIG.
+   */
+  syncEnvToFunctions(firebaseConfig) {
+    const functionsDir = resolve5(this.projectDir, "functions");
+    if (!existsSync6(functionsDir)) {
+      return { success: false, message: "functions/ directory not found.", count: 0 };
+    }
+    const lines = [];
+    const rootEnvPath = resolve5(this.projectDir, ".env");
+    if (existsSync6(rootEnvPath)) {
+      const content = readFileSync4(rootEnvPath, "utf-8");
+      for (const rawLine of content.split("\n")) {
+        let trimmed = rawLine.trim();
+        if (!trimmed || trimmed.startsWith("#")) continue;
+        if (trimmed.startsWith("export ")) {
+          trimmed = trimmed.slice(7);
+        }
+        const eqIdx = trimmed.indexOf("=");
+        if (eqIdx === -1) continue;
+        const key = trimmed.slice(0, eqIdx).trim();
+        if (key === "NPM_TOKEN" || key === "NODE_ENV") continue;
+        lines.push(trimmed);
+      }
+    }
+    if (firebaseConfig && Object.keys(firebaseConfig).length > 0) {
+      const filtered = lines.filter((l) => !l.startsWith("CLAWFIRE_FIREBASE_CONFIG="));
+      filtered.push(`CLAWFIRE_FIREBASE_CONFIG=${JSON.stringify(firebaseConfig)}`);
+      lines.length = 0;
+      lines.push(...filtered);
+    }
+    const functionsEnvPath = resolve5(functionsDir, ".env");
+    writeFileSync3(functionsEnvPath, lines.join("\n") + "\n", "utf-8");
+    return { success: true, message: `Synced ${lines.length} env vars to functions/.env`, count: lines.length };
+  }
+  /**
+   * Ensure firebase.json is fully configured for deployment:
+   * - functions config exists
+   * - hosting has cleanUrls
+   * - hosting has API rewrite (/api/** → api function) before catch-all
+   *
+   * Fixes existing configs created by older versions.
+   */
+  ensureDeployConfig() {
+    const firebaseJsonPath = resolve5(this.projectDir, "firebase.json");
+    if (!existsSync6(firebaseJsonPath)) {
+      return { success: false, message: "firebase.json not found.", changes: [] };
+    }
+    try {
+      const config = JSON.parse(readFileSync4(firebaseJsonPath, "utf-8"));
+      const changes = [];
+      if (!config.functions) {
+        config.functions = {
+          source: "functions",
+          runtime: "nodejs20",
+          codebase: "clawfire"
+        };
+        changes.push("Added functions config");
+      }
+      if (config.hosting && !config.hosting.cleanUrls) {
+        config.hosting.cleanUrls = true;
+        changes.push("Added cleanUrls");
+      }
+      if (config.hosting) {
+        if (!config.hosting.rewrites) {
+          config.hosting.rewrites = [];
+        }
+        const rewrites = config.hosting.rewrites;
+        const hasApiRewrite = rewrites.some(
+          (r) => r.source === "/api/**" && r.function === "api"
+        );
+        if (!hasApiRewrite) {
+          const apiRewrite = { source: "/api/**", function: "api" };
+          const catchAllIndex = rewrites.findIndex((r) => r.source === "**");
+          if (catchAllIndex >= 0) {
+            rewrites.splice(catchAllIndex, 0, apiRewrite);
+          } else {
+            rewrites.push(apiRewrite);
+            rewrites.push({ source: "**", destination: "/index.html" });
+          }
+          changes.push("Added API rewrite (/api/** \u2192 Cloud Function)");
+        }
+      }
+      if (changes.length > 0) {
+        writeFileSync3(firebaseJsonPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
+      }
+      return {
+        success: true,
+        message: changes.length > 0 ? changes.join(", ") : "Deploy config up to date.",
+        changes
+      };
+    } catch {
+      return { success: false, message: "Invalid firebase.json.", changes: [] };
+    }
+  }
+  /**
+   * Install dependencies and build functions for deployment.
+   */
+  async buildFunctions() {
+    const functionsDir = resolve5(this.projectDir, "functions");
+    if (!existsSync6(functionsDir)) {
+      return { success: false, message: "functions/ directory not found." };
+    }
+    const pkgPath = resolve5(functionsDir, "package.json");
+    if (!existsSync6(pkgPath)) {
+      return { success: false, message: "functions/package.json not found." };
+    }
+    const nodeModulesPath = resolve5(functionsDir, "node_modules");
+    if (!existsSync6(nodeModulesPath)) {
+      try {
+        await this.execTimeout("npm", ["install"], 12e4, functionsDir);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : "Unknown error";
+        return { success: false, message: `npm install in functions/ failed: ${msg}` };
+      }
+    }
+    try {
+      const pkg = JSON.parse(readFileSync4(pkgPath, "utf-8"));
+      if (pkg.scripts?.build) {
+        await this.execTimeout("npm", ["run", "build"], 6e4, functionsDir);
+      } else {
+        const tsconfigPath = resolve5(functionsDir, "tsconfig.json");
+        if (existsSync6(tsconfigPath)) {
+          await this.execTimeout("npx", ["tsc"], 6e4, functionsDir);
+        }
+      }
+      return { success: true, message: "Functions built successfully." };
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : "Unknown error";
+      return { success: false, message: `Functions build failed: ${msg}` };
+    }
+  }
   // ─── Service Enable ────────────────────────────────────────────────
   enableService(service) {
     const firebaseJsonPath = resolve5(this.projectDir, "firebase.json");
@@ -3625,9 +3760,9 @@ https://console.developers.google.com/apis/api/firestore.googleapis.com/overview
     }
   }
   // ─── Helpers ───────────────────────────────────────────────────────
-  execTimeout(command, args, timeoutMs) {
+  execTimeout(command, args, timeoutMs, cwd) {
     return new Promise((resolve7, reject) => {
-      const proc = execFile2(command, args, { cwd: this.projectDir, timeout: timeoutMs }, (err, stdout, stderr) => {
+      const proc = execFile2(command, args, { cwd: cwd || this.projectDir, timeout: timeoutMs }, (err, stdout, stderr) => {
         if (err) {
           const detail = stderr?.trim() || stdout?.trim() || "";
           const enriched = new Error(`${err.message}${detail ? "\n" + detail : ""}`);
@@ -4790,22 +4925,27 @@ ${liveReloadScript}
     if (url.pathname === "/__dev/deploy/hosting" && req.method === "POST") {
       (async () => {
         try {
-          if (this.pageCompiler.isActive()) {
-            const projectConfig = this.readProjectConfig();
-            const firebaseConfig = {};
-            for (const field of projectConfig.fields) {
-              if (!field.isPlaceholder) {
-                firebaseConfig[field.key] = field.value;
-              }
+          const steps = [];
+          const functionsDir = resolve6(this.options.projectDir, "functions");
+          const hasFunctions = existsSync7(functionsDir);
+          const projectConfig = this.readProjectConfig();
+          const firebaseConfig = {};
+          for (const field of projectConfig.fields) {
+            if (!field.isPlaceholder) {
+              firebaseConfig[field.key] = field.value;
             }
+          }
+          if (this.pageCompiler.isActive()) {
             const configScript = Object.keys(firebaseConfig).length > 0 ? `
 <script>window.__CLAWFIRE_CONFIG__=${JSON.stringify(firebaseConfig)};</script>` : "";
             const routerScript = generateProductionRouterScript();
             const scriptToInject = configScript + routerScript;
             const buildResult = this.pageCompiler.buildForProduction(this.publicDir, scriptToInject);
             console.log(`  \x1B[32m\u2713\x1B[0m Built ${buildResult.pages.length} pages for production`);
+            steps.push(`${buildResult.pages.length} pages built`);
             if (configScript) {
               console.log(`  \x1B[32m\u2713\x1B[0m Firebase config injected (projectId: ${firebaseConfig.projectId || "?"})`);
+              steps.push("Firebase config injected");
             }
             if (buildResult.errors.length > 0) {
               for (const err of buildResult.errors) {
@@ -4813,9 +4953,42 @@ ${liveReloadScript}
               }
             }
           }
-          const result = await this.firebaseSetup.deployHosting();
+          const deployConfig = this.firebaseSetup.ensureDeployConfig();
+          if (deployConfig.success && deployConfig.changes.length > 0) {
+            for (const change of deployConfig.changes) {
+              console.log(`  \x1B[32m\u2713\x1B[0m firebase.json: ${change}`);
+            }
+            steps.push(`firebase.json updated (${deployConfig.changes.length} fixes)`);
+          }
+          let deployFunctions = false;
+          if (hasFunctions) {
+            const syncResult = this.firebaseSetup.syncEnvToFunctions(firebaseConfig);
+            if (syncResult.success) {
+              console.log(`  \x1B[32m\u2713\x1B[0m ${syncResult.message}`);
+              steps.push(`${syncResult.count} env vars synced`);
+            } else {
+              console.log(`  \x1B[33m\u26A0\x1B[0m Env sync: ${syncResult.message}`);
+            }
+            console.log("  Building functions...");
+            const buildResult = await this.firebaseSetup.buildFunctions();
+            if (buildResult.success) {
+              console.log(`  \x1B[32m\u2713\x1B[0m ${buildResult.message}`);
+              steps.push("Functions built");
+              deployFunctions = true;
+            } else {
+              console.log(`  \x1B[31m\u2717\x1B[0m ${buildResult.message}`);
+              console.log("  \x1B[33m\u26A0\x1B[0m Deploying hosting only (functions build failed)");
+              steps.push("Functions build failed \u2014 hosting only");
+            }
+          }
+          const targets = deployFunctions ? "hosting,functions" : "hosting";
+          console.log(`  Deploying ${targets}...`);
+          const result = await this.firebaseSetup.deployHosting(targets);
           clearFirebaseStatusCache();
-          sendJson(result);
+          sendJson({
+            ...result,
+            message: result.message + (steps.length > 0 ? ` (${steps.join(", ")})` : "")
+          });
         } catch (err) {
           sendJson({ success: false, message: err instanceof Error ? err.message : "Failed" }, 500);
         }