@base44-preview/cli 0.0.33-pr.338.c6ab1f7 → 0.0.33-pr.383.4cb51a6

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";
@@ -116858,15 +116858,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) {
@@ -131821,7 +131821,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;
@@ -131971,7 +131971,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 resolve5(from, to5);
     }
@@ -138038,7 +138038,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) {
@@ -138234,7 +138234,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;
@@ -155696,7 +155696,7 @@ 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 dirname12 = path18.dirname;
   var basename4 = path18.basename;
   var extname2 = path18.extname;
   var join15 = path18.join;
@@ -155735,7 +155735,7 @@ var require_view = __commonJS((exports, module) => {
     for (var i5 = 0;i5 < roots.length && !path19; i5++) {
       var root2 = roots[i5];
       var loc = resolve5(root2, name2);
-      var dir = dirname11(loc);
+      var dir = dirname12(loc);
       var file2 = basename4(loc);
       path19 = this.resolve(dir, file2);
     }
@@ -161382,8 +161382,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)) {
@@ -162852,7 +162852,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);
@@ -178322,7 +178322,9 @@ import { fileURLToPath } from "node:url";
 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_EXTENSION_GLOB}`;
+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}`,
@@ -185327,7 +185329,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"]);
@@ -186025,8 +186027,7 @@ var BackendFunctionSchema = FunctionConfigSchema.extend({
   filePaths: exports_external.array(exports_external.string()).min(1, "Function must have at least one file")
 });
 var DeploySingleFunctionResponseSchema = exports_external.object({
-  status: exports_external.enum(["deployed", "unchanged"]),
-  duration_ms: exports_external.number().optional().nullable()
+  status: exports_external.enum(["deployed", "unchanged"])
 });
 var FunctionAutomationInfoSchema = exports_external.object({
   name: exports_external.string(),
@@ -186082,7 +186083,7 @@ async function listDeployedFunctions() {
   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, relative } from "node:path";
 async function readFunctionConfig(configPath) {
   const parsed = await readJsonFile(configPath);
   const result = FunctionConfigSchema.safeParse(parsed);
@@ -186096,9 +186097,11 @@ async function readFunction(configPath) {
   const functionDir = dirname4(configPath);
   const entryPath = join5(functionDir, config5.entry);
   if (!await pathExists(entryPath)) {
-    throw new FileNotFoundError(`Function entry file not found: ${entryPath} (referenced in ${configPath})`);
+    throw new InvalidInputError(`Function entry file not found: ${entryPath} (referenced in ${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
   });
@@ -186109,30 +186112,66 @@ 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 functions = await Promise.all(configFiles.map((configPath) => readFunction(configPath)));
+  const entryFiles = await globby(ENTRY_FILE_GLOB, {
+    cwd: functionsDir,
+    absolute: true,
+    ignore: ENTRY_IGNORE_DOT_PATHS
+  });
+  const configFilesDirs = new Set(configFiles.map((f) => dirname4(f)));
+  const entryFilesWithoutConfig = entryFiles.filter((entryFile) => !configFilesDirs.has(dirname4(entryFile)));
+  const functionsFromConfig = await Promise.all(configFiles.map((configPath) => readFunction(configPath)));
+  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 = 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 basename2 } from "node:path";
+import { dirname as dirname5, relative as relative2 } from "node:path";
 async function loadFunctionCode(fn) {
+  const functionDir = dirname5(fn.entryPath);
   const resolvedFiles = await Promise.all(fn.filePaths.map(async (filePath) => {
     const content = await readTextFile(filePath);
-    return { path: basename2(filePath), content };
+    const path11 = relative2(functionDir, filePath).split(/[/\\]/).join("/");
+    return { path: path11, content };
   }));
   return { ...fn, files: resolvedFiles };
 }
 async function deployOne(fn) {
+  const start = Date.now();
   try {
     const functionWithCode = await loadFunctionCode(fn);
     const response = await deploySingleFunction(functionWithCode.name, {
@@ -186143,7 +186182,7 @@ async function deployOne(fn) {
     return {
       name: functionWithCode.name,
       status: response.status,
-      durationMs: response.duration_ms
+      durationMs: Date.now() - start
     };
   } catch (error48) {
     return {
@@ -186199,12 +186238,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;
 }
@@ -186226,7 +186265,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)),
@@ -186328,7 +186367,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);
@@ -186350,7 +186389,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 {
@@ -186499,13 +186538,10 @@ function hasResourcesToDeploy(projectData) {
   const hasConnectors = connectors.length > 0;
   return hasEntities || hasFunctions || hasAgents || hasConnectors || hasSite;
 }
-async function deployAll(projectData, options) {
+async function deployAll(projectData) {
   const { project, entities, functions, agents, connectors } = projectData;
   await entityResource.push(entities);
-  await deployFunctionsSequentially(functions, {
-    onStart: options?.onFunctionStart,
-    onResult: options?.onFunctionResult
-  });
+  await functionResource.push(functions);
   await agentResource.push(agents);
   const { results: connectorResults } = await pushConnectors(connectors);
   if (project.site?.outputDirectory) {
@@ -194157,7 +194193,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();
@@ -194252,10 +194288,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();
@@ -195104,59 +195140,6 @@ function getEntitiesPushCommand(context) {
   }));
 }
 
-// src/cli/utils/parseNames.ts
-function parseNames(args) {
-  return args.flatMap((arg) => arg.split(",")).map((n2) => n2.trim()).filter(Boolean);
-}
-
-// src/cli/commands/functions/delete.ts
-async function deleteFunctionsAction(names) {
-  let deleted = 0;
-  let notFound = 0;
-  let errors4 = 0;
-  for (const name2 of names) {
-    try {
-      await deleteSingleFunction(name2);
-      R2.success(`${name2} deleted`);
-      deleted++;
-    } catch (error48) {
-      if (error48 instanceof ApiError && error48.statusCode === 404) {
-        R2.warn(`Function "${name2}" not found on remote`);
-        notFound++;
-      } else {
-        R2.error(`${name2} error: ${error48 instanceof Error ? error48.message : String(error48)}`);
-        errors4++;
-      }
-    }
-  }
-  if (names.length === 1) {
-    if (deleted)
-      return { outroMessage: `Function "${names[0]}" deleted` };
-    if (notFound)
-      return { outroMessage: `Function "${names[0]}" not found` };
-    return { outroMessage: `Failed to delete "${names[0]}"` };
-  }
-  const parts = [];
-  if (deleted > 0)
-    parts.push(`${deleted} deleted`);
-  if (notFound > 0)
-    parts.push(`${notFound} not found`);
-  if (errors4 > 0)
-    parts.push(`${errors4} error${errors4 !== 1 ? "s" : ""}`);
-  return { outroMessage: parts.join(", ") };
-}
-function getDeleteCommand(context) {
-  return new Command("delete").description("Delete deployed functions").argument("<names...>", "Function names to delete").action(async (rawNames) => {
-    await runCommand(() => {
-      const names = parseNames(rawNames);
-      if (names.length === 0) {
-        throw new InvalidInputError("At least one function name is required");
-      }
-      return deleteFunctionsAction(names);
-    }, { requireAuth: true }, context);
-  });
-}
-
 // src/cli/utils/formatDeployResult.ts
 function formatDuration(ms) {
   return `${(ms / 1000).toFixed(1)}s`;
@@ -195173,6 +195156,11 @@ function formatDeployResult(result) {
   }
 }
 
+// src/cli/utils/parseNames.ts
+function parseNames(args) {
+  return args.flatMap((arg) => arg.split(",")).map((n2) => n2.trim()).filter(Boolean);
+}
+
 // src/cli/commands/functions/deploy.ts
 function resolveFunctionsToDeploy(names, allFunctions) {
   if (names.length === 0)
@@ -195197,11 +195185,11 @@ function formatPruneResults(pruneResults) {
   }
 }
 function buildDeploySummary(results) {
-  const succeeded = results.filter((r) => r.status !== "error").length;
+  const deployed = results.filter((r) => r.status !== "error").length;
   const failed = results.filter((r) => r.status === "error").length;
   const parts = [];
-  if (succeeded > 0)
-    parts.push(`${succeeded}/${results.length} succeeded`);
+  if (deployed > 0)
+    parts.push(`${deployed}/${results.length} deployed`);
   if (failed > 0)
     parts.push(`${failed} error${failed !== 1 ? "s" : ""}`);
   return parts.join(", ") || "No functions deployed";
@@ -195270,7 +195258,7 @@ function getListCommand(context) {
 
 // src/cli/commands/functions/index.ts
 function getFunctionsCommand(context) {
-  return new Command("functions").description("Manage backend functions").addCommand(getDeployCommand(context)).addCommand(getListCommand(context)).addCommand(getDeleteCommand(context));
+  return new Command("functions").description("Manage backend functions").addCommand(getDeployCommand(context)).addCommand(getListCommand(context));
 }
 
 // src/cli/commands/project/create.ts
@@ -195490,17 +195478,11 @@ ${summaryLines.join(`
 ${summaryLines.join(`
 `)}`);
   }
-  let functionCompleted = 0;
-  const functionTotal = functions.length;
-  const result = await deployAll(projectData, {
-    onFunctionStart: (names) => {
-      const label = names.length === 1 ? names[0] : `${names.length} functions`;
-      R2.step(theme.styles.dim(`[${functionCompleted + 1}/${functionTotal}] Deploying ${label}...`));
-    },
-    onFunctionResult: (r) => {
-      functionCompleted++;
-      formatDeployResult(r);
-    }
+  const result = await runTask("Deploying your app...", async () => {
+    return await deployAll(projectData);
+  }, {
+    successMessage: theme.colors.base44Orange("Deployment completed"),
+    errorMessage: "Deployment failed"
   });
   const needsOAuth = filterPendingOAuth(result.connectorResults ?? []);
   if (needsOAuth.length > 0) {
@@ -195863,7 +195845,7 @@ function getTypesCommand(context) {
 }
 
 // src/cli/commands/dev.ts
-import { dirname as dirname12, join as join16 } from "node:path";
+import { dirname as dirname13, join as join16 } from "node:path";
 
 // src/cli/dev/dev-server/main.ts
 var import_cors = __toESM(require_lib4(), 1);
@@ -196011,9 +195993,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;
 
@@ -196266,7 +196248,7 @@ async function devAction(options8) {
     port,
     loadResources: async () => {
       const { project: project2 } = await readProjectConfig();
-      const configDir = dirname12(project2.configPath);
+      const configDir = dirname13(project2.configPath);
       const functions = await functionResource.readAll(join16(configDir, project2.functionsDir));
       return { functions };
     }
@@ -196432,7 +196414,7 @@ function nanoid3(size = 21) {
 }
 
 // node_modules/posthog-node/dist/extensions/error-tracking/modifiers/module.node.mjs
-import { dirname as dirname13, posix, sep } from "path";
+import { dirname as dirname14, posix, sep } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -196441,7 +196423,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname13(process.argv[1]) : process.cwd(), isWindows4 = sep === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname14(process.argv[1]) : process.cwd(), isWindows4 = sep === "\\") {
   const normalizedBase = isWindows4 ? normalizeWindowsPath2(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -200658,4 +200640,4 @@ export {
   CLIExitError
 };
 
-//# debugId=848A655CD4CA165764756E2164756E21
+//# debugId=B3EC239F04F3A3D564756E2164756E21