@orpc/client 0.0.0-next.b6be6f0 → 0.0.0-next.c099c92

package/dist/fetch.js

@@ -1,8 +1,8 @@
 // src/adapters/fetch/orpc-link.ts
+import { ORPCError } from "@orpc/contract";
 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 {
+var RPCLink = class {
   fetch;
   payloadCodec;
   maxURLLength;
@@ -34,13 +34,14 @@ var ORPCLink = class {
     }, clientContext);
     const decoded = await this.payloadCodec.decode(response);
     if (!response.ok) {
-      const error = ORPCError.fromJSON(decoded) ?? new ORPCError({
+      if (ORPCError.isValidJSON(decoded)) {
+        throw ORPCError.fromJSON(decoded);
+      }
+      throw new ORPCError("INTERNAL_SERVER_ERROR", {
         status: response.status,
-        code: "INTERNAL_SERVER_ERROR",
         message: "Internal server error",
         cause: decoded
       });
-      throw error;
     }
     return decoded;
   }
@@ -75,13 +76,12 @@ var ORPCLink = class {
         body: encoded.body
       };
     }
-    throw new ORPCError({
-      code: "BAD_REQUEST",
+    throw new ORPCError("BAD_REQUEST", {
       message: "Cannot encode the request, please check the url length or payload."
     });
   }
 };
 export {
-  ORPCLink
+  RPCLink
 };
 //# sourceMappingURL=fetch.js.map

package/dist/index.js

@@ -31,9 +31,12 @@ var DynamicLink = class {
 };
 
 // src/index.ts
-export * from "@orpc/shared/error";
+import { isDefinedError, ORPCError, safe } from "@orpc/contract";
 export {
   DynamicLink,
-  createORPCClient
+  ORPCError,
+  createORPCClient,
+  isDefinedError,
+  safe
 };
 //# sourceMappingURL=index.js.map

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

@@ -1,10 +1,9 @@
-import type { HTTPMethod } from '@orpc/contract';
-import type { ProcedureClientOptions } from '@orpc/server';
+import type { ClientOptions, HTTPMethod } from '@orpc/contract';
 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> {
+export interface RPCLinkOptions<TClientContext> {
     /**
      * Base url for all requests.
      */
@@ -20,7 +19,7 @@ export interface ORPCLinkOptions<TClientContext> {
      *
      * @default 'POST'
      */
-    method?: (path: readonly string[], input: unknown, context: TClientContext) => Promisable<HTTPMethod | undefined>;
+    method?(path: readonly string[], input: unknown, context: TClientContext): Promisable<HTTPMethod | undefined>;
     /**
      * The method to use when the payload cannot safely pass to the server with method return from method function.
      * Do not use GET as fallback method, it's very dangerous.
@@ -28,11 +27,11 @@ export interface ORPCLinkOptions<TClientContext> {
      * @default 'POST'
      */
     fallbackMethod?: HTTPMethod;
-    headers?: (path: readonly string[], input: unknown, context: TClientContext) => Promisable<Headers | Record<string, string>>;
+    headers?(path: readonly string[], input: unknown, context: TClientContext): Promisable<Headers | Record<string, string>>;
     fetch?: FetchWithContext<TClientContext>;
     payloadCodec?: PublicORPCPayloadCodec;
 }
-export declare class ORPCLink<TClientContext> implements ClientLink<TClientContext> {
+export declare class RPCLink<TClientContext> implements ClientLink<TClientContext> {
     private readonly fetch;
     private readonly payloadCodec;
     private readonly maxURLLength;
@@ -40,8 +39,8 @@ export declare class ORPCLink<TClientContext> implements ClientLink<TClientConte
     private readonly getMethod;
     private readonly getHeaders;
     private readonly url;
-    constructor(options: ORPCLinkOptions<TClientContext>);
-    call(path: readonly string[], input: unknown, options: ProcedureClientOptions<TClientContext>): Promise<unknown>;
+    constructor(options: RPCLinkOptions<TClientContext>);
+    call(path: readonly string[], input: unknown, options: ClientOptions<TClientContext>): Promise<unknown>;
     private encode;
 }
 //# sourceMappingURL=orpc-link.d.ts.map

package/dist/src/client.d.ts

@@ -1,5 +1,5 @@
-import type { ContractRouter } from '@orpc/contract';
-import type { ANY_ROUTER, RouterClient } from '@orpc/server';
+import type { ContractRouter, ContractRouterClient } from '@orpc/contract';
+import type { AnyRouter, RouterClient } from '@orpc/server';
 import type { ClientLink } from './types';
 export interface createORPCClientOptions {
     /**
@@ -7,5 +7,5 @@ export interface createORPCClientOptions {
      */
     path?: string[];
 }
-export declare function createORPCClient<TRouter extends ANY_ROUTER | ContractRouter, TClientContext = unknown>(link: ClientLink<TClientContext>, options?: createORPCClientOptions): RouterClient<TRouter, TClientContext>;
+export declare function createORPCClient<TRouter extends AnyRouter | ContractRouter<any>, TClientContext = unknown>(link: ClientLink<TClientContext>, options?: createORPCClientOptions): TRouter extends ContractRouter<any> ? ContractRouterClient<TRouter, TClientContext> : TRouter extends AnyRouter ? RouterClient<TRouter, TClientContext> : never;
 //# sourceMappingURL=client.d.ts.map

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

@@ -1,4 +1,4 @@
-import type { ProcedureClientOptions } from '@orpc/server';
+import type { ClientOptions } from '@orpc/contract';
 import type { Promisable } from '@orpc/shared';
 import type { ClientLink } from './types';
 /**
@@ -8,6 +8,6 @@ import type { ClientLink } from './types';
 export declare class DynamicLink<TClientContext> implements ClientLink<TClientContext> {
     private readonly linkResolver;
     constructor(linkResolver: (path: readonly string[], input: unknown, context: TClientContext) => Promisable<ClientLink<TClientContext>>);
-    call(path: readonly string[], input: unknown, options: ProcedureClientOptions<TClientContext>): Promise<unknown>;
+    call(path: readonly string[], input: unknown, options: ClientOptions<TClientContext>): Promise<unknown>;
 }
 //# sourceMappingURL=dynamic-link.d.ts.map

package/dist/src/index.d.ts

@@ -2,5 +2,5 @@
 export * from './client';
 export * from './dynamic-link';
 export * from './types';
-export * from '@orpc/shared/error';
+export { isDefinedError, ORPCError, safe } from '@orpc/contract';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/types.d.ts

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

package/package.json

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