@fern-api/fern-api-dev 4.95.0 → 4.96.0

package/cli.cjs

@@ -478306,6 +478306,7 @@ var SingleUndiscriminatedUnionTypeSchema = schemas_exports.undiscriminatedUnion(
 // ../fern-definition/schema/lib/schemas/serialization/resources/types/types/UndiscriminatedUnionSchema.js
 var UndiscriminatedUnionSchema = schemas_exports.object({
   discriminated: schemas_exports.booleanLiteral(false),
+  "base-properties": schemas_exports.record(schemas_exports.string(), TypeReferenceSchema).optional(),
   union: schemas_exports.list(SingleUndiscriminatedUnionTypeSchema)
 }).extend(BaseTypeDeclarationSchema);
 
@@ -489207,7 +489208,8 @@ var UndiscriminatedUnionMember = schemas_exports3.objectWithoutOptionalPropertie
 
 // ../../ir-sdk/lib/sdk/serialization/resources/types/types/UndiscriminatedUnionTypeDeclaration.js
 var UndiscriminatedUnionTypeDeclaration = schemas_exports3.objectWithoutOptionalProperties({
-  members: schemas_exports3.list(UndiscriminatedUnionMember)
+  members: schemas_exports3.list(UndiscriminatedUnionMember),
+  baseProperties: schemas_exports3.list(ObjectProperty).optional()
 });
 
 // ../../ir-sdk/lib/sdk/serialization/resources/types/types/SingleUnionTypeProperty.js
@@ -491587,6 +491589,7 @@ function visitTypeDeclaration({ typeName, declaration, visitor, nodePathForType
       visitObject(union22, {
         docs: createDocsVisitor(visitor, nodePathForType),
         discriminated: noop2,
+        "base-properties": noop2,
         union: (unionMembers) => {
           for (const [index3, unionMember] of unionMembers.entries()) {
             const nodePathForUnionType = [...nodePathForType, `union[${index3}]`];
@@ -519799,6 +519802,7 @@ var Schema2 = schemas_exports9.union("type", {
 
 // ../api-importers/openapi/openapi-ir/lib/sdk/serialization/resources/finalIr/types/UnDiscriminatedOneOfSchema.js
 var UnDiscriminatedOneOfSchema = schemas_exports9.objectWithoutOptionalProperties({
+  commonProperties: schemas_exports9.list(schemas_exports9.lazyObject(() => CommonProperty)).optional(),
   schemas: schemas_exports9.list(schemas_exports9.lazy(() => Schema2))
 }).extend(WithSdkGroupName).extend(WithNamespace).extend(WithName3).extend(WithDescription).extend(WithAvailability3).extend(WithEncoding).extend(WithSource).extend(WithTitle).extend(WithInline);
 
@@ -520286,6 +520290,7 @@ var SchemaWithExample2 = schemas_exports9.union("type", {
 
 // ../api-importers/openapi/openapi-ir/lib/sdk/serialization/resources/parseIr/types/UnDiscriminatedOneOfSchemaWithExample.js
 var UnDiscriminatedOneOfSchemaWithExample = schemas_exports9.objectWithoutOptionalProperties({
+  commonProperties: schemas_exports9.list(schemas_exports9.lazyObject(() => CommonPropertyWithExample)).optional(),
   schemas: schemas_exports9.list(schemas_exports9.lazy(() => SchemaWithExample2))
 }).extend(WithSdkGroupName).extend(WithNamespace).extend(WithName3).extend(WithDescription).extend(WithAvailability3).extend(WithEncoding).extend(WithSource).extend(WithTitle).extend(WithInline);
 
@@ -521863,9 +521868,9 @@ function buildLiteralTypeDeclaration(schema2, nameOverride, generatedName) {
 function buildOneOfTypeDeclaration({ schema: schema2, context: context3, declarationFile, namespace, declarationDepth, variant }) {
   const encoding = schema2.encoding != null ? convertToEncodingSchema(schema2.encoding) : void 0;
   if (schema2.type === "discriminated") {
-    const baseProperties = {};
+    const baseProperties2 = {};
     for (const property23 of schema2.commonProperties) {
-      baseProperties[property23.key] = buildTypeReference({
+      baseProperties2[property23.key] = buildTypeReference({
         schema: property23.schema,
         fileContainingReference: declarationFile,
         context: context3,
@@ -521897,7 +521902,7 @@ function buildOneOfTypeDeclaration({ schema: schema2, context: context3, declara
             context: schema2.discriminatorContext
           }
         } : schema2.discriminantProperty,
-        "base-properties": baseProperties,
+        "base-properties": baseProperties2,
         docs: schema2.description ?? void 0,
         availability: schema2.availability != null ? convertAvailability(schema2.availability) : void 0,
         union: union23,
@@ -521918,10 +521923,22 @@ function buildOneOfTypeDeclaration({ schema: schema2, context: context3, declara
       variant
     }));
   }
+  const baseProperties = schema2.commonProperties != null && schema2.commonProperties.length > 0 ? Object.fromEntries(schema2.commonProperties.map((property23) => [
+    property23.key,
+    buildTypeReference({
+      schema: property23.schema,
+      fileContainingReference: declarationFile,
+      context: context3,
+      namespace,
+      declarationDepth: declarationDepth + 1,
+      variant
+    })
+  ])) : void 0;
   return {
     name: schema2.nameOverride ?? schema2.generatedName,
     schema: {
       discriminated: false,
+      "base-properties": baseProperties,
       docs: schema2.description ?? void 0,
       union: union22,
       encoding,
@@ -528784,6 +528801,12 @@ function convertToOneOf(oneOfSchema) {
         generatedName: oneOfSchema.generatedName,
         title: oneOfSchema.title,
         nameOverride: oneOfSchema.nameOverride,
+        commonProperties: oneOfSchema.commonProperties?.map((commonProperty) => {
+          return {
+            key: commonProperty.key,
+            schema: convertSchemaWithExampleToSchema(commonProperty.schema)
+          };
+        }),
         schemas: oneOfSchema.schemas.map((oneOfSchema2) => convertSchemaWithExampleToSchema(oneOfSchema2)),
         namespace: oneOfSchema.namespace,
         groupName: oneOfSchema.groupName,
@@ -529176,7 +529199,7 @@ function getAllProperties({ schema: schema2, context: context3, breadcrumbs, sou
 
 // ../api-importers/openapi/openapi-ir-parser/lib/schema/convertUndiscriminatedOneOf.js
 init_lodash();
-function convertUndiscriminatedOneOf({ nameOverride, generatedName, title: title2, breadcrumbs, description, availability, wrapAsOptional, wrapAsNullable, context: context3, subtypes, namespace, groupName, encoding, source: source2, subtypeSuffixOverrides }) {
+function convertUndiscriminatedOneOf({ nameOverride, generatedName, title: title2, breadcrumbs, description, availability, wrapAsOptional, wrapAsNullable, context: context3, subtypes, namespace, groupName, encoding, source: source2, subtypeSuffixOverrides, properties: properties7, required: required6 }) {
   const derivedSubtypeSuffixes = getUniqueSubTypeNames({ schemas: subtypes });
   const convertedSubtypes = subtypes.flatMap((schema2, index3) => {
     if (!isReferenceObject(schema2) && schema2.enum != null && context3.options.coerceEnumsToLiterals && schema2.type === "string") {
@@ -529204,6 +529227,14 @@ function convertUndiscriminatedOneOf({ nameOverride, generatedName, title: title
       convertSchema2(schema2, false, false, context3, [...breadcrumbs, subtypeSuffix ?? `${index3}`], source2, namespace)
     ];
   });
+  const convertedCommonProperties = properties7 != null && Object.keys(properties7).length > 0 ? Object.entries(properties7).map(([propertyName, propertySchema]) => {
+    const isRequired = required6 != null && required6.includes(propertyName);
+    const [isOptional, isNullable] = context3.options.coerceOptionalSchemasToNullable ? [false, !isRequired] : [!isRequired, false];
+    return {
+      key: propertyName,
+      schema: convertSchema2(propertySchema, isOptional, isNullable, context3, [...breadcrumbs, propertyName], source2, namespace)
+    };
+  }) : void 0;
   const uniqueSubtypes = deduplicateSubtypes(convertedSubtypes);
   return processSubtypes({
     uniqueSubtypes,
@@ -529218,7 +529249,8 @@ function convertUndiscriminatedOneOf({ nameOverride, generatedName, title: title
     groupName,
     context: context3,
     encoding,
-    source: source2
+    source: source2,
+    commonProperties: convertedCommonProperties
   });
 }
 function deduplicateSubtypes(subtypes) {
@@ -529239,11 +529271,12 @@ function deduplicateSubtypes(subtypes) {
   }
   return uniqueSubtypes;
 }
-function processSubtypes({ uniqueSubtypes, nameOverride, generatedName, title: title2, wrapAsOptional, wrapAsNullable, description, availability, namespace, groupName, context: context3, encoding, source: source2 }) {
+function processSubtypes({ uniqueSubtypes, nameOverride, generatedName, title: title2, wrapAsOptional, wrapAsNullable, description, availability, namespace, groupName, context: context3, encoding, source: source2, commonProperties }) {
+  const hasCommonProperties = commonProperties != null && commonProperties.length > 0;
   const everySubTypeIsLiteral = Object.entries(uniqueSubtypes).every(([_7, schema2]) => {
     return schema2.type === "literal";
   });
-  if (everySubTypeIsLiteral) {
+  if (everySubTypeIsLiteral && !hasCommonProperties) {
     const enumDescriptions = {};
     const enumValues = [];
     Object.entries(uniqueSubtypes).forEach(([_7, schema2]) => {
@@ -529275,7 +529308,7 @@ function processSubtypes({ uniqueSubtypes, nameOverride, generatedName, title: t
       inline: void 0
     });
   }
-  if (uniqueSubtypes.length === 1 && uniqueSubtypes[0] != null && !context3.options.preserveSingleSchemaOneOf) {
+  if (uniqueSubtypes.length === 1 && uniqueSubtypes[0] != null && !context3.options.preserveSingleSchemaOneOf && !hasCommonProperties) {
     let result = uniqueSubtypes[0];
     if (wrapAsNullable) {
       result = SchemaWithExample.nullable({
@@ -529317,7 +529350,8 @@ function processSubtypes({ uniqueSubtypes, nameOverride, generatedName, title: t
     namespace,
     groupName,
     encoding,
-    source: source2
+    source: source2,
+    commonProperties
   });
 }
 function convertUndiscriminatedOneOfWithDiscriminant({ nameOverride, generatedName, title: title2, description, availability, wrapAsOptional, wrapAsNullable, context: context3, namespace, groupName, discriminator, encoding, source: source2 }) {
@@ -529445,13 +529479,14 @@ function getUniqueSubTypeNames({ schemas }) {
   });
   return prefixes;
 }
-function wrapUndiscriminatedOneOf({ nameOverride, generatedName, title: title2, wrapAsOptional, wrapAsNullable, description, availability, subtypes, namespace, groupName, encoding, source: source2 }) {
+function wrapUndiscriminatedOneOf({ nameOverride, generatedName, title: title2, wrapAsOptional, wrapAsNullable, description, availability, subtypes, namespace, groupName, encoding, source: source2, commonProperties }) {
   let result = SchemaWithExample.oneOf(OneOfSchemaWithExample.undiscriminated({
     description,
     availability,
     nameOverride,
     generatedName,
     title: title2,
+    commonProperties: commonProperties != null && commonProperties.length > 0 ? commonProperties : void 0,
     schemas: subtypes,
     namespace,
     groupName,
@@ -530378,7 +530413,9 @@ function convertSchemaObject(schema2, wrapAsOptional, wrapAsNullable, context3,
           encoding,
           namespace,
           groupName,
-          source: source2
+          source: source2,
+          properties: schema2.properties,
+          required: schema2.required
         });
       }
     }
@@ -530444,7 +530481,9 @@ function convertSchemaObject(schema2, wrapAsOptional, wrapAsNullable, context3,
         encoding,
         namespace,
         groupName,
-        source: source2
+        source: source2,
+        properties: schema2.properties,
+        required: schema2.required
       });
     }
     if (schema2.discriminator?.mapping != null && Object.keys(schema2.discriminator.mapping).length > 0 && schema2.oneOf == null && schema2.anyOf == null) {
@@ -532299,6 +532338,12 @@ function convertToOneOf2(oneOfSchema) {
         generatedName: oneOfSchema.generatedName,
         nameOverride: oneOfSchema.nameOverride,
         title: oneOfSchema.title,
+        commonProperties: oneOfSchema.commonProperties?.map((commonProperty) => {
+          return {
+            key: commonProperty.key,
+            schema: convertSchemaToSchemaWithExample(commonProperty.schema)
+          };
+        }),
         schemas: oneOfSchema.schemas.map((oneOfSchema2) => convertSchemaToSchemaWithExample(oneOfSchema2)),
         namespace: oneOfSchema.namespace,
         groupName: oneOfSchema.groupName,
@@ -561162,6 +561207,19 @@ function convertUndiscriminatedUnionTypeDeclaration({ union: union22, file: file
     }) === currentIndex;
   });
   return Type.undiscriminatedUnion({
+    baseProperties: union22["base-properties"] != null ? Object.entries(union22["base-properties"]).map(([propertyKey, propertyDefinition]) => ({
+      ...convertDeclaration(propertyDefinition),
+      name: file4.casingsGenerator.generateNameAndWireValue({
+        wireValue: propertyKey,
+        name: getPropertyName({ propertyKey, property: propertyDefinition }).name
+      }),
+      valueType: file4.parseTypeReference(propertyDefinition),
+      propertyAccess: getPropertyAccess2({ property: propertyDefinition }),
+      v2Examples: {
+        userSpecifiedExamples: {},
+        autogeneratedExamples: {}
+      }
+    })) : void 0,
     members: uniqueMembers.map((member) => {
       const parsedType2 = file4.parseTypeReference(typeof member === "string" ? member : member.type);
       const typeWithDisplayName = parsedType2.type === "named" ? {
@@ -561226,13 +561284,18 @@ function getReferencedTypesFromRawDeclaration({ typeDeclaration: typeDeclaration
       return types4;
     },
     undiscriminatedUnion: (unionDeclaration) => {
-      return Object.values(unionDeclaration.union).reduce((types4, unionMember) => {
+      const types4 = [];
+      if (unionDeclaration["base-properties"] != null) {
+        types4.push(...Object.values(unionDeclaration["base-properties"]).map((property23) => typeof property23 === "string" ? property23 : property23.type));
+      }
+      types4.push(...Object.values(unionDeclaration.union).reduce((memberTypes, unionMember) => {
         const rawType = typeof unionMember === "string" ? unionMember : unionMember.type;
         if (typeof rawType === "string") {
-          types4.push(rawType);
+          memberTypes.push(rawType);
         }
-        return types4;
-      }, []);
+        return memberTypes;
+      }, []));
+      return types4;
     },
     enum: () => []
   });
@@ -588591,6 +588654,19 @@ var definitions2 = {
       discriminated: {
         const: false
       },
+      "base-properties": {
+        oneOf: [
+          {
+            type: "object",
+            additionalProperties: {
+              $ref: "#/definitions/types.TypeReferenceSchema"
+            }
+          },
+          {
+            type: "null"
+          }
+        ]
+      },
       union: {
         type: "array",
         items: {
@@ -592802,6 +592878,19 @@ var definitions3 = {
       discriminated: {
         const: false
       },
+      "base-properties": {
+        oneOf: [
+          {
+            type: "object",
+            additionalProperties: {
+              $ref: "#/definitions/types.TypeReferenceSchema"
+            }
+          },
+          {
+            type: "null"
+          }
+        ]
+      },
       union: {
         type: "array",
         items: {
@@ -600486,7 +600575,8 @@ var OneOfSchemaConverter = class extends AbstractConverter {
         }
         continue;
       }
-      const extendedSubSchema = this.extendSubSchema(subSchema);
+      const hasSiblingProperties = Object.keys(this.schema.properties ?? {}).length > 0;
+      const extendedSubSchema = hasSiblingProperties ? void 0 : this.extendSubSchema(subSchema);
       const schemaId = this.context.convertBreadcrumbsToName([`${this.id}_${index3}`]);
       const displayName = subSchema.title;
       const schemaConverter = new SchemaConverter({
@@ -600529,12 +600619,29 @@ var OneOfSchemaConverter = class extends AbstractConverter {
         });
       }
     }
+    const { convertedProperties: siblingProperties, referencedTypes: siblingReferencedTypes, inlinedTypesFromProperties: siblingInlinedTypes } = convertProperties({
+      properties: this.schema.properties ?? {},
+      required: this.schema.required ?? [],
+      breadcrumbs: this.breadcrumbs,
+      context: this.context,
+      errorCollector: this.context.errorCollector
+    });
+    for (const typeId of Object.keys(siblingInlinedTypes)) {
+      referencedTypes.add(typeId);
+    }
+    for (const ref2 of siblingReferencedTypes) {
+      referencedTypes.add(ref2);
+    }
     return {
       type: Type.undiscriminatedUnion({
-        members: unionTypes
+        members: unionTypes,
+        baseProperties: siblingProperties.length > 0 ? siblingProperties : void 0
       }),
       referencedTypes,
-      inlinedTypes
+      inlinedTypes: {
+        ...inlinedTypes,
+        ...siblingInlinedTypes
+      }
     };
   }
   shouldConvertAsNullableSchemaOrReference() {
@@ -618084,7 +618191,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.95.0",
+          version: "4.96.0",
           usingAccessToken: true
         }
       });
@@ -618138,7 +618245,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.95.0",
+        version: "4.96.0",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -829262,7 +829369,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.95.0";
+  const version7 = "4.96.0";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -841225,7 +841332,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.95.0",
+        cliVersion: "4.96.0",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -911874,7 +911981,8 @@ var OneOfFieldConverter = class extends AbstractConverter {
     }
     return {
       type: Type.undiscriminatedUnion({
-        members: unionTypes
+        members: unionTypes,
+        baseProperties: void 0
       }),
       referencedTypes: /* @__PURE__ */ new Set(),
       inlinedTypes: {},
@@ -915717,7 +915825,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.95.0";
+    return "4.96.0";
   }
   getCliName() {
     if (false) {

package/package.json

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