@fern-api/fern-api-dev 5.23.3-15-g95ed8bbddcd → 5.23.3-16-gd93ed571950

package/cli.cjs

@@ -578139,15 +578139,28 @@ function convertSchemaObject(schema2, wrapAsOptional, wrapAsNullable, context3,
         const convertedSchema = convertSchema2(filteredAllOfs[0], wrapAsOptional, wrapAsNullable, context3, breadcrumbs, source2, namespace, referencedAsRequest);
         return maybeInjectDescriptionOrGroupName(convertedSchema, description, namespace, groupName);
       }
-      const filteredAllOfObjects = filteredAllOfs.filter((allOf) => {
-        const valid2 = isValidAllOfObject(allOf);
-        if (!valid2) {
+      const filteredAllOfObjects = [];
+      const filteredOutPrimitiveElements = [];
+      for (const allOf of filteredAllOfs) {
+        if (isValidAllOfObject(allOf)) {
+          filteredAllOfObjects.push(allOf);
+        } else {
           context3.logger.debug(`Skipping non-object allOf element: ${JSON.stringify(allOf)}`);
+          if (!isReferenceObject(allOf)) {
+            filteredOutPrimitiveElements.push(allOf);
+          }
         }
-        return valid2;
-      });
+      }
       if ((schema2.properties == null || hasNoProperties(schema2)) && filteredAllOfObjects.length === 1 && filteredAllOfObjects[0] != null && (schema2.additionalProperties == null || schema2.additionalProperties === false)) {
-        const convertedSchema = convertSchema2(filteredAllOfObjects[0], wrapAsOptional, wrapAsNullable, context3, breadcrumbs, source2, namespace, referencedAsRequest);
+        let elementToConvert = filteredAllOfObjects[0];
+        if (filteredOutPrimitiveElements.length > 0) {
+          const base4 = isReferenceObject(elementToConvert) ? { ...context3.resolveSchemaReference(elementToConvert) } : { ...elementToConvert };
+          for (const primitiveElement of filteredOutPrimitiveElements) {
+            Object.assign(base4, primitiveElement);
+          }
+          elementToConvert = base4;
+        }
+        const convertedSchema = convertSchema2(elementToConvert, wrapAsOptional, wrapAsNullable, context3, breadcrumbs, source2, namespace, referencedAsRequest);
         return maybeInjectDescriptionOrGroupName(convertedSchema, description, namespace, groupName);
       }
       return convertObject3({
@@ -647959,7 +647972,8 @@ var ExampleConverter = class _ExampleConverter extends AbstractConverter {
       };
     }
     const exampleObj = typeof this.example !== "object" || this.example == null ? {} : this.example;
-    const resultsByKey = Object.entries(resolvedSchema.properties ?? {}).map(([key2, property24]) => {
+    const { mergedProperties, mergedRequired } = this.mergeAllOfProperties(resolvedSchema);
+    const resultsByKey = Object.entries(mergedProperties).map(([key2, property24]) => {
       if (typeof property24 !== "object") {
         return {
           key: key2,
@@ -648025,7 +648039,7 @@ var ExampleConverter = class _ExampleConverter extends AbstractConverter {
       }
       const propertyAllowsNull = schemaAllowsNull(property24);
       const propertyIsOmittedFromExample = !(key2 in exampleObj) || !propertyAllowsNull && exampleObj[key2] == null || propertyAllowsNull && exampleObj[key2] === void 0;
-      const propertyIsOptional = !resolvedSchema.required?.includes(key2);
+      const propertyIsOptional = !mergedRequired.includes(key2);
       if (propertyIsOmittedFromExample && propertyIsOptional) {
         if (this.example === void 0 && this.generateOptionalProperties) {
           const propertyExample = this.maybeResolveSchemaExample(property24);
@@ -648100,10 +648114,12 @@ var ExampleConverter = class _ExampleConverter extends AbstractConverter {
     for (const result of allOfResults) {
       if (typeof result.validExample === "object" && result.validExample !== null) {
         const validExampleObj = result.validExample;
-        example = {
-          ...example,
-          ...Object.fromEntries(Object.entries(validExampleObj).filter(([_7, value2]) => value2 !== void 0))
-        };
+        const filteredAllOf = Object.fromEntries(Object.entries(validExampleObj).filter(([_7, value2]) => value2 !== void 0));
+        for (const [key2, value2] of Object.entries(filteredAllOf)) {
+          if (!(key2 in example) || example[key2] == null) {
+            example[key2] = value2;
+          }
+        }
       }
     }
     const additionalPropertiesResults = [];
@@ -648415,6 +648431,81 @@ var ExampleConverter = class _ExampleConverter extends AbstractConverter {
     }
     return void 0;
   }
+  /**
+   * Handles allOf schemas where one element provides a base object and another
+   * overrides specific properties. For example, given:
+   *
+   *   allOf:
+   *     - $ref: GenericSearchResponse   # base: { results: { type: array, items: {} } }
+   *     - properties:                    # override: just replaces items
+   *         results:
+   *           items:
+   *             $ref: SpecificModel
+   *
+   * The override's `results` only has `{ items: $ref }` — it's missing `type: array`
+   * because the base already defined that. This function merges the two so the final
+   * `results` property gets `{ type: array, items: $ref SpecificModel }`, letting the
+   * example generator know it should produce an array, not a generic object.
+   *
+   * Precedence: the override's fields win; the base's fields fill in anything missing.
+   */
+  mergeAllOfProperties(resolvedSchema) {
+    const directProps = resolvedSchema.properties ?? {};
+    const directRequired = resolvedSchema.required ?? [];
+    if (resolvedSchema.allOf == null || resolvedSchema.allOf.length === 0) {
+      return { mergedProperties: directProps, mergedRequired: directRequired };
+    }
+    const baseProps = {};
+    const baseRequired = new Set(directRequired);
+    for (const subSchema of resolvedSchema.allOf) {
+      const resolved = this.context.resolveMaybeReference({
+        schemaOrReference: subSchema,
+        breadcrumbs: this.breadcrumbs,
+        skipErrorCollector: true
+      });
+      if (resolved == null) {
+        continue;
+      }
+      if (resolved.required != null) {
+        for (const req of resolved.required) {
+          baseRequired.add(req);
+        }
+      }
+      if (resolved.properties != null) {
+        for (const [key2, value2] of Object.entries(resolved.properties)) {
+          if (typeof value2 === "object" && value2 !== null) {
+            const existing = baseProps[key2];
+            if (existing != null && isInlineSchema(existing) && isInlineSchema(value2)) {
+              baseProps[key2] = { ...existing, ...value2 };
+            } else {
+              baseProps[key2] = value2;
+            }
+          }
+        }
+      }
+    }
+    const merged = { ...directProps };
+    for (const [key2, directProp] of Object.entries(merged)) {
+      const baseProp = baseProps[key2];
+      if (baseProp == null || !isInlineSchema(directProp)) {
+        continue;
+      }
+      const resolvedBase = "$ref" in baseProp ? this.context.resolveMaybeReference({
+        schemaOrReference: baseProp,
+        breadcrumbs: this.breadcrumbs,
+        skipErrorCollector: true
+      }) : baseProp;
+      if (resolvedBase != null) {
+        merged[key2] = { ...resolvedBase, ...directProp };
+      }
+    }
+    for (const [key2, baseProp] of Object.entries(baseProps)) {
+      if (!(key2 in merged)) {
+        merged[key2] = baseProp;
+      }
+    }
+    return { mergedProperties: merged, mergedRequired: [...baseRequired] };
+  }
   /**
    * Checks if a schema is a "constraint-only" schema that only has validation constraints
    * like 'required' but no actual structure (no type, properties, allOf, oneOf, anyOf, etc.).
@@ -650588,7 +650679,7 @@ var SchemaOrReferenceConverter = class extends AbstractConverter {
     const refElements = this.schemaOrReference.allOf.filter((s9) => this.context.isReferenceObject(s9));
     const inlineElements = this.schemaOrReference.allOf.filter((s9) => typeof s9 === "object" && s9 !== null && !this.context.isReferenceObject(s9));
     const singleRef = refElements.length === 1 ? refElements[0] : void 0;
-    if (singleRef != null && inlineElements.every((s9) => !s9.properties && !s9.enum && !s9.oneOf && !s9.anyOf && !s9.allOf && !s9.format && !("items" in s9)) && !inlineElements.some((s9) => s9.type === "null" || Array.isArray(s9.type) && s9.type.includes("null"))) {
+    if (singleRef != null && inlineElements.every((s9) => isMetadataOnlySchema(s9))) {
       const resolved = this.context.resolveMaybeReference({
         schemaOrReference: singleRef,
         breadcrumbs: this.breadcrumbs
@@ -650663,6 +650754,19 @@ var SchemaOrReferenceConverter = class extends AbstractConverter {
     return TypeReference2.container(ContainerType.nullable(type8));
   }
 };
+var METADATA_ONLY_FIELDS = /* @__PURE__ */ new Set([
+  "description",
+  "title",
+  "deprecated",
+  "readOnly",
+  "writeOnly",
+  "xml",
+  "externalDocs",
+  "x-fern-type-name"
+]);
+function isMetadataOnlySchema(schema2) {
+  return Object.keys(schema2).every((key2) => METADATA_ONLY_FIELDS.has(key2));
+}
 
 // ../api-importers/v3-importer-commons/lib/converters/schema/ArraySchemaConverter.js
 var ArraySchemaConverter = class _ArraySchemaConverter extends AbstractConverter {
@@ -667458,7 +667562,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-15-g95ed8bbddcd",
+          version: "5.23.3-16-gd93ed571950",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -667513,7 +667617,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-15-g95ed8bbddcd",
+        version: "5.23.3-16-gd93ed571950",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -858793,7 +858897,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 = "5.23.3-15-g95ed8bbddcd";
+  const version7 = "5.23.3-16-gd93ed571950";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -871617,7 +871721,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-15-g95ed8bbddcd",
+        cliVersion: "5.23.3-16-gd93ed571950",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -946362,7 +946466,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-15-g95ed8bbddcd";
+    return "5.23.3-16-gd93ed571950";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-15-g95ed8bbddcd",
+  "version": "5.23.3-16-gd93ed571950",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",