@base44-preview/cli 0.0.45-pr.406.30e44d9 → 0.0.45-pr.406.9125087

package/dist/cli/index.js

@@ -248900,7 +248900,7 @@ function getTypesCommand() {
 // src/cli/dev/dev-server/main.ts
 import { dirname as dirname14, join as join20 } from "node:path";
 var import_cors = __toESM(require_lib4(), 1);
-var import_express6 = __toESM(require_express(), 1);
+var import_express5 = __toESM(require_express(), 1);
 
 // ../../node_modules/get-port/index.js
 import net from "node:net";
@@ -249288,11 +249288,23 @@ function nanoid3(size = 21) {
   return id2;
 }
 
+// src/cli/dev/dev-server/utils.ts
+function stripInternalFields(doc2) {
+  if (Array.isArray(doc2)) {
+    return doc2.map((d5) => stripInternalFields(d5));
+  }
+  const { _id, ...rest } = doc2;
+  return rest;
+}
+var getNowISOTimestamp = () => {
+  return new Date().toISOString().replace("Z", "000");
+};
+
 // src/cli/dev/dev-server/db/validator.ts
 class EntityValidationError extends Error {
   context;
   constructor(context) {
-    super();
+    super(context.message);
     this.context = context;
   }
 }
@@ -249445,11 +249457,24 @@ class Database {
   schemas = new Map;
   validator = new Validator;
   async load(entities) {
-    const userDataStore = new import_nedb.default;
-    this.collections.set(USER_COLLECTION, userDataStore);
+    await this.loadUserCollection(entities);
+    for (const entity2 of entities) {
+      const entityName = this.normalizeName(entity2.name);
+      if (entityName === USER_COLLECTION) {
+        continue;
+      }
+      this.collections.set(entityName, new import_nedb.default);
+      this.schemas.set(entityName, entity2);
+    }
+  }
+  async loadUserCollection(entities) {
+    const userEntity = entities.find((e8) => this.normalizeName(e8.name) === USER_COLLECTION);
+    this.schemas.set(USER_COLLECTION, this.buildUserSchema(userEntity));
+    const collection = new import_nedb.default;
+    this.collections.set(USER_COLLECTION, collection);
     const userInfo = await readAuth();
-    const now = new Date().toISOString().replace("Z", "000");
-    await userDataStore.insertAsync({
+    const now = getNowISOTimestamp();
+    await collection.insertAsync({
       id: nanoid3(),
       email: userInfo.email,
       full_name: userInfo.name,
@@ -249461,33 +249486,28 @@ class Database {
       created_date: now,
       updated_date: now
     });
-    for (const entity2 of entities) {
-      const entityName = this.normalizeName(entity2.name);
-      const clonedEntity = structuredClone(entity2);
-      if (entityName === USER_COLLECTION) {
-        ["full_name", "email"].forEach((predefinedField) => {
-          if (predefinedField in clonedEntity.properties) {
-            throw new Error(`Error syncing entities: Invalid User schema: User schema cannot contain base fields: ${predefinedField}. These fields are built-in and managed by the system.`);
-          }
-        });
-        clonedEntity.properties.full_name = { type: "string" };
-        clonedEntity.properties.email = { type: "string" };
-      } else {
-        this.collections.set(entityName, new import_nedb.default);
-      }
-      this.schemas.set(entityName, clonedEntity);
-    }
-    if (!this.schemas.has(USER_COLLECTION)) {
-      this.schemas.set(USER_COLLECTION, {
+  }
+  buildUserSchema(customUserEntity) {
+    const builtInFields = {
+      full_name: { type: "string" },
+      email: { type: "string" }
+    };
+    if (!customUserEntity) {
+      return {
         name: "User",
         type: "object",
-        properties: {
-          full_name: { type: "string" },
-          email: { type: "string" },
-          role: { type: "string" }
-        }
-      });
+        properties: { ...builtInFields, role: { type: "string" } }
+      };
+    }
+    for (const field of Object.keys(builtInFields)) {
+      if (field in customUserEntity.properties) {
+        throw new Error(`Error syncing entities: Invalid User schema: User schema cannot contain base fields: ${field}. These fields are built-in and managed by the system.`);
+      }
     }
+    return {
+      ...customUserEntity,
+      properties: { ...customUserEntity.properties, ...builtInFields }
+    };
   }
   getCollection(name2) {
     return this.collections.get(this.normalizeName(name2));
@@ -249562,18 +249582,7 @@ var import_express3 = __toESM(require_express(), 1);
 
 // src/cli/dev/dev-server/routes/entities/entities-user-router.ts
 var import_express2 = __toESM(require_express(), 1);
-
-// src/cli/dev/dev-server/routes/entities/utils.ts
-function stripInternalFields(doc2) {
-  if (Array.isArray(doc2)) {
-    return doc2.map((d5) => stripInternalFields(d5));
-  }
-  const { _id, ...rest } = doc2;
-  return rest;
-}
-
-// src/cli/dev/dev-server/routes/entities/entities-user-router.ts
-async function createUserRouter(db2, logger) {
+function createUserRouter(db2, logger) {
   const router = import_express2.Router({ mergeParams: true });
   const parseBody = import_express2.json();
   router.get("/:id", async (req, res) => {
@@ -249594,7 +249603,7 @@ async function createUserRouter(db2, logger) {
     const userInfo = await readAuth();
     const currentUser = await db2.getCollection(USER_COLLECTION)?.findOneAsync({ email: userInfo.email });
     if (currentUser) {
-      const now = new Date().toISOString().replace("Z", "000");
+      const now = getNowISOTimestamp();
       res.json({
         created_by: userInfo.email,
         created_by_id: currentUser.id,
@@ -249608,9 +249617,6 @@ async function createUserRouter(db2, logger) {
       res.status(404).json({ error: "Unable to read data for the current user" });
     }
   });
-  router.post("/", async (_req, res) => {
-    res.json({});
-  });
   router.post("/bulk", async (_req, res) => {
     res.json({});
   });
@@ -249634,7 +249640,7 @@ async function createUserRouter(db2, logger) {
           if (!updResult?.affectedDocuments) {
             throw new Error(`Failed to update user`);
           }
-          res.json(updResult.affectedDocuments);
+          res.json(stripInternalFields(updResult.affectedDocuments));
         } catch (error48) {
           if (error48 instanceof EntityValidationError) {
             res.status(422).json(error48.context);
@@ -249969,18 +249975,6 @@ function createCustomIntegrationRoutes(remoteProxy, logger) {
   return router;
 }
 
-// src/cli/dev/dev-server/routes/users.ts
-var import_express5 = __toESM(require_express(), 1);
-function createUsersRoutes() {
-  const router = import_express5.Router({ mergeParams: true });
-  const parseBody = import_express5.json();
-  router.post("/invite-user", parseBody, (req, _res, next) => {
-    console.log("invite-user", req.body);
-    next();
-  });
-  return router;
-}
-
 // src/cli/dev/dev-server/watcher.ts
 import { EventEmitter as EventEmitter4 } from "node:events";
 import { relative as relative6 } from "node:path";
@@ -251685,7 +251679,7 @@ async function createDevServer(options8) {
   const port = userPort ?? await getPorts({ port: DEFAULT_PORT });
   const baseUrl = `http://localhost:${port}`;
   const { functions, entities, project: project2 } = await options8.loadResources();
-  const app = import_express6.default();
+  const app = import_express5.default();
   const remoteProxy = import_http_proxy_middleware2.createProxyMiddleware({
     target: BASE44_APP_URL,
     changeOrigin: true
@@ -251711,8 +251705,6 @@ async function createDevServer(options8) {
     next();
   });
   const devLogger = createDevLogger();
-  const usersRoutes = createUsersRoutes();
-  app.use("/api/apps/:appId/users", usersRoutes);
   const functionManager = new FunctionManager(functions, devLogger, options8.denoWrapperPath);
   const functionRoutes = createFunctionRouter(functionManager, devLogger);
   app.use("/api/apps/:appId/functions", functionRoutes);
@@ -251746,7 +251738,7 @@ async function createDevServer(options8) {
     }
     next();
   });
-  app.use("/media", import_express6.default.static(mediaFilesDir));
+  app.use("/media", import_express5.default.static(mediaFilesDir));
   const integrationRoutes = createIntegrationRoutes(mediaFilesDir, baseUrl, remoteProxy, devLogger);
   app.use("/api/apps/:appId/integration-endpoints", integrationRoutes);
   const customIntegrationRoutes = createCustomIntegrationRoutes(remoteProxy, devLogger);
@@ -256209,4 +256201,4 @@ export {
   CLIExitError
 };
 
-//# debugId=76FBDD916243B1D364756E2164756E21
+//# debugId=1F83CA1A65BEF01964756E2164756E21