@orpc/client 0.0.0-next.db1f26d → 0.0.0-next.ee0aeaf

package/dist/index.js

@@ -1,28 +1,31 @@
 // src/procedure.ts
-import {
-  ORPC_HEADER,
-  ORPC_HEADER_VALUE
-} from "@orpc/contract";
-import { trim } from "@orpc/shared";
+import { ORPC_PROTOCOL_HEADER, ORPC_PROTOCOL_VALUE, trim } from "@orpc/shared";
 import { ORPCError } from "@orpc/shared/error";
 import { ORPCDeserializer, ORPCSerializer } from "@orpc/transformer";
+var serializer = new ORPCSerializer();
+var deserializer = new ORPCDeserializer();
 function createProcedureClient(options) {
-  const serializer = new ORPCSerializer();
-  const deserializer = new ORPCDeserializer();
-  const client = async (input) => {
+  const client = async (...args) => {
+    const [input, callerOptions] = args;
     const fetch_ = options.fetch ?? fetch;
     const url = `${trim(options.baseURL, "/")}/${options.path.map(encodeURIComponent).join("/")}`;
-    let headers = await options.headers?.(input);
-    headers = headers instanceof Headers ? headers : new Headers(headers);
-    const { body, headers: headers_ } = serializer.serialize(input);
-    for (const [key, value] of headers_.entries()) {
-      headers.set(key, value);
+    const headers = new Headers({
+      [ORPC_PROTOCOL_HEADER]: ORPC_PROTOCOL_VALUE
+    });
+    let customHeaders = await options.headers?.(input);
+    customHeaders = customHeaders instanceof Headers ? customHeaders : new Headers(customHeaders);
+    for (const [key, value] of customHeaders.entries()) {
+      headers.append(key, value);
+    }
+    const serialized = serializer.serialize(input);
+    for (const [key, value] of serialized.headers.entries()) {
+      headers.append(key, value);
     }
-    headers.set(ORPC_HEADER, ORPC_HEADER_VALUE);
     const response = await fetch_(url, {
       method: "POST",
       headers,
-      body
+      body: serialized.body,
+      signal: callerOptions?.signal
     });
     const json = await (async () => {
       try {

package/dist/src/procedure.d.ts

@@ -1,8 +1,5 @@
+import type { Caller } from '@orpc/server';
 import type { Promisable } from '@orpc/shared';
-import { type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-export interface ProcedureClient<TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>> {
-    (input: SchemaInput<TInputSchema>): Promise<SchemaOutput<TOutputSchema, TFuncOutput>>;
-}
 export interface CreateProcedureClientOptions {
     /**
      * The base url of the server.
@@ -23,5 +20,5 @@ export interface CreateProcedureClientOptions {
      */
     path: string[];
 }
-export declare function createProcedureClient<TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>>(options: CreateProcedureClientOptions): ProcedureClient<TInputSchema, TOutputSchema, TFuncOutput>;
+export declare function createProcedureClient<TInput, TOutput>(options: CreateProcedureClientOptions): Caller<TInput, TOutput>;
 //# sourceMappingURL=procedure.d.ts.map

package/dist/src/router.d.ts

@@ -1,34 +1,9 @@
-import type { ContractProcedure, ContractRouter, SchemaOutput } from '@orpc/contract';
-import type { Lazy, Procedure, Router } from '@orpc/server';
-import type { Promisable } from '@orpc/shared';
-import { type ProcedureClient } from './procedure';
-export type RouterClientWithContractRouter<TRouter extends ContractRouter> = {
-    [K in keyof TRouter]: TRouter[K] extends ContractProcedure<infer UInputSchema, infer UOutputSchema> ? ProcedureClient<UInputSchema, UOutputSchema, SchemaOutput<UOutputSchema>> : TRouter[K] extends ContractRouter ? RouterClientWithContractRouter<TRouter[K]> : never;
+import type { ContractProcedure, ContractRouter, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { Caller, Lazy, Procedure, Router } from '@orpc/server';
+import type { SetOptional } from '@orpc/shared';
+import type { CreateProcedureClientOptions } from './procedure';
+export type RouterClient<T extends Router<any> | ContractRouter> = {
+    [K in keyof T]: T[K] extends ContractProcedure<infer UInputSchema, infer UOutputSchema> | Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> | Lazy<Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput>> ? Caller<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>> : T[K] extends Router<any> | ContractRouter ? RouterClient<T[K]> : never;
 };
-export type RouterClientWithRouter<TRouter extends Router<any>> = {
-    [K in keyof TRouter]: TRouter[K] extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> | Lazy<Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput>> ? ProcedureClient<UInputSchema, UOutputSchema, UFuncOutput> : TRouter[K] extends Router<any> ? RouterClientWithRouter<TRouter[K]> : never;
-};
-export interface CreateRouterClientOptions {
-    /**
-     * The base url of the server.
-     */
-    baseURL: string;
-    /**
-     * The fetch function used to make the request.
-     * @default global fetch
-     */
-    fetch?: typeof fetch;
-    /**
-     * The headers used to make the request.
-     * Invoked before the request is made.
-     */
-    headers?: (input: unknown) => Promisable<Headers | Record<string, string>>;
-    /**
-     * This used for internal purpose only.
-     *
-     * @internal
-     */
-    path?: string[];
-}
-export declare function createRouterClient<TRouter extends Router<any> | ContractRouter>(options: CreateRouterClientOptions): TRouter extends Router<any> ? RouterClientWithRouter<TRouter> : TRouter extends ContractRouter ? RouterClientWithContractRouter<TRouter> : never;
+export declare function createRouterClient<T extends Router<any> | ContractRouter>(options: SetOptional<CreateProcedureClientOptions, 'path'>): RouterClient<T>;
 //# sourceMappingURL=router.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "0.0.0-next.db1f26d",
+  "version": "0.0.0-next.ee0aeaf",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -29,16 +29,16 @@
     "dist"
   ],
   "peerDependencies": {
-    "@orpc/contract": "0.0.0-next.db1f26d",
-    "@orpc/server": "0.0.0-next.db1f26d"
+    "@orpc/contract": "0.0.0-next.ee0aeaf",
+    "@orpc/server": "0.0.0-next.ee0aeaf"
   },
   "dependencies": {
-    "@orpc/shared": "0.0.0-next.db1f26d",
-    "@orpc/transformer": "0.0.0-next.db1f26d"
+    "@orpc/shared": "0.0.0-next.ee0aeaf",
+    "@orpc/transformer": "0.0.0-next.ee0aeaf"
   },
   "devDependencies": {
-    "zod": "^3.23.8",
-    "@orpc/openapi": "0.0.0-next.db1f26d"
+    "zod": "^3.24.1",
+    "@orpc/openapi": "0.0.0-next.ee0aeaf"
   },
   "scripts": {
     "build": "tsup --clean --sourcemap --entry.index=src/index.ts --format=esm --onSuccess='tsc -b --noCheck'",