@base44-preview/cli 0.0.30-pr.189.ae9567a → 0.0.30-pr.211.740aaa4

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);
   }
@@ -154711,7 +154727,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 +154761,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) {
@@ -162224,24 +162240,26 @@ async function createArchive(pathToArchive, targetArchivePath) {
 }
 // src/core/project/deploy.ts
 function hasResourcesToDeploy(projectData) {
-  const { project, entities, functions, agents } = projectData;
+  const { project, entities, functions, agents, connectors } = projectData;
   const hasSite = Boolean(project.site?.outputDirectory);
   const hasEntities = entities.length > 0;
   const hasFunctions = functions.length > 0;
   const hasAgents = agents.length > 0;
-  return hasEntities || hasFunctions || hasAgents || hasSite;
+  const hasConnectors = connectors.length > 0;
+  return hasEntities || hasFunctions || hasAgents || hasConnectors || hasSite;
 }
 async function deployAll(projectData) {
-  const { project, entities, functions, agents } = projectData;
+  const { project, entities, functions, agents, connectors } = projectData;
   await entityResource.push(entities);
   await functionResource.push(functions);
   await agentResource.push(agents);
+  const { results: connectorResults } = await pushConnectors(connectors);
   if (project.site?.outputDirectory) {
     const outputDir = resolve(project.root, project.site.outputDirectory);
     const { appUrl } = await deploySite(outputDir);
-    return { appUrl };
+    return { appUrl, connectorResults };
   }
-  return {};
+  return { connectorResults };
 }
 // src/core/clients/base44-client.ts
 var retriedRequests = new WeakSet;
@@ -169697,7 +169715,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 {
@@ -169871,10 +169889,48 @@ function getWhoamiCommand(context) {
   });
 }
 
-// src/cli/commands/connectors/push.ts
-function isPendingOAuth(r2) {
-  return r2.action === "needs_oauth" && !!r2.redirectUrl && !!r2.connectionId;
+// src/cli/commands/connectors/oauth-prompt.ts
+function filterPendingOAuth(results) {
+  return results.filter((r2) => r2.action === "needs_oauth" && !!r2.redirectUrl && !!r2.connectionId);
 }
+async function promptOAuthFlows(pending, options) {
+  const outcomes = new Map;
+  if (pending.length === 0) {
+    return outcomes;
+  }
+  M2.info("");
+  M2.warn(`${pending.length} connector(s) require authorization in your browser:`);
+  for (const connector2 of pending) {
+    M2.info(`  ${connector2.type}: ${theme.styles.dim(connector2.redirectUrl)}`);
+  }
+  if (options?.skipPrompt || process.env.CI) {
+    return outcomes;
+  }
+  const shouldAuth = await ye({
+    message: "Open browser to authorize now?"
+  });
+  if (pD(shouldAuth) || !shouldAuth) {
+    return outcomes;
+  }
+  for (const connector2 of pending) {
+    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`
+    });
+    outcomes.set(connector2.type, oauthResult.status);
+  }
+  return outcomes;
+}
+
+// src/cli/commands/connectors/push.ts
 function printSummary(results, oauthOutcomes) {
   const synced = [];
   const added = [];
@@ -169901,18 +169957,18 @@ 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(", ")}`));
   }
   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,46 +169981,13 @@ 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);
+  const needsOAuth = filterPendingOAuth(results);
   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:`));
-    for (const connector2 of needsOAuth) {
-      M2.info(`  ${connector2.type}: ${source_default.dim(connector2.redirectUrl)}`);
-    }
+  const oauthOutcomes = await promptOAuthFlows(needsOAuth);
+  if (needsOAuth.length > 0 && oauthOutcomes.size === 0) {
     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 {
-        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`
-          });
-          oauthOutcomes.set(connector2.type, oauthResult.status);
-        }
-      }
-    }
+    outroMessage = process.env.CI ? `Skipped OAuth in CI. Pending: ${pending}. Run 'base44 connectors push' locally to authorize.` : `Authorization skipped. Pending: ${pending}. Run 'base44 connectors push' again to complete.`;
   }
   printSummary(results, oauthOutcomes);
   return { outroMessage };
@@ -170255,7 +170278,7 @@ async function deployAction(options) {
       outroMessage: "No resources found to deploy"
     };
   }
-  const { project: project2, entities, functions, agents } = projectData;
+  const { project: project2, entities, functions, agents, connectors } = projectData;
   const summaryLines = [];
   if (entities.length > 0) {
     summaryLines.push(`  - ${entities.length} ${entities.length === 1 ? "entity" : "entities"}`);
@@ -170266,6 +170289,9 @@ async function deployAction(options) {
   if (agents.length > 0) {
     summaryLines.push(`  - ${agents.length} ${agents.length === 1 ? "agent" : "agents"}`);
   }
+  if (connectors.length > 0) {
+    summaryLines.push(`  - ${connectors.length} ${connectors.length === 1 ? "connector" : "connectors"}`);
+  }
   if (project2.site?.outputDirectory) {
     summaryLines.push(`  - Site from ${project2.site.outputDirectory}`);
   }
@@ -170290,6 +170316,16 @@ ${summaryLines.join(`
     successMessage: theme.colors.base44Orange("Deployment completed"),
     errorMessage: "Deployment failed"
   });
+  const needsOAuth = filterPendingOAuth(result.connectorResults ?? []);
+  if (needsOAuth.length > 0) {
+    const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
+      skipPrompt: options.yes
+    });
+    if (oauthOutcomes.size === 0) {
+      const pending = needsOAuth.map((c3) => c3.type).join(", ");
+      M2.info(`To authorize, run 'base44 connectors push' or open the links above in your browser.`);
+    }
+  }
   M2.message(`${theme.styles.header("Dashboard")}: ${theme.colors.links(getDashboardUrl())}`);
   if (result.appUrl) {
     M2.message(`${theme.styles.header("App URL")}: ${theme.colors.links(result.appUrl)}`);
@@ -170297,7 +170333,7 @@ ${summaryLines.join(`
   return { outroMessage: "App deployed successfully" };
 }
 function getDeployCommand(context) {
-  return new Command("deploy").description("Deploy all project resources (entities, functions, agents, and site)").option("-y, --yes", "Skip confirmation prompt").action(async (options) => {
+  return new Command("deploy").description("Deploy all project resources (entities, functions, agents, connectors, and site)").option("-y, --yes", "Skip confirmation prompt").action(async (options) => {
     await runCommand(() => deployAction(options), { requireAuth: true }, context);
   });
 }
@@ -170536,10 +170572,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 +174955,4 @@ export {
   CLIExitError
 };
 
-//# debugId=13AA5E3A43A368D664756E2164756E21
+//# debugId=F29098DA3AB96EDD64756E2164756E21