@fern-api/fern-api-dev 5.85.0 → 5.86.0

package/cli.cjs

@@ -130521,6 +130521,7 @@ var init_OpenApiSettingsSchema2 = __esm({
       "additional-properties-defaults-to": schemas_exports8.boolean().optional(),
       "type-dates-as-strings": schemas_exports8.boolean().optional(),
       "preserve-single-schema-oneof": schemas_exports8.boolean().optional(),
+      "preserve-one-of-in-all-of": schemas_exports8.boolean().optional(),
       "inline-all-of-schemas": schemas_exports8.boolean().optional(),
       "resolve-aliases": ResolveAliases.optional(),
       "group-multi-api-environments": schemas_exports8.boolean().optional(),
@@ -152350,6 +152351,7 @@ var init_options2 = __esm({
       additionalPropertiesDefaultsTo: false,
       typeDatesAsStrings: false,
       preserveSingleSchemaOneOf: false,
+      preserveOneOfInAllOf: false,
       inlineAllOfSchemas: false,
       resolveAliases: false,
       groupMultiApiEnvironments: false,
@@ -199499,6 +199501,7 @@ var init_getAPIDefinitionSettings = __esm({
       additionalPropertiesDefaultsTo: "additionalPropertiesDefaultsTo",
       typeDatesAsStrings: "typeDatesAsStrings",
       preserveSingleSchemaOneOf: "preserveSingleSchemaOneOf",
+      preserveOneOfInAllOf: "preserveOneOfInAllOf",
       inlineAllOfSchemas: "inlineAllOfSchemas",
       resolveAliases: "resolveAliases",
       groupMultiApiEnvironments: "groupMultiApiEnvironments",
@@ -261165,6 +261168,7 @@ function parseOpenApiDefinitionSettingsSchema(settings) {
     additionalPropertiesDefaultsTo: settings?.["additional-properties-defaults-to"],
     typeDatesAsStrings: settings?.["type-dates-as-strings"],
     preserveSingleSchemaOneOf: settings?.["preserve-single-schema-oneof"],
+    preserveOneOfInAllOf: settings?.["preserve-one-of-in-all-of"],
     inlineAllOfSchemas: settings?.["inline-all-of-schemas"],
     resolveAliases: settings?.["resolve-aliases"],
     groupMultiApiEnvironments: settings?.["group-multi-api-environments"],
@@ -262023,6 +262027,7 @@ var init_convertGeneratorsConfiguration = __esm({
       additionalPropertiesDefaultsTo: void 0,
       typeDatesAsStrings: void 0,
       preserveSingleSchemaOneOf: void 0,
+      preserveOneOfInAllOf: void 0,
       inlineAllOfSchemas: void 0,
       resolveAliases: void 0,
       groupMultiApiEnvironments: void 0,
@@ -347777,6 +347782,8 @@ var init_SchemaConverter = __esm({
       "extensions"
     ];
     SchemaConverter = class _SchemaConverter extends AbstractConverter {
+      /** Upper bound on the variants produced by distributing an allOf over its unions. */
+      static MAX_DISTRIBUTED_VARIANTS = 64;
       schema;
       id;
       inlined;
@@ -347804,6 +347811,10 @@ var init_SchemaConverter = __esm({
         if (maybeConvertedEnumSchema != null) {
           return maybeConvertedEnumSchema;
         }
+        const maybeDistributedAllOfOverOneOf = this.tryDistributeAllOfOverOneOf();
+        if (maybeDistributedAllOfOverOneOf != null) {
+          return maybeDistributedAllOfOverOneOf;
+        }
         const maybeConvertedSingularAllOfSchema = this.tryConvertSingularAllOfSchema();
         if (maybeConvertedSingularAllOfSchema != null) {
           return maybeConvertedSingularAllOfSchema;
@@ -348001,6 +348012,101 @@ var init_SchemaConverter = __esm({
         }
         return void 0;
       }
+      /**
+       * Distributes an allOf whose members include a union over that union, so that
+       * `allOf: [oneOf: [A, B], S]` is converted as `oneOf: [allOf: [A, S], allOf: [B, S]]`.
+       * Otherwise the union member is flattened into the parent object and its variants are lost.
+       *
+       * Only the first union is distributed here; the remaining allOf members are re-injected into
+       * every variant, so any further unions are distributed by the recursive conversion below.
+       */
+      tryDistributeAllOfOverOneOf() {
+        if (!this.context.settings.preserveOneOfInAllOf) {
+          return void 0;
+        }
+        const allOf = this.schema.allOf;
+        if (!Array.isArray(allOf) || allOf.length === 0) {
+          return void 0;
+        }
+        if (this.schema.oneOf != null || this.schema.anyOf != null) {
+          return void 0;
+        }
+        const unions = this.getDistributableUnions(allOf);
+        const firstUnion = unions[0];
+        if (firstUnion == null) {
+          return void 0;
+        }
+        const variantCount = unions.reduce((count, union23) => count * union23.variants.length, 1);
+        if (variantCount > _SchemaConverter.MAX_DISTRIBUTED_VARIANTS) {
+          this.context.logger.warn(`Not distributing allOf over its ${unions.length} unions at ${this.breadcrumbs.join(".")}: it would produce ${variantCount} variants (max ${_SchemaConverter.MAX_DISTRIBUTED_VARIANTS}).`);
+          return void 0;
+        }
+        const sharedElements = allOf.filter((_5, index3) => index3 !== firstUnion.index);
+        if (this.schema.properties != null || this.schema.required != null) {
+          sharedElements.push({
+            type: "object",
+            properties: this.schema.properties,
+            required: this.schema.required
+          });
+        }
+        const siblings = { ...this.schema };
+        delete siblings.allOf;
+        delete siblings.properties;
+        delete siblings.required;
+        const distributedConverter = new _SchemaConverter({
+          context: this.context,
+          breadcrumbs: this.breadcrumbs,
+          schema: {
+            ...siblings,
+            oneOf: firstUnion.variants.map((variant) => {
+              const title2 = this.getVariantTitle(variant);
+              return { ...title2 != null ? { title: title2 } : {}, allOf: [variant, ...sharedElements] };
+            })
+          },
+          id: this.id,
+          inlined: this.inlined,
+          nameOverride: this.nameOverride,
+          visitedRefs: this.visitedRefs
+        });
+        return distributedConverter.convert();
+      }
+      getVariantTitle(variant) {
+        if (!this.context.isReferenceObject(variant)) {
+          return variant.title;
+        }
+        const resolved = this.context.resolveMaybeReference({
+          schemaOrReference: variant,
+          breadcrumbs: this.breadcrumbs
+        });
+        return resolved?.title ?? variant.$ref.split("/").pop();
+      }
+      /**
+       * The allOf members that are plain unions of the parent's shape, in declaration order.
+       */
+      getDistributableUnions(allOf) {
+        const unions = [];
+        for (const [index3, element4] of allOf.entries()) {
+          const resolved = this.context.isReferenceObject(element4) ? this.context.resolveMaybeReference({
+            schemaOrReference: element4,
+            breadcrumbs: this.breadcrumbs
+          }) : element4;
+          if (resolved == null || resolved.properties != null) {
+            continue;
+          }
+          if (resolved.type != null && resolved.type !== "object") {
+            continue;
+          }
+          if (resolved.discriminator != null) {
+            continue;
+          }
+          const variants = resolved.oneOf ?? resolved.anyOf;
+          if (variants == null || variants.length === 0) {
+            continue;
+          }
+          unions.push({ index: index3, variants });
+        }
+        return unions;
+      }
       tryConvertPrimitiveSchema() {
         const primitiveConverter = new PrimitiveSchemaConverter({ context: this.context, schema: this.schema });
         const primitiveType2 = primitiveConverter.convert();
@@ -684399,6 +684505,13 @@ var OpenApiSettingsSchema2 = BaseApiSettingsSchema2.extend({
    * Defaults to false.
    */
   preserveSingleSchemaOneof: external_exports.boolean().optional(),
+  /**
+   * If true, an allOf containing a oneOf/anyOf member is distributed into a union, where each
+   * variant is the union member merged with the remaining allOf members.
+   * If false, the variants' properties are flattened into a single object and marked optional.
+   * Defaults to false.
+   */
+  preserveOneOfInAllOf: external_exports.boolean().optional(),
   /**
    * Whether to inline allOf schemas. If false, allOf schemas will be
    * extended in the code generation.
@@ -693029,7 +693142,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.85.0",
+          version: "5.86.0",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -693095,7 +693208,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.85.0",
+        version: "5.86.0",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -699902,6 +700015,7 @@ var LegacyApiSpecAdapter = class {
       additionalPropertiesDefaultsTo: settings.additionalPropertiesDefaultsTo,
       typeDatesAsStrings: settings.typeDatesAsStrings,
       preserveSingleSchemaOneOf: settings.preserveSingleSchemaOneof,
+      preserveOneOfInAllOf: settings.preserveOneOfInAllOf,
       inlineAllOfSchemas: settings.inlineAllOfSchemas,
       resolveAliases: settings.resolveAliases,
       groupMultiApiEnvironments: settings.groupMultiApiEnvironments,
@@ -872292,6 +872406,7 @@ var SETTINGS_KEY_MAP = {
   "additional-properties-defaults-to": "additionalPropertiesDefaultsTo",
   "type-dates-as-strings": "typeDatesAsStrings",
   "preserve-single-schema-oneof": "preserveSingleSchemaOneof",
+  "preserve-one-of-in-all-of": "preserveOneOfInAllOf",
   "inline-all-of-schemas": "inlineAllOfSchemas",
   "resolve-aliases": "resolveAliases",
   "group-multi-api-environments": "groupMultiApiEnvironments",
@@ -874201,7 +874316,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "5.85.0";
+  const version7 = "5.86.0";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -906900,7 +907015,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.85.0",
+        cliVersion: "5.86.0",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -973775,7 +973890,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.85.0"
+    cli_version: "5.86.0"
   };
 }
 function isAutomationMode() {
@@ -974607,7 +974722,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.85.0";
+    return "5.86.0";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.85.0",
+  "version": "5.86.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",