chore: apply oxfmt across repo

main's format:check was red: 20 package.json files (publishConfig key ordering) plus two source files were not oxfmt-clean under 0.44.0. Run oxfmt to bring the tree back to a passing format:check so this branch can merge.

Rhys Sullivan committed 4 months ago

Commit 5d6b26c1 parent 778542b22 files · +64 −114Browse files

Unified · Split

22 files

packages/core/cli/package.json +2 −2
packages/core/config/package.json +2 −2
packages/core/execution/package.json +2 −2
packages/core/integrations-registry/package.json +2 −2
packages/core/sdk/package.json +2 −2
packages/core/vite-plugin/package.json +2 −2
packages/kernel/core/package.json +2 −2
packages/kernel/runtime-quickjs/package.json +2 −2
packages/plugins/desktop-settings/package.json +2 −2
packages/plugins/example/package.json +2 −2
packages/plugins/file-secrets/package.json +2 −2
packages/plugins/google/package.json +2 −2
packages/plugins/graphql/package.json +2 −2
packages/plugins/keychain/package.json +2 −2
packages/plugins/mcp/package.json +2 −2
packages/plugins/microsoft/package.json +2 −2
packages/plugins/onepassword/package.json +2 −2
packages/plugins/openapi/package.json +2 −2
packages/plugins/toolkits/package.json +2 −2
packages/plugins/workos-vault/package.json +2 −2
packages/react/src/components/accounts-section.tsx +19 −59
packages/react/src/plugins/oauth-reconnect.ts +5 −15

packages/core/cli/package.json+2−2

     ".": "./src/index.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/index.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/core/config/package.json+2−2

     ".": "./src/index.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/index.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/core/execution/package.json+2−2

     "./promise": "./src/promise.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/core.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/core/integrations-registry/package.json+2−2

     ".": "./src/index.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/index.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/core/sdk/package.json+2−2

     "./public-origin": "./src/public-origin.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/public-origin.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/core/vite-plugin/package.json+2−2

     }
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/index.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/kernel/core/package.json+2−2

     ".": "./src/index.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/index.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/kernel/runtime-quickjs/package.json+2−2

     ".": "./src/index.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/index.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/plugins/desktop-settings/package.json+2−2

     "./client": "./src/client.tsx"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       "./server": {
         "import": {
           "default": "./dist/client.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup",

packages/plugins/example/package.json+2−2

     "./shared": "./src/shared.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       "./server": {
         "import": {
           "default": "./dist/shared.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/plugins/file-secrets/package.json+2−2

     "./promise": "./src/promise.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/core.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/plugins/google/package.json+2−2

     "./client": "./src/react/plugin-client.tsx"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/client.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/plugins/graphql/package.json+2−2

     "./testing": "./src/testing/index.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/testing.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/plugins/keychain/package.json+2−2

     "./promise": "./src/promise.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/core.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/plugins/mcp/package.json+2−2

     "./testing": "./src/testing/index.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/testing.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/plugins/microsoft/package.json+2−2

     "./client": "./src/react/plugin-client.tsx"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/client.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/plugins/onepassword/package.json+2−2

     "./client": "./src/react/plugin-client.tsx"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/client.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/plugins/openapi/package.json+2−2

     "./testing": "./src/testing/index.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/testing.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/plugins/toolkits/package.json+2−2

     "./shared": "./src/shared.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       "./server": {
         "import": {
           "default": "./dist/shared.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/plugins/workos-vault/package.json+2−2

     "./testing": "./src/sdk/testing.ts"
   },
   "publishConfig": {
-    "access": "public",
     "exports": {
       ".": {
         "import": {
           "default": "./dist/testing.js"
         }
       }
-    }
+    },
+    "access": "public"
   },
   "scripts": {
     "build": "tsup && (tsc --declaration --emitDeclarationOnly --outDir dist --rootDir src || true)",

packages/react/src/components/accounts-section.tsx+19−59

 import { useAtomValue, useAtomSet } from "@effect/atom-react";
 import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
 import * as Exit from "effect/Exit";
-import {
+import { IntegrationSlug, type Connection, type Owner } from "@executor-js/sdk/shared";
-  IntegrationSlug,
-  type Connection,
-  type Owner,
-} from "@executor-js/sdk/shared";
 import type { IntegrationAccountHandoff } from "@executor-js/sdk/client";
 import { toast } from "sonner";
         <CardStackEntryTitle className="flex min-w-0 items-center gap-2">
           <span className="truncate">{displayLabel}</span>
           {needsReconsent ? (
-            <Badge
+            <Badge variant="outline" className="shrink-0 border-border text-muted-foreground">
-              variant="outline"
-              className="shrink-0 border-border text-muted-foreground"
-            >
               Reconnect to grant access
             </Badge>
           ) : null}
         ) : null}
         {needsReconsent ? (
           <CardStackEntryDescription className="mt-1 text-xs text-muted-foreground">
-            This connection wasn't granted all the access this integration now
+            This connection wasn't granted all the access this integration now needs.
-            needs.
           </CardStackEntryDescription>
         ) : null}
       </CardStackEntryContent>
             <DropdownMenuItem className="text-sm" onClick={props.onReconnect}>
               Reconnect
             </DropdownMenuItem>
-            <DropdownMenuItem
+            <DropdownMenuItem variant="destructive" className="text-sm" onClick={props.onRemove}>
-              variant="destructive"
-              className="text-sm"
-              onClick={props.onRemove}
-            >
               Remove
             </DropdownMenuItem>
           </DropdownMenuContent>
   readonly declaredScopes: readonly string[] | undefined;
 }) {
   const { integration, owner } = props;
-  const connections = useAtomValue(
+  const connections = useAtomValue(connectionsForIntegrationAtom({ integration, owner }));
-    connectionsForIntegrationAtom({ integration, owner }),
-  );
   const doRemove = useAtomSet(removeConnectionOptimistic(owner), {
     mode: "promiseExit",
   });
     startErrorMessage: "Failed to reconnect",
   });
