convex 1.48.0 → 1.49.0-alpha.0

package/dist/cjs/cli/lib/accounts.js

@@ -0,0 +1,334 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var accounts_exports = {};
+__export(accounts_exports, {
+  accountConfigPath: () => accountConfigPath,
+  findAccountDirectory: () => findAccountDirectory,
+  getAccountSelection: () => getAccountSelection,
+  initializeDefaultAccount: () => initializeDefaultAccount,
+  legacyAuthForFirstAccount: () => legacyAuthForFirstAccount,
+  readAccountAuth: () => readAccountAuth,
+  readAccountCredentials: () => readAccountCredentials,
+  readAccountSettings: () => readAccountSettings,
+  readAccountToken: () => readAccountToken,
+  savedAccountNames: () => savedAccountNames,
+  updateAccountSettings: () => updateAccountSettings,
+  validateAccountName: () => validateAccountName,
+  writeAccountCredentials: () => writeAccountCredentials,
+  writeAccountDirectory: () => writeAccountDirectory
+});
+module.exports = __toCommonJS(accounts_exports);
+var import_path = __toESM(require("path"), 1);
+var import_util = require("util");
+var import_crypto = require("crypto");
+var dotenv = __toESM(require("dotenv"), 1);
+var import_zod = require("zod");
+var import_log = require("../../bundler/log.js");
+var import_globalConfig = require("./utils/globalConfig.js");
+var import_utils = require("./utils/utils.js");
+var import_envvars = require("./envvars.js");
+const settingsSchema = import_zod.z.object({
+  defaultAccount: import_zod.z.string().optional(),
+  directories: import_zod.z.record(import_zod.z.string()).optional(),
+  revokeReplacedTokens: import_zod.z.boolean().optional()
+}).passthrough();
+const credentialsSchema = import_zod.z.object({
+  accessToken: import_zod.z.string().min(1),
+  memberId: import_zod.z.string().optional(),
+  email: import_zod.z.string().optional()
+}).passthrough();
+async function readAccountSettings(ctx) {
+  if (!ctx.fs.exists((0, import_globalConfig.globalConfigPath)())) return {};
+  try {
+    return settingsSchema.parse(
+      JSON.parse(ctx.fs.readUtf8File((0, import_globalConfig.globalConfigPath)()))
+    );
+  } catch {
+    return await ctx.crash({
+      exitCode: 1,
+      errorType: "invalid filesystem data",
+      printedMessage: `Unable to read account settings from ${(0, import_globalConfig.globalConfigPath)()}. Check defaultAccount, directories, and revokeReplacedTokens.`
+    });
+  }
+}
+function writeAccountSettings(ctx, settings) {
+  if (Object.keys(settings).length === 0) {
+    if (ctx.fs.exists((0, import_globalConfig.globalConfigPath)())) ctx.fs.unlink((0, import_globalConfig.globalConfigPath)());
+    return;
+  }
+  const temporary = `${(0, import_globalConfig.globalConfigPath)()}.${(0, import_crypto.randomUUID)()}.tmp`;
+  try {
+    ctx.fs.writeUtf8File(temporary, JSON.stringify(settings, null, 2), 384);
+    ctx.fs.swapTmpFile(temporary, (0, import_globalConfig.globalConfigPath)());
+  } finally {
+    if (ctx.fs.exists(temporary)) ctx.fs.unlink(temporary);
+  }
+}
+async function updateAccountSettings(ctx, update, afterWrite) {
+  const lockPath = `${(0, import_globalConfig.globalConfigPath)()}.lock`;
+  ctx.fs.mkdir((0, import_utils.rootDirectory)(), { allowExisting: true });
+  const deadline = Date.now() + 5e3;
+  for (; ; ) {
+    try {
+      ctx.fs.mkdir(lockPath);
+      break;
+    } catch (err) {
+      if (err.code !== "EEXIST") throw err;
+      if (Date.now() >= deadline) {
+        return await ctx.crash({
+          exitCode: 1,
+          errorType: "fatal",
+          printedMessage: `Another command is updating Convex accounts. Retry after it finishes. If it was interrupted, remove ${lockPath}.`
+        });
+      }
+      await new Promise((resolve) => setTimeout(resolve, 25));
+    }
+  }
+  let released = false;
+  const release = () => {
+    if (released) return;
+    ctx.fs.rmdir(lockPath);
+    released = true;
+  };
+  const cleanup = ctx.registerCleanup(async () => release());
+  try {
+    const settings = await readAccountSettings(ctx);
+    const result = await update(settings);
+    writeAccountSettings(ctx, settings);
+    afterWrite?.();
+    return result;
+  } finally {
+    ctx.removeCleanup(cleanup);
+    release();
+  }
+}
+function accountConfigPath(name) {
+  return import_path.default.join(
+    (0, import_utils.rootDirectory)(),
+    "accounts",
+    `${encodeURIComponent(name)}.json`
+  );
+}
+async function validateAccountName(ctx, name) {
+  if (!/^[a-z0-9][a-z0-9_-]*$/.test(name)) {
+    await ctx.crash({
+      exitCode: 1,
+      errorType: "invalid filesystem or env vars",
+      printedMessage: "Account names must start with a lowercase letter or number and contain only lowercase letters, numbers, hyphens, and underscores."
+    });
+  }
+}
+async function getAccountSelection(ctx, options = {}) {
+  let name = options.name;
+  let source = "--account";
+  if (name === void 0 && process.env[import_envvars.CONVEX_ACCOUNT_ENV_VAR] !== void 0) {
+    name = process.env[import_envvars.CONVEX_ACCOUNT_ENV_VAR];
+    source = `${import_envvars.CONVEX_ACCOUNT_ENV_VAR} environment variable`;
+  }
+  if (name === void 0) {
+    const files = options.envFile ? [options.envFile] : [import_utils.ENV_VAR_FILE_PATH, ".env"];
+    for (const file of files) {
+      if (!ctx.fs.exists(file)) continue;
+      name = dotenv.parse(ctx.fs.readUtf8File(file))[import_envvars.CONVEX_ACCOUNT_ENV_VAR];
+      if (name !== void 0) {
+        source = `${import_envvars.CONVEX_ACCOUNT_ENV_VAR} in ${file}`;
+        break;
+      }
+    }
+  }
+  if (name === void 0) {
+    const config = await readAccountSettings(ctx);
+    const binding = findAccountDirectory(
+      config.directories ?? {},
+      process.cwd()
+    );
+    name = binding?.name ?? config.defaultAccount;
+    source = binding ? `directory selection for ${binding.directory}` : `default account in ${(0, import_globalConfig.globalConfigPath)()}`;
+  }
+  if (name === void 0) return null;
+  await validateAccountName(ctx, name);
+  return { name, source };
+}
+async function readAccountAuth(ctx, account, allowMissing = false) {
+  const credentials = await readAccountCredentials(ctx, account, allowMissing);
+  return credentials === null ? null : {
+    kind: "accessToken",
+    accessToken: credentials.accessToken,
+    header: `Bearer ${credentials.accessToken}`,
+    account
+  };
+}
+async function readAccountCredentials(ctx, account, allowMissing = false) {
+  await validateAccountName(ctx, account.name);
+  const configPath = accountConfigPath(account.name);
+  if (!ctx.fs.exists(configPath)) {
+    if (allowMissing) return null;
+    return await ctx.crash({
+      exitCode: 1,
+      errorType: "invalid filesystem data",
+      printedMessage: `Account "${account.name}" selected by ${account.source} is not logged in. Run \`npx convex login --account ${account.name}\`.`
+    });
+  }
+  try {
+    return credentialsSchema.parse(JSON.parse(ctx.fs.readUtf8File(configPath)));
+  } catch {
+    return await ctx.crash({
+      exitCode: 1,
+      errorType: "invalid filesystem data",
+      printedMessage: `Unable to read credentials for account "${account.name}" from ${configPath}.`
+    });
+  }
+}
+function readAccountToken(ctx, name) {
+  try {
+    const token = JSON.parse(
+      ctx.fs.readUtf8File(accountConfigPath(name))
+    ).accessToken;
+    return typeof token === "string" && token.length > 0 ? token : null;
+  } catch {
+    return null;
+  }
+}
+async function writeCredentialsFile(ctx, name, credentials) {
+  const configPath = accountConfigPath(name);
+  const directory = import_path.default.dirname(configPath);
+  ctx.fs.mkdir(directory, { allowExisting: true });
+  for (const dir of [(0, import_utils.rootDirectory)(), directory]) {
+    if (!ctx.fs.lstat(dir).isDirectory()) {
+      return await ctx.crash({
+        exitCode: 1,
+        errorType: "invalid filesystem data",
+        printedMessage: `Cannot save account credentials through a symlink or non-directory: ${dir}.`
+      });
+    }
+  }
+  const temporary = `${configPath}.${(0, import_crypto.randomUUID)()}.tmp`;
+  try {
+    ctx.fs.writeUtf8File(
+      temporary,
+      JSON.stringify(credentials, null, 2),
+      384
+    );
+    ctx.fs.swapTmpFile(temporary, configPath);
+  } finally {
+    if (ctx.fs.exists(temporary)) ctx.fs.unlink(temporary);
+  }
+}
+async function writeAccountCredentials(ctx, name, accessToken, metadata = {}, expected, onConflict) {
+  await validateAccountName(ctx, name);
+  await updateAccountSettings(ctx, async (settings) => {
+    if (expected !== void 0) {
+      const current = await readAccountCredentials(
+        ctx,
+        { name, source: "login" },
+        true
+      );
+      if (!(0, import_util.isDeepStrictEqual)(current, expected)) {
+        await onConflict?.();
+        return await ctx.crash({
+          exitCode: 1,
+          errorType: "fatal",
+          printedMessage: `Account "${name}" changed during login. Retry the login.`
+        });
+      }
+    }
+    await writeCredentialsFile(ctx, name, { ...metadata, accessToken });
+    if (settings.defaultAccount === name) settings.accessToken = accessToken;
+  });
+}
+async function legacyAuthForFirstAccount(ctx, account) {
+  const settings = await readAccountSettings(ctx);
+  const accountsDir = import_path.default.dirname(accountConfigPath(account.name));
+  if (settings.defaultAccount !== void 0 || ctx.fs.exists(accountsDir) && ctx.fs.listDir(accountsDir).some((entry) => entry.name.endsWith(".json"))) {
+    return null;
+  }
+  const config = (0, import_globalConfig.readGlobalConfig)(ctx);
+  return config === null ? null : {
+    kind: "accessToken",
+    accessToken: config.accessToken,
+    header: `Bearer ${config.accessToken}`,
+    account
+  };
+}
+async function initializeDefaultAccount(ctx, account, namingLegacyAccount, select = true) {
+  const defaultAccount = await updateAccountSettings(ctx, async (settings) => {
+    if (settings.defaultAccount !== void 0) return void 0;
+    const credentials = await readAccountCredentials(ctx, account);
+    const accessToken = credentials.accessToken;
+    const legacyToken = settings.accessToken;
+    if (!select && (savedAccountNames(ctx).some((name) => name !== account.name) || !namingLegacyAccount && typeof legacyToken === "string" && legacyToken.length > 0 && legacyToken !== accessToken))
+      return void 0;
+    if (!namingLegacyAccount && typeof legacyToken === "string" && legacyToken.length > 0 && legacyToken !== accessToken) {
+      let legacyName = "default";
+      for (let suffix = 2; ctx.fs.exists(accountConfigPath(legacyName)); suffix++) {
+        legacyName = `default-${suffix}`;
+      }
+      await writeCredentialsFile(ctx, legacyName, { accessToken: legacyToken });
+      settings.defaultAccount = legacyName;
+    } else {
+      settings.defaultAccount = account.name;
+      settings.accessToken = accessToken;
+    }
+    return settings.defaultAccount;
+  });
+  if (defaultAccount !== void 0)
+    (0, import_log.logFinishedStep)(`Default account: ${defaultAccount}`);
+}
+function findAccountDirectory(directories, cwd) {
+  let directory = import_path.default.resolve(cwd);
+  for (; ; ) {
+    if (Object.hasOwn(directories, directory)) {
+      return { directory, name: directories[directory] };
+    }
+    const parent = import_path.default.dirname(directory);
+    if (parent === directory) return null;
+    directory = parent;
+  }
+}
+function savedAccountNames(ctx) {
+  const directory = import_path.default.join((0, import_utils.rootDirectory)(), "accounts");
+  if (!ctx.fs.exists(directory)) return [];
+  return ctx.fs.listDir(directory).filter((entry) => entry.name.endsWith(".json")).map((entry) => entry.name.slice(0, -5)).sort();
+}
+async function writeAccountDirectory(ctx, name) {
+  await validateAccountName(ctx, name);
+  await updateAccountSettings(ctx, (settings) => {
+    settings.directories = { ...settings.directories, [process.cwd()]: name };
+  });
+  (0, import_log.logFinishedStep)(
+    `Saved directory selection: ${name} (applies to this directory and its subdirectories).`
+  );
+  const selected = await getAccountSelection(ctx);
+  if (selected !== null && selected.name !== name) {
+    (0, import_log.logWarning)(
+      `Account "${selected.name}" selected by ${selected.source} overrides this directory selection. Remove that override to use account "${name}".`
+    );
+  }
+}
+//# sourceMappingURL=accounts.js.map

