feat: Allow grpc and http endpoints in a single service

fern.schema.json

@@ -2656,6 +2656,26 @@
               "type": "null"
             }
           ]
+        },
+        "transport": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/service.ServiceTransport"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "source": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/source.SourceSchema"
+            },
+            {
+              "type": "null"
+            }
+          ]
         }
       },
       "required": [

fern/apis/fern-definition/definition/service.yml

@@ -1,42 +1,42 @@
-imports: 
+imports:
   commons: commons.yml
   types: types.yml
   examples: examples.yml
   pagination: pagination.yml
   source: source.yml
   variables: variables.yml
 
-types: 
-  HttpServiceSchema: 
-    extends: 
+types:
+  HttpServiceSchema:
+    extends:
       - commons.DeclarationWithoutDocsSchema
       - commons.WithDisplayName
-    properties: 
+    properties:
       auth: boolean
       url: optional<string>
       base-path: string
       path-parameters: optional<map<string, string>>
       idempotent: optional<boolean>
       headers: optional<map<string, types.TypeReferenceSchema>>
-      transport: optional<ServiceTransport> 
+      transport: optional<ServiceTransport>
       source: optional<source.SourceSchema>
       endpoints: map<string, HttpEndpointSchema>
 
-  ServiceTransport: 
-    properties: 
-      grpc: optional<GrpcTransport>        
-  
-  GrpcTransport: 
-    properties: 
-      service-name: 
+  ServiceTransport:
+    properties:
+      grpc: optional<GrpcTransport>
+
+  GrpcTransport:
+    properties:
+      service-name:
         type: string
         docs: "The name of the gRPC service."
-  
-  HttpEndpointSchema:   
-    extends: 
+
+  HttpEndpointSchema:
+    extends:
       - commons.WithDisplayName
       - commons.DeclarationSchema
-    properties: 
+    properties:
       method: optional<HttpMethodSchema>
       base-path: optional<string>
       path: string
@@ -51,142 +51,144 @@ types:
       errors: optional<ResponseErrorsSchema>
       examples: optional<list<examples.ExampleEndpointCallSchema>>
       pagination: optional<Pagination>
-
-  HttpMethodSchema: 
-    enum: 
+      transport: optional<ServiceTransport>
+      source: optional<source.SourceSchema>
+
+  HttpMethodSchema:
+    enum:
       - GET
       - POST
       - PUT
       - PATCH
       - DELETE
-  
-  HttpRequest: 
+
+  HttpRequest:
     discriminated: false
-    union: 
+    union:
       - string
       - HttpRequestSchema
 
   HttpRequestSchema:
-    extends: 
+    extends:
       - commons.WithName
       - commons.WithDocsSchema
-    properties: 
+    properties:
       content-type: optional<string>
       query-parameters: optional<map<string, HttpQueryParameterSchema>>
       headers: optional<map<string, HttpHeaderSchema>>
       body: optional<HttpRequestBodySchema>
-  
+
   TypeReferenceDeclarationWithEnvOverride:
     discriminated: false
-    union: 
+    union:
       - string
       - TypeReferenceDeclarationWithEnvOverrideSchema
 
-  TypeReferenceDeclarationWithEnvOverrideSchema: 
+  TypeReferenceDeclarationWithEnvOverrideSchema:
     extends: types.TypeReferenceDeclarationWithName
-    properties: 
+    properties:
       env: optional<string>
 
   HttpHeaderSchema: TypeReferenceDeclarationWithEnvOverride
-  
-  HttpRequestBodySchema: 
+
+  HttpRequestBodySchema:
     discriminated: false
-    union: 
+    union:
       - string
       - HttpReferencedRequestBodySchema
       - HttpInlineRequestBodySchema
-  
-  HttpReferencedRequestBodySchema: 
-    extends: 
+
+  HttpReferencedRequestBodySchema:
+    extends:
       - commons.WithDocsSchema
     properties:
       type: string
 
-  HttpInlineRequestBodySchema: 
-    properties: 
+  HttpInlineRequestBodySchema:
+    properties:
       extends: optional<types.ObjectExtendsSchema>
       extra-properties: optional<boolean>
       properties: optional<map<string, HttpInlineRequestBodyPropertySchema>>
-  
-  HttpInlineRequestBodyPropertySchema: 
+
+  HttpInlineRequestBodyPropertySchema:
     discriminated: false
-    union: 
+    union:
       - string
       - TypeReferenceDeclarationWithContentTypeSchema
-  
-  TypeReferenceDeclarationWithContentTypeSchema: 
+
+  TypeReferenceDeclarationWithContentTypeSchema:
     extends: types.TypeReferenceDeclarationWithName
-    properties: 
+    properties:
       content-type: optional<string>
-  
-  HttpQueryParameterSchema: 
+
+  HttpQueryParameterSchema:
     discriminated: false
-    union: 
+    union:
       - string
       - QueryParameterTypeReferenceDetailed
-  
-  QueryParameterTypeReferenceDetailed: 
-    extends: 
+
+  QueryParameterTypeReferenceDetailed:
+    extends:
       - types.TypeReferenceDeclarationWithName
-    properties: 
+    properties:
       allow-multiple: optional<boolean>
-  
-  HttpResponseSchema: 
+
+  HttpResponseSchema:
     discriminated: false
-    union: 
+    union:
       - string
       - HttpResponseSchemaDetailed
-  
-  HttpResponseSchemaDetailed: 
-    extends: 
+
+  HttpResponseSchemaDetailed:
+    extends:
       - commons.WithDocsSchema
-    properties: 
+    properties:
       type: string
       property: optional<string>
       status-code: optional<integer>
 
-  HttpResponseStreamSchema: 
+  HttpResponseStreamSchema:
     discriminated: false
-    union: 
+    union:
       - string
       - HttpResponseStreamSchemaDetailed
-  
-  HttpResponseStreamSchemaDetailed: 
-    extends: 
+
+  HttpResponseStreamSchemaDetailed:
+    extends:
       - commons.WithDocsSchema
-    properties: 
+    properties:
       type: string
       format: optional<StreamFormat>
       terminator: optional<string>
 
-  StreamFormat: 
-    enum: 
+  StreamFormat:
+    enum:
       - sse
       - json
-  
-  HttpPathParameterSchema: 
+
+  HttpPathParameterSchema:
     discriminated: false
-    union: 
+    union:
       - types.TypeReferenceSchema
       - variables.VariableReferenceSchema
-  
-  Pagination: 
+
+  Pagination:
     discriminated: false
-    union: 
+    union:
       - pagination.PaginationSchema
       - boolean
-  
-  ResponseErrorsSchema: 
+
+  ResponseErrorsSchema:
     type: list<ResponseError>
 
-  ResponseError: 
+  ResponseError:
     discriminated: false
-    union: 
+    union:
       - string
       - ResponseErrorWithDocsSchema
-  
-  ResponseErrorWithDocsSchema: 
-    extends: 
+
+  ResponseErrorWithDocsSchema:
+    extends:
       - commons.WithDocsSchema
-    properties: 
-      error: string
+    properties:
+      error: string

package-yml.schema.json

@@ -2676,6 +2676,26 @@
               "type": "null"
             }
           ]
