diff --git a/packages/server/src/adapters/fetch/orpc-handler.ts b/packages/server/src/adapters/fetch/orpc-handler.ts index fab695c7..5ef536d9 100644 --- a/packages/server/src/adapters/fetch/orpc-handler.ts +++ b/packages/server/src/adapters/fetch/orpc-handler.ts @@ -68,8 +68,7 @@ export class RPCHandler implements FetchHandler { catch (e) { const error = e instanceof ORPCError ? e - : new ORPCError({ - code: 'INTERNAL_SERVER_ERROR', + : new ORPCError('INTERNAL_SERVER_ERROR', { message: 'Internal server error', cause: e, }) diff --git a/packages/server/src/adapters/fetch/orpc-payload-codec.ts b/packages/server/src/adapters/fetch/orpc-payload-codec.ts index 3493a347..d55568fd 100644 --- a/packages/server/src/adapters/fetch/orpc-payload-codec.ts +++ b/packages/server/src/adapters/fetch/orpc-payload-codec.ts @@ -103,11 +103,10 @@ export class ORPCPayloadCodec { const json = await re.json() - return SuperJSON.deserialize(json) + return SuperJSON.deserialize(json as any) } catch (e) { - throw new ORPCError({ - code: 'BAD_REQUEST', + throw new ORPCError('BAD_REQUEST', { message: 'Cannot parse request/response. Please check the request/response body and Content-Type header.', cause: e, }) diff --git a/packages/server/src/adapters/fetch/orpc-procedure-matcher.ts b/packages/server/src/adapters/fetch/orpc-procedure-matcher.ts index 41d7d643..d85596e3 100644 --- a/packages/server/src/adapters/fetch/orpc-procedure-matcher.ts +++ b/packages/server/src/adapters/fetch/orpc-procedure-matcher.ts @@ -1,15 +1,16 @@ -import type { ANY_PROCEDURE } from '../../procedure' +import type { AnyProcedure } from '../../procedure' +import type { AnyRouter } from '../../router' import { trim } from '@orpc/shared' import { unlazy } from '../../lazy' import { isProcedure } from '../../procedure' -import { type ANY_ROUTER, getRouterChild } from '../../router' +import { getRouterChild } from '../../router' export class ORPCProcedureMatcher { constructor( - private readonly router: ANY_ROUTER, + private readonly router: AnyRouter, ) { } - async match(pathname: string): Promise<{ path: string[], procedure: ANY_PROCEDURE } | undefined> { + async match(pathname: string): Promise<{ path: string[], procedure: AnyProcedure } | undefined> { const path = trim(pathname, '/').split('/').map(decodeURIComponent) const match = getRouterChild(this.router, ...path) diff --git a/packages/server/src/lazy.test.ts b/packages/server/src/lazy.test.ts index 440c1e0c..23f0559f 100644 --- a/packages/server/src/lazy.test.ts +++ b/packages/server/src/lazy.test.ts @@ -1,11 +1,10 @@ import { ping } from '../tests/shared' -import { getLazyMeta, isLazy, lazy, unlazy } from './lazy' +import { isLazy, lazy, unlazy } from './lazy' -it('lazy & isLazy & unlazy & getLazyMeta', () => { - const lazied = lazy(() => Promise.resolve({ default: ping }), { prefix: '/test' }) +it('lazy & isLazy & unlazy ', () => { + const lazied = lazy(() => Promise.resolve({ default: ping })) expect(lazied).toSatisfy(isLazy) expect(unlazy(lazied)).resolves.toEqual({ default: ping }) - expect(getLazyMeta(lazied)).toEqual({ prefix: '/test' }) expect({}).not.toSatisfy(isLazy) expect(true).not.toSatisfy(isLazy) diff --git a/packages/server/src/procedure.ts b/packages/server/src/procedure.ts index 3afa1e99..462a72a0 100644 --- a/packages/server/src/procedure.ts +++ b/packages/server/src/procedure.ts @@ -40,7 +40,7 @@ export interface ProcedureDef< TErrorMap extends ErrorMap, TMeta extends Meta, > extends ContractProcedureDef { - __initialContext?(type: TInitialContext): any + __initialContext?(type: TInitialContext): unknown middlewares: AnyMiddleware[] inputValidationIndex: number outputValidationIndex: number