clefbase 2.0.0 → 2.0.2

package/dist/cli-src/cli/commands/deploy.js

@@ -4,12 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runDeploy = runDeploy;
+exports.runHostingDeploy = runHostingDeploy;
+exports.runFunctionsDeploy = runFunctionsDeploy;
 exports.runHostingInit = runHostingInit;
 exports.runStatus = runStatus;
 exports.runDnsStatus = runDnsStatus;
 exports.runDnsReprovision = runDnsReprovision;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
+const child_process_1 = require("child_process");
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
 const inquirer_1 = __importDefault(require("inquirer"));
@@ -70,17 +73,62 @@ function fmtBytes(n) {
 function siteUrl(site) {
     return site.customDomain ? `https://${site.customDomain}` : site.previewUrl;
 }
-// ─── deploy ───────────────────────────────────────────────────────────────────
+// ─── deploy (combined: hosting + functions, or --only one) ────────────────────
 async function runDeploy(opts) {
     const cwd = opts.cwd ?? process.cwd();
     const cfg = (0, config_1.requireConfig)(cwd);
+    const deployHosting = !opts.only || opts.only === "hosting";
+    const deployFunctions = !opts.only || opts.only === "functions";
+    // Guard: make sure at least one of the requested targets is enabled
+    if (deployHosting && !cfg.services.hosting && opts.only === "hosting") {
+        console.error(chalk_1.default.red("\n  Hosting is not enabled for this project.\n  Run `clefbase hosting:init` to set it up.\n"));
+        process.exit(1);
+    }
+    if (deployFunctions && !cfg.services.functions && opts.only === "functions") {
+        console.error(chalk_1.default.red("\n  Functions is not enabled for this project.\n  Run `clefbase init` and enable Functions to set it up.\n"));
+        process.exit(1);
+    }
     console.log();
-    console.log(chalk_1.default.bold.cyan("  Clefbase Deploy"));
+    if (opts.only === "hosting") {
+        console.log(chalk_1.default.bold.cyan("  Clefbase Deploy  ·  Hosting"));
+    }
+    else if (opts.only === "functions") {
+        console.log(chalk_1.default.bold.cyan("  Clefbase Deploy  ·  Functions"));
+    }
+    else {
+        console.log(chalk_1.default.bold.cyan("  Clefbase Deploy"));
+    }
     console.log();
+    // ── Functions first (fast, no file scanning) ──────────────────────────────
+    if (deployFunctions && cfg.services.functions) {
+        await runFunctionsDeploy({ cwd });
+        if (deployHosting && cfg.services.hosting) {
+            console.log();
+        }
+    }
+    // ── Hosting ───────────────────────────────────────────────────────────────
+    if (deployHosting && cfg.services.hosting) {
+        await runHostingDeploy({ dir: opts.dir, message: opts.message, site: opts.site, cwd });
+    }
+    // ── Nothing to do ─────────────────────────────────────────────────────────
+    if (!deployHosting && !deployFunctions) {
+        console.log(chalk_1.default.yellow("  Nothing to deploy — no services matched.\n"));
+    }
+}
+// ─── deploy:hosting ───────────────────────────────────────────────────────────
+//
+// Can be called standalone (clefbase deploy:hosting) or from runDeploy above.
+async function runHostingDeploy(opts) {
+    const cwd = opts.cwd ?? process.cwd();
+    const cfg = (0, config_1.requireConfig)(cwd);
+    if (!cfg.services.hosting) {
+        console.error(chalk_1.default.red("\n  Hosting is not enabled for this project.\n  Run `clefbase hosting:init` to set it up.\n"));
+        process.exit(1);
+    }
     // ── Resolve / pick a site ─────────────────────────────────────────────────
     let siteId = opts.site ?? cfg.hosting?.siteId ?? "";
     let siteName = cfg.hosting?.siteName ?? "";
-    let previewUrl = "";
+    let previewUrl = cfg.hosting?.previewUrl ?? "";
     if (!siteId) {
         const site = await pickOrCreateSite(cfg);
         siteId = site.id;
@@ -95,9 +143,6 @@ async function runDeploy(opts) {
         };
         (0, config_1.saveConfig)(cfg, cwd);
     }
-    else {
-        previewUrl = cfg.hosting?.previewUrl ?? "";
-    }
     // ── Resolve dist dir ──────────────────────────────────────────────────────
     const distDir = opts.dir ?? cfg.hosting?.distDir ?? await promptDistDir(cwd);
     const absDir = path_1.default.isAbsolute(distDir) ? distDir : path_1.default.join(cwd, distDir);
@@ -184,6 +229,39 @@ async function runDeploy(opts) {
     }
     console.log();
 }
+// ─── deploy:functions ─────────────────────────────────────────────────────────
+//
+// Runs `node functions/deploy.mjs` from the project root.
+// Can be called standalone (clefbase deploy:functions) or from runDeploy above.
+async function runFunctionsDeploy(opts = {}) {
+    const cwd = opts.cwd ?? process.cwd();
+    const cfg = (0, config_1.requireConfig)(cwd);
+    if (!cfg.services.functions) {
+        console.error(chalk_1.default.red("\n  Functions is not enabled for this project.\n  Run `clefbase init` and enable Functions.\n"));
+        process.exit(1);
+    }
+    const deployMjs = path_1.default.join(cwd, "functions", "deploy.mjs");
+    if (!fs_1.default.existsSync(deployMjs)) {
+        console.error(chalk_1.default.red(`\n  ✗ functions/deploy.mjs not found.`));
+        console.error(chalk_1.default.dim("    Re-run `clefbase init` to regenerate the functions/ folder,"));
+        console.error(chalk_1.default.dim("    or deploy individual functions with:"));
+        console.error(chalk_1.default.cyan("    clefbase functions:deploy -f functions/src/hello.ts --name hello --trigger http\n"));
+        process.exit(1);
+    }
+    console.log(chalk_1.default.bold("  Deploying functions…"));
+    console.log(chalk_1.default.dim(`  Running: node functions/deploy.mjs\n`));
+    try {
+        (0, child_process_1.execSync)("node deploy.mjs", {
+            cwd: path_1.default.join(cwd, "functions"),
+            stdio: "inherit",
+        });
+    }
+    catch {
+        // execSync throws on non-zero exit — deploy.mjs already printed the details
+        console.error(chalk_1.default.red("\n  ✗ One or more functions failed to deploy.\n"));
+        process.exit(1);
+    }
+}
 // ─── hosting:init ─────────────────────────────────────────────────────────────
 async function runHostingInit(cwd = process.cwd()) {
     const cfg = (0, config_1.requireConfig)(cwd);
@@ -270,7 +348,6 @@ async function runDnsStatus(cwd = process.cwd()) {
         const dns = await (0, api_1.getDnsStatus)(cfg, cfg.hosting.siteId);
         sp.succeed("DNS checked");
         console.log();
-        // Preview subdomain
         console.log(`  ${chalk_1.default.bold("Preview subdomain:")}`);
         console.log(`    URL:    ${chalk_1.default.cyan(dns.previewUrl)}`);
         if (dns.preview.isCorrect) {
@@ -284,7 +361,6 @@ async function runDnsStatus(cwd = process.cwd()) {
             console.log(`    DNS:    ${chalk_1.default.yellow("⚠ Not yet provisioned")}`);
             console.log(chalk_1.default.dim("    Run `clefbase hosting:dns:reprovision` to create the record."));
         }
-        // Custom domain
         if (dns.customDomain) {
             console.log();
             console.log(`  ${chalk_1.default.bold("Custom domain:")}`);
@@ -331,11 +407,6 @@ async function runDnsReprovision(cwd = process.cwd()) {
     console.log();
 }
 // ─── Helpers ──────────────────────────────────────────────────────────────────
-/**
- * Interactive site picker / creator.
- * Shows existing sites, allows creating a new one.
- * On creation: enforces uniqueness, shows preview URL.
- */
 async function pickOrCreateSite(cfg) {
     const sp = (0, ora_1.default)("Fetching sites…").start();
     let sites = [];
@@ -365,7 +436,6 @@ async function pickOrCreateSite(cfg) {
     }
     return createSiteInteractive(cfg);
 }
-/** Prompt for a new site name, handle conflict errors with retry. */
 async function createSiteInteractive(cfg) {
     while (true) {
         const { name } = await inquirer_1.default.prompt([{
@@ -384,11 +454,9 @@ async function createSiteInteractive(cfg) {
         }
         catch (err) {
             const message = err.message;
-            // 409 conflict — name already taken
             if (message.toLowerCase().includes("already exists") || message.includes("409")) {
                 s.fail(chalk_1.default.red(message));
                 console.log(chalk_1.default.dim("  Please choose a different name.\n"));
-                // Loop to prompt again
             }
             else {
                 s.fail(message);