@orpc/client 0.16.0 → 0.17.0

package/dist/index.js

@@ -1,26 +1,29 @@
-// src/procedure.ts
-import { ORPC_HEADER, ORPC_HEADER_VALUE } from "@orpc/contract";
-import { trim } from "@orpc/shared";
+// src/procedure-fetch-client.ts
+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 client = async (...args) => {
-    const [input, callerOptions] = args;
-    const fetch_ = options.fetch ?? fetch;
+function createProcedureFetchClient(options) {
+  const client = async (...[input, callerOptions]) => {
+    const fetchClient = 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()) {
+    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, {
+    const response = await fetchClient(url, {
       method: "POST",
       headers,
-      body,
+      body: serialized.body,
       signal: callerOptions?.signal
     });
     const json = await (async () => {
@@ -46,14 +49,12 @@ function createProcedureClient(options) {
   return client;
 }
 
-// src/router.ts
-function createRouterClient(options) {
+// src/router-fetch-client.ts
+function createRouterFetchClient(options) {
   const path = options?.path ?? [];
   const client = new Proxy(
-    createProcedureClient({
-      baseURL: options.baseURL,
-      fetch: options.fetch,
-      headers: options.headers,
+    createProcedureFetchClient({
+      ...options,
       path
     }),
     {
@@ -61,7 +62,7 @@ function createRouterClient(options) {
         if (typeof key !== "string") {
           return Reflect.get(target, key);
         }
-        return createRouterClient({
+        return createRouterFetchClient({
           ...options,
           path: [...path, key]
         });
@@ -73,10 +74,10 @@ function createRouterClient(options) {
 
 // src/index.ts
 export * from "@orpc/shared/error";
-var createORPCClient = createRouterClient;
+var createORPCFetchClient = createRouterFetchClient;
 export {
-  createORPCClient,
-  createProcedureClient,
-  createRouterClient
+  createORPCFetchClient,
+  createProcedureFetchClient,
+  createRouterFetchClient
 };
 //# sourceMappingURL=index.js.map

package/dist/src/index.d.ts

@@ -1,7 +1,7 @@
 /** unnoq */
-import { createRouterClient } from './router';
-export * from './procedure';
-export * from './router';
+import { createRouterFetchClient } from './router-fetch-client';
+export * from './procedure-fetch-client';
+export * from './router-fetch-client';
 export * from '@orpc/shared/error';
-export declare const createORPCClient: typeof createRouterClient;
+export declare const createORPCFetchClient: typeof createRouterFetchClient;
 //# sourceMappingURL=index.d.ts.map

package/dist/src/{procedure.d.ts → procedure-fetch-client.d.ts}

@@ -1,4 +1,4 @@
-import type { Caller } from '@orpc/server';
+import type { ProcedureClient } from '@orpc/server';
 import type { Promisable } from '@orpc/shared';
 export interface CreateProcedureClientOptions {
     /**
@@ -20,5 +20,5 @@ export interface CreateProcedureClientOptions {
      */
     path: string[];
 }
-export declare function createProcedureClient<TInput, TOutput>(options: CreateProcedureClientOptions): Caller<TInput, TOutput>;
-//# sourceMappingURL=procedure.d.ts.map
+export declare function createProcedureFetchClient<TInput, TOutput>(options: CreateProcedureClientOptions): ProcedureClient<TInput, TOutput>;
+//# sourceMappingURL=procedure-fetch-client.d.ts.map

package/dist/src/router-fetch-client.d.ts

@@ -0,0 +1,6 @@
+import type { ContractRouter } from '@orpc/contract';
+import type { ANY_ROUTER, RouterClient } from '@orpc/server';
+import type { SetOptional } from '@orpc/shared';
+import type { CreateProcedureClientOptions } from './procedure-fetch-client';
+export declare function createRouterFetchClient<T extends ANY_ROUTER | ContractRouter>(options: SetOptional<CreateProcedureClientOptions, 'path'>): RouterClient<T>;
+//# sourceMappingURL=router-fetch-client.d.ts.map

package/package.json

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

package/dist/src/router.d.ts

@@ -1,9 +0,0 @@
-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 declare function createRouterClient<T extends Router<any> | ContractRouter>(options: SetOptional<CreateProcedureClientOptions, 'path'>): RouterClient<T>;
-//# sourceMappingURL=router.d.ts.map