@base44-preview/cli 0.0.50-pr.481.c44e2a5 → 0.0.50-pr.481.dbe6b4f

package/dist/cli/index.js

@@ -253941,23 +253941,29 @@ function evaluateOperator(recordValue, operator) {
   for (const [op2, opValue] of Object.entries(operator)) {
     switch (op2) {
       case "$in":
-        if (!Array.isArray(opValue) || !opValue.includes(recordValue))
+        if (!Array.isArray(opValue) || !opValue.includes(recordValue)) {
           return false;
+        }
         break;
       case "$nin":
-        if (Array.isArray(opValue) && opValue.includes(recordValue))
+        if (!Array.isArray(opValue) || opValue.includes(recordValue)) {
           return false;
+        }
         break;
       case "$ne":
         if (recordValue === opValue)
           return false;
         break;
       case "$all":
-        if (!Array.isArray(recordValue) || !Array.isArray(opValue))
+        if (!Array.isArray(recordValue) || !Array.isArray(opValue)) {
           return false;
-        if (!opValue.every((v10) => recordValue.includes(v10)))
+        }
+        if (!opValue.every((v10) => recordValue.includes(v10))) {
           return false;
+        }
         break;
+      default:
+        return false;
     }
   }
   return true;
@@ -254212,9 +254218,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;
@@ -254223,7 +254235,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) {
@@ -254243,7 +254255,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 });
@@ -254251,38 +254263,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 Task with ID ${id2} not found`
+          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) {
@@ -254293,12 +254294,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,
@@ -254307,10 +254307,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,
@@ -254320,7 +254317,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) {
@@ -254332,7 +254329,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" });
@@ -254340,7 +254337,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, {
@@ -254377,12 +254373,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` });
@@ -254390,15 +254385,12 @@ async function createEntityRoutes(db2, logger2, broadcast) {
         }
         if (!checkRLS(schema10.rls.update, existing, currentUser)) {
           res.status(404).json({
-            message: `Entity Task with ID ${id2} not found`
+            message: `Entity ${entityName} with ID ${id2} not found`
           });
           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,
@@ -254409,7 +254401,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) {
@@ -254421,7 +254413,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 });
@@ -254429,10 +254421,9 @@ 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 Task with ID ${id2} not found`
+          message: `Entity ${entityName} with ID ${id2} not found`
         });
         return;
       }
@@ -254444,11 +254435,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) {
@@ -256264,7 +256254,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();
@@ -260876,4 +260868,4 @@ export {
   CLIExitError
 };
 
-//# debugId=7538A503FE5FF74364756E2164756E21
+//# debugId=731CCB72EF64A04D64756E2164756E21