Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 15 additions & 36 deletions apps/content/content/docs/server/integrations.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ export default app
## Next.js

```ts title="app/api/[...orpc]/route.ts" twoslash
import { OpenAPIServerlessHandler } from '@orpc/openapi/fetch'
import { OpenAPIServerlessHandler } from '@orpc/openapi/next'
import { serve } from '@orpc/server/next'
import { router } from 'examples/server'
import { ZodCoercer } from '@orpc/zod'

Expand All @@ -201,48 +202,26 @@ const openapiHandler = new OpenAPIServerlessHandler(router, {
],
})

export async function GET(request: Request) {
const { matched, response } = await openapiHandler.handle(request, {
prefix: '/rpc',
context: {},
})

if (matched) {
return response
}

return new Response('Not found', { status: 404 })
}

export const POST = GET
export const PUT = GET
export const DELETE = GET
export const PATCH = GET
export const { GET, POST, PUT, PATCH, DELETE } = serve(openapiHandler, {
prefix: '/api',
context: async (req) => {
return {}
},
})
```

```ts title="app/rpc/[...orpc]/route.ts" twoslash
import { ORPCHandler } from '@orpc/server/fetch'
import { serve, ORPCHandler } from '@orpc/server/next'
import { router } from 'examples/server'

const orpcHandler = new ORPCHandler(router)

export async function GET(request: Request) {
const { matched, response } = await orpcHandler.handle(request, {
prefix: '/rpc',
context: {},
})

if (matched) {
return response
}

return new Response('Not found', { status: 404 })
}

export const POST = GET
export const PUT = GET
export const DELETE = GET
export const PATCH = GET
export const { GET, POST, PUT, PATCH, DELETE } = serve(orpcHandler, {
prefix: '/rpc',
context: async (req) => {
return {}
},
})
```

