@launchmatic/cli 0.6.5 → 0.7.1

package/dist/index.js

@@ -21863,6 +21863,83 @@ function readManifest(repoRoot = findRepoRoot()) {
 function writeManifest(manifest, repoRoot = findRepoRoot()) {
   writeFileSync3(manifestPath(repoRoot), JSON.stringify(manifest, null, 2) + "\n");
 }
+var COMPOSE_FILES = ["docker-compose.yml", "docker-compose.yaml", "compose.yml", "compose.yaml"];
+var INFRA_IMAGE_MATCHERS = [
+  { engine: "POSTGIS", pattern: /^(postgis\/postgis|imresamu\/postgis|.*\/postgis)$/i },
+  { engine: "POSTGRESQL", pattern: /^(library\/)?(postgres|postgresql)$/i },
+  { engine: "REDIS", pattern: /^(library\/)?(redis|valkey\/valkey)$/i },
+  { engine: "MONGODB", pattern: /^(library\/)?mongo(db)?$/i },
+  { engine: "MYSQL", pattern: /^(library\/)?(mysql|mariadb)$/i }
+];
+function matchInfraImage(image) {
+  const [imageRef, tag] = image.split(":");
+  const lastSlash = imageRef.lastIndexOf("/");
+  const namespace = lastSlash > 0 ? imageRef.slice(0, lastSlash) : "library";
+  const repo = lastSlash > 0 ? imageRef.slice(lastSlash + 1) : imageRef;
+  const candidate = `${namespace}/${repo}`;
+  for (const m of INFRA_IMAGE_MATCHERS) {
+    if (m.pattern.test(candidate) || m.pattern.test(repo)) {
+      const version = tag ? tag.replace(/-(alpine|bullseye|bookworm|slim|debian).*$/i, "") : void 0;
+      return { engine: m.engine, version };
+    }
+  }
+  return null;
+}
+function discoverInfra(repoRoot = findRepoRoot()) {
+  for (const file of COMPOSE_FILES) {
+    const full = join2(repoRoot, file);
+    if (!existsSync3(full)) continue;
+    try {
+      return parseComposeInfra(readFileSync3(full, "utf-8"));
+    } catch {
+      return [];
+    }
+  }
+  return [];
+}
+function parseComposeInfra(yaml) {
+  const lines = yaml.split(/\r?\n/);
+  const out = [];
+  let inServices = false;
+  let currentService = null;
+  let servicesIndent = -1;
+  for (const raw of lines) {
+    const line = raw.replace(/#.*$/, "").replace(/\s+$/, "");
+    if (!line.trim()) continue;
+    const indent = line.match(/^\s*/)?.[0].length ?? 0;
+    if (!inServices) {
+      if (/^services\s*:\s*$/.test(line)) {
+        inServices = true;
+        servicesIndent = indent;
+      }
+      continue;
+    }
+    if (indent <= servicesIndent && !/^\s*-/.test(line)) {
+      inServices = false;
+      currentService = null;
+      continue;
+    }
+    const isServiceName = /^\s*([A-Za-z0-9_-]+)\s*:\s*$/.test(line);
+    if (isServiceName && indent === servicesIndent + 2) {
+      currentService = line.trim().replace(/:$/, "");
+      continue;
+    }
+    if (currentService) {
+      const m = line.match(/^\s*image\s*:\s*['"]?([^'"\s]+)['"]?\s*$/);
+      if (m) {
+        const matched = matchInfraImage(m[1]);
+        if (matched) {
+          out.push({
+            name: currentService,
+            engine: matched.engine,
+            version: matched.version
+          });
+        }
+      }
+    }
+  }
+  return out;
+}
 function discoverServices(repoRoot = findRepoRoot()) {
   const globs = readWorkspaceGlobs(repoRoot);
   const dirs = /* @__PURE__ */ new Set();
@@ -26144,6 +26221,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();
@@ -26154,8 +26299,9 @@ async function initManifest(opts) {
     process.exitCode = 1;
     return;
   }
-  const spin = ora("Discovering services...").start();
-  const discovered = discoverServices(repoRoot);
+  const spin = ora("Discovering services and infra...").start();
+  let discovered = discoverServices(repoRoot);
+  let discoveredInfra = discoverInfra(repoRoot);
   spin.stop();
   if (discovered.length === 0) {
     console.error(source_default.red("No services discovered."));
@@ -26170,6 +26316,46 @@ Discovered ${discovered.length} service${discovered.length === 1 ? "" : "s"}:`))
     const fw = s.framework ? source_default.dim(` [${s.framework}]`) : "";
     console.log(`  ${source_default.cyan(s.name)}  ${source_default.dim(s.rootDir)}${fw}`);
   }
+  if (discoveredInfra.length > 0) {
+    console.log(source_default.bold(`
+Discovered ${discoveredInfra.length} infra dependenc${discoveredInfra.length === 1 ? "y" : "ies"} (from docker-compose):`));
+    for (const i of discoveredInfra) {
+      const v = i.version ? source_default.dim(` ${i.version}`) : "";
+      console.log(`  ${source_default.magenta(i.name)}  ${source_default.dim(i.engine)}${v}`);
+    }
+  }
+  if (!opts.yes) {
+    discovered = await reviewList(
+      `services`,
+      discovered,
+      (s) => `${source_default.cyan(s.name)}  ${source_default.dim(s.rootDir)}${s.framework ? source_default.dim(` [${s.framework}]`) : ""}`,
+      [
+        { key: "name", label: "name" },
+        { key: "rootDir", label: "rootDir" },
+        { 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."));
@@ -26270,15 +26456,76 @@ Discovered ${discovered.length} service${discovered.length === 1 ? "" : "s"}:`))
       port: s.port
     });
   }