-  const rows: readonly Connection[] = AsyncResult.isSuccess(connections)
+  const rows: readonly Connection[] = AsyncResult.isSuccess(connections) ? connections.value : [];
-    ? connections.value
-    : [];
   if (rows.length === 0) return null;
   const handleReconnect = async (connection: Connection) => {
     if (reconnectMode(connection) === "oauth") {
       const method = props.methods.find(
         (candidate: AuthMethod) =>
-          candidate.kind === "oauth" &&
+          candidate.kind === "oauth" && String(candidate.template) === String(connection.template),
-          String(candidate.template) === String(connection.template),
       );
       if (
         method?.oauth?.supportsDynamicRegistration === true ||
   return (
     <CardStack>
-      {props.showOwnerLabels ? (
+      {props.showOwnerLabels ? <CardStackHeader>{ownerLabel(owner)}</CardStackHeader> : null}
-        <CardStackHeader>{ownerLabel(owner)}</CardStackHeader>
-      ) : null}
       <CardStackContent>
         {rows.map((connection: Connection) => (
           <AccountRow
             key={`${connection.owner}:${connection.integration}:${connection.name}`}
             connection={connection}
-            needsReconsent={connectionNeedsReconsent(
+            needsReconsent={connectionNeedsReconsent(connection, props.declaredScopes)}
-              connection,
-              props.declaredScopes,
-            )}
             showOwnerLabel={props.showOwnerLabels}
             onEdit={() => props.onEdit(connection)}
             onReconnect={() => void handleReconnect(connection)}
     removeCustomMethod,
   } = props;
   const [adding, setAdding] = useState(false);
-  const [editingConnection, setEditingConnection] = useState<Connection | null>(
+  const [editingConnection, setEditingConnection] = useState<Connection | null>(null);
-    null,
+  const [reconnectHandoff, setReconnectHandoff] = useState<IntegrationAccountHandoff | null>(null);
-  );
-  const [reconnectHandoff, setReconnectHandoff] =
-    useState<IntegrationAccountHandoff | null>(null);
   const ownerDisplay = useOwnerDisplay();
-  const canAddConnection =
+  const canAddConnection = methods.length > 0 || createCustomMethod !== undefined;
-    methods.length > 0 || createCustomMethod !== undefined;
   useEffect(() => {
     if (accountHandoff) {
   // Read both owners to decide between the grouped view and the empty CTA. The
   // grouped sub-components re-read these (effect-atom dedupes) and self-hide.
-  const orgConnections = useAtomValue(
+  const orgConnections = useAtomValue(connectionsForIntegrationAtom({ integration, owner: "org" }));
-    connectionsForIntegrationAtom({ integration, owner: "org" }),
-  );
   const userConnections = useAtomValue(
     connectionsForIntegrationAtom({ integration, owner: "user" }),
   );
   useAtomSet(addConnectionOptimistic("user"));
   const totalCount = useMemo(() => {
-    const orgRows = AsyncResult.isSuccess(orgConnections)
+    const orgRows = AsyncResult.isSuccess(orgConnections) ? orgConnections.value.length : 0;
-      ? orgConnections.value.length
+    const userRows = AsyncResult.isSuccess(userConnections) ? userConnections.value.length : 0;
-      : 0;
-    const userRows = AsyncResult.isSuccess(userConnections)
-      ? userConnections.value.length
-      : 0;
     return orgRows + userRows;
   }, [orgConnections, userConnections]);
-  const loading =
+  const loading = !AsyncResult.isSuccess(orgConnections) && !AsyncResult.isSuccess(userConnections);
-    !AsyncResult.isSuccess(orgConnections) &&
-    !AsyncResult.isSuccess(userConnections);
   const modalState = reconnectHandoff ?? accountHandoff;
   const modal = (
           onClick={() => {
             trackEvent("connection_add_opened", {
               integration_slug: String(integration),
-              has_oauth_method: methods.some(
+              has_oauth_method: methods.some((m: AuthMethod) => m.kind === "oauth"),
-                (m: AuthMethod) => m.kind === "oauth",
-              ),
               has_api_key_method: methods.some(
                 (m: AuthMethod) => m.kind !== "oauth" && m.kind !== "none",
               ),
         </div>
       ) : totalCount === 0 ? (
         <div className="rounded-lg border border-dashed border-border/60 px-6 py-8 text-center">
-          <p className="text-sm font-medium text-foreground">
+          <p className="text-sm font-medium text-foreground">No connections yet</p>
-            No connections yet
-          </p>
           <p className="mt-1 text-sm text-muted-foreground">
             Add a connection to make this integration's tools available.
           </p>
             onClick={() => {
               trackEvent("connection_add_opened", {
                 integration_slug: String(integration),
-                has_oauth_method: methods.some(
+                has_oauth_method: methods.some((m: AuthMethod) => m.kind === "oauth"),
-                  (m: AuthMethod) => m.kind === "oauth",
-                ),
                 has_api_key_method: methods.some(
                   (m: AuthMethod) => m.kind !== "oauth" && m.kind !== "none",
                 ),

packages/react/src/plugins/oauth-reconnect.ts+5−15

  *  connection are exactly the branded types `oauth.start` expects, so the same
  *  connection (owner/integration/name) is re-minted with a fresh refresh token
  *  and the widened scope union. Returns null for a non-OAuth connection. */
-export function oauthReconnectPayload(
+export function oauthReconnectPayload(connection: Connection): OAuthStartPayload | null {
-  connection: Connection,
-): OAuthStartPayload | null {
   if (connection.oauthClient == null) return null;
   return {
     client: connection.oauthClient,
   "https://www.googleapis.com/auth/userinfo.profile": "profile",
 };
-const canonicalScope = (scope: string): string =>
+const canonicalScope = (scope: string): string => OAUTH_SCOPE_ALIASES[scope] ?? scope;
-  OAUTH_SCOPE_ALIASES[scope] ?? scope;
 /** Normalize a scope list: trim, canonicalize known provider aliases, drop
  *  empties, de-dupe (order-preserving). A scope set is compared as a SET —
 /** The scopes a connection was actually GRANTED, parsed from its space-delimited
  *  `oauthScope` record. Empty for static creds / when the AS omitted scope. */
-export function connectionGrantedScopes(
+export function connectionGrantedScopes(connection: Connection): readonly string[] {
-  connection: Connection,
+  return connection.oauthScope ? connection.oauthScope.split(/\s+/).filter(Boolean) : [];
-): readonly string[] {
-  return connection.oauthScope
-    ? connection.oauthScope.split(/\s+/).filter(Boolean)
-    : [];
 }
 /** Whether an OAuth connection must RECONNECT to grant newly-needed access: the
   declaredScopes: readonly string[] | undefined,
 ): boolean {
   if (connection.oauthClient == null) return false;
-  return (
+  return missingScopes(declaredScopes, connectionGrantedScopes(connection)).length > 0;
-    missingScopes(declaredScopes, connectionGrantedScopes(connection)).length >
-    0
-  );
 }
 /** The scopes that count as REQUIRED for a connection to be considered fully