fern-api 0.16.30 → 0.16.31

package/bundle.cjs

@@ -736955,7 +736955,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.16.30",
+          version: "0.16.31",
           usingAccessToken: true
         }
       });
@@ -737017,7 +737017,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.16.30",
+        version: "0.16.31",
         ...event,
         ...event.properties
       }
@@ -751627,8 +751627,9 @@ function isObjectEqual(a2, b2) {
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/v3/converters/schema/convertObject.js
 function convertObject2({ nameOverride, generatedName, breadcrumbs, properties, description, required, wrapAsNullable, allOf, context, propertiesToExclude, groupName }) {
-  let allRequired = [...required ?? []];
-  let propertiesToConvert = { ...properties };
+  const allRequired = [...required ?? []];
+  const propertiesToConvert = { ...properties };
+  const inlinedParentProperties = [];
   const parents = [];
   for (const allOfElement of allOf) {
     if (isReferenceObject(allOfElement)) {
@@ -751644,9 +751645,9 @@ function convertObject2({ nameOverride, generatedName, breadcrumbs, properties,
       });
       context.markSchemaAsReferencedByNonRequest(schemaId);
     } else {
-      if (allOfElement.properties != null) {
-        allRequired = [...allRequired, ...allOfElement.required ?? []];
-        propertiesToConvert = { ...allOfElement.properties, ...propertiesToConvert };
+      const allOfSchema = convertSchema(allOfElement, false, context, breadcrumbs);
+      if (allOfSchema.type === "object") {
+        inlinedParentProperties.push(...allOfSchema.properties);
       }
     }
   }
@@ -751702,6 +751703,21 @@ function convertObject2({ nameOverride, generatedName, breadcrumbs, properties,
       generatedName: getGeneratedPropertyName([...breadcrumbs, propertyName])
     };
   });
+  convertedProperties.push(...inlinedParentProperties.map((property2) => {
+    const conflicts = property2.conflict;
+    for (const parent2 of parents) {
+      const parentPropertySchema = parent2.properties[property2.key];
+      if (parentPropertySchema != null && !isSchemaWithExampleEqual(property2.schema, parentPropertySchema)) {
+        conflicts[parent2.schemaId] = { differentSchema: true };
+      } else if (parentPropertySchema != null) {
+        conflicts[parent2.schemaId] = { differentSchema: false };
+      }
+    }
+    return {
+      ...property2,
+      conflict: conflicts
+    };
+  }));
   return wrapObject({
     nameOverride,
     generatedName,
@@ -761725,10 +761741,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.16.30" == null) {
+    if ("0.16.31" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.16.30";
+    return "0.16.31";
   }
   getCliName() {
     if ("fern" == null) {

package/package.json

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