@base44-preview/cli 0.0.32-pr.249.4251a52 → 0.0.32-pr.249.535f2a7

package/dist/cli/index.js

@@ -178102,6 +178102,18 @@ class InvalidInputError extends UserError {
   code = "INVALID_INPUT";
 }
 
+class DependencyNotFoundError extends UserError {
+  code = "DEPENDENCY_NOT_FOUND";
+  constructor(message, options) {
+    super(message, {
+      hints: options?.hints ?? [
+        { message: "Install the required dependency and try again" }
+      ],
+      cause: options?.cause
+    });
+  }
+}
+
 class ApiError extends SystemError {
   code = "API_ERROR";
   statusCode;
@@ -178217,6 +178229,21 @@ class FileReadError extends SystemError {
     });
   }
 }
+
+class InternalError extends SystemError {
+  code = "INTERNAL_ERROR";
+  constructor(message, options) {
+    super(message, {
+      hints: options?.hints ?? [
+        {
+          message: "This is an unexpected error. Please report it if it persists."
+        }
+      ],
+      cause: options?.cause
+    });
+  }
+}
+
 class TypeGenerationError extends SystemError {
   code = "TYPE_GENERATION_ERROR";
   entityName;
@@ -185051,6 +185078,10 @@ var TikTokConnectorSchema = exports_external.object({
   type: exports_external.literal("tiktok"),
   scopes: exports_external.array(exports_external.string()).default([])
 });
+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);
 var GenericConnectorSchema = exports_external.object({
   type: CustomTypeSchema,
@@ -185063,6 +185094,7 @@ var ConnectorResourceSchema = exports_external.union([
   GoogleSheetsConnectorSchema,
   GoogleDocsConnectorSchema,
   GoogleSlidesConnectorSchema,
+  GoogleBigQueryConnectorSchema,
   SlackConnectorSchema,
   NotionConnectorSchema,
   SalesforceConnectorSchema,
@@ -185078,6 +185110,7 @@ var KnownIntegrationTypes = [
   "googlesheets",
   "googledocs",
   "googleslides",
+  "googlebigquery",
   "slack",
   "notion",
   "salesforce",
@@ -185340,7 +185373,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(),
@@ -185357,6 +185393,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"
@@ -185385,60 +185430,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(),
@@ -185451,12 +185469,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()
 });
@@ -186024,7 +186042,7 @@ async function handleUnauthorized(request, _options, response) {
     return;
   }
   retriedRequests.add(request);
-  return distribution_default(request, {
+  return distribution_default(request.clone(), {
     headers: { Authorization: `Bearer ${newAccessToken}` }
   });
 }
@@ -186663,7 +186681,9 @@ var theme = {
   styles: {
     header: source_default.dim,
     bold: source_default.bold,
-    dim: source_default.dim
+    dim: source_default.dim,
+    error: source_default.red,
+    warn: source_default.yellow
   },
   format: {
     errorContext(ctx) {
@@ -195206,62 +195226,10 @@ function getTypesCommand(context) {
   return new Command("types").description("Manage TypeScript type generation").addCommand(getTypesGenerateCommand(context));
 }
 
-// src/cli/dev/createDevLogger.ts
-var dateTimeFormat = new Intl.DateTimeFormat([], {
-  hour: "2-digit",
-  minute: "2-digit",
-  second: "2-digit",
-  hour12: false
-});
-var colorByType = {
-  error: source_default.red,
-  warn: source_default.yellow,
-  log: (text) => text
-};
-function createDevLogger(isPrefixed = true) {
-  const print = (type, msg) => {
-    const colorize = colorByType[type];
-    switch (type) {
-      case "error":
-        console.error(colorize(msg));
-        break;
-      case "warn":
-        console.warn(colorize(msg));
-        break;
-      default:
-        console.log(msg);
-    }
-  };
-  const prefixedLog = (type, msg) => {
-    const timestamp = dateTimeFormat.format(new Date);
-    const colorize = colorByType[type];
-    console.log(`${source_default.gray(timestamp)} ${colorize(msg)}`);
-  };
-  return isPrefixed ? {
-    log: (msg) => prefixedLog("log", msg),
-    error: (msg, err) => {
-      prefixedLog("error", msg);
-      if (err) {
-        prefixedLog("error", String(err));
-      }
-    },
-    warn: (msg) => prefixedLog("warn", msg)
-  } : {
-    log: (msg) => print("log", msg),
-    error: (msg, err) => {
-      print("error", msg);
-      if (err) {
-        print("error", String(err));
-      }
-    },
-    warn: (msg) => print("warn", msg)
-  };
-}
-
 // src/cli/dev/dev-server/main.ts
+import { dirname as dirname12, join as join16 } from "node:path";
 var import_cors = __toESM(require_lib4(), 1);
 var import_express2 = __toESM(require_express(), 1);
-import { dirname as dirname12, join as join16 } from "node:path";
 
 // node_modules/get-port/index.js
 import net from "node:net";
@@ -195380,8 +195348,60 @@ async function getPorts(options8) {
 // src/cli/dev/dev-server/main.ts
 var import_http_proxy_middleware = __toESM(require_dist2(), 1);
 
+// src/cli/dev/createDevLogger.ts
+var dateTimeFormat = new Intl.DateTimeFormat([], {
+  hour: "2-digit",
+  minute: "2-digit",
+  second: "2-digit",
+  hour12: false
+});
+var colorByType = {
+  error: theme.styles.error,
+  warn: theme.styles.warn,
+  log: (text) => text
+};
+function createDevLogger(isPrefixed = true) {
+  const print = (type, msg) => {
+    const colorize = colorByType[type];
+    switch (type) {
+      case "error":
+        console.error(colorize(msg));
+        break;
+      case "warn":
+        console.warn(colorize(msg));
+        break;
+      default:
+        console.log(msg);
+    }
+  };
+  const prefixedLog = (type, msg) => {
+    const timestamp = dateTimeFormat.format(new Date);
+    const colorize = colorByType[type];
+    console.log(`${theme.styles.dim(timestamp)} ${colorize(msg)}`);
+  };
+  return isPrefixed ? {
+    log: (msg) => prefixedLog("log", msg),
+    error: (msg, err) => {
+      prefixedLog("error", msg);
+      if (err) {
+        prefixedLog("error", String(err));
+      }
+    },
+    warn: (msg) => prefixedLog("warn", msg)
+  } : {
+    log: (msg) => print("log", msg),
+    error: (msg, err) => {
+      print("error", msg);
+      if (err) {
+        print("error", String(err));
+      }
+    },
+    warn: (msg) => print("warn", msg)
+  };
+}
+
 // src/cli/dev/dev-server/function-manager.ts
-import { spawn as spawn2 } from "node:child_process";
+import { spawn as spawn2, spawnSync as spawnSync2 } from "node:child_process";
 import { dirname as dirname11, join as join15 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 var __dirname5 = dirname11(fileURLToPath7(import.meta.url));
@@ -195391,26 +195411,52 @@ var READY_TIMEOUT = 30000;
 class FunctionManager {
   functions;
   running = new Map;
+  starting = new Map;
   logger;
   constructor(functions, logger) {
     this.functions = new Map(functions.map((f7) => [f7.name, f7]));
     this.logger = logger;
   }
+  functionNames() {
+    return Array.from(this.functions.keys());
+  }
   getFunction(name2) {
     return this.functions.get(name2);
   }
+  verifyDenoIsInstalled() {
+    if (this.functions.size > 0) {
+      const result = spawnSync2("deno", ["--version"]);
+      if (result.error) {
+        throw new DependencyNotFoundError("Deno is required to run functions", {
+          hints: [{ message: "Install Deno from https://deno.com/download" }]
+        });
+      }
+    }
+  }
   async ensureRunning(name2) {
     const existing = this.running.get(name2);
     if (existing?.ready) {
       return existing.port;
     }
+    const pending = this.starting.get(name2);
+    if (pending) {
+      return pending;
+    }
     const backendFunction = this.functions.get(name2);
     if (!backendFunction) {
-      throw new Error(`Function "${name2}" not found`);
+      throw new InvalidInputError(`Function "${name2}" not found`, {
+        hints: [{ message: "Check available functions in your project" }]
+      });
     }
-    if (existing && !existing.ready) {
-      return this.waitForReady(name2, existing);
+    const promise2 = this.startFunction(name2, backendFunction);
+    this.starting.set(name2, promise2);
+    try {
+      return await promise2;
+    } finally {
+      this.starting.delete(name2);
     }
+  }
+  async startFunction(name2, backendFunction) {
     const port = await this.allocatePort();
     const process21 = this.spawnFunction(backendFunction, port);
     const runningFunc = {
@@ -195432,6 +195478,7 @@ class FunctionManager {
       process21.kill();
     }
     this.running.clear();
+    this.starting.clear();
   }
   stop(name2) {
     const running = this.running.get(name2);
@@ -195485,7 +195532,11 @@ class FunctionManager {
   waitForReady(name2, runningFunc) {
     return new Promise((resolve5, reject) => {
       const timeout3 = setTimeout(() => {
-        reject(new Error(`Function "${name2}" failed to start within timeout`));
+        reject(new InternalError(`Function "${name2}" failed to start within ${READY_TIMEOUT / 1000}s timeout`, {
+          hints: [
+            { message: "Check the function code for startup errors" }
+          ]
+        }));
       }, READY_TIMEOUT);
       const onData = (data) => {
         const output = data.toString();
@@ -195500,7 +195551,9 @@ class FunctionManager {
       runningFunc.process.on("exit", (code2) => {
         if (!runningFunc.ready) {
           clearTimeout(timeout3);
-          reject(new Error(`Function "${name2}" exited with code ${code2}`));
+          reject(new InternalError(`Function "${name2}" exited with code ${code2}`, {
+            hints: [{ message: "Check the function code for errors" }]
+          }));
         }
       });
     });
@@ -195574,13 +195627,7 @@ function proxyRequest(req, res, port, logger) {
       }
       resolve5();
     });
-    if (req.body && Object.keys(req.body).length > 0) {
-      const bodyString = JSON.stringify(req.body);
-      proxyReq.setHeader("Content-Type", "application/json");
-      proxyReq.setHeader("Content-Length", Buffer.byteLength(bodyString));
-      proxyReq.write(bodyString);
-    }
-    proxyReq.end();
+    req.pipe(proxyReq);
   });
 }
 
@@ -195588,7 +195635,7 @@ function proxyRequest(req, res, port, logger) {
 var DEFAULT_PORT = 4400;
 var BASE44_APP_URL = "https://base44.app";
 async function createDevServer(options8) {
-  const { logger, port: userPort } = options8;
+  const { port: userPort } = options8;
   const port = userPort ?? await getPorts({ port: DEFAULT_PORT });
   const { project: project2 } = await readProjectConfig();
   const configDir = dirname12(project2.configPath);
@@ -195609,17 +195656,18 @@ async function createDevServer(options8) {
     }
     next();
   });
-  const [functions] = await Promise.all([
-    functionResource.readAll(join16(configDir, project2.functionsDir))
-  ]);
-  const functionManager = new FunctionManager(functions, logger);
-  logger.log(`Loaded functions: ${functions.map((f7) => f7.name).join(", ") || "(none)"}`);
-  const functionRoutes = createFunctionRoutes(functionManager, logger);
+  const functions = await functionResource.readAll(join16(configDir, project2.functionsDir));
+  const devLogger = createDevLogger(false);
+  const functionManager = new FunctionManager(functions, devLogger);
+  functionManager.verifyDenoIsInstalled();
+  if (functionManager.functionNames().length > 0) {
+    M2.info(`Loaded functions: ${functionManager.functionNames().join(", ")}`);
+  }
+  const functionRoutes = createFunctionRoutes(functionManager, devLogger);
   app.use("/api/apps/:appId/functions", functionRoutes);
   app.use((req, res, next) => {
     return remoteProxy(req, res, next);
   });
-  app.use(import_express2.default.json());
   return new Promise((resolve5, reject) => {
     const server = app.listen(port, "127.0.0.1", (err) => {
       if (err) {
@@ -195629,6 +195677,12 @@ async function createDevServer(options8) {
           reject(err);
         }
       } else {
+        const shutdown = () => {
+          functionManager.stopAll();
+          server.close();
+        };
+        process.on("SIGINT", shutdown);
+        process.on("SIGTERM", shutdown);
         resolve5({
           port,
           server
@@ -195642,8 +195696,7 @@ async function createDevServer(options8) {
 async function devAction(options8) {
   const port = options8.port ? Number(options8.port) : undefined;
   const { port: resolvedPort } = await createDevServer({
-    port,
-    logger: createDevLogger()
+    port
   });
   return {
     outroMessage: `Dev server is available at ${theme.colors.links(`http://localhost:${resolvedPort}`)}`
@@ -200034,4 +200087,4 @@ export {
   CLIExitError
 };
 
-//# debugId=8F3746945013573D64756E2164756E21
+//# debugId=10D47D308F001A4164756E2164756E21