@base44-preview/cli 0.0.37-pr.364.24d182e → 0.0.37-pr.364.45ad860

package/dist/cli/index.js

@@ -246241,20 +246241,23 @@ var WATCH_QUEUE_DELAY_MS = 500;
 class WatchBase44 extends EventEmitter4 {
   itemsToWatch;
   logger;
+  entryNames;
   watchers = new Map;
   queueWaitForCreationTimeout = null;
   constructor(itemsToWatch, logger) {
     super();
     this.itemsToWatch = itemsToWatch;
     this.logger = logger;
+    this.entryNames = Object.keys(itemsToWatch);
   }
   async start() {
     if (this.watchers.size > 0) {
       return;
     }
-    for (const item of Object.values(this.itemsToWatch)) {
-      if (await pathExists(item.path)) {
-        this.watchers.set(item.name, this.watchTarget(item));
+    for (const name2 of this.entryNames) {
+      const targetPath = this.itemsToWatch[name2];
+      if (await pathExists(targetPath)) {
+        this.watchers.set(name2, this.watchTarget(name2, targetPath));
       }
     }
     this.watchEntries();
@@ -246274,19 +246277,20 @@ class WatchBase44 extends EventEmitter4 {
       clearTimeout(this.queueWaitForCreationTimeout);
     }
     this.queueWaitForCreationTimeout = setTimeout(async () => {
-      for (const item of Object.values(this.itemsToWatch)) {
-        const watchItem = this.watchers.get(item.name);
-        const exists = await pathExists(item.path);
+      for (const name2 of this.entryNames) {
+        const path19 = this.itemsToWatch[name2];
+        const watchItem = this.watchers.get(name2);
+        const exists = await pathExists(path19);
         if (!watchItem && exists) {
-          await this.createChangeHandler(item)("", item.path);
-          this.watchers.set(item.name, this.watchTarget(item));
+          this.emit("change", name2, path19);
+          this.watchers.set(name2, this.watchTarget(name2, path19));
         } else if (watchItem && !exists) {
           await watchItem.close();
-          await this.createChangeHandler(item)("", item.path);
+          this.emit("change", name2, path19);
           setTimeout(() => {
-            this.watchers.forEach((watcher, name2) => {
+            this.watchers.forEach((watcher, watcherName) => {
               if (watcher.closed) {
-                this.watchers.delete(name2);
+                this.watchers.delete(watcherName);
               }
             });
           });
@@ -246296,18 +246300,15 @@ class WatchBase44 extends EventEmitter4 {
       this.watchEntries();
     }, WATCH_QUEUE_DELAY_MS);
   }
-  createChangeHandler = (item) => {
-    return import_debounce.default(async (_event, path19) => {
-      this.emit("change", item.name, relative4(item.path, path19));
-    }, WATCH_DEBOUNCE_MS);
-  };
-  watchTarget(item) {
-    const watcher = watch(item.path, {
+  watchTarget(name2, targetPath) {
+    const watcher = watch(targetPath, {
       ignoreInitial: true
     });
-    watcher.on("all", this.createChangeHandler(item));
+    watcher.on("all", import_debounce.default(async (_event, path19) => {
+      this.emit("change", name2, relative4(targetPath, path19));
+    }, WATCH_DEBOUNCE_MS));
     watcher.on("error", (err) => {
-      this.logger.error(`[dev-server] Watch handler failed for ${item.path}`, err instanceof Error ? err : undefined);
+      this.logger.error(`Watch handler failed for ${targetPath}`, err instanceof Error ? err : undefined);
     });
     return watcher;
   }
@@ -246381,19 +246382,13 @@ async function createDevServer(options8) {
     broadcastEntityEvent(io6, appId, entityName, event);
   };
   const base44ConfigWatcher = new WatchBase44({
-    functions: {
-      name: "functions",
-      path: join18(dirname14(project2.configPath), project2.functionsDir)
-    },
-    entities: {
-      name: "entities",
-      path: join18(dirname14(project2.configPath), project2.entitiesDir)
-    }
+    functions: join18(dirname14(project2.configPath), project2.functionsDir),
+    entities: join18(dirname14(project2.configPath), project2.entitiesDir)
   }, devLogger);
   base44ConfigWatcher.on("change", async (name2) => {
     try {
+      const { functions: functions2, entities: entities2 } = await options8.loadResources();
       if (name2 === "functions") {
-        const { functions: functions2 } = await options8.loadResources();
         const previousFunctionCount = functionManager.getFunctionNames().length;
         functionManager.reload(functions2);
         const names = functionManager.getFunctionNames();
@@ -246405,7 +246400,6 @@ async function createDevServer(options8) {
       }
       if (name2 === "entities") {
         const previousEntityCount = db2.getCollectionNames().length;
-        const { entities: entities2 } = await options8.loadResources();
         db2.dropAll();
         if (previousEntityCount > 0) {
           devLogger.log("Entities directory changed, clearing data...");
@@ -250805,4 +250799,4 @@ export {
   CLIExitError
 };
 
-//# debugId=B55811FFD223347464756E2164756E21
+//# debugId=1F612090E5DA7F5064756E2164756E21