@globio/cli 0.1.8 → 0.1.9

package/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@globio/cli",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "license": "MIT",
   "exports": "./src/index.ts"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globio/cli",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "The official CLI for Globio — game backend as a service",
   "type": "module",
   "license": "MIT",

package/src/auth/login.ts

@@ -1,9 +1,8 @@
 import * as p from '@clack/prompts';
 import { exec } from 'child_process';
-import chalk from 'chalk';
 import { config } from '../lib/config.js';
 import { getConsoleCliAuthUrl, manageRequest, type ManageAccount } from '../lib/manage.js';
-import { getCliVersion, muted, orange, printBanner } from '../lib/banner.js';
+import { failure, getCliVersion, muted, orange, printBanner, white } from '../lib/banner.js';
 
 const version = getCliVersion();
 
@@ -37,11 +36,11 @@ function warnOnDuplicateAccount(accountEmail: string, targetProfileName: string)
 
   console.log('');
   console.log(
-    chalk.yellow('  ⚠  ') +
-      chalk.white(accountEmail) +
-      chalk.gray(' is already logged in under profile ') +
+    failure('  ⚠  ') +
+      white(accountEmail) +
+      '\x1b[2m is already logged in under profile \x1b[0m' +
       orange(`"${duplicate}"`) +
-      chalk.gray('.')
+      '\x1b[2m.\x1b[0m'
   );
   console.log('');
 }
@@ -81,7 +80,7 @@ async function runTokenLogin(profileName: string) {
     p.outro(`Logged in as ${account.email}\nProfile: ${profileName}`);
   } catch (error) {
     spinner.stop('Validation failed.');
-    p.outro(chalk.red(error instanceof Error ? error.message : 'Could not validate token'));
+    p.outro(failure(error instanceof Error ? error.message : 'Could not validate token') + '\x1b[0m');
     process.exit(1);
   }
 }
@@ -112,7 +111,7 @@ async function runBrowserLogin(profileName: string) {
 
       if (status.status === 'expired') {
         spinner.stop('Approval window expired.');
-        p.outro(chalk.red('CLI auth request expired. Try again or use globio login --token.'));
+        p.outro(failure('CLI auth request expired. Try again or use globio login --token.') + '\x1b[0m');
         process.exit(1);
       }
 
@@ -148,7 +147,7 @@ async function runBrowserLogin(profileName: string) {
   }
 
   spinner.stop('Approval timed out.');
-  p.outro(chalk.red('Timed out waiting for browser approval. Try again or use globio login --token.'));
+  p.outro(failure('Timed out waiting for browser approval. Try again or use globio login --token.') + '\x1b[0m');
   process.exit(1);
 }
 
@@ -195,7 +194,7 @@ export async function login(options: { token?: boolean; profile?: string } = {})
   try {
     await runBrowserLogin(profileName);
   } catch (error) {
-    p.outro(chalk.red(error instanceof Error ? error.message : 'Could not connect to Globio.'));
+    p.outro(failure(error instanceof Error ? error.message : 'Could not connect to Globio.') + '\x1b[0m');
     process.exit(1);
   }
 }

package/src/auth/logout.ts

@@ -1,5 +1,5 @@
-import chalk from 'chalk';
 import { config } from '../lib/config.js';