package/dist/cjs/cli/lib/accounts.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/cli/lib/accounts.ts"],
+  "sourcesContent": ["import path from \"path\";\nimport { isDeepStrictEqual } from \"util\";\nimport { randomUUID } from \"crypto\";\nimport { TempPath } from \"../../bundler/fs.js\";\nimport * as dotenv from \"dotenv\";\nimport { z } from \"zod\";\nimport { BigBrainAuth, Context } from \"../../bundler/context.js\";\nimport { logFinishedStep, logWarning } from \"../../bundler/log.js\";\nimport { globalConfigPath, readGlobalConfig } from \"./utils/globalConfig.js\";\nimport { ENV_VAR_FILE_PATH, rootDirectory } from \"./utils/utils.js\";\n\nimport { CONVEX_ACCOUNT_ENV_VAR } from \"./envvars.js\";\n\nexport type AccountSelection = {\n  name: string;\n  source: string;\n};\n\nconst settingsSchema = z\n  .object({\n    defaultAccount: z.string().optional(),\n    directories: z.record(z.string()).optional(),\n    revokeReplacedTokens: z.boolean().optional(),\n  })\n  .passthrough();\n\nconst credentialsSchema = z\n  .object({\n    accessToken: z.string().min(1),\n    memberId: z.string().optional(),\n    email: z.string().optional(),\n  })\n  .passthrough();\n\nexport type AccountCredentials = z.infer<typeof credentialsSchema>;\n\nexport async function readAccountSettings(\n  ctx: Context,\n): Promise<z.infer<typeof settingsSchema>> {\n  if (!ctx.fs.exists(globalConfigPath())) return {};\n  try {\n    return settingsSchema.parse(\n      JSON.parse(ctx.fs.readUtf8File(globalConfigPath())),\n    );\n  } catch {\n    return await ctx.crash({\n      exitCode: 1,\n      errorType: \"invalid filesystem data\",\n      printedMessage: `Unable to read account settings from ${globalConfigPath()}. Check defaultAccount, directories, and revokeReplacedTokens.`,\n    });\n  }\n}\n\nfunction writeAccountSettings(ctx: Context, settings: Record<string, unknown>) {\n  if (Object.keys(settings).length === 0) {\n    if (ctx.fs.exists(globalConfigPath())) ctx.fs.unlink(globalConfigPath());\n    return;\n  }\n  const temporary = `${globalConfigPath()}.${randomUUID()}.tmp` as TempPath;\n  try {\n    ctx.fs.writeUtf8File(temporary, JSON.stringify(settings, null, 2), 0o600);\n    ctx.fs.swapTmpFile(temporary, globalConfigPath());\n  } finally {\n    if (ctx.fs.exists(temporary)) ctx.fs.unlink(temporary);\n  }\n}\n\nexport async function updateAccountSettings<T>(\n  ctx: Context,\n  update: (settings: z.infer<typeof settingsSchema>) => T | Promise<T>,\n  afterWrite?: () => void,\n): Promise<T> {\n  const lockPath = `${globalConfigPath()}.lock`;\n  ctx.fs.mkdir(rootDirectory(), { allowExisting: true });\n  const deadline = Date.now() + 5000;\n  for (;;) {\n    try {\n      ctx.fs.mkdir(lockPath);\n      break;\n    } catch (err: any) {\n      // Only the process that creates the directory owns the update lock.\n      // eslint-disable-next-line no-restricted-syntax\n      if (err.code !== \"EEXIST\") throw err;\n      if (Date.now() >= deadline) {\n        return await ctx.crash({\n          exitCode: 1,\n          errorType: \"fatal\",\n          printedMessage: `Another command is updating Convex accounts. Retry after it finishes. If it was interrupted, remove ${lockPath}.`,\n        });\n      }\n      await new Promise((resolve) => setTimeout(resolve, 25));\n    }\n  }\n  let released = false;\n  const release = () => {\n    if (released) return;\n    ctx.fs.rmdir(lockPath);\n    released = true;\n  };\n  const cleanup = ctx.registerCleanup(async () => release());\n  try {\n    const settings = await readAccountSettings(ctx);\n    const result = await update(settings);\n    writeAccountSettings(ctx, settings);\n    // Credential deletion follows persistence while sharing the lock with renewals.\n    afterWrite?.();\n    return result;\n  } finally {\n    ctx.removeCleanup(cleanup);\n    release();\n  }\n}\n\nexport function accountConfigPath(name: string): string {\n  return path.join(\n    rootDirectory(),\n    \"accounts\",\n    `${encodeURIComponent(name)}.json`,\n  );\n}\n\nexport async function validateAccountName(\n  ctx: Context,\n  name: string,\n): Promise<void> {\n  if (!/^[a-z0-9][a-z0-9_-]*$/.test(name)) {\n    await ctx.crash({\n      exitCode: 1,\n      errorType: \"invalid filesystem or env vars\",\n      printedMessage:\n        \"Account names must start with a lowercase letter or number and contain only lowercase letters, numbers, hyphens, and underscores.\",\n    });\n  }\n}\n\nexport async function getAccountSelection(\n  ctx: Context,\n  options: { name?: string | undefined; envFile?: string | undefined } = {},\n): Promise<AccountSelection | null> {\n  let name = options.name;\n  let source = \"--account\";\n  if (name === undefined && process.env[CONVEX_ACCOUNT_ENV_VAR] !== undefined) {\n    name = process.env[CONVEX_ACCOUNT_ENV_VAR];\n    source = `${CONVEX_ACCOUNT_ENV_VAR} environment variable`;\n  }\n  if (name === undefined) {\n    const files = options.envFile\n      ? [options.envFile]\n      : [ENV_VAR_FILE_PATH, \".env\"];\n    for (const file of files) {\n      if (!ctx.fs.exists(file)) continue;\n      name = dotenv.parse(ctx.fs.readUtf8File(file))[CONVEX_ACCOUNT_ENV_VAR];\n      if (name !== undefined) {\n        source = `${CONVEX_ACCOUNT_ENV_VAR} in ${file}`;\n        break;\n      }\n    }\n  }\n  if (name === undefined) {\n    const config = await readAccountSettings(ctx);\n    const binding = findAccountDirectory(\n      config.directories ?? {},\n      process.cwd(),\n    );\n    name = binding?.name ?? config.defaultAccount;\n    source = binding\n      ? `directory selection for ${binding.directory}`\n      : `default account in ${globalConfigPath()}`;\n  }\n  if (name === undefined) return null;\n  await validateAccountName(ctx, name);\n  return { name, source };\n}\n\nexport async function readAccountAuth(\n  ctx: Context,\n  account: AccountSelection,\n  allowMissing = false,\n): Promise<Extract<BigBrainAuth, { kind: \"accessToken\" }> | null> {\n  const credentials = await readAccountCredentials(ctx, account, allowMissing);\n  return credentials === null\n    ? null\n    : {\n        kind: \"accessToken\",\n        accessToken: credentials.accessToken,\n        header: `Bearer ${credentials.accessToken}`,\n        account,\n      };\n}\n\nexport async function readAccountCredentials(\n  ctx: Context,\n  account: AccountSelection,\n  allowMissing = false,\n): Promise<AccountCredentials | null> {\n  await validateAccountName(ctx, account.name);\n  const configPath = accountConfigPath(account.name);\n  if (!ctx.fs.exists(configPath)) {\n    if (allowMissing) return null;\n    return await ctx.crash({\n      exitCode: 1,\n      errorType: \"invalid filesystem data\",\n      printedMessage: `Account \"${account.name}\" selected by ${account.source} is not logged in. Run \\`npx convex login --account ${account.name}\\`.`,\n    });\n  }\n  try {\n    return credentialsSchema.parse(JSON.parse(ctx.fs.readUtf8File(configPath)));\n  } catch {\n    return await ctx.crash({\n      exitCode: 1,\n      errorType: \"invalid filesystem data\",\n      printedMessage: `Unable to read credentials for account \"${account.name}\" from ${configPath}.`,\n    });\n  }\n}\n\nexport function readAccountToken(ctx: Context, name: string): string | null {\n  try {\n    const token = JSON.parse(\n      ctx.fs.readUtf8File(accountConfigPath(name)),\n    ).accessToken;\n    return typeof token === \"string\" && token.length > 0 ? token : null;\n  } catch {\n    return null;\n  }\n}\n\nasync function writeCredentialsFile(\n  ctx: Context,\n  name: string,\n  credentials: AccountCredentials,\n) {\n  const configPath = accountConfigPath(name);\n  const directory = path.dirname(configPath);\n  ctx.fs.mkdir(directory, { allowExisting: true });\n  for (const dir of [rootDirectory(), directory]) {\n    if (!ctx.fs.lstat(dir).isDirectory()) {\n      return await ctx.crash({\n        exitCode: 1,\n        errorType: \"invalid filesystem data\",\n        printedMessage: `Cannot save account credentials through a symlink or non-directory: ${dir}.`,\n      });\n    }\n  }\n  const temporary = `${configPath}.${randomUUID()}.tmp` as TempPath;\n  try {\n    ctx.fs.writeUtf8File(\n      temporary,\n      JSON.stringify(credentials, null, 2),\n      0o600,\n    );\n    ctx.fs.swapTmpFile(temporary, configPath);\n  } finally {\n    if (ctx.fs.exists(temporary)) ctx.fs.unlink(temporary);\n  }\n}\n\nexport async function writeAccountCredentials(\n  ctx: Context,\n  name: string,\n  accessToken: string,\n  metadata: Omit<AccountCredentials, \"accessToken\"> = {},\n  expected?: AccountCredentials | null,\n  onConflict?: () => Promise<void>,\n): Promise<void> {\n  await validateAccountName(ctx, name);\n  await updateAccountSettings(ctx, async (settings) => {\n    if (expected !== undefined) {\n      const current = await readAccountCredentials(\n        ctx,\n        { name, source: \"login\" },\n        true,\n      );\n      if (!isDeepStrictEqual(current, expected)) {\n        await onConflict?.();\n        return await ctx.crash({\n          exitCode: 1,\n          errorType: \"fatal\",\n          printedMessage: `Account \"${name}\" changed during login. Retry the login.`,\n        });\n      }\n    }\n    await writeCredentialsFile(ctx, name, { ...metadata, accessToken });\n    if (settings.defaultAccount === name) settings.accessToken = accessToken;\n  });\n}\n\nexport async function legacyAuthForFirstAccount(\n  ctx: Context,\n  account: AccountSelection,\n): Promise<Extract<BigBrainAuth, { kind: \"accessToken\" }> | null> {\n  const settings = await readAccountSettings(ctx);\n  const accountsDir = path.dirname(accountConfigPath(account.name));\n  if (\n    settings.defaultAccount !== undefined ||\n    (ctx.fs.exists(accountsDir) &&\n      ctx.fs.listDir(accountsDir).some((entry) => entry.name.endsWith(\".json\")))\n  ) {\n    return null;\n  }\n  const config = readGlobalConfig(ctx);\n  return config === null\n    ? null\n    : {\n        kind: \"accessToken\",\n        accessToken: config.accessToken,\n        header: `Bearer ${config.accessToken}`,\n        account,\n      };\n}\n\nexport async function initializeDefaultAccount(\n  ctx: Context,\n  account: AccountSelection,\n  namingLegacyAccount: boolean,\n  select = true,\n) {\n  const defaultAccount = await updateAccountSettings(ctx, async (settings) => {\n    if (settings.defaultAccount !== undefined) return undefined;\n    const credentials = await readAccountCredentials(ctx, account);\n    const accessToken = credentials!.accessToken;\n    const legacyToken = settings.accessToken;\n    if (\n      !select &&\n      (savedAccountNames(ctx).some((name) => name !== account.name) ||\n        (!namingLegacyAccount &&\n          typeof legacyToken === \"string\" &&\n          legacyToken.length > 0 &&\n          legacyToken !== accessToken))\n    )\n      return undefined;\n    if (\n      !namingLegacyAccount &&\n      typeof legacyToken === \"string\" &&\n      legacyToken.length > 0 &&\n      legacyToken !== accessToken\n    ) {\n      // An explicitly new login keeps the previous account as the default for\n      // directories that haven't selected an account.\n      let legacyName = \"default\";\n      for (\n        let suffix = 2;\n        ctx.fs.exists(accountConfigPath(legacyName));\n        suffix++\n      ) {\n        legacyName = `default-${suffix}`;\n      }\n      await writeCredentialsFile(ctx, legacyName, { accessToken: legacyToken });\n      settings.defaultAccount = legacyName;\n    } else {\n      settings.defaultAccount = account.name;\n      settings.accessToken = accessToken;\n    }\n\n    return settings.defaultAccount;\n  });\n  if (defaultAccount !== undefined)\n    logFinishedStep(`Default account: ${defaultAccount}`);\n}\n\nexport function findAccountDirectory(\n  directories: Record<string, string>,\n  cwd: string,\n): { directory: string; name: string } | null {\n  let directory = path.resolve(cwd);\n  for (;;) {\n    if (Object.hasOwn(directories, directory)) {\n      return { directory, name: directories[directory] };\n    }\n    const parent = path.dirname(directory);\n    if (parent === directory) return null;\n    directory = parent;\n  }\n}\n\nexport function savedAccountNames(ctx: Context): string[] {\n  const directory = path.join(rootDirectory(), \"accounts\");\n  if (!ctx.fs.exists(directory)) return [];\n  return ctx.fs\n    .listDir(directory)\n    .filter((entry) => entry.name.endsWith(\".json\"))\n    .map((entry) => entry.name.slice(0, -5))\n    .sort();\n}\n\nexport async function writeAccountDirectory(ctx: Context, name: string) {\n  await validateAccountName(ctx, name);\n  await updateAccountSettings(ctx, (settings) => {\n    settings.directories = { ...settings.directories, [process.cwd()]: name };\n  });\n  logFinishedStep(\n    `Saved directory selection: ${name} (applies to this directory and its subdirectories).`,\n  );\n  const selected = await getAccountSelection(ctx);\n  if (selected !== null && selected.name !== name) {\n    logWarning(\n      `Account \"${selected.name}\" selected by ${selected.source} overrides this directory selection. Remove that override to use account \"${name}\".`,\n    );\n  }\n}\n"],
+  "mappings": "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",
+  "names": ["path"]
+}

