@rathnasgala/cli 1.1.14 → 1.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rathnasgala/cli",
-  "version": "1.1.14",
+  "version": "1.1.15",
   "type": "module",
   "files": [
     "src"

package/src/auth/checkout-profile.js

@@ -2,7 +2,8 @@ import { readFile, rename, rm, stat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 
 import { UsageError } from '../cli/args.js';
-import { requireProfileName } from './profiles.js';
+import { readPublication } from '../publication.js';
+import { listProfiles, requireProfileName } from './profiles.js';
 
 const FILENAME = 'gala-account-profile';
 
@@ -34,18 +35,71 @@ export async function checkoutProfile(root) {
   }
 }
 
-export async function accountForCommand(options, root) {
+export async function accountForCommand(options, root, { terminal, profilesRoot } = {}) {
   const explicit = options.value('account');
   const bound = await checkoutProfile(root);
   if (explicit != null) {
-    const selected = requireProfileName(explicit);
+    const selected = await resolveProfileSelector(explicit, profilesRoot);
     if (bound != null && bound !== selected) {
       throw new UsageError(
         `This checkout belongs to account profile ${bound}; --account ${selected} cannot override it.`
       );
     }
+    if (bound == null) await bindIfCheckout(root, selected);
     return selected;
   }
   if (bound != null) return bound;
-  throw new UsageError('This checkout has no account profile binding; pass --account <github-login>.');
+
+  const profiles = await listProfiles(profilesRoot == null ? {} : { root: profilesRoot });
+  if (profiles.length === 0) {
+    throw new UsageError('No account profile exists. Run `npx --yes @rathnasgala/cli@latest auth add`.');
+  }
+  const publication = await readPublication(root);
+  const repositoryOwner = typeof publication?.repository === 'string'
+    ? publication.repository.split('/', 1)[0]?.toLowerCase()
+    : null;
+  const ownerMatches = repositoryOwner == null ? [] : profiles.filter((profile) =>
+    profile.githubLogin.toLowerCase() === repositoryOwner);
+  let selected;
+  if (ownerMatches.length === 1) selected = ownerMatches[0].name;
+  else if (profiles.length === 1) selected = profiles[0].name;
+  else {
+    if (!terminal?.interactive) {
+      throw new UsageError(
+        `This repository could use more than one account profile (${profileChoices(profiles)}); pass --account <profile>.`
+      );
+    }
+    const answer = await terminal.ask(`Which account owns this repository? (${profileChoices(profiles)})`);
+    selected = resolveFromProfiles(answer, profiles);
+  }
+  await bindIfCheckout(root, selected);
+  terminal?.note(`Using account profile ${selected} for this repository.`);
+  return selected;
+}
+
+async function resolveProfileSelector(value, profilesRoot) {
+  const profiles = await listProfiles(profilesRoot == null ? {} : { root: profilesRoot });
+  return resolveFromProfiles(value, profiles);
+}
+
+function resolveFromProfiles(value, profiles) {
+  const selector = String(value ?? '').trim().replace(/^@/, '').toLowerCase();
+  const matches = profiles.filter(({ name, githubLogin, gala: identity }) => name === selector
+    || githubLogin.toLowerCase() === selector
+    || identity.email.toLowerCase() === selector);
+  if (matches.length === 1) return matches[0].name;
+  if (matches.length > 1) {
+    throw new UsageError(`Account ${value} matches more than one profile; use one of: ${profileChoices(matches)}.`);
+  }
+  throw new UsageError(`Account ${value} is not configured; use one of: ${profileChoices(profiles)}.`);
+}
+
+function profileChoices(profiles) {
+  return profiles.map(({ name, githubLogin, gala: identity }) =>
+    `${name} (GitHub @${githubLogin}, Gala ${identity.email})`).join(', ');
+}
+
+async function bindIfCheckout(root, selected) {
+  const metadata = await stat(path.join(path.resolve(root), '.git')).catch(() => null);
+  if (metadata?.isDirectory()) await bindCheckoutProfile(root, selected);
 }

package/src/auth/profiles.js

@@ -145,7 +145,9 @@ async function readProfile(name, { root }) {
   }
   const [gala, github] = await Promise.all([readCredential(paths.gala), readCredential(paths.github)]);
   if (gala == null || github == null) {
-    throw new UsageError(`Account profile ${name} has expired; remove it and add it again.`);
+    throw new UsageError(
+      `Account profile ${name} has expired; run \`npx --yes @rathnasgala/cli@latest auth add\` to sign in again.`
+    );
   }
   return { metadata, gala, github };
 }

package/src/commands/doctor.js

@@ -21,7 +21,7 @@ export async function doctor({ terminal, options, cwd = process.cwd() }) {
 
   let selected;
   checks.push(await checkCredential('Account profile', async () => {
-    const account = await accountForCommand(options, root);
+    const account = await accountForCommand(options, root, { terminal });
     selected = await selectedProfile({ name: account });
     return ok(`${account}: Gala ${selected.metadata.gala.email} + GitHub @${selected.metadata.githubLogin}`);
   }));

package/src/commands/domain.js

@@ -23,7 +23,7 @@ export async function domain({ terminal, options, cwd = process.cwd() }) {
   if (action === 'set' && value == null) throw new UsageError('domain set needs a hostname');
   if (action !== 'set' && value != null) throw new UsageError(`domain ${action} takes no hostname`);
 
-  const account = await accountForCommand(options, root);
+  const account = await accountForCommand(options, root, { terminal });
   const credential = (await selectedProfile({ name: account })).gala;
   const api = galaApi({ baseUrl: credential.apiBaseUrl, token: credential.accessToken });
 

package/src/commands/prism.js

@@ -22,7 +22,7 @@ export async function prism({ terminal, options, cwd = process.cwd() }) {
   if (!publication || !ULID.test(publication.siteId ?? '')) {
     throw new UsageError('Run this inside a registered Gala publication, or pass --root.');
   }
-  const account = await accountForCommand(options, root);
+  const account = await accountForCommand(options, root, { terminal });
   const credential = (await selectedProfile({ name: account })).gala;
   const api = galaApi({ baseUrl: credential.apiBaseUrl, token: credential.accessToken });
   const [action = 'status', ...args] = options.positional;

package/src/commands/publish.js

@@ -26,7 +26,7 @@ export async function publish({ terminal, options, cwd = process.cwd(), regenera
   const root = path.resolve(options.value('root') ?? cwd);
   const today = options.value('today');
 
-  const account = await accountForCommand(options, root);
+  const account = await accountForCommand(options, root, { terminal });
   const github = (await selectedProfile({ name: account })).github;
   const git = createGit({ root, token: github.accessToken });