@fern-api/fern-api-dev 4.106.3 → 4.107.0-11-g58f57e9e0ec

package/cli.cjs

@@ -340394,9 +340394,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.12.0/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.13.0/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist14 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.12.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.13.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -341136,17 +341136,57 @@ var require_dist14 = __commonJS({
         }
         const isAncestor = await this.git.isAncestor(lastGen.commit_sha, "HEAD");
         if (!isAncestor) {
+          return this.detectPatchesViaMergeBase(lastGen, lock);
+        }
+        return this.detectPatchesInRange(lastGen.commit_sha, lastGen, lock);
+      }
+      /**
+       * FER-10201 — Non-linear-history detection via `merge-base(prevGen, HEAD)`.
+       *
+       * After a squash-merge of a Fern-bot PR, `lastGen.commit_sha` (the previous
+       * `[fern-generated]`) is orphaned but still in git's object database. The
+       * merge-base is the commit on main from which the bot's branch was created —
+       * a reachable ancestor of HEAD. Walking that range and classifying each
+       * commit via `isGenerationCommit` mirrors the linear path and eliminates
+       * the bug class where pipeline-driven changes (autoversion, replay,
+       * generation) get bundled as customer customizations.
+       *
+       * Falls through to the legacy composite path when no common ancestor exists
+       * (truly disjoint history — orphan branches with no shared root).
+       */
+      async detectPatchesViaMergeBase(lastGen, lock) {
+        let mergeBase = "";
+        try {
+          mergeBase = (await this.git.exec(["merge-base", lastGen.commit_sha, "HEAD"])).trim();
+        } catch {
+        }
+        if (!mergeBase) {
+          this.warnings.push(
+            `No common ancestor between previous generation ${lastGen.commit_sha.slice(0, 7)} and HEAD. Falling back to composite tree-diff detection.`
+          );
           return this.detectPatchesViaTreeDiff(
             lastGen,
             /* commitKnownMissing */
             false
           );
         }
+        return this.detectPatchesInRange(mergeBase, lastGen, lock);
+      }
+      /**
+       * FER-10201 — Walk `${rangeStart}..HEAD`, classify each commit, emit one
+       * `StoredPatch` per customer commit. Body shared by the linear path
+       * (rangeStart = lastGen.commit_sha) and the merge-base path.
+       *
+       * Patch `base_generation` is always `lastGen.commit_sha` — the
+       * lockfile-tracked reference the applicator uses to fetch base file
+       * content, regardless of where the walk actually started.
+       */
+      async detectPatchesInRange(rangeStart, lastGen, lock) {
         const log4 = await this.git.exec([
           "log",
           "--first-parent",
           "--format=%H%x00%an%x00%ae%x00%s",
-          `${lastGen.commit_sha}..HEAD`,
+          `${rangeStart}..HEAD`,
           "--",
           this.sdkOutputDir
         ]);
@@ -516846,7 +516886,8 @@ var OpenApiSettingsSchema = schemas_exports8.object({
   "inline-all-of-schemas": schemas_exports8.boolean().optional(),
   "resolve-aliases": ResolveAliases.optional(),
   "group-multi-api-environments": schemas_exports8.boolean().optional(),
-  "default-integer-format": DefaultIntegerFormat2.optional()
+  "default-integer-format": DefaultIntegerFormat2.optional(),
+  "infer-discriminated-union-base-properties": schemas_exports8.boolean().optional()
 }).extend(BaseApiSettingsSchema);
 
 // ../configuration/lib/generators-yml/schemas/serialization/resources/generators/types/ApiConfigurationV2SettingsSchema.js
@@ -529828,7 +529869,8 @@ var DEFAULT_PARSE_OPENAPI_SETTINGS = {
   resolveSchemaCollisions: false,
   inferForwardCompatible: false,
   coerceConstsTo: "enums-coerceable-to-literals",
-  respectByteFormat: false
+  respectByteFormat: false,
+  shouldInferDiscriminatedUnionBaseProperties: false
 };
 function mergeOptions2(params2) {
   const { defaults: defaults3, options: options2, overrides, overrideOnly = /* @__PURE__ */ new Set(), undefinedIfAbsent = /* @__PURE__ */ new Set() } = params2;
@@ -530571,572 +530613,6 @@ function convertAvailability2(propertySchema) {
   return void 0;
 }
 
-// ../api-importers/openapi/openapi-ir-parser/lib/schema/inferDiscriminatorContext.js
-var SSE_SPEC_FIELDS = /* @__PURE__ */ new Set(["event", "data", "id", "retry"]);
-function collectAllProperties(schema2, context3) {
-  let allProperties = {
-    ...schema2.properties ?? {}
-  };
-  for (const allOfElement of schema2.allOf ?? []) {
-    if (isReferenceObject(allOfElement)) {
-      const resolved = context3.resolveSchemaReference(allOfElement);
-      const inheritedProperties = collectAllProperties(resolved, context3);
-      allProperties = { ...inheritedProperties, ...allProperties };
-    } else {
-      const inheritedProperties = collectAllProperties(allOfElement, context3);
-      allProperties = { ...inheritedProperties, ...allProperties };
-    }
-  }
-  return allProperties;
-}
-function resolvePropertySchema(schema2, context3) {
-  if (isReferenceObject(schema2)) {
-    return context3.resolveSchemaReference(schema2);
-  }
-  return schema2;
-}
-function variantMatchesSseSpec(schema2, context3) {
-  const allProperties = collectAllProperties(schema2, context3);
-  const propertyEntries = Object.entries(allProperties);
-  if (propertyEntries.length === 0) {
-    return false;
-  }
-  let hasEvent = false;
-  for (const [propName, propSchema] of propertyEntries) {
-    if (!SSE_SPEC_FIELDS.has(propName)) {
-      return false;
-    }
-    const resolved = resolvePropertySchema(propSchema, context3);
-    switch (propName) {
-      case "event":
-        hasEvent = true;
-        if (resolved.type !== "string") {
-          return false;
-        }
-        break;
-      case "id":
-        if (resolved.type !== "string") {
-          return false;
-        }
-        break;
-      case "retry":
-        if (resolved.type !== "integer") {
-          return false;
-        }
-        break;
-      case "data":
-        break;
-    }
-  }
-  return hasEvent;
-}
-function resolveDiscriminatorContext({ discriminator, context: context3 }) {
-  return getExtension(discriminator, FernOpenAPIExtension.DISCRIMINATOR_CONTEXT) ?? inferDiscriminatorContext({ discriminator, context: context3 });
-}
-function inferDiscriminatorContext({ discriminator, context: context3 }) {
-  const mapping = discriminator.mapping;
-  if (mapping == null || Object.keys(mapping).length === 0) {
-    return "data";
-  }
-  for (const schema2 of Object.values(mapping)) {
-    try {
-      const resolved = context3.resolveSchemaReference({ $ref: schema2 });
-      if (!variantMatchesSseSpec(resolved, context3)) {
-        return "data";
-      }
-    } catch {
-      return "data";
-    }
-  }
-  return "protocol";
-}
-function inferDiscriminatorContextFromVariants({ variants, context: context3 }) {
-  const variantEntries = Object.values(variants);
-  if (variantEntries.length === 0) {
-    return "data";
-  }
-  for (const variantSchema of variantEntries) {
-    try {
-      const resolved = isReferenceObject(variantSchema) ? context3.resolveSchemaReference(variantSchema) : variantSchema;
-      if (!variantMatchesSseSpec(resolved, context3)) {
-        return "data";
-      }
-    } catch {
-      return "data";
-    }
-  }
-  return "protocol";
-}
-
-// ../api-importers/openapi/openapi-ir-parser/lib/schema/convertDiscriminatedOneOf.js
-function convertDiscriminatedOneOf({ nameOverride, generatedName, title: title2, breadcrumbs, properties: properties7, description, availability, required: required6, wrapAsOptional, wrapAsNullable, discriminator, context: context3, namespace, groupName, encoding, source: source2 }) {
-  const discriminant21 = discriminator.propertyName;
-  const discriminantNameOverride = getExtension(discriminator, FernOpenAPIExtension.FERN_PROPERTY_NAME);
-  const discriminatorContext = resolveDiscriminatorContext({ discriminator, context: context3 });
-  const unionSubTypes = Object.fromEntries(Object.entries(discriminator.mapping ?? {}).map(([discriminantValue, schema2]) => {
-    const subtypeReference = convertReferenceObject({
-      $ref: schema2
-    }, false, false, context3, [schema2], encoding, source2, namespace);
-    context3.markReferencedByDiscriminatedUnion({
-      $ref: schema2
-    }, discriminant21, 1);
-    return [discriminantValue, subtypeReference];
-  }));
-  const convertedProperties = Object.entries(properties7).filter(([propertyName]) => {
-    return propertyName !== discriminant21;
-  }).map(([propertyName, propertySchema]) => {
-    const isRequired = required6 != null && required6.includes(propertyName);
-    const [isOptional, isNullable] = context3.options.coerceOptionalSchemasToNullable ? [false, !isRequired] : [!isRequired, false];
-    const schema2 = convertSchema2(propertySchema, isOptional, isNullable, context3, [...breadcrumbs, propertyName], source2, namespace);
-    return {
-      key: propertyName,
-      schema: schema2
-    };
-  });
-  return wrapDiscriminatedOneOf({
-    nameOverride,
-    generatedName,
-    title: title2,
-    wrapAsOptional,
-    wrapAsNullable,
-    properties: convertedProperties,
-    description,
-    availability,
-    discriminant: discriminant21,
-    discriminantNameOverride,
-    discriminatorContext,
-    subtypes: unionSubTypes,
-    defaultDiscriminantValue: void 0,
-    namespace,
-    groupName,
-    source: source2
-  });
-}
-function convertDiscriminatedOneOfWithVariants({ nameOverride, generatedName, title: title2, breadcrumbs, properties: properties7, description, availability, required: required6, wrapAsOptional, wrapAsNullable, discriminant: discriminant21, variants, defaultDiscriminantValue, context: context3, namespace, groupName, encoding, source: source2 }) {
-  const unionSubTypes = Object.fromEntries(Object.entries(variants).map(([discriminantValue, schema2]) => {
-    if (isReferenceObject(schema2)) {
-      const subtypeReference = convertReferenceObject(schema2, false, false, context3, [schema2.$ref], encoding, source2, namespace);
-      context3.markReferencedByDiscriminatedUnion(schema2, discriminant21, 1);
-      return [discriminantValue, subtypeReference];
-    } else {
-      const variantSchema = convertSchemaObject(schema2, false, false, context3, [...breadcrumbs, discriminantValue], encoding, source2, namespace, /* @__PURE__ */ new Set([discriminant21]));
-      return [discriminantValue, variantSchema];
-    }
-  }));
-  const convertedProperties = Object.entries(properties7).filter(([propertyName]) => {
-    return propertyName !== discriminant21;
-  }).map(([propertyName, propertySchema]) => {
-    const isRequired = required6 != null && required6.includes(propertyName);
-    const [isOptional, isNullable] = context3.options.coerceOptionalSchemasToNullable ? [false, !isRequired] : [!isRequired, false];
-    const schema2 = convertSchema2(propertySchema, isOptional, isNullable, context3, [...breadcrumbs, propertyName], source2, namespace);
-    return {
-      key: propertyName,
-      schema: schema2
-    };
-  });
-  return wrapDiscriminatedOneOf({
-    nameOverride,
-    generatedName,
-    title: title2,
-    wrapAsOptional,
-    wrapAsNullable,
-    properties: convertedProperties,
-    description,
-    availability,
-    discriminant: discriminant21,
-    discriminantNameOverride: void 0,
-    discriminatorContext: inferDiscriminatorContextFromVariants({ variants, context: context3 }),
-    subtypes: unionSubTypes,
-    defaultDiscriminantValue,
-    namespace,
-    groupName,
-    source: source2
-  });
-}
-function wrapDiscriminatedOneOf({ nameOverride, generatedName, title: title2, wrapAsOptional, wrapAsNullable, properties: properties7, description, availability, discriminant: discriminant21, discriminantNameOverride, discriminatorContext, subtypes, defaultDiscriminantValue, namespace, groupName, source: source2 }) {
-  let result = SchemaWithExample.oneOf(OneOfSchemaWithExample.discriminated({
-    description,
-    availability,
-    discriminantProperty: discriminant21,
-    discriminantPropertyNameOverride: discriminantNameOverride,
-    discriminatorContext,
-    defaultDiscriminantValue,
-    nameOverride,
-    generatedName,
-    title: title2,
-    schemas: subtypes,
-    commonProperties: properties7,
-    namespace,
-    groupName,
-    encoding: void 0,
-    source: source2,
-    inline: void 0
-  }));
-  if (wrapAsNullable) {
-    result = SchemaWithExample.nullable({
-      nameOverride,
-      generatedName,
-      title: title2,
-      value: result,
-      namespace,
-      groupName,
-      description,
-      availability,
-      inline: void 0
-    });
-  }
-  if (wrapAsOptional) {
-    result = SchemaWithExample.optional({
-      nameOverride,
-      generatedName,
-      title: title2,
-      value: result,
-      namespace,
-      groupName,
-      description,
-      availability,
-      inline: void 0
-    });
-  }
-  return result;
-}
-
-// ../api-importers/openapi/openapi-ir-parser/lib/schema/convertEncoding.js
-function convertEncoding(encodingSchema) {
-  if (encodingSchema.proto != null) {
-    return Encoding2.protobuf({
-      typeName: encodingSchema.proto.type
-    });
-  }
-  return void 0;
-}
-
-// ../api-importers/openapi/openapi-ir-parser/lib/schema/convertEnum.js
-function convertEnum({ nameOverride, generatedName, title: title2, fernEnum, enumVarNames, enumValues, _default: _default4, description, availability, wrapAsOptional, wrapAsNullable, namespace, groupName, context: context3, source: source2, inline }) {
-  const strippedEnumVarNames = stripCommonPrefix(enumVarNames ?? []);
-  const uniqueValues = new Set(enumValues);
-  const values2 = Array.from(uniqueValues).map((value2, index3) => {
-    const fernEnumValue = fernEnum?.[value2];
-    const enumVarName = strippedEnumVarNames[index3];
-    const valueIsValidName = VALID_ENUM_NAME_REGEX.test(value2);
-    let nameOverride2 = fernEnumValue?.name ?? enumVarName;
-    const generatedName2 = valueIsValidName ? value2 : generateEnumNameFromValue(value2);
-    if (nameOverride2 != null && !VALID_ENUM_NAME_REGEX.test(nameOverride2)) {
-      context3?.logger.warn(`Enum name override ${nameOverride2} is not a valid name. Falling back on ${generatedName2}.`);
-      nameOverride2 = void 0;
-    }
-    return {
-      nameOverride: nameOverride2,
-      generatedName: generatedName2,
-      value: value2,
-      description: fernEnumValue?.description,
-      availability,
-      casing: {
-        snake: fernEnumValue?.casing?.snake ?? void 0,
-        pascal: fernEnumValue?.casing?.pascal ?? void 0,
-        screamingSnake: fernEnumValue?.casing?.screamingSnake ?? void 0,
-        camel: fernEnumValue?.casing?.camel ?? void 0
-      }
-    };
-  });
-  const _defaultEnumValue = _default4 != null ? values2.find((value2) => value2.value === _default4) : void 0;
-  return wrapEnum({
-    wrapAsOptional,
-    wrapAsNullable,
-    nameOverride,
-    generatedName,
-    title: title2,
-    values: values2,
-    _default: _defaultEnumValue,
-    description,
-    availability,
-    namespace,
-    groupName,
-    source: source2,
-    inline
-  });
-}
-function wrapEnum({ wrapAsOptional, wrapAsNullable, nameOverride, generatedName, title: title2, values: values2, _default: _default4, description, availability, namespace, groupName, source: source2, inline }) {
-  let result = SchemaWithExample.enum({
-    nameOverride,
-    generatedName,
-    title: title2,
-    values: values2,
-    description,
-    availability,
-    default: _default4,
-    example: void 0,
-    namespace,
-    groupName,
-    source: source2,
-    inline
-  });
-  if (wrapAsNullable) {
-    result = SchemaWithExample.nullable({
-      nameOverride,
-      generatedName,
-      title: title2,
-      value: result,
-      description,
-      availability,
-      namespace,
-      groupName,
-      inline
-    });
-  }
-  if (wrapAsOptional) {
-    result = SchemaWithExample.optional({
-      nameOverride,
-      generatedName,
-      title: title2,
-      value: result,
-      description,
-      availability,
-      namespace,
-      groupName,
-      inline
-    });
-  }
-  return result;
-}
-function stripCommonPrefix(names2) {
-  if (names2.length <= 1 || names2[0] == null) {
-    return names2;
-  }
-  const nameZero = names2[0];
-  let i9 = 0;
-  while (nameZero[i9] != null && names2.every((name2) => name2[i9] === nameZero[i9])) {
-    i9++;
-  }
-  return names2.map((name2) => name2.substring(i9));
-}
-
-// ../api-importers/openapi/openapi-ir-parser/lib/schema/convertInteger.js
-function convertInteger({ nameOverride, generatedName, title: title2, format: format3, _default: _default4, minimum, maximum, exclusiveMinimum, exclusiveMaximum, multipleOf, description, availability, wrapAsOptional, wrapAsNullable, example, namespace, groupName, defaultIntegerFormat = generators_yml_exports.DefaultIntegerFormat.Int32 }) {
-  const effectiveFormat = format3 ?? defaultIntegerFormat;
-  const primitive = (() => {
-    switch (effectiveFormat) {
-      case generators_yml_exports.DefaultIntegerFormat.Int64:
-        return PrimitiveSchemaValueWithExample.int64({ default: _default4, example });
-      case generators_yml_exports.DefaultIntegerFormat.Uint32:
-        return PrimitiveSchemaValueWithExample.uint({ default: _default4, example });
-      case generators_yml_exports.DefaultIntegerFormat.Uint64:
-        return PrimitiveSchemaValueWithExample.uint64({ default: _default4, example });
-      default:
-        return PrimitiveSchemaValueWithExample.int({
-          default: _default4,
-          minimum,
-          maximum,
-          exclusiveMinimum,
-          exclusiveMaximum,
-          multipleOf,
-          example
-        });
-    }
-  })();
-  return wrapPrimitive({
-    nameOverride,
-    generatedName,
-    title: title2,
-    primitive,
-    wrapAsOptional,
-    wrapAsNullable,
-    description,
-    availability,
-    namespace,
-    groupName
-  });
-}
-
-// ../api-importers/openapi/openapi-ir-parser/lib/schema/convertLiteral.js
-function createLiteralSchemaValue(value2) {
-  if (typeof value2 === "string") {
-    return LiteralSchemaValue.string(value2);
-  } else if (typeof value2 === "boolean") {
-    return LiteralSchemaValue.boolean(value2);
-  } else {
-    return LiteralSchemaValue.string(`${value2}`);
-  }
-}
-function convertLiteral({ nameOverride, generatedName, title: title2, wrapAsOptional, wrapAsNullable, value: value2, description, availability, namespace, groupName }) {
-  let result = SchemaWithExample.literal({
-    nameOverride,
-    generatedName,
-    title: title2,
-    value: createLiteralSchemaValue(value2),
-    description,
-    availability,
-    namespace,
-    groupName
-  });
-  if (wrapAsNullable) {
-    result = SchemaWithExample.nullable({
-      nameOverride,
-      generatedName,
-      title: title2,
-      value: result,
-      description,
-      availability,
-      namespace,
-      groupName,
-      inline: void 0
-    });
-  }
-  if (wrapAsOptional) {
-    result = SchemaWithExample.optional({
-      nameOverride,
-      generatedName,
-      title: title2,
-      value: result,
-      description,
-      availability,
-      namespace,
-      groupName,
-      inline: void 0
-    });
-  }
-  return result;
-}
-
-// ../api-importers/openapi/openapi-ir-parser/lib/schema/convertNumber.js
-function convertNumber({ nameOverride, generatedName, title: title2, format: format3, _default: _default4, minimum, maximum, exclusiveMinimum, exclusiveMaximum, multipleOf, description, availability, wrapAsOptional, wrapAsNullable, example, namespace, groupName }) {
-  if (format3 == null || format3 === "double") {
-    return wrapPrimitive({
-      nameOverride,
-      generatedName,
-      title: title2,
-      primitive: PrimitiveSchemaValueWithExample.double({
-        default: _default4,
-        minimum,
-        maximum,
-        exclusiveMinimum,
-        exclusiveMaximum,
-        multipleOf,
-        example
-      }),
-      wrapAsOptional,
-      wrapAsNullable,
-      description,
-      availability,
-      namespace,
-      groupName
-    });
-  } else if (format3 === "float") {
-    return wrapPrimitive({
-      nameOverride,
-      generatedName,
-      title: title2,
-      primitive: PrimitiveSchemaValueWithExample.float({
-        example
-      }),
-      wrapAsOptional,
-      wrapAsNullable,
-      description,
-      availability,
-      namespace,
-      groupName
-    });
-  } else if (format3 === "int32") {
-    return wrapPrimitive({
-      nameOverride,
-      generatedName,
-      title: title2,
-      primitive: PrimitiveSchemaValueWithExample.int({
-        default: _default4,
-        minimum,
-        maximum,
-        exclusiveMinimum,
-        exclusiveMaximum,
-        multipleOf,
-        example
-      }),
-      wrapAsOptional,
-      wrapAsNullable,
-      description,
-      availability,
-      namespace,
-      groupName
-    });
-  } else if (format3 === "int64") {
-    return wrapPrimitive({
-      nameOverride,
-      generatedName,
-      title: title2,
-      primitive: PrimitiveSchemaValueWithExample.int64({
-        default: _default4,
-        example
-      }),
-      wrapAsOptional,
-      wrapAsNullable,
-      description,
-      availability,
-      namespace,
-      groupName
-    });
-  } else if (format3 === "uint32") {
-    return wrapPrimitive({
-      nameOverride,
-      generatedName,
-      title: title2,
-      primitive: PrimitiveSchemaValueWithExample.uint({
-        default: _default4,
-        example
-      }),
-      wrapAsOptional,
-      wrapAsNullable,
-      description,
-      availability,
-      namespace,
-      groupName
-    });
-  } else if (format3 === "uint64") {
-    return wrapPrimitive({
-      nameOverride,
-      generatedName,
-      title: title2,
-      primitive: PrimitiveSchemaValueWithExample.uint64({
-        default: _default4,
-        example
-      }),
-      wrapAsOptional,
-      wrapAsNullable,
-      description,
-      availability,
-      namespace,
-      groupName
-    });
-  } else if (format3 === "time-delta") {
-    return wrapPrimitive({
-      nameOverride,
-      generatedName,
-      title: title2,
-      primitive: PrimitiveSchemaValueWithExample.float({
-        example
-      }),
-      wrapAsOptional,
-      wrapAsNullable,
-      description,
-      availability,
-      namespace,
-      groupName
-    });
-  }
-  return wrapPrimitive({
-    nameOverride,
-    generatedName,
-    title: title2,
-    primitive: PrimitiveSchemaValueWithExample.float({
-      example
-    }),
-    wrapAsOptional,
-    wrapAsNullable,
-    description,
-    availability,
-    namespace,
-    groupName
-  });
-}
-
 // ../api-importers/openapi/openapi-ir-parser/lib/schema/utils/getBreadcrumbsFromReference.js
 var STARTS_WITH_COMPONENTS_SCHEMAS = {
   // if the first three breadcrumbs are "#", "components", "schemas"
@@ -531828,42 +531304,665 @@ function wrapObject({ nameOverride, generatedName, title: title2, wrapAsOptional
   }
   return result;
 }
-function getNonIgnoredProperties({ properties: properties7, breadcrumbs, context: context3 }) {
-  return Object.fromEntries(Object.entries(properties7).filter(([key2, propertySchema]) => {
-    const shouldIgnore = getExtension(propertySchema, FernOpenAPIExtension.IGNORE);
-    if (shouldIgnore) {
-      context3.logger.debug(`Property ${breadcrumbs.join(".")}.${key2} is marked with x-fern-ignore. Skipping.`);
-    }
-    return !shouldIgnore;
-  }));
-}
-function filterNotProperties(schema2) {
-  if (schema2.properties == null) {
-    return schema2;
-  }
-  const filteredProperties = {};
-  for (const [key2, propertySchema] of Object.entries(schema2.properties)) {
-    if (!isReferenceObject(propertySchema) && "not" in propertySchema) {
-      continue;
-    }
-    filteredProperties[key2] = propertySchema;
-  }
-  return { ...schema2, properties: filteredProperties };
-}
-function getAllProperties({ schema: schema2, context: context3, breadcrumbs, source: source2, namespace }) {
-  let properties7 = {};
-  const [resolvedSchema, resolvedBreadCrumbs] = isReferenceObject(schema2) ? [context3.resolveSchemaReference(schema2), getBreadcrumbsFromReference(schema2.$ref)] : [schema2, breadcrumbs];
-  for (const allOfElement of resolvedSchema.allOf ?? []) {
-    properties7 = {
-      ...properties7,
-      ...getAllProperties({ schema: allOfElement, context: context3, breadcrumbs: resolvedBreadCrumbs, source: source2, namespace })
-    };
-  }
-  for (const [propertyName, propertySchema] of Object.entries(getNonIgnoredProperties({ properties: resolvedSchema.properties ?? {}, breadcrumbs, context: context3 }))) {
-    const convertedPropertySchema = convertSchema2(propertySchema, false, false, context3, [...resolvedBreadCrumbs, propertyName], source2, namespace);
-    properties7[propertyName] = convertedPropertySchema;
+function getNonIgnoredProperties({ properties: properties7, breadcrumbs, context: context3 }) {
+  return Object.fromEntries(Object.entries(properties7).filter(([key2, propertySchema]) => {
+    const shouldIgnore = getExtension(propertySchema, FernOpenAPIExtension.IGNORE);
+    if (shouldIgnore) {
+      context3.logger.debug(`Property ${breadcrumbs.join(".")}.${key2} is marked with x-fern-ignore. Skipping.`);
+    }
+    return !shouldIgnore;
+  }));
+}
+function filterNotProperties(schema2) {
+  if (schema2.properties == null) {
+    return schema2;
+  }
+  const filteredProperties = {};
+  for (const [key2, propertySchema] of Object.entries(schema2.properties)) {
+    if (!isReferenceObject(propertySchema) && "not" in propertySchema) {
+      continue;
+    }
+    filteredProperties[key2] = propertySchema;
+  }
+  return { ...schema2, properties: filteredProperties };
+}
+function getAllProperties({ schema: schema2, context: context3, breadcrumbs, source: source2, namespace }) {
+  let properties7 = {};
+  const [resolvedSchema, resolvedBreadCrumbs] = isReferenceObject(schema2) ? [context3.resolveSchemaReference(schema2), getBreadcrumbsFromReference(schema2.$ref)] : [schema2, breadcrumbs];
+  for (const allOfElement of resolvedSchema.allOf ?? []) {
+    properties7 = {
+      ...properties7,
+      ...getAllProperties({ schema: allOfElement, context: context3, breadcrumbs: resolvedBreadCrumbs, source: source2, namespace })
+    };
+  }
+  for (const [propertyName, propertySchema] of Object.entries(getNonIgnoredProperties({ properties: resolvedSchema.properties ?? {}, breadcrumbs, context: context3 }))) {
+    const convertedPropertySchema = convertSchema2(propertySchema, false, false, context3, [...resolvedBreadCrumbs, propertyName], source2, namespace);
+    properties7[propertyName] = convertedPropertySchema;
+  }
+  return properties7;
+}
+
+// ../api-importers/openapi/openapi-ir-parser/lib/schema/inferDiscriminatorContext.js
+var SSE_SPEC_FIELDS = /* @__PURE__ */ new Set(["event", "data", "id", "retry"]);
+function collectAllProperties(schema2, context3) {
+  let allProperties = {
+    ...schema2.properties ?? {}
+  };
+  for (const allOfElement of schema2.allOf ?? []) {
+    if (isReferenceObject(allOfElement)) {
+      const resolved = context3.resolveSchemaReference(allOfElement);
+      const inheritedProperties = collectAllProperties(resolved, context3);
+      allProperties = { ...inheritedProperties, ...allProperties };
+    } else {
+      const inheritedProperties = collectAllProperties(allOfElement, context3);
+      allProperties = { ...inheritedProperties, ...allProperties };
+    }
+  }
+  return allProperties;
+}
+function resolvePropertySchema(schema2, context3) {
+  if (isReferenceObject(schema2)) {
+    return context3.resolveSchemaReference(schema2);
+  }
+  return schema2;
+}
+function variantMatchesSseSpec(schema2, context3) {
+  const allProperties = collectAllProperties(schema2, context3);
+  const propertyEntries = Object.entries(allProperties);
+  if (propertyEntries.length === 0) {
+    return false;
+  }
+  let hasEvent = false;
+  for (const [propName, propSchema] of propertyEntries) {
+    if (!SSE_SPEC_FIELDS.has(propName)) {
+      return false;
+    }
+    const resolved = resolvePropertySchema(propSchema, context3);
+    switch (propName) {
+      case "event":
+        hasEvent = true;
+        if (resolved.type !== "string") {
+          return false;
+        }
+        break;
+      case "id":
+        if (resolved.type !== "string") {
+          return false;
+        }
+        break;
+      case "retry":
+        if (resolved.type !== "integer") {
+          return false;
+        }
+        break;
+      case "data":
+        break;
+    }
+  }
+  return hasEvent;
+}
+function resolveDiscriminatorContext({ discriminator, context: context3 }) {
+  return getExtension(discriminator, FernOpenAPIExtension.DISCRIMINATOR_CONTEXT) ?? inferDiscriminatorContext({ discriminator, context: context3 });
+}
+function inferDiscriminatorContext({ discriminator, context: context3 }) {
+  const mapping = discriminator.mapping;
+  if (mapping == null || Object.keys(mapping).length === 0) {
+    return "data";
+  }
+  for (const schema2 of Object.values(mapping)) {
+    try {
+      const resolved = context3.resolveSchemaReference({ $ref: schema2 });
+      if (!variantMatchesSseSpec(resolved, context3)) {
+        return "data";
+      }
+    } catch {
+      return "data";
+    }
+  }
+  return "protocol";
+}
+function inferDiscriminatorContextFromVariants({ variants, context: context3 }) {
+  const variantEntries = Object.values(variants);
+  if (variantEntries.length === 0) {
+    return "data";
+  }
+  for (const variantSchema of variantEntries) {
+    try {
+      const resolved = isReferenceObject(variantSchema) ? context3.resolveSchemaReference(variantSchema) : variantSchema;
+      if (!variantMatchesSseSpec(resolved, context3)) {
+        return "data";
+      }
+    } catch {
+      return "data";
+    }
+  }
+  return "protocol";
+}
+
+// ../api-importers/openapi/openapi-ir-parser/lib/schema/convertDiscriminatedOneOf.js
+function convertDiscriminatedOneOf({ nameOverride, generatedName, title: title2, breadcrumbs, properties: properties7, description, availability, required: required6, wrapAsOptional, wrapAsNullable, discriminator, context: context3, namespace, groupName, encoding, source: source2 }) {
+  const discriminant21 = discriminator.propertyName;
+  const discriminantNameOverride = getExtension(discriminator, FernOpenAPIExtension.FERN_PROPERTY_NAME);
+  const discriminatorContext = resolveDiscriminatorContext({ discriminator, context: context3 });
+  const unionSubTypes = Object.fromEntries(Object.entries(discriminator.mapping ?? {}).map(([discriminantValue, schema2]) => {
+    const subtypeReference = convertReferenceObject({
+      $ref: schema2
+    }, false, false, context3, [schema2], encoding, source2, namespace);
+    context3.markReferencedByDiscriminatedUnion({
+      $ref: schema2
+    }, discriminant21, 1);
+    return [discriminantValue, subtypeReference];
+  }));
+  const convertedProperties = Object.entries(properties7).filter(([propertyName]) => {
+    return propertyName !== discriminant21;
+  }).map(([propertyName, propertySchema]) => {
+    const isRequired = required6 != null && required6.includes(propertyName);
+    const [isOptional, isNullable] = context3.options.coerceOptionalSchemasToNullable ? [false, !isRequired] : [!isRequired, false];
+    const schema2 = convertSchema2(propertySchema, isOptional, isNullable, context3, [...breadcrumbs, propertyName], source2, namespace);
+    return {
+      key: propertyName,
+      schema: schema2
+    };
+  });
+  if (context3.options.shouldInferDiscriminatedUnionBaseProperties) {
+    const variantSchemas = Object.values(discriminator.mapping ?? {}).map(($ref) => ({ $ref }));
+    const inferredCommonProperties = inferCommonPropertiesFromVariants({
+      variants: variantSchemas,
+      discriminant: discriminant21,
+      existingPropertyNames: new Set(convertedProperties.map((p14) => p14.key)),
+      context: context3,
+      breadcrumbs,
+      source: source2,
+      namespace
+    });
+    convertedProperties.push(...inferredCommonProperties);
+  }
+  return wrapDiscriminatedOneOf({
+    nameOverride,
+    generatedName,
+    title: title2,
+    wrapAsOptional,
+    wrapAsNullable,
+    properties: convertedProperties,
+    description,
+    availability,
+    discriminant: discriminant21,
+    discriminantNameOverride,
+    discriminatorContext,
+    subtypes: unionSubTypes,
+    defaultDiscriminantValue: void 0,
+    namespace,
+    groupName,
+    source: source2
+  });
+}
+function convertDiscriminatedOneOfWithVariants({ nameOverride, generatedName, title: title2, breadcrumbs, properties: properties7, description, availability, required: required6, wrapAsOptional, wrapAsNullable, discriminant: discriminant21, variants, defaultDiscriminantValue, context: context3, namespace, groupName, encoding, source: source2 }) {
+  const unionSubTypes = Object.fromEntries(Object.entries(variants).map(([discriminantValue, schema2]) => {
+    if (isReferenceObject(schema2)) {
+      const subtypeReference = convertReferenceObject(schema2, false, false, context3, [schema2.$ref], encoding, source2, namespace);
+      context3.markReferencedByDiscriminatedUnion(schema2, discriminant21, 1);
+      return [discriminantValue, subtypeReference];
+    } else {
+      const variantSchema = convertSchemaObject(schema2, false, false, context3, [...breadcrumbs, discriminantValue], encoding, source2, namespace, /* @__PURE__ */ new Set([discriminant21]));
+      return [discriminantValue, variantSchema];
+    }
+  }));
+  const convertedProperties = Object.entries(properties7).filter(([propertyName]) => {
+    return propertyName !== discriminant21;
+  }).map(([propertyName, propertySchema]) => {
+    const isRequired = required6 != null && required6.includes(propertyName);
+    const [isOptional, isNullable] = context3.options.coerceOptionalSchemasToNullable ? [false, !isRequired] : [!isRequired, false];
+    const schema2 = convertSchema2(propertySchema, isOptional, isNullable, context3, [...breadcrumbs, propertyName], source2, namespace);
+    return {
+      key: propertyName,
+      schema: schema2
+    };
+  });
+  if (context3.options.shouldInferDiscriminatedUnionBaseProperties) {
+    const inferredCommonProperties = inferCommonPropertiesFromVariants({
+      variants: Object.values(variants),
+      discriminant: discriminant21,
+      existingPropertyNames: new Set(convertedProperties.map((p14) => p14.key)),
+      context: context3,
+      breadcrumbs,
+      source: source2,
+      namespace
+    });
+    convertedProperties.push(...inferredCommonProperties);
+  }
+  return wrapDiscriminatedOneOf({
+    nameOverride,
+    generatedName,
+    title: title2,
+    wrapAsOptional,
+    wrapAsNullable,
+    properties: convertedProperties,
+    description,
+    availability,
+    discriminant: discriminant21,
+    discriminantNameOverride: void 0,
+    discriminatorContext: inferDiscriminatorContextFromVariants({ variants, context: context3 }),
+    subtypes: unionSubTypes,
+    defaultDiscriminantValue,
+    namespace,
+    groupName,
+    source: source2
+  });
+}
+function wrapDiscriminatedOneOf({ nameOverride, generatedName, title: title2, wrapAsOptional, wrapAsNullable, properties: properties7, description, availability, discriminant: discriminant21, discriminantNameOverride, discriminatorContext, subtypes, defaultDiscriminantValue, namespace, groupName, source: source2 }) {
+  let result = SchemaWithExample.oneOf(OneOfSchemaWithExample.discriminated({
+    description,
+    availability,
+    discriminantProperty: discriminant21,
+    discriminantPropertyNameOverride: discriminantNameOverride,
+    discriminatorContext,
+    defaultDiscriminantValue,
+    nameOverride,
+    generatedName,
+    title: title2,
+    schemas: subtypes,
+    commonProperties: properties7,
+    namespace,
+    groupName,
+    encoding: void 0,
+    source: source2,
+    inline: void 0
+  }));
+  if (wrapAsNullable) {
+    result = SchemaWithExample.nullable({
+      nameOverride,
+      generatedName,
+      title: title2,
+      value: result,
+      namespace,
+      groupName,
+      description,
+      availability,
+      inline: void 0
+    });
+  }
+  if (wrapAsOptional) {
+    result = SchemaWithExample.optional({
+      nameOverride,
+      generatedName,
+      title: title2,
+      value: result,
+      namespace,
+      groupName,
+      description,
+      availability,
+      inline: void 0
+    });
+  }
+  return result;
+}
+function inferCommonPropertiesFromVariants({ variants, discriminant: discriminant21, existingPropertyNames, context: context3, breadcrumbs, source: source2, namespace }) {
+  if (variants.length === 0) {
+    return [];
+  }
+  const variantPropertyMaps = variants.map((variant) => getAllProperties({ schema: variant, context: context3, breadcrumbs, source: source2, namespace }));
+  const firstVariantProps = variantPropertyMaps[0];
+  if (firstVariantProps == null) {
+    return [];
+  }
+  const result = [];
+  for (const [propertyName, firstSchema] of Object.entries(firstVariantProps)) {
+    if (propertyName === discriminant21) {
+      continue;
+    }
+    if (existingPropertyNames.has(propertyName)) {
+      continue;
+    }
+    let presentInAll = true;
+    for (let i9 = 1; i9 < variantPropertyMaps.length; i9++) {
+      const map16 = variantPropertyMaps[i9];
+      const otherSchema = map16?.[propertyName];
+      if (otherSchema == null || !isSchemaWithExampleEqual(firstSchema, otherSchema)) {
+        presentInAll = false;
+        break;
+      }
+    }
+    if (presentInAll) {
+      result.push({ key: propertyName, schema: firstSchema });
+    }
+  }
+  return result;
+}
+
+// ../api-importers/openapi/openapi-ir-parser/lib/schema/convertEncoding.js
+function convertEncoding(encodingSchema) {
+  if (encodingSchema.proto != null) {
+    return Encoding2.protobuf({
+      typeName: encodingSchema.proto.type
+    });
+  }
+  return void 0;
+}
+
+// ../api-importers/openapi/openapi-ir-parser/lib/schema/convertEnum.js
+function convertEnum({ nameOverride, generatedName, title: title2, fernEnum, enumVarNames, enumValues, _default: _default4, description, availability, wrapAsOptional, wrapAsNullable, namespace, groupName, context: context3, source: source2, inline }) {
+  const strippedEnumVarNames = stripCommonPrefix(enumVarNames ?? []);
+  const uniqueValues = new Set(enumValues);
+  const values2 = Array.from(uniqueValues).map((value2, index3) => {
+    const fernEnumValue = fernEnum?.[value2];
+    const enumVarName = strippedEnumVarNames[index3];
+    const valueIsValidName = VALID_ENUM_NAME_REGEX.test(value2);
+    let nameOverride2 = fernEnumValue?.name ?? enumVarName;
+    const generatedName2 = valueIsValidName ? value2 : generateEnumNameFromValue(value2);
+    if (nameOverride2 != null && !VALID_ENUM_NAME_REGEX.test(nameOverride2)) {
+      context3?.logger.warn(`Enum name override ${nameOverride2} is not a valid name. Falling back on ${generatedName2}.`);
+      nameOverride2 = void 0;
+    }
+    return {
+      nameOverride: nameOverride2,
+      generatedName: generatedName2,
+      value: value2,
+      description: fernEnumValue?.description,
+      availability,
+      casing: {
+        snake: fernEnumValue?.casing?.snake ?? void 0,
+        pascal: fernEnumValue?.casing?.pascal ?? void 0,
+        screamingSnake: fernEnumValue?.casing?.screamingSnake ?? void 0,
+        camel: fernEnumValue?.casing?.camel ?? void 0
+      }
+    };
+  });
+  const _defaultEnumValue = _default4 != null ? values2.find((value2) => value2.value === _default4) : void 0;
+  return wrapEnum({
+    wrapAsOptional,
+    wrapAsNullable,
+    nameOverride,
+    generatedName,
+    title: title2,
+    values: values2,
+    _default: _defaultEnumValue,
+    description,
+    availability,
+    namespace,
+    groupName,
+    source: source2,
+    inline
+  });
+}
+function wrapEnum({ wrapAsOptional, wrapAsNullable, nameOverride, generatedName, title: title2, values: values2, _default: _default4, description, availability, namespace, groupName, source: source2, inline }) {
+  let result = SchemaWithExample.enum({
+    nameOverride,
+    generatedName,
+    title: title2,
+    values: values2,
+    description,
+    availability,
+    default: _default4,
+    example: void 0,
+    namespace,
+    groupName,
+    source: source2,
+    inline
+  });
+  if (wrapAsNullable) {
+    result = SchemaWithExample.nullable({
+      nameOverride,
+      generatedName,
+      title: title2,
+      value: result,
+      description,
+      availability,
+      namespace,
+      groupName,
+      inline
+    });
+  }
+  if (wrapAsOptional) {
+    result = SchemaWithExample.optional({
+      nameOverride,
+      generatedName,
+      title: title2,
+      value: result,
+      description,
+      availability,
+      namespace,
+      groupName,
+      inline
+    });
+  }
+  return result;
+}
+function stripCommonPrefix(names2) {
+  if (names2.length <= 1 || names2[0] == null) {
+    return names2;
+  }
+  const nameZero = names2[0];
+  let i9 = 0;
+  while (nameZero[i9] != null && names2.every((name2) => name2[i9] === nameZero[i9])) {
+    i9++;
+  }
+  return names2.map((name2) => name2.substring(i9));
+}
+
+// ../api-importers/openapi/openapi-ir-parser/lib/schema/convertInteger.js
+function convertInteger({ nameOverride, generatedName, title: title2, format: format3, _default: _default4, minimum, maximum, exclusiveMinimum, exclusiveMaximum, multipleOf, description, availability, wrapAsOptional, wrapAsNullable, example, namespace, groupName, defaultIntegerFormat = generators_yml_exports.DefaultIntegerFormat.Int32 }) {
+  const effectiveFormat = format3 ?? defaultIntegerFormat;
+  const primitive = (() => {
+    switch (effectiveFormat) {
+      case generators_yml_exports.DefaultIntegerFormat.Int64:
+        return PrimitiveSchemaValueWithExample.int64({ default: _default4, example });
+      case generators_yml_exports.DefaultIntegerFormat.Uint32:
+        return PrimitiveSchemaValueWithExample.uint({ default: _default4, example });
+      case generators_yml_exports.DefaultIntegerFormat.Uint64:
+        return PrimitiveSchemaValueWithExample.uint64({ default: _default4, example });
+      default:
+        return PrimitiveSchemaValueWithExample.int({
+          default: _default4,
+          minimum,
+          maximum,
+          exclusiveMinimum,
+          exclusiveMaximum,
+          multipleOf,
+          example
+        });
+    }
+  })();
+  return wrapPrimitive({
+    nameOverride,
+    generatedName,
+    title: title2,
+    primitive,
+    wrapAsOptional,
+    wrapAsNullable,
+    description,
+    availability,
+    namespace,
+    groupName
+  });
+}
+
+// ../api-importers/openapi/openapi-ir-parser/lib/schema/convertLiteral.js
+function createLiteralSchemaValue(value2) {
+  if (typeof value2 === "string") {
+    return LiteralSchemaValue.string(value2);
+  } else if (typeof value2 === "boolean") {
+    return LiteralSchemaValue.boolean(value2);
+  } else {
+    return LiteralSchemaValue.string(`${value2}`);
+  }
+}
+function convertLiteral({ nameOverride, generatedName, title: title2, wrapAsOptional, wrapAsNullable, value: value2, description, availability, namespace, groupName }) {
+  let result = SchemaWithExample.literal({
+    nameOverride,
+    generatedName,
+    title: title2,
+    value: createLiteralSchemaValue(value2),
+    description,
+    availability,
+    namespace,
+    groupName
+  });
+  if (wrapAsNullable) {
+    result = SchemaWithExample.nullable({
+      nameOverride,
+      generatedName,
+      title: title2,
+      value: result,
+      description,
+      availability,
+      namespace,
+      groupName,
+      inline: void 0
+    });
+  }
+  if (wrapAsOptional) {
+    result = SchemaWithExample.optional({
+      nameOverride,
+      generatedName,
+      title: title2,
+      value: result,
+      description,
+      availability,
+      namespace,
+      groupName,
+      inline: void 0
+    });
+  }
+  return result;
+}
+
+// ../api-importers/openapi/openapi-ir-parser/lib/schema/convertNumber.js
+function convertNumber({ nameOverride, generatedName, title: title2, format: format3, _default: _default4, minimum, maximum, exclusiveMinimum, exclusiveMaximum, multipleOf, description, availability, wrapAsOptional, wrapAsNullable, example, namespace, groupName }) {
+  if (format3 == null || format3 === "double") {
+    return wrapPrimitive({
+      nameOverride,
+      generatedName,
+      title: title2,
+      primitive: PrimitiveSchemaValueWithExample.double({
+        default: _default4,
+        minimum,
+        maximum,
+        exclusiveMinimum,
+        exclusiveMaximum,
+        multipleOf,
+        example
+      }),
+      wrapAsOptional,
+      wrapAsNullable,
+      description,
+      availability,
+      namespace,
+      groupName
+    });
+  } else if (format3 === "float") {
+    return wrapPrimitive({
+      nameOverride,
+      generatedName,
+      title: title2,
+      primitive: PrimitiveSchemaValueWithExample.float({
+        example
+      }),
+      wrapAsOptional,
+      wrapAsNullable,
+      description,
+      availability,
+      namespace,
+      groupName
+    });
+  } else if (format3 === "int32") {
+    return wrapPrimitive({
+      nameOverride,
+      generatedName,
+      title: title2,
+      primitive: PrimitiveSchemaValueWithExample.int({
+        default: _default4,
+        minimum,
+        maximum,
+        exclusiveMinimum,
+        exclusiveMaximum,
+        multipleOf,
+        example
+      }),
+      wrapAsOptional,
+      wrapAsNullable,
+      description,
+      availability,
+      namespace,
+      groupName
+    });
+  } else if (format3 === "int64") {
+    return wrapPrimitive({
+      nameOverride,
+      generatedName,
+      title: title2,
+      primitive: PrimitiveSchemaValueWithExample.int64({
+        default: _default4,
+        example
+      }),
+      wrapAsOptional,
+      wrapAsNullable,
+      description,
+      availability,
+      namespace,
+      groupName
+    });
+  } else if (format3 === "uint32") {
+    return wrapPrimitive({
+      nameOverride,
+      generatedName,
+      title: title2,
+      primitive: PrimitiveSchemaValueWithExample.uint({
+        default: _default4,
+        example
+      }),
+      wrapAsOptional,
+      wrapAsNullable,
+      description,
+      availability,
+      namespace,
+      groupName
+    });
+  } else if (format3 === "uint64") {
+    return wrapPrimitive({
+      nameOverride,
+      generatedName,
+      title: title2,
+      primitive: PrimitiveSchemaValueWithExample.uint64({
+        default: _default4,
+        example
+      }),
+      wrapAsOptional,
+      wrapAsNullable,
+      description,
+      availability,
+      namespace,
+      groupName
+    });
+  } else if (format3 === "time-delta") {
+    return wrapPrimitive({
+      nameOverride,
+      generatedName,
+      title: title2,
+      primitive: PrimitiveSchemaValueWithExample.float({
+        example
+      }),
+      wrapAsOptional,
+      wrapAsNullable,
+      description,
+      availability,
+      namespace,
+      groupName
+    });
   }
-  return properties7;
+  return wrapPrimitive({
+    nameOverride,
+    generatedName,
+    title: title2,
+    primitive: PrimitiveSchemaValueWithExample.float({
+      example
+    }),
+    wrapAsOptional,
+    wrapAsNullable,
+    description,
+    availability,
+    namespace,
+    groupName
+  });
 }
 
 // ../api-importers/openapi/openapi-ir-parser/lib/schema/convertUndiscriminatedOneOf.js
@@ -541303,7 +541402,8 @@ var FIELD_MAPPINGS = {
   pathParameterOrder: "pathParameterOrder",
   resolveSchemaCollisions: "resolveSchemaCollisions",
   inferForwardCompatible: "inferForwardCompatible",
-  coerceConstsTo: "coerceConstsTo"
+  coerceConstsTo: "coerceConstsTo",
+  shouldInferDiscriminatedUnionBaseProperties: "shouldInferDiscriminatedUnionBaseProperties"
 };
 function setIfDefined2(target, key2, value2) {
   if (value2 !== void 0) {
@@ -550402,7 +550502,8 @@ var UNDEFINED_API_DEFINITION_SETTINGS = {
   defaultIntegerFormat: void 0,
   resolveSchemaCollisions: void 0,
   inferForwardCompatible: void 0,
-  coerceConstsTo: void 0
+  coerceConstsTo: void 0,
+  shouldInferDiscriminatedUnionBaseProperties: void 0
 };
 async function convertGeneratorsConfiguration({ absolutePathToGeneratorsConfiguration, rawGeneratorsConfiguration, context: context3 }) {
   const maybeTopLevelMetadata = getOutputMetadata(rawGeneratorsConfiguration.metadata);
@@ -550471,7 +550572,8 @@ function parseOpenApiDefinitionSettingsSchema(settings) {
     groupEnvironmentsByHost: settings?.["group-environments-by-host"],
     multiServerStrategy: settings?.["multi-server-strategy"],
     defaultIntegerFormat: settings?.["default-integer-format"],
-    pathParameterOrder: settings?.["path-parameter-order"]
+    pathParameterOrder: settings?.["path-parameter-order"],
+    shouldInferDiscriminatedUnionBaseProperties: settings?.["infer-discriminated-union-base-properties"]
   };
 }
 function parseAsyncApiDefinitionSettingsSchema(settings) {
@@ -614311,7 +614413,14 @@ var OpenApiSettingsSchema2 = BaseApiSettingsSchema2.extend({
    * The default format to use for integer types when no format is specified in the OpenAPI schema.
    * Defaults to int32.
    */
-  defaultIntegerFormat: DefaultIntegerFormatSchema.optional()
+  defaultIntegerFormat: DefaultIntegerFormatSchema.optional(),
+  /**
+   * If true, properties shared by every variant of a discriminated `oneOf`
+   * (including via `allOf`/`$ref`) are lifted into the union's base properties
+   * so SDKs can expose them directly on the union type without casting.
+   * Defaults to false.
+   */
+  inferDiscriminatedUnionBaseProperties: external_exports.boolean().optional()
 });
 
 // ../config/lib/schemas/specs/OpenApiSpecSchema.js
@@ -621196,7 +621305,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.106.3",
+          version: "4.107.0-11-g58f57e9e0ec",
           usingAccessToken: true
         }
       });
@@ -621250,7 +621359,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.106.3",
+        version: "4.107.0-11-g58f57e9e0ec",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -626585,7 +626694,8 @@ var LegacyApiSpecAdapter = class {
       resolveAliases: settings.resolveAliases,
       groupMultiApiEnvironments: settings.groupMultiApiEnvironments,
       defaultIntegerFormat: this.adaptDefaultIntegerFormat(settings.defaultIntegerFormat),
-      coerceConstsTo: settings.coerceConstsTo
+      coerceConstsTo: settings.coerceConstsTo,
+      shouldInferDiscriminatedUnionBaseProperties: settings.inferDiscriminatedUnionBaseProperties
     };
     const hasSettings = Object.values(result).some((v9) => v9 != null);
     return hasSettings ? result : void 0;
@@ -829478,6 +829588,7 @@ var SETTINGS_KEY_MAP = {
   "resolve-aliases": "resolveAliases",
   "group-multi-api-environments": "groupMultiApiEnvironments",
   "default-integer-format": "defaultIntegerFormat",
+  "infer-discriminated-union-base-properties": "inferDiscriminatedUnionBaseProperties",
   // AsyncAPI-specific settings
   "message-naming": "messageNaming"
 };
@@ -832891,7 +833002,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 = "4.106.3";
+  const version7 = "4.107.0-11-g58f57e9e0ec";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -845300,7 +845411,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.106.3",
+        cliVersion: "4.107.0-11-g58f57e9e0ec",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -881373,52 +881484,6 @@ var Begin = class extends AstNode6 {
   }
 };
 
-// ../../../generators/ruby-v2/ast/lib/ast/IfElse.js
-var IfElse = class extends AstNode6 {
-  ifBranch;
-  elseIfs;
-  elseBody;
-  constructor({ if: ifBranch, elseIf, elseBody }) {
-    super();
-    this.ifBranch = ifBranch;
-    this.elseIfs = elseIf ?? [];
-    this.elseBody = elseBody ? Array.isArray(elseBody) ? elseBody : [elseBody] : void 0;
-  }
-  write(writer2) {
-    writer2.write("if ");
-    this.ifBranch.condition.write(writer2);
-    writer2.writeLine();
-    writer2.indent();
-    for (const stmt of this.ifBranch.thenBody) {
-      stmt.write(writer2);
-      writer2.writeNewLineIfLastLineNot();
-    }
-    writer2.dedent();
-    for (const elseIf of this.elseIfs) {
-      writer2.write("elsif ");
-      elseIf.condition.write(writer2);
-      writer2.writeLine();
-      writer2.indent();
-      for (const stmt of elseIf.thenBody) {
-        stmt.write(writer2);
-        writer2.writeNewLineIfLastLineNot();
-      }
-      writer2.dedent();
-    }
-    if (this.elseBody && this.elseBody.length > 0) {
-      writer2.writeLine("else");
-      writer2.indent();
-      for (const stmt of this.elseBody) {
-        stmt.write(writer2);
-        writer2.writeNewLineIfLastLineNot();
-      }
-      writer2.dedent();
-    }
-    writer2.write("end");
-    writer2.writeNewLineIfLastLineNot();
-  }
-};
-
 // ../../../generators/ruby-v2/ast/lib/ast/Comment.js
 var MAX_LINE_LENGTH2 = 120;
 var COMMENT_PREFIX_LENGTH = 2;
@@ -882065,19 +882130,20 @@ var Class_ = class extends Module_ {
       writer2.writeLine("; end");
       return;
     }
-    if (this.statements.length) {
+    if (this.statements.length || this.methods.length) {
       writer2.newLine();
       writer2.indent();
       this.statements.forEach((statement, index3) => {
         statement.write(writer2);
-        writer2.newLine();
+        writer2.writeNewLineIfLastLineNot();
+        if (index3 < this.statements.length - 1) {
+          writer2.newLine();
+        }
       });
-      writer2.dedent();
-    }
-    if (this.methods.length) {
-      writer2.newLine();
-      writer2.indent();
-      this.methods.forEach((method8) => {
+      this.methods.forEach((method8, index3) => {
+        if (index3 > 0 || this.statements.length > 0) {
+          writer2.newLine();
+        }
         method8.write(writer2);
       });
       writer2.dedent();
@@ -882115,6 +882181,112 @@ var Class_ = class extends Module_ {
   }
 };
 
+// ../../../generators/ruby-v2/ast/lib/ast/IfElse.js
+var IfElse = class extends AstNode6 {
+  ifBranch;
+  elseIfs;
+  elseBody;
+  constructor({ if: ifBranch, elseIf, elseBody }) {
+    super();
+    this.ifBranch = ifBranch;
+    this.elseIfs = elseIf ?? [];
+    this.elseBody = elseBody ? Array.isArray(elseBody) ? elseBody : [elseBody] : void 0;
+  }
+  write(writer2) {
+    const modifier = this.renderAsModifier(writer2);
+    if (modifier != null) {
+      writer2.write(modifier);
+      writer2.writeNewLineIfLastLineNot();
+      return;
+    }
+    writer2.write("if ");
+    this.ifBranch.condition.write(writer2);
+    writer2.writeLine();
+    writer2.indent();
+    for (const stmt of this.ifBranch.thenBody) {
+      stmt.write(writer2);
+      writer2.writeNewLineIfLastLineNot();
+    }
+    writer2.dedent();
+    for (const elseIf of this.elseIfs) {
+      writer2.write("elsif ");
+      elseIf.condition.write(writer2);
+      writer2.writeLine();
+      writer2.indent();
+      for (const stmt of elseIf.thenBody) {
+        stmt.write(writer2);
+        writer2.writeNewLineIfLastLineNot();
+      }
+      writer2.dedent();
+    }
+    if (this.elseBody && this.elseBody.length > 0) {
+      writer2.writeLine("else");
+      writer2.indent();
+      for (const stmt of this.elseBody) {
+        stmt.write(writer2);
+        writer2.writeNewLineIfLastLineNot();
+      }
+      writer2.dedent();
+    }
+    writer2.write("end");
+    writer2.writeNewLineIfLastLineNot();
+  }
+  /**
+   * Returns the modifier-form rendering (`stmt if cond`) when this if is
+   * eligible:
+   *   - exactly one statement in the then-body
+   *   - no elsif and no else
+   *   - the single statement is not an intrinsically multi-line AST node
+   *     (Class, Module, Method, Begin, IfElse)
+   *   - the rendered statement and condition each fit on a single line
+   *
+   * Returns undefined when the shape isn't eligible, in which case the caller
+   * falls back to explicit if/end form.
+   *
+   * The generator's .rubocop.yml disables Layout/LineLength, so rubocop's
+   * Style/IfUnlessModifier accepts modifier form at any line length. Shape
+   * eligibility is therefore sufficient; we don't gate on a max-line-length
+   * budget here.
+   */
+  renderAsModifier(writer2) {
+    if (this.ifBranch.thenBody.length !== 1) {
+      return void 0;
+    }
+    if (this.elseIfs.length > 0) {
+      return void 0;
+    }
+    if (this.elseBody != null && this.elseBody.length > 0) {
+      return void 0;
+    }
+    const stmt = this.ifBranch.thenBody[0];
+    if (stmt == null) {
+      return void 0;
+    }
+    if (isKnownMultiLineNode(stmt) || isKnownMultiLineNode(this.ifBranch.condition)) {
+      return void 0;
+    }
+    const stmtRendered = renderNode(stmt, writer2);
+    const conditionRendered = renderNode(this.ifBranch.condition, writer2);
+    if (stmtRendered.length === 0 || conditionRendered.length === 0) {
+      return void 0;
+    }
+    if (stmtRendered.includes("\n") || conditionRendered.includes("\n")) {
+      return void 0;
+    }
+    return `${stmtRendered} if ${conditionRendered}`;
+  }
+};
+function isKnownMultiLineNode(node4) {
+  return node4 instanceof Class_ || node4 instanceof Module_ || node4 instanceof Method6 || node4 instanceof Begin || node4 instanceof IfElse;
+}
+function renderNode(node4, parentWriter) {
+  const rendered = node4.toString({
+    customConfig: parentWriter.customConfig,
+    formatter: parentWriter.formatter
+  });
+  return rendered.replace(/\n+$/, "");
+}
+
 // ../../../generators/ruby-v2/ast/lib/ast/ClassInstantiation.js
 var ClassInstantiation5 = class extends AstNode6 {
   classReference;
@@ -882375,9 +882547,36 @@ var TypeLiteral3 = class _TypeLiteral extends AstNode6 {
     super();
     this.internalType = internalType;
   }
+  /**
+   * Returns a stable string representation of this literal suitable for
+   * deduplicating hash keys (see Lint/DuplicateHashKey). Returns undefined
+   * for compound/dynamic shapes where value equality isn't decidable at
+   * emit time.
+   */
+  getDedupKey() {
+    switch (this.internalType.type) {
+      case "str":
+        return `str:${this.internalType.value}`;
+      case "interpolatedStr":
+        return `istr:${this.internalType.value}`;
+      case "int":
+        return `int:${this.internalType.value}`;
+      case "float":
+        return `float:${this.internalType.value}`;
+      case "bool":
+        return `bool:${this.internalType.value}`;
+      case "nil":
+        return "nil";
+      default:
+        return void 0;
+    }
+  }
   static string(value2) {
     return new this({ type: "str", value: value2 });
   }
+  static interpolatedString(value2) {
+    return new this({ type: "interpolatedStr", value: value2 });
+  }
   static integer(value2) {
     return new this({ type: "int", value: value2 });
   }
@@ -882414,6 +882613,11 @@ var TypeLiteral3 = class _TypeLiteral extends AstNode6 {
   write(writer2) {
     switch (this.internalType.type) {
       case "str": {
+        const value2 = this.internalType.value.replaceAll("\r\n", "\n");
+        writer2.write(`"${value2.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replace(/#(?=[{$@])/g, "\\#")}"`);
+        break;
+      }
+      case "interpolatedStr": {
         const value2 = this.internalType.value.replaceAll("\r\n", "\n");
         writer2.write(`"${value2.replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`);
         break;
@@ -882431,7 +882635,21 @@ var TypeLiteral3 = class _TypeLiteral extends AstNode6 {
         break;
       }
       case "hash": {
-        const entries23 = this.internalType.entries.filter((entry) => !_TypeLiteral.isNop(entry.key) && !_TypeLiteral.isNop(entry.value));
+        const filteredEntries = this.internalType.entries.filter((entry) => !_TypeLiteral.isNop(entry.key) && !_TypeLiteral.isNop(entry.value));
+        const seenKeys = /* @__PURE__ */ new Map();
+        filteredEntries.forEach((entry, index3) => {
+          const rendered = renderKeyForDedup(entry.key);
+          if (rendered != null) {
+            seenKeys.set(rendered, index3);
+          }
+        });
+        const entries23 = filteredEntries.filter((entry, index3) => {
+          const rendered = renderKeyForDedup(entry.key);
+          if (rendered == null) {
+            return true;
+          }
+          return seenKeys.get(rendered) === index3;
+        });
         if (entries23.length === 0) {
           writer2.write("{}");
           break;
@@ -882511,6 +882729,12 @@ var TypeLiteral3 = class _TypeLiteral extends AstNode6 {
     }
   }
 };
+function renderKeyForDedup(key2) {
+  if (!(key2 instanceof TypeLiteral3)) {
+    return void 0;
+  }
+  return key2.getDedupKey();
+}
 
 // ../../../generators/ruby-v2/ast/lib/ast/TypeParameter.js
 var Variance;
@@ -883473,6 +883697,7 @@ var EndpointSnippetGenerator7 = class {
       invokeMethodArgs.keywordArguments = invokeMethodArgs.keywordArguments ?? [];
       invokeMethodArgs.keywordArguments.push(requestOptions);
     }
+    invokeMethodArgs.keywordArguments = dedupeKeywordArguments(invokeMethodArgs.keywordArguments);
     return ruby_exports.invokeMethod(invokeMethodArgs);
   }
   /**
@@ -883506,6 +883731,7 @@ var EndpointSnippetGenerator7 = class {
       invokeMethodArgs.keywordArguments = invokeMethodArgs.keywordArguments ?? [];
       invokeMethodArgs.keywordArguments.push(requestOptions);
     }
+    invokeMethodArgs.keywordArguments = dedupeKeywordArguments(invokeMethodArgs.keywordArguments);
     return ruby_exports.invokeMethod(invokeMethodArgs);
   }
   /**
@@ -883842,6 +884068,21 @@ var EndpointSnippetGenerator7 = class {
     return this.context.getMethodName(endpoint3.declaration.name);
   }
 };
+function dedupeKeywordArguments(kwargs) {
+  if (kwargs == null || kwargs.length <= 1) {
+    return kwargs;
+  }
+  const lastIndexByName = /* @__PURE__ */ new Map();
+  kwargs.forEach((arg, index3) => {
+    lastIndexByName.set(arg.name, index3);
+  });
+  const deduped = kwargs.filter((arg, index3) => lastIndexByName.get(arg.name) === index3);
+  if (deduped.length !== kwargs.length) {
+    const droppedNames = Array.from(new Set(kwargs.map((arg) => arg.name).filter((name2, index3) => lastIndexByName.get(name2) !== index3)));
+    console.warn(`[ruby-v2 dynamic-snippets] duplicate keyword argument name(s) [${droppedNames.join(", ")}] in a generated snippet; keeping last occurrence to match **params runtime behavior. This indicates a latent name collision in the Ruby SDK method signature that should be disambiguated at the generator level.`);
+  }
+  return deduped;
+}
 
 // ../../../generators/ruby-v2/dynamic-snippets/lib/DynamicSnippetsGenerator.js
 var DynamicSnippetsGenerator6 = class extends AbstractDynamicSnippetsGenerator {
@@ -919401,7 +919642,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.106.3";
+    return "4.107.0-11-g58f57e9e0ec";
   }
   getCliName() {
     if (false) {