+import { green, inactive } from '../lib/banner.js';
 
 export async function logout(options: { profile?: string } = {}) {
   const activeProfile = config.getActiveProfile();
@@ -7,7 +7,7 @@ export async function logout(options: { profile?: string } = {}) {
   const profile = profileName ? config.getProfile(profileName) : null;
 
   if (!profileName || !profile) {
-    console.log(chalk.yellow(`No active session on profile "${profileName || 'default'}".`));
+    console.log(inactive(`No active session on profile "${profileName || 'default'}".`));
     return;
   }
 
@@ -17,14 +17,14 @@ export async function logout(options: { profile?: string } = {}) {
     const remaining = config.listProfiles();
     if (remaining.length > 0) {
       config.setActiveProfile(remaining[0]);
-      console.log(chalk.green(`Logged out. Switched to profile: ${remaining[0]}`));
+      console.log(green(`Logged out. Switched to profile: ${remaining[0]}`));
       return;
     }
 
     config.setActiveProfile('');
-    console.log(chalk.green('Logged out.'));
+    console.log(green('Logged out.'));
     return;
   }
 
-  console.log(chalk.green(`Logged out profile: ${profileName}`));
+  console.log(green(`Logged out profile: ${profileName}`));
 }

package/src/auth/whoami.ts

@@ -1,37 +1,76 @@
-import chalk from 'chalk';
 import { config } from '../lib/config.js';
-import { muted, orange } from '../lib/banner.js';
+import {
+  failure,
+  getCliVersion,
+  header,
+  inactive,
+  muted,
+  orange,
+  renderTable,
+  white,
+  gold,
+  reset,
+} from '../lib/banner.js';
+
+const version = getCliVersion();
 
 export async function whoami(options: { profile?: string } = {}) {
   const profileName = options.profile ?? config.getActiveProfile() ?? 'default';
   const profile = config.getProfile(profileName);
 
   if (!profile) {
-    console.log(chalk.red('Not logged in. Run: globio login'));
+    console.log(
+      header(version) +
+        '  ' +
+        failure('Not logged in.') +
+        reset +
+        '  Run: globio login\n'
+    );
     return;
   }
 
   const allProfiles = config.listProfiles();
-  const activeProfile = config.getActiveProfile();
+  const active = config.getActiveProfile();
+  const otherProfiles = allProfiles.filter((p) => p !== profileName).join(', ') || '—';
 
-  console.log('');
   console.log(
-    muted('Profile:  ') + orange(profileName) + (profileName === activeProfile ? muted(' (active)') : '')
+    header(
+      version,
+      'Logged in as ' +
+        orange(profile.account_name || profile.account_email) +
+        reset +
+        ' · ' +
+        muted(profile.account_email)
+    )
   );
-  console.log(muted('Account:  ') + profile.account_email);
-  console.log(muted('Name:     ') + (profile.account_name || '—'));
+
   console.log(
-    muted('Project:  ') +
-      (profile.active_project_id
-        ? orange(profile.active_project_name || 'unnamed') + muted(` (${profile.active_project_id})`)
-        : chalk.gray('none — run: globio projects use <id>'))
+    renderTable({
+      columns: [
+        { header: 'Profile', width: 16 },
+        { header: 'Value', width: 44 },
+      ],
+      rows: [
+        [
+          'Profile',
+          profileName === active
+            ? orange(profileName) + reset + ' ' + inactive('(active)')
+            : inactive(profileName),
+        ],
+        ['Other profiles', inactive(otherProfiles)],
+        ['Account', white(profile.account_name || '—')],
+        ['Organization', white(profile.org_name || '—')],
+        [
+          'Active project',
+          profile.active_project_id
+            ? gold(profile.active_project_name || 'unnamed') +
+              reset +
+              ' ' +
+              inactive(profile.active_project_id)
+            : inactive('none — run: globio projects use <id>'),
+        ],
+      ],
+    })
   );
-
-  if (allProfiles.length > 1) {
-    console.log('');
-    console.log(
-      muted('Other profiles: ') + allProfiles.filter((name) => name !== profileName).join(', ')
-    );
-  }
   console.log('');
 }

package/src/commands/functions.ts

@@ -1,11 +1,22 @@
-import chalk from 'chalk';
 import type { CodeFunction, CodeInvocation } from '@globio/sdk';
 import ora from 'ora';
 import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { config } from '../lib/config.js';
-import { gold, muted, orange } from '../lib/banner.js';
+import {
+  failure,
+  getCliVersion,
+  green,
+  header,
+  inactive,
+  muted,
+  orange,
+  gold,
+  renderTable,
+} from '../lib/banner.js';
 import { getClient } from '../lib/sdk.js';
 
+const version = getCliVersion();
+
 function resolveProfileName(profile?: string) {
   return profile ?? config.getActiveProfile() ?? 'default';
 }
@@ -13,32 +24,39 @@ function resolveProfileName(profile?: string) {
 export async function functionsList(options: { profile?: string } = {}) {
   const profileName = resolveProfileName(options.profile);
   const client = getClient(profileName);
-  const spinner = ora('Fetching functions...').start();
   const result = await client.code.listFunctions();
-  spinner.stop();
 
   if (!result.success || !result.data.length) {
-    console.log(chalk.gray('No functions found.'));
+    console.log(header(version) + '  ' + muted('No functions found.') + '\n');
     return;
   }
 
-  console.log('');
-  result.data.forEach((fn: CodeFunction) => {
-    const status = fn.active ? '\x1b[32m●\x1b[0m' : '\x1b[2m○\x1b[0m';
-    const type =
-      fn.type === 'hook' ? gold('[hook]') : orange('[function]');
-    console.log('  ' + status + '  ' + type + '  ' + fn.slug);
-    if (fn.type === 'hook' && fn.trigger_event) {
-      console.log(muted('           trigger: ' + fn.trigger_event));
-    }
-  });
+  const rows = result.data.map((fn: CodeFunction) => [
+    fn.type === 'hook' ? gold(fn.slug) : orange(fn.slug),
+    fn.type === 'hook' ? gold('hook') : orange('function'),
+    fn.type === 'hook' && fn.trigger_event ? gold(fn.trigger_event) : muted('http'),
+    fn.active ? green('active') : inactive('inactive'),
+  ]);
+
+  console.log(header(version));
+  console.log(
+    renderTable({
+      columns: [
+        { header: 'Function', width: 24 },
+        { header: 'Type', width: 10 },
+        { header: 'Trigger', width: 20 },
+        { header: 'Status', width: 10 },
+      ],
+      rows,
+    })
+  );
   console.log('');
 }
 
 export async function functionsCreate(slug: string, _options: { profile?: string } = {}) {
   const filename = `${slug}.js`;
   if (existsSync(filename)) {
-    console.log(chalk.yellow(`${filename} already exists.`));
+    console.log(inactive(`${filename} already exists.`));
     return;
   }
 
@@ -58,10 +76,8 @@ async function handler(input, globio) {
 }
 `;
   writeFileSync(filename, template);
-  console.log(chalk.green(`Created ${filename}`));
-  console.log(
-    chalk.gray(`Deploy with: npx @globio/cli functions deploy ${slug}`)
-  );
+  console.log(green(`Created ${filename}`));
+  console.log(muted(`Deploy with: npx @globio/cli functions deploy ${slug}`));
 }
 
 export async function functionsDeploy(
@@ -71,7 +87,7 @@ export async function functionsDeploy(
   const filename = options.file ?? `${slug}.js`;
   if (!existsSync(filename)) {
     console.log(
-      chalk.red(
+      failure(
         `File not found: ${filename}. Create it with: npx @globio/cli functions create ${slug}`
       )
     );
@@ -117,7 +133,7 @@ export async function functionsInvoke(
     try {
       input = JSON.parse(options.input) as Record<string, unknown>;
     } catch {
-      console.error(chalk.red('--input must be valid JSON'));
+      console.error(failure('--input must be valid JSON'));
       process.exit(1);
     }
   }
@@ -129,7 +145,7 @@ export async function functionsInvoke(
   spinner.stop();
 
   if (!result.success) {
-    console.log(chalk.red('Invocation failed'));
+    console.log(failure('Invocation failed'));
     console.error(result.error.message);
     return;
   }
@@ -147,28 +163,38 @@ export async function functionsLogs(
   const limit = options.limit ? parseInt(options.limit, 10) : 20;
   const profileName = resolveProfileName(options.profile);
   const client = getClient(profileName);
-  const spinner = ora('Fetching invocations...').start();
   const result = await client.code.getInvocations(slug, limit);
-  spinner.stop();
 
   if (!result.success || !result.data.length) {
-    console.log(chalk.gray('No invocations yet.'));
+    console.log(header(version) + '  ' + muted('No invocations yet.') + '\n');
     return;
   }
 
-  console.log('');
-  result.data.forEach((inv: CodeInvocation) => {
-    const status = inv.success
-      ? '\x1b[38;2;244;140;6m✓\x1b[0m'
-      : '\x1b[31m✗\x1b[0m';
+  const rows = result.data.map((inv: CodeInvocation) => {
     const date = new Date(inv.invoked_at * 1000)
       .toISOString()
       .replace('T', ' ')
       .slice(0, 19);
-    console.log(
-      `  ${status}  ${chalk.gray(date)}  ${inv.duration_ms}ms  ${chalk.gray(`[${inv.trigger_type}]`)}`
-    );
+    return [
+      muted(date),
+      muted(inv.trigger_type),
+      muted(inv.duration_ms + 'ms'),
+      inv.success ? green('success') : failure('failed'),
+    ];
   });
+
+  console.log(header(version));
+  console.log(
+    renderTable({
+      columns: [
+        { header: 'Time', width: 21 },
+        { header: 'Trigger', width: 9 },
+        { header: 'Duration', width: 10 },
+        { header: 'Status', width: 10 },
+      ],
+      rows,
+    })
+  );
   console.log('');
 }
 

package/src/commands/init.ts

@@ -2,6 +2,7 @@ import * as p from '@clack/prompts';
 import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { config } from '../lib/config.js';
 import {
+  failure,
   getCliVersion,
   muted,
   orange,
@@ -21,7 +22,7 @@ export async function init(options: { profile?: string } = {}) {
   const profileName = options.profile ?? config.getActiveProfile() ?? 'default';
   const profile = config.getProfile(profileName);
   if (!profile) {
-    console.log('Run: npx @globio/cli login --profile ' + profileName);
+    console.log(failure('Run: npx @globio/cli login --profile ' + profileName));
     process.exit(1);
   }
 
@@ -37,7 +38,7 @@ export async function init(options: { profile?: string } = {}) {
   const { projectId: activeProjectId } = config.requireProject(profileName);
 
   if (!activeProjectKey) {
-    console.log('No project API key cached. Run: npx @globio/cli projects use ' + activeProjectId);
+    console.log(failure('No project API key cached. Run: npx @globio/cli projects use ' + activeProjectId));
     process.exit(1);
   }
 

package/src/commands/migrate.ts

@@ -1,9 +1,10 @@
 import * as p from '@clack/prompts';
-import chalk from 'chalk';
 import { basename } from 'path';
 import {
+  failure,
   getCliVersion,
   gold,
+  green,
   muted,
   orange,
   printBanner,
@@ -47,14 +48,14 @@ export async function migrateFirestore(options: MigrateFirestoreOptions) {
     const snapshot = await firestore.listCollections();
     collections = snapshot.map((collection) => collection.id);
     console.log(
-      chalk.cyan(
+      green(
         `Found ${collections.length} collections: ${collections.join(', ')}`
       )
     );
   } else if (options.collection) {
     collections = [options.collection];
   } else {
-    console.log(chalk.red('Specify --collection <name> or --all'));
+    console.log(failure('Specify --collection <name> or --all'));
     process.exit(1);
   }
 
@@ -128,17 +129,17 @@ export async function migrateFirestore(options: MigrateFirestoreOptions) {
     bar.stop();
 
     console.log(
-      chalk.green(`  ✓ ${results[collectionId].success} documents migrated`)
+      green(`  ✓ ${results[collectionId].success} documents migrated`)
     );
     if (indexFieldCount > 0) {
       console.log(
-        chalk.gray(`  Indexes created for ${indexFieldCount} fields`)
+        muted(`  Indexes created for ${indexFieldCount} fields`)
       );
     }
     if (results[collectionId].failed > 0) {
-      console.log(chalk.red(`  ✗ ${results[collectionId].failed} failed`));
+      console.log(failure(`  ✗ ${results[collectionId].failed} failed`) + '\x1b[0m');
       console.log(
-        chalk.gray(
+        muted(
           '  Failed IDs: ' +
             results[collectionId].failedIds.slice(0, 10).join(', ') +
             (results[collectionId].failedIds.length > 10 ? '...' : '')
@@ -177,7 +178,7 @@ export async function migrateFirebaseStorage(options: MigrateStorageOptions) {
 
   const [files] = await bucket.getFiles(prefix ? { prefix } : {});
 
-  console.log(chalk.cyan(`Found ${files.length} files to migrate`));
+  console.log(green(`Found ${files.length} files to migrate`));
 
   const bar = createProgressBar('Storage');
   bar.start(files.length, 0);
@@ -222,9 +223,9 @@ export async function migrateFirebaseStorage(options: MigrateStorageOptions) {
   bar.stop();
 
   console.log('');
-  console.log(chalk.green(`  ✓ ${success} files migrated`));
+  console.log(green(`  ✓ ${success} files migrated`));
   if (failed > 0) {
-    console.log(chalk.red(`  ✗ ${failed} failed`));
+    console.log(failure(`  ✗ ${failed} failed`) + '\x1b[0m');
   }
 
   p.outro(

package/src/commands/profiles.ts

@@ -1,26 +1,53 @@
-import chalk from 'chalk';
-import { orange, muted } from '../lib/banner.js';
+import {
+  getCliVersion,
+  green,
+  header,
+  inactive,
+  muted,
+  orange,
+  renderTable,
+  reset,
+  white,
+} from '../lib/banner.js';
 import { config } from '../lib/config.js';
 
+const version = getCliVersion();
+
 export async function profilesList() {
   const profiles = config.listProfiles();
   const active = config.getActiveProfile();
 
   if (!profiles.length) {
-    console.log(chalk.gray('No profiles found. Run: globio login'));
+    console.log(
+      header(version) + '  ' + muted('No profiles. Run: globio login') + '\n'
+    );
     return;
   }
 
-  console.log('');
-  for (const name of profiles) {
-    const data = config.getProfile(name);
+  const rows = profiles.map((name) => {
+    const p = config.getProfile(name);
     const isActive = name === active;
-    const bullet = isActive ? orange('●') : chalk.gray('○');
-    const label = isActive ? orange(name) : chalk.white(name);
-    const email = data?.account_email ? muted(data.account_email) : chalk.gray('unknown');
-    const tag = isActive ? muted(' (active)') : '';
+    return [
+      isActive ? orange(name) : inactive(name),
+      p?.account_email
+        ? isActive
+          ? white(p.account_email)
+          : muted(p.account_email)
+        : inactive('—'),
+      isActive ? green('active') : inactive('—'),
+    ];
+  });
 
-    console.log(`  ${bullet}  ${label}   ${email}${tag}`);
-  }
+  console.log(header(version));
+  console.log(
+    renderTable({
+      columns: [
+        { header: 'Profile', width: 16 },
+        { header: 'Account', width: 36 },
+        { header: 'Status', width: 10 },
+      ],
+      rows,
+    })
+  );
   console.log('');
 }

package/src/commands/projects.ts

@@ -1,12 +1,28 @@
 import * as p from '@clack/prompts';
-import chalk from 'chalk';
 import { config } from '../lib/config.js';
 import {
   manageRequest,
   type ManageOrg,
   type ManageProject,
   type ManageProjectKey,
+  type ManageProjectServices,
 } from '../lib/manage.js';
+import {
+  footer,
+  getCliVersion,
+  gold,
+  green,
+  header,
+  inactive,
+  muted,
+  orange,
+  renderTable,
+  reset,
+  white,
+  failure,
+} from '../lib/banner.js';
+
+const version = getCliVersion();
 
 function slugify(value: string) {
   return value
@@ -44,30 +60,36 @@ export async function projectsList(options: { profile?: string } = {}) {
 
   const projects = await manageRequest<ManageProject[]>('/projects', { profileName });
   const activeProjectId = config.getProfile(profileName)?.active_project_id;
-  const grouped = new Map<string, ManageProject[]>();
-
-  for (const project of projects) {
-    const list = grouped.get(project.org_name) ?? [];
-    list.push(project);
-    grouped.set(project.org_name, list);
-  }
 
-  console.log('');
   if (!projects.length) {
-    console.log(chalk.gray('No projects found.'));
-    console.log('');
+    console.log(header(version) + '  ' + muted('No projects found.') + '\n');
     return;
   }
 
-  for (const [orgName, orgProjects] of grouped.entries()) {
-    console.log(chalk.cyan(`org: ${orgName}`));
-    for (const project of orgProjects) {
-      const marker = project.id === activeProjectId ? chalk.green('●') : chalk.gray('○');
-      const active = project.id === activeProjectId ? chalk.green('  (active)') : '';
-      console.log(`  ${marker} ${project.slug.padEnd(22)} ${chalk.gray(project.id)}${active}`);
-    }
-    console.log('');
-  }
+  const rows = projects.map((project) => [
+    activeProjectId === project.id
+      ? gold(project.name) + reset + ' ' + orange('●') + reset
+      : white(project.name),
+    muted(project.id),
+    muted(project.org_name || project.org_id),
+    inactive(project.environment?.slice(0, 4) ?? 'dev'),
+  ]);
+
+  console.log(header(version));
+  console.log(
+    renderTable({
+      columns: [
+        { header: 'Project', width: 24 },
+        { header: 'ID', width: 26 },
+        { header: 'Org', width: 16 },
+        { header: 'Env', width: 6 },
+      ],
+      rows,
+    })
+  );
+  console.log(
+    footer('● active project · run globio projects use <id> to switch')
+  );
 }
 
 export async function projectsUse(projectId: string, options: { profile?: string } = {}) {
@@ -77,7 +99,7 @@ export async function projectsUse(projectId: string, options: { profile?: string
   const projects = await manageRequest<ManageProject[]>('/projects', { profileName });
   const project = projects.find((item) => item.id === projectId);
   if (!project) {
-    console.log(chalk.red(`Project not found: ${projectId}`));
+    console.log(failure(`Project not found: ${projectId}`));
     process.exit(1);
   }
 
@@ -87,13 +109,12 @@ export async function projectsUse(projectId: string, options: { profile?: string
   config.setProfile(profileName, {
     active_project_id: project.id,
     active_project_name: project.name,
+    org_name: project.org_name,
     project_api_key: apiKey,
   });
   config.setActiveProfile(profileName);
 
-  console.log(
-    chalk.green('Active project set to: ') + chalk.cyan(`${project.name} (${project.id})`)
-  );
+  console.log(green('Active project: ') + `${project.name} (${project.id})`);
 }
 
 export async function projectsCreate(options: { profile?: string } = {}) {
@@ -102,7 +123,7 @@ export async function projectsCreate(options: { profile?: string } = {}) {
 
   const orgs = await manageRequest<ManageOrg[]>('/orgs', { profileName });
   if (!orgs.length) {
-    console.log(chalk.red('No organizations found. Create one in the console first.'));
+    console.log(failure('No organizations found. Create one in the console first.'));
     process.exit(1);
   }
 
@@ -168,14 +189,15 @@ export async function projectsCreate(options: { profile?: string } = {}) {
   config.setProfile(profileName, {
     active_project_id: result.project.id,
     active_project_name: result.project.name,
+    org_name: orgs.find((org) => org.id === orgId)?.name,
     project_api_key: result.keys.server,
   });
   config.setActiveProfile(profileName);
 
   console.log('');
-  console.log(chalk.green('Project created successfully.'));
-  console.log(chalk.cyan('Project: ') + `${result.project.name} (${result.project.id})`);
-  console.log(chalk.cyan('Client key: ') + result.keys.client);
-  console.log(chalk.cyan('Server key: ') + result.keys.server);
+  console.log(green('Project created successfully.'));
+  console.log(orange('Project: ') + reset + `${result.project.name} (${result.project.id})`);
+  console.log(orange('Client key: ') + reset + result.keys.client);
+  console.log(orange('Server key: ') + reset + result.keys.server);
   console.log('');
 }