package/dist/cjs/cli/lib/deployKeyWarning.js

@@ -0,0 +1,43 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var deployKeyWarning_exports = {};
+__export(deployKeyWarning_exports, {
+  warnIfDeployKeyOverridesLogin: () => warnIfDeployKeyOverridesLogin
+});
+module.exports = __toCommonJS(deployKeyWarning_exports);
+var import_log = require("../../bundler/log.js");
+var import_deployment = require("./deployment.js");
+var import_envvars = require("./envvars.js");
+var import_utils = require("./utils/utils.js");
+const warnedContexts = /* @__PURE__ */ new WeakSet();
+function warnIfDeployKeyOverridesLogin(ctx, hasAccount) {
+  if (!hasAccount || warnedContexts.has(ctx) || process.env.CONVEX_OVERRIDE_ACCESS_TOKEN)
+    return;
+  const key = (0, import_utils.readDeployKeyFromEnv)((name) => process.env[name]);
+  if (key === void 0 || key === import_utils.IGNORED_DEPLOY_KEY || (0, import_deployment.isPreviewDeployKey)(key))
+    return;
+  const { envVarName, source } = (0, import_envvars.getDeployKeySource)(key);
+  const type = (0, import_deployment.deploymentTypeFromAdminKey)(key);
+  const target = (0, import_deployment.isDeploymentKey)(key) ? `${type === "prod" ? "production" : type} deployment "${(0, import_deployment.deploymentNameFromAdminKey)(key)}"` : (0, import_deployment.isProjectKey)(key) ? "the project selected by the key" : "the deployment selected by the key";
+  (0, import_log.logWarning)(
+    `WARNING: ${envVarName} in ${source} overrides your Convex account for deployment commands. They target ${target}. Remove ${envVarName} to use the selected account.`
+  );
+  warnedContexts.add(ctx);
+}
+//# sourceMappingURL=deployKeyWarning.js.map

