@devicecloud.dev/dcd 5.8.0 → 5.9.0

package/dist/utils/orgs.d.ts

@@ -1,11 +1,48 @@
+import type { Readable, Writable } from 'node:stream';
 export interface OrgListItem {
     id: string;
     name: string;
     slug?: string;
 }
 export declare function fetchOrgs(apiUrl: string, headers: Record<string, string>): Promise<OrgListItem[]>;
+/**
+ * Match a user-supplied string to an org. Prefers case-insensitive name match.
+ * Falls back to slug / id so existing scripts keep working, but error output
+ * only surfaces names. `pickCommand` is how to pick interactively instead,
+ * for when two orgs share a name.
+ */
+export declare function matchOrg(orgs: OrgListItem[], target: string, pickCommand: string): OrgListItem;
+export interface PickOrgOptions {
+    message?: string;
+    /** Org to start the picker on, so Enter confirms it. Ignored if not listed. */
+    initialId?: string;
+    input?: Readable;
+    output?: Writable;
+}
 /**
  * Interactive org picker. Auto-selects when there's only one org (returns it
  * without prompting). Throws on zero orgs or user cancellation.
  */
-export declare function pickOrg(orgs: OrgListItem[], message?: string): Promise<OrgListItem>;
+export declare function pickOrg(orgs: OrgListItem[], { message, initialId, input, output, }?: PickOrgOptions): Promise<OrgListItem>;
+export interface SelectOrgOptions {
+    /** `dcd login --org`: a name, slug or id. Skips the picker. */
+    requested?: string;
+    /** The org the last login chose. */
+    lastOrgId?: string;
+    /** Whether anyone can answer the picker (see canPrompt). */
+    interactive: boolean;
+    input?: Readable;
+    output?: Writable;
+}
+/**
+ * Choose the org for `dcd login`: `--org` if given, else the only org, else
+ * the picker starting on the last login's org. Without a TTY nobody can
+ * answer the picker, so the last login's org is used without asking, and
+ * when there isn't one the error names `--org` instead of hanging.
+ * `fromLastLogin` is set when that fallback chose the org, so the caller
+ * can say so.
+ */
+export declare function selectOrg(orgs: OrgListItem[], { requested, lastOrgId, interactive, input, output }: SelectOrgOptions): Promise<{
+    org: OrgListItem;
+    fromLastLogin: boolean;
+}>;

package/dist/utils/orgs.js

@@ -1,6 +1,6 @@
 /**
- * Shared helpers for fetching and picking from /me/orgs. Used by both
- * `dcd login` (after the PKCE claim returns a session) and `dcd switch-org`.
+ * Shared helpers for fetching, matching and picking from /me/orgs. Used by
+ * both `dcd login` (after the PKCE claim returns a session) and `dcd switch-org`.
  */
 import * as p from '@clack/prompts';
 import { CliError } from './cli.js';
@@ -13,11 +13,29 @@ export async function fetchOrgs(apiUrl, headers) {
     const body = (await res.json());
     return body.orgs ?? [];
 }
+/**
+ * Match a user-supplied string to an org. Prefers case-insensitive name match.
+ * Falls back to slug / id so existing scripts keep working, but error output
+ * only surfaces names. `pickCommand` is how to pick interactively instead,
+ * for when two orgs share a name.
+ */
+export function matchOrg(orgs, target, pickCommand) {
+    const needle = target.toLowerCase();
+    const nameMatches = orgs.filter((o) => o.name.toLowerCase() === needle);
+    if (nameMatches.length > 1) {
+        throw new CliError(`Multiple orgs named "${target}". Run ${pickCommand} to pick interactively.`);
+    }
+    const chosen = nameMatches[0] ?? orgs.find((o) => o.slug === target || o.id === target);
+    if (!chosen) {
+        throw new CliError(`No org named "${target}". Available: ${orgs.map((o) => o.name).join(', ')}`);
+    }
+    return chosen;
+}
 /**
  * Interactive org picker. Auto-selects when there's only one org (returns it
  * without prompting). Throws on zero orgs or user cancellation.
  */
-export async function pickOrg(orgs, message = 'Pick an organization') {
+export async function pickOrg(orgs, { message = 'Pick an organization', initialId, input, output, } = {}) {
     if (orgs.length === 0) {
         throw new CliError('No organizations found for this user.');
     }
@@ -25,7 +43,11 @@ export async function pickOrg(orgs, message = 'Pick an organization') {
         return orgs[0];
     const picked = await p.select({
         message,
+        input,
+        output,
         options: orgs.map((o) => ({ value: o.id, label: o.name })),
+        // clack starts on the first option when this isn't one of them.
+        initialValue: initialId,
     });
     if (p.isCancel(picked))
         throw new CliError('Cancelled.');
@@ -34,3 +56,37 @@ export async function pickOrg(orgs, message = 'Pick an organization') {
         throw new CliError('No organization selected.');
     return chosen;
 }
+/**
+ * Choose the org for `dcd login`: `--org` if given, else the only org, else
+ * the picker starting on the last login's org. Without a TTY nobody can
+ * answer the picker, so the last login's org is used without asking, and
+ * when there isn't one the error names `--org` instead of hanging.
+ * `fromLastLogin` is set when that fallback chose the org, so the caller
+ * can say so.
+ */
+export async function selectOrg(orgs, { requested, lastOrgId, interactive, input, output }) {
+    if (orgs.length === 0) {
+        throw new CliError('No organizations found for this user.');
+    }
+    if (requested !== undefined) {
+        return {
+            org: matchOrg(orgs, requested, '`dcd login` without --org'),
+            fromLastLogin: false,
+        };
+    }
+    if (orgs.length === 1)
+        return { org: orgs[0], fromLastLogin: false };
+    if (!interactive) {
+        const last = orgs.find((o) => o.id === lastOrgId);
+        if (last)
+            return { org: last, fromLastLogin: true };
+        const reason = lastOrgId
+            ? "The organization from your last login is no longer available, and there's no terminal to pick another in."
+            : "You belong to more than one organization, and there's no terminal to pick one in.";
+        throw new CliError(`${reason} Run \`dcd login --org <name>\` with one of: ${orgs.map((o) => o.name).join(', ')}`);
+    }
+    return {
+        org: await pickOrg(orgs, { initialId: lastOrgId, input, output }),
+        fromLastLogin: false,
+    };
+}

package/package.json

@@ -30,7 +30,7 @@
     "chai": "^6.2.2",
     "eslint": "^10.5.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-unicorn": "^77.0.0",
+    "eslint-plugin-unicorn": "^78.0.0",
     "husky": "^9.1.7",
     "mocha": "^12.0.0",
     "prettier": "^3.8.4",
@@ -68,7 +68,7 @@
     "test:unit": "node scripts/test-runner.mjs --unit",
     "typecheck": "tsc --noEmit -p tsconfig.test.json"
   },
-  "version": "5.8.0",
+  "version": "5.9.0",
   "bugs": {
     "url": "https://discord.gg/gm3mJwcNw8"
   },
@@ -110,7 +110,7 @@
       "esbuild@<0.28.1": ">=0.28.1",
       "qs@<6.16.0": "6.16.0",
       "fast-uri@>=3.0.0 <3.1.8": "3.1.8",
-      "hono@>=4.0.0 <4.13.7": "4.13.7",
+      "hono@>=4.0.0 <4.13.11": "4.13.11",
       "source-map-js@<1.2.2": "1.2.2",
       "micromatch>picomatch": "^2.3.2",
       "tinyglobby>picomatch": "^4.0.4"