fix(cli): fix type reference schemas (#4701)

packages/cli/cli/versions.yml

@@ -1,3 +1,11 @@
+- changelogEntry: 
+    - summary: | 
+        Previously, the OpenAPI converter would bring over `title` on every 
+        single property. This field is extraneous, so now we ignore it. 
+      type: fix
+  irVersion: 53
+  version: 0.42.10
+
 - changelogEntry: 
     - summary: | 
         Previously, the OpenAPI importer would ignore skip parsing arbitrary 

packages/cli/ete-tests/src/tests/write-definition/__snapshots__/writeDefinition.test.ts.snap

@@ -743,17 +743,13 @@ types:
         docs: Four-digit number representing the card's expiration year.
       address_line1:
         type: optional<string>
-        display-name: Card
       address_line2:
         type: optional<string>
-        display-name: Card
       address_city:
         type: optional<string>
-        display-name: Card
       address_country: string
       address_post_code:
         type: optional<string>
-        display-name: Card
     source:
       openapi: openapi/trains/openapi.yml
   BookingPaymentSourceBankAccountAccountType:
@@ -781,7 +777,6 @@ types:
         docs: >-
           The sort code for the bank account, in string form. Must be a
           six-digit number.
-        display-name: Bank Account
       account_type:
         type: BookingPaymentSourceBankAccountAccountType
         docs: >-

packages/cli/ete-tests/src/tests/write-definition/fixtures/namespaced/fern/.definition/trains/__package__.yml

@@ -250,17 +250,13 @@ types:
         docs: Four-digit number representing the card's expiration year.
       address_line1:
         type: optional<string>
-        display-name: Card
       address_line2:
         type: optional<string>
-        display-name: Card
       address_city:
         type: optional<string>
-        display-name: Card
       address_country: string
       address_post_code:
         type: optional<string>
-        display-name: Card
     source:
       openapi: openapi/trains/openapi.yml
   BookingPaymentSourceBankAccountAccountType:
@@ -288,7 +284,6 @@ types:
         docs: >-
           The sort code for the bank account, in string form. Must be a
           six-digit number.
-        display-name: Bank Account
       account_type:
         type: BookingPaymentSourceBankAccountAccountType
         docs: >-

packages/cli/fern-definition/schema/src/schemas/HttpPathParameterSchema.ts

@@ -1,9 +1,9 @@
 import { z } from "zod";
-import { TypeReferenceWithDocsAndAvailabilitySchema } from "./TypeReferenceSchema";
+import { TypeReferenceSchema } from "./TypeReferenceSchema";
 import { VariableReferenceSchema } from "./VariableReferenceSchema";
 
 export const HttpPathParameterSchema = z.union([
-    TypeReferenceWithDocsAndAvailabilitySchema,
+    TypeReferenceSchema,
     // pathParam: $myVariable
     z.string(),
     VariableReferenceSchema

packages/cli/fern-definition/schema/src/schemas/TypeReferenceSchema.ts

@@ -3,8 +3,7 @@ import { DeclarationSchema } from "./DeclarationSchema";
 import { DeclarationWithNameSchema } from "./DeclarationWithNameSchema";
 import { EncodingSchema } from "./EncodingSchema";
 import { ValidationSchema } from "./ValidationSchema";
-import { WithDisplayNameSchema } from "./WithDisplayNameSchema";
-import { WithDocsAndAvailabilitySchema } from "./WithDocsAndAvailability";
+import { WithAvailabilitySchema } from "./WithAvailabilitySchema";
 import { WithDocsSchema } from "./WithDocsSchema";
 
 // This return type is too crazy to write explicitly!
@@ -19,28 +18,15 @@ export function extendTypeReferenceSchema<T extends z.ZodRawShape>(extension: T)
                 encoding: z.optional(EncodingSchema),
                 validation: z.optional(ValidationSchema)
             })
+            .extend(WithAvailabilitySchema.shape)
+            .extend(WithDocsSchema.shape)
             .extend(extension)
     ]);
 }
 
-export const TypeReferenceSchema = extendTypeReferenceSchema({});
+export const TypeReferenceSchema = extendTypeReferenceSchema(z.object({}).shape);
 export type TypeReferenceSchema = z.infer<typeof TypeReferenceSchema>;
 