package/dist/cjs/cli/lib/deployKeyWarning.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/cli/lib/deployKeyWarning.ts"],
+  "sourcesContent": ["import { Context } from \"../../bundler/context.js\";\nimport { logWarning } from \"../../bundler/log.js\";\nimport {\n  deploymentNameFromAdminKey,\n  deploymentTypeFromAdminKey,\n  isDeploymentKey,\n  isPreviewDeployKey,\n  isProjectKey,\n} from \"./deployment.js\";\nimport { getDeployKeySource } from \"./envvars.js\";\nimport { IGNORED_DEPLOY_KEY, readDeployKeyFromEnv } from \"./utils/utils.js\";\n\nconst warnedContexts = new WeakSet<Context>();\n\nexport function warnIfDeployKeyOverridesLogin(\n  ctx: Context,\n  hasAccount: boolean,\n) {\n  if (\n    !hasAccount ||\n    warnedContexts.has(ctx) ||\n    process.env.CONVEX_OVERRIDE_ACCESS_TOKEN\n  )\n    return;\n  const key = readDeployKeyFromEnv((name) => process.env[name]);\n  if (\n    key === undefined ||\n    key === IGNORED_DEPLOY_KEY ||\n    isPreviewDeployKey(key)\n  )\n    return;\n  const { envVarName, source } = getDeployKeySource(key);\n  const type = deploymentTypeFromAdminKey(key);\n  const target = isDeploymentKey(key)\n    ? `${type === \"prod\" ? \"production\" : type} deployment \"${deploymentNameFromAdminKey(key)}\"`\n    : isProjectKey(key)\n      ? \"the project selected by the key\"\n      : \"the deployment selected by the key\";\n  logWarning(\n    `WARNING: ${envVarName} in ${source} overrides your Convex account for deployment commands. They target ${target}. Remove ${envVarName} to use the selected account.`,\n  );\n  warnedContexts.add(ctx);\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,iBAA2B;AAC3B,wBAMO;AACP,qBAAmC;AACnC,mBAAyD;AAEzD,MAAM,iBAAiB,oBAAI,QAAiB;AAErC,SAAS,8BACd,KACA,YACA;AACA,MACE,CAAC,cACD,eAAe,IAAI,GAAG,KACtB,QAAQ,IAAI;AAEZ;AACF,QAAM,UAAM,mCAAqB,CAAC,SAAS,QAAQ,IAAI,IAAI,CAAC;AAC5D,MACE,QAAQ,UACR,QAAQ,uCACR,sCAAmB,GAAG;AAEtB;AACF,QAAM,EAAE,YAAY,OAAO,QAAI,mCAAmB,GAAG;AACrD,QAAM,WAAO,8CAA2B,GAAG;AAC3C,QAAM,aAAS,mCAAgB,GAAG,IAC9B,GAAG,SAAS,SAAS,eAAe,IAAI,oBAAgB,8CAA2B,GAAG,CAAC,UACvF,gCAAa,GAAG,IACd,oCACA;AACN;AAAA,IACE,YAAY,UAAU,OAAO,MAAM,uEAAuE,MAAM,YAAY,UAAU;AAAA,EACxI;AACA,iBAAe,IAAI,GAAG;AACxB;",
+  "names": []
+}

