fix merge conflicts`

fern-api · Sep 17, 2024 · 7b4ae37 · 7b4ae37
1 parent e659388
commit 7b4ae37
Show file tree

Hide file tree

Showing 66 changed files with 185,507 additions and 618,322 deletions.
diff --git a/...ages/cli/openapi-ir-sdk/src/sdk/api/resources/parseIr/types/PrimitiveSchemaWithExample.ts b/...ages/cli/openapi-ir-sdk/src/sdk/api/resources/parseIr/types/PrimitiveSchemaWithExample.ts
@@ -8,12 +8,7 @@ export interface PrimitiveSchemaWithExample
     extends FernOpenapiIr.WithDescription,
         FernOpenapiIr.WithName,
         FernOpenapiIr.WithSdkGroupName,
-<<<<<<< HEAD
-        FernOpenapiIr.WithSchemaId,
         FernOpenapiIr.WithAvailability,
         FernOpenapiIr.WithTitle {
-=======
-        FernOpenapiIr.WithAvailability {
->>>>>>> cafb0600e0 (not fully working)
     schema: FernOpenapiIr.PrimitiveSchemaValueWithExample;
 }
diff --git a/packages/cli/openapi-ir-sdk/src/sdk/serialization/resources/finalIr/types/ArraySchema.ts b/packages/cli/openapi-ir-sdk/src/sdk/serialization/resources/finalIr/types/ArraySchema.ts
@@ -23,17 +23,7 @@ export const ArraySchema: core.serialization.ObjectSchema<serializers.ArraySchem
         .extend(WithTitle);
 
 export declare namespace ArraySchema {
-<<<<<<< HEAD
-    interface Raw
-        extends WithDescription.Raw,
-            WithName.Raw,
-            WithSchemaId.Raw,
-            WithSdkGroupName.Raw,
-            WithAvailability.Raw,
-            WithTitle.Raw {
-=======
-    interface Raw extends WithDescription.Raw, WithName.Raw, WithSdkGroupName.Raw, WithAvailability.Raw {
->>>>>>> cafb0600e0 (not fully working)
+    interface Raw extends WithDescription.Raw, WithName.Raw, WithSdkGroupName.Raw, WithAvailability.Raw, WithTitle.Raw {
         value: serializers.Schema.Raw;
     }
 }
diff --git a/packages/cli/openapi-ir-sdk/src/sdk/serialization/resources/finalIr/types/LiteralSchema.ts b/packages/cli/openapi-ir-sdk/src/sdk/serialization/resources/finalIr/types/LiteralSchema.ts
@@ -26,17 +26,7 @@ export const LiteralSchema: core.serialization.ObjectSchema<
     .extend(WithTitle);
 
 export declare namespace LiteralSchema {
-<<<<<<< HEAD
-    interface Raw
-        extends WithDescription.Raw,
-            WithName.Raw,
-            WithSchemaId.Raw,
-            WithSdkGroupName.Raw,
-            WithAvailability.Raw,
-            WithTitle.Raw {
-=======
-    interface Raw extends WithDescription.Raw, WithName.Raw, WithSdkGroupName.Raw, WithAvailability.Raw {
->>>>>>> cafb0600e0 (not fully working)
+    interface Raw extends WithDescription.Raw, WithName.Raw, WithSdkGroupName.Raw, WithAvailability.Raw, WithTitle.Raw {
         value: LiteralSchemaValue.Raw;
     }
 }
diff --git a/packages/cli/openapi-ir-sdk/src/sdk/serialization/resources/finalIr/types/NullableSchema.ts b/packages/cli/openapi-ir-sdk/src/sdk/serialization/resources/finalIr/types/NullableSchema.ts
@@ -25,17 +25,7 @@ export const NullableSchema: core.serialization.ObjectSchema<
     .extend(WithTitle);
 
 export declare namespace NullableSchema {
-<<<<<<< HEAD
-    interface Raw
-        extends WithDescription.Raw,
-            WithName.Raw,
-            WithSchemaId.Raw,
-            WithSdkGroupName.Raw,
-            WithAvailability.Raw,
-            WithTitle.Raw {
-=======
-    interface Raw extends WithDescription.Raw, WithName.Raw, WithSdkGroupName.Raw, WithAvailability.Raw {
->>>>>>> cafb0600e0 (not fully working)
+    interface Raw extends WithDescription.Raw, WithName.Raw, WithSdkGroupName.Raw, WithAvailability.Raw, WithTitle.Raw {
         value: serializers.Schema.Raw;
     }
 }
diff --git a/packages/cli/openapi-ir-sdk/src/sdk/serialization/resources/finalIr/types/OptionalSchema.ts b/packages/cli/openapi-ir-sdk/src/sdk/serialization/resources/finalIr/types/OptionalSchema.ts
@@ -25,17 +25,7 @@ export const OptionalSchema: core.serialization.ObjectSchema<
     .extend(WithTitle);
 
 export declare namespace OptionalSchema {
-<<<<<<< HEAD
-    interface Raw
-        extends WithDescription.Raw,
-            WithName.Raw,
-            WithSchemaId.Raw,
-            WithSdkGroupName.Raw,
-            WithAvailability.Raw,
-            WithTitle.Raw {
-=======
-    interface Raw extends WithDescription.Raw, WithName.Raw, WithSdkGroupName.Raw, WithAvailability.Raw {
->>>>>>> cafb0600e0 (not fully working)
+    interface Raw extends WithDescription.Raw, WithName.Raw, WithSdkGroupName.Raw, WithAvailability.Raw, WithTitle.Raw {
         value: serializers.Schema.Raw;
     }
 }
diff --git a/packages/cli/openapi-ir-sdk/src/sdk/serialization/resources/finalIr/types/PrimitiveSchema.ts b/packages/cli/openapi-ir-sdk/src/sdk/serialization/resources/finalIr/types/PrimitiveSchema.ts
@@ -26,17 +26,7 @@ export const PrimitiveSchema: core.serialization.ObjectSchema<
     .extend(WithTitle);
 
 export declare namespace PrimitiveSchema {
-<<<<<<< HEAD
-    interface Raw
-        extends WithDescription.Raw,
-            WithSchemaId.Raw,
-            WithName.Raw,
-            WithSdkGroupName.Raw,
-            WithAvailability.Raw,
-            WithTitle.Raw {
-=======
-    interface Raw extends WithDescription.Raw, WithName.Raw, WithSdkGroupName.Raw, WithAvailability.Raw {
->>>>>>> cafb0600e0 (not fully working)
+    interface Raw extends WithDescription.Raw, WithName.Raw, WithSdkGroupName.Raw, WithAvailability.Raw, WithTitle.Raw {
         schema: PrimitiveSchemaValue.Raw;
     }
 }
diff --git a/...li/openapi-ir-sdk/src/sdk/serialization/resources/parseIr/types/ArraySchemaWithExample.ts b/...li/openapi-ir-sdk/src/sdk/serialization/resources/parseIr/types/ArraySchemaWithExample.ts
@@ -26,17 +26,7 @@ export const ArraySchemaWithExample: core.serialization.ObjectSchema<
     .extend(WithTitle);
 
 export declare namespace ArraySchemaWithExample {
-<<<<<<< HEAD
-    interface Raw
-        extends WithSdkGroupName.Raw,
-            WithSchemaId.Raw,
-            WithName.Raw,
-            WithDescription.Raw,
-            WithAvailability.Raw,
-            WithTitle.Raw {
-=======
-    interface Raw extends WithSdkGroupName.Raw, WithName.Raw, WithDescription.Raw, WithAvailability.Raw {
->>>>>>> cafb0600e0 (not fully working)
+    interface Raw extends WithSdkGroupName.Raw, WithName.Raw, WithDescription.Raw, WithAvailability.Raw, WithTitle.Raw {
         value: serializers.SchemaWithExample.Raw;
         example?: unknown[] | null;
     }

diff --git a/...openapi-ir-sdk/src/sdk/serialization/resources/parseIr/types/NullableSchemaWithExample.ts b/...openapi-ir-sdk/src/sdk/serialization/resources/parseIr/types/NullableSchemaWithExample.ts
@@ -25,17 +25,7 @@ export const NullableSchemaWithExample: core.serialization.ObjectSchema<
     .extend(WithTitle);
 
 export declare namespace NullableSchemaWithExample {
-<<<<<<< HEAD
-    interface Raw
-        extends WithSdkGroupName.Raw,
-            WithSchemaId.Raw,
-            WithName.Raw,
-            WithDescription.Raw,
-            WithAvailability.Raw,
-            WithTitle.Raw {
-=======
-    interface Raw extends WithSdkGroupName.Raw, WithName.Raw, WithDescription.Raw, WithAvailability.Raw {
->>>>>>> cafb0600e0 (not fully working)
+    interface Raw extends WithSdkGroupName.Raw, WithName.Raw, WithDescription.Raw, WithAvailability.Raw, WithTitle.Raw {
         value: serializers.SchemaWithExample.Raw;
     }
 }
diff --git a/...openapi-ir-sdk/src/sdk/serialization/resources/parseIr/types/OptionalSchemaWithExample.ts b/...openapi-ir-sdk/src/sdk/serialization/resources/parseIr/types/OptionalSchemaWithExample.ts
@@ -25,17 +25,7 @@ export const OptionalSchemaWithExample: core.serialization.ObjectSchema<
     .extend(WithTitle);
 
 export declare namespace OptionalSchemaWithExample {
-<<<<<<< HEAD
-    interface Raw
-        extends WithSdkGroupName.Raw,
-            WithSchemaId.Raw,
-            WithName.Raw,
-            WithDescription.Raw,
-            WithAvailability.Raw,
-            WithTitle.Raw {
-=======
-    interface Raw extends WithSdkGroupName.Raw, WithName.Raw, WithDescription.Raw, WithAvailability.Raw {
->>>>>>> cafb0600e0 (not fully working)
+    interface Raw extends WithSdkGroupName.Raw, WithName.Raw, WithDescription.Raw, WithAvailability.Raw, WithTitle.Raw {
         value: serializers.SchemaWithExample.Raw;
     }
 }
diff --git a/...penapi-ir-sdk/src/sdk/serialization/resources/parseIr/types/PrimitiveSchemaWithExample.ts b/...penapi-ir-sdk/src/sdk/serialization/resources/parseIr/types/PrimitiveSchemaWithExample.ts
@@ -22,25 +22,11 @@ export const PrimitiveSchemaWithExample: core.serialization.ObjectSchema<
     .extend(WithDescription)
     .extend(WithName)
     .extend(WithSdkGroupName)
-<<<<<<< HEAD
-    .extend(WithSchemaId)
     .extend(WithAvailability)
     .extend(WithTitle);
 
 export declare namespace PrimitiveSchemaWithExample {
-    interface Raw
-        extends WithDescription.Raw,
-            WithName.Raw,
-            WithSdkGroupName.Raw,
-            WithSchemaId.Raw,
-            WithAvailability.Raw,
-            WithTitle.Raw {
-=======
-    .extend(WithAvailability);
-
-export declare namespace PrimitiveSchemaWithExample {
-    interface Raw extends WithDescription.Raw, WithName.Raw, WithSdkGroupName.Raw, WithAvailability.Raw {
->>>>>>> cafb0600e0 (not fully working)
+    interface Raw extends WithDescription.Raw, WithName.Raw, WithSdkGroupName.Raw, WithAvailability.Raw, WithTitle.Raw {
         schema: PrimitiveSchemaValueWithExample.Raw;
     }
 }
diff --git a/.../openapi-ir-sdk/src/sdk/serialization/resources/parseIr/types/UnknownSchemaWithExample.ts b/.../openapi-ir-sdk/src/sdk/serialization/resources/parseIr/types/UnknownSchemaWithExample.ts
@@ -25,17 +25,7 @@ export const UnknownSchemaWithExample: core.serialization.ObjectSchema<
     .extend(WithTitle);
 
 export declare namespace UnknownSchemaWithExample {
-<<<<<<< HEAD
-    interface Raw
-        extends WithSdkGroupName.Raw,
-            WithSchemaId.Raw,
-            WithName.Raw,
-            WithDescription.Raw,
-            WithAvailability.Raw,
-            WithTitle.Raw {
-=======
-    interface Raw extends WithSdkGroupName.Raw, WithName.Raw, WithDescription.Raw, WithAvailability.Raw {
->>>>>>> cafb0600e0 (not fully working)
+    interface Raw extends WithSdkGroupName.Raw, WithName.Raw, WithDescription.Raw, WithAvailability.Raw, WithTitle.Raw {
         example?: unknown;
     }
 }
diff --git a/packages/cli/openapi-ir-to-fern/src/buildTypeReference.ts b/packages/cli/openapi-ir-to-fern/src/buildTypeReference.ts
@@ -56,12 +56,8 @@ export function buildTypeReference({
     fileContainingReference: RelativeFilePath;
     declarationFile?: RelativeFilePath;
     context: OpenApiIrConverterContext;
-<<<<<<< HEAD
-}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
-=======
     namespace: string | undefined;
-}): RawSchemas.TypeReferenceWithDocsSchema {
->>>>>>> cafb0600e0 (not fully working)
+}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
     switch (schema.type) {
         case "primitive": {
             return buildPrimitiveTypeReference(schema);
@@ -406,14 +402,9 @@ export function buildReferenceTypeReference({
     schema: ReferencedSchema;
     fileContainingReference: RelativeFilePath;
     context: OpenApiIrConverterContext;
-<<<<<<< HEAD
-}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
-    const resolvedSchema = context.getSchema(schema.schema);
-=======
     namespace: string | undefined;
-}): RawSchemas.TypeReferenceWithDocsSchema {
+}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
     const resolvedSchema = context.getSchema(schema.schema, namespace);
->>>>>>> cafb0600e0 (not fully working)
     if (resolvedSchema == null) {
         return "unknown";
     }
@@ -450,20 +441,15 @@ export function buildArrayTypeReference({
     fileContainingReference: RelativeFilePath;
     declarationFile: RelativeFilePath;
     context: OpenApiIrConverterContext;
-<<<<<<< HEAD
-}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
-    const item = buildTypeReference({ schema: schema.value, fileContainingReference, declarationFile, context });
-=======
     namespace: string | undefined;
-}): RawSchemas.TypeReferenceWithDocsSchema {
+}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
     const item = buildTypeReference({
         schema: schema.value,
         fileContainingReference,
         declarationFile,
         context,
         namespace
     });
->>>>>>> cafb0600e0 (not fully working)
     const type = `list<${getTypeFromTypeReference(item)}>`;
     if (schema.description == null && schema.title == null) {
         return type;
@@ -487,12 +473,8 @@ export function buildMapTypeReference({
     fileContainingReference: RelativeFilePath;
     declarationFile: RelativeFilePath;
     context: OpenApiIrConverterContext;
-<<<<<<< HEAD
-}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
-=======
     namespace: string | undefined;
-}): RawSchemas.TypeReferenceWithDocsSchema {
->>>>>>> cafb0600e0 (not fully working)
+}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
     const keyTypeReference = buildPrimitiveTypeReference(schema.key);
     const valueTypeReference = buildTypeReference({
         schema: schema.value,
@@ -535,12 +517,8 @@ export function buildOptionalTypeReference({
     fileContainingReference: RelativeFilePath;
     declarationFile: RelativeFilePath;
     context: OpenApiIrConverterContext;
-<<<<<<< HEAD
-}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
-=======
     namespace: string | undefined;
-}): RawSchemas.TypeReferenceWithDocsSchema {
->>>>>>> cafb0600e0 (not fully working)
+}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
     const itemTypeReference = buildTypeReference({
         schema: schema.value,
         fileContainingReference,
@@ -666,12 +644,8 @@ export function buildObjectTypeReference({
     fileContainingReference: RelativeFilePath;
     declarationFile: RelativeFilePath;
     context: OpenApiIrConverterContext;
-<<<<<<< HEAD
-}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
-=======
     namespace: string | undefined;
-}): RawSchemas.TypeReferenceWithDocsSchema {
->>>>>>> cafb0600e0 (not fully working)
+}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
     const objectTypeDeclaration = buildObjectTypeDeclaration({
         schema,
         declarationFile,
@@ -706,12 +680,8 @@ export function buildOneOfTypeReference({
     fileContainingReference: RelativeFilePath;
     declarationFile: RelativeFilePath;
     context: OpenApiIrConverterContext;
-<<<<<<< HEAD
-}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
-=======
     namespace: string | undefined;
-}): RawSchemas.TypeReferenceWithDocsSchema {
->>>>>>> cafb0600e0 (not fully working)
+}): RawSchemas.TypeReferenceWithDocsAndDisplayNameAndAvailabilitySchema {
     const unionTypeDeclaration = buildOneOfTypeDeclaration({
         schema,
         declarationFile,