@base44-preview/cli 0.0.50-pr.481.3fd0022 → 0.0.50-pr.481.74f9319

package/dist/cli/index.js

@@ -253295,15 +253295,21 @@ class FunctionManager {
     this.setupProcessHandlers(name2, process21);
     return this.waitForReady(name2, runningFunc);
   }
-  reload(functions) {
-    this.stopAll();
+  async reload(functions) {
+    await this.stopAll();
     this.functions = new Map(functions.map((f7) => [f7.name, f7]));
   }
-  stopAll() {
-    for (const [name2, { process: process21 }] of this.running) {
+  async stopAll() {
+    await Promise.all(Array.from(this.running, ([name2, { process: proc2 }]) => {
       this.logger.log(`Stopping function: ${name2}`);
-      process21.kill();
-    }
+      const exited = new Promise((r5) => proc2.once("exit", () => r5()));
+      if (process.platform === "win32" && proc2.pid) {
+        spawn2("taskkill", ["/pid", String(proc2.pid), "/T", "/F"]);
+      } else {
+        proc2.kill();
+      }
+      return exited;
+    }));
     this.running.clear();
     this.starting.clear();
   }
@@ -253946,10 +253952,7 @@ function evaluateOperator(recordValue, operator) {
         }
         break;
       case "$nin":
-        if (!Array.isArray(opValue)) {
-          return false;
-        }
-        if (Array.isArray(opValue) && opValue.includes(recordValue)) {
+        if (!Array.isArray(opValue) || opValue.includes(recordValue)) {
           return false;
         }
         break;
@@ -253965,6 +253968,8 @@ function evaluateOperator(recordValue, operator) {
           return false;
         }
         break;
+      default:
+        return false;
     }
   }
   return true;
@@ -254029,6 +254034,9 @@ function checkRLS(rule, record2, user) {
   return evaluateCondition(rule, record2, user);
 }
 function applyFLS(record2, schema10, user, operation) {
+  if (Array.isArray(record2)) {
+    return record2.map((r5) => applyFLS(r5, schema10, user, operation));
+  }
   const result = {};
   for (const [key2, value] of Object.entries(record2)) {
     const rule = schema10.properties[key2]?.rls?.[operation];
@@ -254219,9 +254227,15 @@ async function createEntityRoutes(db2, logger2, broadcast) {
   const parseBody = import_express4.json();
   function withCollection(handler) {
     return async (req, res) => {
-      const collection = db2.getCollection(req.params.entityName);
+      const { entityName } = req.params;
+      const collection = db2.getCollection(entityName);
       if (!collection) {
-        res.status(404).json({ error: `Entity "${req.params.entityName}" not found` });
+        res.status(404).json({ error: `Entity "${entityName}" not found` });
+        return;
+      }
+      const schema10 = db2.getSchema(entityName);
+      if (!schema10) {
+        res.status(404).json({ error: `Schema for "${entityName}" not found` });
         return;
       }
       let currentUser;
@@ -254230,7 +254244,7 @@ async function createEntityRoutes(db2, logger2, broadcast) {
         const { payload } = import_jsonwebtoken3.default.decode(auth2.replace("Bearer ", ""), { complete: true }) ?? {};
         currentUser = await db2.getCollection(USER_COLLECTION)?.findOneAsync({ email: payload?.sub });
       } catch {}
-      await handler(req, res, collection, currentUser);
+      await handler(req, res, collection, schema10, currentUser);
     };
   }
   function emit(appId, entityName, type, data) {
@@ -254250,7 +254264,7 @@ async function createEntityRoutes(db2, logger2, broadcast) {
   }
   const userRouter = createUserRouter(db2, logger2);
   router.use("/User", userRouter);
-  router.get("/:entityName/:id", withCollection(async (req, res, collection, currentUser) => {
+  router.get("/:entityName/:id", withCollection(async (req, res, collection, schema10, currentUser) => {
     const { entityName, id: id2 } = req.params;
     try {
       const doc2 = await collection.findOneAsync({ id: id2 });
@@ -254258,38 +254272,27 @@ async function createEntityRoutes(db2, logger2, broadcast) {
         res.status(404).json({ error: `Record with id "${id2}" not found` });
         return;
       }
-      const schema10 = db2.getSchema(entityName);
-      if (!checkRLS(schema10?.rls?.read, doc2, currentUser)) {
+      if (!checkRLS(schema10.rls?.read, doc2, currentUser)) {
         res.status(404).json({
           message: `Entity ${entityName} with ID ${id2} not found`
         });
         return;
       }
-      let result = stripInternalFields(doc2);
-      if (schema10) {
-        result = applyFLS(result, schema10, currentUser, "read");
-      }
+      const result = applyFLS(stripInternalFields(doc2), schema10, currentUser, "read");
       res.json(result);
     } catch (error48) {
       logger2.error(`Error in GET /${entityName}/${id2}:`, error48);
       res.status(500).json({ error: "Internal server error" });
     }
   }));
-  router.get("/:entityName", withCollection(async (req, res, collection, currentUser) => {
+  router.get("/:entityName", withCollection(async (req, res, collection, schema10, currentUser) => {
     const { entityName } = req.params;
     try {
-      const schema10 = db2.getSchema(entityName);
-      if (schema10?.rls?.read === false) {
-        res.json([]);
-        return;
-      }
       let results = stripInternalFields(await queryEntity(collection, req.query));
-      if (schema10?.rls?.read && schema10.rls.read !== true) {
+      if (schema10.rls?.read && schema10.rls.read !== true) {
         results = results.filter((doc2) => checkRLS(schema10.rls.read, doc2, currentUser));
       }
-      if (schema10) {
-        results = results.map((doc2) => applyFLS(doc2, schema10, currentUser, "read"));
-      }
+      results = results.map((doc2) => applyFLS(doc2, schema10, currentUser, "read"));
       res.json(results);
     } catch (error48) {
       if (error48 instanceof InvalidInputError) {
@@ -254300,12 +254303,11 @@ async function createEntityRoutes(db2, logger2, broadcast) {
       }
     }
   }));
-  router.post("/:entityName", parseBody, withCollection(async (req, res, collection, currentUser) => {
+  router.post("/:entityName", parseBody, withCollection(async (req, res, collection, schema10, currentUser) => {
     const { appId, entityName } = req.params;
     try {
       const now = new Date().toISOString();
       const { _id, ...body } = req.body;
-      const schema10 = db2.getSchema(entityName);
       if (!checkRLS(schema10?.rls?.create, {
         ...body,
         created_by: currentUser?.email,
@@ -254314,10 +254316,7 @@ async function createEntityRoutes(db2, logger2, broadcast) {
         res.status(403).json({ error: "Permission denied" });
         return;
       }
-      let filteredBody = db2.prepareRecord(entityName, body);
-      if (schema10) {
-        filteredBody = applyFLS(filteredBody, schema10, currentUser, "write");
-      }
+      const filteredBody = applyFLS(db2.prepareRecord(entityName, body), schema10, currentUser, "write");
       db2.validate(entityName, filteredBody);
       const record2 = {
         ...filteredBody,
@@ -254327,7 +254326,7 @@ async function createEntityRoutes(db2, logger2, broadcast) {
         created_date: now,
         updated_date: now
       };
-      const inserted = stripInternalFields(await collection.insertAsync(record2));
+      const inserted = applyFLS(stripInternalFields(await collection.insertAsync(record2)), schema10, currentUser, "read");
       emit(appId, entityName, "create", inserted);
       res.status(201).json(inserted);
     } catch (error48) {
@@ -254339,7 +254338,7 @@ async function createEntityRoutes(db2, logger2, broadcast) {
       res.status(500).json({ error: "Internal server error" });
     }
   }));
-  router.post("/:entityName/bulk", parseBody, withCollection(async (req, res, collection, currentUser) => {
+  router.post("/:entityName/bulk", parseBody, withCollection(async (req, res, collection, schema10, currentUser) => {
     const { appId, entityName } = req.params;
     if (!Array.isArray(req.body)) {
       res.status(400).json({ error: "Request body must be an array" });
@@ -254347,7 +254346,6 @@ async function createEntityRoutes(db2, logger2, broadcast) {
     }
     try {
       const now = new Date().toISOString();
-      const schema10 = db2.getSchema(entityName);
       const records = [];
       for (const record2 of req.body) {
         if (!checkRLS(schema10?.rls?.create, {
@@ -254372,7 +254370,7 @@ async function createEntityRoutes(db2, logger2, broadcast) {
           updated_date: now
         });
       }
-      const inserted = stripInternalFields(await collection.insertAsync(records));
+      const inserted = applyFLS(stripInternalFields(await collection.insertAsync(records)), schema10, currentUser, "read");
       emit(appId, entityName, "create", inserted);
       res.status(201).json(inserted);
     } catch (error48) {
@@ -254384,12 +254382,11 @@ async function createEntityRoutes(db2, logger2, broadcast) {
       res.status(500).json({ error: "Internal server error" });
     }
   }));
-  router.put("/:entityName/:id", parseBody, withCollection(async (req, res, collection, currentUser) => {
+  router.put("/:entityName/:id", parseBody, withCollection(async (req, res, collection, schema10, currentUser) => {
     const { appId, entityName, id: id2 } = req.params;
     const { id: _id, created_date: _created_date, ...body } = req.body;
     try {
-      const schema10 = db2.getSchema(entityName);
-      if (schema10?.rls?.update !== undefined) {
+      if (schema10.rls?.update !== undefined) {
         const existing = await collection.findOneAsync({ id: id2 });
         if (!existing) {
           res.status(404).json({ error: `Record with id "${id2}" not found` });
@@ -254402,10 +254399,7 @@ async function createEntityRoutes(db2, logger2, broadcast) {
           return;
         }
       }
-      let filteredBody = db2.prepareRecord(entityName, body, true);
-      if (schema10) {
-        filteredBody = applyFLS(filteredBody, schema10, currentUser, "write");
-      }
+      const filteredBody = applyFLS(db2.prepareRecord(entityName, body, true), schema10, currentUser, "write");
       db2.validate(entityName, filteredBody, true);
       const updateData = {
         ...filteredBody,
@@ -254416,7 +254410,7 @@ async function createEntityRoutes(db2, logger2, broadcast) {
         res.status(404).json({ error: `Record with id "${id2}" not found` });
         return;
       }
-      const updated = stripInternalFields(result.affectedDocuments);
+      const updated = applyFLS(stripInternalFields(result.affectedDocuments), schema10, currentUser, "read");
       emit(appId, entityName, "update", updated);
       res.json(updated);
     } catch (error48) {
@@ -254428,7 +254422,7 @@ async function createEntityRoutes(db2, logger2, broadcast) {
       res.status(500).json({ error: "Internal server error" });
     }
   }));
-  router.delete("/:entityName/:id", withCollection(async (req, res, collection, currentUser) => {
+  router.delete("/:entityName/:id", withCollection(async (req, res, collection, schema10, currentUser) => {
     const { appId, entityName, id: id2 } = req.params;
     try {
       const doc2 = await collection.findOneAsync({ id: id2 });
@@ -254436,8 +254430,7 @@ async function createEntityRoutes(db2, logger2, broadcast) {
         res.status(404).json({ error: `Record with id "${id2}" not found` });
         return;
       }
-      const schema10 = db2.getSchema(entityName);
-      if (!checkRLS(schema10?.rls?.delete, doc2, currentUser)) {
+      if (!checkRLS(schema10.rls?.delete, doc2, currentUser)) {
         res.status(404).json({
           message: `Entity ${entityName} with ID ${id2} not found`
         });
@@ -254451,11 +254444,10 @@ async function createEntityRoutes(db2, logger2, broadcast) {
       res.status(500).json({ error: "Internal server error" });
     }
   }));
-  router.delete("/:entityName", parseBody, withCollection(async (req, res, collection, currentUser) => {
+  router.delete("/:entityName", parseBody, withCollection(async (req, res, collection, schema10, currentUser) => {
     const { entityName } = req.params;
     try {
       const query = req.body || {};
-      const schema10 = db2.getSchema(entityName);
       const rlsDelete = schema10?.rls?.delete;
       if (rlsDelete !== undefined && rlsDelete !== true) {
         if (rlsDelete === false) {
@@ -256271,7 +256263,9 @@ var DEFAULT_PORT = 4400;
 var BASE44_APP_URL = "https://base44.app";
 async function createDevServer(options8) {
   const { port: userPort } = options8;
-  const port = userPort ?? await getPorts({ port: DEFAULT_PORT });
+  const port = userPort ?? await getPorts({
+    port: process.env.IS_TEST === "true" ? undefined : DEFAULT_PORT
+  });
   const baseUrl = `http://localhost:${port}`;
   const { functions, entities, project: project2 } = await options8.loadResources();
   const app = import_express6.default();
@@ -256364,7 +256358,7 @@ async function createDevServer(options8) {
       const { functions: functions2, entities: entities2 } = await options8.loadResources();
       if (name2 === "functions") {
         const previousFunctionCount = functionManager.getFunctionNames().length;
-        functionManager.reload(functions2);
+        await functionManager.reload(functions2);
         const names = functionManager.getFunctionNames();
         if (names.length > 0) {
           devLogger.log(`Reloaded functions: ${names.sort().join(", ")}`);
@@ -256389,10 +256383,10 @@ async function createDevServer(options8) {
     }
   });
   await base44ConfigWatcher.start();
-  const shutdown = () => {
+  const shutdown = async () => {
     base44ConfigWatcher.close();
     io6.close();
-    functionManager.stopAll();
+    await functionManager.stopAll();
     server.close();
   };
   process.on("SIGINT", shutdown);
@@ -260883,4 +260877,4 @@ export {
   CLIExitError
 };
 
-//# debugId=759CD39E93FDA9AF64756E2164756E21
+//# debugId=2B2A7DAF2A94A3A064756E2164756E21