clawfire 0.6.16 → 0.6.18

package/dist/dev.js

@@ -3056,7 +3056,7 @@ function generateDashboardHtml(options) {
 
 // src/dev/firebase-setup.ts
 import { execFile as execFile2, spawn } from "child_process";
-import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync3, rmSync } from "fs";
 import { resolve as resolve5, join as join4 } from "path";
 import { tmpdir, platform, homedir } from "os";
 var FirebaseSetup = class {
@@ -3532,6 +3532,15 @@ var FirebaseSetup = class {
     if (!existsSync6(pkgPath)) {
       return { success: false, message: "functions/package.json not found." };
     }
+    this.ensureFunctionsCJS(functionsDir);
+    const distDir = resolve5(functionsDir, "dist");
+    if (existsSync6(distDir)) {
+      try {
+        rmSync(distDir, { recursive: true, force: true });
+        console.log("  \x1B[32m\u2713\x1B[0m Cleaned functions/dist/");
+      } catch {
+      }
+    }
     try {
       await this.execTimeout("npm", ["install"], 12e4, functionsDir);
     } catch (err) {
@@ -3548,11 +3557,80 @@ var FirebaseSetup = class {
           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}` };
     }
+    const mainEntry = resolve5(functionsDir, "dist/index.js");
+    if (!existsSync6(mainEntry)) {
+      return { success: false, message: "Build produced no output (dist/index.js not found)." };
+    }
+    try {
+      const firstLine = readFileSync4(mainEntry, "utf-8").split("\n")[0];
+      const isESM = firstLine.startsWith("import ") || firstLine.startsWith("export ");
+      if (isESM) {
+        console.log("  \x1B[33m\u26A0\x1B[0m Warning: dist/index.js appears to be ESM, not CJS");
+      } else {
+        console.log("  \x1B[32m\u2713\x1B[0m Build output verified (CJS)");
+      }
+    } catch {
+    }
+    try {
+      const verifyScript = [
+        'process.env.FIREBASE_CONFIG=JSON.stringify({projectId:"verify"});',
+        'process.env.GCLOUD_PROJECT="verify";',
+        'try{require("./dist/index.js");console.log("OK")}',
+        'catch(e){console.error("LOAD_ERROR:"+e.message);process.exit(1)}'
+      ].join("");
+      await this.execTimeout("node", ["-e", verifyScript], 15e3, functionsDir);
+      console.log("  \x1B[32m\u2713\x1B[0m Module load verification passed");
+    } catch (verifyErr) {
+      const msg = verifyErr instanceof Error ? verifyErr.message : "Unknown";
+      const match = msg.match(/LOAD_ERROR:(.+?)(\n|$)/);
+      const detail = match ? match[1].trim() : msg.substring(0, 300);
+      console.log(`  \x1B[31m\u2717\x1B[0m Module load failed: ${detail}`);
+      return { success: false, message: `Functions built but failed to load: ${detail}` };
+    }
+    return { success: true, message: "Functions built successfully." };
+  }
+  /**
+   * Ensure functions/ uses CommonJS for Firebase Functions compatibility.
+   * ESM + Firebase CLI analysis often fails. Auto-fix if needed.
+   */
+  ensureFunctionsCJS(functionsDir) {
+    const pkgPath = resolve5(functionsDir, "package.json");
+    try {
+      const pkg = JSON.parse(readFileSync4(pkgPath, "utf-8"));
+      if (pkg.type === "module") {
+        delete pkg.type;
+        writeFileSync3(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
+        console.log('  \x1B[32m\u2713\x1B[0m Auto-fixed: removed "type": "module" from functions/package.json');
+      }
+    } catch {
+    }
+    const tsconfigPath = resolve5(functionsDir, "tsconfig.json");
+    try {
+      if (existsSync6(tsconfigPath)) {
+        let content = readFileSync4(tsconfigPath, "utf-8");
+        const tsconfig = JSON.parse(content);
+        let changed = false;
+        const mod = (tsconfig.compilerOptions?.module || "").toLowerCase();
+        if (mod === "esnext" || mod === "es2022" || mod === "es2020" || mod === "nodenext" || mod === "node16") {
+          tsconfig.compilerOptions.module = "CommonJS";
+          changed = true;
+        }
+        const res = (tsconfig.compilerOptions?.moduleResolution || "").toLowerCase();
+        if (res === "bundler" || res === "nodenext" || res === "node16") {
+          tsconfig.compilerOptions.moduleResolution = "node";
+          changed = true;
+        }
+        if (changed) {
+          writeFileSync3(tsconfigPath, JSON.stringify(tsconfig, null, 2) + "\n", "utf-8");
+          console.log("  \x1B[32m\u2713\x1B[0m Auto-fixed: functions/tsconfig.json \u2192 CommonJS + node resolution");
+        }
+      }
+    } catch {
+    }
   }
   // ─── Service Enable ────────────────────────────────────────────────
   enableService(service) {