@orpc/client 0.19.0 → 0.20.0

package/dist/fetch.js

@@ -0,0 +1,46 @@
+// src/adapters/fetch/orpc-link.ts
+import { ORPCPayloadCodec } from "@orpc/server/fetch";
+import { ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE, trim } from "@orpc/shared";
+import { ORPCError } from "@orpc/shared/error";
+var ORPCLink = class {
+  constructor(options) {
+    this.options = options;
+    this.fetch = options.fetch ?? globalThis.fetch.bind(globalThis);
+    this.payloadCodec = options.payloadCodec ?? new ORPCPayloadCodec();
+  }
+  fetch;
+  payloadCodec;
+  async call(path, input, options) {
+    const url = `${trim(this.options.url, "/")}/${path.map(encodeURIComponent).join("/")}`;
+    const encoded = this.payloadCodec.encode(input);
+    const headers = new Headers(encoded.headers);
+    headers.append(ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE);
+    const clientContext = options.context;
+    let customHeaders = await this.options.headers?.(input, clientContext);
+    customHeaders = customHeaders instanceof Headers ? customHeaders : new Headers(customHeaders);
+    for (const [key, value] of customHeaders.entries()) {
+      headers.append(key, value);
+    }
+    const response = await this.fetch(url, {
+      method: "POST",
+      headers,
+      body: encoded.body,
+      signal: options.signal
+    }, clientContext);
+    const decoded = await this.payloadCodec.decode(response);
+    if (!response.ok) {
+      const error = ORPCError.fromJSON(decoded) ?? new ORPCError({
+        status: response.status,
+        code: "INTERNAL_SERVER_ERROR",
+        message: "Internal server error",
+        cause: decoded
+      });
+      throw error;
+    }
+    return decoded;
+  }
+};
+export {
+  ORPCLink
+};
+//# sourceMappingURL=fetch.js.map

package/dist/index.js

