@redocly/cli 2.34.0 → 2.35.1

package/lib/chunks/{2ULY6UWW.js → XEVW3SW6.js}

@@ -10,7 +10,7 @@ import {
 } from "./Y6DTFCLS.js";
 import {
   version
-} from "./FP2VGYMF.js";
+} from "./FLHMB3O6.js";
 import {
   diag,
   esm_exports,

package/lib/chunks/{ZIYSHX6D.js → YQONFFT5.js}

@@ -23,7 +23,7 @@ import {
   red,
   stringifyYaml,
   yellow
-} from "./OEYVENNB.js";
+} from "./RA3UJ5AH.js";
 
 // src/utils/error.ts
 var AbortFlowError = class extends Error {

package/lib/chunks/{7GOGGHM5.js → Z5JKGONR.js}

@@ -4,13 +4,13 @@ import {
   exitWithError,
   getExecutionTime,
   getFallbackApisOrExit
-} from "./ZIYSHX6D.js";
+} from "./YQONFFT5.js";
 import {
   require_dist
-} from "./EIHBO33S.js";
+} from "./HQSFIOKV.js";
 import {
   redocVersion
-} from "./FP2VGYMF.js";
+} from "./FLHMB3O6.js";
 import {
   require_json_pointer,
   require_openapi_sampler
@@ -21,7 +21,7 @@ import {
   require_fast_deep_equal,
   require_json_schema_traverse,
   require_pluralize
-} from "./OEYVENNB.js";
+} from "./RA3UJ5AH.js";
 import {
   __commonJS,
   __esm,
@@ -2957,6 +2957,8 @@ var require_Alias = __commonJS({
        * instance of the `source` anchor before this node.
        */
       resolve(doc, ctx) {
+        if (ctx?.maxAliasCount === 0)
+          throw new ReferenceError("Alias resolution is disabled");
         let nodes;
         if (ctx?.aliasResolveCache) {
           nodes = ctx.aliasResolveCache;
@@ -4029,18 +4031,18 @@ var require_merge = __commonJS({
     };
     var isMergeKey = (ctx, key2) => (merge.identify(key2) || identity.isScalar(key2) && (!key2.type || key2.type === Scalar.Scalar.PLAIN) && merge.identify(key2.value)) && ctx?.doc.schema.tags.some((tag) => tag.tag === merge.tag && tag.default);
     function addMergeToJSMap(ctx, map, value) {
-      value = ctx && identity.isAlias(value) ? value.resolve(ctx.doc) : value;
-      if (identity.isSeq(value))
-        for (const it of value.items)
+      const source = resolveAliasValue(ctx, value);
+      if (identity.isSeq(source))
+        for (const it of source.items)
           mergeValue(ctx, map, it);
-      else if (Array.isArray(value))
-        for (const it of value)
+      else if (Array.isArray(source))
+        for (const it of source)
           mergeValue(ctx, map, it);
       else
-        mergeValue(ctx, map, value);
+        mergeValue(ctx, map, source);
     }
     function mergeValue(ctx, map, value) {
-      const source = ctx && identity.isAlias(value) ? value.resolve(ctx.doc) : value;
+      const source = resolveAliasValue(ctx, value);
       if (!identity.isMap(source))
         throw new Error("Merge sources must be maps or map aliases");
       const srcMap = source.toJSON(null, ctx, Map);
@@ -4061,6 +4063,9 @@ var require_merge = __commonJS({
       }
       return map;
     }
+    function resolveAliasValue(ctx, value) {
+      return ctx && identity.isAlias(value) ? value.resolve(ctx.doc, ctx) : value;
+    }
     exports.addMergeToJSMap = addMergeToJSMap;
     exports.isMergeKey = isMergeKey;
     exports.merge = merge;
@@ -4698,7 +4703,7 @@ var require_stringifyNumber = __commonJS({
       if (!isFinite(num))
         return isNaN(num) ? ".nan" : num < 0 ? "-.inf" : ".inf";
       let n = Object.is(value, -0) ? "-0" : JSON.stringify(value);
-      if (!format && minFractionDigits && (!tag || tag === "tag:yaml.org,2002:float") && /^\d/.test(n)) {
+      if (!format && minFractionDigits && (!tag || tag === "tag:yaml.org,2002:float") && /^-?\d/.test(n) && !n.includes("e")) {
         let i = n.indexOf(".");
         if (i < 0) {
           i = n.length;
@@ -7070,7 +7075,7 @@ var require_resolve_flow_scalar = __commonJS({
             while (next === " " || next === "	")
               next = source[++i + 1];
           } else if (next === "x" || next === "u" || next === "U") {
-            const length = { x: 2, u: 4, U: 8 }[next];
+            const length = next === "x" ? 2 : next === "u" ? 4 : 8;
             res += parseCharCode(source, i + 1, length, onError);
             i += length;
           } else {
@@ -7145,12 +7150,13 @@ var require_resolve_flow_scalar = __commonJS({
       const cc = source.substr(offset, length);
       const ok = cc.length === length && /^[0-9a-fA-F]+$/.test(cc);
       const code = ok ? parseInt(cc, 16) : NaN;
-      if (isNaN(code)) {
+      try {
+        return String.fromCodePoint(code);
+      } catch {
         const raw = source.substr(offset - 2, length + 2);
         onError(offset - 2, "BAD_DQ_ESCAPE", `Invalid escape sequence ${raw}`);
         return raw;
       }
-      return String.fromCodePoint(code);
     }
     exports.resolveFlowScalar = resolveFlowScalar;
   }
@@ -7500,8 +7506,10 @@ ${cb}` : comment;
           }
         }
         if (afterDoc) {
-          Array.prototype.push.apply(doc.errors, this.errors);
-          Array.prototype.push.apply(doc.warnings, this.warnings);
+          for (let i = 0; i < this.errors.length; ++i)
+            doc.errors.push(this.errors[i]);
+          for (let i = 0; i < this.warnings.length; ++i)
+            doc.warnings.push(this.warnings[i]);
         } else {
           doc.errors = this.errors;
           doc.warnings = this.warnings;
@@ -8234,7 +8242,7 @@ var require_lexer = __commonJS({
           const n = (yield* this.pushCount(1)) + (yield* this.pushSpaces(true));
           this.indentNext = this.indentValue + 1;
           this.indentValue += n;
-          return yield* this.parseBlockStart();
+          return "block-start";
         }
         return "doc";
       }
@@ -8533,28 +8541,38 @@ var require_lexer = __commonJS({
         return 0;
       }
       *pushIndicators() {
-        switch (this.charAt(0)) {
-          case "!":
-            return (yield* this.pushTag()) + (yield* this.pushSpaces(true)) + (yield* this.pushIndicators());
-          case "&":
-            return (yield* this.pushUntil(isNotAnchorChar)) + (yield* this.pushSpaces(true)) + (yield* this.pushIndicators());
-          case "-":
-          // this is an error
-          case "?":
-          // this is an error outside flow collections
-          case ":": {
-            const inFlow = this.flowLevel > 0;
-            const ch1 = this.charAt(1);
-            if (isEmpty(ch1) || inFlow && flowIndicatorChars.has(ch1)) {
-              if (!inFlow)
-                this.indentNext = this.indentValue + 1;
-              else if (this.flowKey)
-                this.flowKey = false;
-              return (yield* this.pushCount(1)) + (yield* this.pushSpaces(true)) + (yield* this.pushIndicators());
+        let n = 0;
+        loop: while (true) {
+          switch (this.charAt(0)) {
+            case "!":
+              n += yield* this.pushTag();
+              n += yield* this.pushSpaces(true);
+              continue loop;
+            case "&":
+              n += yield* this.pushUntil(isNotAnchorChar);
+              n += yield* this.pushSpaces(true);
+              continue loop;
+            case "-":
+            // this is an error
+            case "?":
+            // this is an error outside flow collections
+            case ":": {
+              const inFlow = this.flowLevel > 0;
+              const ch1 = this.charAt(1);
+              if (isEmpty(ch1) || inFlow && flowIndicatorChars.has(ch1)) {
+                if (!inFlow)
+                  this.indentNext = this.indentValue + 1;
+                else if (this.flowKey)
+                  this.flowKey = false;
+                n += yield* this.pushCount(1);
+                n += yield* this.pushSpaces(true);
+                continue loop;
+              }
             }
           }
+          break loop;
         }
-        return 0;
+        return n;
       }
       *pushTag() {
         if (this.charAt(1) === "<") {
@@ -8713,6 +8731,13 @@ var require_parser = __commonJS({
       }
       return prev.splice(i, prev.length);
     }
+    function arrayPushArray(target, source) {
+      if (source.length < 1e5)
+        Array.prototype.push.apply(target, source);
+      else
+        for (let i = 0; i < source.length; ++i)
+          target.push(source[i]);
+    }
     function fixFlowSeqItems(fc) {
       if (fc.start.type === "flow-seq-start") {
         for (const it of fc.items) {
@@ -8722,11 +8747,11 @@ var require_parser = __commonJS({
             delete it.key;
             if (isFlowToken(it.value)) {
               if (it.value.end)
-                Array.prototype.push.apply(it.value.end, it.sep);
+                arrayPushArray(it.value.end, it.sep);
               else
                 it.value.end = it.sep;
             } else
-              Array.prototype.push.apply(it.start, it.sep);
+              arrayPushArray(it.start, it.sep);
             delete it.sep;
           }
         }
@@ -9081,7 +9106,7 @@ var require_parser = __commonJS({
                 const prev = map.items[map.items.length - 2];
                 const end = prev?.value?.end;
                 if (Array.isArray(end)) {
-                  Array.prototype.push.apply(end, it.start);
+                  arrayPushArray(end, it.start);
                   end.push(this.sourceToken);
                   map.items.pop();
                   return;
@@ -9269,7 +9294,7 @@ var require_parser = __commonJS({
                 const prev = seq.items[seq.items.length - 2];
                 const end = prev?.value?.end;
                 if (Array.isArray(end)) {
-                  Array.prototype.push.apply(end, it.start);
+                  arrayPushArray(end, it.start);
                   end.push(this.sourceToken);
                   seq.items.pop();
                   return;

package/lib/index.js

@@ -30,7 +30,7 @@ import {
   saveBundle,
   sortTopLevelKeys,
   writeToFileByExtension
-} from "./chunks/ZIYSHX6D.js";
+} from "./chunks/YQONFFT5.js";
 import {
   RedoclyOAuthClient,
   ReuniteApi,
@@ -41,23 +41,23 @@ import {
   getReuniteUrl,
   require_undici,
   shouldBypassProxy
-} from "./chunks/FDUPOI4C.js";
+} from "./chunks/G7TNNDDM.js";
 import {
   ANONYMOUS_ID_CACHE_FILE,
   DEFAULT_FETCH_TIMEOUT,
   OTEL_URL
 } from "./chunks/Y6DTFCLS.js";
-import "./chunks/EIHBO33S.js";
+import "./chunks/HQSFIOKV.js";
 import {
   engines,
   name,
   version
-} from "./chunks/FP2VGYMF.js";
+} from "./chunks/FLHMB3O6.js";
 import {
   RESET_ESCAPE_CODE,
   calculateTotals,
   conditionallyMaskSecrets
-} from "./chunks/GRMVFQAA.js";
+} from "./chunks/DZ756KUK.js";
 import "./chunks/VXIQEZPR.js";
 import {
   BaseResolver,
@@ -109,7 +109,7 @@ import {
   white,
   xmlEscape,
   yellow
-} from "./chunks/OEYVENNB.js";
+} from "./chunks/RA3UJ5AH.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/4DNBVE5S.js");
+    const { generate } = await import("./chunks/53LXWEMG.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/4DNBVE5S.js");
+    const { run, conditionallyMaskSecrets: conditionallyMaskSecrets2 } = await import("./chunks/53LXWEMG.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/YA5P3RI2.js");
+    const { RedoclyOAuthClient: RedoclyOAuthClient2 } = await import("./chunks/BAMV5MGA.js");
     const oauthClient = new RedoclyOAuthClient2();
     const reuniteUrl = getReuniteUrl(config3, args.residency);
     const logged_in = await oauthClient.isAuthorized(reuniteUrl);
@@ -12644,6 +12708,7 @@ async function sendTelemetry({
       anonymous_id = `ann_${ulid()}`;
       cacheAnonymousId(anonymous_id);
     }
+    const majorSpecVersion = getMajorSpecVersion(spec_version);
     const eventData = [
       {
         id: "cli-command-run",
@@ -12664,9 +12729,9 @@ async function sendTelemetry({
         spec_version,
         spec_keyword,
         spec_full_version,
-        respect_x_security_auth_types: spec_version === "arazzo1" && respect_x_security_auth_types?.length ? JSON.stringify(respect_x_security_auth_types) : void 0,
-        respect_source_description_types: spec_version === "arazzo1" && respect_source_description_types?.length ? JSON.stringify(respect_source_description_types) : void 0,
-        respect_criterion_object_types: spec_version === "arazzo1" && respect_criterion_object_types?.length ? JSON.stringify(respect_criterion_object_types) : void 0
+        respect_x_security_auth_types: majorSpecVersion === "arazzo1" && respect_x_security_auth_types?.length ? JSON.stringify(respect_x_security_auth_types) : void 0,
+        respect_source_description_types: majorSpecVersion === "arazzo1" && respect_source_description_types?.length ? JSON.stringify(respect_source_description_types) : void 0,
+        respect_criterion_object_types: majorSpecVersion === "arazzo1" && respect_criterion_object_types?.length ? JSON.stringify(respect_criterion_object_types) : void 0
       }
     ];
     const cloudEvent = j.mapToCloudEvent({
@@ -12682,7 +12747,7 @@ async function sendTelemetry({
       category: "product",
       data: eventData
     });
-    const { otelTelemetry } = await import("./chunks/2ULY6UWW.js");
+    const { otelTelemetry } = await import("./chunks/XEVW3SW6.js");
     otelTelemetry.send(cloudEvent);
   } catch (err) {
   }
@@ -12910,7 +12975,7 @@ function commandWrapper(commandHandler) {
       } else {
         specFullVersion = void 0;
       }
-      if (specVersion === "arazzo1") {
+      if (getMajorSpecVersion(specVersion) === "arazzo1") {
         const arazzoDocument = document;
         collectXSecurityAuthTypes(arazzoDocument, respectXSecurityAuthTypes);
         collectSourceDescriptionTypes(arazzoDocument, respectSourceDescriptionTypes);
@@ -13512,7 +13577,7 @@ yargs_default(hideBin(process.argv)).version("version", "Show version number.",
     return true;
   }),
   async (argv) => {
-    const { handlerBuildCommand } = await import("./chunks/7GOGGHM5.js");
+    const { handlerBuildCommand } = await import("./chunks/Z5JKGONR.js");
     commandWrapper(handlerBuildCommand)(argv);
   }
 ).command(

package/package.json

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