@base44-preview/cli 0.1.32-pr.663.ac8cbb8 → 0.1.32-pr.663.d2e3c0d

package/dist/cli/index.js

@@ -249214,44 +249214,6 @@ function areaListing(area, operations, max = AREA_OPERATIONS_MAX) {
     truncated: operations.length > max
   };
 }
-// src/core/api-spec/grep.ts
-var CONTEXT_CHARS = 40;
-var MAX_SNIPPETS = 3;
-var MAX_SNIPPET_CHARS = 200;
-function unescapeJson(snippet) {
-  return snippet.replace(/\\[nrt]/g, " ").replace(/\\"/g, '"');
-}
-function snippets(text, pattern) {
-  const found = [];
-  for (const match of text.matchAll(pattern)) {
-    const start = Math.max(0, match.index - CONTEXT_CHARS);
-    const end = match.index + match[0].length + CONTEXT_CHARS;
-    found.push(unescapeJson(text.slice(start, Math.min(end, start + MAX_SNIPPET_CHARS))));
-    if (found.length === MAX_SNIPPETS || match[0].length === 0) {
-      break;
-    }
-  }
-  return found;
-}
-function grepSpec(spec, operations, pattern, options = {}) {
-  const regex = new RegExp(pattern, options.ignoreCase ? "gi" : "g");
-  const hits = [];
-  for (const op of operations) {
-    const { summary, description, parameters, requestBody, responses } = op.operation;
-    const matches = snippets(`${op.endpoint} ${JSON.stringify({ summary, description, parameters, requestBody, responses })}`, regex);
-    if (matches.length > 0) {
-      hits.push({ ...toOperationSummary(op), matches });
-    }
-  }
-  const schemas = options.schemas === false ? {} : spec.components?.schemas;
-  for (const [schema, definition] of Object.entries(schemas ?? {})) {
-    const matches = snippets(JSON.stringify(definition), regex);
-    if (matches.length > 0) {
-      hits.push({ schema, matches });
-    }
-  }
-  return hits.slice(0, options.limit ?? 20);
-}
 // src/core/api-spec/schema.ts
 var HTTP_METHODS = [
   "get",
@@ -249439,9 +249401,50 @@ function leftoverRefs(node, schemas, found = new Map) {
   }
   return found;
 }
+var SCHEMA_DATA_KEYS = new Set([
+  "example",
+  "examples",
+  "default",
+  "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));
+  }
+  if (node === null || typeof node !== "object") {
+    return node;
+  }
+  const entries = Object.entries(node);
+  if (isPropertyMap) {
+    return Object.fromEntries(entries.map(([name, value]) => [name, slimSchema(value)]));
+  }
+  const slim = {};
+  for (const [key, value] of entries) {
+    if (key === "title" && typeof value === "string") {
+      continue;
+    }
+    slim[key] = SCHEMA_DATA_KEYS.has(key) ? value : key === "properties" ? slimSchema(value, true) : key === "description" && typeof value === "string" ? cleanText(value) : slimSchema(value);
+  }
+  const { anyOf, ...rest } = slim;
+  const nullable = Array.isArray(anyOf) && anyOf.length === 2 ? nullableType(anyOf) : undefined;
+  return nullable ? { type: [nullable, "null"], ...rest } : slim;
+}
+function nullableType(variants) {
+  const types = variants.map((variant) => variant !== null && typeof variant === "object" && Object.keys(variant).length === 1 && typeof variant.type === "string" ? variant.type : undefined);
+  if (types.includes(undefined) || !types.includes("null")) {
+    return;
+  }
+  return types.find((type) => type !== "null");
+}
 function getOperationContract(spec, op) {
   const schemas = spec.components?.schemas ?? {};
-  const inline = (node) => node === undefined ? null : inlineRefs(node, schemas);
+  const inline = (node) => node === undefined ? null : slimSchema(inlineRefs(node, schemas));
   const responses = Object.entries(op.operation.responses ?? {}).flatMap(([status, response]) => {
     const parsed = ResponseObjectSchema.safeParse(response);
     return parsed.success ? [[status, parsed.data]] : [];
@@ -249454,7 +249457,7 @@ function getOperationContract(spec, op) {
     method: op.method,
     path: op.path,
     summary: op.summary,
-    description: op.description,
+    description: cleanText(op.description),
     parameters: (op.operation.parameters ?? []).flatMap((parameter) => {
       const parsed = ParameterSchema.safeParse(parameter);
       if (!parsed.success) {
@@ -249468,7 +249471,7 @@ function getOperationContract(spec, op) {
           in: location2,
           required: required ?? false,
           schema: inline(schema ?? {}),
-          ...description && !inSchema ? { description } : {},
+          ...description && !inSchema ? { description: cleanText(description) } : {},
           ..."example" in parsed.data ? { example: parsed.data.example } : {}
         }
       ];
@@ -249476,14 +249479,25 @@ 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, response.description ?? ""]))
+    errors: Object.fromEntries(errors.map(([status, response]) => [
+      status,
+      cleanText(response.description ?? "")
+    ]))
   };
   const refs = leftoverRefs(contract, schemas);
   return {
     ...contract,
-    ...refs.size > 0 ? { refs: Object.fromEntries(refs) } : {}
+    ...refs.size > 0 ? {
+      refs: Object.fromEntries([...refs].map(([ref, schema]) => [ref, slimSchema(schema)]))
+    } : {}
   };
 }
+
+// src/core/api-spec/grep.ts
+function grepOperations(spec, operations, pattern, options = {}) {
+  const regex = new RegExp(pattern, options.ignoreCase ? "i" : "");
+  return operations.filter((op) => regex.test(JSON.stringify(getOperationContract(spec, op)))).slice(0, options.limit ?? 20).map(toOperationSummary);
+}
 // src/core/api-spec/request.ts
 var MAX_ERROR_BODY_CHARS = 4000;
 async function readBody(response) {
@@ -249510,7 +249524,8 @@ 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;
-    throw new ApiError(apiError.message, {
+    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,
@@ -249778,11 +249793,9 @@ async function grepAction(ctx, pattern, options) {
   if (options.readOnly) {
     operations = operations.filter((op) => op.readOnly);
   }
-  const narrowed = options.area !== undefined || options.readOnly === true;
-  const hits = grepSpec(spec, operations, pattern, {
+  const hits = grepOperations(spec, operations, pattern, {
     ignoreCase: options.ignoreCase,
-    limit,
-    schemas: !narrowed
+    limit
   });
   return { stdout: formatJson(hits) };
 }
@@ -249790,7 +249803,7 @@ function getApiGrepCommand() {
   return new Base44Command("grep", {
     requireAuth: false,
     requireAppContext: false
-  }).description("Search the API spec with a regular expression, for when search misses").argument("<pattern>", 'Regular expression, e.g. "runs.*status"').option("--area <area>", "Search only one area's operations (see base44 api catalog)").option("-i, --ignore-case", "Case-insensitive match").option("--limit <n>", "Most operations or schemas to return (default 20)").option("--read-only", READ_ONLY_FILTER_HELP).option("--refresh", REFRESH_OPTION_HELP).action(grepAction);
+  }).description("Search the API spec with a regular expression, for when search misses").argument("<pattern>", 'Regular expression, e.g. "runs.*status"').option("--area <area>", "Search only one area's operations (see base44 api catalog)").option("-i, --ignore-case", "Case-insensitive match").option("--limit <n>", "Most operations to return (default 20)").option("--read-only", READ_ONLY_FILTER_HELP).option("--refresh", REFRESH_OPTION_HELP).action(grepAction);
 }
 
 // src/cli/commands/api/search.ts
@@ -262350,7 +262363,7 @@ var nativeEnumType = ZodNativeEnum.create;
 var promiseType = ZodPromise.create;
 var effectsType = ZodEffects.create;
 var optionalType = ZodOptional2.create;
-var nullableType = ZodNullable2.create;
+var nullableType2 = ZodNullable2.create;
 var preprocessType = ZodEffects.createWithPreprocess;
 var pipelineType = ZodPipeline.create;
 // ../functions-compiler/src/contracts.ts
@@ -273352,4 +273365,4 @@ export {
   runCLI
 };
 
-//# debugId=47D4434C61AEF7C764756E2164756E21
+//# debugId=34B2FE9173AAC44664756E2164756E21