@base44-preview/cli 0.0.33-pr.225.220b697 → 0.0.33-pr.225.299669a

package/dist/cli/index.js

@@ -136896,12 +136896,12 @@ var require_linker = __commonJS((exports) => {
 var require_optionValidator = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.validateOptions = undefined;
-  function validateOptions2({ maxItems }) {
+  function validateOptions3({ maxItems }) {
     if (maxItems !== undefined && maxItems < -1) {
       throw RangeError(`Expected options.maxItems to be >= -1, but was given ${maxItems}.`);
     }
   }
-  exports.validateOptions = validateOptions2;
+  exports.validateOptions = validateOptions3;
 });
 
 // node_modules/json-schema-to-typescript/dist/src/index.js
@@ -178557,10 +178557,9 @@ class ApiError extends SystemError {
       } catch {
         message = error48.message;
       }
-      const statusCode = ApiError.normalizeStatusCode(error48.response.status, responseBody);
       const requestBody = error48.options.context?.__requestBody;
       return new ApiError(`Error ${context}: ${message}`, {
-        statusCode,
+        statusCode: error48.response.status,
         requestUrl: error48.request.url,
         requestMethod: error48.request.method,
         requestBody,
@@ -178617,12 +178616,6 @@ class ApiError extends SystemError {
       return;
     return REASON_HINTS[reason];
   }
-  static normalizeStatusCode(statusCode, responseBody) {
-    if (responseBody?.error_type === "KeyError") {
-      return 404;
-    }
-    return statusCode;
-  }
 }
 
 class FileNotFoundError extends SystemError {
@@ -178649,6 +178642,24 @@ class FileReadError extends SystemError {
   }
 }
 
+class FunctionNotFoundError extends ApiError {
+  constructor(functionName, cause) {
+    super(`Function "${functionName}" was not found in this app`, {
+      statusCode: 404,
+      cause,
+      hints: [
+        {
+          message: "Make sure the function name is correct and has been deployed",
+          command: "base44 functions deploy"
+        },
+        {
+          message: "List project functions by checking the base44/functions/ directory"
+        }
+      ]
+    });
+  }
+}
+
 class InternalError extends SystemError {
   code = "INTERNAL_ERROR";
   constructor(message, options) {
@@ -186073,17 +186084,30 @@ function buildLogsQueryString(filters) {
   if (filters.order) {
     params.set("order", filters.order);
   }
-  return params;
+  const queryString = params.toString();
+  return queryString ? `?${queryString}` : "";
 }
 async function fetchFunctionLogs(functionName, filters = {}) {
   const appClient = getAppClient();
-  const searchParams = buildLogsQueryString(filters);
+  const queryString = buildLogsQueryString(filters);
   let response;
   try {
-    response = await appClient.get(`functions-mgmt/${functionName}/logs`, {
-      searchParams
-    });
+    response = await appClient.get(`functions-mgmt/${functionName}/logs${queryString}`);
   } catch (error48) {
+    if (error48 instanceof HTTPError) {
+      if (error48.response.status === 404) {
+        throw new FunctionNotFoundError(functionName, error48);
+      }
+      try {
+        const body = await error48.response.clone().json();
+        if (body.error_type === "KeyError") {
+          throw new FunctionNotFoundError(functionName, error48);
+        }
+      } catch (parseError) {
+        if (parseError instanceof ApiError)
+          throw parseError;
+      }
+    }
     throw await ApiError.fromHttpError(error48, `fetching function logs: '${functionName}'`);
   }
   const result = FunctionLogsResponseSchema.safeParse(await response.json());
@@ -195109,7 +195133,8 @@ function getFunctionsDeployCommand(context) {
   }));
 }
 
-// src/cli/commands/project/logs.ts
+// src/cli/commands/logs/index.ts
+var VALID_LEVELS = ["log", "info", "warn", "error", "debug"];
 function parseFunctionFilters(options) {
   const filters = {};
   if (options.since) {
@@ -195118,6 +195143,9 @@ function parseFunctionFilters(options) {
   if (options.until) {
     filters.until = options.until;
   }
+  if (options.level) {
+    filters.level = options.level;
+  }
   if (options.limit) {
     filters.limit = Number.parseInt(options.limit, 10);
   }
@@ -195136,21 +195164,42 @@ function normalizeDatetime(value) {
     return value;
   return `${value}Z`;
 }
+function validateOptions2(options) {
+  if (options.level && !VALID_LEVELS.includes(options.level)) {
+    throw new InvalidInputError(`Invalid level: "${options.level}". Must be one of: ${VALID_LEVELS.join(", ")}.`);
+  }
+  if (options.limit) {
+    const limit = Number.parseInt(options.limit, 10);
+    if (Number.isNaN(limit) || limit < 1 || limit > 1000) {
+      throw new InvalidInputError(`Invalid limit: "${options.limit}". Must be a number between 1 and 1000.`);
+    }
+  }
+  if (options.order) {
+    const order = options.order.toUpperCase();
+    if (order !== "ASC" && order !== "DESC") {
+      throw new InvalidInputError(`Invalid order: "${options.order}". Must be "ASC" or "DESC".`);
+    }
+  }
+}
 function formatEntry(entry) {
   const time3 = entry.time.substring(0, 19).replace("T", " ");
   const level = entry.level.toUpperCase().padEnd(5);
   const message = entry.message.trim();
-  return `${time3} ${level} ${message}`;
+  return `${time3} ${level} ${message}
+`;
 }
 function formatLogs(entries) {
   if (entries.length === 0) {
     return `No logs found matching the filters.
 `;
   }
-  const header2 = `Showing ${entries.length} function log entries
+  let output = `Showing ${entries.length} function log entries
+
 `;
-  return [header2, ...entries.map(formatEntry)].join(`
-`);
+  for (const entry of entries) {
+    output += formatEntry(entry);
+  }
+  return output;
 }
 function normalizeLogEntry(entry, functionName) {
   return {
@@ -195168,7 +195217,7 @@ async function fetchLogsForFunctions(functionNames, options, availableFunctionNa
     try {
       logs = await fetchFunctionLogs(functionName, filters);
     } catch (error48) {
-      if (error48 instanceof ApiError && error48.statusCode === 404 && availableFunctionNames.length > 0) {
+      if (error48 instanceof FunctionNotFoundError && availableFunctionNames.length > 0) {
         const available = availableFunctionNames.join(", ");
         throw new InvalidInputError(`Function "${functionName}" was not found in this app`, {
           hints: [
@@ -195198,29 +195247,29 @@ async function getAllFunctionNames() {
   return functions.map((fn) => fn.name);
 }
 async function logsAction(options) {
+  if (options.since)
+    options.since = normalizeDatetime(options.since);
+  if (options.until)
+    options.until = normalizeDatetime(options.until);
+  validateOptions2(options);
   const specifiedFunctions = parseFunctionNames(options.function);
   const allProjectFunctions = await getAllFunctionNames();
   const functionNames = specifiedFunctions.length > 0 ? specifiedFunctions : allProjectFunctions;
   if (functionNames.length === 0) {
-    return { outroMessage: "No functions found in this project." };
+    return { stdout: `No functions found in this project.
+` };
   }
   let entries = await fetchLogsForFunctions(functionNames, options, allProjectFunctions);
   const limit = options.limit ? Number.parseInt(options.limit, 10) : undefined;
   if (limit !== undefined && entries.length > limit) {
     entries = entries.slice(0, limit);
   }
-  const logsOutput = options.json ? `${JSON.stringify(entries, null, 2)}
+  const stdout = options.json ? `${JSON.stringify(entries, null, 2)}
 ` : formatLogs(entries);
-  return { outroMessage: "Fetched logs", stdout: logsOutput };
+  return { stdout };
 }
 function getLogsCommand(context) {
-  return new Command("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).option("-n, --limit <n>", "Results per page (1-1000, default: 50)", (v) => {
-    const n2 = Number.parseInt(v, 10);
-    if (Number.isNaN(n2) || n2 < 1 || n2 > 1000) {
-      throw new InvalidInputError(`Invalid limit: "${v}". Must be a number between 1 and 1000.`);
-    }
-    return v;
-  }).addOption(new Option("--order <order>", "Sort order").choices(["asc", "desc"])).option("--json", "Output raw JSON").action(async (options) => {
+  return new Command("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)").option("--until <datetime>", "Show logs until this time (ISO format)").option("--level <level>", "Filter by log level: log, info, warn, error, debug").option("-n, --limit <n>", "Results per page (1-1000, default: 50)").option("--order <order>", "Sort order: ASC|DESC (default: DESC)").option("--json", "Output raw JSON").action(async (options) => {
     await runCommand(() => logsAction(options), { requireAuth: true }, context);
   });
 }
@@ -200605,4 +200654,4 @@ export {
   CLIExitError
 };
 
-//# debugId=BDC2926C94F34D8D64756E2164756E21
+//# debugId=00151F47FED4FE2F64756E2164756E21