@base44-preview/cli 0.0.32-pr.251.fd02def → 0.0.32-pr.252.3b64eaf

package/dist/cli/index.js

@@ -17468,7 +17468,7 @@ var require_lodash2 = __commonJS((exports, module) => {
       function nth(array2, n2) {
         return array2 && array2.length ? baseNth(array2, toInteger(n2)) : undefined2;
       }
-      var pull2 = baseRest(pullAll);
+      var pull = baseRest(pullAll);
       function pullAll(array2, values2) {
         return array2 && array2.length && values2 && values2.length ? basePullAll(array2, values2) : array2;
       }
@@ -19233,7 +19233,7 @@ __p += '`;
       lodash.pickBy = pickBy;
       lodash.property = property;
       lodash.propertyOf = propertyOf;
-      lodash.pull = pull2;
+      lodash.pull = pull;
       lodash.pullAll = pullAll;
       lodash.pullAllBy = pullAllBy;
       lodash.pullAllWith = pullAllWith;
@@ -185051,8 +185051,8 @@ var TikTokConnectorSchema = exports_external.object({
   type: exports_external.literal("tiktok"),
   scopes: exports_external.array(exports_external.string()).default([])
 });
-var StripeConnectorSchema = exports_external.object({
-  type: exports_external.literal("stripe"),
+var GoogleBigQueryConnectorSchema = exports_external.object({
+  type: exports_external.literal("googlebigquery"),
   scopes: exports_external.array(exports_external.string()).default([])
 });
 var CustomTypeSchema = exports_external.string().min(1).regex(/^[a-z0-9_-]+$/i);
@@ -185067,13 +185067,13 @@ var ConnectorResourceSchema = exports_external.union([
   GoogleSheetsConnectorSchema,
   GoogleDocsConnectorSchema,
   GoogleSlidesConnectorSchema,
+  GoogleBigQueryConnectorSchema,
   SlackConnectorSchema,
   NotionConnectorSchema,
   SalesforceConnectorSchema,
   HubspotConnectorSchema,
   LinkedInConnectorSchema,
   TikTokConnectorSchema,
-  StripeConnectorSchema,
   GenericConnectorSchema
 ]);
 var KnownIntegrationTypes = [
@@ -185083,13 +185083,13 @@ var KnownIntegrationTypes = [
   "googlesheets",
   "googledocs",
   "googleslides",
+  "googlebigquery",
   "slack",
   "notion",
   "salesforce",
   "hubspot",
   "linkedin",
-  "tiktok",
-  "stripe"
+  "tiktok"
 ];
 var IntegrationTypeSchema = exports_external.union([
   exports_external.enum(KnownIntegrationTypes),
@@ -185142,18 +185142,6 @@ var RemoveConnectorResponseSchema = exports_external.object({
   status: data.status,
   integrationType: data.integration_type
 }));
-var STRIPE_CONNECTOR_TYPE = "stripe";
-var InstallStripeResponseSchema = exports_external.object({
-  already_installed: exports_external.boolean(),
-  claim_url: exports_external.string().nullable()
-});
-var StripeStatusResponseSchema = exports_external.object({
-  stripe_mode: exports_external.enum(["sandbox", "live"]).nullable(),
-  sandbox_claim_url: exports_external.string().nullable().optional()
-});
-var RemoveStripeResponseSchema = exports_external.object({
-  success: exports_external.boolean()
-});
 
 // src/core/resources/connector/api.ts
 async function listConnectors() {
@@ -185221,54 +185209,6 @@ async function removeConnector(integrationType) {
   }
   return result.data;
 }
-async function installStripe() {
-  const appClient = getAppClient();
-  let response;
-  try {
-    response = await appClient.post("payments/stripe/install", {
-      timeout: 60000
-    });
-  } catch (error48) {
-    throw await ApiError.fromHttpError(error48, "installing Stripe");
-  }
-  const result = InstallStripeResponseSchema.safeParse(await response.json());
-  if (!result.success) {
-    throw new SchemaValidationError("Invalid response from server", result.error);
-  }
-  return result.data;
-}
-async function getStripeStatus() {
-  const appClient = getAppClient();
-  let response;
-  try {
-    response = await appClient.get("payments/stripe/status", {
-      timeout: 60000
-    });
-  } catch (error48) {
-    throw await ApiError.fromHttpError(error48, "checking Stripe integration status");
-  }
-  const result = StripeStatusResponseSchema.safeParse(await response.json());
-  if (!result.success) {
-    throw new SchemaValidationError("Invalid response from server", result.error);
-  }
-  return result.data;
-}
-async function removeStripe() {
-  const appClient = getAppClient();
-  let response;
-  try {
-    response = await appClient.delete("payments/stripe", {
-      timeout: 60000
-    });
-  } catch (error48) {
-    throw await ApiError.fromHttpError(error48, "removing Stripe integration");
-  }
-  const result = RemoveStripeResponseSchema.safeParse(await response.json());
-  if (!result.success) {
-    throw new SchemaValidationError("Invalid response from server", result.error);
-  }
-  return result.data;
-}
 // src/core/resources/connector/config.ts
 import { join as join4 } from "node:path";
 import { isDeepStrictEqual } from "node:util";
@@ -185317,7 +185257,7 @@ async function readAllConnectors(connectorsDir) {
 async function writeConnectors(connectorsDir, remoteConnectors) {
   const entries = await readConnectorFiles(connectorsDir);
   const typeToEntry = buildTypeToEntryMap(entries);
-  const newTypes = new Set(remoteConnectors.map((c) => c.type));
+  const newTypes = new Set(remoteConnectors.map((c) => c.integrationType));
   const deleted = [];
   for (const [type, entry] of typeToEntry) {
     if (!newTypes.has(type)) {
@@ -185327,44 +185267,22 @@ async function writeConnectors(connectorsDir, remoteConnectors) {
   }
   const written = [];
   for (const connector of remoteConnectors) {
-    const existing = typeToEntry.get(connector.type);
-    if (existing && isDeepStrictEqual(existing.data, connector)) {
+    const existing = typeToEntry.get(connector.integrationType);
+    const localConnector = {
+      type: connector.integrationType,
+      scopes: connector.scopes
+    };
+    if (existing && isDeepStrictEqual(existing.data, localConnector)) {
       continue;
     }
-    const filePath = existing?.filePath ?? join4(connectorsDir, `${connector.type}.${CONFIG_FILE_EXTENSION}`);
-    await writeJsonFile(filePath, connector);
-    written.push(connector.type);
+    const filePath = existing?.filePath ?? join4(connectorsDir, `${connector.integrationType}.${CONFIG_FILE_EXTENSION}`);
+    await writeJsonFile(filePath, localConnector);
+    written.push(connector.integrationType);
   }
   return { written, deleted };
 }
-// src/core/resources/connector/pull.ts
-async function pullAllConnectors() {
-  const [oauthResponse, stripeStatus] = await Promise.all([
-    listConnectors(),
-    getStripeStatus()
-  ]);
-  const connectors = oauthResponse.integrations.map((i) => ({
-    type: i.integrationType,
-    scopes: i.scopes
-  }));
-  if (stripeStatus.stripe_mode !== null) {
-    connectors.push({ type: STRIPE_CONNECTOR_TYPE, scopes: [] });
-  }
-  return connectors;
-}
 // src/core/resources/connector/push.ts
 async function pushConnectors(connectors) {
-  const stripeConnector = connectors.find((c) => c.type === STRIPE_CONNECTOR_TYPE);
-  const oauthConnectors = connectors.filter((c) => c.type !== STRIPE_CONNECTOR_TYPE);
-  const oauthResults = await syncOAuthConnectors(oauthConnectors);
-  const stripeResult = await syncStripeConnector(stripeConnector);
-  const results = [...oauthResults];
-  if (stripeResult) {
-    results.push(stripeResult);
-  }
-  return { results };
-}
-async function syncOAuthConnectors(connectors) {
   const results = [];
   const upstream = await listConnectors();
   const localTypes = new Set(connectors.map((c) => c.type));
@@ -185397,62 +185315,7 @@ async function syncOAuthConnectors(connectors) {
       }
     }
   }
-  return results;
-}
-async function syncStripeConnector(localStripe) {
-  const remoteStatus = await fetchStripeRemoteStatus();
-  if (remoteStatus === "error") {
-    return localStripe ? stripeError("Failed to check Stripe integration status") : null;
-  }
-  const isRemoteInstalled = remoteStatus.stripe_mode !== null;
-  const needsInstall = localStripe && !isRemoteInstalled;
-  const alreadySynced = localStripe && isRemoteInstalled;
-  const needsRemoval = !localStripe && isRemoteInstalled;
-  if (needsInstall) {
-    return handleStripeInstall();
-  }
-  if (alreadySynced) {
-    return stripeSynced();
-  }
-  if (needsRemoval) {
-    return handleStripeRemoval();
-  }
-  return null;
-}
-async function fetchStripeRemoteStatus() {
-  try {
-    return await getStripeStatus();
-  } catch {
-    return "error";
-  }
-}
-async function handleStripeInstall() {
-  try {
-    const result = await installStripe();
-    return stripeProvisioned(result.claim_url ?? undefined);
-  } catch (err) {
-    return stripeError(err instanceof Error ? err.message : String(err));
-  }
-}
-async function handleStripeRemoval() {
-  try {
-    await removeStripe();
-    return stripeRemoved();
-  } catch (err) {
-    return stripeError(err instanceof Error ? err.message : String(err));
-  }
-}
-function stripeSynced() {
-  return { type: STRIPE_CONNECTOR_TYPE, action: "synced" };
-}
-function stripeProvisioned(claimUrl) {
-  return { type: STRIPE_CONNECTOR_TYPE, action: "provisioned", claimUrl };
-}
-function stripeRemoved() {
-  return { type: STRIPE_CONNECTOR_TYPE, action: "removed" };
-}
-function stripeError(error48) {
-  return { type: STRIPE_CONNECTOR_TYPE, action: "error", error: error48 };
+  return { results };
 }
 function getConnectorSyncResult(type, response) {
   if (response.error === "different_user") {
@@ -185470,7 +185333,7 @@ function getConnectorSyncResult(type, response) {
       type,
       action: "needs_oauth",
       redirectUrl: response.redirectUrl,
-      connectionId: response.connectionId ?? ""
+      connectionId: response.connectionId ?? undefined
     };
   }
   return { type, action: "synced" };
@@ -185483,7 +185346,10 @@ var connectorResource = {
 // src/core/resources/entity/schema.ts
 var FieldConditionSchema = exports_external.union([
   exports_external.string(),
-  exports_external.object({
+  exports_external.number(),
+  exports_external.boolean(),
+  exports_external.null(),
+  exports_external.looseObject({
     $in: exports_external.unknown().optional(),
     $nin: exports_external.unknown().optional(),
     $ne: exports_external.unknown().optional(),
@@ -185500,6 +185366,15 @@ var rlsConditionAllowedKeys = new Set([
   "user_condition",
   "created_by",
   "created_by_id",
+  "id",
+  "_id",
+  "created_date",
+  "updated_date",
+  "app_id",
+  "entity_name",
+  "is_deleted",
+  "deleted_date",
+  "environment",
   "$or",
   "$and",
   "$nor"
@@ -185528,60 +185403,33 @@ var isValidFieldCondition = (value) => {
   }
   return false;
 };
-var RefineRLSConditionSchema = RLSConditionSchema.refine((val) => Object.entries(val).every(([key, value]) => {
-  if (rlsConditionAllowedKeys.has(key)) {
-    return true;
-  }
-  if (!key.startsWith("data.")) {
-    return false;
-  }
-  return isValidFieldCondition(value);
-}), "Keys must be known RLS keys or match data.* pattern with valid value");
+var RefineRLSConditionSchema = RLSConditionSchema.refine((val) => Object.entries(val).every(([key, value]) => rlsConditionAllowedKeys.has(key) || isValidFieldCondition(value)), "Field condition values must be a primitive or an operator object ($in, $nin, $ne, $all)");
 var RLSRuleSchema = exports_external.union([exports_external.boolean(), RefineRLSConditionSchema]);
-var EntityRLSSchema = exports_external.strictObject({
+var EntityRLSSchema = exports_external.looseObject({
   create: RLSRuleSchema.optional(),
   read: RLSRuleSchema.optional(),
   update: RLSRuleSchema.optional(),
   delete: RLSRuleSchema.optional(),
   write: RLSRuleSchema.optional()
 });
-var FieldRLSSchema = exports_external.strictObject({
+var FieldRLSSchema = exports_external.looseObject({
   read: RLSRuleSchema.optional(),
   write: RLSRuleSchema.optional(),
   create: RLSRuleSchema.optional(),
   update: RLSRuleSchema.optional(),
   delete: RLSRuleSchema.optional()
 });
-var PropertyTypeSchema = exports_external.enum([
-  "string",
-  "number",
-  "integer",
-  "boolean",
-  "array",
-  "object"
-]);
-var StringFormatSchema = exports_external.enum([
-  "date",
-  "date-time",
-  "time",
-  "email",
-  "uri",
-  "hostname",
-  "ipv4",
-  "ipv6",
-  "uuid"
-]);
-var PropertyDefinitionSchema = exports_external.object({
-  type: PropertyTypeSchema,
+var PropertyDefinitionSchema = exports_external.looseObject({
+  type: exports_external.string().optional(),
   title: exports_external.string().optional(),
   description: exports_external.string().optional(),
   minLength: exports_external.number().int().min(0).optional(),
   maxLength: exports_external.number().int().min(0).optional(),
   pattern: exports_external.string().optional(),
-  format: StringFormatSchema.optional(),
+  format: exports_external.string().optional(),
   minimum: exports_external.number().optional(),
   maximum: exports_external.number().optional(),
-  enum: exports_external.array(exports_external.string()).optional(),
+  enum: exports_external.array(exports_external.unknown()).optional(),
   enumNames: exports_external.array(exports_external.string()).optional(),
   default: exports_external.unknown().optional(),
   $ref: exports_external.string().optional(),
@@ -185594,12 +185442,12 @@ var PropertyDefinitionSchema = exports_external.object({
     return exports_external.record(exports_external.string(), PropertyDefinitionSchema).optional();
   }
 });
-var EntitySchema = exports_external.object({
-  type: exports_external.literal("object"),
-  name: exports_external.string().regex(/^[a-zA-Z0-9]+$/, "Entity name must be alphanumeric only"),
+var EntitySchema = exports_external.looseObject({
+  type: exports_external.literal("object").default("object"),
+  name: exports_external.string().min(1).regex(/^[a-zA-Z0-9]+$/, "Entity name must be alphanumeric only"),
   title: exports_external.string().optional(),
   description: exports_external.string().optional(),
-  properties: exports_external.record(exports_external.string(), PropertyDefinitionSchema),
+  properties: exports_external.record(exports_external.string(), PropertyDefinitionSchema).default({}),
   required: exports_external.array(exports_external.string()).optional(),
   rls: EntityRLSSchema.optional()
 });
@@ -193779,10 +193627,6 @@ function getDashboardUrl(projectId) {
   const id = projectId ?? getAppConfig().id;
   return `${getBase44ApiUrl()}/apps/${id}/editor/workspace/overview`;
 }
-function getConnectorsUrl(projectId) {
-  const id = projectId ?? getAppConfig().id;
-  return `${getBase44ApiUrl()}/apps/${id}/editor/workspace/app-connections`;
-}
 // src/cli/commands/agents/pull.ts
 async function pullAgentsAction() {
   const { project: project2 } = await readProjectConfig();
@@ -193887,13 +193731,13 @@ async function pullConnectorsAction() {
   const configDir = dirname8(project2.configPath);
   const connectorsDir = join10(configDir, project2.connectorsDir);
   const remoteConnectors = await runTask("Fetching connectors from Base44", async () => {
-    return await pullAllConnectors();
+    return await listConnectors();
   }, {
     successMessage: "Connectors fetched successfully",
     errorMessage: "Failed to fetch connectors"
   });
   const { written, deleted } = await runTask("Syncing connector files", async () => {
-    return await writeConnectors(connectorsDir, remoteConnectors);
+    return await writeConnectors(connectorsDir, remoteConnectors.integrations);
   }, {
     successMessage: "Connector files synced successfully",
     errorMessage: "Failed to sync connector files"
@@ -193908,7 +193752,7 @@ async function pullConnectorsAction() {
     M2.info("All connectors are already up to date");
   }
   return {
-    outroMessage: `Pulled ${remoteConnectors.length} connectors to ${connectorsDir}`
+    outroMessage: `Pulled ${remoteConnectors.integrations.length} connectors to ${connectorsDir}`
   };
 }
 function getConnectorsPullCommand(context) {
@@ -194527,7 +194371,7 @@ var open_default = open;
 var POLL_INTERVAL_MS = 2000;
 var POLL_TIMEOUT_MS = 2 * 60 * 1000;
 function filterPendingOAuth(results) {
-  return results.filter((r2) => r2.action === "needs_oauth" && !!r2.connectionId);
+  return results.filter((r2) => r2.action === "needs_oauth" && !!r2.redirectUrl && !!r2.connectionId);
 }
 async function runOAuthFlowWithSkip(connector2) {
   await open_default(connector2.redirectUrl);
@@ -194609,49 +194453,32 @@ Opening browser for ${connector2.type}...`);
 function printSummary(results, oauthOutcomes) {
   const synced = [];
   const added = [];
-  const provisioned = [];
   const removed = [];
   const skipped = [];
   const failed = [];
   for (const r2 of results) {
-    switch (r2.action) {
-      case "provisioned":
-        provisioned.push(r2);
-        break;
-      case "synced":
-        synced.push(r2.type);
-        break;
-      case "removed":
-        removed.push(r2.type);
-        break;
-      case "error":
-        failed.push({ type: r2.type, error: r2.error });
-        break;
-      case "needs_oauth": {
-        const oauthStatus = oauthOutcomes.get(r2.type);
-        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") {
-          failed.push({ type: r2.type, error: "authorization failed" });
-        } else {
-          failed.push({ type: r2.type, error: "needs authorization" });
-        }
-        break;
+    const oauthStatus = oauthOutcomes.get(r2.type);
+    if (r2.action === "synced") {
+      synced.push(r2.type);
+    } else if (r2.action === "removed") {
+      removed.push(r2.type);
+    } else if (r2.action === "error") {
+      failed.push({ type: r2.type, error: r2.error });
+    } 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") {
+        failed.push({ type: r2.type, error: "authorization failed" });
+      } else {
+        failed.push({ type: r2.type, error: "needs authorization" });
       }
     }
   }
   M2.info(theme.styles.bold("Summary:"));
-  for (const i2 of provisioned) {
-    M2.success(`Provisioned: ${i2.type}`);
-    if (i2.claimUrl) {
-      M2.info(`  Claim your Stripe account: ${theme.colors.links(i2.claimUrl)}`);
-    }
-    M2.info(`  Connectors dashboard: ${theme.colors.links(getConnectorsUrl())}`);
-  }
   if (synced.length > 0) {
     M2.success(`Synced: ${synced.join(", ")}`);
   }
@@ -194665,7 +194492,7 @@ function printSummary(results, oauthOutcomes) {
     M2.warn(`Skipped: ${skipped.join(", ")}`);
   }
   for (const r2 of failed) {
-    M2.error(`Failed: ${r2.type} - ${r2.error}`);
+    M2.error(`Failed: ${r2.type}${r2.error ? ` - ${r2.error}` : ""}`);
   }
 }
 async function pushConnectorsAction() {
@@ -194699,7 +194526,7 @@ function getConnectorsPushCommand(context) {
 
 // src/cli/commands/connectors/index.ts
 function getConnectorsCommand(context) {
-  return new Command("connectors").description("Manage project connectors").addCommand(getConnectorsPullCommand(context)).addCommand(getConnectorsPushCommand(context));
+  return new Command("connectors").description("Manage project connectors (OAuth integrations)").addCommand(getConnectorsPullCommand(context)).addCommand(getConnectorsPushCommand(context));
 }
 
 // src/cli/commands/dashboard/open.ts
@@ -195015,11 +194842,15 @@ ${summaryLines.join(`
     successMessage: theme.colors.base44Orange("Deployment completed"),
     errorMessage: "Deployment failed"
   });
-  const connectorResults = result.connectorResults ?? [];
-  await handleOAuthConnectors(connectorResults, options);
-  const stripeResult = connectorResults.find((r2) => r2.action === "provisioned");
-  if (stripeResult) {
-    printStripeResult(stripeResult);
+  const needsOAuth = filterPendingOAuth(result.connectorResults ?? []);
+  if (needsOAuth.length > 0) {
+    const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
+      skipPrompt: options.yes || !!process.env.CI
+    });
+    const allAuthorized = oauthOutcomes.size > 0 && [...oauthOutcomes.values()].every((s) => s === "ACTIVE");
+    if (!allAuthorized) {
+      M2.info("Some connectors still require authorization. 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) {
@@ -195032,25 +194863,6 @@ function getDeployCommand(context) {
     await runCommand(() => deployAction(options), { requireAuth: true }, context);
   });
 }
-async function handleOAuthConnectors(connectorResults, options) {
-  const needsOAuth = filterPendingOAuth(connectorResults);
-  if (needsOAuth.length === 0)
-    return;
-  const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
-    skipPrompt: options.yes || !!process.env.CI
-  });
-  const allAuthorized = oauthOutcomes.size > 0 && [...oauthOutcomes.values()].every((s) => s === "ACTIVE");
-  if (!allAuthorized) {
-    M2.info("Some connectors still require authorization. Run 'base44 connectors push' or open the links above in your browser.");
-  }
-}
-function printStripeResult(r2) {
-  M2.success(`Provisioned: Stripe`);
-  if (r2.claimUrl) {
-    M2.info(`  Claim your Stripe account: ${theme.colors.links(r2.claimUrl)}`);
-  }
-  M2.info(`  Connectors dashboard: ${theme.colors.links(getConnectorsUrl())}`);
-}
 
 // src/cli/commands/project/link.ts
 function validateNonInteractiveFlags2(command) {
@@ -199939,4 +199751,4 @@ export {
   CLIExitError
 };
 
-//# debugId=72EE81BD671BA57A64756E2164756E21
+//# debugId=AF03C92ADCD7DDC664756E2164756E21