@@ -1,78 +1,39 @@
-// src/procedure-fetch-client.ts
-import { ORPCPayloadCodec } from "@orpc/server/fetch";
-import { ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE, trim } from "@orpc/shared";
-import { ORPCError } from "@orpc/shared/error";
-var payloadCodec = new ORPCPayloadCodec();
-function createProcedureFetchClient(options) {
-  const client = async (...[input, callerOptions]) => {
-    const fetchClient = options.fetch ?? fetch;
-    const url = `${trim(options.baseURL, "/")}/${options.path.map(encodeURIComponent).join("/")}`;
-    const encoded = payloadCodec.encode(input);
-    const headers = new Headers(encoded.headers);
-    headers.append(ORPC_HANDLER_HEADER, ORPC_HANDLER_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 response = await fetchClient(url, {
-      method: "POST",
-      headers,
-      body: encoded.body,
-      signal: callerOptions?.signal
-    });
-    const json = await (async () => {
-      try {
-        return await payloadCodec.decode(response);
-      } catch (e) {
-        throw new ORPCError({
-          code: "INTERNAL_SERVER_ERROR",
-          message: "Cannot parse response.",
-          cause: e
-        });
+// src/client.ts
+function createORPCClient(link, options) {
+  const path = options?.path ?? [];
+  const procedureClient = async (...[input, options2]) => {
+    return await link.call(path, input, options2 ?? {});
+  };
+  const recursive = new Proxy(procedureClient, {
+    get(target, key) {
+      if (typeof key !== "string") {
+        return Reflect.get(target, key);
       }
-    })();
-    if (!response.ok) {
-      throw ORPCError.fromJSON(json) ?? new ORPCError({
-        status: response.status,
-        code: "INTERNAL_SERVER_ERROR",
-        message: "Internal server error"
+      return createORPCClient(link, {
+        ...options,
+        path: [...path, key]
       });
     }
-    return json;
-  };
-  return client;
+  });
+  return recursive;
 }
 
-// src/router-fetch-client.ts
-function createRouterFetchClient(options) {
-  const path = options?.path ?? [];
-  const client = new Proxy(
-    createProcedureFetchClient({
-      ...options,
-      path
-    }),
-    {
-      get(target, key) {
-        if (typeof key !== "string") {
-          return Reflect.get(target, key);
-        }
-        return createRouterFetchClient({
-          ...options,
-          path: [...path, key]
-        });
-      }
-    }
-  );
-  return client;
-}
+// src/dynamic-link.ts
+var DynamicLink = class {
+  constructor(linkResolver) {
+    this.linkResolver = linkResolver;
+  }
+  async call(path, input, options) {
+    const resolvedLink = await this.linkResolver(path, input, options);
+    const output = await resolvedLink.call(path, input, options);
+    return output;
+  }
+};
 
 // src/index.ts
 export * from "@orpc/shared/error";
-var createORPCFetchClient = createRouterFetchClient;
 export {
-  createORPCFetchClient,
-  createProcedureFetchClient,
-  createRouterFetchClient
+  DynamicLink,
+  createORPCClient
 };
 //# sourceMappingURL=index.js.map

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

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

package/dist/src/adapters/fetch/orpc-link.d.ts

@@ -0,0 +1,19 @@
+import type { ProcedureClientOptions } from '@orpc/server';
+import type { Promisable } from '@orpc/shared';
+import type { ClientLink } from '../../types';
+import type { FetchWithContext } from './types';
+import { type PublicORPCPayloadCodec } from '@orpc/server/fetch';
+export interface ORPCLinkOptions<TClientContext> {
+    url: string;
+    headers?: (input: unknown, context: TClientContext) => Promisable<Headers | Record<string, string>>;
+    fetch?: FetchWithContext<TClientContext>;
+    payloadCodec?: PublicORPCPayloadCodec;
+}
+export declare class ORPCLink<TClientContext> implements ClientLink<TClientContext> {
+    private readonly options;
+    private readonly fetch;
+    private readonly payloadCodec;
+    constructor(options: ORPCLinkOptions<TClientContext>);
+    call(path: readonly string[], input: unknown, options: ProcedureClientOptions<TClientContext>): Promise<unknown>;
+}
+//# sourceMappingURL=orpc-link.d.ts.map

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

@@ -0,0 +1,4 @@
+export interface FetchWithContext<TClientContext> {
+    (input: RequestInfo | URL, init: RequestInit | undefined, context: TClientContext): Promise<Response>;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/src/client.d.ts

@@ -0,0 +1,11 @@
+import type { ContractRouter } from '@orpc/contract';
+import type { ANY_ROUTER, RouterClient } from '@orpc/server';
+import type { ClientLink } from './types';
+export interface createORPCClientOptions {
+    /**
+     * Use as base path for all procedure, useful when you only want to call a subset of the procedure.
+     */
+    path?: string[];
+}
+export declare function createORPCClient<TRouter extends ANY_ROUTER | ContractRouter, TClientContext = unknown>(link: ClientLink<TClientContext>, options?: createORPCClientOptions): RouterClient<TRouter, TClientContext>;
+//# sourceMappingURL=client.d.ts.map

package/dist/src/dynamic-link.d.ts

@@ -0,0 +1,15 @@
+import type { ProcedureClientOptions } from '@orpc/server';
+import type { Promisable } from '@orpc/shared';
+import type { ClientLink } from './types';
+/**
+ * DynamicLink provides a way to dynamically resolve and delegate calls to other ClientLinks
+ * based on the request path, input, and context.
+ */
+export declare class DynamicLink<TClientContext> implements ClientLink<TClientContext> {
+    private readonly linkResolver;
+    constructor(linkResolver: (path: readonly string[], input: unknown, options: ProcedureClientOptions<TClientContext> & {
+        context: TClientContext;
+    }) => Promisable<ClientLink<TClientContext>>);
+    call(path: readonly string[], input: unknown, options: ProcedureClientOptions<TClientContext>): Promise<unknown>;
+}
+//# sourceMappingURL=dynamic-link.d.ts.map

package/dist/src/index.d.ts

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

package/dist/src/types.d.ts

@@ -0,0 +1,5 @@
+import type { ProcedureClientOptions } from '@orpc/server';
+export interface ClientLink<TClientContext> {
+    call: (path: readonly string[], input: unknown, options: ProcedureClientOptions<TClientContext>) => Promise<unknown>;
+}
+//# sourceMappingURL=types.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -19,6 +19,11 @@
       "import": "./dist/index.js",
       "default": "./dist/index.js"
     },
+    "./fetch": {
+      "types": "./dist/src/adapters/fetch/index.d.ts",
+      "import": "./dist/fetch.js",
+      "default": "./dist/fetch.js"
+    },
     "./🔒/*": {
       "types": "./dist/src/*.d.ts"
     }
@@ -29,18 +34,18 @@
     "dist"
   ],
   "peerDependencies": {
-    "@orpc/contract": "0.19.0"
+    "@orpc/contract": "0.20.0"
   },
   "dependencies": {
-    "@orpc/server": "0.19.0",
-    "@orpc/shared": "0.19.0"
+    "@orpc/server": "0.20.0",
+    "@orpc/shared": "0.20.0"
   },
   "devDependencies": {
     "zod": "^3.24.1",
-    "@orpc/openapi": "0.19.0"
+    "@orpc/openapi": "0.20.0"
   },
   "scripts": {
-    "build": "tsup --clean --sourcemap --entry.index=src/index.ts --format=esm --onSuccess='tsc -b --noCheck'",
+    "build": "tsup --clean --sourcemap --entry.index=src/index.ts --entry.fetch=src/adapters/fetch/index.ts --format=esm --onSuccess='tsc -b --noCheck'",
     "build:watch": "pnpm run build --watch",
     "type:check": "tsc -b"
   }

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

@@ -1,24 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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