@base44-preview/cli 0.1.32-pr.663.ab2ede0 → 0.1.32-pr.663.b609424

package/dist/cli/index.js

@@ -39570,9 +39570,9 @@ function tm(e, t, r) {
     return l(["<", r("name"), r("typeArguments"), " ", ...e.map(r, "attributes"), n.selfClosing ? " />" : ">"]);
   let i = n.attributes?.some((u) => V3(u.value) && u.value.value.includes(`
 `)), o = t.singleAttributePerLine && n.attributes.length > 1 ? E : A;
-  return l(["<", r("name"), r("typeArguments"), m(e.map(() => [o, r()], "attributes")), ...rm2(n, t, s)], { shouldBreak: i });
+  return l(["<", r("name"), r("typeArguments"), m(e.map(() => [o, r()], "attributes")), ...rm3(n, t, s)], { shouldBreak: i });
 }
-function rm2(e, t, r) {
+function rm3(e, t, r) {
   return e.selfClosing ? [A, "/>"] : nm(e, t, r) ? [">"] : [f, ">"];
 }
 function nm(e, t, r) {
@@ -111521,7 +111521,7 @@ function N62(e) {
 function nm2(e, t, a) {
   return ie10(t, a, e.typeParameters) || ie10(t, a, e.parameters) || S7(t, e.type);
 }
-function rm3(e, t, a) {
+function rm4(e, t, a) {
   return ie10(t, a, e.types);
 }
 function im2(e, t, a) {
@@ -114489,7 +114489,7 @@ ${Me.join(`
     return S7(a, t.elementType);
   }, 190: function(t, a, _) {
     return ie10(a, _, t.elements);
-  }, 193: rm3, 194: rm3, 195: function(t, a, _) {
+  }, 193: rm4, 194: rm4, 195: function(t, a, _) {
     return S7(a, t.checkType) || S7(a, t.extendsType) || S7(a, t.trueType) || S7(a, t.falseType);
   }, 196: function(t, a, _) {
     return S7(a, t.typeParameter);
@@ -249251,23 +249251,26 @@ var OperationSchema = looseObject({
   responses: record(string2(), unknown()).optional(),
   security: array(SecurityRequirementSchema).optional()
 });
-var PathItemSchema = looseObject({
-  ...Object.fromEntries(HTTP_METHODS.map((method) => [method, OperationSchema.optional()])),
-  parameters: array(unknown()).optional()
-});
 var OpenApiSpecSchema = looseObject({
   openapi: string2(),
-  paths: record(string2(), PathItemSchema),
+  paths: record(string2(), record(string2(), unknown())),
   components: looseObject({
     schemas: record(string2(), unknown()).optional()
   }).optional(),
-  security: array(SecurityRequirementSchema).optional()
+  security: array(SecurityRequirementSchema).optional().catch(undefined)
 });
+var ParameterListSchema = array(unknown());
+
+// src/core/api-spec/text.ts
+var DOCS_CALLOUT = /<(Info|Note|Tip|Check|Warning)>([\s\S]*?)<\/\1>/g;
+var RELATIVE_LINK = /\[([^\]]+)\]\(\/[^)]*\)/g;
+function cleanText(text) {
+  return text.replace(DOCS_CALLOUT, (_, kind, body) => kind === "Warning" ? `Warning: ${body}` : body).replace(RELATIVE_LINK, "$1");
+}
 
 // src/core/api-spec/contract.ts
 var SCHEMA_REF_PREFIX = "#/components/schemas/";
 var MAX_REF_DEPTH = 4;
-var FRAMEWORK_VALIDATION_ERROR = "Validation Error";
 function inlineRefs(node, schemas, seen = new Set, depth = 0) {
   if (depth > MAX_REF_DEPTH) {
     return node;
@@ -249307,8 +249310,10 @@ function leftoverRefs(node, schemas, found = new Map) {
     for (const [key, value] of Object.entries(node)) {
       if (key === "$ref" && typeof value === "string" && value.startsWith(SCHEMA_REF_PREFIX) && !found.has(value)) {
         const schema = schemas[value.slice(SCHEMA_REF_PREFIX.length)];
-        found.set(value, schema);
-        leftoverRefs(schema, schemas, found);
+        if (schema !== undefined) {
+          found.set(value, schema);
+          leftoverRefs(schema, schemas, found);
+        }
       } else {
         leftoverRefs(value, schemas, found);
       }
@@ -249323,11 +249328,6 @@ var SCHEMA_DATA_KEYS = new Set([
   "enum",
   "const"
 ]);
-var DOCS_CALLOUT = /<(Info|Note|Tip|Check|Warning)>([\s\S]*?)<\/\1>/g;
-var RELATIVE_LINK = /\[([^\]]+)\]\(\/[^)]*\)/g;
-function cleanText(text) {
-  return text.replace(DOCS_CALLOUT, (_, kind, body) => kind === "Warning" ? `Warning: ${body}` : body).replace(RELATIVE_LINK, "$1");
-}
 function slimSchema(node, isPropertyMap = false) {
   if (Array.isArray(node)) {
     return node.map((item) => slimSchema(item));
@@ -249365,14 +249365,13 @@ function getOperationContract(spec, op) {
     return parsed.success ? [[status, parsed.data]] : [];
   });
   const success = responses.filter(([status]) => status.startsWith("2")).sort(([a], [b]) => a.localeCompare(b)).map(([, response]) => bodyOf(response).schema).find(Boolean);
-  const errors = responses.filter(([status, response]) => !status.startsWith("2") && response.description !== FRAMEWORK_VALIDATION_ERROR);
   const requestBody = bodyOf(op.operation.requestBody);
   const contract = {
     endpoint: op.endpoint,
     method: op.method,
     path: op.path,
     summary: op.summary,
-    description: cleanText(op.description),
+    description: op.description,
     parameters: (op.operation.parameters ?? []).flatMap((parameter) => {
       const parsed = ParameterSchema.safeParse(parameter);
       if (!parsed.success) {
@@ -249393,11 +249392,7 @@ function getOperationContract(spec, op) {
     }),
     ...requestBody.contentType && requestBody.contentType !== "application/json" ? { requestBodyContentType: requestBody.contentType } : {},
     requestBodySchema: inline(requestBody.schema),
-    responseSchema: inline(success),
-    errors: Object.fromEntries(errors.map(([status, response]) => [
-      status,
-      cleanText(response.description ?? "")
-    ]))
+    responseSchema: inline(success)
   };
   const refs = leftoverRefs(contract, schemas);
   return {
@@ -249422,7 +249417,7 @@ function isReadOnly(operation, spec) {
 function parameterText(operation) {
   return (operation.parameters ?? []).flatMap((parameter) => {
     const parsed = ParameterSchema.safeParse(parameter);
-    return parsed.success ? [parsed.data.name, parsed.data.description ?? ""] : [];
+    return parsed.success ? [parsed.data.name, cleanText(parsed.data.description ?? "")] : [];
   }).join(" ");
 }
 function mergeParameters(shared, own) {
@@ -249441,13 +249436,14 @@ function mergeParameters(shared, own) {
 }
 function listOperations(spec) {
   return Object.entries(spec.paths).flatMap(([path, item]) => HTTP_METHODS.flatMap((method) => {
-    const declared = item[method];
-    if (!declared) {
+    const parsed = OperationSchema.safeParse(item[method]);
+    if (!parsed.success) {
       return [];
     }
+    const shared = ParameterListSchema.safeParse(item.parameters);
     const operation = {
-      ...declared,
-      parameters: mergeParameters(item.parameters, declared.parameters)
+      ...parsed.data,
+      parameters: mergeParameters(shared.success ? shared.data : undefined, parsed.data.parameters)
     };
     return [
       {
@@ -249455,7 +249451,7 @@ function listOperations(spec) {
         method: method.toUpperCase(),
         path,
         summary: operation.summary ?? "",
-        description: operation.description ?? "",
+        description: cleanText(operation.description ?? ""),
         parameterText: parameterText(operation),
         readOnly: isReadOnly(operation, spec),
         operation
@@ -249488,6 +249484,7 @@ function matchOperation(operations, method, concretePath) {
 }
 // src/core/api-spec/request.ts
 var MAX_ERROR_BODY_CHARS = 4000;
+var QUERY_STRING = /\?\S*/g;
 async function readBody(response) {
   try {
     const text = (await response.clone().text()).trim();
@@ -249501,8 +249498,9 @@ async function sendApiRequest(method, path, body) {
     const response = await base44Client(path.replace(/^\/+/, ""), {
       method,
       body,
-      headers: body === undefined ? {} : { "Content-Type": "application/json" },
-      timeout: false
+      headers: typeof body === "string" ? { "Content-Type": "application/json" } : {},
+      timeout: false,
+      retry: { methods: ["get", "head"] }
     });
     return {
       status: response.status,
@@ -249511,20 +249509,27 @@ async function sendApiRequest(method, path, body) {
     };
   } catch (error) {
     const apiError = await ApiError.fromHttpError(error, `calling ${method} ${path}`);
-    const raw = error instanceof HTTPError ? await readBody(error.response) : undefined;
-    const message = raw && apiError.statusCode !== undefined ? `Error calling ${method} ${path}: HTTP ${apiError.statusCode}` : apiError.message;
-    throw new ApiError(message, {
-      statusCode: apiError.statusCode,
-      requestUrl: apiError.requestUrl,
-      requestMethod: apiError.requestMethod,
-      requestId: apiError.requestId,
-      hints: apiError.hints,
-      details: raw ? [`Response body: ${raw}`] : apiError.details
-    });
+    const response = error instanceof HTTPError ? error.response : undefined;
+    const raw = response ? await readBody(response) : undefined;
+    const retryAfter = response?.headers.get("retry-after") ?? undefined;
+    throw redactedApiError(apiError, raw, method, path, retryAfter);
   }
 }
+function redactedApiError(apiError, raw, method, path, retryAfter) {
+  const wait = retryAfter ? ` (retry after ${/^\d+$/.test(retryAfter) ? `${retryAfter} s` : retryAfter})` : "";
+  const reason = apiError.statusCode !== undefined ? `HTTP ${apiError.statusCode}${wait}` : (apiError.cause?.message ?? "request failed").replace(QUERY_STRING, "");
+  const message = `Error calling ${method} ${path.split("?", 1)[0]}: ${reason}`;
+  return new ApiError(message, {
+    statusCode: apiError.statusCode,
+    requestUrl: apiError.requestUrl?.split("?", 1)[0],
+    requestMethod: apiError.requestMethod,
+    requestId: apiError.requestId,
+    hints: apiError.hints,
+    details: raw ? [`Response body: ${raw}`] : apiError.details
+  });
+}
 // src/core/api-spec/spec.ts
-import { rename, stat as stat3 } from "node:fs/promises";
+import { rename, rm, stat as stat3 } from "node:fs/promises";
 import { join as join22 } from "node:path";
 var SPEC_CACHE_TTL_MS = 60 * 60 * 1000;
 function getSpecCachePath(apiUrl = getBase44ApiUrl()) {
@@ -249579,12 +249584,19 @@ async function loadSpec(options = {}) {
   const text = await downloadSpec();
   const spec = parseSpec(text);
   const partial = `${path}.${process.pid}.tmp`;
-  await writeFile(partial, text);
-  await rename(partial, path);
+  try {
+    await writeFile(partial, text);
+    await rename(partial, path);
+  } catch {
+    await rm(partial, { force: true }).catch(() => {
+      return;
+    });
+  }
   return { text, spec };
 }
 // src/cli/commands/api/shared.ts
 import { fstatSync } from "node:fs";
+import { basename as basename6 } from "node:path";
 function formatJson(value) {
   return toJsonStdout(value, { compact: !process.stdout.isTTY });
 }
@@ -249636,6 +249648,41 @@ async function readRequestBody(flag, log) {
   }
   return flag;
 }
+var FORM_FILE = /^@(.+?)(?:;type=([^;]+))?$/;
+async function readFormBody(fields) {
+  const form = new FormData;
+  for (const field of fields) {
+    const separator = field.indexOf("=");
+    if (separator < 1) {
+      throw new InvalidInputError(`--form takes name=value or name=@file, got "${field}".`);
+    }
+    const name = field.slice(0, separator);
+    const value = field.slice(separator + 1);
+    const file = FORM_FILE.exec(value);
+    if (file?.[1]) {
+      const type = file[2] ?? "application/octet-stream";
+      const blob = new Blob([await readFile(file[1])], { type });
+      form.append(name, blob, basename6(file[1]));
+    } else {
+      form.append(name, value);
+    }
+  }
+  return form;
+}
+function withoutQuery(path) {
+  return path.split("?", 1)[0] ?? "";
+}
+function reportedFetchCommand(method, path, options) {
+  return {
+    name: "api fetch",
+    args: [method, withoutQuery(path)],
+    options: {
+      ...options,
+      ...options.body === undefined ? {} : { body: "[not reported]" },
+      ...Array.isArray(options.form) && options.form.length > 0 ? { form: "[not reported]" } : {}
+    }
+  };
+}
 
 // src/cli/commands/api/catalog.ts
 async function catalogAction(ctx, area, options) {
@@ -249660,7 +249707,7 @@ async function findOperation(ctx, method, path, { refresh, flag }) {
   const { spec } = await loadSpecTask(ctx, refresh);
   const op = matchOperation(listOperations(spec), method, path);
   if (!op) {
-    throw new InvalidInputError(`No operation in the API spec matches ${method} ${path}.`, {
+    throw new InvalidInputError(`No operation in the API spec matches ${method} ${withoutQuery(path)}.`, {
       hints: [
         {
           message: "The cached spec may predate this route; fetch it again",
@@ -249675,6 +249722,9 @@ async function findOperation(ctx, method, path, { refresh, flag }) {
   }
   return { spec, op };
 }
+var MULTIPART_HINT = "Send this body with --form name=value, and --form name=@path for files.";
+var CONTRACT_HELP = `
+The contract is JSON; cut it down with e.g. | jq '.parameters, .requestBodySchema'`;
 var TEXT_CONTENT_TYPES = [
   "json",
   "text/",
@@ -249714,9 +249764,13 @@ async function formatResponse({ status, contentType, body }, output, jsonMode) {
   }
 }
 async function fetchAction(ctx, methodArg, path, options, command) {
+  ctx.errorReporter.setContext({
+    command: reportedFetchCommand(methodArg ?? "", path ?? "", { ...options })
+  });
   if (!methodArg || !path) {
     if (options.help) {
-      const usage = command.helpInformation();
+      const usage = `${command.helpInformation()}${CONTRACT_HELP}
+`;
       return { stdout: ctx.jsonMode ? formatJson({ usage }) : usage };
     }
     throw new InvalidInputError("Provide a method and a path, e.g. GET /api/apps.");
@@ -249727,7 +249781,10 @@ async function fetchAction(ctx, methodArg, path, options, command) {
       refresh: options.refresh,
       flag: "--help"
     });
-    return { stdout: formatJson(getOperationContract(spec, op)) };
+    const contract = getOperationContract(spec, op);
+    return {
+      stdout: formatJson(contract.requestBodyContentType === "multipart/form-data" ? { ...contract, hint: MULTIPART_HINT } : contract)
+    };
   }
   if (options.readOnly) {
     const { op } = await findOperation(ctx, method, path, {
@@ -249738,15 +249795,11 @@ async function fetchAction(ctx, methodArg, path, options, command) {
       throw new InvalidInputError(`Refused under --read-only: ${op.method} ${op.path} is not a read-only operation. Nothing was sent.`);
     }
   }
-  ctx.errorReporter.setContext({
-    command: {
-      name: "api fetch",
-      args: [method, path.split("?", 1)[0] ?? ""],
-      options: { ...options, body: options.body && "[not reported]" }
-    }
-  });
+  if (options.body !== undefined && options.form.length > 0) {
+    throw new InvalidInputError("Use --body or --form, not both.");
+  }
   await ensureAuth(ctx);
-  const body = await readRequestBody(options.body, ctx.log);
+  const body = options.form.length > 0 ? await readFormBody(options.form) : await readRequestBody(options.body, ctx.log);
   const response = await ctx.runTask(`Calling ${method} ${path}`, () => sendApiRequest(method, path, body), {
     successMessage: `Called ${method} ${path}`,
     errorMessage: "Request failed"
@@ -249759,7 +249812,7 @@ function getApiFetchCommand() {
   return new Base44Command("fetch", {
     requireAuth: false,
     requireAppContext: false
-  }).description("Call a Base44 API operation; add --help after a path for its contract").helpOption(false).argument("[method]", "HTTP method, e.g. GET or POST").argument("[path]", 'Concrete path with any query string, e.g. "/api/apps/<app-id>/workflows/runs?status=failed"').option("--body <json>", "Request body: JSON, @file.json, or @- to read it from stdin").option("--output <file>", "Save the response body to a file").option("--read-only", "Refuse, before sending, any operation the spec does not mark read-only").option("--refresh", REFRESH_OPTION_HELP).option("-h, --help", "With a method and path, print that operation's contract; otherwise this help").action(fetchAction);
+  }).description("Call a Base44 API operation; add --help after a path for its contract").helpOption(false).argument("[method]", "HTTP method, e.g. GET or POST").argument("[path]", 'Concrete path with any query string, e.g. "/api/apps/<app-id>/workflows/runs?status=failed"').option("--body <json>", "Request body: JSON, @file.json, or @- to read it from stdin").option("--form <field>", "Multipart field: name=value, or name=@file to attach a file (repeatable)", (field, fields) => [...fields, field], []).option("--output <file>", "Save the response body to a file").option("--read-only", "Refuse, before sending, any operation the spec does not mark read-only").option("--refresh", REFRESH_OPTION_HELP).option("-h, --help", "With a method and path, print that operation's contract; otherwise this help").addHelpText("after", CONTRACT_HELP).action(fetchAction);
 }
 
 // src/cli/commands/api/grep.ts
@@ -251578,7 +251631,7 @@ function getBuildCommand() {
 }
 
 // src/cli/commands/project/create.ts
-import { basename as basename6, resolve as resolve11 } from "node:path";
+import { basename as basename7, resolve as resolve11 } from "node:path";
 var import_kebabCase = __toESM(require_kebabCase(), 1);
 
 // src/cli/commands/project/scaffold-shared.ts
@@ -251743,8 +251796,8 @@ async function createInteractive(options, ctx) {
     name: () => {
       return options.name ? Promise.resolve(options.name) : Ze({
         message: "What is the name of your project?",
-        placeholder: basename6(process.cwd()),
-        initialValue: basename6(process.cwd()),
+        placeholder: basename7(process.cwd()),
+        initialValue: basename7(process.cwd()),
         validate: (value) => {
           if (!value || value.trim().length === 0) {
             return "Every project deserves a name";
@@ -252439,7 +252492,7 @@ function getLogsCommand() {
 }
 
 // src/cli/commands/project/scaffold.ts
-import { basename as basename7, resolve as resolve12 } from "node:path";
+import { basename as basename8, resolve as resolve12 } from "node:path";
 function resolveAppId(options) {
   const appId = options.appId;
   if (!appId) {
@@ -252456,7 +252509,7 @@ async function scaffoldAction(ctx, name, options, command) {
   const { log, runTask } = ctx;
   const appId = resolveAppId(command.optsWithGlobals());
   const resolvedPath = resolve12("./");
-  const projectName = (name ?? basename7(resolvedPath)).trim();
+  const projectName = (name ?? basename8(resolvedPath)).trim();
   const template = await getTemplateById("backend-only");
   log.info(`Scaffolding project at ${resolvedPath}`);
   const { projectId } = await runTask("Setting up your project...", async () => {
@@ -262381,7 +262434,7 @@ var bundleAppRequestSchema = objectType({
 var ACTIVATION_MODE = "pull";
 
 // ../functions-compiler/src/deno-bundle.ts
-import { mkdtemp, rm, writeFile as writeFile2 } from "node:fs/promises";
+import { mkdtemp, rm as rm2, writeFile as writeFile2 } from "node:fs/promises";
 import { tmpdir as tmpdir2 } from "node:os";
 import path21 from "node:path";
 
@@ -262988,7 +263041,7 @@ async function bundleToModule(prepared, nodeModulesDir = "none") {
       warnings: result.warnings.map((w) => w.text)
     };
   } finally {
-    await rm(dir, { recursive: true, force: true });
+    await rm2(dir, { recursive: true, force: true });
   }
 }
 function buildFailureErrors(e, dir) {
@@ -273353,4 +273406,4 @@ export {
   runCLI
 };
 
-//# debugId=ED51B8A8CDD1B22D64756E2164756E21
+//# debugId=FFC47D2E535D22E664756E2164756E21