@orpc/server 0.20.0 → 0.22.0

package/dist/{chunk-YAVPFNPF.js → chunk-6A7XHEBH.js}

@@ -1,3 +1,9 @@
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+
 // src/utils.ts
 function mergeContext(a, b) {
   if (!a)
@@ -23,7 +29,7 @@ function isProcedure(item) {
   if (item instanceof Procedure) {
     return true;
   }
-  return (typeof item === "object" || typeof item === "function") && item !== null && "~type" in item && item["~type"] === "Procedure" && "~orpc" in item && typeof item["~orpc"] === "object" && item["~orpc"] !== null && "contract" in item["~orpc"] && isContractProcedure(item["~orpc"].contract) && "func" in item["~orpc"] && typeof item["~orpc"].func === "function";
+  return (typeof item === "object" || typeof item === "function") && item !== null && "~type" in item && item["~type"] === "Procedure" && "~orpc" in item && typeof item["~orpc"] === "object" && item["~orpc"] !== null && "contract" in item["~orpc"] && isContractProcedure(item["~orpc"].contract) && "handler" in item["~orpc"] && typeof item["~orpc"].handler === "function";
 }
 
 // src/lazy.ts
@@ -129,7 +135,7 @@ async function executeMiddlewareChain(procedure, input, context, meta) {
       });
     }
     const result = {
-      output: await procedure["~orpc"].func(input, currentContext, meta),
+      output: await procedure["~orpc"].handler(input, currentContext, meta),
       context: currentContext
     };
     return result;
@@ -168,6 +174,7 @@ function getRouterChild(router, ...path) {
 }
 
 export {
+  __export,
   mergeContext,
   Procedure,
   isProcedure,
@@ -179,4 +186,4 @@ export {
   createProcedureClient,
   getRouterChild
 };
-//# sourceMappingURL=chunk-YAVPFNPF.js.map
+//# sourceMappingURL=chunk-6A7XHEBH.js.map

package/dist/fetch.js

@@ -1,9 +1,10 @@
 import {
+  __export,
   createProcedureClient,
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-YAVPFNPF.js";
+} from "./chunk-6A7XHEBH.js";
 
 // src/fetch/composite-handler.ts
 var CompositeHandler = class {
@@ -30,6 +31,13 @@ import { ORPCError as ORPCError2 } from "@orpc/shared/error";
 import { findDeepMatches, set } from "@orpc/shared";
 import { ORPCError } from "@orpc/shared/error";
 
+// src/fetch/super-json.ts
+var super_json_exports = {};
+__export(super_json_exports, {
+  deserialize: () => deserialize,
+  serialize: () => serialize
+});
+
 // ../../node_modules/.pnpm/is-what@5.0.2/node_modules/is-what/dist/getType.js
 function getType(payload) {
   return Object.prototype.toString.call(payload).slice(8, -1);
@@ -148,9 +156,24 @@ function deserialize({
 
 // src/fetch/orpc-payload-codec.ts
 var ORPCPayloadCodec = class {
-  encode(payload) {
+  /**
+   * If method is GET, the payload will be encoded as query string.
+   * If method is GET and payload contain file, the method will be fallback to fallbackMethod. (fallbackMethod = GET will force to use GET method)
+   */
+  encode(payload, method = "POST", fallbackMethod = "POST") {
     const { data, meta } = serialize(payload);
     const { maps, values } = findDeepMatches((v) => v instanceof Blob, data);
+    if (method === "GET" && (values.length === 0 || fallbackMethod === "GET")) {
+      const query = new URLSearchParams({
+        data: JSON.stringify(data),
+        meta: JSON.stringify(meta)
+      });
+      return {
+        query,
+        method: "GET"
+      };
+    }
+    const nonGETMethod = method === "GET" ? fallbackMethod : method;
     if (values.length > 0) {
       const form = new FormData();
       if (data !== void 0) {
@@ -162,17 +185,31 @@ var ORPCPayloadCodec = class {
         const value = values[i];
         form.append(i, value);
       }
-      return { body: form };
+      return {
+        body: form,
+        method: nonGETMethod
+      };
     }
     return {
       body: JSON.stringify({ data, meta }),
       headers: new Headers({
         "content-type": "application/json"
-      })
+      }),
+      method: nonGETMethod
     };
   }
   async decode(re) {
     try {
+      if ("method" in re && re.method === "GET") {
+        const url = new URL(re.url);
+        const query = url.searchParams;
+        const data = JSON.parse(query.getAll("data").at(-1));
+        const meta = JSON.parse(query.getAll("meta").at(-1));
+        return deserialize({
+          data,
+          meta
+        });
+      }
       if (re.headers.get("content-type")?.startsWith("multipart/form-data")) {
         const form = await re.formData();
         const rawData = form.get("data");
@@ -281,6 +318,7 @@ export {
   CompositeHandler,
   ORPCHandler,
   ORPCPayloadCodec,
-  ORPCProcedureMatcher
+  ORPCProcedureMatcher,
+  super_json_exports as SuperJSON
 };
 //# sourceMappingURL=fetch.js.map

package/dist/index.js

@@ -9,7 +9,7 @@ import {
   lazy,
   mergeContext,
   unlazy
-} from "./chunk-YAVPFNPF.js";
+} from "./chunk-6A7XHEBH.js";
 
 // src/builder.ts
 import { ContractProcedure } from "@orpc/contract";
@@ -110,11 +110,11 @@ var ProcedureImplementer = class _ProcedureImplementer {
       middlewares: [...this["~orpc"].middlewares ?? [], mappedMiddleware]
     });
   }
-  func(func) {
+  handler(handler) {
     return decorateProcedure(new Procedure({
       middlewares: this["~orpc"].middlewares,
       contract: this["~orpc"].contract,
-      func
+      handler
     }));
   }
 };
@@ -358,11 +358,11 @@ var ProcedureBuilder = class _ProcedureBuilder {
       middlewares: this["~orpc"].middlewares
     }).use(middleware, mapInput);
   }
-  func(func) {
+  handler(handler) {
     return decorateProcedure(new Procedure({
       middlewares: this["~orpc"].middlewares,
       contract: this["~orpc"].contract,
-      func
+      handler
     }));
   }
 };
@@ -416,14 +416,14 @@ var Builder = class _Builder {
       })
     });
   }
