@orpc/server 0.0.0-next.6c13765 → 0.0.0-next.6c1c681

package/dist/{chunk-77FU7QSO.js → shared/server.jG7ZuX3S.mjs}

@@ -1,21 +1,10 @@
-import {
-  convertPathToHttpPath,
-  createContractedProcedure,
-  createProcedureClient,
-  eachContractProcedure,
-  getRouterChild,
-  isProcedure,
-  unlazy
-} from "./chunk-MHVECKBC.js";
-import {
-  CompositePlugin
-} from "./chunk-WQNNSBXW.js";
+import { ORPCError, toORPCError } from '@orpc/client';
+import { intercept, trim, parseEmptyableJSON } from '@orpc/shared';
+import { C as CompositePlugin } from './server.Q6ZmnTgO.mjs';
+import { c as createProcedureClient, t as traverseContractProcedures, a as toHttpPath, i as isProcedure, u as unlazy, g as getRouter, b as createContractedProcedure } from './server.BtxZnWJ9.mjs';
 
-// src/adapters/standard/handler.ts
-import { ORPCError, toORPCError } from "@orpc/client";
-import { intercept, trim } from "@orpc/shared";
-var StandardHandler = class {
-  constructor(router, matcher, codec, options = {}) {
+class StandardHandler {
+  constructor(router, matcher, codec, options) {
     this.matcher = matcher;
     this.codec = codec;
     this.options = options;
@@ -78,17 +67,14 @@ var StandardHandler = class {
       }
     );
   }
-};
+}
 
