@fern-api/fern-api-dev 3.52.0-63-g2019600bc72 → 3.52.1-2-g35a8ecf9b7c

package/cli.cjs

@@ -1572257,49 +1572257,63 @@ var OneOfSchemaConverter = class extends AbstractConverter {
     if (isDiscriminated === false) {
       return this.convertAsUndiscriminatedUnion();
     }
-    if (this.schema.discriminator != null && !this.unionVariantsContainLiteral({
-      discriminantProperty: this.schema.discriminator.propertyName
-    })) {
+    if (this.schema.discriminator != null) {
       return this.convertAsDiscriminatedUnion();
     }
     return this.convertAsUndiscriminatedUnion();
   }
-  unionVariantsContainLiteral({ discriminantProperty }) {
-    for (const [_15, reference4] of Object.entries(this.schema.discriminator?.mapping ?? {})) {
-      const schema2 = this.context.resolveReference({
-        reference: { $ref: reference4 },
-        breadcrumbs: this.breadcrumbs
-      });
-      if (schema2.resolved && !Object.keys(schema2.value.properties ?? {}).includes(discriminantProperty)) {
-        return false;
-      }
+  /**
+   * Filters out the discriminant property from a schema's properties.
+   * This is needed when the discriminant is redeclared in variant schemas.
+   */
+  filterDiscriminantFromSchema(schema2, discriminantProperty) {
+    if (schema2.properties == null || !(discriminantProperty in schema2.properties)) {
+      return schema2;
     }
-    return true;
+    const { [discriminantProperty]: _15, ...filteredProperties } = schema2.properties;
+    const filteredRequired = schema2.required?.filter((prop) => prop !== discriminantProperty);
+    return {
+      ...schema2,
+      properties: filteredProperties,
+      required: filteredRequired
+    };
   }
   convertAsDiscriminatedUnion() {
     if (this.schema.discriminator == null) {
       return void 0;
     }
+    const discriminantProperty = this.schema.discriminator.propertyName;
     const unionTypes = [];
     let referencedTypes = /* @__PURE__ */ new Set();
     let inlinedTypes = {};
     for (const [discriminant8, reference4] of Object.entries(this.schema.discriminator.mapping ?? {})) {
+      const typeId = this.context.getTypeIdFromSchemaReference({ $ref: reference4 });
+      const breadcrumbs = [...this.breadcrumbs, "discriminator", "mapping", discriminant8];
+      const resolvedSchema = this.context.resolveReference({
+        reference: { $ref: reference4 },
+        breadcrumbs
+      });
+      let schemaOrReference = { $ref: reference4 };
+      if (resolvedSchema.resolved && resolvedSchema.value.properties != null && discriminantProperty in resolvedSchema.value.properties) {
+        const filteredSchema = this.filterDiscriminantFromSchema(resolvedSchema.value, discriminantProperty);
+        schemaOrReference = filteredSchema;
+      }
       const singleUnionTypeSchemaConverter = new SchemaOrReferenceConverter({
         context: this.context,
-        schemaOrReference: { $ref: reference4 },
-        breadcrumbs: [...this.breadcrumbs, "discriminator", "mapping", discriminant8]
+        schemaOrReference,
+        schemaIdOverride: typeId ?? void 0,
+        breadcrumbs
       });
-      const typeId = this.context.getTypeIdFromSchemaReference({ $ref: reference4 });
       if (typeId != null) {
         referencedTypes.add(typeId);
       }
       const convertedSchema = singleUnionTypeSchemaConverter.convert();
       if (convertedSchema?.type != null && typeId != null) {
-        for (const typeId2 of Object.keys(convertedSchema?.inlinedTypes ?? {})) {
-          referencedTypes.add(typeId2);
+        for (const inlinedTypeId of Object.keys(convertedSchema?.inlinedTypes ?? {})) {
+          referencedTypes.add(inlinedTypeId);
         }
-        for (const typeId2 of convertedSchema.schema?.typeDeclaration.referencedTypes ?? []) {
-          referencedTypes.add(typeId2);
+        for (const refTypeId of convertedSchema.schema?.typeDeclaration.referencedTypes ?? []) {
+          referencedTypes.add(refTypeId);
         }
         const nameAndWireValue = this.context.casingsGenerator.generateNameAndWireValue({
           name: discriminant8,
@@ -1650969,7 +1650983,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "3.52.0-63-g2019600bc72",
+          version: "3.52.1-2-g35a8ecf9b7c",
           usingAccessToken: true
         }
       });
@@ -1651019,7 +1651033,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "3.52.0-63-g2019600bc72",
+        version: "3.52.1-2-g35a8ecf9b7c",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -1684161,7 +1684175,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "3.52.0-63-g2019600bc72";
+    return "3.52.1-2-g35a8ecf9b7c";
   }
   getCliName() {
     if (false) {
@@ -1687274,7 +1687288,7 @@ var import_path54 = __toESM(require("path"), 1);
 var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 function getCliSource() {
-  const version7 = "3.52.0-63-g2019600bc72";
+  const version7 = "3.52.1-2-g35a8ecf9b7c";
   return `cli@${version7}`;
 }
 var DebugLogger = class {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.52.0-63-g2019600bc72",
+  "version": "3.52.1-2-g35a8ecf9b7c",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",