-export const TypeReferenceWithDocsSchema = extendTypeReferenceSchema(WithDocsSchema.shape);
-export type TypeReferenceWithDocsSchema = z.infer<typeof TypeReferenceWithDocsSchema>;
-
-export const TypeReferenceWithDocsAndAvailabilitySchema = extendTypeReferenceSchema(
-    WithDocsAndAvailabilitySchema.shape
-);
-export type TypeReferenceWithDocsAndAvailabilitySchema = z.infer<typeof TypeReferenceWithDocsAndAvailabilitySchema>;
-
-export const TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema = extendTypeReferenceSchema(
-    WithDocsAndAvailabilitySchema.extend(WithDisplayNameSchema.shape).shape
-);
-export type TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema = z.infer<
-    typeof TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema
->;
-
 export const TypeReferenceDeclarationSchema = extendTypeReferenceSchema(DeclarationSchema.shape);
 export type TypeReferenceDeclarationSchema = z.infer<typeof TypeReferenceDeclarationSchema>;
 
@@ -53,10 +39,3 @@ export const TypeReferenceDeclarationWithEnvOverride = extendTypeReferenceSchema
     }).shape
 );
 export type TypeReferenceDeclarationWithEnvOverride = z.infer<typeof TypeReferenceDeclarationWithEnvOverride>;
-
-export const TypeReferenceWithDefaultAndValidationSchema = z.strictObject({
-    type: z.string(),
-    default: z.unknown().optional(),
-    validation: z.optional(ValidationSchema)
-});
-export type TypeReferenceWithDefaultAndValidationSchema = z.infer<typeof TypeReferenceWithDefaultAndValidationSchema>;

packages/cli/fern-definition/schema/src/schemas/VariableDeclarationSchema.ts

@@ -1,6 +1,13 @@
 import { z } from "zod";
-import { TypeReferenceWithDocsSchema } from "./TypeReferenceSchema";
+import { WithDocsSchema } from "./WithDocsSchema";
 
-export const VariableDeclarationSchema = TypeReferenceWithDocsSchema;
+export const VariableDeclarationSchema = z.union([
+    z.string(),
+    z
+        .strictObject({
+            type: z.string()
+        })
+        .extend(WithDocsSchema.shape)
+]);
 
 export type VariableDeclarationSchema = z.infer<typeof VariableDeclarationSchema>;

packages/cli/fern-definition/schema/src/schemas/index.ts

@@ -74,11 +74,7 @@ export { StatusCodeErrorDiscriminationSchema } from "./StatusCodeErrorDiscrimina
 export { StringValidationSchema } from "./StringValidationSchema";
 export { TransportSchema } from "./TransportSchema";
 export { TypeDeclarationSchema } from "./TypeDeclarationSchema";
-export {
-    TypeReferenceSchema,
-    TypeReferenceWithDocsSchema,
-    TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema
-} from "./TypeReferenceSchema";
+export { TypeReferenceSchema } from "./TypeReferenceSchema";
 export { UndiscriminatedUnionSchema } from "./UndiscriminatedUnionSchema";
 export { ValidationSchema } from "./ValidationSchema";
 export { VariableDeclarationSchema } from "./VariableDeclarationSchema";

packages/cli/fern-definition/schema/src/utils/visitRawPathParameter.ts

@@ -1,9 +1,9 @@
 import { HttpPathParameterSchema } from "../schemas";
-import { TypeReferenceWithDocsSchema } from "../schemas/TypeReferenceSchema";
+import { TypeReferenceSchema } from "../schemas/TypeReferenceSchema";
 import { VariableReferenceSchema } from "../schemas/VariableReferenceSchema";
 
 export interface PathParameterDeclarationVisitor<R> {
-    nonVariable: (pathParameter: TypeReferenceWithDocsSchema) => R;
+    nonVariable: (pathParameter: TypeReferenceSchema) => R;
     variable: (pathParameter: VariableReferenceSchema | string) => R;
 }
 

packages/cli/fern-definition/validator/src/utils/property-validator/validatePropertyInRequest.ts

@@ -85,7 +85,7 @@ export function validatePropertyInRequest({
     return validatePropertyInType({ path, typeResolver, file, resolvedType: resolvedBodyPropertyType, validate });
 }
 
-function getTypeFromTypeReference(typeReference: RawSchemas.TypeReferenceWithDocsSchema): string {
+function getTypeFromTypeReference(typeReference: RawSchemas.TypeReferenceSchema): string {
     if (typeof typeReference === "string") {
         return typeReference;
     }