Skip to content

Commit 22284c7

Browse files
committed
fix conflict types
1 parent 4284db9 commit 22284c7

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

packages/client/src/adapters/fetch/rpc-link.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { StandardRPCLink } from '../standard'
55
import { LinkFetchClient } from './link-fetch-client'
66

77
export interface RPCLinkOptions<T extends ClientContext>
8-
extends StandardRPCLinkOptions<T>, LinkFetchClientOptions<T> {}
8+
extends LinkFetchClientOptions<T>, Omit<StandardRPCLinkOptions<T>, 'plugins'> {}
99

1010
/**
1111
* The RPC Link communicates with the server using the RPC protocol.

packages/openapi-client/src/adapters/fetch/openapi-link.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { LinkFetchClient } from '@orpc/client/fetch'
66
import { StandardOpenAPILink } from '../standard'
77

88
export interface OpenAPILinkOptions<T extends ClientContext>
9-
extends StandardOpenAPILinkOptions<T>, LinkFetchClientOptions<T> { }
9+
extends LinkFetchClientOptions<T>, Omit<StandardOpenAPILinkOptions<T>, 'plugins'> { }
1010

1111
/**
1212
* The OpenAPI Link for fetch runtime communicates with the server that follow the OpenAPI specification.

packages/openapi/src/adapters/fetch/openapi-handler.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ import type { StandardOpenAPIHandlerOptions } from '../standard'
44
import { FetchHandler } from '@orpc/server/fetch'
55
import { StandardOpenAPIHandler } from '../standard'
66

7+
export interface OpenAPIHandlerOptions<T extends Context> extends FetchHandlerOptions<T>, Omit<StandardOpenAPIHandlerOptions<T>, 'plugins'> {
8+
}
9+
710
/**
811
* OpenAPI Handler for Fetch Server
912
*
1013
* @see {@link https://orpc.unnoq.com/docs/openapi/openapi-handler OpenAPI Handler Docs}
1114
* @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
1215
*/
1316
export class OpenAPIHandler<T extends Context> extends FetchHandler<T> {
14-
constructor(router: Router<any, T>, options: NoInfer<StandardOpenAPIHandlerOptions<T> & FetchHandlerOptions<T>> = {}) {
17+
constructor(router: Router<any, T>, options: NoInfer<OpenAPIHandlerOptions<T>> = {}) {
1518
super(new StandardOpenAPIHandler(router, options), options)
1619
}
1720
}

packages/openapi/src/adapters/node/openapi-handler.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ import type { StandardOpenAPIHandlerOptions } from '../standard'
44
import { NodeHttpHandler } from '@orpc/server/node'
55
import { StandardOpenAPIHandler } from '../standard'
66

7+
export interface OpenAPIHandlerOptions<T extends Context> extends NodeHttpHandlerOptions<T>, Omit<StandardOpenAPIHandlerOptions<T>, 'plugins'> {
8+
}
9+
710
/**
811
* OpenAPI Handler for Node Server
912
*
1013
* @see {@link https://orpc.unnoq.com/docs/openapi/openapi-handler OpenAPI Handler Docs}
1114
* @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
1215
*/
1316
export class OpenAPIHandler<T extends Context> extends NodeHttpHandler<T> {
14-
constructor(router: Router<any, T>, options: NoInfer<StandardOpenAPIHandlerOptions<T> & NodeHttpHandlerOptions<T>> = {}) {
17+
constructor(router: Router<any, T>, options: NoInfer<OpenAPIHandlerOptions<T>> = {}) {
1518
super(new StandardOpenAPIHandler(router, options), options)
1619
}
1720
}

packages/server/src/adapters/fetch/rpc-handler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { StrictGetMethodPlugin } from '../../plugins'
66
import { StandardRPCHandler } from '../standard'
77
import { FetchHandler } from './handler'
88

9-
export type RPCHandlerOptions<T extends Context> = FetchHandlerOptions<T> & StandardRPCHandlerOptions<T> & {
9+
export interface RPCHandlerOptions<T extends Context> extends FetchHandlerOptions<T>, Omit<StandardRPCHandlerOptions<T>, 'plugins'> {
1010
/**
1111
* Enables or disables the StrictGetMethodPlugin.
1212
*

packages/server/src/adapters/node/rpc-handler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { StrictGetMethodPlugin } from '../../plugins'
66
import { StandardRPCHandler } from '../standard'
77
import { NodeHttpHandler } from './handler'
88

9-
export type RPCHandlerOptions<T extends Context> = NodeHttpHandlerOptions<T> & StandardRPCHandlerOptions<T> & {
9+
export interface RPCHandlerOptions<T extends Context> extends NodeHttpHandlerOptions<T>, Omit<StandardRPCHandlerOptions<T>, 'plugins'> {
1010
/**
1111
* Enables or disables the StrictGetMethodPlugin.
1212
*

0 commit comments

Comments
 (0)