@base44-preview/cli 0.1.32-pr.663.60cadbf → 0.1.32-pr.663.63c4a74

package/dist/cli/index.js

@@ -249234,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({
@@ -249264,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";
@@ -249373,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 } : {};
@@ -249449,9 +249364,9 @@ function getOperationContract(spec, op) {
     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,
@@ -249492,12 +249407,85 @@ function getOperationContract(spec, op) {
     } : {}
   };
 }
-
 // 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;
 async function readBody(response) {
@@ -249524,17 +249512,20 @@ 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
-    });
+    throw redactedApiError(apiError, raw, method, path);
   }
 }
+function redactedApiError(apiError, raw, method, path) {
+  const message = raw && apiError.statusCode !== undefined ? `Error calling ${method} ${path.split("?", 1)[0]}: HTTP ${apiError.statusCode}` : apiError.message;
+  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 { join as join22 } from "node:path";
@@ -249648,6 +249639,16 @@ async function readRequestBody(flag, log) {
   }
   return flag;
 }
+function reportedFetchCommand(method, path, options) {
+  return {
+    name: "api fetch",
+    args: [method, path.split("?", 1)[0] ?? ""],
+    options: {
+      ...options,
+      ...options.body === undefined ? {} : { body: "[not reported]" }
+    }
+  };
+}
 
 // src/cli/commands/api/catalog.ts
 async function catalogAction(ctx, area, options) {
@@ -249751,11 +249752,7 @@ async function fetchAction(ctx, methodArg, path, options, command) {
     }
   }
   ctx.errorReporter.setContext({
-    command: {
-      name: "api fetch",
-      args: [method, path.split("?", 1)[0] ?? ""],
-      options: { ...options, body: options.body && "[not reported]" }
-    }
+    command: reportedFetchCommand(method, path, { ...options })
   });
   await ensureAuth(ctx);
   const body = await readRequestBody(options.body, ctx.log);
@@ -273365,4 +273362,4 @@ export {
   runCLI
 };
 
-//# debugId=34B2FE9173AAC44664756E2164756E21
+//# debugId=FFB0D67D7951621A64756E2164756E21