@launchmatic/cli 0.7.0 → 0.7.2

package/dist/index.js

@@ -21963,13 +21963,16 @@ function discoverServices(repoRoot = findRepoRoot()) {
   for (const absDir of dirs) {
     if (!isLikelyDeployable(absDir)) continue;
     const detection = detectLocal(absDir);
+    const rootDir = toPosix(relative(repoRoot, absDir));
+    const dockerfile = existsSync3(join2(absDir, "Dockerfile")) ? `${rootDir}/Dockerfile` : void 0;
     out.push({
       name: deriveName(repoRoot, absDir),
-      rootDir: toPosix(relative(repoRoot, absDir)),
+      rootDir,
       framework: detection.framework,
       buildCmd: detection.buildCmd,
       startCmd: detection.startCmd,
-      port: detection.port
+      port: detection.port,
+      ...dockerfile ? { dockerfile } : {}
     });
   }
   out.sort((a, b) => a.rootDir.localeCompare(b.rootDir));
@@ -26221,6 +26224,74 @@ function prompt6(question) {
     });
   });
 }
+function parseIndices(spec, max) {
+  const out = /* @__PURE__ */ new Set();
+  for (const token of spec.split(",").map((s) => s.trim()).filter(Boolean)) {
+    const range = token.match(/^(\d+)-(\d+)$/);
+    if (range) {
+      const lo = parseInt(range[1], 10) - 1;
+      const hi = parseInt(range[2], 10) - 1;
+      if (lo >= 0 && hi < max && lo <= hi) {
+        for (let i = lo; i <= hi; i++) out.add(i);
+      }
+      continue;
+    }
+    const n = parseInt(token, 10);
+    if (Number.isFinite(n) && n >= 1 && n <= max) out.add(n - 1);
+  }
+  return [...out].sort((a, b) => a - b);
+}
+async function reviewList(label, items, render, editable) {
+  if (items.length === 0) return items;
+  let current = [...items];
+  for (let round = 0; round < 5; round++) {
+    console.log();
+    console.log(source_default.bold(`Review ${label}:`));
+    current.forEach((item, i) => {
+      console.log(`  ${source_default.dim(String(i + 1).padStart(2))}. ${render(item)}`);
+    });
+    const action = (await prompt6(
+      `Action \u2014 [Enter] accept, [r] remove, [e] edit, [a] add? `
+    )).toLowerCase();
+    if (!action || action === "a" && current.length === items.length) {
+      if (!action) break;
+    }
+    if (action === "r") {
+      const spec = await prompt6("Indices to remove (e.g. 1,3-4): ");
+      const drop = new Set(parseIndices(spec, current.length));
+      if (drop.size > 0) {
+        current = current.filter((_, i) => !drop.has(i));
+        console.log(source_default.dim(`Removed ${drop.size} item${drop.size === 1 ? "" : "s"}.`));
+      }
+      continue;
+    }
+    if (action === "e") {
+      const spec = await prompt6("Indices to edit (e.g. 2): ");
+      const editIdx = parseIndices(spec, current.length);
+      for (const idx of editIdx) {
+        const item = { ...current[idx] };
+        console.log(source_default.dim(`
+Editing ${render(item)}`));
+        for (const field of editable) {
+          const cur = item[field.key];
+          const display = cur === void 0 || cur === null ? source_default.dim("unset") : source_default.cyan(String(cur));
+          const ans = await prompt6(`  ${field.label} [${display}]: `);
+          if (ans) {
+            if (field.numeric) {
+              const n = parseInt(ans, 10);
+              if (Number.isFinite(n)) item[field.key] = n;
+            } else {
+              item[field.key] = ans;
+            }
+          }
+        }
+        current[idx] = item;
+      }
+      continue;
+    }
+  }
+  return current;
+}
 async function initManifest(opts) {
   if (!requireLogin3()) return;
   const repoRoot = findRepoRoot();
@@ -26232,8 +26303,8 @@ async function initManifest(opts) {
     return;
   }
   const spin = ora("Discovering services and infra...").start();
-  const discovered = discoverServices(repoRoot);
-  const discoveredInfra = discoverInfra(repoRoot);
+  let discovered = discoverServices(repoRoot);
+  let discoveredInfra = discoverInfra(repoRoot);
   spin.stop();
   if (discovered.length === 0) {
     console.error(source_default.red("No services discovered."));
@@ -26256,6 +26327,43 @@ Discovered ${discoveredInfra.length} infra dependenc${discoveredInfra.length ===
       console.log(`  ${source_default.magenta(i.name)}  ${source_default.dim(i.engine)}${v}`);
     }
   }
+  if (!opts.yes) {
+    discovered = await reviewList(
+      `services`,
+      discovered,
+      (s) => {
+        const fw = s.framework ? source_default.dim(` [${s.framework}]`) : "";
+        const df = s.dockerfile ? source_default.dim(` Dockerfile=${s.dockerfile}`) : "";
+        return `${source_default.cyan(s.name)}  ${source_default.dim(s.rootDir)}${fw}${df}`;
+      },
+      [
+        { key: "name", label: "name" },
+        { key: "rootDir", label: "rootDir" },
+        { key: "dockerfile", label: "dockerfile (path from repo root)" },
+        { key: "framework", label: "framework" },
+        { key: "buildCmd", label: "buildCmd" },
+        { key: "startCmd", label: "startCmd" },
+        { key: "port", label: "port", numeric: true }
+      ]
+    );
+    if (discovered.length === 0) {
+      console.error(source_default.red("All services removed. Nothing to create."));
+      process.exitCode = 1;
+      return;
+    }
+    if (discoveredInfra.length > 0) {
+      discoveredInfra = await reviewList(
+        `infra`,
+        discoveredInfra,
+        (i) => `${source_default.magenta(i.name)}  ${source_default.dim(i.engine)}${i.version ? source_default.dim(` ${i.version}`) : ""}`,
+        [
+          { key: "name", label: "name" },
+          { key: "engine", label: "engine (POSTGRESQL/POSTGIS/REDIS/MONGODB/MYSQL)" },
+          { key: "version", label: "version" }
+        ]
+      );
+    }
+  }
   const { data: teams } = await api("/api/teams");
   if (!teams || teams.length === 0) {
     console.error(source_default.red("No teams found on your account."));
@@ -26326,6 +26434,7 @@ Discovered ${discoveredInfra.length} infra dependenc${discoveredInfra.length ===
       if (s.framework) payload.framework = s.framework;
       if (s.buildCmd) payload.buildCmd = s.buildCmd;
       if (s.startCmd) payload.startCmd = s.startCmd;
+      if (s.dockerfile) payload.dockerfilePath = s.dockerfile;
       if (gitInfo.repoOwner && gitInfo.repoName) {
         payload.repoOwner = gitInfo.repoOwner;
         payload.repoName = gitInfo.repoName;
@@ -26353,7 +26462,8 @@ Discovered ${discoveredInfra.length} infra dependenc${discoveredInfra.length ===
       framework: s.framework,
       buildCmd: s.buildCmd,
       startCmd: s.startCmd,
-      port: s.port
+      port: s.port,
+      ...s.dockerfile ? { dockerfile: s.dockerfile } : {}
     });
   }
   const infra = [];
@@ -26512,6 +26622,20 @@ async function up(opts) {
   console.log();
   const results = await Promise.allSettled(
     selected.map(async ({ entry }) => {
+      const patch = {};
+      if (entry.dockerfile !== void 0) patch.dockerfilePath = entry.dockerfile || null;
+      if (entry.rootDir) patch.rootDir = `/${entry.rootDir.replace(/^\/+/, "")}`;
+      if (entry.buildCmd) patch.buildCmd = entry.buildCmd;
+      if (entry.startCmd) patch.startCmd = entry.startCmd;
+      if (Object.keys(patch).length > 0) {
+        try {
+          await api(`/api/services/${entry.serviceId}`, {
+            method: "PATCH",
+            body: JSON.stringify(patch)
+          });
+        } catch {
+        }
+      }
       const res = await api("/api/deployments", {
         method: "POST",
         body: JSON.stringify({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@launchmatic/cli",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Launchmatic CLI — deploy from your terminal",
   "private": false,
   "type": "module",