@base44-preview/cli 0.0.37-pr.246.26b1479 → 0.0.37-pr.246.3c6cb91

package/dist/cli/index.js

@@ -8933,10 +8933,10 @@ var require_ejs = __commonJS((exports) => {
   exports.localsName = _DEFAULT_LOCALS_NAME;
   exports.promiseImpl = new Function("return this;")().Promise;
   exports.resolveInclude = function(name2, filename, isDir) {
-    var dirname6 = path11.dirname;
+    var dirname7 = path11.dirname;
     var extname = path11.extname;
     var resolve = path11.resolve;
-    var includePath = resolve(isDir ? filename : dirname6(filename), name2);
+    var includePath = resolve(isDir ? filename : dirname7(filename), name2);
     var ext = extname(name2);
     if (!ext) {
       includePath += ".ejs";
@@ -9314,10 +9314,10 @@ var require_ejs = __commonJS((exports) => {
       };
       if (opts.filename && typeof Object.defineProperty === "function") {
         var filename = opts.filename;
-        var basename4 = path11.basename(filename, path11.extname(filename));
+        var basename3 = path11.basename(filename, path11.extname(filename));
         try {
           Object.defineProperty(returnedFn, "name", {
-            value: basename4,
+            value: basename3,
             writable: false,
             enumerable: false,
             configurable: true
@@ -12652,8 +12652,8 @@ var require_main = __commonJS((exports, module) => {
       const shortPaths = [];
       for (const filePath of optionPaths) {
         try {
-          const relative = path11.relative(process.cwd(), filePath);
-          shortPaths.push(relative);
+          const relative3 = path11.relative(process.cwd(), filePath);
+          shortPaths.push(relative3);
         } catch (e2) {
           if (debug) {
             _debug(`Failed to load ${filePath} ${e2.message}`);
@@ -112161,12 +112161,12 @@ function getLanguageByFileName(languages2, file2) {
   if (!file2) {
     return;
   }
-  const basename5 = getFileBasename(file2).toLowerCase();
+  const basename4 = getFileBasename(file2).toLowerCase();
   return languages2.find(({
     filenames
-  }) => filenames?.some((name2) => name2.toLowerCase() === basename5)) ?? languages2.find(({
+  }) => filenames?.some((name2) => name2.toLowerCase() === basename4)) ?? languages2.find(({
     extensions
-  }) => extensions?.some((extension) => basename5.endsWith(extension)));
+  }) => extensions?.some((extension) => basename4.endsWith(extension)));
 }
 function getLanguageByLanguageName(languages2, languageName) {
   if (!languageName) {
@@ -117388,8 +117388,8 @@ var init_prettier = __esm(() => {
       }
       exports.endsWithSlashGlobStar = endsWithSlashGlobStar;
       function isAffectDepthOfReadingPattern(pattern) {
-        const basename5 = path152.basename(pattern);
-        return endsWithSlashGlobStar(pattern) || isStaticPattern(basename5);
+        const basename4 = path152.basename(pattern);
+        return endsWithSlashGlobStar(pattern) || isStaticPattern(basename4);
       }
       exports.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern;
       function expandPatternsWithBraceExpansion(patterns) {
@@ -117434,15 +117434,15 @@ var init_prettier = __esm(() => {
       exports.removeDuplicateSlashes = removeDuplicateSlashes;
       function partitionAbsoluteAndRelative(patterns) {
         const absolute = [];
-        const relative2 = [];
+        const relative22 = [];
         for (const pattern of patterns) {
           if (isAbsolute2(pattern)) {
             absolute.push(pattern);
           } else {
-            relative2.push(pattern);
+            relative22.push(pattern);
           }
         }
-        return [absolute, relative2];
+        return [absolute, relative22];
       }
       exports.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative;
       function isAbsolute2(pattern) {
@@ -132397,7 +132397,7 @@ var require_url = __commonJS((exports) => {
   exports.fromFileSystemPath = fromFileSystemPath;
   exports.toFileSystemPath = toFileSystemPath;
   exports.safePointerToPath = safePointerToPath;
-  exports.relative = relative2;
+  exports.relative = relative4;
   var convert_path_to_posix_1 = __importDefault(require_convert_path_to_posix());
   var path_1 = __importStar(__require("path"));
   var forwardSlashPattern = /\//g;
@@ -132547,7 +132547,7 @@ var require_url = __commonJS((exports) => {
       return decodeURIComponent(value).replace(jsonPointerSlash, "/").replace(jsonPointerTilde, "~");
     });
   }
-  function relative2(from, to5) {
+  function relative4(from, to5) {
     if (!isFileSystemPath(from) || !isFileSystemPath(to5)) {
       return resolve6(from, to5);
     }
@@ -138614,7 +138614,7 @@ var require_depd = __commonJS((exports, module) => {
    * Copyright(c) 2014-2018 Douglas Christopher Wilson
    * MIT Licensed
    */
-  var relative2 = __require("path").relative;
+  var relative4 = __require("path").relative;
   module.exports = depd;
   var basePath = process.cwd();
   function containsNamespace(str, namespace) {
@@ -138810,7 +138810,7 @@ var require_depd = __commonJS((exports, module) => {
     return formatted;
   }
   function formatLocation(callSite) {
-    return relative2(basePath, callSite[0]) + ":" + callSite[1] + ":" + callSite[2];
+    return relative4(basePath, callSite[0]) + ":" + callSite[1] + ":" + callSite[2];
   }
   function getStack() {
     var limit = Error.stackTraceLimit;
@@ -156272,8 +156272,8 @@ var require_view = __commonJS((exports, module) => {
   var debug = require_src4()("express:view");
   var path18 = __require("node:path");
   var fs28 = __require("node:fs");
-  var dirname11 = path18.dirname;
-  var basename5 = path18.basename;
+  var dirname12 = path18.dirname;
+  var basename4 = path18.basename;
   var extname2 = path18.extname;
   var join15 = path18.join;
   var resolve6 = path18.resolve;
@@ -156311,8 +156311,8 @@ var require_view = __commonJS((exports, module) => {
     for (var i5 = 0;i5 < roots.length && !path19; i5++) {
       var root2 = roots[i5];
       var loc = resolve6(root2, name2);
-      var dir = dirname11(loc);
-      var file2 = basename5(loc);
+      var dir = dirname12(loc);
+      var file2 = basename4(loc);
       path19 = this.resolve(dir, file2);
     }
     return path19;
@@ -156342,7 +156342,7 @@ var require_view = __commonJS((exports, module) => {
     if (stat2 && stat2.isFile()) {
       return path19;
     }
-    path19 = join15(dir, basename5(file2, ext), "index" + ext);
+    path19 = join15(dir, basename4(file2, ext), "index" + ext);
     stat2 = tryStat(path19);
     if (stat2 && stat2.isFile()) {
       return path19;
@@ -159663,7 +159663,7 @@ var require_content_disposition = __commonJS((exports, module) => {
    */
   module.exports = contentDisposition;
   module.exports.parse = parse11;
-  var basename5 = __require("path").basename;
+  var basename4 = __require("path").basename;
   var ENCODE_URL_ATTR_CHAR_REGEXP = /[\x00-\x20"'()*,/:;<=>?@[\\\]{}\x7f]/g;
   var HEX_ESCAPE_REGEXP = /%[0-9A-Fa-f]{2}/;
   var HEX_ESCAPE_REPLACE_REGEXP = /%([0-9A-Fa-f]{2})/g;
@@ -159698,9 +159698,9 @@ var require_content_disposition = __commonJS((exports, module) => {
     if (typeof fallback === "string" && NON_LATIN1_REGEXP.test(fallback)) {
       throw new TypeError("fallback must be ISO-8859-1 string");
     }
-    var name2 = basename5(filename);
+    var name2 = basename4(filename);
     var isQuotedString = TEXT_REGEXP.test(name2);
-    var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name2) : basename5(fallback);
+    var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name2) : basename4(fallback);
     var hasFallback = typeof fallbackName === "string" && fallbackName !== name2;
     if (hasFallback || !isQuotedString || HEX_ESCAPE_REGEXP.test(name2)) {
       params["filename*"] = name2;
@@ -161958,8 +161958,8 @@ var require_follow_redirects = __commonJS((exports, module) => {
     }
     return parsed;
   }
-  function resolveUrl(relative2, base) {
-    return useNativeURL ? new URL2(relative2, base) : parseUrl(url3.resolve(base, relative2));
+  function resolveUrl(relative4, base) {
+    return useNativeURL ? new URL2(relative4, base) : parseUrl(url3.resolve(base, relative4));
   }
   function validateUrl(input) {
     if (/^\[/.test(input.hostname) && !/^\[[:0-9a-f]+\]$/i.test(input.hostname)) {
@@ -163597,8 +163597,8 @@ var require_tmp = __commonJS((exports, module) => {
       const name2 = options8.name;
       if (path18.isAbsolute(name2))
         throw new Error(`name option must not contain an absolute path, found "${name2}".`);
-      const basename5 = path18.basename(name2);
-      if (basename5 === ".." || basename5 === "." || basename5 !== name2)
+      const basename4 = path18.basename(name2);
+      if (basename4 === ".." || basename4 === "." || basename4 !== name2)
         throw new Error(`name option must not contain a path, found "${name2}".`);
     }
     if (!_isUndefined(options8.template) && !options8.template.match(TEMPLATE_PATTERN)) {
@@ -202878,7 +202878,7 @@ var require_utils12 = __commonJS((exports, module) => {
     if (decode4)
       return decode4(data, hint);
   }
-  function basename5(path18) {
+  function basename4(path18) {
     if (typeof path18 !== "string")
       return "";
     for (let i5 = path18.length - 1;i5 >= 0; --i5) {
@@ -204182,7 +204182,7 @@ var require_utils12 = __commonJS((exports, module) => {
     -1
   ];
   module.exports = {
-    basename: basename5,
+    basename: basename4,
     convertToUTF8,
     getDecoder,
     parseContentType,
@@ -204590,7 +204590,7 @@ var require_multipart = __commonJS((exports, module) => {
   var { Readable: Readable6, Writable: Writable4 } = __require("stream");
   var StreamSearch = require_sbmh();
   var {
-    basename: basename5,
+    basename: basename4,
     convertToUTF8,
     getDecoder,
     parseContentType,
@@ -204852,7 +204852,7 @@ var require_multipart = __commonJS((exports, module) => {
           else if (disp.params.filename)
             filename = disp.params.filename;
           if (filename !== undefined && !preservePath)
-            filename = basename5(filename);
+            filename = basename4(filename);
         }
         if (header2["content-type"]) {
           const conType = parseContentType(header2["content-type"][0]);
@@ -210671,7 +210671,7 @@ var {
 } = import__.default;
 
 // src/cli/commands/agents/pull.ts
-import { dirname as dirname7, join as join9 } from "node:path";
+import { dirname as dirname8, join as join9 } from "node:path";
 
 // node_modules/@clack/core/dist/index.mjs
 var import_picocolors = __toESM(require_picocolors(), 1);
@@ -226142,6 +226142,9 @@ var PROJECT_SUBDIR = "base44";
 var CONFIG_FILE_EXTENSION = "jsonc";
 var CONFIG_FILE_EXTENSION_GLOB = "{json,jsonc}";
 var FUNCTION_CONFIG_FILE = `function.${CONFIG_FILE_EXTENSION_GLOB}`;
+var FUNCTION_CONFIG_GLOB = `**/${FUNCTION_CONFIG_FILE}`;
+var ENTRY_FILE_GLOB = "**/entry.{js,ts}";
+var ENTRY_IGNORE_DOT_PATHS = ["**/*.*/**"];
 var APP_CONFIG_PATTERN = `**/.app.${CONFIG_FILE_EXTENSION_GLOB}`;
 var PROJECT_CONFIG_PATTERNS = [
   `${PROJECT_SUBDIR}/config.${CONFIG_FILE_EXTENSION_GLOB}`,
@@ -233170,7 +233173,7 @@ var generateGlobTasks = normalizeArguments(generateTasks);
 var generateGlobTasksSync = normalizeArgumentsSync(generateTasksSync);
 
 // src/core/project/config.ts
-import { dirname as dirname5, join as join6 } from "node:path";
+import { dirname as dirname6, join as join6 } from "node:path";
 
 // src/core/resources/agent/schema.ts
 var EntityOperationSchema = exports_external.enum(["create", "update", "delete", "read"]);
@@ -233980,7 +233983,7 @@ async function fetchFunctionLogs(functionName, filters = {}) {
   return result.data;
 }
 // src/core/resources/function/config.ts
-import { basename as basename2, dirname as dirname4, join as join5 } from "node:path";
+import { basename as basename2, dirname as dirname4, join as join5, relative } from "node:path";
 async function readFunctionConfig(configPath) {
   const parsed = await readJsonFile(configPath);
   const result = FunctionConfigSchema.safeParse(parsed);
@@ -233998,7 +234001,7 @@ async function readFunction(configPath) {
       hints: [{ message: "Check the 'entry' field in your function config" }]
     });
   }
-  const filePaths = await globby("*.{js,ts,json}", {
+  const filePaths = await globby("**/*.{js,ts,json}", {
     cwd: functionDir,
     absolute: true
   });
@@ -234009,43 +234012,61 @@ async function readAllFunctions(functionsDir) {
   if (!await pathExists(functionsDir)) {
     return [];
   }
-  const configFiles = await globby(`*/${FUNCTION_CONFIG_FILE}`, {
+  const configFiles = await globby(FUNCTION_CONFIG_GLOB, {
     cwd: functionsDir,
     absolute: true
   });
-  const indexFiles = await globby(`*/index.{js,ts}`, {
+  const entryFiles = await globby(ENTRY_FILE_GLOB, {
     cwd: functionsDir,
-    absolute: true
+    absolute: true,
+    ignore: ENTRY_IGNORE_DOT_PATHS
   });
   const configFilesDirs = new Set(configFiles.map((f) => dirname4(f)));
-  const indexFilesDirs = indexFiles.filter((indexFile) => !configFilesDirs.has(dirname4(indexFile)));
+  const entryFilesWithoutConfig = entryFiles.filter((entryFile) => !configFilesDirs.has(dirname4(entryFile)));
   const functionsFromConfig = await Promise.all(configFiles.map((configPath) => readFunction(configPath)));
-  const functionsWithoutConfig = await Promise.all(indexFilesDirs.map(async (functionFile) => {
-    const functionDir = dirname4(functionFile);
-    const filePaths = await globby("*.{js,ts,json}", {
+  const functionsWithoutConfig = await Promise.all(entryFilesWithoutConfig.map(async (entryFile) => {
+    const functionDir = dirname4(entryFile);
+    const filePaths = await globby("**/*.{js,ts,json}", {
       cwd: functionDir,
       absolute: true
     });
-    const name2 = basename2(functionDir);
-    const entry = basename2(functionFile);
-    return { name: name2, entry, entryPath: functionFile, filePaths };
+    const name2 = relative(functionsDir, functionDir).split(/[/\\]/).join("/");
+    if (!name2) {
+      throw new InvalidInputError("entry.ts found directly in the functions directory — it must be inside a named subfolder", {
+        hints: [
+          {
+            message: `Move ${entryFile} into a subfolder (e.g. functions/myFunc/entry.ts)`
+          }
+        ]
+      });
+    }
+    const entry = basename2(entryFile);
+    return { name: name2, entry, entryPath: entryFile, filePaths };
   }));
   const functions = [...functionsFromConfig, ...functionsWithoutConfig];
   const names = new Set;
   for (const fn of functions) {
     if (names.has(fn.name)) {
-      throw new Error(`Duplicate function name "${fn.name}"`);
+      throw new InvalidInputError(`Duplicate function name "${fn.name}"`, {
+        hints: [
+          {
+            message: "Ensure each function has a unique name (or path for zero-config functions)."
+          }
+        ]
+      });
     }
     names.add(fn.name);
   }
   return functions;
 }
 // src/core/resources/function/deploy.ts
-import { basename as basename3 } from "node:path";
+import { dirname as dirname5, relative as relative2 } from "node:path";
 async function loadFunctionCode(fn) {
+  const functionDir = dirname5(fn.entryPath);
   const loadedFiles = await Promise.all(fn.filePaths.map(async (filePath) => {
     const content = await readTextFile(filePath);
-    return { path: basename3(filePath), content };
+    const path11 = relative2(functionDir, filePath).split(/[/\\]/).join("/");
+    return { path: path11, content };
   }));
   return { ...fn, files: loadedFiles };
 }
@@ -234071,12 +234092,12 @@ async function findConfigInDir(dir) {
 }
 async function findProjectRoot(startPath) {
   let current = startPath || process.cwd();
-  while (current !== dirname5(current)) {
+  while (current !== dirname6(current)) {
     const configPath = await findConfigInDir(current);
     if (configPath) {
       return { root: current, configPath };
     }
-    current = dirname5(current);
+    current = dirname6(current);
   }
   return null;
 }
@@ -234098,7 +234119,7 @@ async function readProjectConfig(projectRoot) {
     throw new SchemaValidationError("Invalid project configuration", result.error, configPath);
   }
   const project = result.data;
-  const configDir = dirname5(configPath);
+  const configDir = dirname6(configPath);
   const [entities, functions, agents, connectors] = await Promise.all([
     entityResource.readAll(join6(configDir, project.entitiesDir)),
     functionResource.readAll(join6(configDir, project.functionsDir)),
@@ -234200,7 +234221,7 @@ async function readAppConfig(projectRoot) {
 // src/core/project/template.ts
 var import_ejs = __toESM(require_ejs(), 1);
 var import_front_matter = __toESM(require_front_matter(), 1);
-import { dirname as dirname6, join as join7 } from "node:path";
+import { dirname as dirname7, join as join7 } from "node:path";
 async function listTemplates() {
   const parsed = await readJsonFile(getTemplatesIndexPath());
   const result = TemplatesConfigSchema.safeParse(parsed);
@@ -234222,7 +234243,7 @@ async function renderTemplate(template, destPath, data) {
       if (file2.endsWith(".ejs")) {
         const rendered = await import_ejs.default.renderFile(srcPath, data);
         const { attributes, body } = import_front_matter.default(rendered);
-        const destFile = attributes.outputFileName ? join7(dirname6(file2), attributes.outputFileName) : file2.replace(/\.ejs$/, "");
+        const destFile = attributes.outputFileName ? join7(dirname7(file2), attributes.outputFileName) : file2.replace(/\.ejs$/, "");
         const destFilePath = join7(destPath, destFile);
         await writeFile(destFilePath, body);
       } else {
@@ -242107,7 +242128,7 @@ function getDashboardUrl(projectId) {
 // src/cli/commands/agents/pull.ts
 async function pullAgentsAction() {
   const { project: project2 } = await readProjectConfig();
-  const configDir = dirname7(project2.configPath);
+  const configDir = dirname8(project2.configPath);
   const agentsDir = join9(configDir, project2.agentsDir);
   const remoteAgents = await runTask("Fetching agents from Base44", async () => {
     return await fetchAgents();
@@ -242202,10 +242223,10 @@ function getWhoamiCommand(context) {
 }
 
 // src/cli/commands/connectors/pull.ts
-import { dirname as dirname8, join as join10 } from "node:path";
+import { dirname as dirname9, join as join10 } from "node:path";
 async function pullConnectorsAction() {
   const { project: project2 } = await readProjectConfig();
-  const configDir = dirname8(project2.configPath);
+  const configDir = dirname9(project2.configPath);
   const connectorsDir = join10(configDir, project2.connectorsDir);
   const remoteConnectors = await runTask("Fetching connectors from Base44", async () => {
     return await listConnectors();
@@ -243093,7 +243114,7 @@ function getFunctionsDeployCommand(context) {
 }
 
 // src/cli/commands/project/create.ts
-import { basename as basename4, join as join11, resolve as resolve2 } from "node:path";
+import { basename as basename3, join as join11, resolve as resolve2 } from "node:path";
 var import_kebabCase = __toESM(require_kebabCase(), 1);
 var DEFAULT_TEMPLATE_ID = "backend-only";
 async function getTemplateById(templateId) {
@@ -243128,8 +243149,8 @@ async function createInteractive(options) {
     name: () => {
       return options.name ? Promise.resolve(options.name) : Ze({
         message: "What is the name of your project?",
-        placeholder: basename4(process.cwd()),
-        initialValue: basename4(process.cwd()),
+        placeholder: basename3(process.cwd()),
+        initialValue: basename3(process.cwd()),
         validate: (value) => {
           if (!value || value.trim().length === 0) {
             return "Every project deserves a name";
@@ -243901,7 +243922,7 @@ function getTypesCommand(context) {
 }
 
 // src/cli/dev/dev-server/main.ts
-import { dirname as dirname14, join as join18 } from "node:path";
+import { dirname as dirname15, join as join18 } from "node:path";
 var import_cors = __toESM(require_lib4(), 1);
 var import_express4 = __toESM(require_express(), 1);
 
@@ -244060,9 +244081,9 @@ function createDevLogger() {
 
 // src/cli/dev/dev-server/function-manager.ts
 import { spawn as spawn2, spawnSync as spawnSync2 } from "node:child_process";
-import { dirname as dirname11, join as join15 } from "node:path";
+import { dirname as dirname12, join as join15 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
-var __dirname5 = dirname11(fileURLToPath7(import.meta.url));
+var __dirname5 = dirname12(fileURLToPath7(import.meta.url));
 var WRAPPER_PATH = join15(__dirname5, "../deno-runtime/main.js");
 var READY_TIMEOUT = 30000;
 
@@ -244632,7 +244653,7 @@ function createCustomIntegrationRoutes(remoteProxy, logger) {
 
 // src/cli/dev/dev-server/watcher.ts
 import { EventEmitter as EventEmitter4 } from "node:events";
-import { relative as relative4 } from "node:path";
+import { relative as relative6 } from "node:path";
 
 // node_modules/chokidar/index.js
 import { EventEmitter as EventEmitter3 } from "node:events";
@@ -244802,10 +244823,10 @@ class ReaddirpStream extends Readable6 {
   }
   async _formatEntry(dirent, path19) {
     let entry;
-    const basename5 = this._isDirent ? dirent.name : dirent;
+    const basename4 = this._isDirent ? dirent.name : dirent;
     try {
-      const fullPath = presolve(pjoin(path19, basename5));
-      entry = { path: prelative(this._root, fullPath), fullPath, basename: basename5 };
+      const fullPath = presolve(pjoin(path19, basename4));
+      entry = { path: prelative(this._root, fullPath), fullPath, basename: basename4 };
       entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
     } catch (err) {
       this._onError(err);
@@ -245332,9 +245353,9 @@ class NodeFsHandler {
   _watchWithNodeFs(path19, listener) {
     const opts = this.fsw.options;
     const directory = sp2.dirname(path19);
-    const basename6 = sp2.basename(path19);
+    const basename5 = sp2.basename(path19);
     const parent = this.fsw._getWatchedDir(directory);
-    parent.add(basename6);
+    parent.add(basename5);
     const absolutePath = sp2.resolve(path19);
     const options8 = {
       persistent: opts.persistent
@@ -245344,7 +245365,7 @@ class NodeFsHandler {
     let closer;
     if (opts.usePolling) {
       const enableBin = opts.interval !== opts.binaryInterval;
-      options8.interval = enableBin && isBinaryPath(basename6) ? opts.binaryInterval : opts.interval;
+      options8.interval = enableBin && isBinaryPath(basename5) ? opts.binaryInterval : opts.interval;
       closer = setFsWatchFileListener(path19, absolutePath, options8, {
         listener,
         rawEmitter: this.fsw._emitRaw
@@ -245362,11 +245383,11 @@ class NodeFsHandler {
     if (this.fsw.closed) {
       return;
     }
-    const dirname13 = sp2.dirname(file2);
-    const basename6 = sp2.basename(file2);
-    const parent = this.fsw._getWatchedDir(dirname13);
+    const dirname14 = sp2.dirname(file2);
+    const basename5 = sp2.basename(file2);
+    const parent = this.fsw._getWatchedDir(dirname14);
     let prevStats = stats;
-    if (parent.has(basename6))
+    if (parent.has(basename5))
       return;
     const listener = async (path19, newStats) => {
       if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
@@ -245391,9 +245412,9 @@ class NodeFsHandler {
             prevStats = newStats2;
           }
         } catch (error48) {
-          this.fsw._remove(dirname13, basename6);
+          this.fsw._remove(dirname14, basename5);
         }
-      } else if (parent.has(basename6)) {
+      } else if (parent.has(basename5)) {
         const at13 = newStats.atimeMs;
         const mt12 = newStats.mtimeMs;
         if (!at13 || at13 <= mt12 || mt12 !== prevStats.mtimeMs) {
@@ -245614,11 +245635,11 @@ function createPattern(matcher) {
       if (matcher.path === string4)
         return true;
       if (matcher.recursive) {
-        const relative4 = sp3.relative(matcher.path, string4);
-        if (!relative4) {
+        const relative6 = sp3.relative(matcher.path, string4);
+        if (!relative6) {
           return false;
         }
-        return !relative4.startsWith("..") && !sp3.isAbsolute(relative4);
+        return !relative6.startsWith("..") && !sp3.isAbsolute(relative6);
       }
       return false;
     };
@@ -246307,7 +246328,7 @@ class WatchBase44 extends EventEmitter4 {
   }
   watchTarget(item) {
     const handler = import_debounce.default(async (_event, path19) => {
-      this.emit("change", item.name, relative4(item.path, path19));
+      this.emit("change", item.name, relative6(item.path, path19));
     }, WATCH_DEBOUNCE_MS);
     const watcher = watch(item.path, {
       ignoreInitial: true
@@ -246400,7 +246421,7 @@ async function createDevServer(options8) {
   const base44ConfigWatcher = new WatchBase44([
     {
       name: "functions",
-      path: join18(dirname14(project2.configPath), project2.functionsDir)
+      path: join18(dirname15(project2.configPath), project2.functionsDir)
     }
   ], devLogger);
   base44ConfigWatcher.on("change", async (name2) => {
@@ -246579,7 +246600,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 dirname15, posix, sep } from "path";
+import { dirname as dirname16, posix, sep } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -246588,7 +246609,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname15(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname16(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
   const normalizedBase = isWindows5 ? normalizeWindowsPath2(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -250806,4 +250827,4 @@ export {
   CLIExitError
 };
 
-//# debugId=CF0F55B99A93F97864756E2164756E21
+//# debugId=C5F38CF0EABECFE464756E2164756E21