@base44-preview/cli 0.0.36-pr.353.e4eb961 → 0.0.36-pr.353.f5250a0

package/dist/cli/index.js

@@ -243860,7 +243860,7 @@ function getTypesCommand(context) {
 }
 
 // src/cli/dev/dev-server/main.ts
-import { dirname as dirname15, join as join18 } from "node:path";
+import { dirname as dirname14 } from "node:path";
 var import_cors = __toESM(require_lib4(), 1);
 var import_express4 = __toESM(require_express(), 1);
 
@@ -244068,6 +244068,10 @@ class FunctionManager {
     try {
       return await promise2;
     } finally {
+      if (!this.starting.has(name2) && this.running.has(name2)) {
+        this.running.get(name2)?.process.kill();
+        this.running.delete(name2);
+      }
       this.starting.delete(name2);
     }
   }
@@ -244235,7 +244239,7 @@ class Database {
 }
 
 // src/cli/dev/dev-server/dir-watcher.ts
-import { dirname as dirname14 } from "node:path";
+import { relative as relative4, sep } from "node:path";
 
 // node_modules/chokidar/index.js
 import { EventEmitter as EventEmitter3 } from "node:events";
@@ -245852,69 +245856,53 @@ function watch(paths, options8 = {}) {
 var import_debounce = __toESM(require_debounce(), 1);
 var WATCH_DEBOUNCE_MS = 300;
 
-class DirWatcher {
-  targetDir;
+class WatchBase44Directory {
+  configDir;
   onChange;
   logger;
   watcher = null;
-  closed = false;
-  constructor(targetDir, onChange, logger) {
-    this.targetDir = targetDir;
+  constructor(configDir, onChange, logger) {
+    this.configDir = configDir;
     this.onChange = onChange;
     this.logger = logger;
   }
   async start() {
-    if (await pathExists(this.targetDir)) {
+    if (this.watcher) {
+      return;
+    }
+    if (await pathExists(this.configDir)) {
       this.watchTarget();
-    } else {
-      this.watchParentForCreation();
     }
   }
-  close() {
-    this.closed = true;
-    this.watcher?.close();
+  async close() {
+    await this.watcher?.close();
     this.watcher = null;
   }
-  watchTarget() {
-    if (this.closed) {
+  getSubfolder(path18) {
+    const rel = relative4(this.configDir, path18);
+    if (!rel || rel === ".")
       return;
-    }
-    const handler = import_debounce.default(async () => {
-      try {
-        await this.onChange();
-      } catch (error48) {
-        this.handleError(error48);
-      }
-    }, WATCH_DEBOUNCE_MS);
-    this.watcher = watch(this.targetDir, { ignoreInitial: true });
-    this.watcher.on("all", handler);
+    return rel.split(sep)[0];
   }
-  watchParentForCreation() {
-    if (this.closed) {
-      return;
-    }
-    const parentDir = dirname14(this.targetDir);
-    const handler = import_debounce.default(async () => {
-      if (this.closed) {
-        return;
-      }
-      if (await pathExists(this.targetDir)) {
-        handler.cancel();
-        await this.watcher?.close();
-        this.watcher = null;
-        this.watchTarget();
-        try {
-          await this.onChange();
-        } catch (error48) {
-          this.handleError(error48);
+  watchTarget() {
+    const handler = import_debounce.default(async (_event, path18) => {
+      const subfolder = this.getSubfolder(path18);
+      await this.onChange(subfolder);
+    }, WATCH_DEBOUNCE_MS);
+    this.watcher = watch(this.configDir, {
+      ignoreInitial: true,
+      ignored: (filePath) => {
+        if (this.configDir === filePath) {
+          return false;
         }
+        const subfolder = this.getSubfolder(filePath);
+        return subfolder !== "functions";
       }
-    }, WATCH_DEBOUNCE_MS);
-    this.watcher = watch(parentDir, { ignoreInitial: true, depth: 0 });
+    });
     this.watcher.on("all", handler);
-  }
-  handleError(error48) {
-    this.logger.error(`[dev-server] Watch handler failed for ${this.targetDir}`, error48 instanceof Error ? error48 : undefined);
+    this.watcher.on("error", (err) => {
+      this.logger.error(`[dev-server] Watch handler failed for ${this.configDir}`, err instanceof Error ? err : undefined);
+    });
   }
 }
 
@@ -246335,22 +246323,23 @@ async function createDevServer(options8) {
   emitEntityEvent = (appId, entityName, event) => {
     broadcastEntityEvent(io6, appId, entityName, event);
   };
-  const configDir = dirname15(project2.configPath);
-  const functionsDir = join18(configDir, project2.functionsDir);
-  const functionsWatcher = new DirWatcher(functionsDir, async () => {
-    const { functions: functions2 } = await options8.loadResources();
-    const previousNamesLength = functionManager.getFunctionNames().length;
-    functionManager.reload(functions2);
-    const names = functionManager.getFunctionNames();
-    if (names.length > 0) {
-      devLogger.log(`Reloaded functions: ${names.sort().join(", ")}`);
-    } else if (previousNamesLength > 0) {
-      devLogger.log("All functions removed");
+  const configDir = dirname14(project2.configPath);
+  const base44ConfigWatcher = new WatchBase44Directory(configDir, async (subfolder) => {
+    if (subfolder === "functions") {
+      const { functions: functions2 } = await options8.loadResources();
+      const previousFunctionCount = functionManager.getFunctionNames().length;
+      functionManager.reload(functions2);
+      const names = functionManager.getFunctionNames();
+      if (names.length > 0) {
+        devLogger.log(`Reloaded functions: ${names.sort().join(", ")}`);
+      } else if (previousFunctionCount > 0) {
+        devLogger.log("All functions removed");
+      }
     }
   }, devLogger);
-  await functionsWatcher.start();
+  await base44ConfigWatcher.start();
   const shutdown = () => {
-    functionsWatcher.close();
+    base44ConfigWatcher.close();
     io6.close();
     functionManager.stopAll();
     server.close();
@@ -246506,7 +246495,7 @@ var import_detect_agent = __toESM(require_dist5(), 1);
 import { release, type } from "node:os";
 
 // node_modules/posthog-node/dist/extensions/error-tracking/modifiers/module.node.mjs
-import { dirname as dirname16, posix, sep } from "path";
+import { dirname as dirname15, posix, sep as sep2 } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -246515,7 +246504,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname16(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname15(process.argv[1]) : process.cwd(), isWindows5 = sep2 === "\\") {
   const normalizedBase = isWindows5 ? normalizeWindowsPath2(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -250733,4 +250722,4 @@ export {
   CLIExitError
 };
 
-//# debugId=EFF117A5EF450AB064756E2164756E21
+//# debugId=0FDE3E45A7228AE164756E2164756E21