+  const infra = [];
+  if (discoveredInfra.length > 0) {
+    const shouldProvision = opts.yes || (await prompt6(
+      `
+Provision ${discoveredInfra.length} database${discoveredInfra.length === 1 ? "" : "s"} on Launchmatic? [Y/n]: `
+    )).toLowerCase().replace(/^$/, "y").startsWith("y");
+    if (shouldProvision) {
+      const { data: existingDbs } = await api(`/api/databases?projectId=${projectId}`);
+      for (const inf of discoveredInfra) {
+        const dbName = `${projectSlug}-${inf.name}`.slice(0, 100);
+        const already = existingDbs.find(
+          (d) => d.name === dbName && d.engine === inf.engine
+        );
+        let databaseId = already?.id;
+        if (!databaseId) {
+          try {
+            const created = await api(
+              "/api/databases",
+              {
+                method: "POST",
+                body: JSON.stringify({
+                  name: dbName,
+                  engine: inf.engine,
+                  projectId,
+                  // version is optional — let the API pick the default if undefined
+                  ...inf.version ? { version: inf.version } : {}
+                })
+              }
+            );
+            databaseId = created.data.id;
+            console.log(source_default.green(`Provisioned ${source_default.bold(inf.engine)} ${source_default.dim(`(${dbName})`)}`));
+          } catch (err) {
+            console.warn(
+              source_default.yellow(
+                `Could not provision ${inf.name}: ${err instanceof Error ? err.message : String(err)}`
+              )
+            );
+          }
+        } else {
+          console.log(source_default.dim(`Using existing ${inf.engine} ${dbName}`));
+        }
+        infra.push({
+          name: inf.name,
+          engine: inf.engine,
+          ...inf.version ? { version: inf.version } : {},
+          ...databaseId ? { databaseId } : {}
+        });
+      }
+    } else {
+      for (const inf of discoveredInfra) {
+        infra.push({
+          name: inf.name,
+          engine: inf.engine,
+          ...inf.version ? { version: inf.version } : {}
+        });
+      }
+      console.log(source_default.dim("Skipped provisioning \u2014 entries recorded in manifest only."));
+    }
+  }
   const manifest = {
     version: 1,
     teamId,
     projectId,
-    services
+    services,
+    ...infra.length > 0 ? { infra } : {}
   };
   writeManifest(manifest, repoRoot);
   console.log();
-  console.log(source_default.green(`\u2713 Wrote ${source_default.bold(MANIFEST_FILE)} (${services.length} services)`));
+  const infraStr = infra.length > 0 ? `, ${infra.length} infra` : "";
+  console.log(source_default.green(`\u2713 Wrote ${source_default.bold(MANIFEST_FILE)} (${services.length} services${infraStr})`));
   console.log(source_default.dim("Next: ") + source_default.bold("lm up") + source_default.dim(" to deploy everything."));
 }
 async function listManifest() {
@@ -26294,6 +26541,15 @@ async function listManifest() {
     const sid = s.serviceId ? source_default.dim(` ${s.serviceId}`) : source_default.yellow(" (not yet created)");
     console.log(`  ${source_default.cyan(s.name.padEnd(16))} ${source_default.dim(s.rootDir)}${fw}${sid}`);
   }
+  if (manifest.infra && manifest.infra.length > 0) {
+    console.log(source_default.bold(`
+${manifest.infra.length} infra:`));
+    for (const i of manifest.infra) {
+      const ver = i.version ? source_default.dim(` ${i.version}`) : "";
+      const did = i.databaseId ? source_default.dim(` ${i.databaseId}`) : source_default.yellow(" (not yet provisioned)");
+      console.log(`  ${source_default.magenta(i.name.padEnd(16))} ${source_default.dim(i.engine)}${ver}${did}`);
+    }
+  }
 }
 async function up(opts) {
   if (!requireLogin3()) return;

package/package.json

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