package/dist/cjs/cli/lib/deployment.js

@@ -30,11 +30,13 @@ var deployment_exports = {};
 __export(deployment_exports, {
   changesToEnvVarFile: () => changesToEnvVarFile,
   changesToGitIgnore: () => changesToGitIgnore,
+  deploymentNameFromAdminKey: () => deploymentNameFromAdminKey,
   deploymentNameFromAdminKeyOrCrash: () => deploymentNameFromAdminKeyOrCrash,
   deploymentTypeFromAdminKey: () => deploymentTypeFromAdminKey,
   eraseDeploymentEnvVar: () => eraseDeploymentEnvVar,
   getDeploymentTypeFromConfiguredDeployment: () => getDeploymentTypeFromConfiguredDeployment,
   getTeamAndProjectFromPreviewAdminKey: () => getTeamAndProjectFromPreviewAdminKey,
+  gitIgnoreEnvVarFile: () => gitIgnoreEnvVarFile,
   isAnonymousDeployment: () => isAnonymousDeployment,
   isDeploymentKey: () => isDeploymentKey,
   isPreviewDeployKey: () => isPreviewDeployKey,

package/dist/cjs/cli/lib/deployment.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/lib/deployment.ts"],
-  "sourcesContent": ["import * as dotenv from \"dotenv\";\nimport { Context } from \"../../bundler/context.js\";\nimport { changedEnvVarFile, getEnvVarRegex } from \"./envvars.js\";\nimport {\n  CONVEX_DEPLOY_KEY_ENV_VAR_NAME,\n  CONVEX_DEPLOYMENT_ENV_VAR_NAME,\n  ENV_VAR_FILE_PATH,\n} from \"./utils/utils.js\";\nimport { DeploymentType } from \"./api.js\";\n\n// Given a deployment string like \"dev:tall-forest-1234\"\n// returns only the slug \"tall-forest-1234\".\n// If there's no prefix returns the original string.\nexport function stripDeploymentTypePrefix(deployment: string) {\n  return deployment.split(\":\").at(-1)!;\n}\n\n// Handling legacy CONVEX_DEPLOYMENT without type prefix as well\nexport function getDeploymentTypeFromConfiguredDeployment(raw: string) {\n  const typeRaw = raw.split(\":\")[0];\n  const type =\n    typeRaw === \"prod\" ||\n    typeRaw === \"dev\" ||\n    typeRaw === \"preview\" ||\n    typeRaw === \"local\"\n      ? typeRaw\n      : null;\n  return type;\n}\n\nexport function isAnonymousDeployment(deploymentName: string) {\n  return deploymentName.startsWith(\"anonymous-\");\n}\n\nexport function removeAnonymousPrefix(deploymentName: string) {\n  if (isAnonymousDeployment(deploymentName)) {\n    return deploymentName.slice(\"anonymous-\".length);\n  }\n  return deploymentName;\n}\n\nexport async function writeDeploymentEnvVar(\n  ctx: Context,\n  deploymentType: DeploymentType,\n  deployment: {\n    team: string | null;\n    project: string | null;\n    deploymentName: string;\n  },\n  existingValue: string | null,\n): Promise<{ wroteToGitIgnore: boolean; changedDeploymentEnvVar: boolean }> {\n  const existingFile = ctx.fs.exists(ENV_VAR_FILE_PATH)\n    ? ctx.fs.readUtf8File(ENV_VAR_FILE_PATH)\n    : null;\n  const changedFile = changesToEnvVarFile(\n    existingFile,\n    deploymentType,\n    deployment,\n  );\n  const deploymentEnvVarValue =\n    deploymentType + \":\" + deployment.deploymentName;\n  // The `existingValue` that reaches this function is at least sometimes is missing its prefix.\n  // Until this is cleaned up consider either of these values not a change.\n  // Otherwise we spam the init instructions (Welcome to Convex etc.) on every run of `npx convex dev`.\n  const changedDeploymentEnvVar =\n    !!changedFile &&\n    existingValue !== deployment.deploymentName &&\n    existingValue !== deploymentEnvVarValue;\n\n  if (changedFile !== null) {\n    ctx.fs.writeUtf8File(ENV_VAR_FILE_PATH, changedFile);\n    // Only do this if we're not reinitializing an existing setup\n    return {\n      wroteToGitIgnore: await gitIgnoreEnvVarFile(ctx),\n      changedDeploymentEnvVar,\n    };\n  }\n  return {\n    wroteToGitIgnore: false,\n    changedDeploymentEnvVar,\n  };\n}\n\n// Only used in the internal --url flow\nexport async function eraseDeploymentEnvVar(ctx: Context): Promise<boolean> {\n  const existingFile = ctx.fs.exists(ENV_VAR_FILE_PATH)\n    ? ctx.fs.readUtf8File(ENV_VAR_FILE_PATH)\n    : null;\n  if (existingFile === null) {\n    return false;\n  }\n  const config = dotenv.parse(existingFile);\n  const existing = config[CONVEX_DEPLOYMENT_ENV_VAR_NAME];\n  if (existing === undefined) {\n    return false;\n  }\n  const changedFile = existingFile.replace(\n    getEnvVarRegex(CONVEX_DEPLOYMENT_ENV_VAR_NAME),\n    \"\",\n  );\n  ctx.fs.writeUtf8File(ENV_VAR_FILE_PATH, changedFile);\n  return true;\n}\n\nasync function gitIgnoreEnvVarFile(ctx: Context): Promise<boolean> {\n  const gitIgnorePath = \".gitignore\";\n  const gitIgnoreContents = ctx.fs.exists(gitIgnorePath)\n    ? ctx.fs.readUtf8File(gitIgnorePath)\n    : \"\";\n  const changedGitIgnore = changesToGitIgnore(gitIgnoreContents);\n  if (changedGitIgnore !== null) {\n    ctx.fs.writeUtf8File(gitIgnorePath, changedGitIgnore);\n    return true;\n  }\n  return false;\n}\n\n// exported for tests\nexport function changesToEnvVarFile(\n  existingFile: string | null,\n  deploymentType: DeploymentType,\n  {\n    team,\n    project,\n    deploymentName,\n  }: { team: string | null; project: string | null; deploymentName: string },\n): string | null {\n  const deploymentValue = deploymentType + \":\" + deploymentName;\n  const commentOnPreviousLine = \"# Deployment used by `npx convex dev`\";\n  const commentAfterValue =\n    team !== null && project !== null\n      ? `team: ${team}, project: ${project}`\n      : null;\n  return changedEnvVarFile({\n    existingFileContent: existingFile,\n    envVarName: CONVEX_DEPLOYMENT_ENV_VAR_NAME,\n    envVarValue: deploymentValue,\n    commentAfterValue,\n    commentOnPreviousLine,\n  });\n}\n\n// exported for tests\nexport function changesToGitIgnore(existingFile: string | null): string | null {\n  if (existingFile === null) {\n    return `${ENV_VAR_FILE_PATH}\\n`;\n  }\n  const gitIgnoreLines = existingFile.split(\"\\n\");\n  const envVarFileIgnored = gitIgnoreLines.some((line) => {\n    if (line.startsWith(\"#\")) return false;\n    if (line.startsWith(\"!\")) return false;\n\n    // .gitignore ignores trailing whitespace, and also we need to remove\n    // the trailing `\\r` from Windows-style newline since we split on `\\n`.\n    const trimmedLine = line.trimEnd();\n\n    const envIgnorePatterns = [\n      /^\\.env\\.local$/,\n      /^\\.env\\.\\*$/,\n      /^\\.env\\*$/,\n      /^.*\\.local$/,\n      /^\\.env\\*\\.local$/,\n    ];\n\n    return envIgnorePatterns.some((pattern) => pattern.test(trimmedLine));\n  });\n  if (!envVarFileIgnored) {\n    return `${existingFile}\\n${ENV_VAR_FILE_PATH}\\n`;\n  } else {\n    return null;\n  }\n}\n\nexport async function deploymentNameFromAdminKeyOrCrash(\n  ctx: Context,\n  adminKey: string,\n) {\n  const deploymentName = deploymentNameFromAdminKey(adminKey);\n  if (deploymentName === null) {\n    return await ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage: `Please set ${CONVEX_DEPLOY_KEY_ENV_VAR_NAME} to a new key which you can find on your Convex dashboard.`,\n    });\n  }\n  return deploymentName;\n}\n\nfunction deploymentNameFromAdminKey(adminKey: string) {\n  const parts = adminKey.split(\"|\");\n  if (parts.length === 1) {\n    return null;\n  }\n  if (isPreviewDeployKey(adminKey)) {\n    // Preview deploy keys do not contain a deployment name.\n    return null;\n  }\n  return stripDeploymentTypePrefix(parts[0]);\n}\n\n// Needed to differentiate a preview deploy key\n// from a concrete preview deployment's deploy key.\n// preview deploy key: `preview:team:project|key`\n// preview deployment's deploy key: `preview:deploymentName|key`\nexport function isPreviewDeployKey(adminKey: string) {\n  const parts = adminKey.split(\"|\");\n  if (parts.length === 1) {\n    return false;\n  }\n  const [prefix] = parts;\n  const prefixParts = prefix.split(\":\");\n  return prefixParts[0] === \"preview\" && prefixParts.length === 3;\n}\n\nexport function isProjectKey(adminKey: string) {\n  return /^project:.*\\|/.test(adminKey);\n}\n\n// \"dev deploy keys\" and \"prod deploy keys\" are deployment keys.\n// On the client these are also known as admin keys.\nexport function isDeploymentKey(adminKey: string) {\n  return /^(dev|prod):.*\\|/.test(adminKey);\n}\n\n// For current keys returns prod|dev|preview,\n// for legacy keys returns \"prod\".\n// Examples:\n//  \"prod:deploymentName|key\" -> \"prod\"\n//  \"preview:deploymentName|key\" -> \"preview\"\n//  \"dev:deploymentName|key\" -> \"dev\"\n//  \"custom:deploymentName|key\" -> \"custom\"\n//  \"key\" -> \"prod\"\nexport function deploymentTypeFromAdminKey(adminKey: string) {\n  const parts = adminKey.split(\":\");\n  if (parts.length === 1) {\n    return \"prod\";\n  }\n  return parts.at(0)! as DeploymentType;\n}\n\nexport async function getTeamAndProjectFromPreviewAdminKey(\n  ctx: Context,\n  adminKey: string,\n) {\n  const parts = adminKey.split(\"|\")[0].split(\":\");\n  if (parts.length !== 3) {\n    return await ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage:\n        \"Malformed preview CONVEX_DEPLOY_KEY, get a new key from Project Settings.\",\n    });\n  }\n  const [_preview, teamSlug, projectSlug] = parts;\n  return { teamSlug, projectSlug };\n}\n\nexport type CleanupDeploymentFunc = () => Promise<void>;\nexport type DeploymentDetails = {\n  deploymentName: string;\n  deploymentUrl: string;\n  adminKey: string;\n  reference: string | null;\n  isDefault: boolean;\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as dotenv from \"dotenv\";\nimport { Context } from \"../../bundler/context.js\";\nimport { changedEnvVarFile, getEnvVarRegex } from \"./envvars.js\";\nimport {\n  CONVEX_DEPLOY_KEY_ENV_VAR_NAME,\n  CONVEX_DEPLOYMENT_ENV_VAR_NAME,\n  ENV_VAR_FILE_PATH,\n} from \"./utils/utils.js\";\nimport { DeploymentType } from \"./api.js\";\n\n// Given a deployment string like \"dev:tall-forest-1234\"\n// returns only the slug \"tall-forest-1234\".\n// If there's no prefix returns the original string.\nexport function stripDeploymentTypePrefix(deployment: string) {\n  return deployment.split(\":\").at(-1)!;\n}\n\n// Handling legacy CONVEX_DEPLOYMENT without type prefix as well\nexport function getDeploymentTypeFromConfiguredDeployment(raw: string) {\n  const typeRaw = raw.split(\":\")[0];\n  const type =\n    typeRaw === \"prod\" ||\n    typeRaw === \"dev\" ||\n    typeRaw === \"preview\" ||\n    typeRaw === \"local\"\n      ? typeRaw\n      : null;\n  return type;\n}\n\nexport function isAnonymousDeployment(deploymentName: string) {\n  return deploymentName.startsWith(\"anonymous-\");\n}\n\nexport function removeAnonymousPrefix(deploymentName: string) {\n  if (isAnonymousDeployment(deploymentName)) {\n    return deploymentName.slice(\"anonymous-\".length);\n  }\n  return deploymentName;\n}\n\nexport async function writeDeploymentEnvVar(\n  ctx: Context,\n  deploymentType: DeploymentType,\n  deployment: {\n    team: string | null;\n    project: string | null;\n    deploymentName: string;\n  },\n  existingValue: string | null,\n): Promise<{ wroteToGitIgnore: boolean; changedDeploymentEnvVar: boolean }> {\n  const existingFile = ctx.fs.exists(ENV_VAR_FILE_PATH)\n    ? ctx.fs.readUtf8File(ENV_VAR_FILE_PATH)\n    : null;\n  const changedFile = changesToEnvVarFile(\n    existingFile,\n    deploymentType,\n    deployment,\n  );\n  const deploymentEnvVarValue =\n    deploymentType + \":\" + deployment.deploymentName;\n  // The `existingValue` that reaches this function is at least sometimes is missing its prefix.\n  // Until this is cleaned up consider either of these values not a change.\n  // Otherwise we spam the init instructions (Welcome to Convex etc.) on every run of `npx convex dev`.\n  const changedDeploymentEnvVar =\n    !!changedFile &&\n    existingValue !== deployment.deploymentName &&\n    existingValue !== deploymentEnvVarValue;\n\n  if (changedFile !== null) {\n    ctx.fs.writeUtf8File(ENV_VAR_FILE_PATH, changedFile);\n    // Only do this if we're not reinitializing an existing setup\n    return {\n      wroteToGitIgnore: await gitIgnoreEnvVarFile(ctx),\n      changedDeploymentEnvVar,\n    };\n  }\n  return {\n    wroteToGitIgnore: false,\n    changedDeploymentEnvVar,\n  };\n}\n\n// Only used in the internal --url flow\nexport async function eraseDeploymentEnvVar(ctx: Context): Promise<boolean> {\n  const existingFile = ctx.fs.exists(ENV_VAR_FILE_PATH)\n    ? ctx.fs.readUtf8File(ENV_VAR_FILE_PATH)\n    : null;\n  if (existingFile === null) {\n    return false;\n  }\n  const config = dotenv.parse(existingFile);\n  const existing = config[CONVEX_DEPLOYMENT_ENV_VAR_NAME];\n  if (existing === undefined) {\n    return false;\n  }\n  const changedFile = existingFile.replace(\n    getEnvVarRegex(CONVEX_DEPLOYMENT_ENV_VAR_NAME),\n    \"\",\n  );\n  ctx.fs.writeUtf8File(ENV_VAR_FILE_PATH, changedFile);\n  return true;\n}\n\nexport async function gitIgnoreEnvVarFile(ctx: Context): Promise<boolean> {\n  const gitIgnorePath = \".gitignore\";\n  const gitIgnoreContents = ctx.fs.exists(gitIgnorePath)\n    ? ctx.fs.readUtf8File(gitIgnorePath)\n    : \"\";\n  const changedGitIgnore = changesToGitIgnore(gitIgnoreContents);\n  if (changedGitIgnore !== null) {\n    ctx.fs.writeUtf8File(gitIgnorePath, changedGitIgnore);\n    return true;\n  }\n  return false;\n}\n\n// exported for tests\nexport function changesToEnvVarFile(\n  existingFile: string | null,\n  deploymentType: DeploymentType,\n  {\n    team,\n    project,\n    deploymentName,\n  }: { team: string | null; project: string | null; deploymentName: string },\n): string | null {\n  const deploymentValue = deploymentType + \":\" + deploymentName;\n  const commentOnPreviousLine = \"# Deployment used by `npx convex dev`\";\n  const commentAfterValue =\n    team !== null && project !== null\n      ? `team: ${team}, project: ${project}`\n      : null;\n  return changedEnvVarFile({\n    existingFileContent: existingFile,\n    envVarName: CONVEX_DEPLOYMENT_ENV_VAR_NAME,\n    envVarValue: deploymentValue,\n    commentAfterValue,\n    commentOnPreviousLine,\n  });\n}\n\n// exported for tests\nexport function changesToGitIgnore(existingFile: string | null): string | null {\n  if (existingFile === null) {\n    return `${ENV_VAR_FILE_PATH}\\n`;\n  }\n  const gitIgnoreLines = existingFile.split(\"\\n\");\n  const envVarFileIgnored = gitIgnoreLines.some((line) => {\n    if (line.startsWith(\"#\")) return false;\n    if (line.startsWith(\"!\")) return false;\n\n    // .gitignore ignores trailing whitespace, and also we need to remove\n    // the trailing `\\r` from Windows-style newline since we split on `\\n`.\n    const trimmedLine = line.trimEnd();\n\n    const envIgnorePatterns = [\n      /^\\.env\\.local$/,\n      /^\\.env\\.\\*$/,\n      /^\\.env\\*$/,\n      /^.*\\.local$/,\n      /^\\.env\\*\\.local$/,\n    ];\n\n    return envIgnorePatterns.some((pattern) => pattern.test(trimmedLine));\n  });\n  if (!envVarFileIgnored) {\n    return `${existingFile}\\n${ENV_VAR_FILE_PATH}\\n`;\n  } else {\n    return null;\n  }\n}\n\nexport async function deploymentNameFromAdminKeyOrCrash(\n  ctx: Context,\n  adminKey: string,\n) {\n  const deploymentName = deploymentNameFromAdminKey(adminKey);\n  if (deploymentName === null) {\n    return await ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage: `Please set ${CONVEX_DEPLOY_KEY_ENV_VAR_NAME} to a new key which you can find on your Convex dashboard.`,\n    });\n  }\n  return deploymentName;\n}\n\nexport function deploymentNameFromAdminKey(adminKey: string) {\n  const parts = adminKey.split(\"|\");\n  if (parts.length === 1) {\n    return null;\n  }\n  if (isPreviewDeployKey(adminKey)) {\n    // Preview deploy keys do not contain a deployment name.\n    return null;\n  }\n  return stripDeploymentTypePrefix(parts[0]);\n}\n\n// Needed to differentiate a preview deploy key\n// from a concrete preview deployment's deploy key.\n// preview deploy key: `preview:team:project|key`\n// preview deployment's deploy key: `preview:deploymentName|key`\nexport function isPreviewDeployKey(adminKey: string) {\n  const parts = adminKey.split(\"|\");\n  if (parts.length === 1) {\n    return false;\n  }\n  const [prefix] = parts;\n  const prefixParts = prefix.split(\":\");\n  return prefixParts[0] === \"preview\" && prefixParts.length === 3;\n}\n\nexport function isProjectKey(adminKey: string) {\n  return /^project:.*\\|/.test(adminKey);\n}\n\n// \"dev deploy keys\" and \"prod deploy keys\" are deployment keys.\n// On the client these are also known as admin keys.\nexport function isDeploymentKey(adminKey: string) {\n  return /^(dev|prod):.*\\|/.test(adminKey);\n}\n\n// For current keys returns prod|dev|preview,\n// for legacy keys returns \"prod\".\n// Examples:\n//  \"prod:deploymentName|key\" -> \"prod\"\n//  \"preview:deploymentName|key\" -> \"preview\"\n//  \"dev:deploymentName|key\" -> \"dev\"\n//  \"custom:deploymentName|key\" -> \"custom\"\n//  \"key\" -> \"prod\"\nexport function deploymentTypeFromAdminKey(adminKey: string) {\n  const parts = adminKey.split(\":\");\n  if (parts.length === 1) {\n    return \"prod\";\n  }\n  return parts.at(0)! as DeploymentType;\n}\n\nexport async function getTeamAndProjectFromPreviewAdminKey(\n  ctx: Context,\n  adminKey: string,\n) {\n  const parts = adminKey.split(\"|\")[0].split(\":\");\n  if (parts.length !== 3) {\n    return await ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage:\n        \"Malformed preview CONVEX_DEPLOY_KEY, get a new key from Project Settings.\",\n    });\n  }\n  const [_preview, teamSlug, projectSlug] = parts;\n  return { teamSlug, projectSlug };\n}\n\nexport type CleanupDeploymentFunc = () => Promise<void>;\nexport type DeploymentDetails = {\n  deploymentName: string;\n  deploymentUrl: string;\n  adminKey: string;\n  reference: string | null;\n  isDefault: boolean;\n};\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/cli/lib/deploymentSelection.js

@@ -49,15 +49,17 @@ var import_projectMismatch = require("./localDeployment/projectMismatch.js");
 var import_chalk = require("chalk");
 var import_envvars = require("./envvars.js");
 var import_globalConfig = require("./utils/globalConfig.js");
+var import_accounts = require("./accounts.js");
 var import_utils = require("./utils/utils.js");
 var dotenv = __toESM(require("dotenv"), 1);
 async function initializeBigBrainAuth(ctx, initialArgs) {
   if (initialArgs.url !== void 0 && initialArgs.adminKey !== void 0) {
     ctx._updateBigBrainAuth(
-      getBigBrainAuth(ctx, {
+      await getBigBrainAuth(ctx, {
         previewDeployKey: null,
         projectKey: null,
-        deploymentKey: null
+        deploymentKey: null,
+        skipAccount: true
       })
     );
     return;
@@ -75,29 +77,30 @@ async function initializeBigBrainAuth(ctx, initialArgs) {
     const rawDeployKey2 = (0, import_utils.readDeployKeyFromEnv)((name) => config[name]);
     const deployKey2 = await (0, import_utils.processDeployKeyValue)(ctx, rawDeployKey2);
     if (deployKey2 !== void 0) {
-      const bigBrainAuth = getBigBrainAuth(ctx, {
+      const bigBrainAuth = await getBigBrainAuth(ctx, {
         previewDeployKey: (0, import_deployment.isPreviewDeployKey)(deployKey2) ? deployKey2 : null,
         projectKey: (0, import_deployment.isProjectKey)(deployKey2) ? deployKey2 : null,
-        deploymentKey: (0, import_deployment.isDeploymentKey)(deployKey2) ? deployKey2 : null
+        deploymentKey: (0, import_deployment.isDeploymentKey)(deployKey2) ? deployKey2 : null,
+        envFile: initialArgs.envFile
       });
       ctx._updateBigBrainAuth(bigBrainAuth);
       return;
     }
     ctx._updateBigBrainAuth(
-      getBigBrainAuth(ctx, {
+      await getBigBrainAuth(ctx, {
         previewDeployKey: null,
         projectKey: null,
-        deploymentKey: null
+        deploymentKey: null,
+        envFile: initialArgs.envFile
       })
     );
     return;
   }
-  dotenv.config({ path: import_utils.ENV_VAR_FILE_PATH });
-  dotenv.config();
+  (0, import_envvars.loadProjectEnvironmentVariables)();
   const rawDeployKey = (0, import_utils.readDeployKeyFromEnv)((name) => process.env[name]);
   const deployKey = await (0, import_utils.processDeployKeyValue)(ctx, rawDeployKey);
   if (deployKey !== void 0) {
-    const bigBrainAuth = getBigBrainAuth(ctx, {
+    const bigBrainAuth = await getBigBrainAuth(ctx, {
       previewDeployKey: (0, import_deployment.isPreviewDeployKey)(deployKey) ? deployKey : null,
       projectKey: (0, import_deployment.isProjectKey)(deployKey) ? deployKey : null,
       deploymentKey: (0, import_deployment.isDeploymentKey)(deployKey) ? deployKey : null
@@ -106,7 +109,7 @@ async function initializeBigBrainAuth(ctx, initialArgs) {
     return;
   }
   ctx._updateBigBrainAuth(
-    getBigBrainAuth(ctx, {
+    await getBigBrainAuth(ctx, {
       previewDeployKey: null,
       projectKey: null,
       deploymentKey: null
@@ -114,7 +117,7 @@ async function initializeBigBrainAuth(ctx, initialArgs) {
   );
   return;
 }
-async function updateBigBrainAuthAfterLogin(ctx, accessToken) {
+async function updateBigBrainAuthAfterLogin(ctx, accessToken, account) {
   const existingAuth = ctx.bigBrainAuth();
   if (existingAuth !== null && existingAuth.kind === "projectKey") {
     (0, import_log.logVerbose)(
@@ -125,18 +128,20 @@ async function updateBigBrainAuthAfterLogin(ctx, accessToken) {
   ctx._updateBigBrainAuth({
     accessToken,
     kind: "accessToken",
-    header: `Bearer ${accessToken}`
+    header: `Bearer ${accessToken}`,
+    ...account ? { account } : {}
   });
 }
 async function clearBigBrainAuth(ctx) {
   ctx._updateBigBrainAuth(null);
 }
-function getBigBrainAuth(ctx, opts) {
+async function getBigBrainAuth(ctx, opts) {
   if (process.env.CONVEX_OVERRIDE_ACCESS_TOKEN) {
     return {
       accessToken: process.env.CONVEX_OVERRIDE_ACCESS_TOKEN,
       kind: "accessToken",
-      header: `Bearer ${process.env.CONVEX_OVERRIDE_ACCESS_TOKEN}`
+      header: `Bearer ${process.env.CONVEX_OVERRIDE_ACCESS_TOKEN}`,
+      account: null
     };
   }
   if (opts.projectKey !== null) {
@@ -153,12 +158,17 @@ function getBigBrainAuth(ctx, opts) {
       deploymentKey: opts.deploymentKey
     };
   }
+  const account = opts.skipAccount ? null : await (0, import_accounts.getAccountSelection)(ctx, { envFile: opts.envFile });
+  if (account !== null) {
+    return await (0, import_accounts.readAccountAuth)(ctx, account);
+  }
   const globalConfig = (0, import_globalConfig.readGlobalConfig)(ctx);
   if (globalConfig) {
     return {
       kind: "accessToken",
       header: `Bearer ${globalConfig.accessToken}`,
-      accessToken: globalConfig.accessToken
+      accessToken: globalConfig.accessToken,
+      account: null
     };
   }
   if (opts.previewDeployKey !== null) {
@@ -198,7 +208,7 @@ async function ensureAuthCanCreateDeployment(ctx) {
       )} and try again.`
     });
   }
-  const envVar = process.env[import_utils.CONVEX_DEPLOY_KEY_ENV_VAR_NAME] ? import_utils.CONVEX_DEPLOY_KEY_ENV_VAR_NAME : import_utils.CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME;
+  const envVar = (0, import_utils.readDeployKeyEnvVar)((name) => process.env[name])?.name ?? import_utils.CONVEX_DEPLOY_KEY_ENV_VAR_NAME;
   return await ctx.crash({
     exitCode: 1,
     errorType: "fatal",
@@ -368,8 +378,7 @@ async function resolveBaseDeploymentSelection(ctx, cliArgs, selectionWithinProje
     }
     return result2.metadata;
   }
-  dotenv.config({ path: import_utils.ENV_VAR_FILE_PATH });
-  dotenv.config();
+  (0, import_envvars.loadProjectEnvironmentVariables)();
   const result = await getDeploymentSelectionFromEnv(
     ctx,
     selectionWithinProject,