@athletelog/cli 0.1.0-beta.1 → 0.1.0-beta.2

package/dist/index.js

@@ -26,15 +26,21 @@ function readStored() {
 function toRequestBase(raw) {
   return raw.includes(".convex.cloud") ? raw.replace(".convex.cloud", ".convex.site") : raw;
 }
+function literalResult(url) {
+  return { baseUrl: toRequestBase(url), env: url.includes(".convex.") ? "dev" : "unknown" };
+}
+function namedResult(named) {
+  return { baseUrl: toRequestBase(ENV_BASE_URLS[named] ?? ENV_BASE_URLS.prod), env: named };
+}
 function resolveBaseUrl(o, stored) {
-  const literal = o.url ?? process.env.ATHLETELOG_API_URL ?? stored.url ?? stored.convexUrl;
-  if (literal) {
-    const env = literal.includes(".convex.") ? "dev" : "unknown";
-    return { baseUrl: toRequestBase(literal), env };
-  }
-  const named = o.env ?? process.env.ATHLETELOG_ENV ?? stored.env ?? "prod";
-  const base = ENV_BASE_URLS[named] ?? ENV_BASE_URLS.prod;
-  return { baseUrl: toRequestBase(base), env: named };
+  if (o.url) return literalResult(o.url);
+  if (o.env) return namedResult(o.env);
+  if (process.env.ATHLETELOG_API_URL) return literalResult(process.env.ATHLETELOG_API_URL);
+  if (process.env.ATHLETELOG_ENV) return namedResult(process.env.ATHLETELOG_ENV);
+  if (stored.url) return literalResult(stored.url);
+  if (stored.convexUrl) return literalResult(stored.convexUrl);
+  if (stored.env) return namedResult(stored.env);
+  return namedResult("prod");
 }
 function loadConfig(overrides = {}) {
   const stored = readStored();
@@ -195,7 +201,7 @@ async function apiRequest(baseUrl, path, opts) {
 
 // src/commands/athletes-list.ts
 async function runAthletesList(args) {
-  const config = loadConfig();
+  const config = loadConfig({ url: args.url, env: args.env });
   const session = await createAuthSession(config);
   const athletes = await apiRequest(config.baseUrl, "/athletelog/v1/athletes", { token: session.getToken() });
   if (args.json) {
@@ -239,7 +245,7 @@ function toNumber(value) {
   return value;
 }
 async function runCheckinImport(args) {
-  const config = loadConfig();
+  const config = loadConfig({ url: args.url, env: args.env });
   const session = await createAuthSession(config);
   const targetUserId = args.athlete;
   if (!existsSync2(args.file)) throw new Error(`File not found: ${args.file}`);
@@ -339,7 +345,7 @@ async function runLogin(args) {
 
 // src/commands/whoami.ts
 async function runWhoami(args) {
-  const config = loadConfig();
+  const config = loadConfig({ url: args.url, env: args.env });
   const session = await createAuthSession(config);
   const me = await apiRequest(config.baseUrl, "/athletelog/v1/me", { token: session.getToken() });
   if (args.json) {
@@ -420,7 +426,7 @@ ${usageFor()}`);
     return;
   }
   if (group === "whoami") {
-    await runWhoami({ json });
+    await runWhoami({ json, url: values.url, env });
     return;
   }
   if (group === "logout") {
@@ -428,14 +434,14 @@ ${usageFor()}`);
     return;
   }
   if (group === "athletes" && action === "list") {
-    await runAthletesList({ json });
+    await runAthletesList({ json, url: values.url, env });
     return;
   }
   if (group === "checkin" && action === "import") {
     if (!values.athlete || !values.file) {
       throw new Error("checkin import requires --athlete and --file");
     }
-    await runCheckinImport({ json, athlete: values.athlete, file: values.file });
+    await runCheckinImport({ json, athlete: values.athlete, file: values.file, url: values.url, env });
     return;
   }
   process.stderr.write(`Unknown command: ${group ?? ""} ${action ?? ""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@athletelog/cli",
-  "version": "0.1.0-beta.1",
+  "version": "0.1.0-beta.2",
   "type": "module",
   "bin": {
     "athletelog": "./dist/index.js"