@base44-preview/cli 0.0.45-pr.406.7acd6ec → 0.0.45-pr.406.ed52e60

package/dist/cli/index.js

@@ -179494,19 +179494,19 @@ var require_base64id = __commonJS((exports, module) => {
   /*!
    * base64id v0.1.0
    */
-  var crypto = __require("crypto");
+  var crypto2 = __require("crypto");
   var Base64Id = function() {};
   Base64Id.prototype.getRandomBytes = function(bytes) {
     var BUFFER_SIZE = 4096;
     var self2 = this;
     bytes = bytes || 12;
     if (bytes > BUFFER_SIZE) {
-      return crypto.randomBytes(bytes);
+      return crypto2.randomBytes(bytes);
     }
     var bytesInBuffer = parseInt(BUFFER_SIZE / bytes);
     var threshold = parseInt(bytesInBuffer * 0.85);
     if (!threshold) {
-      return crypto.randomBytes(bytes);
+      return crypto2.randomBytes(bytes);
     }
     if (this.bytesBufferIndex == null) {
       this.bytesBufferIndex = -1;
@@ -179518,14 +179518,14 @@ var require_base64id = __commonJS((exports, module) => {
     if (this.bytesBufferIndex == -1 || this.bytesBufferIndex > threshold) {
       if (!this.isGeneratingBytes) {
         this.isGeneratingBytes = true;
-        crypto.randomBytes(BUFFER_SIZE, function(err, bytes2) {
+        crypto2.randomBytes(BUFFER_SIZE, function(err, bytes2) {
           self2.bytesBuffer = bytes2;
           self2.bytesBufferIndex = 0;
           self2.isGeneratingBytes = false;
         });
       }
       if (this.bytesBufferIndex == -1) {
-        return crypto.randomBytes(bytes);
+        return crypto2.randomBytes(bytes);
       }
     }
     var result = this.bytesBuffer.slice(bytes * this.bytesBufferIndex, bytes * (this.bytesBufferIndex + 1));
@@ -179539,7 +179539,7 @@ var require_base64id = __commonJS((exports, module) => {
     }
     this.sequenceNumber = this.sequenceNumber + 1 | 0;
     rand.writeInt32BE(this.sequenceNumber, 11);
-    if (crypto.randomBytes) {
+    if (crypto2.randomBytes) {
       this.getRandomBytes(12).copy(rand);
     } else {
       [0, 4, 8].forEach(function(i5) {
@@ -249177,6 +249177,36 @@ function createFunctionRouter(manager, logger) {
 // src/cli/dev/dev-server/db/database.ts
 var import_nedb = __toESM(require_nedb(), 1);
 
+// ../../node_modules/nanoid/index.js
+import { webcrypto as crypto } from "node:crypto";
+
+// ../../node_modules/nanoid/url-alphabet/index.js
+var urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
+
+// ../../node_modules/nanoid/index.js
+var POOL_SIZE_MULTIPLIER = 128;
+var pool;
+var poolOffset;
+function fillPool(bytes) {
+  if (!pool || pool.length < bytes) {
+    pool = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER);
+    crypto.getRandomValues(pool);
+    poolOffset = 0;
+  } else if (poolOffset + bytes > pool.length) {
+    crypto.getRandomValues(pool);
+    poolOffset = 0;
+  }
+  poolOffset += bytes;
+}
+function nanoid3(size = 21) {
+  fillPool(size |= 0);
+  let id2 = "";
+  for (let i5 = poolOffset - size;i5 < poolOffset; i5++) {
+    id2 += urlAlphabet[pool[i5] & 63];
+  }
+  return id2;
+}
+
 // src/cli/dev/dev-server/db/validator.ts
 var fieldTypes = [
   "string",
@@ -249329,11 +249359,25 @@ class Database {
   collections = new Map;
   schemas = new Map;
   validator = new Validator;
-  load(entities) {
-    this.collections.set(USER_COLLECTION, new import_nedb.default);
+  async load(entities) {
+    const userDataStore = new import_nedb.default;
+    this.collections.set(USER_COLLECTION, userDataStore);
+    const userInfo = await readAuth();
+    const now = new Date().toISOString().replace("Z", "000");
+    await userDataStore.insertAsync({
+      id: nanoid3(),
+      email: userInfo.email,
+      full_name: userInfo.name,
+      is_service: false,
+      is_verified: true,
+      disabled: null,
+      role: "admin",
+      collaborator_role: "editor",
+      created_date: now,
+      updated_date: now
+    });
     for (const entity2 of entities) {
       const entityName = this.normalizeName(entity2.name);
-      this.collections.set(entityName, new import_nedb.default);
       const clonedEntity = structuredClone(entity2);
       if (entityName === USER_COLLECTION) {
         ["full_name", "email"].forEach((predefinedField) => {
@@ -249344,6 +249388,8 @@ class Database {
         clonedEntity.properties.full_name = { type: "string" };
         clonedEntity.properties.email = { type: "string" };
         clonedEntity.properties.role = { type: "string" };
+      } else {
+        this.collections.set(entityName, new import_nedb.default);
       }
       this.schemas.set(entityName, clonedEntity);
     }
@@ -249433,36 +249479,6 @@ function broadcastEntityEvent(io6, appId, entityName, event) {
 // src/cli/dev/dev-server/routes/entities/entities-router.ts
 var import_express3 = __toESM(require_express(), 1);
 
-// ../../node_modules/nanoid/index.js
-import { webcrypto as crypto } from "node:crypto";
-
-// ../../node_modules/nanoid/url-alphabet/index.js
-var urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
-
-// ../../node_modules/nanoid/index.js
-var POOL_SIZE_MULTIPLIER = 128;
-var pool;
-var poolOffset;
-function fillPool(bytes) {
-  if (!pool || pool.length < bytes) {
-    pool = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER);
-    crypto.getRandomValues(pool);
-    poolOffset = 0;
-  } else if (poolOffset + bytes > pool.length) {
-    crypto.getRandomValues(pool);
-    poolOffset = 0;
-  }
-  poolOffset += bytes;
-}
-function nanoid3(size = 21) {
-  fillPool(size |= 0);
-  let id2 = "";
-  for (let i5 = poolOffset - size;i5 < poolOffset; i5++) {
-    id2 += urlAlphabet[pool[i5] & 63];
-  }
-  return id2;
-}
-
 // src/cli/dev/dev-server/routes/entities/entities-user-router.ts
 var import_express2 = __toESM(require_express(), 1);
 
@@ -249477,29 +249493,15 @@ function stripInternalFields(doc2) {
 
 // src/cli/dev/dev-server/routes/entities/entities-user-router.ts
 async function createUserRouter(db2) {
-  const userInfo = await readAuth();
-  const meEntity = await db2.getCollection("User")?.findOneAsync({ email: userInfo.email });
-  let idMe = meEntity?.id;
-  if (!idMe) {
-    const now = new Date().toISOString().replace("Z", "000");
-    idMe = nanoid3();
-    await db2.getCollection("User")?.insertAsync({
-      id: idMe,
-      email: userInfo.email,
-      full_name: userInfo.name,
-      is_service: false,
-      is_verified: true,
-      disabled: null,
-      role: "admin",
-      collaborator_role: "editor",
-      created_date: now,
-      updated_date: now
-    });
-  }
   const router = import_express2.Router({ mergeParams: true });
   router.get("/:id", async (req, res) => {
-    const id2 = req.params.id === "me" ? idMe : req.params.id;
-    const result = await db2.getCollection("User")?.findOneAsync({ id: id2 });
+    let result;
+    if (req.params.id === "me") {
+      const userInfo = await readAuth();
+      result = await db2.getCollection("User")?.findOneAsync({ email: userInfo.email });
+    } else {
+      result = await db2.getCollection("User")?.findOneAsync({ id: req.params.id });
+    }
     if (!result) {
       res.status(404).json({ error: `User with id "${req.params.id}" not found` });
       return;
@@ -251573,7 +251575,7 @@ async function createDevServer(options8) {
     R2.info(`Loaded functions: ${functionManager.getFunctionNames().join(", ")}`);
   }
   const db2 = new Database;
-  db2.load(entities);
+  await db2.load(entities);
   if (db2.getCollectionNames().length > 0) {
     R2.info(`Loaded entities: ${db2.getCollectionNames().join(", ")}`);
   }
@@ -251648,7 +251650,7 @@ async function createDevServer(options8) {
         if (previousEntityCount > 0) {
           devLogger.log("Entities directory changed, clearing data...");
         }
-        db2.load(entities2);
+        await db2.load(entities2);
         if (db2.getCollectionNames().length > 0) {
           devLogger.log(`Loaded entities: ${db2.getCollectionNames().join(", ")}`);
         }
@@ -256050,4 +256052,4 @@ export {
   CLIExitError
 };
 
-//# debugId=A178BD03C903D32B64756E2164756E21
+//# debugId=1D8798AB57E4532E64756E2164756E21