@fern-api/fern-api-dev 4.37.11 → 4.37.12-1-g5a6d7637c13

package/cli.cjs

@@ -499495,8 +499495,30 @@ function convertObject3({ nameOverride, generatedName, title: title3, breadcrumb
         }
         return property22;
       });
-      const variants = allOfElement.oneOf ?? allOfElement.anyOf;
-      if (variants != null && allOfElement.type == null && allOfElement.properties == null) {
+      let mergedAllOfElement = allOfElement;
+      if (allOfElement.properties != null) {
+        const mergedProperties = {};
+        for (const [key2, overridePropSchema] of Object.entries(allOfElement.properties)) {
+          let merged = overridePropSchema;
+          if (!isReferenceObject(overridePropSchema)) {
+            for (const otherAllOfElement of allOf) {
+              if (otherAllOfElement === allOfElement || !isReferenceObject(otherAllOfElement)) {
+                continue;
+              }
+              const resolvedParent = context2.resolveSchemaReference(otherAllOfElement);
+              const basePropSchema = resolvedParent.properties?.[key2];
+              if (basePropSchema != null && !isReferenceObject(basePropSchema)) {
+                merged = { ...basePropSchema, ...overridePropSchema };
+                break;
+              }
+            }
+          }
+          mergedProperties[key2] = merged;
+        }
+        mergedAllOfElement = { ...allOfElement, properties: mergedProperties };
+      }
+      const variants = mergedAllOfElement.oneOf ?? mergedAllOfElement.anyOf;
+      if (variants != null && mergedAllOfElement.type == null && mergedAllOfElement.properties == null) {
         const seenKeys = new Set(inlinedParentProperties.map((p10) => p10.key));
         for (const variantSchema of variants) {
           const resolvedVariantSchema = isReferenceObject(variantSchema) ? context2.resolveSchemaReference(variantSchema) : variantSchema;
@@ -499530,7 +499552,7 @@ function convertObject3({ nameOverride, generatedName, title: title3, breadcrumb
           }
         }
       } else {
-        const allOfSchema = convertSchema2(allOfElement, false, false, context2, breadcrumbs, source2, namespace);
+        const allOfSchema = convertSchema2(mergedAllOfElement, false, false, context2, breadcrumbs, source2, namespace);
         if (allOfSchema.type === "object") {
           inlinedParentProperties.push(...allOfSchema.properties);
         }
@@ -563985,9 +564007,26 @@ var ObjectSchemaConverter = class extends AbstractConverter {
     const objectHasRequiredProperties = this.schema.required != null && this.schema.required.length > 0;
     let inlinedTypes = propertiesInlinedTypes;
     let propertiesByAudience = basePropertiesByAudience;
+    const resolvedParentProperties = {};
+    for (const allOfSchemaOrReference of this.schema.allOf ?? []) {
+      if (this.context.isReferenceObject(allOfSchemaOrReference)) {
+        const resolved = this.context.resolveMaybeReference({
+          schemaOrReference: allOfSchemaOrReference,
+          breadcrumbs: this.breadcrumbs
+        });
+        if (resolved?.properties != null) {
+          for (const [key2, propSchema] of Object.entries(resolved.properties)) {
+            if (!this.context.isReferenceObject(propSchema) && resolvedParentProperties[key2] == null) {
+              resolvedParentProperties[key2] = propSchema;
+            }
+          }
+        }
+      }
+    }
     for (const [index3, allOfSchemaOrReference] of (this.schema.allOf ?? []).entries()) {
       const breadcrumbs = [...this.breadcrumbs, "allOf", index3.toString()];
       let allOfSchema;
+      let isInlineAllOf = false;
       if (this.context.isReferenceObject(allOfSchemaOrReference)) {
         const maybeResolvedReference = this.context.resolveMaybeReference({
           schemaOrReference: allOfSchemaOrReference,
@@ -564012,6 +564051,7 @@ var ObjectSchemaConverter = class extends AbstractConverter {
         }
       } else {
         allOfSchema = allOfSchemaOrReference;
+        isInlineAllOf = true;
       }
       if (typeof allOfSchema.additionalProperties === "boolean" && allOfSchema.additionalProperties) {
         hasAdditionalProperties = true;
@@ -564068,8 +564108,20 @@ var ObjectSchemaConverter = class extends AbstractConverter {
         }
         continue;
       }
+      let mergedProperties = allOfSchema.properties ?? {};
+      if (isInlineAllOf) {
+        mergedProperties = {};
+        for (const [key2, propSchema] of Object.entries(allOfSchema.properties ?? {})) {
+          const parentProp = resolvedParentProperties[key2];
+          if (parentProp != null && !this.context.isReferenceObject(propSchema)) {
+            mergedProperties[key2] = { ...parentProp, ...propSchema };
+          } else {
+            mergedProperties[key2] = propSchema;
+          }
+        }
+      }
       const { convertedProperties: allOfProperties, inlinedTypesFromProperties: inlinedTypesFromAllOf, referencedTypes: allOfReferencedTypes, propertiesByAudience: allOfPropertiesByAudience } = convertProperties({
-        properties: allOfSchema.properties ?? {},
+        properties: mergedProperties,
         required: [...this.schema.required ?? [], ...allOfSchema.required ?? []],
         breadcrumbs,
         context: this.context,
@@ -581600,7 +581652,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.37.11",
+          version: "4.37.12-1-g5a6d7637c13",
           usingAccessToken: true
         }
       });
@@ -581651,7 +581703,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.37.11",
+        version: "4.37.12-1-g5a6d7637c13",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -787754,7 +787806,7 @@ var import_path51 = __toESM(require("path"), 1);
 var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 function getCliSource() {
-  const version8 = "4.37.11";
+  const version8 = "4.37.12-1-g5a6d7637c13";
   return `cli@${version8}`;
 }
 var DebugLogger = class {
@@ -798549,7 +798601,7 @@ var LegacyDocsPublisher = class {
         previewId: void 0,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.37.11"
+        cliVersion: "4.37.12-1-g5a6d7637c13"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -839445,6 +839497,9 @@ var DynamicTypeLiteralMapper5 = class {
       return rust_exports.Expression.none();
     }
     const innerTypeRef = typeReference2.value || { type: "unknown" };
+    if (innerTypeRef.type === "optional" || innerTypeRef.type === "nullable") {
+      return this.convertOptional({ typeReference: innerTypeRef, value });
+    }
     const innerValue = this.convert({ typeReference: innerTypeRef, value });
     return rust_exports.Expression.functionCall("Some", [innerValue]);
   }
@@ -871140,7 +871195,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.37.11";
+    return "4.37.12-1-g5a6d7637c13";
   }
   getCliName() {
     if (false) {

package/package.json

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