@omg-dev/cli 0.4.31 → 0.4.32

package/dist/omg.mjs

@@ -2,8 +2,8 @@
 // @bun
 
 // src/index.ts
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, mkdirSync as mkdirSync3 } from "fs";
-import { join as join5, resolve as resolve3, basename, dirname as dirname3 } from "path";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync5, mkdirSync as mkdirSync3 } from "fs";
+import { join as join6, resolve as resolve3, basename, dirname as dirname3 } from "path";
 
 // src/config.ts
 import { homedir } from "os";
@@ -446,6 +446,30 @@ function getStatus(token, slug) {
 function listApps(token) {
   return controlPlane("/api/cli/apps/list", token);
 }
+function envList(token, slug) {
+  return controlPlane(`/api/cli/env/list?slug=${encodeURIComponent(slug)}`, token);
+}
+function envPull(token, slug) {
+  return controlPlane(`/api/cli/env/pull?slug=${encodeURIComponent(slug)}`, token);
+}
+function envSet(token, slug, vars) {
+  return controlPlane("/api/cli/env/set", token, {
+    method: "POST",
+    body: JSON.stringify({ slug, vars })
+  });
+}
+function envRemove(token, slug, keys) {
+  return controlPlane("/api/cli/env/rm", token, {
+    method: "POST",
+    body: JSON.stringify({ slug, keys })
+  });
+}
+function envImport(token, slug, contents) {
+  return controlPlane("/api/cli/env/import", token, {
+    method: "POST",
+    body: JSON.stringify({ slug, contents })
+  });
+}
 function getComputerConnectConfig(token) {
   return controlPlane("/api/cli/computer/connect", token);
 }
@@ -654,7 +678,7 @@ async function deploy(opts) {
   if (collected.files.length === 0)
     throw new Error(`No files to deploy in ${root}`);
   for (const s of collected.skippedSecrets) {
-    onProgress(`skipping ${s} \u2014 set secrets in project settings, not the artifact`);
+    onProgress(`skipping ${s} \u2014 import it with \`omg env push --file ${s}\``);
   }
   for (const s of collected.skippedLarge)
     onProgress(`skipping ${s} \u2014 over the per-file limit`);
@@ -1306,6 +1330,145 @@ async function runDev(options) {
   }
 }
 
+// src/env.ts
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, existsSync as existsSync2 } from "fs";
+import { join as join5 } from "path";
+async function defaultReadStdin() {
+  const chunks = [];
+  for await (const chunk of process.stdin)
+    chunks.push(chunk);
+  return Buffer.concat(chunks).toString("utf8");
+}
+function formatList(vars, out) {
+  if (!vars.length) {
+    out("No env vars set.");
+    out("");
+    out("  omg env set KEY=value      set one");
+    out("  omg env push --file .env   import a local .env");
+    return;
+  }
+  const width = Math.max(...vars.map((v) => v.key.length));
+  for (const v of vars)
+    out(`  ${v.key.padEnd(width)}  ${v.preview}`);
+}
+async function collectAssignments(args, readStdin) {
+  const vars = {};
+  for (let i = 0;i < args.length; i++) {
+    const arg = args[i];
+    const eq = arg.indexOf("=");
+    if (eq > 0) {
+      vars[arg.slice(0, eq)] = arg.slice(eq + 1);
+      continue;
+    }
+    if (args[i + 1] === "-") {
+      vars[arg] = (await readStdin()).replace(/\n$/, "");
+      i++;
+      continue;
+    }
+    throw new Error(`Expected KEY=value (or \`${arg} -\` to read the value from stdin), got "${arg}"`);
+  }
+  return vars;
+}
+function toDotenv(env) {
+  return Object.keys(env).sort().map((k) => {
+    const v = env[k] ?? "";
+    const needsQuotes = /[\s"'#$`\\]/.test(v) || v === "";
+    return `${k}=${needsQuotes ? JSON.stringify(v) : v}`;
+  }).join(`
+`) + `
+`;
+}
+async function runEnv(opts) {
+  const { args, slug, token, root, flag, out } = opts;
+  const readStdin = opts.readStdin ?? defaultReadStdin;
+  const sub = args[0] ?? "list";
+  const rest = args.slice(1);
+  switch (sub) {
+    case "list":
+    case "ls": {
+      const { vars } = await envList(token, slug);
+      formatList(vars, out);
+      return 0;
+    }
+    case "set": {
+      if (!rest.length) {
+        out("Usage: omg env set KEY=value [KEY2=value2 ...]");
+        out("       omg env set KEY -            read the value from stdin");
+        return 1;
+      }
+      const vars = await collectAssignments(rest, readStdin);
+      const res = await envSet(token, slug, vars);
+      for (const k of res.created)
+        out(`  + ${k}`);
+      for (const k of res.updated)
+        out(`  ~ ${k} (updated)`);
+      out("");
+      out("Applies on next `omg deploy`.");
+      return 0;
+    }
+    case "rm":
+    case "remove":
+    case "unset": {
+      if (!rest.length) {
+        out("Usage: omg env rm KEY [KEY2 ...]");
+        return 1;
+      }
+      const res = await envRemove(token, slug, rest);
+      for (const k of res.removed)
+        out(`  - ${k}`);
+      for (const k of res.missing)
+        out(`  ? ${k} was not set`);
+      if (res.removed.length) {
+        out("");
+        out("Applies on next `omg deploy`.");
+      }
+      return res.removed.length === 0 && res.missing.length ? 1 : 0;
+    }
+    case "pull": {
+      const target = join5(root, flag("out") ?? ".env");
+      if (existsSync2(target) && !args.includes("--force")) {
+        out(`${target} already exists. Re-run with --force to overwrite.`);
+        return 1;
+      }
+      const { env } = await envPull(token, slug);
+      const keys = Object.keys(env);
+      if (!keys.length) {
+        out(`No env vars set for ${slug} \u2014 nothing to pull.`);
+        return 0;
+      }
+      writeFileSync4(target, toDotenv(env), { mode: 384 });
+      out(`Wrote ${keys.length} var${keys.length === 1 ? "" : "s"} to ${target}`);
+      out("Add it to .gitignore \u2014 it holds real secrets.");
+      return 0;
+    }
+    case "push":
+    case "import": {
+      const source = join5(root, flag("file") ?? ".env");
+      if (!existsSync2(source)) {
+        out(`No file at ${source}. Point at one with --file <path>.`);
+        return 1;
+      }
+      const res = await envImport(token, slug, readFileSync4(source, "utf8"));
+      for (const k of res.created)
+        out(`  + ${k}`);
+      for (const k of res.updated)
+        out(`  ~ ${k} (updated)`);
+      out("");
+      out("Applies on next `omg deploy`.");
+      return 0;
+    }
+    default:
+      out(`Unknown: omg env ${sub}`);
+      out("");
+      out("  omg env                      list (masked)");
+      out("  omg env set KEY=value        set one or many");
+      out("  omg env rm KEY               remove");
+      out("  omg env pull [--out .env]    write real values locally");
+      out("  omg env push [--file .env]   import a local .env");
+      return 1;
+  }
+}
+
 // src/index.ts
 var argv = process.argv.slice(2);
 var cmd = argv[0] ?? "help";
@@ -1319,15 +1482,15 @@ var out = (msg = "") => process.stdout.write(msg + `
 var step = (msg) => out(`  ${msg}`);
 function readLink(root) {
   try {
-    return JSON.parse(readFileSync4(join5(root, LINK_FILE), "utf8"));
+    return JSON.parse(readFileSync5(join6(root, LINK_FILE), "utf8"));
   } catch {
     return null;
   }
 }
 function writeLink(root, link) {
-  const path = join5(root, LINK_FILE);
+  const path = join6(root, LINK_FILE);
   mkdirSync3(dirname3(path), { recursive: true });
-  writeFileSync4(path, JSON.stringify(link, null, 2) + `
+  writeFileSync5(path, JSON.stringify(link, null, 2) + `
 `);
 }
 var HELP = `omg \u2014 deploy a local project to omg.dev
@@ -1335,6 +1498,11 @@ var HELP = `omg \u2014 deploy a local project to omg.dev
   omg create <name> [--no-install]
   omg deploy [--name <name>] [--dir <path>] [--no-wait]
   omg status [--dir <path>]
+  omg env                                    list env vars (masked)
+  omg env set KEY=value [KEY2=v2 ...]        set (KEY - reads stdin)
+  omg env rm KEY [KEY2 ...]                  remove
+  omg env pull [--out .env] [--force]        write real values locally
+  omg env push [--file .env]                 import a local .env
   omg link <slug> [--dir <path>]
   omg login [--token <omg_sk_...>]
   omg logout
@@ -1435,6 +1603,15 @@ async function main() {
       out(`${link.slug}: ${status}`);
       return 0;
     }
+    case "env": {
+      const token = await requireToken();
+      const link = readLink(root);
+      if (!link?.slug) {
+        out("Not linked to an app. Run `omg deploy` or `omg link <slug>` first.");
+        return 1;
+      }
+      return runEnv({ args: argv.slice(1), slug: link.slug, token, root, flag, out });
+    }
     case "deploy": {
       const token = await requireToken();
       const link = readLink(root);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omg-dev/cli",
-  "version": "0.4.31",
+  "version": "0.4.32",
   "description": "Deploy and develop omg apps from your terminal.",
   "type": "module",
   "bin": {