@redocly/cli 2.41.0 → 2.41.2

package/lib/index.js

@@ -28,16 +28,16 @@ import {
   saveBundle,
   sortTopLevelKeys,
   writeToFileByExtension
-} from "./chunks/XDNYWH7V.js";
+} from "./chunks/3UUTQVCJ.js";
 import {
   OPENAPI3_COMPONENT_NAMES,
   OPENAPI3_METHOD_NAMES,
   Spinner
-} from "./chunks/LCWGF7G6.js";
+} from "./chunks/KPMZLKQG.js";
 import {
   AbortFlowError,
   exitWithError
-} from "./chunks/DT4UM7U4.js";
+} from "./chunks/T6UZU3XM.js";
 import {
   RedoclyOAuthClient,
   ReuniteApi,
@@ -47,7 +47,7 @@ import {
   getProxyUrl,
   getReuniteUrl,
   shouldBypassProxy
-} from "./chunks/Q3KTKRJH.js";
+} from "./chunks/ASYQPOQY.js";
 import {
   ANONYMOUS_ID_CACHE_FILE,
   DEFAULT_FETCH_TIMEOUT,
@@ -58,7 +58,7 @@ import {
   engines,
   name,
   version
-} from "./chunks/Z5H4OEIW.js";
+} from "./chunks/GFU5KGSW.js";
 import {
   require_undici
 } from "./chunks/XB6C62FW.js";
