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

package/dist/cli/index.js

@@ -249102,23 +249102,30 @@ var wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var SPACE_OR_PUNCTUATION = /[\n\r\p{Z}\p{P}]+/u;
 
 // src/core/api-spec/search.ts
-var BOOST = { path: 8, summary: 5, description: 2, parameters: 0.5 };
+var BOOST = {
+  method: 1,
+  path: 8,
+  summary: 5,
+  description: 2,
+  parameters: 0.5
+};
 var MIN_RELATIVE_SCORE = 0.2;
 var TOKEN_SEPARATOR = /[\n\r\p{Z}\p{P}\p{S}]+/u;
-var STOPWORDS = new Set("a an and are at be by do does for from how i in is it its me my of on or our that the this to we what who with you your".split(" "));
+var STOPWORDS = new Set("a an and are at be by do does for from how i id in is it its me my of on or our that the this to we what who with you your".split(" "));
 function tokenize(text) {
-  return text.split(TOKEN_SEPARATOR).filter((word) => word && !STOPWORDS.has(word.toLowerCase()));
+  return text.split(TOKEN_SEPARATOR).filter((word) => word.length >= 2 && !STOPWORDS.has(word.toLowerCase()));
 }
 function toOperationSummary(op) {
   return { endpoint: op.endpoint, summary: op.summary };
 }
 function buildSearchIndex(operations) {
   const index = new MiniSearch({
-    fields: ["path", "summary", "description", "parameters"],
+    fields: ["method", "path", "summary", "description", "parameters"],
     tokenize
   });
   index.addAll(operations.map((op, id) => ({
     id,
+    method: op.method,
     path: op.path.replace(/\{[^}]*\}/g, ""),
     summary: op.summary,
     description: op.description,
@@ -249126,27 +249133,37 @@ function buildSearchIndex(operations) {
   })));
   return index;
 }