+        },
+        "transport": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/service.ServiceTransport"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "source": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/source.SourceSchema"
+            },
+            {
+              "type": "null"
+            }
+          ]
         }
       },
       "required": [

packages/cli/api-importers/openapi/openapi-ir-to-fern/src/buildEndpoint.ts

@@ -16,6 +16,7 @@ import { convertToHttpMethod } from "./utils/convertToHttpMethod";
 import { getDocsFromTypeReference, getTypeFromTypeReference } from "./utils/getTypeFromTypeReference";
 import { getEndpointNamespace } from "./utils/getNamespaceFromGroup";
 import { resolveLocationWithNamespace } from "./utils/convertSdkGroupName";
+import { convertToSourceSchema } from "./utils/convertToSourceSchema";
 
 export interface ConvertedEndpoint {
     value: RawSchemas.HttpEndpointSchema;
@@ -94,7 +95,8 @@ export function buildEndpoint({
         method: convertToHttpMethod(endpoint.method),
         auth: endpoint.authed,
         docs: endpoint.description ?? undefined,
-        pagination
+        pagination,
+        source: endpoint.source != null ? convertToSourceSchema(endpoint.source) : undefined
     };
 
     if (Object.keys(pathParameters).length > 0) {

packages/cli/fern-definition/schema/src/schemas/api/resources/service/types/HttpEndpointSchema.ts

@@ -19,4 +19,6 @@ export interface HttpEndpointSchema extends FernDefinition.WithDisplayName, Fern
     errors?: FernDefinition.ResponseErrorsSchema;
     examples?: FernDefinition.ExampleEndpointCallSchema[];
     pagination?: FernDefinition.Pagination;
+    transport?: FernDefinition.ServiceTransport;
+    source?: FernDefinition.SourceSchema;
 }

packages/cli/fern-definition/schema/src/schemas/serialization/resources/service/types/HttpEndpointSchema.ts

@@ -13,6 +13,8 @@ import { HttpResponseStreamSchema } from "./HttpResponseStreamSchema";
 import { ResponseErrorsSchema } from "./ResponseErrorsSchema";
 import { ExampleEndpointCallSchema } from "../../examples/types/ExampleEndpointCallSchema";
 import { Pagination } from "./Pagination";
+import { ServiceTransport } from "./ServiceTransport";
+import { SourceSchema } from "../../source/types/SourceSchema";
 import { WithDisplayName } from "../../commons/types/WithDisplayName";
 import { DeclarationSchema } from "../../commons/types/DeclarationSchema";
 import { ResponseError } from "./ResponseError";
@@ -36,6 +38,8 @@ export const HttpEndpointSchema: core.serialization.ObjectSchema<
         errors: ResponseErrorsSchema.optional(),
         examples: core.serialization.list(ExampleEndpointCallSchema).optional(),
         pagination: Pagination.optional(),
+        transport: ServiceTransport.optional(),
+        source: SourceSchema.optional(),
     })
     .extend(WithDisplayName)
     .extend(DeclarationSchema);
@@ -56,5 +60,7 @@ export declare namespace HttpEndpointSchema {
         errors?: ResponseErrorsSchema.Raw | null;
         examples?: ExampleEndpointCallSchema.Raw[] | null;
         pagination?: Pagination.Raw | null;
+        transport?: ServiceTransport.Raw | null;
+        source?: SourceSchema.Raw | null;
     }
 }

packages/cli/fern-definition/validator/src/ast/visitors/services/visitHttpService.ts

@@ -297,7 +297,8 @@ async function visitEndpoint({
                 });
             }
         },
-        pagination: noop
+        pagination: noop,
+        source: noop
     });
 }