-  func(func) {
+  handler(handler) {
     return decorateProcedure(new Procedure({
       middlewares: this["~orpc"].middlewares,
       contract: new ContractProcedure({
         InputSchema: void 0,
         OutputSchema: void 0
       }),
-      func
+      handler
     }));
   }
   prefix(prefix) {

package/dist/src/builder.d.ts

@@ -23,7 +23,7 @@ export declare class Builder<TContext extends Context, TExtraContext extends Con
     route(route: RouteOptions): ProcedureBuilder<TContext, TExtraContext, undefined, undefined>;
     input<USchema extends Schema = undefined>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilder<TContext, TExtraContext, USchema, undefined>;
     output<USchema extends Schema = undefined>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilder<TContext, TExtraContext, undefined, USchema>;
-    func<UFuncOutput = undefined>(func: ProcedureFunc<TContext, TExtraContext, undefined, undefined, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput>;
+    handler<UFuncOutput = undefined>(handler: ProcedureFunc<TContext, TExtraContext, undefined, undefined, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput>;
     prefix(prefix: HTTPPath): RouterBuilder<TContext, TExtraContext>;
     tag(...tags: string[]): RouterBuilder<TContext, TExtraContext>;
     router<U extends Router<MergeContext<TContext, TExtraContext>, any>>(router: U): AdaptedRouter<TContext, U>;

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

@@ -2,5 +2,6 @@ export * from './composite-handler';
 export * from './orpc-handler';
 export * from './orpc-payload-codec';
 export * from './orpc-procedure-matcher';
+export * as SuperJSON from './super-json';
 export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/fetch/orpc-payload-codec.d.ts

@@ -1,7 +1,14 @@
+import type { HTTPMethod } from '@orpc/contract';
 export declare class ORPCPayloadCodec {
-    encode(payload: unknown): {
-        body: FormData | string;
+    /**
+     * If method is GET, the payload will be encoded as query string.
+     * If method is GET and payload contain file, the method will be fallback to fallbackMethod. (fallbackMethod = GET will force to use GET method)
+     */
+    encode(payload: unknown, method?: HTTPMethod, fallbackMethod?: HTTPMethod): {
+        query?: URLSearchParams;
+        body?: FormData | string;
         headers?: Headers;
+        method: HTTPMethod;
     };
     decode(re: Request | Response): Promise<unknown>;
 }

package/dist/src/procedure-builder.d.ts

@@ -17,6 +17,6 @@ export declare class ProcedureBuilder<TContext extends Context, TExtraContext ex
     output<U extends Schema = undefined>(schema: U, example?: SchemaOutput<U>): ProcedureBuilder<TContext, TExtraContext, TInputSchema, U>;
     use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema>;
     use<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema>;
-    func<UFuncOutput extends SchemaInput<TOutputSchema>>(func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
 }
 //# sourceMappingURL=procedure-builder.d.ts.map

package/dist/src/procedure-client.d.ts

@@ -14,8 +14,8 @@ export interface ProcedureClient<TInput, TOutput, TClientContext> {
 /**
  * Options for creating a procedure caller with comprehensive type safety
  */
-export type CreateProcedureClientOptions<TContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> = {
-    procedure: Lazyable<Procedure<TContext, any, TInputSchema, TOutputSchema, TFuncOutput>>;
+export type CreateProcedureClientOptions<TContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> = {
+    procedure: Lazyable<Procedure<TContext, any, TInputSchema, TOutputSchema, THandlerOutput>>;
     /**
      * This is helpful for logging and analytics.
      *
@@ -29,6 +29,6 @@ export type CreateProcedureClientOptions<TContext extends Context, TInputSchema
     context: Value<TContext>;
 } | (undefined extends TContext ? {
     context?: undefined;
-} : never)) & Hooks<unknown, SchemaOutput<TOutputSchema, TFuncOutput>, TContext, Meta>;
-export declare function createProcedureClient<TContext extends Context = WELL_CONTEXT, TInputSchema extends Schema = undefined, TOutputSchema extends Schema = undefined, TFuncOutput extends SchemaInput<TOutputSchema> = SchemaInput<TOutputSchema>>(options: CreateProcedureClientOptions<TContext, TInputSchema, TOutputSchema, TFuncOutput>): ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, TFuncOutput>, unknown>;
+} : never)) & Hooks<unknown, SchemaOutput<TOutputSchema, THandlerOutput>, TContext, Meta>;
+export declare function createProcedureClient<TContext extends Context = WELL_CONTEXT, TInputSchema extends Schema = undefined, TOutputSchema extends Schema = undefined, THandlerOutput extends SchemaInput<TOutputSchema> = SchemaInput<TOutputSchema>>(options: CreateProcedureClientOptions<TContext, TInputSchema, TOutputSchema, THandlerOutput>): ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, unknown>;
 //# sourceMappingURL=procedure-client.d.ts.map

package/dist/src/procedure-decorated.d.ts

@@ -3,12 +3,12 @@ import type { MapInputMiddleware, Middleware } from './middleware';
 import type { ProcedureClient } from './procedure-client';
 import type { Context, MergeContext } from './types';
 import { Procedure } from './procedure';
-export type DecoratedProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> = Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput> & {
-    prefix: (prefix: HTTPPath) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    route: (route: RouteOptions) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    use: (<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, TFuncOutput>>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema, TFuncOutput>) & (<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema, TFuncOutput>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema, TFuncOutput>, UInput>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema, TFuncOutput>);
-    unshiftTag: (...tags: string[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    unshiftMiddleware: <U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(...middlewares: Middleware<TContext, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, TFuncOutput>>[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-} & (undefined extends TContext ? ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, TFuncOutput>, unknown> : unknown);
-export declare function decorateProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>>(procedure: Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
+export type DecoratedProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> = Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput> & {
+    prefix: (prefix: HTTPPath) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    route: (route: RouteOptions) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    use: (<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, THandlerOutput>>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema, THandlerOutput>) & (<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema, THandlerOutput>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema, THandlerOutput>, UInput>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema, THandlerOutput>);
+    unshiftTag: (...tags: string[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    unshiftMiddleware: <U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(...middlewares: Middleware<TContext, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, THandlerOutput>>[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+} & (undefined extends TContext ? ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, unknown> : unknown);
+export declare function decorateProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>>(procedure: Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
 //# sourceMappingURL=procedure-decorated.d.ts.map

package/dist/src/procedure-implementer.d.ts

@@ -13,6 +13,6 @@ export declare class ProcedureImplementer<TContext extends Context, TExtraContex
     constructor(def: ProcedureImplementerDef<TContext, TExtraContext, TInputSchema, TOutputSchema>);
     use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema>;
     use<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema>;
-    func<UFuncOutput extends SchemaInput<TOutputSchema>>(func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
 }
 //# sourceMappingURL=procedure-implementer.d.ts.map

package/dist/src/procedure.d.ts

@@ -3,18 +3,18 @@ import type { Lazy } from './lazy';
 import type { Middleware } from './middleware';
 import type { Context, MergeContext, Meta } from './types';
 import { type ContractProcedure, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-export interface ProcedureFunc<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> {
-    (input: SchemaOutput<TInputSchema>, context: MergeContext<TContext, TExtraContext>, meta: Meta): Promisable<SchemaInput<TOutputSchema, TFuncOutput>>;
+export interface ProcedureFunc<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
+    (input: SchemaOutput<TInputSchema>, context: MergeContext<TContext, TExtraContext>, meta: Meta): Promisable<SchemaInput<TOutputSchema, THandlerOutput>>;
 }
-export interface ProcedureDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> {
+export interface ProcedureDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
     middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, SchemaOutput<TInputSchema>, any>[];
     contract: ContractProcedure<TInputSchema, TOutputSchema>;
-    func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
+    handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
 }
-export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> {
+export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
     '~type': "Procedure";
-    '~orpc': ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    constructor(def: ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>);
+    '~orpc': ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    constructor(def: ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>);
 }
 export type ANY_PROCEDURE = Procedure<any, any, any, any, any>;
 export type WELL_PROCEDURE = Procedure<Context, Context, Schema, Schema, unknown>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.20.0",
+  "version": "0.22.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,8 +34,8 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "0.20.0",
-    "@orpc/contract": "0.20.0"
+    "@orpc/contract": "0.22.0",
+    "@orpc/shared": "0.22.0"
   },
   "devDependencies": {
     "zod": "^3.24.1"