-function summaryCoverage(query, op) {
-  const terms = tokenize(query.toLowerCase());
-  if (!op || terms.length === 0) {
-    return 0;
-  }
-  const words = tokenize(op.summary.toLowerCase());
-  return terms.filter((term) => words.some((word) => word.startsWith(term))).length / terms.length;
+function summaryMatch(terms, op) {
+  const words = tokenize(op?.summary.toLowerCase() ?? "");
+  const named = (word) => terms.some((term) => word.startsWith(term));
+  return {
+    coverage: terms.filter((term) => words.some((word) => word.startsWith(term))).length / terms.length,
+    precision: words.length ? words.filter(named).length / words.length : 0
+  };
 }
+var readsFirst = (op) => op?.method === "GET" ? 0 : 1;
 function searchOperations(operations, query, options = {}) {
+  const terms = tokenize(query.toLowerCase());
+  if (terms.length === 0) {
+    return [];
+  }
   const index = buildSearchIndex(operations);
   const hits = index.search(query, {
     prefix: (term) => term.length >= 3,
     fuzzy: (term) => term.length >= 4 ? 0.2 : false,
     boost: BOOST,
     filter: options.readOnly ? (hit) => operations[hit.id]?.readOnly === true : undefined
-  }).map((hit) => ({
-    ...hit,
-    score: hit.score * (1 + summaryCoverage(query, operations[hit.id]))
-  })).sort((a, b) => b.score - a.score);
-  const baseline = (hits[0]?.score ?? 0) * MIN_RELATIVE_SCORE;
-  return hits.filter((hit) => hit.score >= baseline).slice(0, options.limit ?? 5).flatMap((hit) => {
+  }).map((hit) => {
+    const match = summaryMatch(terms, operations[hit.id]);
+    return {
+      ...hit,
+      ...match,
+      full: match.coverage === 1,
+      score: hit.score * (1 + match.coverage)
+    };
+  }).sort((a, b) => Number(b.full) - Number(a.full) || (a.full ? b.precision - a.precision || readsFirst(operations[a.id]) - readsFirst(operations[b.id]) : 0) || b.score - a.score);
+  const baseline = Math.max(0, ...hits.map((hit) => hit.score)) * MIN_RELATIVE_SCORE;
+  return hits.filter((hit) => hit.full || hit.score >= baseline).slice(0, options.limit ?? 5).flatMap((hit) => {
     const op = operations[hit.id];
     return op ? [toOperationSummary(op)] : [];
   });
@@ -249177,7 +249194,7 @@ function groupByArea(operations) {
   }
   return new Map([...areas].sort(([a], [b]) => byCodePoint(a, b)));
 }
-function readsFirst(ops) {
+function readsFirst2(ops) {
   const isRead = (op) => op.method === "GET" ? 0 : 1;
   return [...ops].sort((a, b) => isRead(a) - isRead(b));
 }
@@ -249185,7 +249202,7 @@ function catalogIndex(operations) {
   const areas = [...groupByArea(operations)].map(([area, ops]) => ops.length <= INLINE_AREA_MAX ? { area, operations: ops.map(toOperationSummary) } : {
     area,
     operationCount: ops.length,
-    sample: readsFirst(ops).slice(0, AREA_SAMPLE_MAX).map((op) => op.summary)
+    sample: readsFirst2(ops).slice(0, AREA_SAMPLE_MAX).map((op) => op.summary)
   });
   return { areas, total: operations.length };
 }
@@ -249197,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",
@@ -249255,7 +249234,7 @@ var ParameterSchema = looseObject({
   example: unknown().optional()
 });
 var MediaTypesSchema = record(string2(), looseObject({ schema: unknown().optional() }));
-var RequestBodySchema = looseObject({
+var MediaContentSchema = looseObject({
   content: MediaTypesSchema.optional()
 });
 var ResponseObjectSchema = looseObject({
@@ -249285,88 +249264,7 @@ var OpenApiSpecSchema = looseObject({
   security: array(SecurityRequirementSchema).optional()
 });
 
-// src/core/api-spec/operations.ts
-var PERSONAL_ACCESS_TOKEN_SCHEME = "PersonalAccessTokenAuth";
-var READ_ONLY_SCOPE = "read_only";
-function isReadOnly(operation, spec) {
-  const security = operation.security ?? spec.security ?? [];
-  return security.some((requirement) => requirement[PERSONAL_ACCESS_TOKEN_SCHEME]?.includes(READ_ONLY_SCOPE));
-}
-function parameterText(operation) {
-  return (operation.parameters ?? []).flatMap((parameter) => {
-    const parsed = ParameterSchema.safeParse(parameter);
-    return parsed.success ? [parsed.data.name, parsed.data.description ?? ""] : [];
-  }).join(" ");
-}
-function mergeParameters(shared, own) {
-  if (!shared?.length) {
-    return own;
-  }
-  const key = (parameter) => {
-    const parsed = ParameterSchema.safeParse(parameter);
-    return parsed.success ? `${parsed.data.in}:${parsed.data.name}` : undefined;
-  };
-  const ownKeys = new Set((own ?? []).map(key));
-  return [
-    ...shared.filter((parameter) => !ownKeys.has(key(parameter))),
-    ...own ?? []
-  ];
-}
-function listOperations(spec) {
-  return Object.entries(spec.paths).flatMap(([path, item]) => HTTP_METHODS.flatMap((method) => {
-    const declared = item[method];
-    if (!declared) {
-      return [];
-    }
-    const operation = {
-      ...declared,
-      parameters: mergeParameters(item.parameters, declared.parameters)
-    };
-    return [
-      {
-        endpoint: `${method.toUpperCase()} ${path}`,
-        method: method.toUpperCase(),
-        path,
-        summary: operation.summary ?? "",
-        description: operation.description ?? "",
-        parameterText: parameterText(operation),
-        readOnly: isReadOnly(operation, spec),
-        operation
-      }
-    ];
-  }));
-}
-function pathSegments(path) {
-  const pathname = path.split(/[?#]/, 1)[0] ?? "";
-  return pathname.split("/").filter(Boolean);
-}
-function segmentPattern(segment) {
-  const source = segment.split(/(\{[^}]+\})/).map((part) => part.startsWith("{") ? "[^/]+" : part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("");
-  return new RegExp(`^${source}$`);
-}
-function specificity(templateSegments) {
-  return templateSegments.map((segment) => segment.includes("{") ? 0 : 1);
-}
-function compareSpecificity(a, b) {
-  for (let i = 0;i < a.length; i++) {
-    if (a[i] !== b[i]) {
-      return (b[i] ?? 0) - (a[i] ?? 0);
-    }
-  }
-  return 0;
-}
-function matchOperation(operations, method, concretePath) {
-  const upperMethod = method.toUpperCase();
-  const segments = pathSegments(concretePath);
-  const candidates = operations.filter((op) => {
-    if (op.method !== upperMethod) {
-      return false;
-    }
-    const template = pathSegments(op.path);
-    return template.length === segments.length && template.every((part, i) => segmentPattern(part).test(segments[i] ?? ""));
-  });
-  return candidates.sort((a, b) => compareSpecificity(specificity(pathSegments(a.path)), specificity(pathSegments(b.path))))[0];
-}
+// src/core/api-spec/contract.ts
 var SCHEMA_REF_PREFIX = "#/components/schemas/";
 var MAX_REF_DEPTH = 4;
 var FRAMEWORK_VALIDATION_ERROR = "Validation Error";
@@ -249394,12 +249292,8 @@ function inlineRefs(node, schemas, seen = new Set, depth = 0) {
     inlineRefs(value, schemas, seen, depth)
   ]));
 }
-function jsonSchemaOf(value) {
-  const parsed = RequestBodySchema.safeParse(value);
-  return parsed.success ? parsed.data.content?.["application/json"]?.schema : undefined;
-}
-function requestBodyOf(value) {
-  const parsed = RequestBodySchema.safeParse(value);
+function bodyOf(value) {
+  const parsed = MediaContentSchema.safeParse(value);
   const content = parsed.success ? parsed.data.content ?? {} : {};
   const contentType = "application/json" in content ? "application/json" : Object.keys(content)[0];
   return contentType ? { contentType, schema: content[contentType]?.schema } : {};
@@ -249422,22 +249316,63 @@ 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]] : [];
   });
-  const success = responses.filter(([status]) => status.startsWith("2")).sort(([a], [b]) => a.localeCompare(b)).map(([, response]) => jsonSchemaOf(response)).find(Boolean);
+  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 = requestBodyOf(op.operation.requestBody);
+  const requestBody = bodyOf(op.operation.requestBody);
   const contract = {
     endpoint: op.endpoint,
     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) {
@@ -249451,7 +249386,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 } : {}
         }
       ];
@@ -249459,13 +249394,97 @@ 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/operations.ts
+var PERSONAL_ACCESS_TOKEN_SCHEME = "PersonalAccessTokenAuth";
+var READ_ONLY_SCOPE = "read_only";
+function isReadOnly(operation, spec) {
+  const security = operation.security ?? spec.security ?? [];
+  return security.some((requirement) => requirement[PERSONAL_ACCESS_TOKEN_SCHEME]?.includes(READ_ONLY_SCOPE));
+}
+function parameterText(operation) {
+  return (operation.parameters ?? []).flatMap((parameter) => {
+    const parsed = ParameterSchema.safeParse(parameter);
+    return parsed.success ? [parsed.data.name, parsed.data.description ?? ""] : [];
+  }).join(" ");
+}
+function mergeParameters(shared, own) {
+  if (!shared?.length) {
+    return own;
+  }
+  const key = (parameter) => {
+    const parsed = ParameterSchema.safeParse(parameter);
+    return parsed.success ? `${parsed.data.in}:${parsed.data.name}` : undefined;
   };
+  const ownKeys = new Set((own ?? []).map(key));
+  return [
+    ...shared.filter((parameter) => !ownKeys.has(key(parameter))),
+    ...own ?? []
+  ];
+}
+function listOperations(spec) {
+  return Object.entries(spec.paths).flatMap(([path, item]) => HTTP_METHODS.flatMap((method) => {
+    const declared = item[method];
+    if (!declared) {
+      return [];
+    }
+    const operation = {
+      ...declared,
+      parameters: mergeParameters(item.parameters, declared.parameters)
+    };
+    return [
+      {
+        endpoint: `${method.toUpperCase()} ${path}`,
+        method: method.toUpperCase(),
+        path,
+        summary: operation.summary ?? "",
+        description: operation.description ?? "",
+        parameterText: parameterText(operation),
+        readOnly: isReadOnly(operation, spec),
+        operation
+      }
+    ];
+  }));
+}
+function pathSegments(path) {
+  const pathname = path.split(/[?#]/, 1)[0] ?? "";
+  return pathname.split("/").filter(Boolean);
+}
+function segmentPattern(segment) {
+  const source = segment.split(/(\{[^}]+\})/).map((part) => part.startsWith("{") ? "[^/]+" : part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("");
+  return new RegExp(`^${source}$`);
+}
+function literalSegments(path) {
+  return pathSegments(path).map((segment) => segment.includes("{") ? "0" : "1").join("");
+}
+function matchOperation(operations, method, concretePath) {
+  const upperMethod = method.toUpperCase();
+  const segments = pathSegments(concretePath);
+  const candidates = operations.filter((op) => {
+    if (op.method !== upperMethod) {
+      return false;
+    }
+    const template = pathSegments(op.path);
+    return template.length === segments.length && template.every((part, i) => segmentPattern(part).test(segments[i] ?? ""));
+  });
+  return candidates.sort((a, b) => literalSegments(b.path).localeCompare(literalSegments(a.path)))[0];
 }
 // src/core/api-spec/request.ts
 var MAX_ERROR_BODY_CHARS = 4000;
@@ -249493,7 +249512,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,
@@ -249636,7 +249656,7 @@ function getApiCatalogCommand() {
 }
 
 // src/cli/commands/api/fetch.ts
-async function findOperation(ctx, method, path, refresh) {
+async function findOperation(ctx, method, path, { refresh, flag }) {
   const { spec } = await loadSpecTask(ctx, refresh);
   const op = matchOperation(listOperations(spec), method, path);
   if (!op) {
@@ -249644,7 +249664,7 @@ async function findOperation(ctx, method, path, refresh) {
       hints: [
         {
           message: "The cached spec may predate this route; fetch it again",
-          command: "base44 api fetch <METHOD> <path> --help --refresh"
+          command: `base44 api fetch ${method} ${path} ${flag} --refresh`
         },
         {
           message: "Find the operation and its path template",
@@ -249703,11 +249723,17 @@ async function fetchAction(ctx, methodArg, path, options, command) {
   }
   const method = methodArg.toUpperCase();
   if (options.help) {
-    const { spec, op } = await findOperation(ctx, method, path, options.refresh);
+    const { spec, op } = await findOperation(ctx, method, path, {
+      refresh: options.refresh,
+      flag: "--help"
+    });
     return { stdout: formatJson(getOperationContract(spec, op)) };
   }
   if (options.readOnly) {
-    const { op } = await findOperation(ctx, method, path, options.refresh);
+    const { op } = await findOperation(ctx, method, path, {
+      refresh: options.refresh,
+      flag: "--read-only"
+    });
     if (!op.readOnly) {
       throw new InvalidInputError(`Refused under --read-only: ${op.method} ${op.path} is not a read-only operation. Nothing was sent.`);
     }
@@ -249755,11 +249781,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) };
 }
@@ -249767,7 +249791,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
@@ -262327,7 +262351,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
@@ -273329,4 +273353,4 @@ export {
   runCLI
 };
 
-//# debugId=FB96E058A37AEBFF64756E2164756E21
+//# debugId=ED51B8A8CDD1B22D64756E2164756E21