attio 0.0.1-experimental.20250402.1 → 0.0.1-experimental.20250403

package/lib/commands/version/create.js

@@ -1,76 +1,51 @@
 import { Command } from "commander";
 import chalk from "chalk";
-import { Spinner } from "../../util/spinner.js";
-import { loadAttioCliPackageJson } from "../../util/load-attio-cli-package-json.js";
+import { spinnerify } from "../../util/spinner.js";
+import { buildJavaScript } from "../dev/build-javascript.js";
 import { createVersion } from "../../api/create-version.js";
-import { fetchVersions } from "../../api/fetch-versions.js";
 import { completeProdBundleUpload } from "../../api/complete-prod-bundle-upload.js";
-import { buildJavaScript } from "../dev/build-javascript.js";
-import { boot } from "./create/boot.js";
+import { loadAttioCliPackageJson } from "../../util/load-attio-cli-package-json.js";
+import { uploadBundle } from "../../util/upload-bundle.js";
+import { getVersions } from "../../api/get-versions.spinner.js";
+import { getAppInfo } from "../../api/get-app-info.spinner.js";
+import { getAppSlugFromPackageJson } from "../../api/get-app-slug-from-package-json.js";
 export const versionCreate = new Command("create")
     .description("Create a new unpublished version of your Attio app")
     .action(async () => {
-    try {
-        const { token, appInfo } = await boot();
-        const bundlingSpinner = new Spinner();
-        bundlingSpinner.start("Bundling JavaScript...");
-        const [clientBundle, serverBundle] = await new Promise((resolve) => {
+    const appSlug = await getAppSlugFromPackageJson();
+    const appInfo = await getAppInfo(appSlug);
+    const [clientBundle, serverBundle] = await spinnerify("Bundling JavaScript...", "Bundling complete", async () => {
+        return await new Promise((resolve) => {
             const cleanup = buildJavaScript((bundles) => {
                 cleanup();
-                bundlingSpinner.success("Bundling complete");
                 resolve(bundles);
             });
         });
-        const versions = await fetchVersions({
-            token,
-            appId: appInfo.app_id,
-        });
-        const uploadSpinner = new Spinner();
-        uploadSpinner.start("Uploading...");
+    });
+    const versions = await getVersions(appInfo);
+    const version = await spinnerify("Uploading...", "Upload complete", async () => {
         const packageJson = loadAttioCliPackageJson();
-        if (typeof packageJson === "string")
-            throw packageJson;
-        const major = versions.length === 0 ? 1 : Math.max(...versions.map((version) => version.major), 1);
         const version = await createVersion({
-            token,
             appId: appInfo.app_id,
-            major,
+            major: versions.length === 0
+                ? 1
+                : Math.max(...versions.map((version) => version.major), 1),
             cliVersion: packageJson.version,
         });
         await Promise.all([
-            fetch(version.client_bundle_upload_url, {
-                method: "PUT",
-                body: clientBundle,
-                headers: {
-                    "Content-Type": "text/javascript",
-                    "Content-Length": String(Buffer.from(clientBundle).length),
-                },
-            }),
-            fetch(version.server_bundle_upload_url, {
-                method: "PUT",
-                body: serverBundle,
-                headers: {
-                    "Content-Type": "text/javascript",
-                    "Content-Length": String(Buffer.from(serverBundle).length),
-                },
-            }),
+            uploadBundle(clientBundle, version.client_bundle_upload_url),
+            uploadBundle(serverBundle, version.server_bundle_upload_url),
         ]);
-        uploadSpinner.success("Upload complete");
-        const signSpinner = new Spinner();
-        signSpinner.start("Signing bundles...");
+        return version;
+    });
+    await spinnerify("Signing bundles...", "Bundles signed", async () => {
         await completeProdBundleUpload({
-            token,
-            appId: version.app_id,
+            appId: appInfo.app_id,
             major: version.major,
             minor: version.minor,
             bundleId: version.app_prod_version_bundle_id,
         });
-        signSpinner.success("Bundles signed");
-        process.stdout.write(`\nVersion ${chalk.green(`${version.major}.${version.minor}`)} created!\n\n`);
-        process.exit(0);
-    }
-    catch (error) {
-        process.stderr.write(`${chalk.red("✖ " + error)}\n`);
-        process.exit(1);
-    }
+    });
+    process.stdout.write(`\nVersion ${chalk.green(`${version.major}.${version.minor}`)} created!\n\n`);
+    process.exit(0);
 });

package/lib/commands/version/list.js

@@ -1,36 +1,47 @@
 import { Command } from "commander";
-import { fetchVersions } from "../../api/fetch-versions.js";
-import Table from "cli-table3";
-import chalk from "chalk";
-import formatDate from "date-fns/format/index.js";
-import { ensureAuthed } from "../../api/ensure-authed.js";
-import { getAppSlugFromPackageJson } from "../../api/get-app-slug-from-package-json.js";
 import { getAppInfo } from "../../api/get-app-info.spinner.js";
-export const versionList = new Command("list")
-    .description("List all versions of your Attio app")
-    .alias("ls")
+import { getAppSlugFromPackageJson } from "../../api/get-app-slug-from-package-json.js";
+import { getVersions } from "../../api/get-versions.spinner.js";
+import chalk from "chalk";
+import Table from "cli-table3";
+import { format as formatDate } from "date-fns";
+export const versionList = new Command()
+    .name("list")
+    .description("List all versions of your app")
     .action(async () => {
-    const token = await ensureAuthed();
     const appSlug = await getAppSlugFromPackageJson();
-    const appInfo = await getAppInfo({ token, appSlug });
-    const versions = await fetchVersions({
-        token,
-        appId: appInfo.app_id,
-    });
+    const appInfo = await getAppInfo(appSlug);
+    const versions = await getVersions(appInfo);
+    if (versions.length === 0) {
+        process.stdout.write("No versions found\n");
+        process.exit(0);
+    }
     const table = new Table({
-        head: ["Version", "Published", "Installations", "Created"].map((h) => chalk.bold(h)),
+        head: ["Version", "Status", "Published", "Installations", "Created"].map((h) => chalk.bold(h)),
         style: {
             head: [],
             border: [],
         },
-        colAligns: ["center", "center", "right", "left"],
+        colAligns: ["center", "left", "center", "right", "left"],
+    });
+    versions.forEach((version) => {
+        const statusColors = {
+            private: chalk.gray,
+            in_review: chalk.yellow,
+            published: chalk.green,
+            rejected: chalk.red,
+        };
+        const formattedStatus = version.publication_status
+            .split("_")
+            .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+            .join(" ");
+        table.push([
+            `${version.major}.${version.minor}`,
+            statusColors[version.publication_status](formattedStatus),
+            version.is_published ? "Yes" : "No",
+            version.num_installations.toLocaleString(),
+            formatDate(new Date(version.created_at), "MMM d, yyyy, HH:mm"),
+        ]);
     });
-    table.push(...versions.map((version) => [
-        `${version.major}.${version.minor}`,
-        version.is_published ? "Yes" : "No",
-        version.num_installations.toLocaleString(),
-        formatDate(new Date(version.created_at), "MMMM d, yyyy, HH:mm"),
-    ]));
-    process.stdout.write(table.toString());
-    process.exit(0);
+    process.stdout.write("\n" + table.toString() + "\n");
 });

package/lib/commands/whoami.js

@@ -1,20 +1,16 @@
 import { Command } from "commander";
-import { auth as authApi } from "../api/auth.js";
 import { whoami as whoamiApi } from "../api/whoami.js";
-export const whoami = new Command("whoami")
+import { loadAuthToken } from "../api/keychain.js";
+export const whoami = new Command()
+    .name("whoami")
     .description("Identify the current user")
     .action(async () => {
-    const token = await authApi();
-    if (!token) {
+    const tokenResult = await loadAuthToken();
+    if (!tokenResult) {
         process.stdout.write("🔒 Not logged in.\n");
         process.exit(0);
     }
-    try {
-        const user = await whoamiApi({ token });
-        process.stdout.write(`👤 ${user.name.full} (${user.email_address})\n`);
-    }
-    catch (error) {
-        process.stderr.write(`❌ User lookup failed\n\n${error}\n`);
-        process.exit(1);
-    }
+    const user = await whoamiApi();
+    process.stdout.write(`👤 ${user.name.full} (${user.email_address})\n`);
+    process.exit(0);
 });

package/lib/util/copy-with-replace.js

@@ -1,11 +1,12 @@
 import { promises as fs } from "fs";
 import path from "path";
+import { hardExit } from "../api/hard-exit.js";
 export const copyWithTransform = async (srcDir, destDir, transform) => {
     try {
         await fs.mkdir(destDir, { recursive: true });
     }
     catch {
-        throw new Error(`Failed to create "${destDir}".`);
+        hardExit(`Failed to create "${destDir}".`);
     }
     const entries = await fs.readdir(srcDir, { withFileTypes: true });
     await Promise.all(entries.map(async (entry) => {
@@ -27,7 +28,7 @@ export const copyWithTransform = async (srcDir, destDir, transform) => {
             }
         }
         catch {
-            throw new Error(`Failed to copy "${srcPath}" to "${destPath}"`);
+            hardExit(`Failed to copy "${srcPath}" to "${destPath}"`);
         }
     }));
 };

package/lib/util/create-directory.js

@@ -1,10 +1,11 @@
 import { accessSync, constants, existsSync, mkdirSync } from "fs";
 import { join } from "path";
+import { hardExit } from "../api/hard-exit.js";
 export const createDirectory = (name) => {
     const currentDir = process.cwd();
     const newPath = join(currentDir, name);
     if (existsSync(newPath)) {
-        throw new Error(`The directory '${name}' already exists.`);
+        hardExit(`The directory '${name}' already exists.`);
     }
     else {
         try {
@@ -13,7 +14,7 @@ export const createDirectory = (name) => {
             return newPath;
         }
         catch {
-            throw new Error(`Write access to create the directory "${name}" in the current directory is denied.`);
+            hardExit(`Write access to create the directory "${name}" in the current directory is denied.`);
         }
     }
 };

package/lib/util/find-available-port.js

@@ -1,4 +1,5 @@
 import net from "net";
+import { hardExit } from "../api/hard-exit.js";
 async function isPortAvailable(port) {
     return new Promise((resolve) => {
         const portTester = net.createConnection(port, "127.0.0.1");
@@ -32,5 +33,5 @@ export async function findAvailablePort(startPort, maxAttempts = 100) {
             return port;
         }
     }
-    throw new Error(`Could not find an available port after ${maxAttempts} attempts`);
+    hardExit(`Could not find an available port after ${maxAttempts} attempts`);
 }

package/lib/util/load-attio-cli-package-json.js

@@ -2,6 +2,7 @@ import { readFileSync } from "fs";
 import { findUpSync } from "find-up-simple";
 import { z } from "zod";
 import { fileURLToPath } from "url";
+import { hardExit } from "../api/hard-exit.js";
 const FILE_NAME = "package.json";
 const packageJsonSchema = z.object({
     version: z.string(),
@@ -12,14 +13,14 @@ export function loadAttioCliPackageJson() {
     if (packageJson === undefined) {
         const packageJsonPath = findUpSync(FILE_NAME, { cwd: fileURLToPath(import.meta.url) });
         if (packageJsonPath === undefined) {
-            throw new Error("Failed to find package.json");
+            hardExit("Failed to find package.json");
         }
         try {
             const packageJsonContent = JSON.parse(readFileSync(packageJsonPath, "utf8"));
             packageJson = packageJsonSchema.parse(packageJsonContent);
         }
         catch (error) {
-            throw new Error("Failed to find version in package.json");
+            hardExit("Failed to find version in package.json");
         }
     }
     return packageJson;

package/lib/util/spinner.js

@@ -1,6 +1,6 @@
 import chalk from "chalk";
 const frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-export class Spinner {
+class Spinner {
     frameIndex = 0;
     stopped = false;
     interval = null;
@@ -44,3 +44,15 @@ export class Spinner {
         return this.stop(`${chalk.yellow("⚠")} ${message}`);
     }
 }
+export async function spinnerify(busyMessage, successMessage, fn) {
+    const spinner = new Spinner();
+    spinner.start(busyMessage);
+    try {
+        const result = await fn();
+        spinner.success(typeof successMessage === "string" ? successMessage : successMessage(result));
+        return result;
+    }
+    finally {
+        spinner.stop();
+    }
+}

package/lib/util/upload-bundle.js

@@ -0,0 +1,16 @@
+import { hardExit } from "../api/hard-exit.js";
+export async function uploadBundle(bundle, uploadUrl) {
+    try {
+        await fetch(uploadUrl, {
+            method: "PUT",
+            body: bundle,
+            headers: {
+                "Content-Type": "text/javascript",
+                "Content-Length": String(Buffer.from(bundle).length),
+            },
+        });
+    }
+    catch (error) {
+        hardExit(`Failed to upload bundle: ${error}`);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attio",
-  "version": "0.0.1-experimental.20250402.1",
+  "version": "0.0.1-experimental.20250403",
   "bin": "lib/attio.js",
   "type": "module",
   "files": [

package/lib/api/fetch-connections.js

@@ -1,20 +0,0 @@
-import { z } from "zod";
-import { API } from "../env.js";
-import { handleError } from "./handle-error.js";
-import { makeHeaders } from "./make-headers.js";
-const connectionDefinitionsResponseSchema = z.object({
-    values: z.array(z.object({
-        label: z.string(),
-        connection_type: z.enum(["oauth2-code", "secret"]),
-        description: z.string().nullable(),
-        global: z.boolean(),
-    })),
-});
-export async function fetchConnections({ token, appId, major, }) {
-    const response = await fetch(`${API}/apps/${appId}/versions/${major}/connection-definitions`, {
-        method: "GET",
-        headers: makeHeaders(token),
-    });
-    await handleError(response);
-    return connectionDefinitionsResponseSchema.parse(await response.json()).values;
-}

package/lib/api/handle-error.js

@@ -1,18 +0,0 @@
-import { z } from "zod";
-const serverErrorSchema = z.object({
-    message: z.string(),
-});
-export async function handleError(response) {
-    if (response.ok)
-        return;
-    const text = await response.text();
-    let json;
-    try {
-        json = JSON.parse(text);
-    }
-    catch {
-        throw new Error(`Error parsing JSON: ${JSON.stringify(text)}`);
-    }
-    const error = serverErrorSchema.parse(json);
-    throw new Error(error.message);
-}

package/lib/api/make-headers.js

@@ -1,7 +0,0 @@
-export function makeHeaders(token) {
-    return {
-        "x-attio-platform": "developer-cli",
-        "Authorization": `Bearer ${token}`,
-        "Content-Type": "application/json",
-    };
-}

package/lib/api/remove-connection-definition.js

@@ -1,10 +0,0 @@
-import { API } from "../env.js";
-import { handleError } from "./handle-error.js";
-import { makeHeaders } from "./make-headers.js";
-export async function removeConnectionDefinition({ token, appId, global, major, }) {
-    const response = await fetch(`${API}/apps/${appId}/versions/${major}/connection-definitions/${global ? "workspace" : "user"}/remove`, {
-        method: "DELETE",
-        headers: makeHeaders(token),
-    });
-    await handleError(response);
-}

package/lib/commands/init/boot.js

@@ -1,14 +0,0 @@
-import { ensureAuthed } from "../../api/ensure-authed.js";
-import { getAppInfo } from "../../api/get-app-info.spinner.js";
-import { determineWorkspace } from "../../api/determine-workspace.spinner.js";
-export async function boot({ workspaceSlug, appSlug, }) {
-    const token = await ensureAuthed();
-    const appInfo = await getAppInfo({ token, appSlug });
-    const workspace = await determineWorkspace({ token, workspaceSlug });
-    return {
-        token,
-        appId: appInfo.app_id,
-        appInfo,
-        workspace,
-    };
-}

package/lib/commands/version/create/boot.js

@@ -1,9 +0,0 @@
-import { ensureAuthed } from "../../../api/ensure-authed.js";
-import { getAppSlugFromPackageJson } from "../../../api/get-app-slug-from-package-json.js";
-import { getAppInfo } from "../../../api/get-app-info.spinner.js";
-export async function boot() {
-    const token = await ensureAuthed();
-    const appSlug = await getAppSlugFromPackageJson();
-    const appInfo = await getAppInfo({ token, appSlug });
-    return { token, appInfo };
-}

package/lib/util/clear-terminal.js

@@ -1,4 +0,0 @@
-export function clearTerminal() {
-    process.stdout.write("\x1b[2J");
-    process.stdout.write("\x1b[H");
-}