@moloodev/cli 0.3.0 → 0.4.0

package/src/publish.ts

@@ -1,3 +1,4 @@
+import { publishCredentials } from "./auth";
 import { createHash } from "node:crypto";
 import { putScriptUpload } from "@moloodev/editor-store/upload";
 import { getApiOrigin } from "@moloodev/platform";
@@ -20,13 +21,14 @@ export async function publishEditor(input: {
   token: string;
   apiUrl?: string;
   service?: string;
+  bearer?: boolean;
 }): Promise<{ status: number; body: string }> {
   const uploadUrl = uploadEndpoint(input.apiUrl);
   const publishUrl = publishEndpoint(input.apiUrl);
   const service = input.service ?? DEFAULT_SERVICE;
   const issued = await fetch(uploadUrl, {
     method: "POST",
-    headers: serviceHeaders(input.token, service),
+    headers: input.bearer ? { authorization: `Bearer ${input.token}` } : serviceHeaders(input.token, service),
   });
   const issuedBody = await issued.text();
   if (issued.status !== 201) return { status: issued.status, body: issuedBody };
@@ -43,7 +45,7 @@ export async function publishEditor(input: {
   const response = await fetch(publishUrl, {
     method: "POST",
     headers: {
-      ...serviceHeaders(input.token, service),
+      ...(input.bearer ? { authorization: `Bearer ${input.token}` } : serviceHeaders(input.token, service)),
       "content-type": "application/json",
     },
     body: JSON.stringify({
@@ -62,13 +64,12 @@ export async function publishEditorPackage(
   packageRoot: string,
   options: { token?: string; apiUrl?: string; service?: string } = {},
 ): Promise<{ id: string; status: number; body: string }> {
-  const token = (options.token ?? process.env.MOLOO_SERVICE_TOKEN ?? "").trim();
-  if (token.length === 0) throw new Error("MOLOO_SERVICE_TOKEN is empty");
+  const credentials = await publishCredentials(options.token ?? process.env.MOLOO_SERVICE_TOKEN);
   const built = await buildEditorPackage(packageRoot);
   const result = await publishEditor({
     manifest: built.manifest,
     script: built.script,
-    token,
+    ...credentials,
     apiUrl: options.apiUrl,
     service: options.service,
   });

package/src/workspace.ts

@@ -0,0 +1,68 @@
+import { cliIdentity } from "./auth";
+import { readConfig, writeConfig } from "./config";
+import type { CredentialStore } from "./credentials";
+
+export type WorkspaceOptions = {
+  store?: CredentialStore;
+  apiOrigin?: string;
+  configPath?: string;
+};
+
+export async function listWorkspaces(options: WorkspaceOptions = {}): Promise<void> {
+  const { workspaces: available } = await cliIdentity(options.store, options.apiOrigin);
+  const config = await readConfig(options.configPath);
+  for (const workspace of available) {
+    console.log(`${workspace.slug}\t${workspace.name}${workspace.slug === config.workspace ? " (default)" : ""}`);
+  }
+  if (!available.length) console.log("No workspaces.");
+}
+
+export async function useWorkspace(slug: string, options: WorkspaceOptions = {}): Promise<void> {
+  const { workspaces: available } = await cliIdentity(options.store, options.apiOrigin);
+  const workspace = available.find((item) => item.slug === slug);
+  if (!workspace) {
+    throw new Error(`Workspace "${slug}" is not in your memberships. Run moloo workspace use <slug>. Available: ${available.map((item) => item.slug).join(", ") || "none"}.`);
+  }
+  await writeConfig({ workspace: workspace.slug }, options.configPath);
+  console.log(`Default workspace: ${workspace.slug} (${workspace.name})`);
+}
+
+/** Resolve against current memberships even when the slug came from saved config. */
+export async function resolveWorkspace({
+  flag,
+  interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY),
+  choose = chooseWorkspace,
+  ...options
+}: WorkspaceOptions & {
+  flag?: string;
+  interactive?: boolean;
+  choose?: (workspaces: { slug: string; name: string }[]) => Promise<string>;
+} = {}): Promise<string> {
+  const { workspaces } = await cliIdentity(options.store, options.apiOrigin);
+  const selected = flag ?? (await readConfig(options.configPath)).workspace;
+  const available = workspaces.map((workspace) => workspace.slug).join(", ") || "none";
+  const guidance = `Run moloo workspace use <slug>. Available: ${available}.`;
+  if (selected !== undefined) {
+    if (workspaces.some((workspace) => workspace.slug === selected)) return selected;
+    throw new Error(`Workspace "${selected}" is not in your memberships. ${guidance}`);
+  }
+  if (workspaces.length === 1 && workspaces[0]) return workspaces[0].slug;
+  if (!workspaces.length || !interactive) throw new Error(`Select a workspace. ${guidance}`);
+  const slug = await choose(workspaces);
+  if (!workspaces.some((workspace) => workspace.slug === slug)) {
+    throw new Error(`Invalid workspace selection. ${guidance}`);
+  }
+  return slug;
+}
+
+async function chooseWorkspace(workspaces: { slug: string; name: string }[]): Promise<string> {
+  const { createInterface } = await import("node:readline/promises");
+  const prompt = createInterface({ input: process.stdin, output: process.stdout });
+  try {
+    const choices = workspaces.map((workspace, index) => `${index + 1}. ${workspace.slug} (${workspace.name})`).join("\n");
+    const answer = (await prompt.question(`${choices}\nWorkspace number: `)).trim();
+    return /^[1-9][0-9]*$/.test(answer) ? workspaces[Number(answer) - 1]?.slug ?? "" : "";
+  } finally {
+    prompt.close();
+  }
+}