fern-api 0.31.23 → 0.31.25-rc0

package/bundle.cjs

@@ -49893,7 +49893,7 @@ var require_extract = __commonJS({
       return size2 && 512 - size2;
     };
     var emptyStream = function(self2, offset2) {
-      var s2 = new Source(self2, offset2);
+      var s2 = new Source2(self2, offset2);
       s2.end();
       return s2;
     };
@@ -49907,13 +49907,13 @@ var require_extract = __commonJS({
       header.pax = pax;
       return header;
     };
-    var Source = function(self2, offset2) {
+    var Source2 = function(self2, offset2) {
       this._parent = self2;
       this.offset = offset2;
       PassThrough2.call(this, { autoDestroy: false });
     };
-    util2.inherits(Source, PassThrough2);
-    Source.prototype.destroy = function(err) {
+    util2.inherits(Source2, PassThrough2);
+    Source2.prototype.destroy = function(err) {
       this._parent.destroy(err);
     };
     var Extract = function(opts) {
@@ -50041,7 +50041,7 @@ var require_extract = __commonJS({
           self2.emit("entry", header, emptyStream(self2, offset2), onunlock);
           return;
         }
-        self2._stream = new Source(self2, offset2);
+        self2._stream = new Source2(self2, offset2);
         self2.emit("entry", header, self2._stream, onunlock);
         self2._parse(header.size, onstreamend);
         oncontinue();
@@ -405155,7 +405155,7 @@ var require_resolve3 = __commonJS({
     var ref_utils_1 = require_ref_utils();
     var types_1 = require_types22();
     var utils_1 = require_utils15();
-    var Source = class {
+    var Source2 = class {
       constructor(absoluteRef, body, mimeType) {
         this.absoluteRef = absoluteRef;
         this.body = body;
@@ -405179,7 +405179,7 @@ var require_resolve3 = __commonJS({
         return this._lines;
       }
     };
-    exports2.Source = Source;
+    exports2.Source = Source2;
     var ResolveError = class extends Error {
       constructor(originalError) {
         super(originalError.message);
@@ -405206,7 +405206,7 @@ var require_resolve3 = __commonJS({
     }
     exports2.makeRefId = makeRefId;
     function makeDocumentFromString(sourceString, absoluteRef) {
-      const source = new Source(absoluteRef, sourceString);
+      const source = new Source2(absoluteRef, sourceString);
       try {
         return {
           source,
@@ -405239,13 +405239,13 @@ var require_resolve3 = __commonJS({
           try {
             if ((0, ref_utils_1.isAbsoluteUrl)(absoluteRef)) {
               const { body, mimeType } = yield (0, utils_1.readFileFromUrl)(absoluteRef, this.config.http);
-              return new Source(absoluteRef, body, mimeType);
+              return new Source2(absoluteRef, body, mimeType);
             } else {
               if (fs10.lstatSync(absoluteRef).isDirectory()) {
                 throw new Error(`Expected a file but received a folder at ${absoluteRef}`);
               }
               const content5 = yield fs10.promises.readFile(absoluteRef, "utf-8");
-              return new Source(absoluteRef, content5.replace(/\r\n/g, "\n"));
+              return new Source2(absoluteRef, content5.replace(/\r\n/g, "\n"));
             }
           } catch (error) {
             error.message = error.message.replace(", lstat", "");
@@ -451844,7 +451844,7 @@ var require_extract3 = __commonJS({
       return size2 && 512 - size2;
     };
     var emptyStream = function(self2, offset2) {
-      var s2 = new Source(self2, offset2);
+      var s2 = new Source2(self2, offset2);
       s2.end();
       return s2;
     };
@@ -451858,13 +451858,13 @@ var require_extract3 = __commonJS({
       header.pax = pax;
       return header;
     };
-    var Source = function(self2, offset2) {
+    var Source2 = function(self2, offset2) {
       this._parent = self2;
       this.offset = offset2;
       PassThrough2.call(this);
     };
-    util2.inherits(Source, PassThrough2);
-    Source.prototype.destroy = function(err) {
+    util2.inherits(Source2, PassThrough2);
+    Source2.prototype.destroy = function(err) {
       this._parent.destroy(err);
     };
     var Extract = function(opts) {
@@ -451992,7 +451992,7 @@ var require_extract3 = __commonJS({
           self2.emit("entry", header, emptyStream(self2, offset2), onunlock);
           return;
         }
-        self2._stream = new Source(self2, offset2);
+        self2._stream = new Source2(self2, offset2);
         self2.emit("entry", header, self2._stream, onunlock);
         self2._parse(header.size, onstreamend);
         oncontinue();
@@ -1122319,7 +1122319,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.31.23",
+          version: "0.31.25-rc0",
           usingAccessToken: true
         }
       });
@@ -1122381,7 +1122381,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.31.23",
+        version: "0.31.25-rc0",
         ...event,
         ...event.properties
       }
@@ -1137523,7 +1137523,8 @@ var FernOpenAPIExtension = {
   FERN_GLOBAL_HEADERS: "x-fern-global-headers",
   FERN_IDEMPOTENCY_HEADERS: "x-fern-idempotency-headers",
   IDEMPOTENT: "x-fern-idempotent",
-  FERN_PROPERTY_NAME: "x-fern-property-name"
+  FERN_PROPERTY_NAME: "x-fern-property-name",
+  IS_UNDISCRIMINATED: "x-fern-undiscriminated"
 };
 
 // pnp:/home/runner/work/fern/fern/packages/cli/openapi-parser/lib/openapi/v3/extensions/getFernEnum.js
@@ -1139390,29 +1139391,30 @@ function convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, prop
     }
   }
   if (schema2.oneOf != null && schema2.oneOf.length > 0) {
+    const isUndiscriminated = getExtension(schema2, FernOpenAPIExtension.IS_UNDISCRIMINATED);
     if (schema2.discriminator != null && schema2.discriminator.mapping != null && Object.keys(schema2.discriminator.mapping).length > 0) {
-      if (!context.options.discriminatedUnionV2) {
-        return convertDiscriminatedOneOf({
+      if (context.options.discriminatedUnionV2 || isUndiscriminated) {
+        return convertUndiscriminatedOneOfWithDiscriminant({
           nameOverride,
           generatedName,
-          breadcrumbs,
           description,
-          discriminator: schema2.discriminator,
-          properties: schema2.properties ?? {},
-          required: schema2.required,
           wrapAsNullable,
           context,
-          groupName
+          groupName,
+          discriminator: schema2.discriminator
         });
       } else {
-        return convertUndiscriminatedOneOfWithDiscriminant({
+        return convertDiscriminatedOneOf({
           nameOverride,
           generatedName,
+          breadcrumbs,
           description,
+          discriminator: schema2.discriminator,
+          properties: schema2.properties ?? {},
+          required: schema2.required,
           wrapAsNullable,
           context,
-          groupName,
-          discriminator: schema2.discriminator
+          groupName
         });
       }
     } else if (schema2.oneOf.length === 1 && schema2.oneOf[0] != null) {
@@ -1139443,7 +1139445,7 @@ function convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, prop
         });
       }
       const maybeDiscriminant = getDiscriminant({ schemas: schema2.oneOf, context });
-      if (maybeDiscriminant != null && !context.options.discriminatedUnionV2) {
+      if (maybeDiscriminant != null && !context.options.discriminatedUnionV2 && !isUndiscriminated) {
         return convertDiscriminatedOneOfWithVariants({
           nameOverride,
           generatedName,
@@ -1141691,22 +1141693,9 @@ var FERN_TYPE_EXTENSIONS = {
   }
 };
 async function loadOpenAPI({ absolutePathToOpenAPI, absolutePathToOpenAPIOverrides, context }) {
-  const result2 = await (0, import_openapi_core.bundle)({
-    config: new import_openapi_core.Config({
-      apis: {},
-      styleguide: {
-        plugins: [FERN_TYPE_EXTENSIONS],
-        rules: {
-          spec: "warn"
-        }
-      }
-    }, void 0),
-    ref: absolutePathToOpenAPI,
-    dereference: false,
-    removeUnusedComponents: false,
-    keepUrlRefs: true
+  const parsed = await parseOpenAPI({
+    absolutePathToOpenAPI
   });
-  const parsed = await import_swagger_parser.default.parse(result2.bundle.parsed);
   let overridesFilepath = void 0;
   if (absolutePathToOpenAPIOverrides != null) {
     overridesFilepath = absolutePathToOpenAPIOverrides;
@@ -1141717,14 +1141706,45 @@ async function loadOpenAPI({ absolutePathToOpenAPI, absolutePathToOpenAPIOverrid
     );
   }
   if (overridesFilepath != null) {
-    return await mergeWithOverrides({
+    const merged = await mergeWithOverrides({
       absoluteFilepathToOverrides: overridesFilepath,
       context,
       data: parsed
     });
+    return await parseOpenAPI({
+      absolutePathToOpenAPI,
+      parsed: merged
+    });
   }
   return parsed;
 }
+async function parseOpenAPI({ absolutePathToOpenAPI, parsed }) {
+  const options2 = {
+    config: new import_openapi_core.Config({
+      apis: {},
+      styleguide: {
+        plugins: [FERN_TYPE_EXTENSIONS],
+        rules: {
+          spec: "warn"
+        }
+      }
+    }, void 0),
+    dereference: false,
+    removeUnusedComponents: false,
+    keepUrlRefs: true
+  };
+  const result2 = parsed != null ? await (0, import_openapi_core.bundle)({
+    ...options2,
+    doc: {
+      source: new import_openapi_core.Source(absolutePathToOpenAPI, "<openapi>"),
+      parsed
+    }
+  }) : await (0, import_openapi_core.bundle)({
+    ...options2,
+    ref: absolutePathToOpenAPI
+  });
+  return await import_swagger_parser.default.parse(result2.bundle.parsed);
+}
 
 // pnp:/home/runner/work/fern/fern/packages/cli/openapi-parser/lib/openapi/v2/generateIr.js
 var import_swagger2openapi = __toESM(require_swagger2openapi());
@@ -1149979,10 +1149999,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.31.23" == null) {
+    if ("0.31.25-rc0" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.31.23";
+    return "0.31.25-rc0";
   }
   getCliName() {
     if ("fern" == null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fern-api",
-  "version": "0.31.23",
+  "version": "0.31.25-rc0",
   "repository": {
     "type": "git",
     "url": "https://github.com/fern-api/fern.git",