@ollie-shop/cli 1.2.2 → 1.3.3

package/src/utils/supabase.ts

@@ -6,15 +6,49 @@ declare const __OLLIE_SUPABASE_URL__: string;
 declare const __OLLIE_SUPABASE_ANON_KEY__: string;
 declare const __OLLIE_BUILDER_URL__: string;
 
+// Resolution order: runtime env var > CI build-time inline > prod default.
+// Baked-in defaults ensure `ollieshop` works zero-config when CI inject is
+// missing or stale. All three values are public (anon Supabase key, public
+// API URLs) so inlining them carries no secret-leak risk.
+const PROD_DEFAULTS = {
+  supabaseUrl: "https://aazahtmqrhjqsyqoqdkm.supabase.co",
+  supabaseAnonKey:
+    "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImFhemFodG1xcmhqcXN5cW9xZGttIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDg2MzEwOTcsImV4cCI6MjA2NDIwNzA5N30.VuAbAyjDe0HcL09SZtQ-UmP1o7Z6qwGuOtvfFhnyAcM",
+  builderUrl: "https://api.ollie.shop/builder/v1",
+};
+
+function envOrDefault(
+  envValue: string | undefined,
+  buildTimeValue: string,
+  prodDefault: string,
+): string {
+  return envValue || buildTimeValue || prodDefault;
+}
+
+// Collapses a Supabase to-one embed (object, array, or null) to a single record.
+export function unwrapToOne<T = Record<string, unknown>>(
+  embed: unknown,
+): T | null {
+  const record = Array.isArray(embed) ? embed[0] : embed;
+  return record && typeof record === "object" ? (record as T) : null;
+}
+
 export async function getAuthenticatedClient(): Promise<SupabaseClient> {
   const credentials = await getCredentials();
   if (!credentials) {
     throw new Error("Not authenticated. Run `ollieshop login` first.");
   }
 
-  const supabaseUrl = process.env.OLLIE_SUPABASE_URL || __OLLIE_SUPABASE_URL__;
-  const supabaseAnonKey =
-    process.env.OLLIE_SUPABASE_ANON_KEY || __OLLIE_SUPABASE_ANON_KEY__;
+  const supabaseUrl = envOrDefault(
+    process.env.OLLIE_SUPABASE_URL,
+    __OLLIE_SUPABASE_URL__,
+    PROD_DEFAULTS.supabaseUrl,
+  );
+  const supabaseAnonKey = envOrDefault(
+    process.env.OLLIE_SUPABASE_ANON_KEY,
+    __OLLIE_SUPABASE_ANON_KEY__,
+    PROD_DEFAULTS.supabaseAnonKey,
+  );
 
   const client = createClient(supabaseUrl, supabaseAnonKey, {
     auth: {
@@ -32,7 +66,11 @@ export async function getAuthenticatedClient(): Promise<SupabaseClient> {
 }
 
 export function getBuilderUrl(): string {
-  return process.env.OLLIE_BUILDER_URL || __OLLIE_BUILDER_URL__;
+  return envOrDefault(
+    process.env.OLLIE_BUILDER_URL,
+    __OLLIE_BUILDER_URL__,
+    PROD_DEFAULTS.builderUrl,
+  );
 }
 
 export async function getAuthToken(): Promise<string> {
@@ -45,23 +83,40 @@ export async function getAuthToken(): Promise<string> {
 
 export async function getOrganizationId(
   client: SupabaseClient,
+  preferredOrgId?: string,
 ): Promise<string> {
-  const { data: org, error } = await client
+  const { data: orgs, error } = await client
     .from("organizations")
-    .select("id")
-    .order("created_at", { ascending: true })
-    .limit(1)
-    .maybeSingle();
+    .select("id, name")
+    .order("created_at", { ascending: true });
 
   if (error) {
     throw new Error(`Failed to get organization: ${error.message}`);
   }
 
-  if (!org) {
+  if (!orgs || orgs.length === 0) {
     throw new Error(
       "No organization found for your account. Create one at https://admin.ollie.shop",
     );
   }
 
-  return org.id;
+  if (preferredOrgId) {
+    const match = orgs.find((o) => o.id === preferredOrgId);
+    if (!match) {
+      const list = orgs.map((o) => `  - ${o.id}  ${o.name}`).join("\n");
+      throw new Error(
+        `Organization ${preferredOrgId} not found or you are not a member. Orgs you can access:\n${list}`,
+      );
+    }
+    return match.id;
+  }
+
+  if (orgs.length > 1) {
+    const list = orgs.map((o) => `  - ${o.id}  ${o.name}`).join("\n");
+    throw new Error(
+      `You belong to multiple organizations. Pass --org <id> to select one:\n${list}`,
+    );
+  }
+
+  return orgs[0].id;
 }

package/tsup.config.ts

@@ -1,9 +1,15 @@
+import { readFileSync } from "node:fs";
 import { defineConfig } from "tsup";
 
 // CI injects SUPABASE_URL/SUPABASE_ANON_KEY/BUILDER_URL from GH Actions vars;
 // locally they're empty and the CLI falls back to runtime process.env.
 const env = (k: string) => JSON.stringify(process.env[k] ?? "");
 
+// Inline the package version at build time so `-v`/`--version` report the real version.
+const pkg = JSON.parse(
+  readFileSync(new URL("./package.json", import.meta.url), "utf8"),
+);
+
 export default defineConfig({
   entry: ["src/index.tsx"],
   format: ["esm"],
@@ -16,5 +22,6 @@ export default defineConfig({
     __OLLIE_SUPABASE_URL__: env("SUPABASE_URL"),
     __OLLIE_SUPABASE_ANON_KEY__: env("SUPABASE_ANON_KEY"),
     __OLLIE_BUILDER_URL__: env("BUILDER_URL"),
+    __OLLIE_CLI_VERSION__: JSON.stringify(pkg.version),
   },
 });