ardent-cli-beta 0.0.13 → 0.0.15

package/dist/commands/branch/list.js

@@ -2,7 +2,7 @@ import { ArdentCommand } from '../../command.js';
 import { listBranches } from '../../branches/client.js';
 import { replaceBranchCache } from '../../branches/context.js';
 import { requireConnector } from '../../connectors/context.js';
-import { terminalText } from '../../terminal.js';
+import { renderTable } from '../../table.js';
 export default class BranchList extends ArdentCommand {
     static description = 'List branches in the selected connector';
     static helpGroup = 'Branches';
@@ -13,9 +13,15 @@ export default class BranchList extends ArdentCommand {
         if (!this.jsonEnabled()) {
             if (branches.length === 0)
                 this.log('No branches found.');
-            const width = Math.max(0, ...branches.map(({ name }) => terminalText(name).length));
-            for (const branch of branches)
-                this.log(`${branch.id === updated.selectedBranch?.id ? '*' : ' '} ${terminalText(branch.name).padEnd(width)}  ${terminalText(branch.state)}`);
+            else {
+                const lines = renderTable(branches, [
+                    { header: 'Selected', value: ({ id }) => id === updated.selectedBranch?.id ? '●' : '' },
+                    { header: 'Title', maxWidth: 30, shrinkPriority: 0, value: ({ name }) => name },
+                    { header: 'Status', shrinkPriority: 1, value: ({ state }) => state },
+                ], process.stdout.columns ?? 120);
+                for (const line of lines)
+                    this.log(line);
+            }
         }
         return { branches };
     }

package/dist/commands/connector/list.js

@@ -2,7 +2,7 @@ import { loadSession } from '../../auth/credentials.js';
 import { ArdentCommand } from '../../command.js';
 import { listConnectors } from '../../connectors/client.js';
 import { replaceConnectorCache } from '../../connectors/context.js';
-import { terminalText } from '../../terminal.js';
+import { renderTable } from '../../table.js';
 export default class ConnectorList extends ArdentCommand {
     static description = 'List connectors in the selected project';
     static helpGroup = 'Connectors';
@@ -17,9 +17,20 @@ export default class ConnectorList extends ArdentCommand {
         if (!this.jsonEnabled()) {
             if (connectors.length === 0)
                 this.log('No connectors found.');
-            const nameWidth = Math.max(0, ...connectors.map(({ name }) => terminalText(name).length));
-            for (const connector of connectors) {
-                this.log(`${terminalText(connector.name).padEnd(nameWidth)}  ${terminalText(connector.status)}`);
+            else {
+                const lines = renderTable(connectors, [
+                    { header: 'Title', maxWidth: 30, shrinkPriority: 1, value: ({ name }) => name },
+                    { header: 'Status', shrinkPriority: 2, value: ({ status }) => status },
+                    {
+                        header: 'Source',
+                        maxWidth: 50,
+                        minWidth: 20,
+                        shrinkPriority: 0,
+                        value: ({ source }) => `${source.host}:${source.port}/${source.database}`,
+                    },
+                ], process.stdout.columns ?? 120);
+                for (const line of lines)
+                    this.log(line);
             }
         }
         return { connectors };

package/dist/commands/member/list.js

@@ -1,7 +1,7 @@
 import { loadSession } from '../../auth/credentials.js';
 import { ArdentCommand } from '../../command.js';
 import { listMemberships, listReadableInvitations } from '../../members/client.js';
-import { terminalText } from '../../terminal.js';
+import { renderTable } from '../../table.js';
 export default class MemberList extends ArdentCommand {
     static description = 'List organization members and pending invitations';
     static helpGroup = 'Members';
@@ -17,22 +17,27 @@ export default class MemberList extends ArdentCommand {
         if (!this.jsonEnabled()) {
             const rows = [
                 ...memberships.map((membership) => ({
-                    email: terminalText(membership.email),
-                    role: terminalText(membership.role_display_name),
+                    email: membership.email,
+                    role: membership.role_display_name,
                     status: 'Active',
                 })),
                 ...readableInvitations.map((invitation) => ({
-                    email: terminalText(invitation.email),
-                    role: terminalText(invitation.role_display_name),
+                    email: invitation.email,
+                    role: invitation.role_display_name,
                     status: 'Pending',
                 })),
             ];
             if (rows.length === 0)
                 this.log('No members found.');
-            const emailWidth = Math.max(0, ...rows.map(({ email }) => email.length));
-            const roleWidth = Math.max(0, ...rows.map(({ role }) => role.length));
-            for (const row of rows)
-                this.log(`${row.email.padEnd(emailWidth)}  ${row.role.padEnd(roleWidth)}  ${row.status}`);
+            else {
+                const lines = renderTable(rows, [
+                    { header: 'Email', maxWidth: 40, minWidth: 12, shrinkPriority: 0, value: ({ email }) => email },
+                    { header: 'Role', maxWidth: 20, shrinkPriority: 1, value: ({ role }) => role },
+                    { header: 'Status', shrinkPriority: 2, value: ({ status }) => status },
+                ], process.stdout.columns ?? 120);
+                for (const line of lines)
+                    this.log(line);
+            }
             if (invitations === undefined)
                 this.log('Pending invitations are not visible with this login.');
         }

package/dist/commands/project/list.js

@@ -3,7 +3,7 @@ import { loadSession } from '../../auth/credentials.js';
 import { ArdentCommand } from '../../command.js';
 import { listProjects } from '../../projects/client.js';
 import { replaceProjectCache } from '../../projects/context.js';
-import { terminalText } from '../../terminal.js';
+import { renderTable } from '../../table.js';
 export default class ProjectList extends ArdentCommand {
     static description = 'List projects';
     static helpGroup = 'Projects';
@@ -18,10 +18,23 @@ export default class ProjectList extends ArdentCommand {
         if (!this.jsonEnabled()) {
             if (projects.length === 0)
                 this.log('No projects found.');
-            for (const project of projects) {
-                const name = terminalText(project.name);
-                const line = project.id === refreshedSession.selectedProject?.id ? `● ${name}` : `  ${name}`;
-                this.log(project.id === refreshedSession.selectedProject?.id ? ux.colorize('green', line) : line);
+            else {
+                const lines = renderTable(projects, [
+                    {
+                        header: 'Title',
+                        maxWidth: 30,
+                        shrinkPriority: 0,
+                        value: ({ id, name }) => `${id === refreshedSession.selectedProject?.id ? '●' : ' '} ${name}`,
+                    },
+                ], process.stdout.columns ?? 120);
+                const selectedIndex = projects.findIndex(({ id }) => id === refreshedSession.selectedProject?.id);
+                if (selectedIndex >= 0) {
+                    const lineIndex = selectedIndex + 3;
+                    const value = lines[lineIndex].slice(2, -2).trimEnd();
+                    lines[lineIndex] = `${lines[lineIndex].slice(0, 2)}${ux.colorize('green', value)}${lines[lineIndex].slice(value.length + 2)}`;
+                }
+                for (const line of lines)
+                    this.log(line);
             }
         }
         return { projects };

package/dist/commands/project/switch.js

@@ -1,28 +1,45 @@
 import { Args } from '@oclif/core';
 import { loadSession } from '../../auth/credentials.js';
 import { ArdentCommand } from '../../command.js';
-import { cachedProjectNamed, selectProject } from '../../projects/context.js';
+import { listProjects } from '../../projects/client.js';
+import { cachedProjectNamed, replaceProjectCache, selectProject } from '../../projects/context.js';
 import { terminalText } from '../../terminal.js';
 export default class ProjectSwitch extends ArdentCommand {
     static args = {
         name: Args.string({ description: 'Project name', required: true }),
     };
-    static description = 'Switch to a project from the local project list';
+    static description = 'Switch to a project in the logged-in organization';
     static helpGroup = 'Projects';
     async run() {
         const { args } = await this.parse(ProjectSwitch);
         const name = args.name.trim();
         if (!name)
             this.error('Project name cannot be empty.');
-        const session = await loadSession(this.config.configDir);
+        let session = await loadSession(this.config.configDir);
         if (!session?.organization)
             this.error('You must be logged in to run this command. Run ardent-beta login.');
-        const project = cachedProjectNamed(session, name);
-        if (!project)
-            this.error(`Project ${JSON.stringify(name)} not found. Run ardent-beta project list.`);
+        // A cached name switches without a request, which is what makes this cheap
+        // enough to run constantly. A miss is not an answer though: the cache only
+        // holds what the last `project list` returned, so a project created since
+        // then reported that it did not exist. Only the organization's list can say
+        // that, and it is already the authority `project delete` defers to.
+        let project = cachedProjectNamed(session, name);
+        if (!project) {
+            const projects = await listProjects(session.token, session.organization.id);
+            // Refused before anything is written. replaceProjectCache is not a read:
+            // it persists, it drops the connector and branch context when the
+            // selection moves, and it adopts the sole remaining project when the
+            // selected one is gone. Running it first would let a mistyped name exit
+            // non-zero having quietly selected a different project underneath.
+            project = projects.find((candidate) => candidate.name === name);
+            if (!project) {
+                this.error(`Project ${JSON.stringify(name)} not found in organization ${JSON.stringify(session.organization.name)}.`);
+            }
+            session = await replaceProjectCache(this.config.configDir, session, projects);
+        }
         await selectProject(this.config.configDir, session, project);
         if (!this.jsonEnabled())
             this.log(`✓ Switched to project ${terminalText(project.name)}`);
-        return project;
+        return { id: project.id, name: project.name };
     }
 }

package/dist/table.d.ts

@@ -0,0 +1,8 @@
+export interface TableColumn<Row> {
+    header: string;
+    maxWidth?: number;
+    minWidth?: number;
+    shrinkPriority?: number;
+    value: (row: Row) => string;
+}
+export declare function renderTable<Row>(rows: Row[], columns: TableColumn<Row>[], terminalWidth?: number): string[];

package/dist/table.js

@@ -0,0 +1,53 @@
+import stringWidth from 'string-width';
+import { terminalText } from './terminal.js';
+const graphemeSegmenter = new Intl.Segmenter(undefined, { granularity: 'grapheme' });
+export function renderTable(rows, columns, terminalWidth = 120) {
+    const headers = columns.map(({ header }) => terminalText(header));
+    const values = rows.map((row) => columns.map(({ value }) => terminalText(value(row))));
+    const widths = columns.map((column, index) => {
+        const headerWidth = stringWidth(headers[index]);
+        const naturalWidth = Math.max(headerWidth, ...values.map((row) => stringWidth(row[index])));
+        return Math.min(naturalWidth, Math.max(headerWidth, column.maxWidth ?? naturalWidth));
+    });
+    const preferredMinimumWidths = columns.map((column, index) => Math.min(widths[index], Math.max(stringWidth(headers[index]), column.minWidth ?? stringWidth(headers[index]))));
+    const frameWidth = columns.length * 3 + 1;
+    const availableWidth = Number.isFinite(terminalWidth) ? Math.floor(terminalWidth) : 120;
+    const narrowestTableWidth = frameWidth + columns.length;
+    let overflow = widths.reduce((total, width) => total + width, frameWidth) - Math.max(narrowestTableWidth, availableWidth);
+    const shrinkOrder = columns
+        .map((column, index) => ({ index, priority: column.shrinkPriority ?? index }))
+        .sort((left, right) => left.priority - right.priority);
+    for (const minimumWidths of [preferredMinimumWidths, columns.map(() => 1)]) {
+        for (const { index } of shrinkOrder) {
+            const reduction = Math.min(Math.max(0, overflow), widths[index] - minimumWidths[index]);
+            widths[index] -= reduction;
+            overflow -= reduction;
+        }
+    }
+    const border = (left, divider, right) => `${left}${widths.map((width) => '─'.repeat(width + 2)).join(divider)}${right}`;
+    const cell = (value, width) => {
+        let display = value;
+        if (stringWidth(value) > width) {
+            const contentWidth = width - stringWidth('…');
+            let truncatedWidth = 0;
+            display = '';
+            for (const { segment } of graphemeSegmenter.segment(value)) {
+                const segmentWidth = stringWidth(segment);
+                if (truncatedWidth + segmentWidth > contentWidth)
+                    break;
+                display += segment;
+                truncatedWidth += segmentWidth;
+            }
+            display += '…';
+        }
+        return display + ' '.repeat(width - stringWidth(display));
+    };
+    const line = (row) => `│ ${row.map((value, index) => cell(value, widths[index])).join(' │ ')} │`;
+    return [
+        border('┌', '┬', '┐'),
+        line(headers),
+        border('├', '┼', '┤'),
+        ...values.map(line),
+        border('└', '┴', '┘'),
+    ];
+}

package/oclif.manifest.json

@@ -546,7 +546,7 @@
           "required": true
         }
       },
-      "description": "Switch to a project from the local project list",
+      "description": "Switch to a project in the logged-in organization",
       "flags": {
         "json": {
           "description": "Format output as json.",
@@ -574,5 +574,5 @@
       ]
     }
   },
-  "version": "0.0.13"
+  "version": "0.0.15"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ardent-cli-beta",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "The Ardent command-line interface",
   "license": "Apache-2.0",
   "type": "module",
@@ -41,7 +41,8 @@
   },
   "dependencies": {
     "@oclif/core": "^5.0.0",
-    "@oclif/plugin-autocomplete": "^4.0.0"
+    "@oclif/plugin-autocomplete": "^4.0.0",
+    "string-width": "^4.2.3"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",