## Cloudflare Workers
Expand Down
6 changes: 6 additions & 0 deletions packages/openapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
"import": "./dist/hono.js",
"default": "./dist/hono.js"
},
"./next": {
"types": "./dist/src/adapters/next/index.d.ts",
"import": "./dist/next.js",
"default": "./dist/next.js"
},
"./node": {
"types": "./dist/src/adapters/node/index.d.ts",
"import": "./dist/node.js",
Expand All @@ -44,6 +49,7 @@
".": "./src/index.ts",
"./fetch": "./src/adapters/fetch/index.ts",
"./hono": "./src/adapters/hono/index.ts",
"./next": "./src/adapters/next/index.ts",
"./node": "./src/adapters/node/index.ts",
"./🔒/*": {
"types": "./src/*.ts"
Expand Down
1 change: 1 addition & 0 deletions packages/openapi/src/adapters/next/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from '../fetch'
1 change: 1 addition & 0 deletions packages/openapi/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export default defineConfig({
index: 'src/index.ts',
fetch: 'src/adapters/fetch/index.ts',
node: 'src/adapters/node/index.ts',
next: 'src/adapters/next/index.ts',
hono: 'src/adapters/hono/index.ts',
},
sourcemap: true,
Expand Down
9 changes: 8 additions & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
"import": "./dist/hono.js",
"default": "./dist/hono.js"
},
"./next": {
"types": "./dist/src/adapters/next/index.d.ts",
"import": "./dist/next.js",
"default": "./dist/next.js"
},
"./node": {
"types": "./dist/src/adapters/node/index.d.ts",
"import": "./dist/node.js",
Expand All @@ -44,6 +49,7 @@
".": "./src/index.ts",
"./fetch": "./src/adapters/fetch/index.ts",
"./hono": "./src/adapters/hono/index.ts",
"./next": "./src/adapters/next/index.ts",
"./node": "./src/adapters/node/index.ts",
"./🔒/*": {
"types": "./src/*.ts"
Expand All @@ -60,7 +66,8 @@
"type:check": "tsc -b"
},
"peerDependencies": {
"hono": ">=4.6.0"
"hono": ">=4.6.0",
"next": ">=14.0.0"
},
"dependencies": {
"@orpc/contract": "workspace:*",
Expand Down
2 changes: 2 additions & 0 deletions packages/server/src/adapters/next/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from '../fetch'
export * from './serve'
40 changes: 40 additions & 0 deletions packages/server/src/adapters/next/serve.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import type { NextRequest } from 'next/server'
import type { Context } from '../../types'
import type { FetchHandleOptions, FetchHandler } from '../fetch'
import { value, type Value } from '@orpc/shared'

export type ServeOptions<T extends Context> =
& Omit<FetchHandleOptions<T>, 'context'>
& (undefined extends T ? { context?: Value<T, [NextRequest]> } : { context: Value<T, [NextRequest]> })

export type ServeRest<T extends Context> = [options: ServeOptions<T>] | (undefined extends T ? [] : never)

export interface ServeResult {
GET: (req: NextRequest) => Promise<Response>
POST: (req: NextRequest) => Promise<Response>
PUT: (req: NextRequest) => Promise<Response>
PATCH: (req: NextRequest) => Promise<Response>
DELETE: (req: NextRequest) => Promise<Response>
}

export function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: ServeRest<T>): ServeResult {
const main = async (req: NextRequest) => {
const context = await value(options?.context, req) as any

const { matched, response } = await handler.handle(req, { ...options, context })

if (matched) {
return response
}

return new Response(`Cannot find a matching procedure for ${req.url}`, { status: 404 })
}

return {
GET: main,
POST: main,
PUT: main,
PATCH: main,
DELETE: main,
}
}
1 change: 1 addition & 0 deletions packages/server/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export default defineConfig({
index: 'src/index.ts',
fetch: 'src/adapters/fetch/index.ts',
node: 'src/adapters/node/index.ts',
next: 'src/adapters/next/index.ts',
hono: 'src/adapters/hono/index.ts',
},
sourcemap: true,
Expand Down
25 changes: 8 additions & 17 deletions playgrounds/nextjs/src/app/api/[...rest]/route.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { OpenAPIServerlessHandler } from '@orpc/openapi/fetch'
import { OpenAPIServerlessHandler } from '@orpc/openapi/next'
import { serve } from '@orpc/server/next'
import { ZodCoercer } from '@orpc/zod'
import { router } from '../../router'
import '../../../polyfill'
Expand All @@ -12,19 +13,9 @@ const openAPIHandler = new OpenAPIServerlessHandler(router, {
},
})

export async function GET(request: Request) {
const { matched, response } = await openAPIHandler.handle(request, { prefix: '/api' })

if (matched) {
return response
}

// Your custom logic here (e.g., calling `next()` in Express.js or Hono.js)

return new Response('Not found', { status: 404 })
}

export const POST = GET
export const PUT = GET
export const DELETE = GET
export const PATCH = GET
export const { GET, POST, PUT, PATCH, DELETE } = serve(openAPIHandler, {
prefix: '/api',
context: async (req) => {
return {}
},
})
24 changes: 7 additions & 17 deletions playgrounds/nextjs/src/app/rpc/[...rest]/route.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ORPCHandler } from '@orpc/server/fetch'
import { ORPCHandler, serve } from '@orpc/server/next'
import { router } from '../../router'
import '../../../polyfill'

Expand All @@ -8,19 +8,9 @@ const openAPIHandler = new ORPCHandler(router, {
},
})

export async function GET(request: Request) {
const { matched, response } = await openAPIHandler.handle(request, { prefix: '/rpc' })

if (matched) {
return response
}

// Your custom logic here (e.g., calling `next()` in Express.js or Hono.js)

return new Response('Not found', { status: 404 })
}

export const POST = GET
export const PUT = GET
export const DELETE = GET
export const PATCH = GET
export const { GET, POST, PUT, PATCH, DELETE } = serve(openAPIHandler, {
prefix: '/rpc',
context: async (req) => {
return {}
},
})
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.