@base44-preview/cli 0.0.31-pr.189.61c2518 → 0.0.31-pr.189.7c5ebd3

package/dist/cli/index.js

@@ -185082,11 +185082,7 @@ var IntegrationTypeSchema = exports_external.union([
   exports_external.enum(KnownIntegrationTypes),
   CustomTypeSchema
 ]);
-var ConnectorStatusSchema = exports_external.enum([
-  "active",
-  "disconnected",
-  "expired"
-]);
+var ConnectorStatusSchema = exports_external.enum(["active", "disconnected", "expired"]);
 var UpstreamConnectorSchema = exports_external.object({
   integration_type: IntegrationTypeSchema,
   status: ConnectorStatusSchema,
@@ -185095,15 +185091,29 @@ var UpstreamConnectorSchema = exports_external.object({
 });
 var ListConnectorsResponseSchema = exports_external.object({
   integrations: exports_external.array(UpstreamConnectorSchema)
-});
+}).transform((data) => ({
+  integrations: data.integrations.map((i) => ({
+    integrationType: i.integration_type,
+    status: i.status,
+    scopes: i.scopes,
+    userEmail: i.user_email
+  }))
+}));
 var SetConnectorResponseSchema = exports_external.object({
   redirect_url: exports_external.string().nullable(),
   connection_id: exports_external.string().nullable(),
   already_authorized: exports_external.boolean(),
-  error: exports_external.string().nullable().optional(),
-  error_message: exports_external.string().nullable().optional(),
-  other_user_email: exports_external.string().nullable().optional()
-});
+  error: exports_external.string().nullable(),
+  error_message: exports_external.string().nullable(),
+  other_user_email: exports_external.string().nullable()
+}).transform((data) => ({
+  redirectUrl: data.redirect_url,
+  connectionId: data.connection_id,
+  alreadyAuthorized: data.already_authorized,
+  error: data.error,
+  errorMessage: data.error_message,
+  otherUserEmail: data.other_user_email
+}));
 var ConnectorOAuthStatusSchema = exports_external.enum([
   "ACTIVE",
   "FAILED",
@@ -185115,7 +185125,10 @@ var OAuthStatusResponseSchema = exports_external.object({
 var RemoveConnectorResponseSchema = exports_external.object({
   status: exports_external.literal("removed"),
   integration_type: IntegrationTypeSchema
-});
+}).transform((data) => ({
+  status: data.status,
+  integrationType: data.integration_type
+}));
 
 // src/core/resources/connector/api.ts
 async function listConnectors() {
@@ -185201,6 +185214,10 @@ async function readAllConnectors(connectorsDir) {
     absolute: true
   });
   const connectors = await Promise.all(files.map((filePath) => readConnectorFile(filePath)));
+  assertNoDuplicateConnectors(connectors);
+  return connectors;
+}
+function assertNoDuplicateConnectors(connectors) {
   const types = new Set;
   for (const connector of connectors) {
     if (types.has(connector.type)) {
@@ -185214,7 +185231,6 @@ async function readAllConnectors(connectorsDir) {
     }
     types.add(connector.type);
   }
-  return connectors;
 }
 // src/core/resources/connector/push.ts
 async function pushConnectors(connectors) {
@@ -185224,7 +185240,7 @@ async function pushConnectors(connectors) {
   for (const connector of connectors) {
     try {
       const response = await setConnector(connector.type, connector.scopes ?? []);
-      results.push(setResponseToResult(connector.type, response));
+      results.push(getConnectorSyncResult(connector.type, response));
     } catch (err) {
       results.push({
         type: connector.type,
@@ -185234,16 +185250,16 @@ async function pushConnectors(connectors) {
     }
   }
   for (const upstreamConnector of upstream.integrations) {
-    if (!localTypes.has(upstreamConnector.integration_type)) {
+    if (!localTypes.has(upstreamConnector.integrationType)) {
       try {
-        await removeConnector(upstreamConnector.integration_type);
+        await removeConnector(upstreamConnector.integrationType);
         results.push({
-          type: upstreamConnector.integration_type,
+          type: upstreamConnector.integrationType,
           action: "removed"
         });
       } catch (err) {
         results.push({
-          type: upstreamConnector.integration_type,
+          type: upstreamConnector.integrationType,
           action: "error",
           error: err instanceof Error ? err.message : String(err)
         });
@@ -185252,23 +185268,23 @@ async function pushConnectors(connectors) {
   }
   return { results };
 }
-function setResponseToResult(type, response) {
+function getConnectorSyncResult(type, response) {
   if (response.error === "different_user") {
     return {
       type,
       action: "error",
-      error: response.error_message || `Already connected by ${response.other_user_email ?? "another user"}`
+      error: response.errorMessage || `Already connected by ${response.otherUserEmail ?? "another user"}`
     };
   }
-  if (response.already_authorized) {
+  if (response.alreadyAuthorized) {
     return { type, action: "synced" };
   }
-  if (response.redirect_url) {
+  if (response.redirectUrl) {
     return {
       type,
       action: "needs_oauth",
-      redirectUrl: response.redirect_url,
-      connectionId: response.connection_id ?? undefined
+      redirectUrl: response.redirectUrl,
+      connectionId: response.connectionId ?? undefined
     };
   }
   return { type, action: "synced" };
@@ -194334,28 +194350,31 @@ async function pushConnectorsAction() {
   const oauthOutcomes = new Map;
   const needsOAuth = results.filter(isPendingOAuth);
   let outroMessage = "Connectors pushed to Base44";
-  if (needsOAuth.length > 0) {
-    M2.info("");
-    M2.warn(`${needsOAuth.length} connector(s) require authorization in your browser:`);
-    for (const connector2 of needsOAuth) {
-      M2.info(`  ${connector2.type}: ${theme.styles.dim(connector2.redirectUrl)}`);
-    }
-    const pending = needsOAuth.map((c3) => c3.type).join(", ");
-    if (process.env.CI) {
-      outroMessage = `Skipped OAuth in CI. Pending: ${pending}. Run 'base44 connectors push' locally to authorize.`;
+  if (needsOAuth.length === 0) {
+    printSummary(results, oauthOutcomes);
+    return { outroMessage };
+  }
+  M2.warn(`${needsOAuth.length} connector(s) require authorization in your browser:`);
+  for (const connector2 of needsOAuth) {
+    M2.info(`  '${connector2.type}': ${theme.styles.dim(connector2.redirectUrl)}`);
+  }
+  const pending = needsOAuth.map((c3) => c3.type).join(", ");
+  if (process.env.CI) {
+    outroMessage = `Skipped OAuth in CI. Pending: ${pending}. Run 'base44 connectors push' locally to authorize.`;
+  } else {
+    const shouldAuth = await ye({
+      message: "Open browser to authorize now?"
+    });
+    if (pD(shouldAuth) || !shouldAuth) {
+      outroMessage = `Authorization skipped. Pending: ${pending}. Run 'base44 connectors push' again to complete.`;
     } else {
-      const shouldAuth = await ye({
-        message: "Open browser to authorize now?"
-      });
-      if (pD(shouldAuth) || !shouldAuth) {
-        outroMessage = `Authorization skipped. Pending: ${pending}. Run 'base44 connectors push' again to complete.`;
-      } else {
-        for (const connector2 of needsOAuth) {
+      for (const connector2 of needsOAuth) {
+        try {
           M2.info(`
-Opening browser for ${connector2.type}...`);
+Opening browser for '${connector2.type}'...`);
           await open_default(connector2.redirectUrl);
           let finalStatus = "PENDING";
-          await runTask(`Waiting for ${connector2.type} authorization...`, async () => {
+          await runTask(`Waiting for '${connector2.type}' authorization...`, async () => {
             await pWaitFor(async () => {
               const response = await getOAuthStatus(connector2.type, connector2.connectionId);
               finalStatus = response.status;
@@ -194365,8 +194384,8 @@ Opening browser for ${connector2.type}...`);
               timeout: 2 * 60 * 1000
             });
           }, {
-            successMessage: `${connector2.type} authorization complete`,
-            errorMessage: `${connector2.type} authorization failed`
+            successMessage: `'${connector2.type}' authorization complete`,
+            errorMessage: `'${connector2.type}' authorization failed`
           }).catch((err) => {
             if (err instanceof TimeoutError2) {
               finalStatus = "PENDING";
@@ -194375,6 +194394,9 @@ Opening browser for ${connector2.type}...`);
             }
           });
           oauthOutcomes.set(connector2.type, finalStatus);
+        } catch (err) {
+          M2.error(`Failed to authorize '${connector2.type}': ${err instanceof Error ? err.message : String(err)}`);
+          oauthOutcomes.set(connector2.type, "FAILED");
         }
       }
     }
@@ -194383,7 +194405,7 @@ Opening browser for ${connector2.type}...`);
   return { outroMessage };
 }
 function getConnectorsPushCommand(context) {
-  return new Command("push").description("Push local connectors to Base44 (syncs scopes and removes unlisted)").action(async () => {
+  return new Command("push").description("Push local connectors to Base44 (overwrites connectors on Base44)").action(async () => {
     await runCommand(pushConnectorsAction, { requireAuth: true }, context);
   });
 }
@@ -199601,4 +199623,4 @@ export {
   CLIExitError
 };
 
-//# debugId=747B6136C48A11DE64756E2164756E21
+//# debugId=B60FA69AE8B179EB64756E2164756E21