@@ -66,7 +66,7 @@ import {
   RESET_ESCAPE_CODE,
   calculateTotals,
   conditionallyMaskSecrets
-} from "./chunks/6ABF7ZRJ.js";
+} from "./chunks/KRMBH6JF.js";
 import "./chunks/VXIQEZPR.js";
 import "./chunks/UUU33DK3.js";
 import {
@@ -94,6 +94,7 @@ import {
   green,
   isAbsoluteUrl,
   isEmptyObject,
+  isGraphqlRef,
   isMappingRef,
   isNotEmptyObject,
   isPlainObject,
@@ -119,7 +120,7 @@ import {
   white,
   xmlEscape,
   yellow
-} from "./chunks/YK6T7IHG.js";
+} from "./chunks/Z2664VV5.js";
 import "./chunks/Z2I5YXYN.js";
 import {
   __commonJS,
@@ -7714,7 +7715,7 @@ async function handleGenerateArazzo({
     config: config3
   };
   try {
-    const { generate } = await import("./chunks/VMHXZFTB.js");
+    const { generate } = await import("./chunks/A3VFVVHD.js");
     logger.info(gray("\n  Generating Arazzo description... \n"));
     const generatedArazzo = await generate(options);
     writeFileSync2(outputFile, stringifyYaml(generatedArazzo));
@@ -8396,7 +8397,7 @@ Please choose only one!`
   for (const document of documents) {
     try {
       const version3 = detectSpec(document.parsed);
-      collectSpecData?.(document.parsed);
+      collectSpecData?.(document);
       if (version3 !== "oas3_0" && version3 !== "oas3_1" && version3 !== "oas3_2") {
         return exitWithError(
           `Only OpenAPI 3.0, 3.1, and 3.2 are supported: ${blue(document.source.absoluteRef)}.`
@@ -9071,14 +9072,14 @@ function mapJsonStep(step, workflowId, ctx) {
     stepId: step.stepId,
     workflowId,
     request: {
-      method: publicStep.request?.method || "",
+      method: publicStep?.request?.method || "",
       url: step.response?.requestUrl || "",
-      headers: publicStep.request?.header || {},
-      body: publicStep.request?.body
+      headers: publicStep?.request?.header || {},
+      body: publicStep?.request?.body
     },
     response: {
       statusCode: step.response?.statusCode || 0,
-      body: publicStep.response?.body,
+      body: publicStep?.response?.body,
       headers: step.response?.header || {},
       time: step.response?.time || 0,
       size: step.response?.responseSize
@@ -9087,7 +9088,7 @@ function mapJsonStep(step, workflowId, ctx) {
       ...check,
       status: calculateCheckStatus(check)
     })),
-    totalTimeMs: publicStep.response?.time || 0,
+    totalTimeMs: publicStep?.response?.time || 0,
     retriesLeft: step.retriesLeft,
     status: calculateStepStatus(step.checks)
   };
@@ -9166,7 +9167,7 @@ async function handleRespect({
   let mtlsCerts;
   let harLogs;
   try {
-    const { run, conditionallyMaskSecrets: conditionallyMaskSecrets2 } = await import("./chunks/VMHXZFTB.js");
+    const { run, conditionallyMaskSecrets: conditionallyMaskSecrets2 } = await import("./chunks/A3VFVVHD.js");
     const workingDir = config3.configPath ? dirname4(config3.configPath) : process.cwd();
     if (argv.mtls) {
       mtlsCerts = resolveMtlsCertificates(argv.mtls, workingDir);
@@ -10382,7 +10383,7 @@ async function handleScore({ argv, config: config3, collectSpecData }) {
   const [{ path: path28 }] = await getFallbackApisOrExit(argv.api ? [argv.api] : [], config3);
   const externalRefResolver = new BaseResolver(config3.resolve);
   const { bundle: document } = await bundle({ config: config3, ref: path28 });
-  collectSpecData?.(document.parsed);
+  collectSpecData?.(document);
   const specVersion = detectSpec(document.parsed);
   if (getMajorSpecVersion(specVersion) !== "oas3") {
     return exitWithError(
@@ -11212,7 +11213,7 @@ async function handleScorecardClassic({
   }
   const externalRefResolver = new BaseResolver(config3.resolve);
   const document = await externalRefResolver.resolveDocument(null, path28, true);
-  collectSpecData?.(document.parsed);
+  collectSpecData?.(document);
   const documentInfo = document.parsed?.info;
   const builtInMetadata = documentInfo?.["x-metadata"] || {};
   const metadata = {
@@ -11851,7 +11852,7 @@ async function handleSplit({ argv, collectSpecData }) {
   const ext = getAndValidateFileExtension(api);
   if (!fs13.existsSync(api)) exitWithError(`File ${blue(api)} does not exist.`);
   const definition = readYaml(api);
-  collectSpecData?.(definition);
+  collectSpecData?.({ parsed: definition });
   const specVersion = detectSpec(definition);
   switch (specVersion) {
     case "async2":
@@ -11991,7 +11992,7 @@ async function handleStats({ argv, config: config3, collectSpecData }) {
   const [{ path: path28 }] = await getFallbackApisOrExit(argv.api ? [argv.api] : [], config3);
   const externalRefResolver = new BaseResolver(config3.resolve);
   const { bundle: document } = await bundle({ config: config3, ref: path28 });
-  collectSpecData?.(document.parsed);
+  collectSpecData?.(document);
   const specVersion = detectSpec(document.parsed);
   const types = normalizeTypes(config3.extendTypes(getTypes(specVersion), specVersion), config3);
   const { statsVisitor, statsAccumulator } = resolveStatsVisitorAndAccumulator(specVersion);
@@ -12642,7 +12643,7 @@ async function sendTelemetry({
       $0: _,
       ...args
     } = argv;
-    const { RedoclyOAuthClient: RedoclyOAuthClient2 } = await import("./chunks/SZLWDHZK.js");
+    const { RedoclyOAuthClient: RedoclyOAuthClient2 } = await import("./chunks/7IX44JLO.js");
     const oauthClient = new RedoclyOAuthClient2();
     const reuniteUrl = getReuniteUrl(config3, args.residency);
     const logged_in = await oauthClient.isAuthorized(reuniteUrl);
@@ -12681,6 +12682,8 @@ async function sendTelemetry({
       type: "com.redocly.command.ran",
       source: "urn:redocly:cli",
       origin: "redocly-cli",
+      env: "production",
+      // should become "production" ab build time
       osPlatform: os.platform(),
       actor: {
         id: anonymous_id,
@@ -12690,7 +12693,7 @@ async function sendTelemetry({
       category: "product",
       data: eventData
     });
-    const { otelTelemetry } = await import("./chunks/5YSNZVUA.js");
+    const { otelTelemetry } = await import("./chunks/BVP23YP7.js");
     otelTelemetry.send(cloudEvent);
   } catch (err) {
   }
@@ -12905,24 +12908,28 @@ function commandWrapper(commandHandler) {
     const respectXSecurityAuthTypes = /* @__PURE__ */ new Set();
     const respectSourceDescriptionTypes = /* @__PURE__ */ new Set();
     const respectCriterionObjectTypes = /* @__PURE__ */ new Set();
-    const collectSpecData = (document) => {
+    const collectSpecData = ({ parsed: document, source }) => {
+      specVersion = "unknown";
+      specKeyword = void 0;
+      specFullVersion = void 0;
+      if (source?.absoluteRef && isGraphqlRef(source.absoluteRef)) {
+        specVersion = "graphql";
+        return;
+      }
       try {
         specVersion = detectSpec(document);
       } catch (err) {
-        specVersion = `unsupported`;
+        specVersion = "unsupported";
       }
       if (!isPlainObject(document)) return;
       specKeyword = document?.openapi ? "openapi" : document?.swagger ? "swagger" : document?.asyncapi ? "asyncapi" : document?.arazzo ? "arazzo" : document?.overlay ? "overlay" : void 0;
       if (specKeyword) {
         specFullVersion = document[specKeyword];
-      } else {
-        specFullVersion = void 0;
       }
       if (getMajorSpecVersion(specVersion) === "arazzo1") {
-        const arazzoDocument = document;
-        collectXSecurityAuthTypes(arazzoDocument, respectXSecurityAuthTypes);
-        collectSourceDescriptionTypes(arazzoDocument, respectSourceDescriptionTypes);
-        collectCriterionObjectTypes(arazzoDocument, respectCriterionObjectTypes);
+        collectXSecurityAuthTypes(document, respectXSecurityAuthTypes);
+        collectSourceDescriptionTypes(document, respectSourceDescriptionTypes);
+        collectCriterionObjectTypes(document, respectCriterionObjectTypes);
       }
     };
     try {
@@ -13520,7 +13527,7 @@ yargs_default(hideBin(process.argv)).version("version", "Show version number.",
     return true;
   }),
   async (argv) => {
-    const { handlerBuildCommand } = await import("./chunks/7H6CC6CT.js");
+    const { handlerBuildCommand } = await import("./chunks/7MOL2QVN.js");
     commandWrapper(handlerBuildCommand)(argv);
   }
 ).command(
@@ -13741,7 +13748,7 @@ yargs_default(hideBin(process.argv)).version("version", "Show version number.",
     config: { describe: "Path to the config file.", type: "string" }
   }),
   async (argv) => {
-    const { handleGenerateSpec } = await import("./chunks/PFPGSTSG.js");
+    const { handleGenerateSpec } = await import("./chunks/7F5O43EU.js");
     commandWrapper(handleGenerateSpec)(argv);
   }
 ).command(
@@ -13856,7 +13863,7 @@ yargs_default(hideBin(process.argv)).version("version", "Show version number.",
     }
   }),
   async (argv) => {
-    const { handleDrift } = await import("./chunks/HQDT5XFP.js");
+    const { handleDrift } = await import("./chunks/NW3XJZXQ.js");
     commandWrapper(handleDrift)(argv);
   }
 ).command(
@@ -13924,7 +13931,7 @@ yargs_default(hideBin(process.argv)).version("version", "Show version number.",
     }
   }),
   async (argv) => {
-    const { handleProxy } = await import("./chunks/GOFLD5MJ.js");
+    const { handleProxy } = await import("./chunks/NLIKC7UP.js");
     commandWrapper(handleProxy)(argv);
   }
 ).completion("completion", "Generate autocomplete script for `redocly` command.").demandCommand(1).middleware([notifyUpdateCliVersion]).strict().argv;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/cli",
-  "version": "2.41.0",
+  "version": "2.41.2",
   "description": "",
   "license": "MIT",
   "type": "module",