@motherbase/cli 0.2.6 → 0.2.8

package/src/config.js

@@ -1,98 +1,98 @@
-'use strict';
-
-// Config persistence. Two files:
-//   Global creds : ~/.motherbase/config.json  (contains tokens; written 0o600)
-//     { "consoles": { "<url>": { "token": "...", "email": "..." } }, "current": "<url>" }
-//   Project link : ./.motherbase/config.json  (versionable, non-secret)
-//     { "consoleUrl": "<url>", "projectId": "abc", "projectName": "my-app" }
-
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-
-const GLOBAL_DIR = path.join(os.homedir(), '.motherbase');
-const GLOBAL_FILE = path.join(GLOBAL_DIR, 'config.json');
-const LINK_DIRNAME = '.motherbase';
-const LINK_BASENAME = 'config.json';
-
-function normalizeUrl(url) {
-  return String(url || '').replace(/\/+$/, '');
-}
-
-function readJson(file) {
-  try {
-    return JSON.parse(fs.readFileSync(file, 'utf8'));
-  } catch {
-    return null;
-  }
-}
-
-// ── Global credentials ───────────────────────────────────────────────────────
-
-function readGlobal() {
-  return readJson(GLOBAL_FILE) || { consoles: {}, current: null };
-}
-
-function writeGlobal(cfg) {
-  fs.mkdirSync(GLOBAL_DIR, { recursive: true });
-  fs.writeFileSync(GLOBAL_FILE, JSON.stringify(cfg, null, 2) + '\n', { mode: 0o600 });
-  // Best-effort tighten perms even if the file already existed with looser mode.
-  try { fs.chmodSync(GLOBAL_FILE, 0o600); } catch { /* windows / noop */ }
-}
-
-function saveConsoleToken(url, token, email) {
-  const u = normalizeUrl(url);
-  const cfg = readGlobal();
-  cfg.consoles = cfg.consoles || {};
-  cfg.consoles[u] = { ...(cfg.consoles[u] || {}), token, email };
-  cfg.current = u;
-  writeGlobal(cfg);
-  return u;
-}
-
-function clearConsoleToken(url) {
-  const cfg = readGlobal();
-  const u = normalizeUrl(url);
-  if (cfg.consoles && cfg.consoles[u]) delete cfg.consoles[u];
-  if (cfg.current === u) cfg.current = null;
-  writeGlobal(cfg);
-}
-
-function consoleEntry(url) {
-  const cfg = readGlobal();
-  return (cfg.consoles && cfg.consoles[normalizeUrl(url)]) || null;
-}
-
-// ── Per-project link ─────────────────────────────────────────────────────────
-
-function linkPath(cwd) {
-  return path.join(cwd || process.cwd(), LINK_DIRNAME, LINK_BASENAME);
-}
-
-function readLink(cwd) {
-  return readJson(linkPath(cwd));
-}
-
-function writeLink(cwd, data) {
-  const dir = path.join(cwd || process.cwd(), LINK_DIRNAME);
-  fs.mkdirSync(dir, { recursive: true });
-  fs.writeFileSync(linkPath(cwd), JSON.stringify(data, null, 2) + '\n');
-}
-
-function removeLink(cwd) {
-  try { fs.unlinkSync(linkPath(cwd)); return true; } catch { return false; }
-}
-
-module.exports = {
-  GLOBAL_FILE,
-  normalizeUrl,
-  readGlobal,
-  writeGlobal,
-  saveConsoleToken,
-  clearConsoleToken,
-  consoleEntry,
-  readLink,
-  writeLink,
-  removeLink,
-  linkPath,
-};
+'use strict';
+
+// Config persistence. Two files:
+//   Global creds : ~/.motherbase/config.json  (contains tokens; written 0o600)
+//     { "consoles": { "<url>": { "token": "...", "email": "..." } }, "current": "<url>" }
+//   Project link : ./.motherbase/config.json  (versionable, non-secret)
+//     { "consoleUrl": "<url>", "projectId": "abc", "projectName": "my-app" }
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+
+const GLOBAL_DIR = path.join(os.homedir(), '.motherbase');
+const GLOBAL_FILE = path.join(GLOBAL_DIR, 'config.json');
+const LINK_DIRNAME = '.motherbase';
+const LINK_BASENAME = 'config.json';
+
+function normalizeUrl(url) {
+  return String(url || '').replace(/\/+$/, '');
+}
+
+function readJson(file) {
+  try {
+    return JSON.parse(fs.readFileSync(file, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+// ── Global credentials ───────────────────────────────────────────────────────
+
+function readGlobal() {
+  return readJson(GLOBAL_FILE) || { consoles: {}, current: null };
+}
+
+function writeGlobal(cfg) {
+  fs.mkdirSync(GLOBAL_DIR, { recursive: true });
+  fs.writeFileSync(GLOBAL_FILE, JSON.stringify(cfg, null, 2) + '\n', { mode: 0o600 });
+  // Best-effort tighten perms even if the file already existed with looser mode.
+  try { fs.chmodSync(GLOBAL_FILE, 0o600); } catch { /* windows / noop */ }
+}
+
+function saveConsoleToken(url, token, email) {
+  const u = normalizeUrl(url);
+  const cfg = readGlobal();
+  cfg.consoles = cfg.consoles || {};
+  cfg.consoles[u] = { ...(cfg.consoles[u] || {}), token, email };
+  cfg.current = u;
+  writeGlobal(cfg);
+  return u;
+}
+
+function clearConsoleToken(url) {
+  const cfg = readGlobal();
+  const u = normalizeUrl(url);
+  if (cfg.consoles && cfg.consoles[u]) delete cfg.consoles[u];
+  if (cfg.current === u) cfg.current = null;
+  writeGlobal(cfg);
+}
+
+function consoleEntry(url) {
+  const cfg = readGlobal();
+  return (cfg.consoles && cfg.consoles[normalizeUrl(url)]) || null;
+}
+
+// ── Per-project link ─────────────────────────────────────────────────────────
+
+function linkPath(cwd) {
+  return path.join(cwd || process.cwd(), LINK_DIRNAME, LINK_BASENAME);
+}
+
+function readLink(cwd) {
+  return readJson(linkPath(cwd));
+}
+
+function writeLink(cwd, data) {
+  const dir = path.join(cwd || process.cwd(), LINK_DIRNAME);
+  fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(linkPath(cwd), JSON.stringify(data, null, 2) + '\n');
+}
+
+function removeLink(cwd) {
+  try { fs.unlinkSync(linkPath(cwd)); return true; } catch { return false; }
+}
+
+module.exports = {
+  GLOBAL_FILE,
+  normalizeUrl,
+  readGlobal,
+  writeGlobal,
+  saveConsoleToken,
+  clearConsoleToken,
+  consoleEntry,
+  readLink,
+  writeLink,
+  removeLink,
+  linkPath,
+};

package/src/context.js

@@ -1,106 +1,106 @@
-'use strict';
-
-// Resolve the runtime context: which console, which token, which project, and
-// whether we talk through the Console proxy ('console' mode) or straight at a
-// single project API ('direct' mode). Precedence everywhere: flags > env > config.
-//
-// Resolution is LAZY: building a context never throws, so commands that need no
-// project (login, local docker, init) work with zero configuration. The
-// require*() helpers throw a clear, actionable error only when a value is
-// actually needed and missing.
-
-const config = require('./config');
-
-class CliError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'CliError';
-    this.isCliError = true;
-  }
-}
-
-function firstDefined(...vals) {
-  for (const v of vals) if (v !== undefined && v !== null && v !== '') return v;
-  return undefined;
-}
-
-function createContext(flags = {}, env = process.env, cwd = process.cwd()) {
-  const link = config.readLink(cwd) || {};
-  const global = config.readGlobal();
-
-  const consoleUrl = firstDefined(
-    flags.url,
-    env.MOTHERBASE_CONSOLE_URL,
-    link.consoleUrl,
-    global.current,
-  );
-  const normConsoleUrl = consoleUrl ? config.normalizeUrl(consoleUrl) : undefined;
-
-  // The link file is committed to the repo, so a URL that came only from it is
-  // not trusted with a token the user supplied for some other console.
-  const urlFromLinkOnly = !firstDefined(flags.url, env.MOTHERBASE_CONSOLE_URL) && Boolean(link.consoleUrl);
-
-  const token = firstDefined(
-    urlFromLinkOnly ? undefined : flags.token,
-    urlFromLinkOnly ? undefined : env.MOTHERBASE_TOKEN,
-    normConsoleUrl ? (config.consoleEntry(normConsoleUrl) || {}).token : undefined,
-  );
-
-  const projectId = firstDefined(flags.project, env.MOTHERBASE_PROJECT, link.projectId);
-  const projectName = firstDefined(link.projectName, projectId);
-
-  // Direct project mode: an admin JWT pointed straight at one project API. Only
-  // used as a fallback when there is no console link/flags to route through.
-  const directUrl = env.MOTHERBASE_URL ? config.normalizeUrl(env.MOTHERBASE_URL) : undefined;
-  const directToken = env.MOTHERBASE_ADMIN_TOKEN;
-  const hasConsole = Boolean(normConsoleUrl && token);
-  const hasProjectLink = Boolean(projectId);
-  const preferDirect = Boolean(directUrl && directToken) && !(hasConsole && hasProjectLink);
-  const mode = preferDirect ? 'direct' : 'console';
-
-  return {
-    flags,
-    env,
-    cwd,
-    mode,
-    consoleUrl: normConsoleUrl,
-    token,
-    projectId,
-    projectName,
-    directUrl,
-    directToken,
-    linkedConsoleUrl: link.consoleUrl,
-    accountEmail: normConsoleUrl ? (config.consoleEntry(normConsoleUrl) || {}).email : undefined,
-
-    // Console (account / multi-project) requests need URL + session token.
-    requireConsole() {
-      if (!this.consoleUrl) {
-        throw new CliError('No console URL. Run `motherbase login --url <consoleUrl>` or set MOTHERBASE_CONSOLE_URL.');
-      }
-      if (!this.token) {
-        throw new CliError('Not logged in. Run `motherbase login` or set MOTHERBASE_TOKEN.');
-      }
-      return { consoleUrl: this.consoleUrl, token: this.token };
-    },
-
-    // Admin/resource requests: resolve either the console proxy path or a direct
-    // project API, whichever the context selected.
-    requireProject() {
-      if (this.mode === 'direct') {
-        return { mode: 'direct', baseUrl: this.directUrl, token: this.directToken };
-      }
-      this.requireConsole();
-      if (!this.projectId) {
-        throw new CliError('No project linked. Run `motherbase link` or set MOTHERBASE_PROJECT (or use direct mode via MOTHERBASE_URL + MOTHERBASE_ADMIN_TOKEN).');
-      }
-      return {
-        mode: 'console',
-        consoleUrl: this.consoleUrl,
-        token: this.token,
-        projectId: this.projectId,
-      };
-    },
-  };
-}
-
-module.exports = { createContext, CliError };
+'use strict';
+
+// Resolve the runtime context: which console, which token, which project, and
+// whether we talk through the Console proxy ('console' mode) or straight at a
+// single project API ('direct' mode). Precedence everywhere: flags > env > config.
+//
+// Resolution is LAZY: building a context never throws, so commands that need no
+// project (login, local docker, init) work with zero configuration. The
+// require*() helpers throw a clear, actionable error only when a value is
+// actually needed and missing.
+
+const config = require('./config');
+
+class CliError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'CliError';
+    this.isCliError = true;
+  }
+}
+
+function firstDefined(...vals) {
+  for (const v of vals) if (v !== undefined && v !== null && v !== '') return v;
+  return undefined;
+}
+
+function createContext(flags = {}, env = process.env, cwd = process.cwd()) {
+  const link = config.readLink(cwd) || {};
+  const global = config.readGlobal();
+
+  const consoleUrl = firstDefined(
+    flags.url,
+    env.MOTHERBASE_CONSOLE_URL,
+    link.consoleUrl,
+    global.current,
+  );
+  const normConsoleUrl = consoleUrl ? config.normalizeUrl(consoleUrl) : undefined;
+
+  // The link file is committed to the repo, so a URL that came only from it is
+  // not trusted with a token the user supplied for some other console.
+  const urlFromLinkOnly = !firstDefined(flags.url, env.MOTHERBASE_CONSOLE_URL) && Boolean(link.consoleUrl);
+
+  const token = firstDefined(
+    urlFromLinkOnly ? undefined : flags.token,
+    urlFromLinkOnly ? undefined : env.MOTHERBASE_TOKEN,
+    normConsoleUrl ? (config.consoleEntry(normConsoleUrl) || {}).token : undefined,
+  );
+
+  const projectId = firstDefined(flags.project, env.MOTHERBASE_PROJECT, link.projectId);
+  const projectName = firstDefined(link.projectName, projectId);
+
+  // Direct project mode: an admin JWT pointed straight at one project API. Only
+  // used as a fallback when there is no console link/flags to route through.
+  const directUrl = env.MOTHERBASE_URL ? config.normalizeUrl(env.MOTHERBASE_URL) : undefined;
+  const directToken = env.MOTHERBASE_ADMIN_TOKEN;
+  const hasConsole = Boolean(normConsoleUrl && token);
+  const hasProjectLink = Boolean(projectId);
+  const preferDirect = Boolean(directUrl && directToken) && !(hasConsole && hasProjectLink);
+  const mode = preferDirect ? 'direct' : 'console';
+
+  return {
+    flags,
+    env,
+    cwd,
+    mode,
+    consoleUrl: normConsoleUrl,
+    token,
+    projectId,
+    projectName,
+    directUrl,
+    directToken,
+    linkedConsoleUrl: link.consoleUrl,
+    accountEmail: normConsoleUrl ? (config.consoleEntry(normConsoleUrl) || {}).email : undefined,
+
+    // Console (account / multi-project) requests need URL + session token.
+    requireConsole() {
+      if (!this.consoleUrl) {
+        throw new CliError('No console URL. Run `motherbase login --url <consoleUrl>` or set MOTHERBASE_CONSOLE_URL.');
+      }
+      if (!this.token) {
+        throw new CliError('Not logged in. Run `motherbase login` or set MOTHERBASE_TOKEN.');
+      }
+      return { consoleUrl: this.consoleUrl, token: this.token };
+    },
+
+    // Admin/resource requests: resolve either the console proxy path or a direct
+    // project API, whichever the context selected.
+    requireProject() {
+      if (this.mode === 'direct') {
+        return { mode: 'direct', baseUrl: this.directUrl, token: this.directToken };
+      }
+      this.requireConsole();
+      if (!this.projectId) {
+        throw new CliError('No project linked. Run `motherbase link` or set MOTHERBASE_PROJECT (or use direct mode via MOTHERBASE_URL + MOTHERBASE_ADMIN_TOKEN).');
+      }
+      return {
+        mode: 'console',
+        consoleUrl: this.consoleUrl,
+        token: this.token,
+        projectId: this.projectId,
+      };
+    },
+  };
+}
+
+module.exports = { createContext, CliError };