ardent-cli-beta 0.0.7 → 0.0.8

package/README.md

@@ -11,7 +11,8 @@ API token for CI and automation; `ARDENT_TOKEN` supplies the same flag
 non-interactively. `ardent status` and `ardent logout` inspect and remove that
 local session. The CLI always talks to Ardent's production control plane. Oclif
 provides help, version, autocomplete, and native JSON command behavior. Resource
-commands and resource context are not implemented yet.
+context is retained from login. Project listing, creation, and local context
+switching are implemented; other resource commands are not implemented yet.
 
 Set `ARDENT_API_URL` to point the CLI at a development control plane. Without
 it, the CLI uses `https://production.tryardent.com`.
@@ -22,6 +23,9 @@ npm run build
 ./bin/run.js --help
 ./bin/run.js login
 ./bin/run.js login --token <token>
+./bin/run.js project list
+./bin/run.js project create "My project"
+./bin/run.js project switch "My project"
 ARDENT_API_URL=http://localhost:8080 ./bin/run.js login --token <token>
 ```
 

package/dist/auth/credentials.d.ts

@@ -1,6 +1,16 @@
 export interface Session {
+    organization?: {
+        id: string;
+        name: string;
+    };
+    projects?: ProjectIdentity[];
+    selectedProject?: ProjectIdentity;
     token: string;
 }
+export interface ProjectIdentity {
+    id: string;
+    name: string;
+}
 export declare function loadSession(directory: string): Promise<Session | undefined>;
 export declare function saveSession(directory: string, session: Session): Promise<void>;
 export declare function clearSession(directory: string): Promise<void>;

package/dist/auth/credentials.js

@@ -16,12 +16,54 @@ export async function loadSession(directory) {
         const session = JSON.parse(contents);
         if (typeof session.token !== 'string' || session.token.length === 0)
             throw new Error();
-        return { token: session.token };
+        if (session.organization === undefined) {
+            if (session.projects !== undefined || session.selectedProject !== undefined)
+                throw new Error();
+            return { token: session.token };
+        }
+        if (typeof session.organization !== 'object' ||
+            session.organization === null ||
+            typeof session.organization.id !== 'string' ||
+            session.organization.id.length === 0 ||
+            typeof session.organization.name !== 'string' ||
+            session.organization.name.length === 0) {
+            throw new Error();
+        }
+        let projects;
+        if (session.projects !== undefined) {
+            if (!Array.isArray(session.projects) || session.projects.some((project) => !isProjectIdentity(project)))
+                throw new Error();
+            projects = session.projects.map(({ id, name }) => ({ id, name }));
+            if (new Set(projects.map(({ id }) => id)).size !== projects.length)
+                throw new Error();
+            if (new Set(projects.map(({ name }) => name)).size !== projects.length)
+                throw new Error();
+        }
+        let selectedProject;
+        if (session.selectedProject !== undefined) {
+            if (!isProjectIdentity(session.selectedProject) || projects === undefined)
+                throw new Error();
+            selectedProject = projects.find(({ id, name }) => id === session.selectedProject?.id && name === session.selectedProject.name);
+            if (!selectedProject)
+                throw new Error();
+        }
+        return {
+            organization: session.organization,
+            ...(projects === undefined ? {} : { projects }),
+            ...(selectedProject === undefined ? {} : { selectedProject }),
+            token: session.token,
+        };
     }
     catch {
         throw new Error(`Ardent configuration at ${configPath(directory)} is invalid. Run ardent logout, then log in again.`);
     }
 }
+function isProjectIdentity(value) {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const project = value;
+    return typeof project.id === 'string' && project.id.length > 0 && typeof project.name === 'string' && project.name.length > 0;
+}
 export async function saveSession(directory, session) {
     await mkdir(directory, { mode: 0o700, recursive: true });
     await chmod(directory, 0o700);

package/dist/auth/token.js

@@ -9,10 +9,14 @@ export async function loginWithToken(directory, value, signal) {
         organizations.some((organization) => typeof organization !== 'object' ||
             organization === null ||
             typeof organization.id !== 'string' ||
-            typeof organization.name !== 'string')) {
+            organization.id.length === 0 ||
+            typeof organization.name !== 'string' ||
+            organization.name.length === 0)) {
         throw new Error('Ardent API returned an invalid organization response.');
     }
+    if (organizations.length !== 1)
+        throw new Error('Ardent API token must belong to exactly one organization.');
     signal?.throwIfAborted();
-    await saveSession(directory, { token });
+    await saveSession(directory, { organization: organizations[0], token });
     return organizations;
 }

package/dist/commands/project/create.d.ts

@@ -0,0 +1,10 @@
+import { ArdentCommand } from '../../command.js';
+import { type Project } from '../../projects/client.js';
+export default class ProjectCreate extends ArdentCommand {
+    static args: {
+        name: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static description: string;
+    static helpGroup: string;
+    run(): Promise<Project>;
+}

package/dist/commands/project/create.js

@@ -0,0 +1,29 @@
+import { Args } from '@oclif/core';
+import { loadSession } from '../../auth/credentials.js';
+import { ArdentCommand } from '../../command.js';
+import { createProject } from '../../projects/client.js';
+import { selectProject } from '../../projects/context.js';
+import { terminalText } from '../../terminal.js';
+export default class ProjectCreate extends ArdentCommand {
+    static args = {
+        name: Args.string({ description: 'Project name', required: true }),
+    };
+    static description = 'Create a project';
+    static helpGroup = 'Projects';
+    async run() {
+        const { args } = await this.parse(ProjectCreate);
+        const name = args.name.trim();
+        if (!name)
+            this.error('Project name cannot be empty.');
+        const session = await loadSession(this.config.configDir);
+        if (!session)
+            this.error('Not logged in to Ardent. Run ardent login.');
+        if (!session.organization)
+            this.error('You must be logged in to run this command. Run ardent login.');
+        const project = await createProject(session.token, session.organization.id, name);
+        await selectProject(this.config.configDir, session, project);
+        if (!this.jsonEnabled())
+            this.log(`✓ Created project ${terminalText(project.name)}`);
+        return project;
+    }
+}

package/dist/commands/project/list.d.ts

@@ -0,0 +1,9 @@
+import { ArdentCommand } from '../../command.js';
+import { type Project } from '../../projects/client.js';
+export default class ProjectList extends ArdentCommand {
+    static description: string;
+    static helpGroup: string;
+    run(): Promise<{
+        projects: Project[];
+    }>;
+}

package/dist/commands/project/list.js

@@ -0,0 +1,29 @@
+import { ux } from '@oclif/core';
+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';
+export default class ProjectList extends ArdentCommand {
+    static description = 'List projects';
+    static helpGroup = 'Projects';
+    async run() {
+        const session = await loadSession(this.config.configDir);
+        if (!session)
+            this.error('Not logged in to Ardent. Run ardent login.');
+        if (!session.organization)
+            this.error('You must be logged in to run this command. Run ardent login.');
+        const projects = await listProjects(session.token, session.organization.id);
+        const refreshedSession = await replaceProjectCache(this.config.configDir, session, projects);
+        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);
+            }
+        }
+        return { projects };
+    }
+}

package/dist/commands/project/switch.d.ts

@@ -0,0 +1,12 @@
+import { ArdentCommand } from '../../command.js';
+export default class ProjectSwitch extends ArdentCommand {
+    static args: {
+        name: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static description: string;
+    static helpGroup: string;
+    run(): Promise<{
+        id: string;
+        name: string;
+    }>;
+}

package/dist/commands/project/switch.js

@@ -0,0 +1,28 @@
+import { Args } from '@oclif/core';
+import { loadSession } from '../../auth/credentials.js';
+import { ArdentCommand } from '../../command.js';
+import { cachedProjectNamed, 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 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);
+        if (!session?.organization)
+            this.error('You must be logged in to run this command. Run ardent login.');
+        const project = cachedProjectNamed(session, name);
+        if (!project)
+            this.error(`Project ${JSON.stringify(name)} not found. Run ardent project list.`);
+        await selectProject(this.config.configDir, session, project);
+        if (!this.jsonEnabled())
+            this.log(`✓ Switched to project ${terminalText(project.name)}`);
+        return project;
+    }
+}

package/dist/projects/client.d.ts

@@ -0,0 +1,9 @@
+export interface Project {
+    created_at: string;
+    id: string;
+    name: string;
+    organization_id: string;
+    updated_at: string;
+}
+export declare function listProjects(token: string, organizationID: string): Promise<Project[]>;
+export declare function createProject(token: string, organizationID: string, name: string): Promise<Project>;

package/dist/projects/client.js

@@ -0,0 +1,30 @@
+import { randomUUID } from 'node:crypto';
+import { request } from '../api/client.js';
+export async function listProjects(token, organizationID) {
+    const projects = await request(token, `/projects?organization_id=${encodeURIComponent(organizationID)}`);
+    if (!Array.isArray(projects) || projects.some((project) => !isProject(project, organizationID))) {
+        throw new Error('Ardent API returned an invalid projects response.');
+    }
+    return projects;
+}
+export async function createProject(token, organizationID, name) {
+    const project = await request(token, '/projects', {
+        body: JSON.stringify({ name, organization_id: organizationID }),
+        headers: { 'Idempotency-Key': randomUUID() },
+        method: 'POST',
+    });
+    if (!isProject(project, organizationID))
+        throw new Error('Ardent API returned an invalid project response.');
+    return project;
+}
+function isProject(value, organizationID) {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const project = value;
+    return (typeof project.id === 'string' &&
+        project.id.length > 0 &&
+        project.organization_id === organizationID &&
+        typeof project.name === 'string' &&
+        typeof project.created_at === 'string' &&
+        typeof project.updated_at === 'string');
+}

package/dist/projects/context.d.ts

@@ -0,0 +1,5 @@
+import { type ProjectIdentity, type Session } from '../auth/credentials.js';
+import type { Project } from './client.js';
+export declare function replaceProjectCache(directory: string, session: Session, projects: Project[]): Promise<Session>;
+export declare function selectProject(directory: string, session: Session, project: ProjectIdentity): Promise<Session>;
+export declare function cachedProjectNamed(session: Session, name: string): ProjectIdentity | undefined;

package/dist/projects/context.js

@@ -0,0 +1,29 @@
+import { saveSession } from '../auth/credentials.js';
+export async function replaceProjectCache(directory, session, projects) {
+    const identities = projects.map(projectIdentity);
+    const selectedProject = identities.find(({ id }) => id === session.selectedProject?.id) ??
+        (identities.length === 1 ? identities[0] : undefined);
+    const updated = { ...session, projects: identities, selectedProject };
+    if (selectedProject === undefined)
+        delete updated.selectedProject;
+    await saveSession(directory, updated);
+    return updated;
+}
+export async function selectProject(directory, session, project) {
+    const selectedProject = projectIdentity(project);
+    const projects = [...(session.projects ?? [])];
+    const existingIndex = projects.findIndex(({ id }) => id === selectedProject.id);
+    if (existingIndex === -1)
+        projects.push(selectedProject);
+    else
+        projects[existingIndex] = selectedProject;
+    const updated = { ...session, projects, selectedProject };
+    await saveSession(directory, updated);
+    return updated;
+}
+export function cachedProjectNamed(session, name) {
+    return session.projects?.find((project) => project.name === name);
+}
+function projectIdentity(project) {
+    return { id: project.id, name: project.name };
+}

package/dist/terminal.d.ts

@@ -0,0 +1 @@
+export declare function terminalText(value: string): string;

package/dist/terminal.js

@@ -0,0 +1,9 @@
+const terminalControlCharacter = /[\u0000-\u001F\u007F-\u009F\u202A-\u202E\u2066-\u2069]/g;
+export function terminalText(value) {
+    return value.replace(terminalControlCharacter, (character) => {
+        const codePoint = character.codePointAt(0);
+        if (codePoint === undefined)
+            return '';
+        return `\\u${codePoint.toString(16).padStart(4, '0')}`;
+    });
+}

package/oclif.manifest.json

@@ -94,7 +94,109 @@
         "commands",
         "status.js"
       ]
+    },
+    "project:create": {
+      "aliases": [],
+      "args": {
+        "name": {
+          "description": "Project name",
+          "name": "name",
+          "required": true
+        }
+      },
+      "description": "Create a project",
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "project:create",
+      "pluginAlias": "ardent-cli-beta",
+      "pluginName": "ardent-cli-beta",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "helpGroup": "Projects",
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "project",
+        "create.js"
+      ]
+    },
+    "project:list": {
+      "aliases": [],
+      "args": {},
+      "description": "List projects",
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "project:list",
+      "pluginAlias": "ardent-cli-beta",
+      "pluginName": "ardent-cli-beta",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "helpGroup": "Projects",
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "project",
+        "list.js"
+      ]
+    },
+    "project:switch": {
+      "aliases": [],
+      "args": {
+        "name": {
+          "description": "Project name",
+          "name": "name",
+          "required": true
+        }
+      },
+      "description": "Switch to a project from the local project list",
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "project:switch",
+      "pluginAlias": "ardent-cli-beta",
+      "pluginName": "ardent-cli-beta",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "helpGroup": "Projects",
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "project",
+        "switch.js"
+      ]
     }
   },
-  "version": "0.0.7"
+  "version": "0.0.8"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ardent-cli-beta",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "The Ardent command-line interface",
   "license": "Apache-2.0",
   "type": "module",