@redocly/cli 2.35.0 → 2.36.0

package/lib/index.js

@@ -30,7 +30,7 @@ import {
   saveBundle,
   sortTopLevelKeys,
   writeToFileByExtension
-} from "./chunks/O5NRRTPS.js";
+} from "./chunks/R5E5LXAJ.js";
 import {
   RedoclyOAuthClient,
   ReuniteApi,
@@ -41,23 +41,23 @@ import {
   getReuniteUrl,
   require_undici,
   shouldBypassProxy
-} from "./chunks/FLGNQ4P2.js";
+} from "./chunks/FMJFZCNQ.js";
 import {
   ANONYMOUS_ID_CACHE_FILE,
   DEFAULT_FETCH_TIMEOUT,
   OTEL_URL
 } from "./chunks/Y6DTFCLS.js";
-import "./chunks/ZH7E3R54.js";
+import "./chunks/SHVJYD75.js";
 import {
   engines,
   name,
   version
-} from "./chunks/YMIVTRT4.js";
+} from "./chunks/K6PX5SU7.js";
 import {
   RESET_ESCAPE_CODE,
   calculateTotals,
   conditionallyMaskSecrets
-} from "./chunks/2ACFK2AA.js";
+} from "./chunks/35B2IXV3.js";
 import "./chunks/VXIQEZPR.js";
 import {
   BaseResolver,
@@ -109,7 +109,7 @@ import {
   white,
   xmlEscape,
   yellow
-} from "./chunks/ZKG4D7JN.js";
+} from "./chunks/UVIPIXTL.js";
 import {
   __commonJS,
   __require,
@@ -299,6 +299,18 @@ var require_semver = __commonJS({
     var { safeRe: re, t } = require_re();
     var parseOptions = require_parse_options();
     var { compareIdentifiers } = require_identifiers();
+    var isPrereleaseIdentifier = (prerelease, identifier) => {
+      const identifiers = identifier.split(".");
+      if (identifiers.length > prerelease.length) {
+        return false;
+      }
+      for (let i = 0; i < identifiers.length; i++) {
+        if (compareIdentifiers(prerelease[i], identifiers[i]) !== 0) {
+          return false;
+        }
+      }
+      return true;
+    };
     var SemVer = class _SemVer {
       constructor(version3, options) {
         options = parseOptions(options);
@@ -545,8 +557,9 @@ var require_semver = __commonJS({
               if (identifierBase === false) {
                 prerelease = [identifier];
               }
-              if (compareIdentifiers(this.prerelease[0], identifier) === 0) {
-                if (isNaN(this.prerelease[1])) {
+              if (isPrereleaseIdentifier(this.prerelease, identifier)) {
+                const prereleaseBase = this.prerelease[identifier.split(".").length];
+                if (isNaN(prereleaseBase)) {
                   this.prerelease = prerelease;
                 }
               } else {
@@ -948,6 +961,47 @@ var require_coerce = __commonJS({
   }
 });
 
+// ../../node_modules/semver/functions/truncate.js
+var require_truncate = __commonJS({
+  "../../node_modules/semver/functions/truncate.js"(exports, module) {
+    "use strict";
+    var parse3 = require_parse();
+    var constants2 = require_constants();
+    var SemVer = require_semver();
+    var truncate = (version3, truncation, options) => {
+      if (!constants2.RELEASE_TYPES.includes(truncation)) {
+        return null;
+      }
+      const clonedVersion = cloneInputVersion(version3, options);
+      return clonedVersion && doTruncation(clonedVersion, truncation);
+    };
+    var cloneInputVersion = (version3, options) => {
+      const versionStringToParse = version3 instanceof SemVer ? version3.version : version3;
+      return parse3(versionStringToParse, options);
+    };
+    var doTruncation = (version3, truncation) => {
+      if (isPrerelease(truncation)) {
+        return version3.version;
+      }
+      version3.prerelease = [];
+      switch (truncation) {
+        case "major":
+          version3.minor = 0;
+          version3.patch = 0;
+          break;
+        case "minor":
+          version3.patch = 0;
+          break;
+      }
+      return version3.format();
+    };
+    var isPrerelease = (type) => {
+      return type.startsWith("pre");
+    };
+    module.exports = truncate;
+  }
+});
+
 // ../../node_modules/semver/internal/lrucache.js
 var require_lrucache = __commonJS({
   "../../node_modules/semver/internal/lrucache.js"(exports, module) {
@@ -1056,6 +1110,7 @@ var require_range = __commonJS({
         return this.range;
       }
       parseRange(range) {
+        range = range.replace(BUILDSTRIPRE, "");
         const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
         const memoKey = memoOpts + ":" + range;
         const cached = cache.get(memoKey);
@@ -1138,12 +1193,14 @@ var require_range = __commonJS({
     var SemVer = require_semver();
     var {
       safeRe: re,
+      src,
       t,
       comparatorTrimReplace,
       tildeTrimReplace,
       caretTrimReplace
     } = require_re();
     var { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require_constants();
+    var BUILDSTRIPRE = new RegExp(src[t.BUILD], "g");
     var isNullSet = (c) => c.value === "<0.0.0-0";
     var isAny = (c) => c.value === "";
     var isSatisfiable = (comparators, options) => {
@@ -1172,20 +1229,22 @@ var require_range = __commonJS({
       return comp;
     };
     var isX = (id) => !id || id.toLowerCase() === "x" || id === "*";
+    var invalidXRangeOrder = (M, m, p) => isX(M) && !isX(m) || isX(m) && p && !isX(p);
     var replaceTildes = (comp, options) => {
       return comp.trim().split(/\s+/).map((c) => replaceTilde(c, options)).join(" ");
     };
     var replaceTilde = (comp, options) => {
       const r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE];
+      const z = options.includePrerelease ? "-0" : "";
       return comp.replace(r, (_, M, m, p, pr) => {
         debug("tilde", comp, _, M, m, p, pr);
         let ret;
         if (isX(M)) {
           ret = "";
         } else if (isX(m)) {
-          ret = `>=${M}.0.0 <${+M + 1}.0.0-0`;
+          ret = `>=${M}.0.0${z} <${+M + 1}.0.0-0`;
         } else if (isX(p)) {
-          ret = `>=${M}.${m}.0 <${M}.${+m + 1}.0-0`;
+          ret = `>=${M}.${m}.0${z} <${M}.${+m + 1}.0-0`;
         } else if (pr) {
           debug("replaceTilde pr", pr);
           ret = `>=${M}.${m}.${p}-${pr} <${M}.${+m + 1}.0-0`;
@@ -1231,9 +1290,9 @@ var require_range = __commonJS({
           debug("no pr");
           if (M === "0") {
             if (m === "0") {
-              ret = `>=${M}.${m}.${p}${z} <${M}.${m}.${+p + 1}-0`;
+              ret = `>=${M}.${m}.${p} <${M}.${m}.${+p + 1}-0`;
             } else {
-              ret = `>=${M}.${m}.${p}${z} <${M}.${+m + 1}.0-0`;
+              ret = `>=${M}.${m}.${p} <${M}.${+m + 1}.0-0`;
             }
           } else {
             ret = `>=${M}.${m}.${p} <${+M + 1}.0.0-0`;
@@ -1252,6 +1311,9 @@ var require_range = __commonJS({
       const r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE];
       return comp.replace(r, (ret, gtlt, M, m, p, pr) => {
         debug("xRange", comp, ret, gtlt, M, m, p, pr);
+        if (invalidXRangeOrder(M, m, p)) {
+          return comp;
+        }
         const xM = isX(M);
         const xm = xM || isX(m);
         const xp = xm || isX(p);
@@ -1899,7 +1961,7 @@ var require_subset = __commonJS({
             if (higher === c && higher !== gt) {
               return false;
             }
-          } else if (gt.operator === ">=" && !satisfies2(gt.semver, String(c), options)) {
+          } else if (gt.operator === ">=" && !c.test(gt.semver)) {
             return false;
           }
         }
@@ -1914,7 +1976,7 @@ var require_subset = __commonJS({
             if (lower === c && lower !== lt) {
               return false;
             }
-          } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
+          } else if (lt.operator === "<=" && !c.test(lt.semver)) {
             return false;
           }
         }
@@ -1982,6 +2044,7 @@ var require_semver2 = __commonJS({
     var lte = require_lte();
     var cmp = require_cmp();
     var coerce = require_coerce();
+    var truncate = require_truncate();
     var Comparator = require_comparator();
     var Range = require_range();
     var satisfies2 = require_satisfies();
@@ -2020,6 +2083,7 @@ var require_semver2 = __commonJS({
       lte,
       cmp,
       coerce,
+      truncate,
       Comparator,
       Range,
       satisfies: satisfies2,
@@ -7639,7 +7703,7 @@ async function handleGenerateArazzo({
     config: config3
   };
   try {
-    const { generate } = await import("./chunks/JL6XAXTH.js");
+    const { generate } = await import("./chunks/4QGHXAYN.js");
     logger.info(gray("\n  Generating Arazzo description... \n"));
     const generatedArazzo = await generate(options);
     writeFileSync2(outputFile, stringifyYaml(generatedArazzo));
@@ -9115,7 +9179,7 @@ async function handleRespect({
   let mtlsCerts;
   let harLogs;
   try {
-    const { run, conditionallyMaskSecrets: conditionallyMaskSecrets2 } = await import("./chunks/JL6XAXTH.js");
+    const { run, conditionallyMaskSecrets: conditionallyMaskSecrets2 } = await import("./chunks/4QGHXAYN.js");
     const workingDir = config3.configPath ? dirname4(config3.configPath) : process.cwd();
     if (argv.mtls) {
       mtlsCerts = resolveMtlsCertificates(argv.mtls, workingDir);
@@ -12635,7 +12699,7 @@ async function sendTelemetry({
       $0: _,
       ...args
     } = argv;
-    const { RedoclyOAuthClient: RedoclyOAuthClient2 } = await import("./chunks/JT6WVBVX.js");
+    const { RedoclyOAuthClient: RedoclyOAuthClient2 } = await import("./chunks/SBGJND3Q.js");
     const oauthClient = new RedoclyOAuthClient2();
     const reuniteUrl = getReuniteUrl(config3, args.residency);
     const logged_in = await oauthClient.isAuthorized(reuniteUrl);
@@ -12683,7 +12747,7 @@ async function sendTelemetry({
       category: "product",
       data: eventData
     });
-    const { otelTelemetry } = await import("./chunks/HYYETV7F.js");
+    const { otelTelemetry } = await import("./chunks/7PWB3SB5.js");
     otelTelemetry.send(cloudEvent);
   } catch (err) {
   }
@@ -13513,7 +13577,7 @@ yargs_default(hideBin(process.argv)).version("version", "Show version number.",
     return true;
   }),
   async (argv) => {
-    const { handlerBuildCommand } = await import("./chunks/TGF4B4QI.js");
+    const { handlerBuildCommand } = await import("./chunks/XTSKVMID.js");
     commandWrapper(handlerBuildCommand)(argv);
   }
 ).command(

package/package.json

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