@base44-preview/cli 0.0.30-pr.189.ae9567a → 0.0.30-pr.217.2ff8369

package/dist/cli/index.js

@@ -153805,7 +153805,7 @@ var SlackConnectorSchema = exports_external.object({
 });
 var NotionConnectorSchema = exports_external.object({
   type: exports_external.literal("notion"),
-  scopes: exports_external.array(exports_external.string()).default([])
+  scopes: exports_external.array(exports_external.string()).default([]).optional()
 });
 var SalesforceConnectorSchema = exports_external.object({
   type: exports_external.literal("salesforce"),
@@ -153823,7 +153823,12 @@ var TikTokConnectorSchema = exports_external.object({
   type: exports_external.literal("tiktok"),
   scopes: exports_external.array(exports_external.string()).default([])
 });
-var ConnectorResourceSchema = exports_external.discriminatedUnion("type", [
+var CustomTypeSchema = exports_external.string().min(1).regex(/^[a-z0-9_-]+$/i);
+var GenericConnectorSchema = exports_external.object({
+  type: CustomTypeSchema,
+  scopes: exports_external.array(exports_external.string()).default([])
+});
+var ConnectorResourceSchema = exports_external.union([
   GoogleCalendarConnectorSchema,
   GoogleDriveConnectorSchema,
   GmailConnectorSchema,
@@ -153835,9 +153840,10 @@ var ConnectorResourceSchema = exports_external.discriminatedUnion("type", [
   SalesforceConnectorSchema,
   HubspotConnectorSchema,
   LinkedInConnectorSchema,
-  TikTokConnectorSchema
+  TikTokConnectorSchema,
+  GenericConnectorSchema
 ]);
-var IntegrationTypeSchema = exports_external.enum([
+var KnownIntegrationTypes = [
   "googlecalendar",
   "googledrive",
   "gmail",
@@ -153850,6 +153856,10 @@ var IntegrationTypeSchema = exports_external.enum([
   "hubspot",
   "linkedin",
   "tiktok"
+];
+var IntegrationTypeSchema = exports_external.union([
+  exports_external.enum(KnownIntegrationTypes),
+  CustomTypeSchema
 ]);
 var ConnectorStatusSchema = exports_external.enum([
   "active",
@@ -153973,7 +153983,13 @@ async function readAllConnectors(connectorsDir) {
   const types = new Set;
   for (const connector of connectors) {
     if (types.has(connector.type)) {
-      throw new Error(`Duplicate connector type "${connector.type}"`);
+      throw new InvalidInputError(`Duplicate connector type "${connector.type}"`, {
+        hints: [
+          {
+            message: `Remove duplicate connectors with type "${connector.type}" - only one connector per type is allowed`
+          }
+        ]
+      });
     }
     types.add(connector.type);
   }
@@ -154685,23 +154701,48 @@ class TimeoutError2 extends Error {
 // src/core/resources/connector/oauth.ts
 var POLL_INTERVAL_MS = 2000;
 var POLL_TIMEOUT_MS = 2 * 60 * 1000;
-async function runOAuthFlow(params) {
+async function runOAuthFlowWithSkip(params) {
   await open_default(params.redirectUrl);
   let finalStatus = "PENDING";
-  await pWaitFor(async () => {
-    const response = await getOAuthStatus(params.type, params.connectionId);
-    finalStatus = response.status;
-    return response.status !== "PENDING";
-  }, {
-    interval: POLL_INTERVAL_MS,
-    timeout: POLL_TIMEOUT_MS
-  }).catch((err) => {
-    if (err instanceof TimeoutError2) {
-      finalStatus = "PENDING";
-    } else {
-      throw err;
+  let skipped = false;
+  const s = Y2();
+  const originalExit = process.exit;
+  process.exit = () => {
+    skipped = true;
+    s.stop(`${params.type} skipped`);
+  };
+  s.start(`Waiting for ${params.type} authorization... (Esc to skip)`);
+  try {
+    await pWaitFor(async () => {
+      if (skipped) {
+        finalStatus = "SKIPPED";
+        return true;
+      }
+      const response = await getOAuthStatus(params.type, params.connectionId);
+      finalStatus = response.status;
+      return response.status !== "PENDING";
+    }, {
+      interval: POLL_INTERVAL_MS,
+      timeout: POLL_TIMEOUT_MS
+    }).catch((err) => {
+      if (err instanceof TimeoutError2) {
+        finalStatus = "PENDING";
+      } else {
+        throw err;
+      }
+    });
+  } finally {
+    process.exit = originalExit;
+    if (!skipped) {
+      if (finalStatus === "ACTIVE") {
+        s.stop(`${params.type} authorization complete`);
+      } else if (finalStatus === "FAILED") {
+        s.stop(`${params.type} authorization failed`);
+      } else {
+        s.stop(`${params.type} authorization timed out`);
+      }
     }
-  });
+  }
   return { type: params.type, status: finalStatus };
 }
 // src/core/resources/connector/push.ts
@@ -154711,7 +154752,7 @@ async function pushConnectors(connectors) {
   const localTypes = new Set(connectors.map((c) => c.type));
   for (const connector of connectors) {
     try {
-      const response = await setConnector(connector.type, connector.scopes);
+      const response = await setConnector(connector.type, connector.scopes ?? []);
       results.push(setResponseToResult(connector.type, response));
     } catch (err) {
       results.push({
@@ -154745,7 +154786,7 @@ function setResponseToResult(type, response) {
     return {
       type,
       action: "error",
-      error: response.error_message || `Already connected by ${response.other_user_email}`
+      error: response.error_message || `Already connected by ${response.other_user_email ?? "another user"}`
     };
   }
   if (response.already_authorized) {
@@ -169697,7 +169738,7 @@ async function checkForUpgrade() {
 function formatUpgradeMessage(info) {
   const { shinyOrange } = theme.colors;
   const { bold: bold2 } = theme.styles;
-  return `${shinyOrange("Update available!")} ${shinyOrange(`${info.currentVersion} → ${info.latestVersion}`)}  ${shinyOrange("Run:")} ${bold2(shinyOrange("npm update -g base44"))}`;
+  return `${shinyOrange("Update available!")} ${shinyOrange(`${info.currentVersion} → ${info.latestVersion}`)}  ${shinyOrange("Run:")} ${bold2(shinyOrange("npm install -g base44@latest"))}`;
 }
 async function printUpgradeNotificationIfAvailable() {
   try {
@@ -169879,6 +169920,7 @@ function printSummary(results, oauthOutcomes) {
   const synced = [];
   const added = [];
   const removed = [];
+  const skipped = [];
   const failed = [];
   for (const r2 of results) {
     const oauthStatus = oauthOutcomes.get(r2.type);
@@ -169891,6 +169933,8 @@ function printSummary(results, oauthOutcomes) {
     } else if (r2.action === "needs_oauth") {
       if (oauthStatus === "ACTIVE") {
         added.push(r2.type);
+      } else if (oauthStatus === "SKIPPED") {
+        skipped.push(r2.type);
       } else if (oauthStatus === "PENDING") {
         failed.push({ type: r2.type, error: "authorization timed out" });
       } else if (oauthStatus === "FAILED") {
@@ -169901,18 +169945,21 @@ function printSummary(results, oauthOutcomes) {
     }
   }
   M2.info("");
-  M2.info(source_default.bold("Summary:"));
+  M2.info(theme.styles.bold("Summary:"));
   if (synced.length > 0) {
-    M2.info(source_default.green(`  Synced: ${synced.join(", ")}`));
+    M2.success(`Synced: ${synced.join(", ")}`);
   }
   if (added.length > 0) {
-    M2.info(source_default.green(`  Added: ${added.join(", ")}`));
+    M2.success(`Added: ${added.join(", ")}`);
   }
   if (removed.length > 0) {
-    M2.info(source_default.dim(`  Removed: ${removed.join(", ")}`));
+    M2.info(theme.styles.dim(`Removed: ${removed.join(", ")}`));
+  }
+  if (skipped.length > 0) {
+    M2.warn(`Skipped: ${skipped.join(", ")}`);
   }
   for (const r2 of failed) {
-    M2.info(source_default.red(`  Failed: ${r2.type}${r2.error ? ` - ${r2.error}` : ""}`));
+    M2.error(`Failed: ${r2.type}${r2.error ? ` - ${r2.error}` : ""}`);
   }
 }
 async function pushConnectorsAction() {
@@ -169925,18 +169972,15 @@ async function pushConnectorsAction() {
   }
   const { results } = await runTask("Pushing connectors to Base44", async () => {
     return await pushConnectors(connectors);
-  }, {
-    successMessage: "Connectors pushed",
-    errorMessage: "Failed to push connectors"
   });
   const oauthOutcomes = new Map;
   const needsOAuth = results.filter(isPendingOAuth);
   let outroMessage = "Connectors pushed to Base44";
   if (needsOAuth.length > 0) {
     M2.info("");
-    M2.info(source_default.yellow(`${needsOAuth.length} connector(s) require authorization in your browser:`));
+    M2.warn(`${needsOAuth.length} connector(s) require authorization in your browser:`);
     for (const connector2 of needsOAuth) {
-      M2.info(`  ${connector2.type}: ${source_default.dim(connector2.redirectUrl)}`);
+      M2.info(`  ${connector2.type}: ${theme.styles.dim(connector2.redirectUrl)}`);
     }
     const pending = needsOAuth.map((c3) => c3.type).join(", ");
     if (process.env.CI) {
@@ -169951,15 +169995,10 @@ async function pushConnectorsAction() {
         for (const connector2 of needsOAuth) {
           M2.info(`
 Opening browser for ${connector2.type}...`);
-          const oauthResult = await runTask(`Waiting for ${connector2.type} authorization...`, async () => {
-            return await runOAuthFlow({
-              type: connector2.type,
-              redirectUrl: connector2.redirectUrl,
-              connectionId: connector2.connectionId
-            });
-          }, {
-            successMessage: `${connector2.type} authorization complete`,
-            errorMessage: `${connector2.type} authorization failed`
+          const oauthResult = await runOAuthFlowWithSkip({
+            type: connector2.type,
+            redirectUrl: connector2.redirectUrl,
+            connectionId: connector2.connectionId
           });
           oauthOutcomes.set(connector2.type, oauthResult.status);
         }
@@ -170536,10 +170575,10 @@ async function generateContent(input) {
   const registryEntries = [
     [
       "EntityTypeRegistry",
-      entities.map((e8) => `${e8.name}: ${toPascalCase(e8.name)};`)
+      entities.map((e8) => `"${e8.name}": ${toPascalCase(e8.name)};`)
     ],
-    ["FunctionNameRegistry", functions.map((f7) => `${f7.name}: true;`)],
-    ["AgentNameRegistry", agents.map((a5) => `${a5.name}: true;`)]
+    ["FunctionNameRegistry", functions.map((f7) => `"${f7.name}": true;`)],
+    ["AgentNameRegistry", agents.map((a5) => `"${a5.name}": true;`)]
   ];
   const registries2 = registryEntries.filter(([, entries]) => entries.length > 0).map(([name2, entries]) => registry2(name2, entries));
   return [
@@ -174919,4 +174958,4 @@ export {
   CLIExitError
 };
 
-//# debugId=13AA5E3A43A368D664756E2164756E21
+//# debugId=E37980718A5E4C3064756E2164756E21