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

package/dist/index.js

@@ -1,28 +1,30 @@
-// 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";
-function createProcedureClient(options) {
-  const serializer = new ORPCSerializer();
-  const deserializer = new ORPCDeserializer();
-  const client = async (input) => {
-    const fetch_ = options.fetch ?? fetch;
+var serializer = new ORPCSerializer();
+var deserializer = new ORPCDeserializer();
+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()) {
-      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, {
+    const response = await fetchClient(url, {
       method: "POST",
       headers,
-      body
+      body: serialized.body,
+      signal: callerOptions?.signal
     });
     const json = await (async () => {
       try {
@@ -47,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
     }),
     {
@@ -62,7 +62,7 @@ function createRouterClient(options) {
         if (typeof key !== "string") {
           return Reflect.get(target, key);
         }
-        return createRouterClient({
+        return createRouterFetchClient({
           ...options,
           path: [...path, key]
         });
@@ -74,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-fetch-client.d.ts

@@ -0,0 +1,24 @@
+import type { ProcedureClient } from '@orpc/server';
+import type { Promisable } from '@orpc/shared';
+export interface CreateProcedureClientOptions {
+    /**
+     * 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>>;
+    /**
+     * The path of the procedure on server.
+     */
+    path: string[];
+}
+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.0.0-next.db1f26d",
+  "version": "0.0.0-next.e361acd",
   "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.e361acd",
+    "@orpc/server": "0.0.0-next.e361acd"
   },
   "dependencies": {
-    "@orpc/shared": "0.0.0-next.db1f26d",
-    "@orpc/transformer": "0.0.0-next.db1f26d"
+    "@orpc/transformer": "0.0.0-next.e361acd",
+    "@orpc/shared": "0.0.0-next.e361acd"
   },
   "devDependencies": {
-    "zod": "^3.23.8",
-    "@orpc/openapi": "0.0.0-next.db1f26d"
+    "zod": "^3.24.1",
+    "@orpc/openapi": "0.0.0-next.e361acd"
   },
   "scripts": {
     "build": "tsup --clean --sourcemap --entry.index=src/index.ts --format=esm --onSuccess='tsc -b --noCheck'",

package/dist/src/procedure.d.ts

@@ -1,27 +0,0 @@
-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.
-     */
-    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>>;
-    /**
-     * The path of the procedure on server.
-     */
-    path: string[];
-}
-export declare function createProcedureClient<TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>>(options: CreateProcedureClientOptions): ProcedureClient<TInputSchema, TOutputSchema, TFuncOutput>;
-//# sourceMappingURL=procedure.d.ts.map

package/dist/src/router.d.ts

@@ -1,34 +0,0 @@
-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;
-};
-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;
-//# sourceMappingURL=router.d.ts.map