fern-api 0.31.0-rc2 → 0.31.0-rc3

package/bundle.cjs

@@ -44920,7 +44920,7 @@ var require_buffer_list = __commonJS({
         }
       }, {
         key: "join",
-        value: function join5(s2) {
+        value: function join4(s2) {
           if (this.length === 0)
             return "";
           var p2 = this.head;
@@ -124644,7 +124644,7 @@ var require_doc = __commonJS({
                 type: "cursor",
                 placeholder: Symbol("cursor")
               };
-              function join5(sep, arr) {
+              function join4(sep, arr) {
                 const res = [];
                 for (let i2 = 0; i2 < arr.length; i2++) {
                   if (i2 !== 0) {
@@ -124674,7 +124674,7 @@ var require_doc = __commonJS({
               }
               module22.exports = {
                 concat: concat2,
-                join: join5,
+                join: join4,
                 line,
                 softline,
                 hardline,
@@ -124866,7 +124866,7 @@ var require_doc = __commonJS({
               var getLast = require_get_last();
               var {
                 literalline,
-                join: join5
+                join: join4
               } = require_doc_builders();
               var isConcat = (doc) => Array.isArray(doc) || doc && doc.type === "concat";
               var getDocParts = (doc) => {
@@ -125179,7 +125179,7 @@ var require_doc = __commonJS({
               }
               function replaceTextEndOfLine(text8) {
                 let replacement = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : literalline;
-                return join5(replacement, text8.split("\n")).parts;
+                return join4(replacement, text8.split("\n")).parts;
               }
               function canBreakFn(doc) {
                 if (doc.type === "line") {
@@ -312335,7 +312335,7 @@ var require_prettier = __commonJS({
           tokenize: function tokenize2(value) {
             return value.split("");
           },
-          join: function join5(chars) {
+          join: function join4(chars) {
             return chars.join("");
           }
         };
@@ -318257,7 +318257,7 @@ ${frame}`;
             breakParent,
             indent: indent3,
             lineSuffix,
-            join: join5,
+            join: join4,
             cursor
           }
         } = require_doc();
@@ -318639,9 +318639,9 @@ ${frame}`;
             return "";
           }
           if (sameIndent) {
-            return join5(hardline, parts);
+            return join4(hardline, parts);
           }
-          return indent3([hardline, join5(hardline, parts)]);
+          return indent3([hardline, join4(hardline, parts)]);
         }
         function printCommentsSeparately(path42, options2, ignored) {
           const value = path42.getValue();
@@ -332899,7 +332899,7 @@ ${fromBody}`;
         } = require_util8();
         var {
           builders: {
-            join: join5,
+            join: join4,
             hardline,
             softline,
             group,
@@ -333011,7 +333011,7 @@ ${fromBody}`;
                 maxColumnWidths[index3] = Math.max(maxColumnWidths[index3], getStringWidth(cell));
               }
             }
-            parts.push(lineSuffixBoundary, "`", indent3([hardline, join5(hardline, table2.map((row) => join5(" | ", row.cells.map((cell, index3) => row.hasLineBreak ? cell : cell + " ".repeat(maxColumnWidths[index3] - getStringWidth(cell))))))]), hardline, "`");
+            parts.push(lineSuffixBoundary, "`", indent3([hardline, join4(hardline, table2.map((row) => join4(" | ", row.cells.map((cell, index3) => row.hasLineBreak ? cell : cell + " ".repeat(maxColumnWidths[index3] - getStringWidth(cell))))))]), hardline, "`");
             return parts;
           }
         }
@@ -333155,7 +333155,7 @@ ${fromBody}`;
         var {
           builders: {
             indent: indent3,
-            join: join5,
+            join: join4,
             hardline
           }
         } = require_doc();
@@ -333211,7 +333211,7 @@ ${fromBody}`;
               parts.push(expressionDoc);
             }
           }
-          return ["`", indent3([hardline, join5(hardline, parts)]), hardline, "`"];
+          return ["`", indent3([hardline, join4(hardline, parts)]), hardline, "`"];
         }
         function printGraphqlComments(lines) {
           const parts = [];
@@ -333228,7 +333228,7 @@ ${fromBody}`;
             }
             seenComment = true;
           }
-          return parts.length === 0 ? null : join5(hardline, parts);
+          return parts.length === 0 ? null : join4(hardline, parts);
         }
         module22.exports = format5;
       }
@@ -334844,7 +334844,7 @@ ${fromBody}`;
         "use strict";
         var {
           builders: {
-            join: join5,
+            join: join4,
             line,
             group,
             softline,
@@ -334861,7 +334861,7 @@ ${fromBody}`;
           }
           if (options2.__isVueForBindingLeft) {
             return path42.call((functionDeclarationPath) => {
-              const printed = join5([",", line], functionDeclarationPath.map(print, "params"));
+              const printed = join4([",", line], functionDeclarationPath.map(print, "params"));
               const {
                 params
               } = functionDeclarationPath.getValue();
@@ -334872,7 +334872,7 @@ ${fromBody}`;
             }, "program", "body", 0);
           }
           if (options2.__isVueBindings) {
-            return path42.call((functionDeclarationPath) => join5([",", line], functionDeclarationPath.map(print, "params")), "program", "body", 0);
+            return path42.call((functionDeclarationPath) => join4([",", line], functionDeclarationPath.map(print, "params")), "program", "body", 0);
           }
         }
         function isVueEventBindingExpression(node3) {
@@ -334908,7 +334908,7 @@ ${fromBody}`;
         } = require_util8();
         var {
           builders: {
-            join: join5,
+            join: join4,
             line,
             softline,
             group,
@@ -334991,7 +334991,7 @@ ${fromBody}`;
           const shouldInline = shouldInlineLogicalExpression(node3);
           const lineBeforeOperator = (node3.operator === "|>" || node3.type === "NGPipeExpression" || node3.operator === "|" && options2.parser === "__vue_expression") && !hasLeadingOwnLineComment(options2.originalText, node3.right);
           const operator = node3.type === "NGPipeExpression" ? "|" : node3.operator;
-          const rightSuffix = node3.type === "NGPipeExpression" && node3.arguments.length > 0 ? group(indent3([softline, ": ", join5([softline, ":", ifBreak(" ")], path42.map(print, "arguments").map((arg) => align2(2, group(arg))))])) : "";
+          const rightSuffix = node3.type === "NGPipeExpression" && node3.arguments.length > 0 ? group(indent3([softline, ": ", join4([softline, ":", ifBreak(" ")], path42.map(print, "arguments").map((arg) => align2(2, group(arg))))])) : "";
           let right3;
           if (shouldInline) {
             right3 = [operator, " ", print("right"), rightSuffix];
@@ -335041,7 +335041,7 @@ ${fromBody}`;
         "use strict";
         var {
           builders: {
-            join: join5,
+            join: join4,
             line,
             group
           }
@@ -335065,7 +335065,7 @@ ${fromBody}`;
             case "NGPipeExpression":
               return printBinaryishExpression(path42, options2, print);
             case "NGChainedExpression":
-              return group(join5([";", line], path42.map((childPath) => hasNgSideEffect(childPath) ? print() : ["(", print(), ")"], "expressions")));
+              return group(join4([";", line], path42.map((childPath) => hasNgSideEffect(childPath) ? print() : ["(", print(), ")"], "expressions")));
             case "NGEmptyExpression":
               return "";
             case "NGQuotedExpression":
@@ -335128,7 +335128,7 @@ ${fromBody}`;
             fill: fill2,
             ifBreak,
             lineSuffixBoundary,
-            join: join5
+            join: join4
           },
           utils: {
             willBreak
@@ -335451,9 +335451,9 @@ ${fromBody}`;
             case "JSXIdentifier":
               return String(node3.name);
             case "JSXNamespacedName":
-              return join5(":", [print("namespace"), print("name")]);
+              return join4(":", [print("namespace"), print("name")]);
             case "JSXMemberExpression":
-              return join5(".", [print("object"), print("property")]);
+              return join4(".", [print("object"), print("property")]);
             case "JSXSpreadAttribute":
               return printJsxSpreadAttribute(path42, options2, print);
             case "JSXSpreadChild": {
@@ -335533,7 +335533,7 @@ ${fromBody}`;
         var {
           builders: {
             indent: indent3,
-            join: join5,
+            join: join4,
             line
           }
         } = require_doc();
@@ -335583,7 +335583,7 @@ ${fromBody}`;
           if (!isNonEmptyArray(node3.modifiers)) {
             return "";
           }
-          return [join5(" ", path42.map(print, "modifiers")), " "];
+          return [join4(" ", path42.map(print, "modifiers")), " "];
         }
         function adjustClause(node3, clause, forceSpace) {
           if (node3.type === "EmptyStatement") {
@@ -335956,7 +335956,7 @@ ${fromBody}`;
         } = require_loc();
         var {
           builders: {
-            join: join5,
+            join: join4,
             hardline,
             group,
             indent: indent3,
@@ -336100,7 +336100,7 @@ ${fromBody}`;
             if (groups2.length === 0) {
               return "";
             }
-            return indent3(group([hardline, join5(hardline, groups2.map(printGroup))]));
+            return indent3(group([hardline, join4(hardline, groups2.map(printGroup))]));
           }
           const printedGroups = groups.map(printGroup);
           const oneLine = printedGroups;
@@ -336140,7 +336140,7 @@ ${fromBody}`;
         "use strict";
         var {
           builders: {
-            join: join5,
+            join: join4,
             group
           }
         } = require_doc();
@@ -336173,7 +336173,7 @@ ${fromBody}`;
             iterateCallArgumentsPath(path42, () => {
               printed.push(print());
             });
-            return [isNew ? "new " : "", print("callee"), optional4, printFunctionTypeParameters(path42, options2, print), "(", join5(", ", printed), ")"];
+            return [isNew ? "new " : "", print("callee"), optional4, printFunctionTypeParameters(path42, options2, print), "(", join4(", ", printed), ")"];
           }
           const isIdentifierWithFlowAnnotation = (options2.parser === "babel" || options2.parser === "babel-flow") && node3.callee && node3.callee.type === "Identifier" && hasFlowAnnotationComment(node3.callee.trailingComments);
           if (isIdentifierWithFlowAnnotation) {
@@ -336655,7 +336655,7 @@ ${fromBody}`;
         var {
           builders: {
             group,
-            join: join5,
+            join: join4,
             line,
             softline,
             indent: indent3,
@@ -336756,10 +336756,10 @@ ${fromBody}`;
             return printComments(typePath, printedType, options2);
           }, "types");
           if (shouldHug) {
-            return join5(" | ", printed);
+            return join4(" | ", printed);
           }
           const shouldAddStartLine = shouldIndent && !hasLeadingOwnLineComment(options2.originalText, node3);
-          const code3 = [ifBreak([shouldAddStartLine ? line : "", "| "]), join5([line, "| "], printed)];
+          const code3 = [ifBreak([shouldAddStartLine ? line : "", "| "]), join4([line, "| "], printed)];
           if (pathNeedsParens(path42, options2)) {
             return group([indent3(code3), softline]);
           }
@@ -336834,7 +336834,7 @@ ${fromBody}`;
         } = require_comments();
         var {
           builders: {
-            join: join5,
+            join: join4,
             line,
             hardline,
             softline,
@@ -336875,10 +336875,10 @@ ${fromBody}`;
           const isArrowFunctionVariable = path42.match((node22) => !(node22[paramsKey].length === 1 && isObjectType(node22[paramsKey][0])), void 0, (node22, name3) => name3 === "typeAnnotation", (node22) => node22.type === "Identifier", isArrowFunctionVariableDeclarator);
           const shouldInline = !isArrowFunctionVariable && (isParameterInTestCall || node3[paramsKey].length === 0 || node3[paramsKey].length === 1 && (node3[paramsKey][0].type === "NullableTypeAnnotation" || shouldHugType(node3[paramsKey][0])));
           if (shouldInline) {
-            return ["<", join5(", ", path42.map(print, paramsKey)), printDanglingCommentsForInline(path42, options2), ">"];
+            return ["<", join4(", ", path42.map(print, paramsKey)), printDanglingCommentsForInline(path42, options2), ">"];
           }
           const trailingComma = node3.type === "TSTypeParameterInstantiation" ? "" : getFunctionParameters(node3).length === 1 && isTSXFile(options2) && !node3[paramsKey][0].constraint && path42.getParentNode().type === "ArrowFunctionExpression" ? "," : shouldPrintComma(options2, "all") ? ifBreak(",") : "";
-          return group(["<", indent3([softline, join5([",", line], path42.map(print, paramsKey))]), trailingComma, softline, ">"], {
+          return group(["<", indent3([softline, join4([",", line], path42.map(print, paramsKey))]), trailingComma, softline, ">"], {
             id: getTypeParametersGroupId(node3)
           });
         }
@@ -337016,7 +337016,7 @@ ${fromBody}`;
             indent: indent3,
             ifBreak,
             hardline,
-            join: join5,
+            join: join4,
             indentIfBreak
           },
           utils: {
@@ -337172,7 +337172,7 @@ ${fromBody}`;
           if (tailNode.body.type === "SequenceExpression") {
             bodyDoc = group(["(", indent3([softline, bodyDoc]), softline, ")"]);
           }
-          return group([group(indent3([isCallee || isAssignmentRhs ? softline : "", group(join5([" =>", line], signatures), {
+          return group([group(indent3([isCallee || isAssignmentRhs ? softline : "", group(join4([" =>", line], signatures), {
             shouldBreak
           })]), {
             id: groupId,
@@ -337324,7 +337324,7 @@ ${fromBody}`;
           builders: {
             line,
             hardline,
-            join: join5,
+            join: join4,
             breakParent,
             group
           }
@@ -337338,10 +337338,10 @@ ${fromBody}`;
         } = require_utils72();
         function printClassMemberDecorators(path42, options2, print) {
           const node3 = path42.getValue();
-          return group([join5(line, path42.map(print, "decorators")), hasNewlineBetweenOrAfterDecorators(node3, options2) ? hardline : line]);
+          return group([join4(line, path42.map(print, "decorators")), hasNewlineBetweenOrAfterDecorators(node3, options2) ? hardline : line]);
         }
         function printDecoratorsBeforeExport(path42, options2, print) {
-          return [join5(hardline, path42.map(print, "declaration", "decorators")), hardline];
+          return [join4(hardline, path42.map(print, "declaration", "decorators")), hardline];
         }
         function printDecorators(path42, options2, print) {
           const node3 = path42.getValue();
@@ -337352,7 +337352,7 @@ ${fromBody}`;
             return;
           }
           const shouldBreak = node3.type === "ClassExpression" || node3.type === "ClassDeclaration" || hasNewlineBetweenOrAfterDecorators(node3, options2);
-          return [getParentExportDeclaration(path42) ? hardline : shouldBreak ? breakParent : "", join5(line, path42.map(print, "decorators")), line];
+          return [getParentExportDeclaration(path42) ? hardline : shouldBreak ? breakParent : "", join4(line, path42.map(print, "decorators")), line];
         }
         function hasNewlineBetweenOrAfterDecorators(node3, options2) {
           return node3.decorators.some((decorator) => hasNewline(options2.originalText, locEnd(decorator)));
@@ -337387,7 +337387,7 @@ ${fromBody}`;
         } = require_comments();
         var {
           builders: {
-            join: join5,
+            join: join4,
             line,
             hardline,
             softline,
@@ -337487,7 +337487,7 @@ ${fromBody}`;
           }) => marker === listName);
           return [shouldIndentOnlyHeritageClauses(node3) ? ifBreak(" ", line, {
             groupId: getTypeParametersGroupId(node3.typeParameters)
-          }) : line, printedLeadingComments, printedLeadingComments && hardline, listName, group(indent3([line, join5([",", line], path42.map(print, listName))]))];
+          }) : line, printedLeadingComments, printedLeadingComments && hardline, listName, group(indent3([line, join4([",", line], path42.map(print, listName))]))];
         }
         function printSuperClass(path42, options2, print) {
           const printed = print("superClass");
@@ -337574,7 +337574,7 @@ ${fromBody}`;
         } = require_util8();
         var {
           builders: {
-            join: join5,
+            join: join4,
             line,
             group,
             indent: indent3,
@@ -337611,7 +337611,7 @@ ${fromBody}`;
           if (isNonEmptyArray(node3.extends)) {
             extendsParts.push(shouldIndentOnlyHeritageClauses ? ifBreak(" ", line, {
               groupId: getTypeParametersGroupId(node3.typeParameters)
-            }) : line, "extends ", (node3.extends.length === 1 ? identity3 : indent3)(join5([",", line], path42.map(print, "extends"))));
+            }) : line, "extends ", (node3.extends.length === 1 ? identity3 : indent3)(join4([",", line], path42.map(print, "extends"))));
           }
           if (node3.id && hasComment(node3.id, CommentCheckFlags.Trailing) || isNonEmptyArray(node3.extends)) {
             if (shouldIndentOnlyHeritageClauses) {
@@ -337641,7 +337641,7 @@ ${fromBody}`;
             softline,
             group,
             indent: indent3,
-            join: join5,
+            join: join4,
             line,
             ifBreak,
             hardline
@@ -337782,14 +337782,14 @@ ${fromBody}`;
                 throw new Error(`Unknown specifier type ${JSON.stringify(specifierType)}`);
               }
             }, "specifiers");
-            parts.push(join5(", ", standaloneSpecifiers));
+            parts.push(join4(", ", standaloneSpecifiers));
             if (groupedSpecifiers.length > 0) {
               if (standaloneSpecifiers.length > 0) {
                 parts.push(", ");
               }
               const canBreak = groupedSpecifiers.length > 1 || standaloneSpecifiers.length > 0 || node3.specifiers.some((node22) => hasComment(node22));
               if (canBreak) {
-                parts.push(group(["{", indent3([options2.bracketSpacing ? line : softline, join5([",", line], groupedSpecifiers)]), ifBreak(shouldPrintComma(options2) ? "," : ""), options2.bracketSpacing ? line : softline, "}"]));
+                parts.push(group(["{", indent3([options2.bracketSpacing ? line : softline, join4([",", line], groupedSpecifiers)]), ifBreak(shouldPrintComma(options2) ? "," : ""), options2.bracketSpacing ? line : softline, "}"]));
               } else {
                 parts.push(["{", options2.bracketSpacing ? " " : "", ...groupedSpecifiers, options2.bracketSpacing ? " " : "", "}"]);
               }
@@ -337814,7 +337814,7 @@ ${fromBody}`;
         function printImportAssertions(path42, options2, print) {
           const node3 = path42.getNode();
           if (isNonEmptyArray(node3.assertions)) {
-            return [" assert {", options2.bracketSpacing ? " " : "", join5(", ", path42.map(print, "assertions")), options2.bracketSpacing ? " " : "", "}"];
+            return [" assert {", options2.bracketSpacing ? " " : "", join4(", ", path42.map(print, "assertions")), options2.bracketSpacing ? " " : "", "}"];
           }
           return "";
         }
@@ -338718,7 +338718,7 @@ ${fromBody}`;
         } = require_util8();
         var {
           builders: {
-            join: join5,
+            join: join4,
             line,
             hardline,
             softline,
@@ -338826,7 +338826,7 @@ ${fromBody}`;
             case "TSTypeAliasDeclaration":
               return printTypeAlias(path42, options2, print);
             case "TSQualifiedName":
-              return join5(".", [print("left"), print("right")]);
+              return join4(".", [print("left"), print("right")]);
             case "TSAbstractMethodDefinition":
             case "TSDeclareMethod":
               return printClassMethod(path42, options2, print);
@@ -338902,7 +338902,7 @@ ${fromBody}`;
             case "TSIndexSignature": {
               const parent2 = path42.getParentNode();
               const trailingComma = node3.parameters.length > 1 ? ifBreak(shouldPrintComma(options2) ? "," : "") : "";
-              const parametersGroup = group([indent3([softline, join5([", ", softline], path42.map(print, "parameters"))]), trailingComma, softline]);
+              const parametersGroup = group([indent3([softline, join4([", ", softline], path42.map(print, "parameters"))]), trailingComma, softline]);
               return [node3.export ? "export " : "", node3.accessibility ? [node3.accessibility, " "] : "", node3.static ? "static " : "", node3.readonly ? "readonly " : "", node3.declare ? "declare " : "", "[", node3.parameters ? parametersGroup : "", node3.typeAnnotation ? "]: " : "]", node3.typeAnnotation ? print("typeAnnotation") : "", parent2.type === "ClassBody" ? semi : ""];
             }
             case "TSTypePredicate":
@@ -339074,7 +339074,7 @@ ${fromBody}`;
         } = require_util8();
         var {
           builders: {
-            join: join5,
+            join: join4,
             hardline
           },
           utils: {
@@ -339116,7 +339116,7 @@ ${fromBody}`;
         }
         function printIndentableBlockComment(comment2) {
           const lines = comment2.value.split("\n");
-          return ["/*", join5(hardline, lines.map((line, index3) => index3 === 0 ? line.trimEnd() : " " + (index3 < lines.length - 1 ? line.trim() : line.trimStart()))), "*/"];
+          return ["/*", join4(hardline, lines.map((line, index3) => index3 === 0 ? line.trimEnd() : " " + (index3 < lines.length - 1 ? line.trim() : line.trimStart()))), "*/"];
         }
         module22.exports = {
           printComment
@@ -339196,7 +339196,7 @@ ${fromBody}`;
         } = require_util8();
         var {
           builders: {
-            join: join5,
+            join: join4,
             line,
             hardline,
             softline,
@@ -339546,7 +339546,7 @@ ${fromBody}`;
                 }, "expressions");
                 return group(parts2);
               }
-              return group(join5([",", line], path42.map(print, "expressions")));
+              return group(join4([",", line], path42.map(print, "expressions")));
             }
             case "ThisExpression":
               return "this";
@@ -339669,7 +339669,7 @@ ${fromBody}`;
               }
               return ["catch ", print("body")];
             case "SwitchStatement":
-              return [group(["switch (", indent3([softline, print("discriminant")]), softline, ")"]), " {", node3.cases.length > 0 ? indent3([hardline, join5(hardline, path42.map((casePath, index3, cases) => {
+              return [group(["switch (", indent3([softline, print("discriminant")]), softline, ")"]), " {", node3.cases.length > 0 ? indent3([hardline, join4(hardline, path42.map((casePath, index3, cases) => {
                 const caseNode = casePath.getValue();
                 return [print(), index3 !== cases.length - 1 && isNextLineEmpty(caseNode, options2) ? hardline : ""];
               }, "cases"))]) : "", hardline, "}"];
@@ -339778,7 +339778,7 @@ ${fromBody}`;
           builders: {
             hardline,
             indent: indent3,
-            join: join5
+            join: join4
           }
         } = require_doc();
         var preprocess3 = require_print_preprocess();
@@ -339792,10 +339792,10 @@ ${fromBody}`;
                 return "[]";
               }
               const printed = path42.map(() => path42.getValue() === null ? "null" : print(), "elements");
-              return ["[", indent3([hardline, join5([",", hardline], printed)]), hardline, "]"];
+              return ["[", indent3([hardline, join4([",", hardline], printed)]), hardline, "]"];
             }
             case "ObjectExpression":
-              return node3.properties.length === 0 ? "{}" : ["{", indent3([hardline, join5([",", hardline], path42.map(print, "properties"))]), hardline, "}"];
+              return node3.properties.length === 0 ? "{}" : ["{", indent3([hardline, join4([",", hardline], path42.map(print, "properties"))]), hardline, "}"];
             case "ObjectProperty":
               return [print("key"), ": ", print("value")];
             case "UnaryExpression":
@@ -341060,7 +341060,7 @@ ${fromBody}`;
         } = require_util8();
         var {
           builders: {
-            join: join5,
+            join: join4,
             line,
             hardline,
             softline,
@@ -341200,10 +341200,10 @@ ${fromBody}`;
                 }
                 parts.push(print());
               }, "nodes");
-              return group(indent3(join5(line, parts)));
+              return group(indent3(join4(line, parts)));
             }
             case "media-query": {
-              return [join5(" ", path42.map(print, "nodes")), isLastNode(path42, node3) ? "" : ","];
+              return [join4(" ", path42.map(print, "nodes")), isLastNode(path42, node3) ? "" : ","];
             }
             case "media-type": {
               return adjustNumbers(adjustStrings(node3.value, options2));
@@ -341233,7 +341233,7 @@ ${fromBody}`;
               return node3.value;
             }
             case "selector-root": {
-              return group([insideAtRuleNode(path42, "custom-selector") ? [getAncestorNode(path42, "css-atrule").customSelector, line] : "", join5([",", insideAtRuleNode(path42, ["extend", "custom-selector", "nest"]) ? line : hardline], path42.map(print, "nodes"))]);
+              return group([insideAtRuleNode(path42, "custom-selector") ? [getAncestorNode(path42, "css-atrule").customSelector, line] : "", join4([",", insideAtRuleNode(path42, ["extend", "custom-selector", "nest"]) ? line : hardline], path42.map(print, "nodes"))]);
             }
             case "selector-selector": {
               return group(indent3(path42.map(print, "nodes")));
@@ -341273,7 +341273,7 @@ ${fromBody}`;
               return [node3.namespace ? [node3.namespace === true ? "" : node3.namespace.trim(), "|"] : "", node3.value];
             }
             case "selector-pseudo": {
-              return [maybeToLowerCase(node3.value), isNonEmptyArray(node3.nodes) ? ["(", join5(", ", path42.map(print, "nodes")), ")"] : ""];
+              return [maybeToLowerCase(node3.value), isNonEmptyArray(node3.nodes) ? ["(", join4(", ", path42.map(print, "nodes")), ")"] : ""];
             }
             case "selector-nesting": {
               return node3.value;
@@ -341454,7 +341454,7 @@ ${fromBody}`;
             case "value-paren_group": {
               const parentNode = path42.getParentNode();
               if (parentNode && isURLFunctionNode(parentNode) && (node3.groups.length === 1 || node3.groups.length > 0 && node3.groups[0].type === "value-comma_group" && node3.groups[0].groups.length > 0 && node3.groups[0].groups[0].type === "value-word" && node3.groups[0].groups[0].value.startsWith("data:"))) {
-                return [node3.open ? print("open") : "", join5(",", path42.map(print, "groups")), node3.close ? print("close") : ""];
+                return [node3.open ? print("open") : "", join4(",", path42.map(print, "groups")), node3.close ? print("close") : ""];
               }
               if (!node3.open) {
                 const printed2 = path42.map(print, "groups");
@@ -341474,7 +341474,7 @@ ${fromBody}`;
               const isConfiguration = isConfigurationNode(node3, parentNode);
               const shouldBreak = isConfiguration || isSCSSMapItem && !isKey2;
               const shouldDedent = isConfiguration || isKey2;
-              const printed = group([node3.open ? print("open") : "", indent3([softline, join5([line], path42.map((childPath, index3) => {
+              const printed = group([node3.open ? print("open") : "", indent3([softline, join4([line], path42.map((childPath, index3) => {
                 const child = childPath.getValue();
                 const isLast = index3 === node3.groups.length - 1;
                 const printed2 = [print(), isLast ? "" : ","];
@@ -341844,7 +341844,7 @@ ${fromBody}`;
             hardline,
             ifBreak,
             indent: indent3,
-            join: join5,
+            join: join4,
             line,
             softline
           },
@@ -341936,7 +341936,7 @@ ${fromBody}`;
               return path42.map(print2, "parts");
             }
             case "Hash": {
-              return join5(line, path42.map(print2, "pairs"));
+              return join4(line, path42.map(print2, "pairs"));
             }
             case "HashPair": {
               return [node3.key, "=", print2("value")];
@@ -342225,7 +342225,7 @@ ${fromBody}`;
           return "";
         }
         function getTextValueParts(value) {
-          return getDocParts(join5(line, splitByHtmlWhitespace(value)));
+          return getDocParts(join4(line, splitByHtmlWhitespace(value)));
         }
         function splitByHtmlWhitespace(string8) {
           return string8.split(/[\t\n\f\r ]+/);
@@ -342309,7 +342309,7 @@ ${fromBody}`;
           if (parts.length === 0) {
             return "";
           }
-          return join5(line, parts);
+          return join4(line, parts);
         }
         function printBlockParams(node3) {
           return ["as |", node3.blockParams.join(" "), "|"];
@@ -342406,7 +342406,7 @@ ${fromBody}`;
         "use strict";
         var {
           builders: {
-            join: join5,
+            join: join4,
             hardline,
             line,
             softline,
@@ -342451,16 +342451,16 @@ ${fromBody}`;
             case "OperationDefinition": {
               const hasOperation = options2.originalText[locStart(node3)] !== "{";
               const hasName = Boolean(node3.name);
-              return [hasOperation ? node3.operation : "", hasOperation && hasName ? [" ", print("name")] : "", hasOperation && !hasName && isNonEmptyArray(node3.variableDefinitions) ? " " : "", isNonEmptyArray(node3.variableDefinitions) ? group(["(", indent3([softline, join5([ifBreak("", ", "), softline], path42.map(print, "variableDefinitions"))]), softline, ")"]) : "", printDirectives(path42, print, node3), node3.selectionSet ? !hasOperation && !hasName ? "" : " " : "", print("selectionSet")];
+              return [hasOperation ? node3.operation : "", hasOperation && hasName ? [" ", print("name")] : "", hasOperation && !hasName && isNonEmptyArray(node3.variableDefinitions) ? " " : "", isNonEmptyArray(node3.variableDefinitions) ? group(["(", indent3([softline, join4([ifBreak("", ", "), softline], path42.map(print, "variableDefinitions"))]), softline, ")"]) : "", printDirectives(path42, print, node3), node3.selectionSet ? !hasOperation && !hasName ? "" : " " : "", print("selectionSet")];
             }
             case "FragmentDefinition": {
-              return ["fragment ", print("name"), isNonEmptyArray(node3.variableDefinitions) ? group(["(", indent3([softline, join5([ifBreak("", ", "), softline], path42.map(print, "variableDefinitions"))]), softline, ")"]) : "", " on ", print("typeCondition"), printDirectives(path42, print, node3), " ", print("selectionSet")];
+              return ["fragment ", print("name"), isNonEmptyArray(node3.variableDefinitions) ? group(["(", indent3([softline, join4([ifBreak("", ", "), softline], path42.map(print, "variableDefinitions"))]), softline, ")"]) : "", " on ", print("typeCondition"), printDirectives(path42, print, node3), " ", print("selectionSet")];
             }
             case "SelectionSet": {
-              return ["{", indent3([hardline, join5(hardline, printSequence(path42, options2, print, "selections"))]), hardline, "}"];
+              return ["{", indent3([hardline, join4(hardline, printSequence(path42, options2, print, "selections"))]), hardline, "}"];
             }
             case "Field": {
-              return group([node3.alias ? [print("alias"), ": "] : "", print("name"), node3.arguments.length > 0 ? group(["(", indent3([softline, join5([ifBreak("", ", "), softline], printSequence(path42, options2, print, "arguments"))]), softline, ")"]) : "", printDirectives(path42, print, node3), node3.selectionSet ? " " : "", print("selectionSet")]);
+              return group([node3.alias ? [print("alias"), ": "] : "", print("name"), node3.arguments.length > 0 ? group(["(", indent3([softline, join4([ifBreak("", ", "), softline], printSequence(path42, options2, print, "arguments"))]), softline, ")"]) : "", printDirectives(path42, print, node3), node3.selectionSet ? " " : "", print("selectionSet")]);
             }
             case "Name": {
               return node3.value;
@@ -342474,7 +342474,7 @@ ${fromBody}`;
                 if (lines.every((line2) => line2 === "")) {
                   lines.length = 0;
                 }
-                return join5(hardline, ['"""', ...lines, '"""']);
+                return join4(hardline, ['"""', ...lines, '"""']);
               }
               return ['"', node3.value.replace(/["\\]/g, "\\$&").replace(/\n/g, "\\n"), '"'];
             }
@@ -342493,17 +342493,17 @@ ${fromBody}`;
               return ["$", print("name")];
             }
             case "ListValue": {
-              return group(["[", indent3([softline, join5([ifBreak("", ", "), softline], path42.map(print, "values"))]), softline, "]"]);
+              return group(["[", indent3([softline, join4([ifBreak("", ", "), softline], path42.map(print, "values"))]), softline, "]"]);
             }
             case "ObjectValue": {
-              return group(["{", options2.bracketSpacing && node3.fields.length > 0 ? " " : "", indent3([softline, join5([ifBreak("", ", "), softline], path42.map(print, "fields"))]), softline, ifBreak("", options2.bracketSpacing && node3.fields.length > 0 ? " " : ""), "}"]);
+              return group(["{", options2.bracketSpacing && node3.fields.length > 0 ? " " : "", indent3([softline, join4([ifBreak("", ", "), softline], path42.map(print, "fields"))]), softline, ifBreak("", options2.bracketSpacing && node3.fields.length > 0 ? " " : ""), "}"]);
             }
             case "ObjectField":
             case "Argument": {
               return [print("name"), ": ", print("value")];
             }
             case "Directive": {
-              return ["@", print("name"), node3.arguments.length > 0 ? group(["(", indent3([softline, join5([ifBreak("", ", "), softline], printSequence(path42, options2, print, "arguments"))]), softline, ")"]) : ""];
+              return ["@", print("name"), node3.arguments.length > 0 ? group(["(", indent3([softline, join4([ifBreak("", ", "), softline], printSequence(path42, options2, print, "arguments"))]), softline, ")"]) : ""];
             }
             case "NamedType": {
               return print("name");
@@ -342513,17 +342513,17 @@ ${fromBody}`;
             }
             case "ObjectTypeExtension":
             case "ObjectTypeDefinition": {
-              return [print("description"), node3.description ? hardline : "", node3.kind === "ObjectTypeExtension" ? "extend " : "", "type ", print("name"), node3.interfaces.length > 0 ? [" implements ", ...printInterfaces(path42, options2, print)] : "", printDirectives(path42, print, node3), node3.fields.length > 0 ? [" {", indent3([hardline, join5(hardline, printSequence(path42, options2, print, "fields"))]), hardline, "}"] : ""];
+              return [print("description"), node3.description ? hardline : "", node3.kind === "ObjectTypeExtension" ? "extend " : "", "type ", print("name"), node3.interfaces.length > 0 ? [" implements ", ...printInterfaces(path42, options2, print)] : "", printDirectives(path42, print, node3), node3.fields.length > 0 ? [" {", indent3([hardline, join4(hardline, printSequence(path42, options2, print, "fields"))]), hardline, "}"] : ""];
             }
             case "FieldDefinition": {
-              return [print("description"), node3.description ? hardline : "", print("name"), node3.arguments.length > 0 ? group(["(", indent3([softline, join5([ifBreak("", ", "), softline], printSequence(path42, options2, print, "arguments"))]), softline, ")"]) : "", ": ", print("type"), printDirectives(path42, print, node3)];
+              return [print("description"), node3.description ? hardline : "", print("name"), node3.arguments.length > 0 ? group(["(", indent3([softline, join4([ifBreak("", ", "), softline], printSequence(path42, options2, print, "arguments"))]), softline, ")"]) : "", ": ", print("type"), printDirectives(path42, print, node3)];
             }
             case "DirectiveDefinition": {
-              return [print("description"), node3.description ? hardline : "", "directive ", "@", print("name"), node3.arguments.length > 0 ? group(["(", indent3([softline, join5([ifBreak("", ", "), softline], printSequence(path42, options2, print, "arguments"))]), softline, ")"]) : "", node3.repeatable ? " repeatable" : "", " on ", join5(" | ", path42.map(print, "locations"))];
+              return [print("description"), node3.description ? hardline : "", "directive ", "@", print("name"), node3.arguments.length > 0 ? group(["(", indent3([softline, join4([ifBreak("", ", "), softline], printSequence(path42, options2, print, "arguments"))]), softline, ")"]) : "", node3.repeatable ? " repeatable" : "", " on ", join4(" | ", path42.map(print, "locations"))];
             }
             case "EnumTypeExtension":
             case "EnumTypeDefinition": {
-              return [print("description"), node3.description ? hardline : "", node3.kind === "EnumTypeExtension" ? "extend " : "", "enum ", print("name"), printDirectives(path42, print, node3), node3.values.length > 0 ? [" {", indent3([hardline, join5(hardline, printSequence(path42, options2, print, "values"))]), hardline, "}"] : ""];
+              return [print("description"), node3.description ? hardline : "", node3.kind === "EnumTypeExtension" ? "extend " : "", "enum ", print("name"), printDirectives(path42, print, node3), node3.values.length > 0 ? [" {", indent3([hardline, join4(hardline, printSequence(path42, options2, print, "values"))]), hardline, "}"] : ""];
             }
             case "EnumValueDefinition": {
               return [print("description"), node3.description ? hardline : "", print("name"), printDirectives(path42, print, node3)];
@@ -342533,20 +342533,20 @@ ${fromBody}`;
             }
             case "InputObjectTypeExtension":
             case "InputObjectTypeDefinition": {
-              return [print("description"), node3.description ? hardline : "", node3.kind === "InputObjectTypeExtension" ? "extend " : "", "input ", print("name"), printDirectives(path42, print, node3), node3.fields.length > 0 ? [" {", indent3([hardline, join5(hardline, printSequence(path42, options2, print, "fields"))]), hardline, "}"] : ""];
+              return [print("description"), node3.description ? hardline : "", node3.kind === "InputObjectTypeExtension" ? "extend " : "", "input ", print("name"), printDirectives(path42, print, node3), node3.fields.length > 0 ? [" {", indent3([hardline, join4(hardline, printSequence(path42, options2, print, "fields"))]), hardline, "}"] : ""];
             }
             case "SchemaExtension": {
-              return ["extend schema", printDirectives(path42, print, node3), ...node3.operationTypes.length > 0 ? [" {", indent3([hardline, join5(hardline, printSequence(path42, options2, print, "operationTypes"))]), hardline, "}"] : []];
+              return ["extend schema", printDirectives(path42, print, node3), ...node3.operationTypes.length > 0 ? [" {", indent3([hardline, join4(hardline, printSequence(path42, options2, print, "operationTypes"))]), hardline, "}"] : []];
             }
             case "SchemaDefinition": {
-              return [print("description"), node3.description ? hardline : "", "schema", printDirectives(path42, print, node3), " {", node3.operationTypes.length > 0 ? indent3([hardline, join5(hardline, printSequence(path42, options2, print, "operationTypes"))]) : "", hardline, "}"];
+              return [print("description"), node3.description ? hardline : "", "schema", printDirectives(path42, print, node3), " {", node3.operationTypes.length > 0 ? indent3([hardline, join4(hardline, printSequence(path42, options2, print, "operationTypes"))]) : "", hardline, "}"];
             }
             case "OperationTypeDefinition": {
               return [print("operation"), ": ", print("type")];
             }
             case "InterfaceTypeExtension":
             case "InterfaceTypeDefinition": {
-              return [print("description"), node3.description ? hardline : "", node3.kind === "InterfaceTypeExtension" ? "extend " : "", "interface ", print("name"), node3.interfaces.length > 0 ? [" implements ", ...printInterfaces(path42, options2, print)] : "", printDirectives(path42, print, node3), node3.fields.length > 0 ? [" {", indent3([hardline, join5(hardline, printSequence(path42, options2, print, "fields"))]), hardline, "}"] : ""];
+              return [print("description"), node3.description ? hardline : "", node3.kind === "InterfaceTypeExtension" ? "extend " : "", "interface ", print("name"), node3.interfaces.length > 0 ? [" implements ", ...printInterfaces(path42, options2, print)] : "", printDirectives(path42, print, node3), node3.fields.length > 0 ? [" {", indent3([hardline, join4(hardline, printSequence(path42, options2, print, "fields"))]), hardline, "}"] : ""];
             }
             case "FragmentSpread": {
               return ["...", print("name"), printDirectives(path42, print, node3)];
@@ -342556,7 +342556,7 @@ ${fromBody}`;
             }
             case "UnionTypeExtension":
             case "UnionTypeDefinition": {
-              return group([print("description"), node3.description ? hardline : "", group([node3.kind === "UnionTypeExtension" ? "extend " : "", "union ", print("name"), printDirectives(path42, print, node3), node3.types.length > 0 ? [" =", ifBreak("", " "), indent3([ifBreak([line, "  "]), join5([line, "| "], path42.map(print, "types"))])] : ""])]);
+              return group([print("description"), node3.description ? hardline : "", group([node3.kind === "UnionTypeExtension" ? "extend " : "", "union ", print("name"), printDirectives(path42, print, node3), node3.types.length > 0 ? [" =", ifBreak("", " "), indent3([ifBreak([line, "  "]), join4([line, "| "], path42.map(print, "types"))])] : ""])]);
             }
             case "ScalarTypeExtension":
             case "ScalarTypeDefinition": {
@@ -342576,7 +342576,7 @@ ${fromBody}`;
           if (node3.directives.length === 0) {
             return "";
           }
-          const printed = join5(line, path42.map(print, "directives"));
+          const printed = join4(line, path42.map(print, "directives"));
           if (node3.kind === "FragmentDefinition" || node3.kind === "OperationDefinition") {
             return group([line, printed]);
           }
@@ -343201,7 +343201,7 @@ ${extracted.content}`;
         var {
           builders: {
             breakParent,
-            join: join5,
+            join: join4,
             line,
             literalline,
             markAsRoot,
@@ -343502,9 +343502,9 @@ ${extracted.content}`;
           function printTableContents(isCompact) {
             const parts = [printRow(contents[0], isCompact), printAlign(isCompact)];
             if (contents.length > 1) {
-              parts.push(join5(hardlineWithoutBreakParent, contents.slice(1).map((rowContents) => printRow(rowContents, isCompact))));
+              parts.push(join4(hardlineWithoutBreakParent, contents.slice(1).map((rowContents) => printRow(rowContents, isCompact))));
             }
-            return join5(hardlineWithoutBreakParent, parts);
+            return join4(hardlineWithoutBreakParent, parts);
           }
           function printAlign(isCompact) {
             const align22 = columnMaxWidths.map((width, index3) => {
@@ -343941,7 +343941,7 @@ ${extracted.content}`;
           builders: {
             line,
             hardline,
-            join: join5
+            join: join4
           },
           utils: {
             getDocParts,
@@ -344295,7 +344295,7 @@ ${extracted.content}`;
           return tagName === "script" && attributeName === "setup" || tagName === "style" && attributeName === "vars";
         }
         function getTextValueParts(node3, value = node3.value) {
-          return node3.parent.isWhitespaceSensitive ? node3.parent.isIndentationSensitive ? replaceTextEndOfLine(value) : replaceTextEndOfLine(dedentString(htmlTrimPreserveIndentation(value)), hardline) : getDocParts(join5(line, splitByHtmlWhitespace(value)));
+          return node3.parent.isWhitespaceSensitive ? node3.parent.isIndentationSensitive ? replaceTextEndOfLine(value) : replaceTextEndOfLine(dedentString(htmlTrimPreserveIndentation(value)), hardline) : getDocParts(join4(line, splitByHtmlWhitespace(value)));
         }
         function isVueScriptTag(node3, options2) {
           return isVueSfcBlock(node3, options2) && node3.name === "script";
@@ -345590,7 +345590,7 @@ ${extracted.content}`;
         var {
           builders: {
             indent: indent3,
-            join: join5,
+            join: join4,
             line,
             softline,
             hardline
@@ -345704,7 +345704,7 @@ ${extracted.content}`;
           const forceNotToBreakAttrContent = node3.type === "element" && node3.fullName === "script" && node3.attrs.length === 1 && node3.attrs[0].fullName === "src" && node3.children.length === 0;
           const shouldPrintAttributePerLine = options2.singleAttributePerLine && node3.attrs.length > 1 && !isVueSfcBlock(node3, options2);
           const attributeLine = shouldPrintAttributePerLine ? hardline : line;
-          const parts = [indent3([forceNotToBreakAttrContent ? " " : line, join5(attributeLine, printedAttributes)])];
+          const parts = [indent3([forceNotToBreakAttrContent ? " " : line, join4(attributeLine, printedAttributes)])];
           if (node3.firstChild && needsToBorrowParentOpeningTagEndMarker(node3.firstChild) || node3.isSelfClosing && needsToBorrowLastChildClosingTagEndMarker(node3.parent) || forceNotToBreakAttrContent) {
             parts.push(node3.isSelfClosing ? " " : "");
           } else {
@@ -345938,7 +345938,7 @@ ${extracted.content}`;
         var {
           builders: {
             ifBreak,
-            join: join5,
+            join: join4,
             line
           }
         } = require_doc();
@@ -345973,7 +345973,7 @@ ${extracted.content}`;
             return index3 === -1 ? descriptor.length : index3;
           });
           const maxDescriptorLeftLength = getMax(descriptorLeftLengths);
-          return join5([",", line], urls.map((url, index3) => {
+          return join4([",", line], urls.map((url, index3) => {
             const parts = [url];
             const descriptor = descriptors[index3];
             if (descriptor) {
@@ -347147,7 +347147,7 @@ ${text8}`;
             line,
             softline,
             hardline,
-            join: join5
+            join: join4
           }
         } = require_doc();
         var {
@@ -347170,7 +347170,7 @@ ${text8}`;
           }
           const lastItem = getLast(node3.children);
           const isLastItemEmptyMappingItem = lastItem && lastItem.type === "flowMappingItem" && isEmptyNode(lastItem.key) && isEmptyNode(lastItem.value);
-          return [openMarker, alignWithSpaces(options2.tabWidth, [bracketSpacing, printChildren(path42, print, options2), options2.trailingComma === "none" ? "" : ifBreak(","), hasEndComments(node3) ? [hardline, join5(hardline, path42.map(print, "endComments"))] : ""]), isLastItemEmptyMappingItem ? "" : bracketSpacing, closeMarker];
+          return [openMarker, alignWithSpaces(options2.tabWidth, [bracketSpacing, printChildren(path42, print, options2), options2.trailingComma === "none" ? "" : ifBreak(","), hasEndComments(node3) ? [hardline, join4(hardline, path42.map(print, "endComments"))] : ""]), isLastItemEmptyMappingItem ? "" : bracketSpacing, closeMarker];
         }
         function printChildren(path42, print, options2) {
           const node3 = path42.getValue();
@@ -347192,7 +347192,7 @@ ${text8}`;
             group,
             hardline,
             ifBreak,
-            join: join5,
+            join: join4,
             line
           }
         } = require_doc();
@@ -347234,7 +347234,7 @@ ${text8}`;
             return [": ", alignWithSpaces(2, printedValue)];
           }
           if (hasLeadingComments(value) || !isInlineNode(key2.content)) {
-            return ["? ", alignWithSpaces(2, printedKey), hardline, join5("", path42.map(print, "value", "leadingComments").map((comment2) => [comment2, hardline])), ": ", alignWithSpaces(2, printedValue)];
+            return ["? ", alignWithSpaces(2, printedKey), hardline, join4("", path42.map(print, "value", "leadingComments").map((comment2) => [comment2, hardline])), ": ", alignWithSpaces(2, printedValue)];
           }
           if (isSingleLineNode(key2.content) && !hasLeadingComments(key2.content) && !hasMiddleComments(key2.content) && !hasTrailingComment(key2.content) && !hasEndComments(key2) && !hasLeadingComments(value.content) && !hasMiddleComments(value.content) && !hasEndComments(value) && isAbsolutelyPrintedAsSingleLineNode(value.content, options2)) {
             return [printedKey, spaceBeforeColon, ": ", printedValue];
@@ -347318,7 +347318,7 @@ ${text8}`;
             dedentToRoot,
             fill: fill2,
             hardline,
-            join: join5,
+            join: join4,
             line,
             literalline,
             markAsRoot
@@ -347361,7 +347361,7 @@ ${text8}`;
             if (index3 === 0) {
               contentsParts.push(hardline);
             }
-            contentsParts.push(fill2(getDocParts(join5(line, lineWords))));
+            contentsParts.push(fill2(getDocParts(join4(line, lineWords))));
             if (index3 !== lineContents.length - 1) {
               contentsParts.push(lineWords.length === 0 ? hardline : markAsRoot(literalline));
             } else if (node3.chomping === "keep" && isLastDescendant) {
@@ -347387,7 +347387,7 @@ ${text8}`;
             fill: fill2,
             group,
             hardline,
-            join: join5,
+            join: join4,
             line,
             lineSuffix,
             literalline
@@ -347436,7 +347436,7 @@ ${text8}`;
           const node3 = path42.getValue();
           const parts = [];
           if (node3.type !== "mappingValue" && hasLeadingComments(node3)) {
-            parts.push([join5(hardline, path42.map(print, "leadingComments")), hardline]);
+            parts.push([join4(hardline, path42.map(print, "leadingComments")), hardline]);
           }
           const {
             tag,
@@ -347463,7 +347463,7 @@ ${text8}`;
             }
           }
           if (hasMiddleComments(node3)) {
-            parts.push([node3.middleComments.length === 1 ? "" : hardline, join5(hardline, path42.map(print, "middleComments")), hardline]);
+            parts.push([node3.middleComments.length === 1 ? "" : hardline, join4(hardline, path42.map(print, "middleComments")), hardline]);
           }
           const parentNode = path42.getParentNode();
           if (hasPrettierIgnore(path42)) {
@@ -347475,7 +347475,7 @@ ${text8}`;
             parts.push(lineSuffix([node3.type === "mappingValue" && !node3.content ? "" : " ", parentNode.type === "mappingKey" && path42.getParentNode(2).type === "mapping" && isInlineNode(node3) ? "" : breakParent, print("trailingComment")]));
           }
           if (shouldPrintEndComments(node3)) {
-            parts.push(alignWithSpaces(node3.type === "sequenceItem" ? 2 : 0, [hardline, join5(hardline, path42.map((path210) => [isPreviousLineEmpty(options2.originalText, path210.getValue(), locStart) ? hardline : "", print()], "endComments"))]));
+            parts.push(alignWithSpaces(node3.type === "sequenceItem" ? 2 : 0, [hardline, join4(hardline, path42.map((path210) => [isPreviousLineEmpty(options2.originalText, path210.getValue(), locStart) ? hardline : "", print()], "endComments"))]));
           }
           parts.push(nextEmptyLine);
           return parts;
@@ -347525,10 +347525,10 @@ ${text8}`;
               if (shouldPrintDocumentBody(node3)) {
                 parts.push(print("body"));
               }
-              return join5(hardline, parts);
+              return join4(hardline, parts);
             }
             case "documentHead":
-              return join5(hardline, [...path42.map(print, "children"), ...path42.map(print, "endComments")]);
+              return join4(hardline, [...path42.map(print, "children"), ...path42.map(print, "endComments")]);
             case "documentBody": {
               const {
                 children: children2,
@@ -347545,10 +347545,10 @@ ${text8}`;
                   separator = hardline;
                 }
               }
-              return [join5(hardline, path42.map(print, "children")), separator, join5(hardline, path42.map(print, "endComments"))];
+              return [join4(hardline, path42.map(print, "children")), separator, join4(hardline, path42.map(print, "endComments"))];
             }
             case "directive":
-              return ["%", join5(" ", [node3.name, ...node3.parameters])];
+              return ["%", join4(" ", [node3.name, ...node3.parameters])];
             case "comment":
               return ["#", node3.value];
             case "alias":
@@ -347583,7 +347583,7 @@ ${text8}`;
             }
             case "mapping":
             case "sequence":
-              return join5(hardline, path42.map(print, "children"));
+              return join4(hardline, path42.map(print, "children"));
             case "sequenceItem":
               return ["- ", alignWithSpaces(2, node3.content ? print("content") : "")];
             case "mappingKey":
@@ -347620,7 +347620,7 @@ ${text8}`;
         }
         function printFlowScalarContent(nodeType, content5, options2) {
           const lineContents = getFlowScalarLineContents(nodeType, content5, options2);
-          return join5(hardline, lineContents.map((lineContentWords) => fill2(getDocParts(join5(line, lineContentWords)))));
+          return join4(hardline, lineContents.map((lineContentWords) => fill2(getDocParts(join4(line, lineContentWords)))));
         }
         function clean2(node3, newNode) {
           if (isNode4(newNode)) {
@@ -356329,6 +356329,7 @@ var init_ReadmeConfig2 = __esm({
     ReadmeConfig = schemas_exports4.objectWithoutOptionalProperties({
       defaultEndpoint: schemas_exports4.lazy(async () => (await Promise.resolve().then(() => (init_serialization2(), serialization_exports2))).EndpointId).optional(),
       bannerLink: schemas_exports4.string().optional(),
+      introduction: schemas_exports4.string().optional(),
       apiReferenceLink: schemas_exports4.string().optional(),
       features: schemas_exports4.record(schemas_exports4.lazy(async () => (await Promise.resolve().then(() => (init_serialization2(), serialization_exports2))).FeatureId), schemas_exports4.list(schemas_exports4.lazy(async () => (await Promise.resolve().then(() => (init_serialization2(), serialization_exports2))).EndpointId))).optional()
     });
@@ -362930,7 +362931,7 @@ var require_path_reservations = __commonJS({
     var assert2 = require("assert");
     var normalize4 = require_normalize_unicode();
     var stripSlashes = require_strip_trailing_slashes();
-    var { join: join5 } = require("path");
+    var { join: join4 } = require("path");
     var platform = process.env.TESTING_TAR_FAKE_PLATFORM || process.platform;
     var isWindows = platform === "win32";
     module2.exports = () => {
@@ -362939,7 +362940,7 @@ var require_path_reservations = __commonJS({
       const getDirs = (path42) => {
         const dirs = path42.split("/").slice(0, -1).reduce((set7, path43) => {
           if (set7.length) {
-            path43 = join5(set7[set7.length - 1], path43);
+            path43 = join4(set7[set7.length - 1], path43);
           }
           set7.push(path43 || "/");
           return set7;
@@ -363007,7 +363008,7 @@ var require_path_reservations = __commonJS({
       };
       const reserve = (paths, fn2) => {
         paths = isWindows ? ["win32 parallelization disabled"] : paths.map((p2) => {
-          return stripSlashes(join5(normalize4(p2))).toLowerCase();
+          return stripSlashes(join4(normalize4(p2))).toLowerCase();
         });
         const dirs = new Set(
           paths.map((path42) => getDirs(path42)).reduce((a2, b2) => a2.concat(b2))
@@ -427649,7 +427650,7 @@ var require_require_directory = __commonJS({
   "pnp:/home/circleci/project/.yarn/cache/require-directory-npm-2.1.1-8608aee50b-fb47e70bf0.zip/node_modules/require-directory/index.js"(exports2, module2) {
     "use strict";
     var fs9 = require("fs");
-    var join5 = require("path").join;
+    var join4 = require("path").join;
     var resolve6 = require("path").resolve;
     var dirname5 = require("path").dirname;
     var defaultOptions2 = {
@@ -427679,7 +427680,7 @@ var require_require_directory = __commonJS({
       }
       path42 = !path42 ? dirname5(m.filename) : resolve6(dirname5(m.filename), path42);
       fs9.readdirSync(path42).forEach(function(filename) {
-        var joined = join5(path42, filename), files, key2, obj;
+        var joined = join4(path42, filename), files, key2, obj;
         if (fs9.statSync(joined).isDirectory() && options2.recurse) {
           files = requireDirectory(m, joined, options2);
           if (Object.keys(files).length) {
@@ -432330,7 +432331,7 @@ var require_minimist = __commonJS({
 var require_rc = __commonJS({
   "pnp:/home/circleci/project/.yarn/cache/rc-npm-1.2.8-d6768ac936-2e26e052f8.zip/node_modules/rc/index.js"(exports2, module2) {
     var cc = require_utils19();
-    var join5 = require("path").join;
+    var join4 = require("path").join;
     var deepExtend = require_deep_extend();
     var etc = "/etc";
     var win = process.platform === "win32";
@@ -432356,15 +432357,15 @@ var require_rc = __commonJS({
       }
       if (!win)
         [
-          join5(etc, name3, "config"),
-          join5(etc, name3 + "rc")
+          join4(etc, name3, "config"),
+          join4(etc, name3 + "rc")
         ].forEach(addConfigFile);
       if (home)
         [
-          join5(home, ".config", name3, "config"),
-          join5(home, ".config", name3),
-          join5(home, "." + name3, "config"),
-          join5(home, "." + name3 + "rc")
+          join4(home, ".config", name3, "config"),
+          join4(home, ".config", name3),
+          join4(home, "." + name3, "config"),
+          join4(home, "." + name3 + "rc")
         ].forEach(addConfigFile);
       addConfigFile(cc.find("." + name3 + "rc"));
       if (env5.config)
@@ -441188,7 +441189,7 @@ var require_view = __commonJS({
     var dirname5 = path42.dirname;
     var basename4 = path42.basename;
     var extname3 = path42.extname;
-    var join5 = path42.join;
+    var join4 = path42.join;
     var resolve6 = path42.resolve;
     module2.exports = View;
     function View(name3, options2) {
@@ -441236,12 +441237,12 @@ var require_view = __commonJS({
     };
     View.prototype.resolve = function resolve7(dir, file) {
       var ext = this.ext;
-      var path43 = join5(dir, file);
+      var path43 = join4(dir, file);
       var stat = tryStat(path43);
       if (stat && stat.isFile()) {
         return path43;
       }
-      path43 = join5(dir, basename4(file, ext), "index" + ext);
+      path43 = join4(dir, basename4(file, ext), "index" + ext);
       stat = tryStat(path43);
       if (stat && stat.isFile()) {
         return path43;
@@ -441700,7 +441701,7 @@ var require_send = __commonJS({
     var Stream2 = require("stream");
     var util2 = require("util");
     var extname3 = path42.extname;
-    var join5 = path42.join;
+    var join4 = path42.join;
     var normalize4 = path42.normalize;
     var resolve6 = path42.resolve;
     var sep = path42.sep;
@@ -441919,7 +441920,7 @@ var require_send = __commonJS({
           return res;
         }
         parts = path43.split(sep);
-        path43 = normalize4(join5(root4, path43));
+        path43 = normalize4(join4(root4, path43));
       } else {
         if (UP_PATH_REGEXP.test(path43)) {
           debug('malicious path "%s"', path43);
@@ -442060,7 +442061,7 @@ var require_send = __commonJS({
             return self2.onStatError(err);
           return self2.error(404);
         }
-        var p2 = join5(path43, self2._index[i2]);
+        var p2 = join4(path43, self2._index[i2]);
         debug('stat "%s"', p2);
         fs9.stat(p2, function(err2, stat) {
           if (err2)
@@ -445140,9 +445141,9 @@ var require_express3 = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/stream.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/stream.js
 var require_stream2 = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/stream.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/stream.js"(exports2, module2) {
     "use strict";
     var { Duplex } = require("stream");
     function emitClose(stream) {
@@ -445245,9 +445246,9 @@ var require_stream2 = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/constants.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/constants.js
 var require_constants6 = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/constants.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/constants.js"(exports2, module2) {
     "use strict";
     module2.exports = {
       BINARY_TYPES: ["nodebuffer", "arraybuffer", "fragments"],
@@ -445263,9 +445264,9 @@ var require_constants6 = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/buffer-util.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/buffer-util.js
 var require_buffer_util = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/buffer-util.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/buffer-util.js"(exports2, module2) {
     "use strict";
     var { EMPTY_BUFFER } = require_constants6();
     var FastBuffer = Buffer[Symbol.species];
@@ -445345,9 +445346,9 @@ var require_buffer_util = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/limiter.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/limiter.js
 var require_limiter2 = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/limiter.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/limiter.js"(exports2, module2) {
     "use strict";
     var kDone = Symbol("kDone");
     var kRun = Symbol("kRun");
@@ -445379,9 +445380,9 @@ var require_limiter2 = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/permessage-deflate.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/permessage-deflate.js
 var require_permessage_deflate = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/permessage-deflate.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/permessage-deflate.js"(exports2, module2) {
     "use strict";
     var zlib2 = require("zlib");
     var bufferUtil = require_buffer_util();
@@ -445661,9 +445662,9 @@ var require_permessage_deflate = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/validation.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/validation.js
 var require_validation6 = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/validation.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/validation.js"(exports2, module2) {
     "use strict";
     var { isUtf8 } = require("buffer");
     var tokenChars = [
@@ -445847,9 +445848,9 @@ var require_validation6 = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/receiver.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/receiver.js
 var require_receiver = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/receiver.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/receiver.js"(exports2, module2) {
     "use strict";
     var { Writable: Writable2 } = require("stream");
     var PerMessageDeflate = require_permessage_deflate();
@@ -446344,9 +446345,9 @@ var require_receiver = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/sender.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/sender.js
 var require_sender = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/sender.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/sender.js"(exports2, module2) {
     "use strict";
     var { Duplex } = require("stream");
     var { randomFillSync } = require("crypto");
@@ -446356,6 +446357,9 @@ var require_sender = __commonJS({
     var { mask: applyMask, toBuffer } = require_buffer_util();
     var kByteLength = Symbol("kByteLength");
     var maskBuffer = Buffer.alloc(4);
+    var RANDOM_POOL_SIZE = 8 * 1024;
+    var randomPool;
+    var randomPoolPointer = RANDOM_POOL_SIZE;
     var Sender2 = class {
       constructor(socket, extensions, generateMask) {
         this._extensions = extensions || {};
@@ -446380,7 +446384,17 @@ var require_sender = __commonJS({
           if (options2.generateMask) {
             options2.generateMask(mask2);
           } else {
-            randomFillSync(mask2, 0, 4);
+            if (randomPoolPointer === RANDOM_POOL_SIZE) {
+              if (randomPool === void 0) {
+                randomPool = Buffer.alloc(RANDOM_POOL_SIZE);
+              }
+              randomFillSync(randomPool, 0, RANDOM_POOL_SIZE);
+              randomPoolPointer = 0;
+            }
+            mask2[0] = randomPool[randomPoolPointer++];
+            mask2[1] = randomPool[randomPoolPointer++];
+            mask2[2] = randomPool[randomPoolPointer++];
+            mask2[3] = randomPool[randomPoolPointer++];
           }
           skipMasking = (mask2[0] | mask2[1] | mask2[2] | mask2[3]) === 0;
           offset2 = 6;
@@ -446644,9 +446658,9 @@ var require_sender = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/event-target.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/event-target.js
 var require_event_target = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/event-target.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/event-target.js"(exports2, module2) {
     "use strict";
     var { kForOnEventAttribute, kListener } = require_constants6();
     var kCode = Symbol("kCode");
@@ -446794,9 +446808,9 @@ var require_event_target = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/extension.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/extension.js
 var require_extension = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/extension.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/extension.js"(exports2, module2) {
     "use strict";
     var { tokenChars } = require_validation6();
     function push3(dest, name3, elem) {
@@ -446964,9 +446978,9 @@ var require_extension = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/websocket.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/websocket.js
 var require_websocket = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/websocket.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/websocket.js"(exports2, module2) {
     "use strict";
     var EventEmitter2 = require("events");
     var https = require("https");
@@ -447509,7 +447523,8 @@ var require_websocket = __commonJS({
         if (websocket.readyState !== WebSocket2.CONNECTING)
           return;
         req2 = websocket._req = null;
-        if (res.headers.upgrade.toLowerCase() !== "websocket") {
+        const upgrade2 = res.headers.upgrade;
+        if (upgrade2 === void 0 || upgrade2.toLowerCase() !== "websocket") {
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
@@ -447715,9 +447730,9 @@ var require_websocket = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/subprotocol.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/subprotocol.js
 var require_subprotocol = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/subprotocol.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/subprotocol.js"(exports2, module2) {
     "use strict";
     var { tokenChars } = require_validation6();
     function parse8(header) {
@@ -447763,9 +447778,9 @@ var require_subprotocol = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/websocket-server.js
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/websocket-server.js
 var require_websocket_server = __commonJS({
-  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/lib/websocket-server.js"(exports2, module2) {
+  "pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/lib/websocket-server.js"(exports2, module2) {
     "use strict";
     var EventEmitter2 = require("events");
     var http4 = require("http");
@@ -447901,18 +447916,19 @@ var require_websocket_server = __commonJS({
       handleUpgrade(req2, socket, head2, cb) {
         socket.on("error", socketOnError);
         const key2 = req2.headers["sec-websocket-key"];
+        const upgrade2 = req2.headers.upgrade;
         const version3 = +req2.headers["sec-websocket-version"];
         if (req2.method !== "GET") {
           const message = "Invalid HTTP method";
           abortHandshakeOrEmitwsClientError(this, req2, socket, 405, message);
           return;
         }
-        if (req2.headers.upgrade.toLowerCase() !== "websocket") {
+        if (upgrade2 === void 0 || upgrade2.toLowerCase() !== "websocket") {
           const message = "Invalid Upgrade header";
           abortHandshakeOrEmitwsClientError(this, req2, socket, 400, message);
           return;
         }
-        if (!key2 || !keyRegex.test(key2)) {
+        if (key2 === void 0 || !keyRegex.test(key2)) {
           const message = "Missing or invalid Sec-WebSocket-Key header";
           abortHandshakeOrEmitwsClientError(this, req2, socket, 400, message);
           return;
@@ -448754,7 +448770,7 @@ var require_BufferList3 = __commonJS({
         this.head = this.tail = null;
         this.length = 0;
       };
-      BufferList.prototype.join = function join5(s2) {
+      BufferList.prototype.join = function join4(s2) {
         if (this.length === 0)
           return "";
         var p2 = this.head;
@@ -1074372,6 +1074388,7 @@ var GeneratorInvocationSchema = z.strictObject({
   snippets: z.optional(GeneratorSnippetsSchema),
   "ir-version": z.optional(z.string()),
   "smart-casing": z.optional(z.boolean()),
+  api: z.optional(z.object({ settings: z.optional(APIDefinitionSettingsSchema) })),
   "disable-examples": z.optional(z.boolean()),
   "publish-metadata": z.optional(GeneratorPublishMetadataSchema)
 });
@@ -1074412,6 +1074429,7 @@ var ReadmeEndpointSchema = z.union([
 // pnp:/home/circleci/project/packages/cli/configuration/lib/generators-yml/schemas/ReadmeSchema.js
 var ReadmeSchema = z.strictObject({
   bannerLink: z.optional(z.string()),
+  introduction: z.optional(z.string()),
   apiReferenceLink: z.optional(z.string()),
   defaultEndpoint: z.optional(ReadmeEndpointSchema).describe("If set, use this endpoint's snippet as the default whenever possible"),
   features: z.optional(z.record(z.array(ReadmeEndpointSchema))).describe("Specifies a list of endpoints associated with the feature")
@@ -1074585,7 +1074603,7 @@ async function convertGroup({ absolutePathToGeneratorsConfiguration, groupName,
   };
 }
 async function convertGenerator({ absolutePathToGeneratorsConfiguration, generator, maybeGroupLevelMetadata, maybeTopLevelMetadata, readme }) {
-  var _a5, _b4;
+  var _a5, _b4, _c4;
   return {
     name: generator.name,
     version: generator.version,
@@ -1074604,7 +1074622,8 @@ async function convertGenerator({ absolutePathToGeneratorsConfiguration, generat
     language: getLanguageFromGeneratorName(generator.name),
     irVersionOverride: generator["ir-version"] ?? void 0,
     publishMetadata: getPublishMetadata({ generatorInvocation: generator }),
-    readme
+    readme,
+    settings: ((_c4 = generator.api) == null ? void 0 : _c4.settings) ?? void 0
   };
 }
 function getPublishMetadata({ generatorInvocation }) {
@@ -1077782,7 +1077801,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.31.0-rc2",
+          version: "0.31.0-rc3",
           usingAccessToken: true
         }
       });
@@ -1077844,7 +1077863,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.31.0-rc2",
+        version: "0.31.0-rc3",
         ...event,
         ...event.properties
       }
@@ -1090102,10 +1090121,307 @@ function isRawMultipleBaseUrlsEnvironment(environment) {
 var import_fiddle_sdk3 = __toESM(require_fiddle_sdk());
 var import_axios3 = __toESM(require_axios4());
 var import_fs3 = require("fs");
-var import_path18 = __toESM(require("path"));
-var import_promises26 = require("stream/promises");
+var import_path17 = __toESM(require("path"));
+var import_promises24 = require("stream/promises");
 var import_tar = __toESM(require_tar());
 var import_tmp_promise2 = __toESM(require_tmp_promise());
+var FIDDLE = createFiddleService();
+async function loadDependency({ dependencyName, dependenciesConfiguration, context, rootApiFile, cliVersion }) {
+  let definition3;
+  let failure = {
+    type: WorkspaceLoaderFailureType.FAILED_TO_LOAD_DEPENDENCY,
+    dependencyName
+  };
+  const dependency = dependenciesConfiguration.dependencies[dependencyName];
+  if (dependency == null) {
+    failure = {
+      type: WorkspaceLoaderFailureType.DEPENDENCY_NOT_LISTED,
+      dependencyName
+    };
+  } else {
+    await context.runInteractiveTask({ name: `Download ${stringifyDependency(dependency)}` }, async (contextForDependency) => {
+      switch (dependency.type) {
+        case "version":
+          definition3 = await validateVersionedDependencyAndGetDefinition({
+            context: contextForDependency,
+            dependency,
+            cliVersion
+          });
+          return;
+        case "local":
+          definition3 = await validateLocalDependencyAndGetDefinition({
+            context: contextForDependency,
+            dependency,
+            cliVersion
+          });
+          return;
+        default:
+          assertNever(dependency);
+      }
+    });
+  }
+  if (definition3 != null) {
+    return { didSucceed: true, definition: definition3 };
+  } else {
+    return { didSucceed: false, failure };
+  }
+}
+async function validateLocalDependencyAndGetDefinition({ dependency, context, cliVersion }) {
+  context.logger.info("Parsing...");
+  const loadDependencyWorkspaceResult = await loadAPIWorkspace({
+    absolutePathToWorkspace: dependency.absoluteFilepath,
+    context,
+    cliVersion,
+    workspaceName: void 0
+  });
+  if (!loadDependencyWorkspaceResult.didSucceed) {
+    context.failWithoutThrowing("Failed to load api definition", loadDependencyWorkspaceResult.failures);
+    return void 0;
+  }
+  return await loadDependencyWorkspaceResult.workspace.getDefinition({ context });
+}
+async function validateVersionedDependencyAndGetDefinition({ dependency, context, cliVersion }) {
+  context.logger.info("Downloading manifest...");
+  const response = await FIDDLE.definitionRegistry.get(import_fiddle_sdk3.FernFiddle.OrganizationId(dependency.organization), import_fiddle_sdk3.FernFiddle.ApiId(dependency.apiName), dependency.version);
+  if (!response.ok) {
+    response.error._visit({
+      orgDoesNotExistError: () => {
+        context.failWithoutThrowing("Organization does not exist");
+      },
+      apiDoesNotExistError: () => {
+        context.failWithoutThrowing("API does not exist");
+      },
+      versionDoesNotExistError: () => {
+        context.failWithoutThrowing("Version does not exist");
+      },
+      _other: (error) => {
+        context.failWithoutThrowing("Failed to download API manifest", error);
+      }
+    });
+    return void 0;
+  }
+  const parsedYamlVersionOfDependency = response.body.yamlSchemaVersion != null ? parseInt(response.body.yamlSchemaVersion) : void 0;
+  const parsedCliVersion = parseVersion(cliVersion);
+  const parsedCliVersionOfDependency = parseVersion(response.body.cliVersion);
+  if (parsedYamlVersionOfDependency != null) {
+    if (parsedYamlVersionOfDependency > YAML_SCHEMA_VERSION) {
+      context.failWithoutThrowing(`${dependency.organization}/${dependency.apiName}@${dependency.version} on a higher version of fern. Upgrade this workspace to ${response.body.cliVersion}`);
+      return void 0;
+    } else if (parsedYamlVersionOfDependency < YAML_SCHEMA_VERSION) {
+      context.failWithoutThrowing(`${dependency.organization}/${dependency.apiName}@${dependency.version} on a lower version of fern. Upgrade it to ${cliVersion}`);
+      return void 0;
+    }
+  } else if (parsedCliVersion.major !== parsedCliVersionOfDependency.major || parsedCliVersion.minor !== parsedCliVersionOfDependency.minor) {
+    context.failWithoutThrowing(`CLI version is ${response.body.cliVersion}. Expected ${parsedCliVersion.major}.${parsedCliVersion.minor}.x (to match current workspace).`);
+    return void 0;
+  }
+  context.logger.info("Downloading...");
+  const pathToDependency = AbsoluteFilePath.of((await import_tmp_promise2.default.dir()).path);
+  context.logger.debug("Remote URL: " + response.body.definitionS3DownloadUrl);
+  try {
+    await downloadDependency({
+      s3PreSignedReadUrl: response.body.definitionS3DownloadUrl,
+      absolutePathToLocalOutput: pathToDependency
+    });
+  } catch (error) {
+    context.failWithoutThrowing("Failed to download API", error);
+    return void 0;
+  }
+  context.logger.info("Parsing...");
+  const loadDependencyWorkspaceResult = await loadAPIWorkspace({
+    absolutePathToWorkspace: pathToDependency,
+    context,
+    cliVersion: response.body.cliVersion,
+    workspaceName: void 0
+  });
+  if (!loadDependencyWorkspaceResult.didSucceed) {
+    context.failWithoutThrowing("Failed to parse dependency after downloading", loadDependencyWorkspaceResult.failures);
+    return void 0;
+  }
+  const workspaceOfDependency = loadDependencyWorkspaceResult.workspace;
+  if (workspaceOfDependency.type === "oss") {
+    context.failWithoutThrowing("Dependency must be a fern workspace.");
+    return void 0;
+  }
+  return await loadDependencyWorkspaceResult.workspace.getDefinition({ context });
+}
+async function downloadDependency({ s3PreSignedReadUrl, absolutePathToLocalOutput }) {
+  const request = await import_axios3.default.get(s3PreSignedReadUrl, {
+    responseType: "stream"
+  });
+  const tmpDir = await import_tmp_promise2.default.dir();
+  const outputTarPath = import_path17.default.join(tmpDir.path, "api.tgz");
+  await (0, import_promises24.pipeline)(request.data, (0, import_fs3.createWriteStream)(outputTarPath));
+  await import_tar.default.extract({ file: outputTarPath, cwd: absolutePathToLocalOutput });
+}
+function stringifyDependency(dependency) {
+  switch (dependency.type) {
+    case "version":
+      return `@${dependency.organization}/${dependency.apiName}`;
+    case "local":
+      return `${dependency.path}`;
+    default:
+      assertNever(dependency);
+  }
+}
+
+// pnp:/home/circleci/project/packages/cli/workspace-loader/lib/processPackageMarkers.js
+async function processPackageMarkers({ dependenciesConfiguration, structuralValidationResult, context, cliVersion }) {
+  const packageMarkers = {};
+  const importedDefinitions = {};
+  const failures = {};
+  await Promise.all(entries(structuralValidationResult.packageMarkers).map(async ([pathOfPackageMarker, packageMarker]) => {
+    if (packageMarker.contents.export == null) {
+      packageMarkers[pathOfPackageMarker] = packageMarker;
+    } else {
+      const { export: _4, ...otherPackageMarkerKeys } = packageMarker.contents;
+      if (size_default(otherPackageMarkerKeys) > 0) {
+        failures[pathOfPackageMarker] = {
+          type: WorkspaceLoaderFailureType.EXPORTING_PACKAGE_MARKER_OTHER_KEYS,
+          pathOfPackageMarker
+        };
+      } else {
+        const pathToPackage = dirname(pathOfPackageMarker);
+        const areDefinitionsDefinedInPackage = keys(structuralValidationResult.namedDefinitionFiles).some((filepath) => filepath !== pathOfPackageMarker && filepath.startsWith(pathToPackage));
+        if (areDefinitionsDefinedInPackage) {
+          failures[pathOfPackageMarker] = {
+            type: WorkspaceLoaderFailureType.EXPORT_PACKAGE_HAS_DEFINITIONS,
+            pathToPackage
+          };
+        } else {
+          const loadDependencyResult = await loadDependency({
+            dependencyName: packageMarker.contents.export,
+            dependenciesConfiguration,
+            context,
+            rootApiFile: structuralValidationResult.rootApiFile.contents,
+            cliVersion
+          });
+          if (loadDependencyResult.didSucceed) {
+            importedDefinitions[dirname(pathOfPackageMarker)] = loadDependencyResult.definition;
+          } else {
+            failures[pathOfPackageMarker] = loadDependencyResult.failure;
+          }
+        }
+      }
+    }
+  }));
+  if (size_default(failures) > 0) {
+    return {
+      didSucceed: false,
+      failures
+    };
+  } else {
+    return {
+      didSucceed: true,
+      packageMarkers,
+      importedDefinitions
+    };
+  }
+}
+
+// pnp:/home/circleci/project/packages/cli/workspace-loader/lib/validateStructureOfYamlFiles.js
+var import_path18 = __toESM(require("path"));
+function validateStructureOfYamlFiles({ files, absolutePathToDefinition }) {
+  let rootApiFile = void 0;
+  const namesDefinitionFiles = {};
+  const packageMarkers = {};
+  const failures = {};
+  for (const [relativeFilepath, file] of entries(files)) {
+    const parsedFileContents = file.contents;
+    const addFailure = (error) => {
+      failures[relativeFilepath] = {
+        type: WorkspaceLoaderFailureType.STRUCTURE_VALIDATION,
+        error
+      };
+    };
+    if (relativeFilepath === ROOT_API_FILENAME) {
+      const maybeValidFileContents = RootApiFileSchema.safeParse(parsedFileContents);
+      if (maybeValidFileContents.success) {
+        rootApiFile = {
+          contents: maybeValidFileContents.data,
+          rawContents: file.rawContents
+        };
+      } else {
+        addFailure(maybeValidFileContents.error);
+      }
+    } else if (import_path18.default.basename(relativeFilepath) === FERN_PACKAGE_MARKER_FILENAME) {
+      const maybeValidFileContents = PackageMarkerFileSchema.safeParse(parsedFileContents);
+      if (maybeValidFileContents.success) {
+        packageMarkers[relativeFilepath] = {
+          contents: maybeValidFileContents.data,
+          rawContents: file.rawContents
+        };
+      } else {
+        addFailure(maybeValidFileContents.error);
+      }
+    } else {
+      const maybeValidFileContents = DefinitionFileSchema.safeParse(parsedFileContents);
+      if (maybeValidFileContents.success) {
+        namesDefinitionFiles[relativeFilepath] = {
+          contents: maybeValidFileContents.data,
+          rawContents: file.rawContents,
+          absoluteFilepath: join(absolutePathToDefinition, relativeFilepath)
+        };
+      } else {
+        addFailure(maybeValidFileContents.error);
+      }
+    }
+  }
+  if (rootApiFile == null) {
+    return {
+      didSucceed: false,
+      failures: {
+        [RelativeFilePath.of(ROOT_API_FILENAME)]: {
+          type: WorkspaceLoaderFailureType.FILE_MISSING
+        },
+        ...failures
+      }
+    };
+  }
+  if (Object.keys(failures).length > 0) {
+    return {
+      didSucceed: false,
+      failures
+    };
+  } else {
+    return {
+      didSucceed: true,
+      namedDefinitionFiles: namesDefinitionFiles,
+      rootApiFile,
+      packageMarkers
+    };
+  }
+}
+
+// pnp:/home/circleci/project/packages/cli/workspace-loader/lib/workspaces/AbstractAPIWorkspace.js
+var AbstractAPIWorkspace = class {
+};
+
+// pnp:/home/circleci/project/packages/cli/workspace-loader/lib/workspaces/FernWorkspace.js
+var FernWorkspace = class extends AbstractAPIWorkspace {
+  type = "fern";
+  workspaceName;
+  absoluteFilepath;
+  generatorsConfiguration;
+  dependenciesConfiguration;
+  definition;
+  changelog;
+  constructor({ absoluteFilepath, workspaceName, generatorsConfiguration, dependenciesConfiguration, definition: definition3, changelog }) {
+    super();
+    this.absoluteFilepath = absoluteFilepath;
+    this.workspaceName = workspaceName;
+    this.changelog = changelog;
+    this.generatorsConfiguration = generatorsConfiguration;
+    this.dependenciesConfiguration = dependenciesConfiguration;
+    this.definition = definition3;
+  }
+  async getDefinition() {
+    return this.definition;
+  }
+  async toFernWorkspace() {
+    return this;
+  }
+};
 
 // pnp:/home/circleci/project/packages/cli/openapi-ir-sdk/lib/sdk/index.js
 init_api2();
@@ -1091061,8 +1091377,8 @@ function buildPathParameter({ pathParameter, context, fileContainingReference })
   return pathParameterSchema;
 }
 
-// pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/parse.js
-var import_promises25 = require("fs/promises");
+// pnp:/home/circleci/project/packages/cli/openapi-parser/lib/parse.js
+var import_promises26 = require("fs/promises");
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/getExtension.js
 function getExtension(object4, extension3) {
@@ -1092714,7 +1093030,7 @@ function getTitleAsName(title2) {
 }
 function convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, propertiesToExclude = /* @__PURE__ */ new Set(), referencedAsRequest = false) {
   var _a5;
-  const nameOverride = getExtension(schema2, FernOpenAPIExtension.TYPE_NAME) ?? (context.shouldUseTitleAsName ? getTitleAsName(schema2.title) : void 0);
+  const nameOverride = getExtension(schema2, FernOpenAPIExtension.TYPE_NAME) ?? (context.options.useTitlesAsName ? getTitleAsName(schema2.title) : void 0);
   const mixedGroupName = getExtension(schema2, FernOpenAPIExtension.SDK_GROUP_NAME) ?? ((_a5 = getExtension(schema2, OpenAPIExtension.TAGS)) == null ? void 0 : _a5[0]);
   const groupName = typeof mixedGroupName === "string" ? [mixedGroupName] : mixedGroupName;
   const generatedName = getGeneratedTypeName(breadcrumbs);
@@ -1092973,7 +1093289,7 @@ function convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, prop
     });
   }
   if (schema2.type === "object" && schema2.discriminator != null && schema2.discriminator.mapping != null) {
-    if (!context.shouldUseUndiscriminatedUnionsWithLiterals) {
+    if (!context.options.discriminatedUnionV2) {
       return convertDiscriminatedOneOf({
         nameOverride,
         generatedName,
@@ -1093000,7 +1093316,7 @@ function convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, prop
   }
   if (schema2.oneOf != null && schema2.oneOf.length > 0) {
     if (schema2.discriminator != null && schema2.discriminator.mapping != null && Object.keys(schema2.discriminator.mapping).length > 0) {
-      if (!context.shouldUseUndiscriminatedUnionsWithLiterals) {
+      if (!context.options.discriminatedUnionV2) {
         return convertDiscriminatedOneOf({
           nameOverride,
           generatedName,
@@ -1093052,7 +1093368,7 @@ function convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, prop
         });
       }
       const maybeDiscriminant = getDiscriminant({ schemas: schema2.oneOf, context });
-      if (maybeDiscriminant != null && !context.shouldUseUndiscriminatedUnionsWithLiterals) {
+      if (maybeDiscriminant != null && !context.options.discriminatedUnionV2) {
         return convertDiscriminatedOneOfWithVariants({
           nameOverride,
           generatedName,
@@ -1093105,7 +1093421,7 @@ function convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, prop
       schemas: schema2.anyOf,
       context
     });
-    if (maybeDiscriminant != null && !context.shouldUseUndiscriminatedUnionsWithLiterals) {
+    if (maybeDiscriminant != null && !context.options.discriminatedUnionV2) {
       return convertDiscriminatedOneOfWithVariants({
         nameOverride,
         generatedName,
@@ -1093418,15 +1093734,13 @@ var AbstractAsyncAPIV2ParserContext = class {
   document;
   taskContext;
   DUMMY;
-  shouldUseTitleAsName;
-  shouldUseUndiscriminatedUnionsWithLiterals;
-  constructor({ document: document6, taskContext, shouldUseTitleAsName, shouldUseUndiscriminatedUnionsWithLiterals, sdkLanguage }) {
+  options;
+  constructor({ document: document6, taskContext, options: options2 }) {
     this.document = document6;
     this.taskContext = taskContext;
     this.logger = taskContext.logger;
     this.DUMMY = this;
-    this.shouldUseTitleAsName = shouldUseTitleAsName;
-    this.shouldUseUndiscriminatedUnionsWithLiterals = shouldUseUndiscriminatedUnionsWithLiterals && sdkLanguage === generators_yml_exports.GenerationLanguage.PYTHON;
+    this.options = options2;
   }
   resolveSchemaReference(schema2) {
     var _a5;
@@ -1093481,13 +1093795,11 @@ var AbstractAsyncAPIV2ParserContext = class {
   }
 };
 var AsyncAPIV2ParserContext = class extends AbstractAsyncAPIV2ParserContext {
-  constructor({ document: document6, taskContext, shouldUseTitleAsName, shouldUseUndiscriminatedUnionsWithLiterals, sdkLanguage }) {
+  constructor({ document: document6, taskContext, options: options2 }) {
     super({
       document: document6,
       taskContext,
-      shouldUseTitleAsName,
-      shouldUseUndiscriminatedUnionsWithLiterals,
-      sdkLanguage
+      options: options2
     });
   }
   markSchemaAsReferencedByNonRequest(schemaId) {
@@ -1095021,7 +1095333,7 @@ function getFernExamples(channel) {
 }
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/asyncapi/parse.js
-function parseAsyncAPI({ document: document6, taskContext, sdkLanguage, shouldUseTitleAsName, shouldUseUndiscriminatedUnionsWithLiterals }) {
+function parseAsyncAPI({ document: document6, taskContext, options: options2 }) {
   var _a5, _b4, _c4, _d2;
   const breadcrumbs = [];
   if (((_a5 = document6.tags) == null ? void 0 : _a5[0]) != null) {
@@ -1095032,9 +1095344,7 @@ function parseAsyncAPI({ document: document6, taskContext, sdkLanguage, shouldUs
   const context = new AsyncAPIV2ParserContext({
     document: document6,
     taskContext,
-    shouldUseTitleAsName,
-    shouldUseUndiscriminatedUnionsWithLiterals,
-    sdkLanguage
+    options: options2
   });
   const schemas = {};
   let parsedChannel = void 0;
@@ -1095214,11 +1095524,11 @@ var import_swagger_parser = __toESM(require_lib17());
 var import_openapi_core = __toESM(require_lib19());
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/mergeWithOverrides.js
-var import_promises24 = require("fs/promises");
+var import_promises25 = require("fs/promises");
 async function mergeWithOverrides({ absoluteFilepathToOverrides, data: data2, context }) {
   let parsedOverrides = null;
   try {
-    const contents = (await (0, import_promises24.readFile)(absoluteFilepathToOverrides, "utf8")).toString();
+    const contents = (await (0, import_promises25.readFile)(absoluteFilepathToOverrides, "utf8")).toString();
     try {
       parsedOverrides = JSON.parse(contents);
     } catch (err) {
@@ -1095489,18 +1095799,15 @@ var AbstractOpenAPIV3ParserContext = class {
   authHeaders;
   refOccurrences;
   DUMMY;
-  shouldUseTitleAsName;
-  shouldUseUndiscriminatedUnionsWithLiterals;
-  sdkLanguage;
-  constructor({ document: document6, taskContext, authHeaders, shouldUseTitleAsName, shouldUseUndiscriminatedUnionsWithLiterals, sdkLanguage }) {
+  options;
+  constructor({ document: document6, taskContext, authHeaders, options: options2 }) {
     this.document = document6;
     this.logger = taskContext.logger;
     this.taskContext = taskContext;
     this.authHeaders = authHeaders;
     this.refOccurrences = getReferenceOccurrences(document6);
+    this.options = options2;
     this.DUMMY = this.getDummy();
-    this.shouldUseTitleAsName = shouldUseTitleAsName;
-    this.shouldUseUndiscriminatedUnionsWithLiterals = shouldUseUndiscriminatedUnionsWithLiterals;
   }
   getNumberOfOccurrencesForRef(schema2) {
     return this.refOccurrences[schema2.$ref] ?? 0;
@@ -1095599,14 +1095906,12 @@ var AbstractOpenAPIV3ParserContext = class {
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/v3/DummyOpenAPIV3ParserContext.js
 var DummyOpenAPIV3ParserContext = class extends AbstractOpenAPIV3ParserContext {
-  constructor({ document: document6, taskContext }) {
+  constructor({ document: document6, taskContext, options: options2 }) {
     super({
       document: document6,
       taskContext,
       authHeaders: /* @__PURE__ */ new Set(),
-      shouldUseTitleAsName: false,
-      shouldUseUndiscriminatedUnionsWithLiterals: false,
-      sdkLanguage: void 0
+      options: options2
     });
   }
   getDummy() {
@@ -1096232,7 +1096537,8 @@ function convertHttpOperation({ operationContext, context, responseStatusCode, s
     document: document6,
     context: new DummyOpenAPIV3ParserContext({
       document: context.document,
-      taskContext: context.taskContext
+      taskContext: context.taskContext,
+      options: context.options
     }),
     requestBreadcrumbs
   }) : void 0;
@@ -1096949,18 +1097255,20 @@ var OpenAPIV3ParserContext = class extends AbstractOpenAPIV3ParserContext {
   discrminatedUnionReferences = {};
   discrminatedUnionMetadata = {};
   schemasToExclude = /* @__PURE__ */ new Set();
-  constructor({ document: document6, taskContext, authHeaders, shouldUseTitleAsName, shouldUseUndiscriminatedUnionsWithLiterals, sdkLanguage }) {
+  constructor({ document: document6, taskContext, authHeaders, options: options2 }) {
     super({
       document: document6,
       taskContext,
       authHeaders,
-      shouldUseTitleAsName,
-      shouldUseUndiscriminatedUnionsWithLiterals,
-      sdkLanguage
+      options: options2
     });
   }
   getDummy() {
-    return new DummyOpenAPIV3ParserContext({ document: this.document, taskContext: this.taskContext });
+    return new DummyOpenAPIV3ParserContext({
+      document: this.document,
+      taskContext: this.taskContext,
+      options: this.options
+    });
   }
   markSchemaAsReferencedByNonRequest(schemaId) {
     this.nonRequestReferencedSchemas.add(schemaId);
@@ -1097094,7 +1097402,7 @@ function replaceWithSchemaReference({ openapi, replaceReference, schemaReference
 }
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/v3/generateIr.js
-function generateIr({ openApi, taskContext, disableExamples, audiences, shouldUseTitleAsName, shouldUseUndiscriminatedUnionsWithLiterals, sdkLanguage }) {
+function generateIr({ openApi, taskContext, options: options2 }) {
   var _a5, _b4, _c4;
   openApi = runResolutions({ openapi: openApi });
   const securitySchemes = Object.fromEntries(Object.entries(((_a5 = openApi.components) == null ? void 0 : _a5.securitySchemes) ?? {}).map(([key2, securityScheme]) => {
@@ -1097116,13 +1097424,12 @@ function generateIr({ openApi, taskContext, disableExamples, audiences, shouldUs
     document: openApi,
     taskContext,
     authHeaders,
-    shouldUseTitleAsName,
-    shouldUseUndiscriminatedUnionsWithLiterals,
-    sdkLanguage
+    options: options2
   });
   const variables = getVariableDefinitions(openApi);
   const globalHeaders = getGlobalHeaders(openApi);
   const idempotencyHeaders = getIdempotencyHeaders(openApi);
+  const audiences = options2.audiences ?? [];
   const endpointsWithExample = [];
   const webhooks = [];
   Object.entries(openApi.paths ?? {}).forEach(([path42, pathItem]) => {
@@ -1097207,7 +1097514,7 @@ function generateIr({ openApi, taskContext, disableExamples, audiences, shouldUs
   const endpoints = endpointsWithExample.map((endpointWithExample) => {
     const extensionExamples = endpointWithExample.examples;
     let examples = extensionExamples;
-    if (!disableExamples && (extensionExamples.length === 0 || extensionExamples.every(hasIncompleteExample))) {
+    if (!options2.disableExamples && (extensionExamples.length === 0 || extensionExamples.every(hasIncompleteExample))) {
       const endpointExample = exampleEndpointFactory.buildEndpointExample(endpointWithExample);
       if (endpointExample.length > 0) {
         examples = [
@@ -1097426,22 +1097733,25 @@ function getAudiences({ operation }) {
 }
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/v2/generateIr.js
-async function generateIr2({ openApi, taskContext, disableExamples, audiences, shouldUseTitleAsName, shouldUseUndiscriminatedUnionsWithLiterals, sdkLanguage }) {
+async function generateIr2({ openApi, taskContext, options: options2 }) {
   const conversionResult = await (0, import_swagger2openapi.convertObj)(openApi, {});
   return generateIr({
     openApi: conversionResult.openapi,
     taskContext,
-    disableExamples,
-    audiences,
-    shouldUseTitleAsName,
-    shouldUseUndiscriminatedUnionsWithLiterals,
-    sdkLanguage
+    options: options2
   });
 }
 
-// pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/parse.js
-async function parse3({ workspace, taskContext, sdkLanguage }) {
-  var _a5, _b4, _c4, _d2, _e, _f, _g, _h;
+// pnp:/home/circleci/project/packages/cli/openapi-parser/lib/options.js
+var DEFAULT_PARSE_OPENAPI_SETTINGS = {
+  disableExamples: false,
+  discriminatedUnionV2: false,
+  useTitlesAsName: true,
+  audiences: void 0
+};
+
+// pnp:/home/circleci/project/packages/cli/openapi-parser/lib/parse.js
+async function parse3({ specs, taskContext, optionOverrides }) {
   let ir = {
     title: void 0,
     description: void 0,
@@ -1097463,8 +1097773,8 @@ async function parse3({ workspace, taskContext, sdkLanguage }) {
     idempotencyHeaders: [],
     groups: {}
   };
-  for (const spec of workspace.specs) {
-    const contents = (await (0, import_promises25.readFile)(spec.absoluteFilepath)).toString();
+  for (const spec of specs) {
+    const contents = (await (0, import_promises26.readFile)(spec.absoluteFilepath)).toString();
     if (contents.includes("openapi") || contents.includes("swagger")) {
       const openApiDocument = await loadOpenAPI({
         absolutePathToOpenAPI: spec.absoluteFilepath,
@@ -1097475,22 +1097785,14 @@ async function parse3({ workspace, taskContext, sdkLanguage }) {
         const openapiIr = generateIr({
           openApi: openApiDocument,
           taskContext,
-          disableExamples: false,
-          audiences: ((_a5 = spec.settings) == null ? void 0 : _a5.audiences) ?? [],
-          shouldUseTitleAsName: ((_b4 = spec.settings) == null ? void 0 : _b4.shouldUseTitleAsName) ?? true,
-          shouldUseUndiscriminatedUnionsWithLiterals: ((_c4 = spec.settings) == null ? void 0 : _c4.shouldUseUndiscriminatedUnionsWithLiterals) ?? false,
-          sdkLanguage
+          options: getParseOptions({ specSettings: spec.settings, overrides: optionOverrides })
         });
         ir = merge3(ir, openapiIr);
       } else if (isOpenApiV2(openApiDocument)) {
         const openapiIr = await generateIr2({
           openApi: openApiDocument,
           taskContext,
-          disableExamples: false,
-          audiences: ((_d2 = spec.settings) == null ? void 0 : _d2.audiences) ?? [],
-          shouldUseTitleAsName: ((_e = spec.settings) == null ? void 0 : _e.shouldUseTitleAsName) ?? true,
-          shouldUseUndiscriminatedUnionsWithLiterals: ((_f = spec.settings) == null ? void 0 : _f.shouldUseUndiscriminatedUnionsWithLiterals) ?? false,
-          sdkLanguage
+          options: getParseOptions({ specSettings: spec.settings })
         });
         ir = merge3(ir, openapiIr);
       }
@@ -1097503,9 +1097805,7 @@ async function parse3({ workspace, taskContext, sdkLanguage }) {
       const parsedAsyncAPI = parseAsyncAPI({
         document: asyncAPI,
         taskContext,
-        shouldUseTitleAsName: ((_g = spec.settings) == null ? void 0 : _g.shouldUseTitleAsName) ?? true,
-        shouldUseUndiscriminatedUnionsWithLiterals: ((_h = spec.settings) == null ? void 0 : _h.shouldUseUndiscriminatedUnionsWithLiterals) ?? false,
-        sdkLanguage
+        options: getParseOptions({ specSettings: spec.settings })
       });
       if (parsedAsyncAPI.channel != null) {
         ir.channel.push(parsedAsyncAPI.channel);
@@ -1097522,6 +1097822,14 @@ async function parse3({ workspace, taskContext, sdkLanguage }) {
   }
   return ir;
 }
+function getParseOptions({ specSettings, overrides }) {
+  return {
+    disableExamples: (overrides == null ? void 0 : overrides.disableExamples) ?? DEFAULT_PARSE_OPENAPI_SETTINGS.disableExamples,
+    discriminatedUnionV2: (overrides == null ? void 0 : overrides.discriminatedUnionV2) ?? (specSettings == null ? void 0 : specSettings.shouldUseUndiscriminatedUnionsWithLiterals) ?? DEFAULT_PARSE_OPENAPI_SETTINGS.discriminatedUnionV2,
+    useTitlesAsName: (overrides == null ? void 0 : overrides.useTitlesAsName) ?? (specSettings == null ? void 0 : specSettings.shouldUseTitleAsName) ?? DEFAULT_PARSE_OPENAPI_SETTINGS.useTitlesAsName,
+    audiences: (overrides == null ? void 0 : overrides.audiences) ?? (specSettings == null ? void 0 : specSettings.audiences) ?? DEFAULT_PARSE_OPENAPI_SETTINGS.audiences
+  };
+}
 function merge3(ir1, ir2) {
   return {
     title: ir1.title ?? ir2.title,
@@ -1097561,7 +1097869,7 @@ function merge3(ir1, ir2) {
   };
 }
 async function loadAsyncAPI({ absoluteFilePathToAsyncAPI, absoluteFilePathToAsyncAPIOverrides, context }) {
-  const contents = (await (0, import_promises25.readFile)(absoluteFilePathToAsyncAPI)).toString();
+  const contents = (await (0, import_promises26.readFile)(absoluteFilePathToAsyncAPI)).toString();
   const parsed = await js_yaml_default.load(contents);
   if (absoluteFilePathToAsyncAPIOverrides != null) {
     return await mergeWithOverrides({
@@ -1099191,7 +1099499,7 @@ function buildFernDefinition(context) {
 }
 
 // pnp:/home/circleci/project/packages/cli/openapi-ir-to-fern/lib/FernDefnitionBuilder.js
-var import_path17 = __toESM(require("path"));
+var import_path19 = __toESM(require("path"));
 var FernDefinitionBuilderImpl = class {
   modifyBasePaths;
   enableUniqueErrorsPerEndpoint;
@@ -1099293,7 +1099601,7 @@ var FernDefinitionBuilderImpl = class {
     if (file === fileToImport) {
       return void 0;
     }
-    const importPrefix = camelCase_default((0, import_path17.basename)(fileToImport, (0, import_path17.extname)(fileToImport)).replaceAll("__package__", "root"));
+    const importPrefix = camelCase_default((0, import_path19.basename)(fileToImport, (0, import_path19.extname)(fileToImport)).replaceAll("__package__", "root"));
     if (file === RelativeFilePath.of(ROOT_API_FILENAME)) {
       if (this.rootApiFile.imports == null) {
         this.rootApiFile.imports = {};
@@ -1099490,7 +1099798,7 @@ var FernDefinitionBuilderImpl = class {
               id,
               {
                 ...endpoint,
-                path: import_path17.default.join(basePath, endpoint.path)
+                path: import_path19.default.join(basePath, endpoint.path)
               }
             ];
           }))
@@ -1099505,7 +1099813,7 @@ var FernDefinitionBuilderImpl = class {
                 id,
                 {
                   ...endpoint,
-                  path: import_path17.default.join(basePath, endpoint.path)
+                  path: import_path19.default.join(basePath, endpoint.path)
                 }
               ];
             }))
@@ -1099607,28 +1099915,34 @@ function convert3(opts) {
   return buildFernDefinition(context);
 }
 
-// pnp:/home/circleci/project/packages/cli/workspace-loader/lib/utils/convertOpenApiWorkspaceToFernWorkspace.js
-async function convertToFernWorkspace(openapiWorkspace, context, enableUniqueErrorsPerEndpoint = false, sdkLanguage) {
-  const openApiIr = await parse3({
-    workspace: openapiWorkspace,
-    taskContext: context,
-    sdkLanguage
-  });
-  const definition3 = convert3({
-    taskContext: context,
-    ir: openApiIr,
-    enableUniqueErrorsPerEndpoint
-  });
-  return {
-    type: "fern",
-    name: openapiWorkspace.name,
-    generatorsConfiguration: openapiWorkspace.generatorsConfiguration,
-    absoluteFilepath: openapiWorkspace.absoluteFilepath,
-    dependenciesConfiguration: {
-      dependencies: {}
-    },
-    workspaceName: openapiWorkspace.workspaceName,
-    definition: {
+// pnp:/home/circleci/project/packages/cli/workspace-loader/lib/workspaces/OSSWorkspace.js
+var OSSWorkspace = class extends AbstractAPIWorkspace {
+  type = "oss";
+  absoluteFilepath;
+  workspaceName;
+  specs;
+  changelog;
+  generatorsConfiguration;
+  constructor({ absoluteFilepath, workspaceName, specs, changelog, generatorsConfiguration }) {
+    super();
+    this.absoluteFilepath = absoluteFilepath;
+    this.workspaceName = workspaceName;
+    this.specs = specs;
+    this.changelog = changelog;
+    this.generatorsConfiguration = generatorsConfiguration;
+  }
+  async getDefinition({ context }, settings) {
+    const openApiIr = await parse3({
+      specs: this.specs,
+      taskContext: context,
+      optionOverrides: getOptionsOverridesFromSettings(settings)
+    });
+    const definition3 = convert3({
+      taskContext: context,
+      ir: openApiIr,
+      enableUniqueErrorsPerEndpoint: (settings == null ? void 0 : settings.enableUniqueErrorsPerEndpoint) ?? false
+    });
+    return {
       absoluteFilepath: AbsoluteFilePath.of("/DUMMY_PATH"),
       rootApiFile: {
         contents: definition3.rootApiFile,
@@ -1099648,291 +1099962,48 @@ async function convertToFernWorkspace(openapiWorkspace, context, enableUniqueErr
       },
       packageMarkers: {},
       importedDefinitions: {}
-    },
-    changelog: openapiWorkspace.changelog
-  };
-}
-function mapValues2(items, mapper) {
-  return mapValues_default2(items, mapper);
-}
-
-// pnp:/home/circleci/project/packages/cli/workspace-loader/lib/loadDependency.js
-var FIDDLE = createFiddleService();
-async function loadDependency({ dependencyName, dependenciesConfiguration, context, rootApiFile, cliVersion, sdkLanguage }) {
-  let definition3;
-  let failure = {
-    type: WorkspaceLoaderFailureType.FAILED_TO_LOAD_DEPENDENCY,
-    dependencyName
-  };
-  const dependency = dependenciesConfiguration.dependencies[dependencyName];
-  if (dependency == null) {
-    failure = {
-      type: WorkspaceLoaderFailureType.DEPENDENCY_NOT_LISTED,
-      dependencyName
     };
-  } else {
-    await context.runInteractiveTask({ name: `Download ${stringifyDependency(dependency)}` }, async (contextForDependency) => {
-      switch (dependency.type) {
-        case "version":
-          definition3 = await validateVersionedDependencyAndGetDefinition({
-            context: contextForDependency,
-            dependency,
-            cliVersion,
-            sdkLanguage
-          });
-          return;
-        case "local":
-          definition3 = await validateLocalDependencyAndGetDefinition({
-            context: contextForDependency,
-            dependency,
-            cliVersion,
-            sdkLanguage
-          });
-          return;
-        default:
-          assertNever(dependency);
-      }
-    });
-  }
-  if (definition3 != null) {
-    return { didSucceed: true, definition: definition3 };
-  } else {
-    return { didSucceed: false, failure };
-  }
-}
-async function validateLocalDependencyAndGetDefinition({ dependency, context, cliVersion, sdkLanguage }) {
-  context.logger.info("Parsing...");
-  const loadDependencyWorkspaceResult = await loadAPIWorkspace({
-    absolutePathToWorkspace: dependency.absoluteFilepath,
-    context,
-    cliVersion,
-    workspaceName: void 0,
-    sdkLanguage
-  });
-  if (!loadDependencyWorkspaceResult.didSucceed) {
-    context.failWithoutThrowing("Failed to load api definition", loadDependencyWorkspaceResult.failures);
-    return void 0;
   }
-  const workspaceOfDependency = loadDependencyWorkspaceResult.workspace.type === "fern" ? loadDependencyWorkspaceResult.workspace : await convertToFernWorkspace(loadDependencyWorkspaceResult.workspace, context, false, sdkLanguage);
-  return workspaceOfDependency.definition;
-}
-async function validateVersionedDependencyAndGetDefinition({ dependency, context, cliVersion, sdkLanguage }) {
-  context.logger.info("Downloading manifest...");
-  const response = await FIDDLE.definitionRegistry.get(import_fiddle_sdk3.FernFiddle.OrganizationId(dependency.organization), import_fiddle_sdk3.FernFiddle.ApiId(dependency.apiName), dependency.version);
-  if (!response.ok) {
-    response.error._visit({
-      orgDoesNotExistError: () => {
-        context.failWithoutThrowing("Organization does not exist");
-      },
-      apiDoesNotExistError: () => {
-        context.failWithoutThrowing("API does not exist");
+  async toFernWorkspace({ context }, settings) {
+    const definition3 = await this.getDefinition({ context }, settings);
+    return new FernWorkspace({
+      absoluteFilepath: this.absoluteFilepath,
+      workspaceName: this.workspaceName,
+      generatorsConfiguration: this.generatorsConfiguration,
+      dependenciesConfiguration: {
+        dependencies: {}
       },
-      versionDoesNotExistError: () => {
-        context.failWithoutThrowing("Version does not exist");
-      },
-      _other: (error) => {
-        context.failWithoutThrowing("Failed to download API manifest", error);
-      }
-    });
-    return void 0;
-  }
-  const parsedYamlVersionOfDependency = response.body.yamlSchemaVersion != null ? parseInt(response.body.yamlSchemaVersion) : void 0;
-  const parsedCliVersion = parseVersion(cliVersion);
-  const parsedCliVersionOfDependency = parseVersion(response.body.cliVersion);
-  if (parsedYamlVersionOfDependency != null) {
-    if (parsedYamlVersionOfDependency > YAML_SCHEMA_VERSION) {
-      context.failWithoutThrowing(`${dependency.organization}/${dependency.apiName}@${dependency.version} on a higher version of fern. Upgrade this workspace to ${response.body.cliVersion}`);
-      return void 0;
-    } else if (parsedYamlVersionOfDependency < YAML_SCHEMA_VERSION) {
-      context.failWithoutThrowing(`${dependency.organization}/${dependency.apiName}@${dependency.version} on a lower version of fern. Upgrade it to ${cliVersion}`);
-      return void 0;
-    }
-  } else if (parsedCliVersion.major !== parsedCliVersionOfDependency.major || parsedCliVersion.minor !== parsedCliVersionOfDependency.minor) {
-    context.failWithoutThrowing(`CLI version is ${response.body.cliVersion}. Expected ${parsedCliVersion.major}.${parsedCliVersion.minor}.x (to match current workspace).`);
-    return void 0;
-  }
-  context.logger.info("Downloading...");
-  const pathToDependency = AbsoluteFilePath.of((await import_tmp_promise2.default.dir()).path);
-  context.logger.debug("Remote URL: " + response.body.definitionS3DownloadUrl);
-  try {
-    await downloadDependency({
-      s3PreSignedReadUrl: response.body.definitionS3DownloadUrl,
-      absolutePathToLocalOutput: pathToDependency
+      definition: definition3,
+      changelog: this.changelog
     });
-  } catch (error) {
-    context.failWithoutThrowing("Failed to download API", error);
-    return void 0;
   }
-  context.logger.info("Parsing...");
-  const loadDependencyWorkspaceResult = await loadAPIWorkspace({
-    absolutePathToWorkspace: pathToDependency,
-    context,
-    cliVersion: response.body.cliVersion,
-    workspaceName: void 0,
-    sdkLanguage
-  });
-  if (!loadDependencyWorkspaceResult.didSucceed) {
-    context.failWithoutThrowing("Failed to parse dependency after downloading", loadDependencyWorkspaceResult.failures);
+};
+function getOSSWorkspaceSettingsFromGeneratorInvocation(generatorInvocation) {
+  if (generatorInvocation.settings == null) {
     return void 0;
   }
-  const workspaceOfDependency = loadDependencyWorkspaceResult.workspace;
-  if (workspaceOfDependency.type === "oss") {
-    context.failWithoutThrowing("Dependency must be a fern workspace.");
-    return void 0;
+  const result2 = {};
+  if (generatorInvocation.settings.unions === "v1") {
+    result2.enableDiscriminatedUnionV2 = true;
   }
-  return workspaceOfDependency.definition;
-}
-async function downloadDependency({ s3PreSignedReadUrl, absolutePathToLocalOutput }) {
-  const request = await import_axios3.default.get(s3PreSignedReadUrl, {
-    responseType: "stream"
-  });
-  const tmpDir = await import_tmp_promise2.default.dir();
-  const outputTarPath = import_path18.default.join(tmpDir.path, "api.tgz");
-  await (0, import_promises26.pipeline)(request.data, (0, import_fs3.createWriteStream)(outputTarPath));
-  await import_tar.default.extract({ file: outputTarPath, cwd: absolutePathToLocalOutput });
+  return result2;
 }
-function stringifyDependency(dependency) {
-  switch (dependency.type) {
-    case "version":
-      return `@${dependency.organization}/${dependency.apiName}`;
-    case "local":
-      return `${dependency.path}`;
-    default:
-      assertNever(dependency);
+function getOptionsOverridesFromSettings(settings) {
+  if (settings == null) {
+    return void 0;
   }
-}
-
-// pnp:/home/circleci/project/packages/cli/workspace-loader/lib/processPackageMarkers.js
-async function processPackageMarkers({ dependenciesConfiguration, structuralValidationResult, context, cliVersion, sdkLanguage }) {
-  const packageMarkers = {};
-  const importedDefinitions = {};
-  const failures = {};
-  await Promise.all(entries(structuralValidationResult.packageMarkers).map(async ([pathOfPackageMarker, packageMarker]) => {
-    if (packageMarker.contents.export == null) {
-      packageMarkers[pathOfPackageMarker] = packageMarker;
-    } else {
-      const { export: _4, ...otherPackageMarkerKeys } = packageMarker.contents;
-      if (size_default(otherPackageMarkerKeys) > 0) {
-        failures[pathOfPackageMarker] = {
-          type: WorkspaceLoaderFailureType.EXPORTING_PACKAGE_MARKER_OTHER_KEYS,
-          pathOfPackageMarker
-        };
-      } else {
-        const pathToPackage = dirname(pathOfPackageMarker);
-        const areDefinitionsDefinedInPackage = keys(structuralValidationResult.namedDefinitionFiles).some((filepath) => filepath !== pathOfPackageMarker && filepath.startsWith(pathToPackage));
-        if (areDefinitionsDefinedInPackage) {
-          failures[pathOfPackageMarker] = {
-            type: WorkspaceLoaderFailureType.EXPORT_PACKAGE_HAS_DEFINITIONS,
-            pathToPackage
-          };
-        } else {
-          const loadDependencyResult = await loadDependency({
-            dependencyName: packageMarker.contents.export,
-            dependenciesConfiguration,
-            context,
-            rootApiFile: structuralValidationResult.rootApiFile.contents,
-            cliVersion,
-            sdkLanguage
-          });
-          if (loadDependencyResult.didSucceed) {
-            importedDefinitions[dirname(pathOfPackageMarker)] = loadDependencyResult.definition;
-          } else {
-            failures[pathOfPackageMarker] = loadDependencyResult.failure;
-          }
-        }
-      }
-    }
-  }));
-  if (size_default(failures) > 0) {
-    return {
-      didSucceed: false,
-      failures
-    };
-  } else {
-    return {
-      didSucceed: true,
-      packageMarkers,
-      importedDefinitions
-    };
+  const result2 = {};
+  if (settings.enableDiscriminatedUnionV2) {
+    result2.discriminatedUnionV2 = true;
   }
+  return result2;
 }
-
-// pnp:/home/circleci/project/packages/cli/workspace-loader/lib/validateStructureOfYamlFiles.js
-var import_path19 = __toESM(require("path"));
-function validateStructureOfYamlFiles({ files, absolutePathToDefinition }) {
-  let rootApiFile = void 0;
-  const namesDefinitionFiles = {};
-  const packageMarkers = {};
-  const failures = {};
-  for (const [relativeFilepath, file] of entries(files)) {
-    const parsedFileContents = file.contents;
-    const addFailure = (error) => {
-      failures[relativeFilepath] = {
-        type: WorkspaceLoaderFailureType.STRUCTURE_VALIDATION,
-        error
-      };
-    };
-    if (relativeFilepath === ROOT_API_FILENAME) {
-      const maybeValidFileContents = RootApiFileSchema.safeParse(parsedFileContents);
-      if (maybeValidFileContents.success) {
-        rootApiFile = {
-          contents: maybeValidFileContents.data,
-          rawContents: file.rawContents
-        };
-      } else {
-        addFailure(maybeValidFileContents.error);
-      }
-    } else if (import_path19.default.basename(relativeFilepath) === FERN_PACKAGE_MARKER_FILENAME) {
-      const maybeValidFileContents = PackageMarkerFileSchema.safeParse(parsedFileContents);
-      if (maybeValidFileContents.success) {
-        packageMarkers[relativeFilepath] = {
-          contents: maybeValidFileContents.data,
-          rawContents: file.rawContents
-        };
-      } else {
-        addFailure(maybeValidFileContents.error);
-      }
-    } else {
-      const maybeValidFileContents = DefinitionFileSchema.safeParse(parsedFileContents);
-      if (maybeValidFileContents.success) {
-        namesDefinitionFiles[relativeFilepath] = {
-          contents: maybeValidFileContents.data,
-          rawContents: file.rawContents,
-          absoluteFilepath: join(absolutePathToDefinition, relativeFilepath)
-        };
-      } else {
-        addFailure(maybeValidFileContents.error);
-      }
-    }
-  }
-  if (rootApiFile == null) {
-    return {
-      didSucceed: false,
-      failures: {
-        [RelativeFilePath.of(ROOT_API_FILENAME)]: {
-          type: WorkspaceLoaderFailureType.FILE_MISSING
-        },
-        ...failures
-      }
-    };
-  }
-  if (Object.keys(failures).length > 0) {
-    return {
-      didSucceed: false,
-      failures
-    };
-  } else {
-    return {
-      didSucceed: true,
-      namedDefinitionFiles: namesDefinitionFiles,
-      rootApiFile,
-      packageMarkers
-    };
-  }
+function mapValues2(items, mapper) {
+  return mapValues_default2(items, mapper);
 }
 
 // pnp:/home/circleci/project/packages/cli/workspace-loader/lib/loadAPIWorkspace.js
-async function loadAPIWorkspace({ absolutePathToWorkspace, context, cliVersion, workspaceName, sdkLanguage }) {
+async function loadAPIWorkspace({ absolutePathToWorkspace, context, cliVersion, workspaceName }) {
   var _a5, _b4;
   const generatorsConfiguration = await generators_yml_exports.loadGeneratorsConfiguration({
     absolutePathToWorkspace,
@@ -1099984,15 +1100055,13 @@ async function loadAPIWorkspace({ absolutePathToWorkspace, context, cliVersion,
     }
     return {
       didSucceed: true,
-      workspace: {
-        type: "oss",
-        name: "api",
+      workspace: new OSSWorkspace({
         specs,
         workspaceName,
         absoluteFilepath: absolutePathToWorkspace,
         generatorsConfiguration,
         changelog
-      }
+      })
     };
   }
   if (openApiDirectoryExists) {
@@ -1100023,15 +1100092,13 @@ async function loadAPIWorkspace({ absolutePathToWorkspace, context, cliVersion,
     }
     return {
       didSucceed: true,
-      workspace: {
-        type: "oss",
-        name: "api",
+      workspace: new OSSWorkspace({
         specs,
         workspaceName,
         absoluteFilepath: absolutePathToWorkspace,
         generatorsConfiguration,
         changelog
-      }
+      })
     };
   }
   const absolutePathToDefinition = join(absolutePathToWorkspace, RelativeFilePath.of(DEFINITION_DIRECTORY));
@@ -1100055,15 +1100122,12 @@ async function loadAPIWorkspace({ absolutePathToWorkspace, context, cliVersion,
     dependenciesConfiguration,
     structuralValidationResult,
     context,
-    cliVersion,
-    sdkLanguage
+    cliVersion
   });
   if (!processPackageMarkersResult.didSucceed) {
     return processPackageMarkersResult;
   }
-  const fernWorkspace = {
-    type: "fern",
-    name: structuralValidationResult.rootApiFile.contents.name,
+  const fernWorkspace = new FernWorkspace({
     absoluteFilepath: absolutePathToWorkspace,
     generatorsConfiguration,
     dependenciesConfiguration,
@@ -1100076,7 +1100140,7 @@ async function loadAPIWorkspace({ absolutePathToWorkspace, context, cliVersion,
       importedDefinitions: processPackageMarkersResult.importedDefinitions
     },
     changelog
-  };
+  });
   return {
     didSucceed: true,
     workspace: fernWorkspace
@@ -1100289,7 +1100353,7 @@ function parseIssue(issue) {
 }
 
 // pnp:/home/circleci/project/packages/cli/project-loader/lib/loadProject.js
-async function loadProject({ cliName, cliVersion, commandLineApiWorkspace, defaultToAllApiWorkspaces, context, nameOverride, sdkLanguage }) {
+async function loadProject({ cliName, cliVersion, commandLineApiWorkspace, defaultToAllApiWorkspaces, context, nameOverride }) {
   const fernDirectory = await getFernDirectory(nameOverride);
   if (fernDirectory == null) {
     return context.failAndThrow(`Directory "${nameOverride ?? FERN_DIRECTORY}" not found.`);
@@ -1100300,8 +1100364,7 @@ async function loadProject({ cliName, cliVersion, commandLineApiWorkspace, defau
     cliVersion,
     context,
     commandLineApiWorkspace,
-    defaultToAllApiWorkspaces,
-    sdkLanguage
+    defaultToAllApiWorkspaces
   });
   return {
     config: await fern_config_json_exports.loadProjectConfig({ directory: fernDirectory, context }),
@@ -1100309,7 +1100372,7 @@ async function loadProject({ cliName, cliVersion, commandLineApiWorkspace, defau
     docsWorkspaces: await loadDocsWorkspace({ fernDirectory, context })
   };
 }
-async function loadApis({ cliName, fernDirectory, context, cliVersion, commandLineApiWorkspace, defaultToAllApiWorkspaces, sdkLanguage }) {
+async function loadApis({ cliName, fernDirectory, context, cliVersion, commandLineApiWorkspace, defaultToAllApiWorkspaces }) {
   const apisDirectory = join(fernDirectory, RelativeFilePath.of(APIS_DIRECTORY));
   const apisDirectoryExists = await doesPathExist(apisDirectory);
   if (apisDirectoryExists) {
@@ -1100344,8 +1100407,7 @@ async function loadApis({ cliName, fernDirectory, context, cliVersion, commandLi
         absolutePathToWorkspace: join(apisDirectory, RelativeFilePath.of(workspaceDirectoryName)),
         context,
         cliVersion,
-        workspaceName: workspaceDirectoryName,
-        sdkLanguage
+        workspaceName: workspaceDirectoryName
       });
       if (workspace2.didSucceed) {
         apiWorkspaces.push(workspace2.workspace);
@@ -1100360,8 +1100422,7 @@ async function loadApis({ cliName, fernDirectory, context, cliVersion, commandLi
     absolutePathToWorkspace: fernDirectory,
     context,
     cliVersion,
-    workspaceName: void 0,
-    sdkLanguage
+    workspaceName: void 0
   });
   if (workspace.didSucceed) {
     return [workspace.workspace];
@@ -1103786,10 +1103847,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.31.0-rc2" == null) {
+    if ("0.31.0-rc3" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.31.0-rc2";
+    return "0.31.0-rc3";
   }
   getCliName() {
     if ("fern" == null) {
@@ -1103850,7 +1103911,7 @@ var CliContext = class {
   }
   registerWorkspaces(workspaces) {
     const longestWorkspaceName = maxBy_default(
-      workspaces.map((workspace) => workspace.type === "docs" ? "docs" : workspace.name),
+      workspaces.map((workspace) => workspace.type === "docs" ? "docs" : workspace.workspaceName ?? "api"),
       (name3) => name3.length
     );
     if (longestWorkspaceName != null) {
@@ -1103891,7 +1103952,9 @@ var CliContext = class {
     (await getPosthogManager()).sendEvent(event);
   }
   constructTaskInitForWorkspace(workspace) {
-    const prefixWithoutPadding = wrapWorkspaceNameForPrefix(workspace.type === "docs" ? "docs" : workspace.name);
+    const prefixWithoutPadding = wrapWorkspaceNameForPrefix(
+      workspace.type === "docs" ? "docs" : workspace.workspaceName ?? "api"
+    );
     const minLengthForPrefix = 1 + (this.longestWorkspaceName != null ? wrapWorkspaceNameForPrefix(this.longestWorkspaceName) : prefixWithoutPadding).length;
     const prefix = prefixWithoutPadding.padEnd(minLengthForPrefix);
     const colorForWorkspace = WORKSPACE_NAME_COLORS[this.numTasks++ % WORKSPACE_NAME_COLORS.length];
@@ -1108172,6 +1108235,7 @@ function convertReadmeConfig({ readme, services }) {
   return {
     apiReferenceLink: readme.apiReferenceLink,
     bannerLink: readme.bannerLink,
+    introduction: readme.introduction,
     defaultEndpoint: readme.defaultEndpoint != null ? readmeEndpointCache.getEndpointForReadmeOrThrow(readme.defaultEndpoint).id : void 0,
     features: readme.features != null ? Object.fromEntries(Object.entries(readme.features).map(([featureId, endpoints]) => {
       return [
@@ -1110793,7 +1110857,7 @@ async function generateIntermediateRepresentation({ workspace, generationLanguag
   const exampleResolver = new ExampleResolverImpl(typeResolver);
   const variableResolver = new VariableResolverImpl();
   const intermediateRepresentation = {
-    apiName: casingsGenerator.generateName(workspace.name),
+    apiName: casingsGenerator.generateName(workspace.definition.rootApiFile.contents.name),
     apiDisplayName: workspace.definition.rootApiFile.contents["display-name"],
     apiDocs: await formatDocs(workspace.definition.rootApiFile.contents.docs),
     auth: await convertApiAuth({
@@ -1124786,7 +1124850,7 @@ var Watcher = class extends import_node_events.EventEmitter {
 };
 var watcher_default = Watcher;
 
-// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-1829670845/0/cache/ws-npm-8.17.0-05fb441faf-147ef9eab0.zip/node_modules/ws/wrapper.mjs
+// pnp:/home/circleci/project/.yarn/__virtual__/ws-virtual-4b3d6e6175/0/cache/ws-npm-8.17.1-f57fb24a2c-442badcce1.zip/node_modules/ws/wrapper.mjs
 var import_stream3 = __toESM(require_stream2(), 1);
 var import_receiver = __toESM(require_receiver(), 1);
 var import_sender = __toESM(require_sender(), 1);
@@ -1124877,7 +1124941,7 @@ async function getPreviewDocsDefinition({ domain: domain2, project, context }) {
   if (docsWorkspace == null) {
     throw new Error("No docs workspace found in project");
   }
-  const fernWorkspaces = await Promise.all(apiWorkspaces.map((workspace) => workspace.type === "oss" ? convertToFernWorkspace(workspace, context, false, void 0) : workspace));
+  const fernWorkspaces = await Promise.all(apiWorkspaces.map(async (workspace) => await workspace.toFernWorkspace({ context }, { enableUniqueErrorsPerEndpoint: true })));
   const apiCollector = new ReferencedAPICollector();
   const filesV2 = {};
   const resolver3 = new DocsDefinitionResolver(domain2, docsWorkspace, fernWorkspaces, context, void 0, async (files) => files.map((file) => {
@@ -1148001,7 +1148065,7 @@ async function formatWorkspaces({
 }) {
   await Promise.all(
     project.apiWorkspaces.map(async (workspace) => {
-      if (workspace.type === "oss") {
+      if (workspace instanceof OSSWorkspace) {
         return;
       }
       await cliContext.runTaskForWorkspace(workspace, async (context) => {
@@ -1151904,8 +1151968,8 @@ async function validateAPIWorkspaceAndLogIssues({
   context,
   logWarnings
 }) {
-  if (!(0, import_validate_npm_package_name.default)(workspace.name).validForNewPackages) {
-    context.failAndThrow("Workspace name is not valid.");
+  if (!(0, import_validate_npm_package_name.default)(workspace.definition.rootApiFile.contents.name).validForNewPackages) {
+    context.failAndThrow("API name is not valid.");
   }
   const violations = await validateFernWorkspace(workspace, context.logger);
   const { hasErrors } = logViolations({ violations, context, logWarnings });
@@ -1151947,7 +1152011,7 @@ async function generateFdrApiDefinitionForWorkspaces({
   await Promise.all(
     project.apiWorkspaces.map(async (workspace) => {
       await cliContext.runTaskForWorkspace(workspace, async (context) => {
-        const fernWorkspace = workspace.type === "oss" ? await convertToFernWorkspace(workspace, context, false, void 0) : workspace;
+        const fernWorkspace = await workspace.toFernWorkspace({ context });
         const ir = await generateIrForFernWorkspace({
           workspace: fernWorkspace,
           context,
@@ -1159737,30 +1159801,8 @@ async function generateIrForWorkspaces({
   await Promise.all(
     project.apiWorkspaces.map(async (workspace) => {
       await cliContext.runTaskForWorkspace(workspace, async (context) => {
-        cliContext.logger.info(`Generating IR for workspace ${workspace.name}`);
-        let fernWorkspace;
-        if (workspace.type === "fern") {
-          cliContext.logger.info("Found a fern workspace");
-          fernWorkspace = workspace;
-        } else {
-          workspace.specs = workspace.specs.map((spec) => {
-            var _a5, _b4, _c4;
-            return {
-              ...spec,
-              settings: {
-                audiences: ((_a5 = spec.settings) == null ? void 0 : _a5.audiences) ?? [],
-                shouldUseTitleAsName: ((_b4 = spec.settings) == null ? void 0 : _b4.shouldUseTitleAsName) ?? true,
-                shouldUseUndiscriminatedUnionsWithLiterals: ((_c4 = spec.settings) == null ? void 0 : _c4.shouldUseUndiscriminatedUnionsWithLiterals) ?? false
-              }
-            };
-          });
-          fernWorkspace = await convertToFernWorkspace(
-            workspace,
-            context,
-            false,
-            generationLanguage
-          );
-        }
+        cliContext.logger.info(`Generating IR for workspace ${workspace.workspaceName}`);
+        const fernWorkspace = await workspace.toFernWorkspace({ context });
         const intermediateRepresentation = await getIntermediateRepresentation({
           workspace: fernWorkspace,
           context,
@@ -1159827,25 +1159869,13 @@ async function generateOpenAPIIrForWorkspaces({
   await Promise.all(
     project.apiWorkspaces.map(async (workspace) => {
       await cliContext.runTaskForWorkspace(workspace, async (context) => {
-        if (workspace.type === "fern") {
+        if (workspace instanceof FernWorkspace) {
           context.logger.info("Skipping, API is specified as a Fern Definition.");
           return;
         }
-        workspace.specs = workspace.specs.map((spec) => {
-          var _a5, _b4, _c4;
-          return {
-            ...spec,
-            settings: {
-              audiences: ((_a5 = spec.settings) == null ? void 0 : _a5.audiences) ?? [],
-              shouldUseTitleAsName: ((_b4 = spec.settings) == null ? void 0 : _b4.shouldUseTitleAsName) ?? true,
-              shouldUseUndiscriminatedUnionsWithLiterals: ((_c4 = spec.settings) == null ? void 0 : _c4.shouldUseUndiscriminatedUnionsWithLiterals) ?? false
-            }
-          };
-        });
         const openAPIIr = await parse3({
-          workspace,
-          taskContext: context,
-          sdkLanguage
+          specs: workspace.specs,
+          taskContext: context
         });
         const irOutputFilePath = import_path35.default.resolve(irFilepath);
         const openApiIrJson = await serialization_exports3.OpenApiIntermediateRepresentation.jsonOrThrow(openAPIIr, {
@@ -1159868,7 +1159898,7 @@ async function writeOverridesForWorkspaces({
   await Promise.all(
     project.apiWorkspaces.map(async (workspace) => {
       await cliContext.runTaskForWorkspace(workspace, async (context) => {
-        if (workspace.type === "oss") {
+        if (workspace instanceof OSSWorkspace) {
           await writeDefinitionForOpenAPIWorkspace({
             workspace,
             context,
@@ -1159902,11 +1159932,8 @@ async function writeDefinitionForOpenAPIWorkspace({
 }) {
   for (const spec of workspace.specs) {
     const ir = await parse3({
-      workspace: {
-        specs: [spec]
-      },
-      taskContext: context,
-      sdkLanguage: void 0
+      specs: [spec],
+      taskContext: context
     });
     let existingOverrides = {};
     if (spec.absoluteFilepathToOverrides !== void 0) {
@@ -1159950,9 +1159977,6 @@ async function writeDefinitionForOpenAPIWorkspace({
   }
 }
 
-// pnp:/home/circleci/project/packages/cli/cli/src/commands/generate/generateAPIWorkspaces.ts
-var import_path39 = require("path");
-
 // pnp:/home/circleci/project/packages/cli/cli/src/constants.ts
 var API_CLI_OPTION = "api";
 var GROUP_CLI_OPTION = "group";
@@ -1160444,7 +1160468,7 @@ async function writeFilesToDiskAndRunGenerator({ organization, workspace, genera
     absolutePathToSnippetTemplates: absolutePathToTmpSnippetTemplatesJSON,
     absolutePathToIr,
     absolutePathToWriteConfigJson,
-    workspaceName: workspace.name,
+    workspaceName: workspace.definition.rootApiFile.contents.name,
     organization,
     outputVersion: outputVersionOverride,
     keepDocker,
@@ -1160528,44 +1160552,38 @@ async function runGenerator({ workspaceName, organization, outputVersion, absolu
 var import_os5 = __toESM(require("os"));
 var import_path37 = __toESM(require("path"));
 var import_tmp_promise8 = __toESM(require_tmp_promise());
-async function runLocalGenerationForWorkspace({ projectConfig, workspaceGetter, keepDocker, context }) {
+async function runLocalGenerationForWorkspace({ projectConfig, workspace, generatorGroup, keepDocker, context }) {
   const workspaceTempDir = await getWorkspaceTempDir();
-  const toplevelWorkspaceMetadata = await workspaceGetter(void 0);
-  const generatorGroup = toplevelWorkspaceMetadata == null ? void 0 : toplevelWorkspaceMetadata.group;
-  if (generatorGroup == null) {
-    context.failWithoutThrowing("Could not load workspace");
-    return;
-  }
   const results = await Promise.all(generatorGroup.generators.map(async (generatorInvocation) => {
     return context.runInteractiveTask({ name: generatorInvocation.name }, async (interactiveTaskContext) => {
-      const workspaceMetadata = await workspaceGetter(generatorInvocation.language);
-      if (workspaceMetadata == null) {
-        interactiveTaskContext.failWithoutThrowing("Could not load workspace");
-        return;
+      if (generatorInvocation.absolutePathToLocalOutput == null) {
+        interactiveTaskContext.failWithoutThrowing("Cannot generate because output location is not local-file-system");
       } else {
-        if (generatorInvocation.absolutePathToLocalOutput == null) {
-          interactiveTaskContext.failWithoutThrowing("Cannot generate because output location is not local-file-system");
+        let fernWorkspace;
+        if (workspace instanceof OSSWorkspace) {
+          fernWorkspace = await workspace.toFernWorkspace({ context }, getOSSWorkspaceSettingsFromGeneratorInvocation(generatorInvocation));
         } else {
-          await writeFilesToDiskAndRunGenerator({
-            organization: projectConfig.organization,
-            absolutePathToFernConfig: projectConfig._absolutePath,
-            workspace: workspaceMetadata.workspace,
-            generatorInvocation,
-            absolutePathToLocalOutput: generatorInvocation.absolutePathToLocalOutput,
-            absolutePathToLocalSnippetJSON: void 0,
-            absolutePathToLocalSnippetTemplateJSON: void 0,
-            audiences: generatorGroup.audiences,
-            workspaceTempDir,
-            keepDocker,
-            context: interactiveTaskContext,
-            irVersionOverride: generatorInvocation.irVersionOverride,
-            outputVersionOverride: void 0,
-            writeUnitTests: false,
-            generateOauthClients: false,
-            generatePaginatedClients: false
-          });
-          interactiveTaskContext.logger.info(source_default.green("Wrote files to " + generatorInvocation.absolutePathToLocalOutput));
+          fernWorkspace = workspace;
         }
+        await writeFilesToDiskAndRunGenerator({
+          organization: projectConfig.organization,
+          absolutePathToFernConfig: projectConfig._absolutePath,
+          workspace: fernWorkspace,
+          generatorInvocation,
+          absolutePathToLocalOutput: generatorInvocation.absolutePathToLocalOutput,
+          absolutePathToLocalSnippetJSON: void 0,
+          absolutePathToLocalSnippetTemplateJSON: void 0,
+          audiences: generatorGroup.audiences,
+          workspaceTempDir,
+          keepDocker,
+          context: interactiveTaskContext,
+          irVersionOverride: generatorInvocation.irVersionOverride,
+          outputVersionOverride: void 0,
+          writeUnitTests: false,
+          generateOauthClients: false,
+          generatePaginatedClients: false
+        });
+        interactiveTaskContext.logger.info(source_default.green("Wrote files to " + generatorInvocation.absolutePathToLocalOutput));
       }
     });
   }));
@@ -1160684,7 +1160702,7 @@ async function createJob({ projectConfig, workspace, organization, generatorInvo
       await import_tar2.default.create({ file: tarPath, cwd: absolutePathToTmpFernDirectory }, ["."]);
       context.logger.debug("Getting upload URL for Fern definition.");
       const definitionUploadUrlRequest = await remoteGenerationService.remoteGen.getDefinitionUploadUrl({
-        apiName: workspace.name,
+        apiName: workspace.definition.rootApiFile.contents.name,
         organizationName: organization,
         version: version3
       });
@@ -1160709,7 +1160727,7 @@ async function createJob({ projectConfig, workspace, organization, generatorInvo
     }
   }
   const createResponse = await remoteGenerationService.remoteGen.createJobV3({
-    apiName: workspace.name,
+    apiName: workspace.definition.rootApiFile.contents.name,
     version: version3,
     organizationName: organization,
     generators: [generatorConfigsWithEnvVarSubstitutions],
@@ -1160726,7 +1160744,7 @@ async function createJob({ projectConfig, workspace, organization, generatorInvo
   if (!createResponse.ok) {
     return convertCreateJobError(createResponse.error)._visit({
       illegalApiNameError: () => {
-        return context.failAndThrow("API name is invalid: " + workspace.name);
+        return context.failAndThrow("API name is invalid: " + workspace.definition.rootApiFile.contents.name);
       },
       illegalApiVersionError: () => {
         return context.failAndThrow("API version is invalid: " + version3);
@@ -1161070,13 +1161088,7 @@ async function runRemoteGenerationForGenerator({ projectConfig, organization, wo
 }
 
 // pnp:/home/circleci/project/packages/cli/generation/remote-generation/remote-workspace-runner/lib/runRemoteGenerationForAPIWorkspace.js
-async function runRemoteGenerationForAPIWorkspace({ projectConfig, organization, workspaceGetter, context, version: version3, shouldLogS3Url, token }) {
-  const toplevelWorkspaceMetadata = await workspaceGetter(void 0);
-  const generatorGroup = toplevelWorkspaceMetadata == null ? void 0 : toplevelWorkspaceMetadata.group;
-  if (generatorGroup == null) {
-    context.failWithoutThrowing("Could not load workspace");
-    return null;
-  }
+async function runRemoteGenerationForAPIWorkspace({ projectConfig, organization, workspace, context, generatorGroup, version: version3, shouldLogS3Url, token, whitelabel, absolutePathToPreview }) {
   if (generatorGroup.generators.length === 0) {
     context.logger.warn("No generators specified.");
     return null;
@@ -1161084,36 +1161096,35 @@ async function runRemoteGenerationForAPIWorkspace({ projectConfig, organization,
   const interactiveTasks = [];
   const snippetsProducedBy = [];
   interactiveTasks.push(...generatorGroup.generators.map((generatorInvocation) => context.runInteractiveTask({ name: generatorInvocation.name }, async (interactiveTaskContext) => {
-    var _a5;
-    const workspaceMetadata = await workspaceGetter(generatorInvocation.language);
-    if (workspaceMetadata == null) {
-      interactiveTaskContext.failWithoutThrowing("Could not load workspace");
-      return;
+    let fernWorkspace;
+    if (workspace instanceof OSSWorkspace) {
+      fernWorkspace = await workspace.toFernWorkspace({ context }, getOSSWorkspaceSettingsFromGeneratorInvocation(generatorInvocation));
     } else {
-      const remoteTaskHandlerResponse = await runRemoteGenerationForGenerator({
-        projectConfig,
-        organization,
-        workspace: workspaceMetadata.workspace,
-        interactiveTaskContext,
-        generatorInvocation,
-        version: version3,
-        audiences: generatorGroup.audiences,
-        shouldLogS3Url,
-        token,
-        whitelabel: (_a5 = workspaceMetadata.workspace.generatorsConfiguration) == null ? void 0 : _a5.whitelabel,
-        irVersionOverride: generatorInvocation.irVersionOverride,
-        absolutePathToPreview: workspaceMetadata.absolutePathToPreview,
-        readme: generatorInvocation.readme
-      });
-      if (remoteTaskHandlerResponse != null && remoteTaskHandlerResponse.createdSnippets) {
-        snippetsProducedBy.push(generatorInvocation);
-        if (generatorInvocation.absolutePathToLocalSnippets != null && remoteTaskHandlerResponse.snippetsS3PreSignedReadUrl != null) {
-          await downloadSnippetsForTask({
-            snippetsS3PreSignedReadUrl: remoteTaskHandlerResponse.snippetsS3PreSignedReadUrl,
-            absolutePathToLocalSnippetJSON: generatorInvocation.absolutePathToLocalSnippets,
-            context: interactiveTaskContext
-          });
-        }
+      fernWorkspace = workspace;
+    }
+    const remoteTaskHandlerResponse = await runRemoteGenerationForGenerator({
+      projectConfig,
+      organization,
+      workspace: fernWorkspace,
+      interactiveTaskContext,
+      generatorInvocation,
+      version: version3,
+      audiences: generatorGroup.audiences,
+      shouldLogS3Url,
+      token,
+      whitelabel,
+      readme: generatorInvocation.readme,
+      irVersionOverride: generatorInvocation.irVersionOverride,
+      absolutePathToPreview
+    });
+    if (remoteTaskHandlerResponse != null && remoteTaskHandlerResponse.createdSnippets) {
+      snippetsProducedBy.push(generatorInvocation);
+      if (generatorInvocation.absolutePathToLocalSnippets != null && remoteTaskHandlerResponse.snippetsS3PreSignedReadUrl != null) {
+        await downloadSnippetsForTask({
+          snippetsS3PreSignedReadUrl: remoteTaskHandlerResponse.snippetsS3PreSignedReadUrl,
+          absolutePathToLocalSnippetJSON: generatorInvocation.absolutePathToLocalSnippets,
+          context: interactiveTaskContext
+        });
       }
     }
   })));
@@ -1161376,19 +1161387,47 @@ async function runRemoteGenerationForDocsWorkspace({ organization, fernWorkspace
 // pnp:/home/circleci/project/packages/cli/cli/src/commands/generate/generateAPIWorkspace.ts
 async function generateWorkspace({
   organization,
+  workspace,
   projectConfig,
-  workspaceGetter,
   context,
+  groupName,
   version: version3,
   shouldLogS3Url,
   token,
   useLocalDocker,
-  keepDocker
+  keepDocker,
+  absolutePathToPreview
 }) {
+  if (workspace.generatorsConfiguration == null) {
+    context.logger.warn("This workspaces has no generators.yml");
+    return;
+  }
+  if (workspace.generatorsConfiguration.groups.length === 0) {
+    context.logger.warn(`This workspaces has no groups specified in ${GENERATORS_CONFIGURATION_FILENAME}`);
+    return;
+  }
+  const groupNameOrDefault = groupName ?? workspace.generatorsConfiguration.defaultGroup;
+  if (groupNameOrDefault == null) {
+    return context.failAndThrow(
+      `No group specified. Use the --${GROUP_CLI_OPTION} option, or set "${DEFAULT_GROUP_GENERATORS_CONFIG_KEY}" in ${GENERATORS_CONFIGURATION_FILENAME}`
+    );
+  }
+  const group = workspace.generatorsConfiguration.groups.find(
+    (otherGroup) => otherGroup.groupName === groupNameOrDefault
+  );
+  if (group == null) {
+    return context.failAndThrow(`Group '${groupNameOrDefault}' does not exist.`);
+  }
+  await validateAPIWorkspaceAndLogIssues({
+    workspace: await workspace.toFernWorkspace({ context }),
+    context,
+    logWarnings: false
+  });
   if (useLocalDocker) {
     await runLocalGenerationForWorkspace({
       projectConfig,
-      workspaceGetter,
+      workspace,
+      generatorGroup: group,
       keepDocker,
       context
     });
@@ -1161396,55 +1161435,19 @@ async function generateWorkspace({
     await runRemoteGenerationForAPIWorkspace({
       projectConfig,
       organization,
-      workspaceGetter,
+      workspace,
       context,
+      generatorGroup: group,
       version: version3,
       shouldLogS3Url,
-      token
+      token,
+      whitelabel: workspace.generatorsConfiguration.whitelabel,
+      absolutePathToPreview
     });
   }
 }
 
 // pnp:/home/circleci/project/packages/cli/cli/src/commands/generate/generateAPIWorkspaces.ts
-async function getFernWorkspace(sdkLanguage, groupName, apiWorkspace, context, preview) {
-  var _a5, _b4;
-  let fernWorkspace;
-  if (apiWorkspace.type === "fern") {
-    fernWorkspace = apiWorkspace;
-  } else {
-    fernWorkspace = await convertToFernWorkspace(apiWorkspace, context, false, sdkLanguage);
-  }
-  if (fernWorkspace.generatorsConfiguration == null) {
-    context.logger.warn("This workspaces has no generators.yml");
-    return;
-  }
-  if (fernWorkspace.generatorsConfiguration.groups.length === 0) {
-    context.logger.warn(`This workspaces has no groups specified in ${GENERATORS_CONFIGURATION_FILENAME}`);
-    return;
-  }
-  const absolutePathToPreview = preview ? AbsoluteFilePath.of((0, import_path39.join)(fernWorkspace.absoluteFilepath, RelativeFilePath.of(PREVIEW_DIRECTORY))) : void 0;
-  if (absolutePathToPreview != null) {
-    context.logger.info(`Writing preview to ${absolutePathToPreview}`);
-  }
-  await validateAPIWorkspaceAndLogIssues({ workspace: fernWorkspace, context, logWarnings: false });
-  const groupNameOrDefault = groupName ?? ((_a5 = fernWorkspace.generatorsConfiguration) == null ? void 0 : _a5.defaultGroup);
-  if (groupNameOrDefault == null) {
-    return context.failAndThrow(
-      `No group specified. Use the --${GROUP_CLI_OPTION} option, or set "${DEFAULT_GROUP_GENERATORS_CONFIG_KEY}" in ${GENERATORS_CONFIGURATION_FILENAME}`
-    );
-  }
-  const group = (_b4 = fernWorkspace.generatorsConfiguration) == null ? void 0 : _b4.groups.find(
-    (otherGroup) => otherGroup.groupName === groupNameOrDefault
-  );
-  if (group == null) {
-    return context.failAndThrow(`Group '${groupNameOrDefault}' does not exist.`);
-  }
-  return {
-    workspace: fernWorkspace,
-    absolutePathToPreview,
-    group
-  };
-}
 async function generateAPIWorkspaces({
   project,
   cliContext,
@@ -1161474,7 +1161477,7 @@ async function generateAPIWorkspaces({
       workspaces: project.apiWorkspaces.map((workspace) => {
         var _a5;
         return {
-          name: workspace.name,
+          name: workspace.workspaceName,
           group: groupName,
           generators: (_a5 = workspace.generatorsConfiguration) == null ? void 0 : _a5.groups.filter((group) => groupName == null ? true : group.groupName === groupName).map((group) => {
             return group.generators.map((generator) => {
@@ -1161493,17 +1161496,22 @@ async function generateAPIWorkspaces({
   await Promise.all(
     project.apiWorkspaces.map(async (workspace) => {
       await cliContext.runTaskForWorkspace(workspace, async (context) => {
-        const fernWorkspaceGetter = async (sdkLanguage) => getFernWorkspace(sdkLanguage, groupName, workspace, context, preview);
+        const absolutePathToPreview = preview ? join(workspace.absoluteFilepath, RelativeFilePath.of(PREVIEW_DIRECTORY)) : void 0;
+        if (absolutePathToPreview != null) {
+          context.logger.info(`Writing preview to ${absolutePathToPreview}`);
+        }
         await generateWorkspace({
           organization: project.config.organization,
-          workspaceGetter: fernWorkspaceGetter,
+          workspace,
           projectConfig: project.config,
           context,
           version: version3,
+          groupName,
           shouldLogS3Url,
           token,
           useLocalDocker,
-          keepDocker
+          keepDocker,
+          absolutePathToPreview
         });
       });
     })
@@ -1161541,7 +1161549,7 @@ async function generateDocsWorkspace({
     await validateDocsWorkspaceAndLogIssues({ workspace: docsWorkspace, context, logWarnings: false });
     const fernWorkspaces = await Promise.all(
       project.apiWorkspaces.map(async (workspace) => {
-        return workspace.type === "fern" ? workspace : await convertToFernWorkspace(workspace, context, true, void 0);
+        return workspace.toFernWorkspace({ context }, { enableUniqueErrorsPerEndpoint: true });
       })
     );
     await runRemoteGenerationForDocsWorkspace({
@@ -1161816,7 +1161824,7 @@ async function mockServer({
   }
   const workspace = project.apiWorkspaces[0];
   await cliContext.runTaskForWorkspace(workspace, async (context) => {
-    const fernWorkspace = workspace.type === "fern" ? workspace : await convertToFernWorkspace(workspace, context, false, void 0);
+    const fernWorkspace = await workspace.toFernWorkspace({ context });
     await validateAPIWorkspaceAndLogIssues({
       context,
       logWarnings: false,
@@ -1161845,7 +1161853,7 @@ async function mockServer({
 var import_fiddle_sdk5 = __toESM(require_fiddle_sdk());
 var import_axios9 = __toESM(require_axios4());
 var import_promises47 = require("fs/promises");
-var import_path40 = __toESM(require("path"));
+var import_path39 = __toESM(require("path"));
 var import_tar3 = __toESM(require_tar());
 var import_tmp_promise11 = __toESM(require_tmp_promise());
 async function registerWorkspacesV1({
@@ -1161867,7 +1161875,7 @@ async function registerWorkspacesV1({
   await Promise.all(
     project.apiWorkspaces.map(async (workspace) => {
       await cliContext.runTaskForWorkspace(workspace, async (context) => {
-        if (workspace.type === "oss") {
+        if (workspace instanceof OSSWorkspace) {
           context.failWithoutThrowing("Registering from OpenAPI not currently supported.");
           return;
         }
@@ -1161889,7 +1161897,7 @@ async function registerWorkspacesV1({
           return;
         }
         const tmpDir = await import_tmp_promise11.default.dir();
-        const tarPath = import_path40.default.join(tmpDir.path, "definition.tgz");
+        const tarPath = import_path39.default.join(tmpDir.path, "definition.tgz");
         context.logger.debug(`Compressing definition at ${tmpDir.path}`);
         await import_tar3.default.create({ file: tarPath, cwd: workspace.absoluteFilepath }, ["."]);
         context.logger.info("Uploading definition...");
@@ -1161911,19 +1161919,15 @@ async function registerWorkspacesV2({
   await Promise.all(
     project.apiWorkspaces.map(async (workspace) => {
       await cliContext.runTaskForWorkspace(workspace, async (context) => {
-        if (workspace.type === "oss") {
-          context.failWithoutThrowing("Cannot register OpenAPI workspace");
-        } else {
-          await registerApi({
-            organization: project.config.organization,
-            workspace,
-            context,
-            token,
-            audiences: { type: "all" },
-            snippetsConfig: {}
-          });
-          context.logger.info(source_default.green("Registered API"));
-        }
+        await registerApi({
+          organization: project.config.organization,
+          workspace: await workspace.toFernWorkspace({ context }),
+          context,
+          token,
+          audiences: { type: "all" },
+          snippetsConfig: {}
+        });
+        context.logger.info(source_default.green("Registered API"));
       });
     })
   );
@@ -1161948,7 +1161952,7 @@ async function testOutput({
   }
   const workspace = project.apiWorkspaces[0];
   await cliContext.runTaskForWorkspace(workspace, async (context) => {
-    const fernWorkspace = workspace.type === "fern" ? workspace : await convertToFernWorkspace(workspace, context, false, generationLanguage);
+    const fernWorkspace = await workspace.toFernWorkspace({ context });
     await validateAPIWorkspaceAndLogIssues({
       context,
       logWarnings: false,
@@ -1162022,7 +1162026,7 @@ async function generateToken({
 // pnp:/home/circleci/project/packages/cli/cli/src/commands/upgrade/updateApiSpec.ts
 var fs8 = __toESM(require("fs"));
 var import_promises48 = require("fs/promises");
-var import_path41 = __toESM(require("path"));
+var import_path40 = __toESM(require("path"));
 var import_stream5 = require("stream");
 var import_promises49 = require("stream/promises");
 async function fetchAndWriteFile(url, path42, logger) {
@@ -1162067,7 +1162071,7 @@ async function updateApiSpec({
         for (const api of apis) {
           if (typeof api !== "string" && api.origin != null) {
             cliContext.logger.info(`Origin found, fetching spec from ${api.origin}`);
-            await fetchAndWriteFile(api.origin, import_path41.default.join(fernDirectory, api.path), cliContext.logger);
+            await fetchAndWriteFile(api.origin, import_path40.default.join(fernDirectory, api.path), cliContext.logger);
           }
         }
       } else if (generatorConfig[generators_yml_exports.ASYNC_API_LOCATION_KEY] != null) {
@@ -1162078,7 +1162082,7 @@ async function updateApiSpec({
           const origin2 = generatorConfig[generators_yml_exports.API_ORIGIN_LOCATION_KEY];
           const location2 = generatorConfig[generators_yml_exports.ASYNC_API_LOCATION_KEY];
           if (origin2 != null && location2 != null) {
-            await fetchAndWriteFile(origin2, import_path41.default.join(fernDirectory, location2), cliContext.logger);
+            await fetchAndWriteFile(origin2, import_path40.default.join(fernDirectory, location2), cliContext.logger);
           }
         }
       } else if (generatorConfig[generators_yml_exports.OPENAPI_LOCATION_KEY] != null) {
@@ -1162088,7 +1162092,7 @@ async function updateApiSpec({
         if (apiOrigin != null && apiOutput != null) {
           origin = apiOrigin;
           cliContext.logger.info(`Origin found, fetching spec from ${apiOrigin}`);
-          await fetchAndWriteFile(apiOrigin, import_path41.default.join(fernDirectory, apiOutput), cliContext.logger);
+          await fetchAndWriteFile(apiOrigin, import_path40.default.join(fernDirectory, apiOutput), cliContext.logger);
         }
       }
       return;
@@ -1164666,17 +1164670,8 @@ async function validateWorkspaces({
   await Promise.all(
     project.apiWorkspaces.map(async (workspace) => {
       await cliContext.runTaskForWorkspace(workspace, async (context) => {
-        if (workspace.type === "oss") {
-          const fernWorkspace = await convertToFernWorkspace(
-            workspace,
-            context,
-            false,
-            void 0
-          );
-          await validateAPIWorkspaceAndLogIssues({ workspace: fernWorkspace, context, logWarnings });
-        } else {
-          await validateAPIWorkspaceAndLogIssues({ workspace, context, logWarnings });
-        }
+        const fernWorkspace = await workspace.toFernWorkspace({ context });
+        await validateAPIWorkspaceAndLogIssues({ workspace: fernWorkspace, context, logWarnings });
       });
     })
   );
@@ -1164684,7 +1164679,7 @@ async function validateWorkspaces({
 
 // pnp:/home/circleci/project/packages/cli/cli/src/commands/write-definition/writeDefinitionForWorkspaces.ts
 var import_promises75 = require("fs/promises");
-var import_path42 = __toESM(require("path"));
+var import_path41 = __toESM(require("path"));
 async function writeDefinitionForWorkspaces({
   project,
   cliContext,
@@ -1164693,9 +1164688,9 @@ async function writeDefinitionForWorkspaces({
   await Promise.all(
     project.apiWorkspaces.map(async (workspace) => {
       await cliContext.runTaskForWorkspace(workspace, async (context) => {
-        if (workspace.type === "oss") {
+        if (workspace instanceof OSSWorkspace) {
           await writeDefinitionForOpenAPIWorkspace2({ workspace, context, sdkLanguage });
-        } else {
+        } else if (workspace instanceof FernWorkspace) {
           await writeDefinitionForFernWorkspace({ workspace, context });
         }
       });
@@ -1164718,7 +1164713,7 @@ async function writeDefinitionForFernWorkspace({
       absolutePathToOutputDirectory
     });
     context.logger.info(
-      source_default.green(`Wrote imported definition at ${import_path42.default.relative(process.cwd(), absolutePathToOutputDirectory)}`)
+      source_default.green(`Wrote imported definition at ${import_path41.default.relative(process.cwd(), absolutePathToOutputDirectory)}`)
     );
   }
 }
@@ -1164727,7 +1164722,7 @@ async function writeDefinitionForOpenAPIWorkspace2({
   context,
   sdkLanguage
 }) {
-  const fernWorkspace = await convertToFernWorkspace(workspace, context, false, sdkLanguage);
+  const fernWorkspace = await workspace.toFernWorkspace({ context });
   const absolutePathToOutputDirectory = join(
     workspace.absoluteFilepath,
     RelativeFilePath.of(`.${DEFINITION_DIRECTORY}`)
@@ -1164737,7 +1164732,7 @@ async function writeDefinitionForOpenAPIWorkspace2({
     absolutePathToOutputDirectory
   });
   context.logger.info(
-    source_default.green(`Wrote definition to ${import_path42.default.relative(process.cwd(), absolutePathToOutputDirectory)}`)
+    source_default.green(`Wrote definition to ${import_path41.default.relative(process.cwd(), absolutePathToOutputDirectory)}`)
   );
 }
 async function writeFernDefinition2({