@base44-preview/cli 0.0.56-pr.551.d02ef77 → 0.0.56-pr.552.590deb5

package/dist/cli/index.js

@@ -243426,7 +243426,7 @@ var ListFunctionsResponseSchema = exports_external.object({
 var LogLevelSchema = exports_external.enum(["info", "warning", "error", "debug"]);
 var FunctionLogEntrySchema = exports_external.object({
   time: exports_external.string(),
-  level: LogLevelSchema,
+  level: exports_external.preprocess((v) => v === "warn" ? "warning" : !v || v === "log" ? "info" : v, LogLevelSchema),
   message: exports_external.string()
 });
 var FunctionLogsResponseSchema = exports_external.array(FunctionLogEntrySchema);
@@ -243487,9 +243487,6 @@ function buildLogsQueryString(filters) {
   if (filters.order) {
     params.set("order", filters.order);
   }
-  if (filters.env) {
-    params.set("env", filters.env);
-  }
   return params;
 }
 async function fetchFunctionLogs(functionName, filters = {}) {
@@ -251109,9 +251106,12 @@ class Base44Command extends Command {
     }
     return this._context;
   }
+  isRawOutputMode() {
+    return this.opts().format === "json";
+  }
   action(fn) {
     return super.action(async (...args) => {
-      const quiet = this.context.isNonInteractive;
+      const quiet = this.context.isNonInteractive || this.isRawOutputMode();
       if (!quiet) {
         await showCommandStart(this._commandOptions.fullBanner);
       }
@@ -253499,9 +253499,6 @@ function parseFunctionFilters(options) {
   if (options.order) {
     filters.order = options.order.toLowerCase();
   }
-  if (options.env) {
-    filters.env = options.env;
-  }
   return filters;
 }
 function parseFunctionNames(option) {
@@ -253510,6 +253507,11 @@ function parseFunctionNames(option) {
   return option.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
 }
 function normalizeDatetime(value) {
+  const rel = value.match(/^(\d+)(m|h|d)$/);
+  if (rel) {
+    const ms = rel[2] === "m" ? Number(rel[1]) * 60000 : rel[2] === "h" ? Number(rel[1]) * 3600000 : Number(rel[1]) * 86400000;
+    return new Date(Date.now() - ms).toISOString();
+  }
   if (/Z$|[+-]\d{2}:\d{2}$/.test(value))
     return value;
   return `${value}Z`;
@@ -253538,44 +253540,37 @@ function normalizeLogEntry(entry, functionName) {
     source: functionName
   };
 }
-async function fetchLogsForFunction(functionName, filters, availableFunctionNames) {
-  try {
-    return await fetchFunctionLogs(functionName, filters);
-  } catch (error48) {
-    if (error48 instanceof ApiError && error48.statusCode === 404 && availableFunctionNames.length > 0) {
-      const available = availableFunctionNames.join(", ");
-      throw new InvalidInputError(`Function "${functionName}" was not found in this app`, {
-        hints: [
-          { message: `Available functions in this project: ${available}` },
-          {
-            message: "Make sure the function has been deployed before fetching logs",
-            command: "base44 functions deploy"
-          }
-        ]
-      });
-    }
-    throw error48;
-  }
-}
 async function fetchLogsForFunctions(functionNames, options, availableFunctionNames) {
-  const env3 = options.env ?? "all";
-  const envs = env3 === "all" ? ["preview", "prod"] : [env3];
+  const filters = parseFunctionFilters(options);
   const allEntries = [];
   for (const functionName of functionNames) {
-    const logsPerEnv = await Promise.all(envs.map((e2) => fetchLogsForFunction(functionName, { ...parseFunctionFilters(options), env: e2 }, availableFunctionNames)));
-    const entries = logsPerEnv.flat().map((entry) => normalizeLogEntry(entry, functionName));
-    allEntries.push(...entries);
+    let logs;
+    try {
+      logs = await fetchFunctionLogs(functionName, filters);
+    } catch (error48) {
+      if (error48 instanceof ApiError && error48.statusCode === 404 && availableFunctionNames.length > 0) {
+        const available = availableFunctionNames.join(", ");
+        throw new InvalidInputError(`Function "${functionName}" was not found in this app`, {
+          hints: [
+            {
+              message: `Available functions in this project: ${available}`
+            },
+            {
+              message: "Make sure the function has been deployed before fetching logs",
+              command: "base44 functions deploy"
+            }
+          ]
+        });
+      }
+      throw error48;
+    }
+    allEntries.push(...logs.map((entry) => normalizeLogEntry(entry, functionName)));
   }
-  const order = options.order?.toUpperCase() === "ASC" ? 1 : -1;
-  allEntries.sort((a2, b) => order * a2.time.localeCompare(b.time));
-  const seen = new Set;
-  return allEntries.filter((e2) => {
-    const key = `${e2.time}|${e2.source}|${e2.message}`;
-    if (seen.has(key))
-      return false;
-    seen.add(key);
-    return true;
-  });
+  if (functionNames.length > 1) {
+    const order = options.order?.toUpperCase() === "ASC" ? 1 : -1;
+    allEntries.sort((a2, b) => order * a2.time.localeCompare(b.time));
+  }
+  return allEntries;
 }
 async function getProjectFunctionNames(projectRoot) {
   const { functions } = await readProjectConfig(projectRoot);
@@ -253609,12 +253604,16 @@ async function logsAction(ctx, options) {
   if (limit !== undefined && entries.length > limit) {
     entries = entries.slice(0, limit);
   }
-  const logsOutput = options.json ? `${JSON.stringify(entries, null, 2)}
+  const logsOutput = options.format === "json" ? `${JSON.stringify(entries, null, 2)}
 ` : formatLogs(entries);
-  return { outroMessage: "Fetched logs", stdout: logsOutput };
+  const shouldOutputOutroMessage = options.format !== "json";
+  return {
+    outroMessage: shouldOutputOutroMessage ? "Fetched logs" : undefined,
+    stdout: logsOutput
+  };
 }
 function getLogsCommand() {
-  return new Base44Command("logs").description("Fetch function logs for this app").option("--function <names>", "Filter by function name(s), comma-separated. If omitted, fetches logs for all project functions").option("--since <datetime>", "Show logs from this time (ISO format)", normalizeDatetime).option("--until <datetime>", "Show logs until this time (ISO format)", normalizeDatetime).addOption(new Option("--level <level>", "Filter by log level").choices([...LogLevelSchema.options]).hideHelp()).option("-n, --limit <n>", "Results per page (1-1000, default: 50)").addOption(new Option("--order <order>", "Sort order").choices(["asc", "desc"])).addOption(new Option("--env <env>", "Filter by environment").choices(["preview", "prod", "all"]).default("all")).action(logsAction);
+  return new Base44Command("logs").description("Fetch function logs for this app").option("--function <names>", "Filter by function name(s), comma-separated. If omitted, fetches logs for all project functions").option("--since <datetime>", "Show logs from this time (ISO format)", normalizeDatetime).option("--until <datetime>", "Show logs until this time (ISO format)", normalizeDatetime).addOption(new Option("--level <level>", "Filter by log level").choices([...LogLevelSchema.options]).hideHelp()).option("-n, --limit <n>", "Results per page (1-1000, default: 50)").addOption(new Option("--order <order>", "Sort order").choices(["asc", "desc"])).addOption(new Option("--format <format>", "Output format").choices(["text", "json"]).default("text")).action(logsAction);
 }
 
 // src/cli/commands/project/scaffold.ts
@@ -261990,4 +261989,4 @@ export {
   CLIExitError
 };
 
-//# debugId=62D8AD80DEE0720E64756E2164756E21
+//# debugId=56490DCED052362F64756E2164756E21