@base44-preview/cli 0.1.32-pr.663.63c4a74 → 0.1.32-pr.663.8c37aaa

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);
@@ -249264,10 +249264,16 @@ var OpenApiSpecSchema = looseObject({
   security: array(SecurityRequirementSchema).optional()
 });
 
+// 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 +249313,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 +249331,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 +249368,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 +249395,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 +249420,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) {
@@ -249455,7 +249453,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 +249486,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();
@@ -249502,7 +249501,8 @@ async function sendApiRequest(method, path, body) {
       method,
       body,
       headers: body === undefined ? {} : { "Content-Type": "application/json" },
-      timeout: false
+      timeout: false,
+      retry: { methods: ["get", "head"] }
     });
     return {
       status: response.status,
@@ -249516,7 +249516,8 @@ async function sendApiRequest(method, path, body) {
   }
 }
 function redactedApiError(apiError, raw, method, path) {
-  const message = raw && apiError.statusCode !== undefined ? `Error calling ${method} ${path.split("?", 1)[0]}: HTTP ${apiError.statusCode}` : apiError.message;
+  const reason = apiError.statusCode !== undefined ? `HTTP ${apiError.statusCode}` : (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],
@@ -249527,7 +249528,7 @@ function redactedApiError(apiError, raw, method, path) {
   });
 }
 // 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()) {
@@ -249582,8 +249583,14 @@ 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
@@ -249639,10 +249646,13 @@ async function readRequestBody(flag, log) {
   }
   return flag;
 }
+function withoutQuery(path) {
+  return path.split("?", 1)[0] ?? "";
+}
 function reportedFetchCommand(method, path, options) {
   return {
     name: "api fetch",
-    args: [method, path.split("?", 1)[0] ?? ""],
+    args: [method, withoutQuery(path)],
     options: {
       ...options,
       ...options.body === undefined ? {} : { body: "[not reported]" }
@@ -249673,7 +249683,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",
@@ -249688,6 +249698,8 @@ async function findOperation(ctx, method, path, { refresh, flag }) {
   }
   return { spec, op };
 }
+var CONTRACT_HELP = `
+The contract is JSON; cut it down with e.g. | jq '.parameters, .requestBodySchema'`;
 var TEXT_CONTENT_TYPES = [
   "json",
   "text/",
@@ -249727,9 +249739,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.");
@@ -249751,9 +249767,6 @@ 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: reportedFetchCommand(method, path, { ...options })
-  });
   await ensureAuth(ctx);
   const body = await readRequestBody(options.body, ctx.log);
   const response = await ctx.runTask(`Calling ${method} ${path}`, () => sendApiRequest(method, path, body), {
@@ -249768,7 +249781,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("--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
@@ -262390,7 +262403,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";
 
@@ -262997,7 +263010,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) {
@@ -273362,4 +273375,4 @@ export {
   runCLI
 };
 
-//# debugId=FFB0D67D7951621A64756E2164756E21
+//# debugId=A6B266663FAD34EF64756E2164756E21