@base44-preview/cli 0.0.31-pr.245.26fa5cb → 0.0.31-pr.246.c851bc7

package/dist/cli/index.js

@@ -9296,10 +9296,10 @@ var require_ejs = __commonJS((exports) => {
       };
       if (opts.filename && typeof Object.defineProperty === "function") {
         var filename = opts.filename;
-        var basename3 = path11.basename(filename, path11.extname(filename));
+        var basename4 = path11.basename(filename, path11.extname(filename));
         try {
           Object.defineProperty(returnedFn, "name", {
-            value: basename3,
+            value: basename4,
             writable: false,
             enumerable: false,
             configurable: true
@@ -111567,12 +111567,12 @@ function getLanguageByFileName(languages2, file2) {
   if (!file2) {
     return;
   }
-  const basename4 = getFileBasename(file2).toLowerCase();
+  const basename5 = getFileBasename(file2).toLowerCase();
   return languages2.find(({
     filenames
-  }) => filenames?.some((name2) => name2.toLowerCase() === basename4)) ?? languages2.find(({
+  }) => filenames?.some((name2) => name2.toLowerCase() === basename5)) ?? languages2.find(({
     extensions
-  }) => extensions?.some((extension) => basename4.endsWith(extension)));
+  }) => extensions?.some((extension) => basename5.endsWith(extension)));
 }
 function getLanguageByLanguageName(languages2, languageName) {
   if (!languageName) {
@@ -116794,8 +116794,8 @@ var init_prettier = __esm(() => {
       }
       exports.endsWithSlashGlobStar = endsWithSlashGlobStar;
       function isAffectDepthOfReadingPattern(pattern) {
-        const basename4 = path152.basename(pattern);
-        return endsWithSlashGlobStar(pattern) || isStaticPattern(basename4);
+        const basename5 = path152.basename(pattern);
+        return endsWithSlashGlobStar(pattern) || isStaticPattern(basename5);
       }
       exports.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern;
       function expandPatternsWithBraceExpansion(patterns) {
@@ -155679,7 +155679,7 @@ var require_view = __commonJS((exports, module) => {
   var path18 = __require("node:path");
   var fs28 = __require("node:fs");
   var dirname11 = path18.dirname;
-  var basename4 = path18.basename;
+  var basename5 = path18.basename;
   var extname2 = path18.extname;
   var join15 = path18.join;
   var resolve5 = path18.resolve;
@@ -155718,7 +155718,7 @@ var require_view = __commonJS((exports, module) => {
       var root2 = roots[i5];
       var loc = resolve5(root2, name2);
       var dir = dirname11(loc);
-      var file2 = basename4(loc);
+      var file2 = basename5(loc);
       path19 = this.resolve(dir, file2);
     }
     return path19;
@@ -155748,7 +155748,7 @@ var require_view = __commonJS((exports, module) => {
     if (stat2 && stat2.isFile()) {
       return path19;
     }
-    path19 = join15(dir, basename4(file2, ext), "index" + ext);
+    path19 = join15(dir, basename5(file2, ext), "index" + ext);
     stat2 = tryStat(path19);
     if (stat2 && stat2.isFile()) {
       return path19;
@@ -159069,7 +159069,7 @@ var require_content_disposition = __commonJS((exports, module) => {
    */
   module.exports = contentDisposition;
   module.exports.parse = parse10;
-  var basename4 = __require("path").basename;
+  var basename5 = __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;
@@ -159104,9 +159104,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 = basename4(filename);
+    var name2 = basename5(filename);
     var isQuotedString = TEXT_REGEXP.test(name2);
-    var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name2) : basename4(fallback);
+    var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name2) : basename5(fallback);
     var hasFallback = typeof fallbackName === "string" && fallbackName !== name2;
     if (hasFallback || !isQuotedString || HEX_ESCAPE_REGEXP.test(name2)) {
       params["filename*"] = name2;
@@ -185615,7 +185615,7 @@ async function deployFunctions(functions) {
   return result.data;
 }
 // src/core/resources/function/config.ts
-import { dirname as dirname4, join as join5 } from "node:path";
+import { basename as basename2, dirname as dirname4, join as join5 } from "node:path";
 async function readFunctionConfig(configPath) {
   const parsed = await readJsonFile(configPath);
   const result = FunctionConfigSchema.safeParse(parsed);
@@ -185646,7 +185646,24 @@ async function readAllFunctions(functionsDir) {
     cwd: functionsDir,
     absolute: true
   });
-  const functions = await Promise.all(configFiles.map((configPath) => readFunction(configPath)));
+  const indexFiles = await globby(`*/index.{js,ts}`, {
+    cwd: functionsDir,
+    absolute: true
+  });
+  const configFilesDirs = new Set(configFiles.map((f) => dirname4(f)));
+  const indexFilesDirs = indexFiles.filter((indexFile) => !configFilesDirs.has(dirname4(indexFile)));
+  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}", {
+      cwd: functionDir,
+      absolute: true
+    });
+    const name2 = basename2(functionDir);
+    const entry = basename2(functionFile);
+    return { name: name2, entry, entryPath: functionFile, filePaths };
+  }));
+  const functions = [...functionsFromConfig, ...functionsWithoutConfig];
   const names = new Set;
   for (const fn of functions) {
     if (names.has(fn.name)) {
@@ -185657,11 +185674,11 @@ async function readAllFunctions(functionsDir) {
   return functions;
 }
 // src/core/resources/function/deploy.ts
-import { basename as basename2 } from "node:path";
+import { basename as basename3 } from "node:path";
 async function loadFunctionCode(fn) {
   const loadedFiles = await Promise.all(fn.filePaths.map(async (filePath) => {
     const content = await readTextFile(filePath);
-    return { path: basename2(filePath), content };
+    return { path: basename3(filePath), content };
   }));
   return { ...fn, files: loadedFiles };
 }
@@ -194629,7 +194646,7 @@ function getFunctionsDeployCommand(context) {
 }
 
 // src/cli/commands/project/create.ts
-import { basename as basename3, join as join11, resolve as resolve2 } from "node:path";
+import { basename as basename4, join as join11, resolve as resolve2 } from "node:path";
 var import_lodash = __toESM(require_lodash(), 1);
 var DEFAULT_TEMPLATE_ID = "backend-only";
 async function getTemplateById(templateId) {
@@ -194664,8 +194681,8 @@ async function createInteractive(options) {
     name: () => {
       return options.name ? Promise.resolve(options.name) : he({
         message: "What is the name of your project?",
-        placeholder: basename3(process.cwd()),
-        initialValue: basename3(process.cwd()),
+        placeholder: basename4(process.cwd()),
+        initialValue: basename4(process.cwd()),
         validate: (value) => {
           if (!value || value.trim().length === 0) {
             return "Every project deserves a name";
@@ -199760,4 +199777,4 @@ export {
   CLIExitError
 };
 
-//# debugId=DAE9ABAB4A8EF43C64756E2164756E21
+//# debugId=26F49567E6DDC3D964756E2164756E21