-// src/adapters/standard/rpc-codec.ts
-import { RPCSerializer } from "@orpc/client/rpc";
-var RPCCodec = class {
-  serializer;
-  constructor(options = {}) {
-    this.serializer = options.serializer ?? new RPCSerializer();
+class StandardRPCCodec {
+  constructor(serializer) {
+    this.serializer = serializer;
   }
   async decode(request, _params, _procedure) {
-    const serialized = request.method === "GET" ? JSON.parse(request.url.searchParams.getAll("data").at(-1)) : await request.body();
+    const serialized = request.method === "GET" ? parseEmptyableJSON(request.url.searchParams.getAll("data").at(-1)) : await request.body();
     return this.serializer.deserialize(serialized);
   }
   encode(output, _procedure) {
@@ -105,18 +91,14 @@ var RPCCodec = class {
       body: this.serializer.serialize(error.toJSON())
     };
   }
-};
+}
 
-// src/adapters/standard/rpc-matcher.ts
-var RPCMatcher = class {
+class StandardRPCMatcher {
   tree = {};
   pendingRouters = [];
   init(router, path = []) {
-    const laziedOptions = eachContractProcedure({
-      router,
-      path
-    }, ({ path: path2, contract }) => {
-      const httpPath = convertPathToHttpPath(path2);
+    const laziedOptions = traverseContractProcedures({ router, path }, ({ path: path2, contract }) => {
+      const httpPath = toHttpPath(path2);
       if (isProcedure(contract)) {
         this.tree[httpPath] = {
           path: path2,
@@ -136,7 +118,7 @@ var RPCMatcher = class {
     });
     this.pendingRouters.push(...laziedOptions.map((option) => ({
       ...option,
-      httpPathPrefix: convertPathToHttpPath(option.path)
+      httpPathPrefix: toHttpPath(option.path)
     })));
   }
   async match(_method, pathname) {
@@ -144,7 +126,7 @@ var RPCMatcher = class {
       const newPendingRouters = [];
       for (const pendingRouter of this.pendingRouters) {
         if (pathname.startsWith(pendingRouter.httpPathPrefix)) {
-          const { default: router } = await unlazy(pendingRouter.lazied);
+          const { default: router } = await unlazy(pendingRouter.router);
           this.init(router, pendingRouter.path);
         } else {
           newPendingRouters.push(pendingRouter);
@@ -157,25 +139,20 @@ var RPCMatcher = class {
       return void 0;
     }
     if (!match.procedure) {
-      const { default: maybeProcedure } = await unlazy(getRouterChild(match.router, ...match.path));
+      const { default: maybeProcedure } = await unlazy(getRouter(match.router, match.path));
       if (!isProcedure(maybeProcedure)) {
         throw new Error(`
-          [Contract-First] Missing or invalid implementation for procedure at path: ${convertPathToHttpPath(match.path)}.
+          [Contract-First] Missing or invalid implementation for procedure at path: ${toHttpPath(match.path)}.
           Ensure that the procedure is correctly defined and matches the expected contract.
         `);
       }
-      match.procedure = createContractedProcedure(match.contract, maybeProcedure);
+      match.procedure = createContractedProcedure(maybeProcedure, match.contract);
     }
     return {
       path: match.path,
       procedure: match.procedure
     };
   }
-};
+}
 
-export {
-  StandardHandler,
-  RPCCodec,
-  RPCMatcher
-};
-//# sourceMappingURL=chunk-77FU7QSO.js.map
+export { StandardHandler as S, StandardRPCCodec as a, StandardRPCMatcher as b };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.6c13765",
+  "version": "0.0.0-next.6c1c681",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -15,47 +15,42 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/src/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs",
+      "default": "./dist/index.mjs"
     },
     "./plugins": {
-      "types": "./dist/src/plugins/index.d.ts",
-      "import": "./dist/plugins.js",
-      "default": "./dist/plugins.js"
+      "types": "./dist/plugins/index.d.mts",
+      "import": "./dist/plugins/index.mjs",
+      "default": "./dist/plugins/index.mjs"
     },
     "./standard": {
-      "types": "./dist/src/adapters/standard/index.d.ts",
-      "import": "./dist/standard.js",
-      "default": "./dist/standard.js"
+      "types": "./dist/adapters/standard/index.d.mts",
+      "import": "./dist/adapters/standard/index.mjs",
+      "default": "./dist/adapters/standard/index.mjs"
     },
     "./fetch": {
-      "types": "./dist/src/adapters/fetch/index.d.ts",
-      "import": "./dist/fetch.js",
-      "default": "./dist/fetch.js"
+      "types": "./dist/adapters/fetch/index.d.mts",
+      "import": "./dist/adapters/fetch/index.mjs",
+      "default": "./dist/adapters/fetch/index.mjs"
     },
     "./hono": {
-      "types": "./dist/src/adapters/hono/index.d.ts",
-      "import": "./dist/hono.js",
-      "default": "./dist/hono.js"
+      "types": "./dist/adapters/hono/index.d.mts",
+      "import": "./dist/adapters/hono/index.mjs",
+      "default": "./dist/adapters/hono/index.mjs"
     },
     "./next": {
-      "types": "./dist/src/adapters/next/index.d.ts",
-      "import": "./dist/next.js",
-      "default": "./dist/next.js"
+      "types": "./dist/adapters/next/index.d.mts",
+      "import": "./dist/adapters/next/index.mjs",
+      "default": "./dist/adapters/next/index.mjs"
     },
     "./node": {
-      "types": "./dist/src/adapters/node/index.d.ts",
-      "import": "./dist/node.js",
-      "default": "./dist/node.js"
-    },
-    "./🔒/*": {
-      "types": "./dist/src/*.d.ts"
+      "types": "./dist/adapters/node/index.d.mts",
+      "import": "./dist/adapters/node/index.mjs",
+      "default": "./dist/adapters/node/index.mjs"
     }
   },
   "files": [
-    "!**/*.map",
-    "!**/*.tsbuildinfo",
     "dist"
   ],
   "peerDependencies": {
@@ -63,18 +58,18 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@orpc/server-standard": "^0.4.0",
-    "@orpc/server-standard-fetch": "^0.4.0",
-    "@orpc/server-standard-node": "^0.4.0",
-    "@orpc/client": "0.0.0-next.6c13765",
-    "@orpc/contract": "0.0.0-next.6c13765",
-    "@orpc/shared": "0.0.0-next.6c13765"
+    "@orpc/client": "0.0.0-next.6c1c681",
+    "@orpc/shared": "0.0.0-next.6c1c681",
+    "@orpc/contract": "0.0.0-next.6c1c681",
+    "@orpc/standard-server": "0.0.0-next.6c1c681",
+    "@orpc/standard-server-fetch": "0.0.0-next.6c1c681",
+    "@orpc/standard-server-node": "0.0.0-next.6c1c681"
   },
   "devDependencies": {
     "light-my-request": "^6.5.1"
   },
   "scripts": {
-    "build": "tsup --onSuccess='tsc -b --noCheck'",
+    "build": "unbuild",
     "build:watch": "pnpm run build --watch",
     "type:check": "tsc -b"
   }

package/dist/chunk-47YYO5JS.js

@@ -1,32 +0,0 @@
-import {
-  RPCCodec,
-  RPCMatcher,
-  StandardHandler
-} from "./chunk-77FU7QSO.js";
-
-// src/adapters/fetch/rpc-handler.ts
-import { toFetchResponse, toStandardRequest } from "@orpc/server-standard-fetch";
-var RPCHandler = class {
-  standardHandler;
-  constructor(router, options) {
-    const matcher = options?.matcher ?? new RPCMatcher();
-    const codec = options?.codec ?? new RPCCodec();
-    this.standardHandler = new StandardHandler(router, matcher, codec, options);
-  }
-  async handle(request, ...rest) {
-    const standardRequest = toStandardRequest(request);
-    const result = await this.standardHandler.handle(standardRequest, ...rest);
-    if (!result.matched) {
-      return result;
-    }
-    return {
-      matched: true,
-      response: toFetchResponse(result.response)
-    };
-  }
-};
-
-export {
-  RPCHandler
-};
-//# sourceMappingURL=chunk-47YYO5JS.js.map

package/dist/fetch.js

@@ -1,10 +0,0 @@
-import {
-  RPCHandler
-} from "./chunk-47YYO5JS.js";
-import "./chunk-77FU7QSO.js";
-import "./chunk-MHVECKBC.js";
-import "./chunk-WQNNSBXW.js";
-export {
-  RPCHandler
-};
-//# sourceMappingURL=fetch.js.map

package/dist/node.js

@@ -1,31 +0,0 @@
-import {
-  RPCCodec,
-  RPCMatcher,
-  StandardHandler
-} from "./chunk-77FU7QSO.js";
-import "./chunk-MHVECKBC.js";
-import "./chunk-WQNNSBXW.js";
-
-// src/adapters/node/rpc-handler.ts
-import { sendStandardResponse, toStandardRequest } from "@orpc/server-standard-node";
-var RPCHandler = class {
-  standardHandler;
-  constructor(router, options) {
-    const codec = options?.codec ?? new RPCCodec();
-    const matcher = options?.matcher ?? new RPCMatcher();
-    this.standardHandler = new StandardHandler(router, matcher, codec, options);
-  }
-  async handle(req, res, ...rest) {
-    const standardRequest = toStandardRequest(req, res);
-    const result = await this.standardHandler.handle(standardRequest, ...rest);
-    if (!result.matched) {
-      return { matched: false };
-    }
-    await sendStandardResponse(res, result.response);
-    return { matched: true };
-  }
-};
-export {
-  RPCHandler
-};
-//# sourceMappingURL=node.js.map

package/dist/plugins.js

@@ -1,11 +0,0 @@
-import {
-  CORSPlugin,
-  CompositePlugin,
-  ResponseHeadersPlugin
-} from "./chunk-WQNNSBXW.js";
-export {
-  CORSPlugin,
-  CompositePlugin,
-  ResponseHeadersPlugin
-};
-//# sourceMappingURL=plugins.js.map

package/dist/src/adapters/fetch/index.d.ts

@@ -1,3 +0,0 @@
-export * from './rpc-handler';
-export * from './types';
-//# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/fetch/rpc-handler.d.ts

@@ -1,11 +0,0 @@
-import type { MaybeOptionalOptions } from '@orpc/shared';
-import type { Context } from '../../context';
-import type { Router } from '../../router';
-import type { RPCHandlerOptions, StandardHandleOptions } from '../standard';
-import type { FetchHandler, FetchHandleResult } from './types';
-export declare class RPCHandler<T extends Context> implements FetchHandler<T> {
-    private readonly standardHandler;
-    constructor(router: Router<T, any>, options?: NoInfer<RPCHandlerOptions<T>>);
-    handle(request: Request, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<FetchHandleResult>;
-}
-//# sourceMappingURL=rpc-handler.d.ts.map

package/dist/src/adapters/fetch/types.d.ts

@@ -1,14 +0,0 @@
-import type { MaybeOptionalOptions } from '@orpc/shared';
-import type { Context } from '../../context';
-import type { StandardHandleOptions } from '../standard';
-export type FetchHandleResult = {
-    matched: true;
-    response: Response;
-} | {
-    matched: false;
-    response: undefined;
-};
-export interface FetchHandler<T extends Context> {
-    handle(request: Request, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<FetchHandleResult>;
-}
-//# sourceMappingURL=types.d.ts.map

package/dist/src/adapters/hono/index.d.ts

@@ -1,3 +0,0 @@
-export * from '../fetch';
-export * from './middleware';
-//# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/hono/middleware.d.ts

@@ -1,12 +0,0 @@
-import type { MaybeOptionalOptions, Value } from '@orpc/shared';
-import type { Context as HonoContext, MiddlewareHandler } from 'hono';
-import type { Context } from '../../context';
-import type { FetchHandler } from '../fetch';
-import type { StandardHandleOptions } from '../standard';
-export type CreateMiddlewareOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: Value<T, [HonoContext]>;
-} : {
-    context: Value<T, [HonoContext]>;
-});
-export declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
-//# sourceMappingURL=middleware.d.ts.map

package/dist/src/adapters/next/index.d.ts

@@ -1,3 +0,0 @@
-export * from '../fetch';
-export * from './serve';
-//# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/next/serve.d.ts

@@ -1,19 +0,0 @@
-import type { MaybeOptionalOptions, Value } from '@orpc/shared';
-import type { NextRequest } from 'next/server';
-import type { Context } from '../../context';
-import type { FetchHandler } from '../fetch';
-import type { StandardHandleOptions } from '../standard';
-export type ServeOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: Value<T, [NextRequest]>;
-} : {
-    context: Value<T, [NextRequest]>;
-});
-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 declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
-//# sourceMappingURL=serve.d.ts.map

package/dist/src/adapters/node/index.d.ts

@@ -1,3 +0,0 @@
-export * from './rpc-handler';
-export * from './types';
-//# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/node/rpc-handler.d.ts

@@ -1,11 +0,0 @@
-import type { MaybeOptionalOptions } from '@orpc/shared';
-import type { Context } from '../../context';
-import type { Router } from '../../router';
-import type { RPCHandlerOptions, StandardHandleOptions } from '../standard';
-import type { NodeHttpHandler, NodeHttpHandleResult, NodeHttpRequest, NodeHttpResponse } from './types';
-export declare class RPCHandler<T extends Context> implements NodeHttpHandler<T> {
-    private readonly standardHandler;
-    constructor(router: Router<T, any>, options?: NoInfer<RPCHandlerOptions<T>>);
-    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<NodeHttpHandleResult>;
-}
-//# sourceMappingURL=rpc-handler.d.ts.map

package/dist/src/adapters/node/types.d.ts

@@ -1,22 +0,0 @@
-import type { MaybeOptionalOptions } from '@orpc/shared';
-import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
-import type { Context } from '../../context';
-import type { StandardHandleOptions } from '../standard';
-export type NodeHttpRequest = (IncomingMessage | Http2ServerRequest) & {
-    /**
-     * Replace `req.url` with `req.originalUrl` when `req.originalUrl` is available.
-     * This is useful for `express.js` middleware.
-     */
-    originalUrl?: string;
-};
-export type NodeHttpResponse = ServerResponse | Http2ServerResponse;
-export type NodeHttpHandleResult = {
-    matched: true;
-} | {
-    matched: false;
-};
-export interface NodeHttpHandler<T extends Context> {
-    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<NodeHttpHandleResult>;
-}
-//# sourceMappingURL=types.d.ts.map

package/dist/src/adapters/standard/handler.d.ts

@@ -1,53 +0,0 @@
-import type { ErrorFromErrorMap, HTTPPath, Meta, Schema, SchemaOutput } from '@orpc/contract';
-import type { StandardRequest, StandardResponse } from '@orpc/server-standard';
-import type { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
-import type { Context } from '../../context';
-import type { Plugin } from '../../plugins';
-import type { ProcedureClientInterceptorOptions } from '../../procedure-client';
-import type { Router } from '../../router';
-import type { StandardCodec, StandardMatcher } from './types';
-export type StandardHandleOptions<T extends Context> = {
-    prefix?: HTTPPath;
-} & (Record<never, never> extends T ? {
-    context?: T;
-} : {
-    context: T;
-});
-export type WellStandardHandleOptions<T extends Context> = StandardHandleOptions<T> & {
-    context: T;
-};
-export type StandardHandleResult = {
-    matched: true;
-    response: StandardResponse;
-} | {
-    matched: false;
-    response: undefined;
-};
-export type StandardHandlerInterceptorOptions<TContext extends Context> = WellStandardHandleOptions<TContext> & {
-    request: StandardRequest;
-};
-export interface StandardHandlerOptions<TContext extends Context> {
-    plugins?: Plugin<TContext>[];
-    /**
-     * Interceptors at the request level, helpful when you want catch errors
-     */
-    interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, unknown>[];
-    /**
-     * Interceptors at the root level, helpful when you want override the request/response
-     */
-    rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, unknown>[];
-    /**
-     *
-     * Interceptors for procedure client.
-     */
-    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Schema, Record<never, never>, Meta>, SchemaOutput<Schema, unknown>, ErrorFromErrorMap<Record<never, never>>>[];
-}
-export declare class StandardHandler<T extends Context> {
-    private readonly matcher;
-    private readonly codec;
-    private readonly options;
-    private readonly plugin;
-    constructor(router: Router<T, any>, matcher: StandardMatcher, codec: StandardCodec, options?: NoInfer<StandardHandlerOptions<T>>);
-    handle(request: StandardRequest, ...[options]: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<StandardHandleResult>;
-}
-//# sourceMappingURL=handler.d.ts.map

package/dist/src/adapters/standard/index.d.ts

@@ -1,6 +0,0 @@
-export * from './handler';
-export * from './rpc-codec';
-export * from './rpc-handler';
-export * from './rpc-matcher';
-export * from './types';
-//# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/standard/rpc-codec.d.ts

@@ -1,16 +0,0 @@
-import type { ORPCError } from '@orpc/client';
-import type { StandardRequest, StandardResponse } from '@orpc/server-standard';
-import type { AnyProcedure } from '../../procedure';
-import type { StandardCodec, StandardParams } from './types';
-import { RPCSerializer } from '@orpc/client/rpc';
-export interface StandardCodecOptions {
-    serializer?: RPCSerializer;
-}
-export declare class RPCCodec implements StandardCodec {
-    private readonly serializer;
-    constructor(options?: StandardCodecOptions);
-    decode(request: StandardRequest, _params: StandardParams | undefined, _procedure: AnyProcedure): Promise<unknown>;
-    encode(output: unknown, _procedure: AnyProcedure): StandardResponse;
-    encodeError(error: ORPCError<any, any>): StandardResponse;
-}
-//# sourceMappingURL=rpc-codec.d.ts.map

package/dist/src/adapters/standard/rpc-handler.d.ts

@@ -1,8 +0,0 @@
-import type { Context } from '../../context';
-import type { StandardHandlerOptions } from './handler';
-import type { StandardCodec, StandardMatcher } from './types';
-export interface RPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T> {
-    matcher?: StandardMatcher;
-    codec?: StandardCodec;
-}
-//# sourceMappingURL=rpc-handler.d.ts.map

package/dist/src/adapters/standard/rpc-matcher.d.ts

@@ -1,10 +0,0 @@
-import type { HTTPPath } from '@orpc/contract';
-import type { StandardMatcher, StandardMatchResult } from './types';
-import { type AnyRouter } from '../../router';
-export declare class RPCMatcher implements StandardMatcher {
-    private readonly tree;
-    private pendingRouters;
-    init(router: AnyRouter, path?: string[]): void;
-    match(_method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
-}
-//# sourceMappingURL=rpc-matcher.d.ts.map

package/dist/src/adapters/standard/types.d.ts

@@ -1,21 +0,0 @@
-import type { ORPCError } from '@orpc/client';
-import type { HTTPPath } from '@orpc/contract';
-import type { StandardRequest, StandardResponse } from '@orpc/server-standard';
-import type { AnyProcedure } from '../../procedure';
-import type { AnyRouter } from '../../router';
-export type StandardParams = Record<string, string>;
-export type StandardMatchResult = {
-    path: string[];
-    procedure: AnyProcedure;
-    params?: StandardParams;
-} | undefined;
-export interface StandardMatcher {
-    init(router: AnyRouter): void;
-    match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
-}
-export interface StandardCodec {
-    encode(output: unknown, procedure: AnyProcedure): StandardResponse;
-    encodeError(error: ORPCError<any, any>): StandardResponse;
-    decode(request: StandardRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
-}
-//# sourceMappingURL=types.d.ts.map