attio 0.0.1-experimental.20250414 → 0.0.1-experimental.20250425.1

package/lib/auth/auth.js

@@ -4,7 +4,7 @@ import { randomBytes, createHash } from "crypto";
 import open from "open";
 import { APP } from "../env.js";
 import { findAvailablePort } from "../util/find-available-port.js";
-import { keychain } from "./keychain.js";
+import { getKeychain } from "./keychain.js";
 import { api } from "../api/api.js";
 import { isErrored, complete, errored } from "@attio/fetchable";
 import { printFetcherError, printKeychainError } from "../print-errors.js";
@@ -12,7 +12,7 @@ class AuthenticatorImpl {
     clientId = "f881c6f1-82d7-48a5-a581-649596167845";
     refreshTimeout = null;
     async ensureAuthed() {
-        const existingTokenResult = await keychain.load();
+        const existingTokenResult = await getKeychain().load();
         if (isErrored(existingTokenResult)) {
             return this.promptToAuthenticate();
         }
@@ -31,7 +31,7 @@ class AuthenticatorImpl {
         return this.authenticate();
     }
     async authenticate() {
-        const existingTokenResult = await keychain.load();
+        const existingTokenResult = await getKeychain().load();
         if (isErrored(existingTokenResult)) {
             return existingTokenResult;
         }
@@ -108,7 +108,7 @@ class AuthenticatorImpl {
                 token_type: token.token_type,
                 expires_at: Date.now() + token.expires_in * 1000,
             };
-            const saveResult = await keychain.save(keychainToken);
+            const saveResult = await getKeychain().save(keychainToken);
             if (isErrored(saveResult)) {
                 return saveResult;
             }
@@ -141,7 +141,7 @@ class AuthenticatorImpl {
             token_type: refreshedToken.token_type,
             expires_at: Date.now() + refreshedToken.expires_in * 1000,
         };
-        const saveResult = await keychain.save(keychainToken);
+        const saveResult = await getKeychain().save(keychainToken);
         if (isErrored(saveResult)) {
             printKeychainError(saveResult.error);
             return;
@@ -153,7 +153,7 @@ class AuthenticatorImpl {
             clearTimeout(this.refreshTimeout);
             this.refreshTimeout = null;
         }
-        await keychain.delete();
+        await getKeychain().delete();
     }
 }
 export const authenticator = new AuthenticatorImpl();

package/lib/auth/keychain.js

@@ -59,6 +59,13 @@ class KeytarKeychain {
             console.debug("Wiped keychain entry due to schema mismatch");
             return complete(null);
         }
+        if (parsedToken.data.expires_at < Date.now() + 60_000 * 5) {
+            const deleteResult = await this.delete();
+            if (isErrored(deleteResult)) {
+                return errored({ code: "LOAD_KEYCHAIN_ERROR", error: deleteResult.error });
+            }
+            return complete(null);
+        }
         return complete(parsedToken.data);
     }
     async delete() {
@@ -92,4 +99,10 @@ class TestKeychain {
         return complete(undefined);
     }
 }
-export const keychain = process.env.NODE_ENV === "test" ? new TestKeychain() : new KeytarKeychain();
+let keychain = null;
+export const getKeychain = () => {
+    if (keychain === null) {
+        keychain = process.env.NODE_ENV === "test" ? new TestKeychain() : new KeytarKeychain();
+    }
+    return keychain;
+};

package/lib/commands/build.js

@@ -5,9 +5,15 @@ import { spinnerify } from "../util/spinner.js";
 import { isErrored } from "@attio/fetchable";
 import { printJsError, printTsError } from "../util/typescript.js";
 import { printBuildContextError } from "./dev/prepare-build-contexts.js";
+import { graphqlCodeGen } from "./dev/graphql-code-gen.js";
+import { hardExit } from "../util/hard-exit.js";
 export const build = new Command("build")
     .description("Build your Attio extension locally")
     .action(async () => {
+    const generateGraphqlOperationsResult = await spinnerify("Generating GraphQL types...", "GraphQL types generated successfully", graphqlCodeGen);
+    if (isErrored(generateGraphqlOperationsResult)) {
+        hardExit(generateGraphqlOperationsResult.error.error.toString());
+    }
     const tsResult = await spinnerify("Validating TypeScript...", "TypeScript validation passed", validateTypeScript);
     if (isErrored(tsResult)) {
         switch (tsResult.error.code) {

package/lib/commands/dev/graphql-code-gen.js

@@ -1,39 +1,65 @@
 import chokidar from "chokidar";
 import { readFileSync } from "fs";
 import { parse } from "graphql";
+import { complete, errored, isErrored } from "@attio/fetchable";
 import { findNodeModulesPath } from "../../util/find-node-modules-path.js";
 import { generateOperations } from "../../graphql/generate-operations.js";
 import { GraphQLError } from "../../graphql/graphql-error.js";
 import { hardExit } from "../../util/hard-exit.js";
-export function graphqlCodeGen(onSuccess) {
+export async function graphqlCodeGen() {
+    try {
+        const schemaPath = await findNodeModulesPath(["schema.graphql"]);
+        if (!schemaPath) {
+            hardExit("No schema.graphql found in node_modules");
+        }
+        const schema = parse(readFileSync(schemaPath, "utf8"));
+        await generateOperations(".", schema);
+        return complete(true);
+    }
+    catch (error) {
+        if (error instanceof GraphQLError) {
+            return errored({ code: "GRAPHQL_ERROR", error: error });
+        }
+        else {
+            return errored({
+                code: "GRAPHQL_CODEGEN_ERROR",
+                error: error instanceof Error ? error.message : "GraphQL code generation failed",
+            });
+        }
+    }
+}
+export function watchGraphqlCodegen(onSuccess, onError) {
     const watcher = chokidar.watch(["**/*.graphql", "**/*.gql"], {
         ignored: ["**/node_modules/**", "**/dist/**"],
         cwd: ".",
     });
-    async function handleSchemaAndGenerate() {
-        try {
-            const schemaPath = await findNodeModulesPath(["schema.graphql"]);
-            if (!schemaPath) {
-                hardExit("No schema.graphql found in node_modules");
-            }
-            const schema = parse(readFileSync(schemaPath, "utf8"));
-            await generateOperations(".", schema);
-            onSuccess?.();
-        }
-        catch (error) {
-            if (error instanceof GraphQLError) {
-                process.stderr.write(error.toString());
+    watcher.on("ready", async () => {
+        const result = await graphqlCodeGen();
+        if (isErrored(result)) {
+            if (result.error.code === "GRAPHQL_ERROR") {
+                onError?.(result.error.error.toString());
             }
             else {
-                hardExit(error instanceof Error ? error.message : "GraphQL code generation failed");
+                hardExit(result.error.error.toString());
             }
         }
-    }
-    watcher.on("ready", () => {
-        handleSchemaAndGenerate();
-        watcher.on("all", (event, path) => {
+        else {
+            onSuccess?.();
+        }
+        watcher.on("all", async (event, path) => {
             if (event === "add" || event === "change" || event === "unlink") {
-                handleSchemaAndGenerate();
+                const result = await graphqlCodeGen();
+                if (isErrored(result)) {
+                    if (result.error.code === "GRAPHQL_ERROR") {
+                        onError?.(result.error.error.toString());
+                    }
+                    else {
+                        hardExit(result.error.error.toString());
+                    }
+                }
+                else {
+                    onSuccess?.();
+                }
             }
         });
     });

package/lib/commands/dev.js

@@ -3,7 +3,7 @@ import { z } from "zod";
 import chalk from "chalk";
 import { printMessage } from "../util/print-message.js";
 import { validateTypeScript } from "./dev/validate-typescript.js";
-import { graphqlCodeGen } from "./dev/graphql-code-gen.js";
+import { watchGraphqlCodegen } from "./dev/graphql-code-gen.js";
 import { bundleJavaScript } from "./dev/bundle-javascript.js";
 import { boot } from "./dev/boot.js";
 import { onboarding } from "./dev/onboarding.js";
@@ -76,7 +76,17 @@ export const dev = new Command("dev")
             notifyTsErrors(errors);
         });
         cleanupFunctions.push(cleanupTs);
-        const cleanupGraphqlCodeGen = graphqlCodeGen(triggerTs);
+        let hasGraphqlCodeGenError = false;
+        const cleanupGraphqlCodeGen = watchGraphqlCodegen(() => {
+            if (hasGraphqlCodeGenError) {
+                process.stdout.write(`${chalk.green("✓")} GraphQL errors fixed\n`);
+                hasGraphqlCodeGenError = false;
+            }
+            triggerTs();
+        }, (error) => {
+            hasGraphqlCodeGenError = true;
+            process.stderr.write(error);
+        });
         cleanupFunctions.push(cleanupGraphqlCodeGen);
         let haveJsErrors = false;
         const cleanupJs = bundleJavaScript(async (contents) => {

package/lib/commands/logout.js

@@ -1,9 +1,9 @@
 import { Command } from "commander";
-import { keychain } from "../auth/keychain.js";
+import { getKeychain } from "../auth/keychain.js";
 import { printKeychainError } from "../print-errors.js";
 import { isErrored } from "@attio/fetchable";
 export const logout = new Command("logout").description("Log out from Attio").action(async () => {
-    const result = await keychain.delete();
+    const result = await getKeychain().delete();
     if (isErrored(result)) {
         printKeychainError(result.error);
         process.exit(1);

package/lib/commands/whoami.js

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import { keychain } from "../auth/keychain.js";
+import { getKeychain } from "../auth/keychain.js";
 import { api } from "../api/api.js";
 import { isErrored } from "@attio/fetchable";
 import { printFetcherError } from "../print-errors.js";
@@ -7,7 +7,7 @@ export const whoami = new Command()
     .name("whoami")
     .description("Identify the current user")
     .action(async () => {
-    const tokenResult = await keychain.load();
+    const tokenResult = await getKeychain().load();
     if (isErrored(tokenResult) || tokenResult.value === null) {
         process.stdout.write("🔒 Not logged in.\n");
         process.exit(0);

package/package.json

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