@orpc/openapi-client 0.52.0 → 0.53.0

package/dist/adapters/fetch/index.d.mts

@@ -1,14 +1,14 @@
 import { ClientContext } from '@orpc/client';
 import { AnyContractRouter } from '@orpc/contract';
 import { LinkFetchClientOptions } from '@orpc/client/fetch';
-import { StandardLink } from '@orpc/client/standard';
-import { f as StandardOpenAPILinkOptions } from '../../shared/openapi-client.N18yafE2.mjs';
-import '@orpc/shared';
+import { f as StandardOpenAPILinkOptions, g as StandardOpenAPILink } from '../../shared/openapi-client.DArKvaqp.mjs';
+import '@orpc/client/standard';
 import '@orpc/standard-server';
+import '@orpc/shared';
 
 interface OpenAPILinkOptions<T extends ClientContext> extends StandardOpenAPILinkOptions<T>, LinkFetchClientOptions<T> {
 }
-declare class OpenAPILink<T extends ClientContext> extends StandardLink<T> {
+declare class OpenAPILink<T extends ClientContext> extends StandardOpenAPILink<T> {
     constructor(contract: AnyContractRouter, options: OpenAPILinkOptions<T>);
 }
 

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

@@ -1,14 +1,14 @@
 import { ClientContext } from '@orpc/client';
 import { AnyContractRouter } from '@orpc/contract';
 import { LinkFetchClientOptions } from '@orpc/client/fetch';
-import { StandardLink } from '@orpc/client/standard';
-import { f as StandardOpenAPILinkOptions } from '../../shared/openapi-client.N18yafE2.js';
-import '@orpc/shared';
+import { f as StandardOpenAPILinkOptions, g as StandardOpenAPILink } from '../../shared/openapi-client.DArKvaqp.js';
+import '@orpc/client/standard';
 import '@orpc/standard-server';
+import '@orpc/shared';
 
 interface OpenAPILinkOptions<T extends ClientContext> extends StandardOpenAPILinkOptions<T>, LinkFetchClientOptions<T> {
 }
-declare class OpenAPILink<T extends ClientContext> extends StandardLink<T> {
+declare class OpenAPILink<T extends ClientContext> extends StandardOpenAPILink<T> {
     constructor(contract: AnyContractRouter, options: OpenAPILinkOptions<T>);
 }
 

package/dist/adapters/fetch/index.mjs

@@ -1,19 +1,15 @@
 import { LinkFetchClient } from '@orpc/client/fetch';
-import { StandardLink } from '@orpc/client/standard';
-import { a as StandardOpenAPIJsonSerializer, b as StandardOpenapiLinkCodec, c as StandardOpenAPISerializer, S as StandardBracketNotationSerializer } from '../../shared/openapi-client.C6BK9Q71.mjs';
 import '@orpc/shared';
+import { b as StandardOpenAPILink } from '../../shared/openapi-client.D89vdV2Y.mjs';
 import '@orpc/client';
+import '@orpc/client/standard';
 import '@orpc/contract';
 import '@orpc/standard-server';
 
-class OpenAPILink extends StandardLink {
+class OpenAPILink extends StandardOpenAPILink {
   constructor(contract, options) {
-    const jsonSerializer = new StandardOpenAPIJsonSerializer(options);
-    const bracketNotationSerializer = new StandardBracketNotationSerializer();
-    const serializer = new StandardOpenAPISerializer(jsonSerializer, bracketNotationSerializer);
-    const linkCodec = new StandardOpenapiLinkCodec(contract, serializer, options);
     const linkClient = new LinkFetchClient(options);
-    super(linkCodec, linkClient, options);
+    super(contract, linkClient, options);
   }
 }
 

package/dist/adapters/standard/index.d.mts

@@ -1,9 +1,9 @@
-export { S as StandardBracketNotationSerialized, a as StandardBracketNotationSerializer, c as StandardOpenAPICustomJsonSerializer, b as StandardOpenAPIJsonSerialized, e as StandardOpenAPIJsonSerializer, d as StandardOpenAPIJsonSerializerOptions, f as StandardOpenAPILinkOptions, i as StandardOpenAPISerializeOptions, j as StandardOpenAPISerializer, h as StandardOpenapiLinkCodec, g as StandardOpenapiLinkCodecOptions } from '../../shared/openapi-client.N18yafE2.mjs';
+export { S as StandardBracketNotationSerialized, a as StandardBracketNotationSerializer, c as StandardOpenAPICustomJsonSerializer, b as StandardOpenAPIJsonSerialized, e as StandardOpenAPIJsonSerializer, d as StandardOpenAPIJsonSerializerOptions, g as StandardOpenAPILink, f as StandardOpenAPILinkOptions, j as StandardOpenAPISerializeOptions, k as StandardOpenAPISerializer, i as StandardOpenapiLinkCodec, h as StandardOpenapiLinkCodecOptions } from '../../shared/openapi-client.DArKvaqp.mjs';
 import { HTTPPath } from '@orpc/client';
-import '@orpc/client/standard';
 import '@orpc/contract';
-import '@orpc/shared';
+import '@orpc/client/standard';
 import '@orpc/standard-server';
+import '@orpc/shared';
 
 /**
  * @internal

package/dist/adapters/standard/index.d.ts

@@ -1,9 +1,9 @@
-export { S as StandardBracketNotationSerialized, a as StandardBracketNotationSerializer, c as StandardOpenAPICustomJsonSerializer, b as StandardOpenAPIJsonSerialized, e as StandardOpenAPIJsonSerializer, d as StandardOpenAPIJsonSerializerOptions, f as StandardOpenAPILinkOptions, i as StandardOpenAPISerializeOptions, j as StandardOpenAPISerializer, h as StandardOpenapiLinkCodec, g as StandardOpenapiLinkCodecOptions } from '../../shared/openapi-client.N18yafE2.js';
+export { S as StandardBracketNotationSerialized, a as StandardBracketNotationSerializer, c as StandardOpenAPICustomJsonSerializer, b as StandardOpenAPIJsonSerialized, e as StandardOpenAPIJsonSerializer, d as StandardOpenAPIJsonSerializerOptions, g as StandardOpenAPILink, f as StandardOpenAPILinkOptions, j as StandardOpenAPISerializeOptions, k as StandardOpenAPISerializer, i as StandardOpenapiLinkCodec, h as StandardOpenapiLinkCodecOptions } from '../../shared/openapi-client.DArKvaqp.js';
 import { HTTPPath } from '@orpc/client';
-import '@orpc/client/standard';
 import '@orpc/contract';
-import '@orpc/shared';
+import '@orpc/client/standard';
 import '@orpc/standard-server';
+import '@orpc/shared';
 
 /**
  * @internal

package/dist/adapters/standard/index.mjs

@@ -1,6 +1,6 @@
-export { S as StandardBracketNotationSerializer, a as StandardOpenAPIJsonSerializer, c as StandardOpenAPISerializer, b as StandardOpenapiLinkCodec, g as getDynamicParams, s as standardizeHTTPPath } from '../../shared/openapi-client.C6BK9Q71.mjs';
+export { S as StandardBracketNotationSerializer, a as StandardOpenAPIJsonSerializer, b as StandardOpenAPILink, d as StandardOpenAPISerializer, c as StandardOpenapiLinkCodec, g as getDynamicParams, s as standardizeHTTPPath } from '../../shared/openapi-client.D89vdV2Y.mjs';
+import '@orpc/client/standard';
 import '@orpc/shared';
 import '@orpc/client';
-import '@orpc/client/standard';
 import '@orpc/contract';
 import '@orpc/standard-server';

package/dist/shared/{openapi-client.C6BK9Q71.mjs → openapi-client.D89vdV2Y.mjs}

@@ -1,6 +1,6 @@
+import { toHttpPath, getMalformedResponseErrorCode, StandardLink } from '@orpc/client/standard';
 import { isObject, value, get, isAsyncIteratorObject } from '@orpc/shared';
-import { isORPCErrorStatus, mapEventIterator, toORPCError, ORPCError as ORPCError$1 } from '@orpc/client';
-import { toHttpPath, getMalformedResponseErrorCode } from '@orpc/client/standard';
+import { isORPCErrorStatus, isORPCErrorJson, createORPCErrorFromJson, mapEventIterator, toORPCError } from '@orpc/client';
 import { isContractProcedure, fallbackContractConfig, ORPCError } from '@orpc/contract';
 import { mergeStandardHeaders, ErrorEvent } from '@orpc/standard-server';
 
@@ -202,7 +202,7 @@ class StandardOpenapiLinkCodec {
       throw new Error(`[StandardOpenapiLinkCodec] expect a contract procedure at ${path.join(".")}`);
     }
     const inputStructure = fallbackContractConfig("defaultInputStructure", procedure["~orpc"].route.inputStructure);
-    return inputStructure === "compact" ? this.#encodeCompact(procedure, path, input, options, baseUrl.toString(), headers) : this.#encodeDetailed(procedure, path, input, options, baseUrl.toString(), headers);
+    return inputStructure === "compact" ? this.#encodeCompact(procedure, path, input, options, baseUrl, headers) : this.#encodeDetailed(procedure, path, input, options, baseUrl, headers);
   }
   #encodeCompact(procedure, path, input, options, baseUrl, headers) {
     let httpPath = standardizeHTTPPath(procedure["~orpc"].route.path ?? toHttpPath(path));
@@ -221,7 +221,8 @@ class StandardOpenapiLinkCodec {
       httpBody = Object.keys(body).length ? body : void 0;
     }
     const method = fallbackContractConfig("defaultMethod", procedure["~orpc"].route.method);
-    const url = new URL(`${baseUrl.toString().replace(/\/$/, "")}${httpPath}`);
+    const url = new URL(baseUrl);
+    url.pathname = `${url.pathname.replace(/\/$/, "")}${httpPath}`;
     if (method === "GET") {
       const serialized = this.serializer.serialize(httpBody, { outputFormat: "URLSearchParams" });
       for (const [key, value2] of serialized) {
@@ -266,7 +267,8 @@ class StandardOpenapiLinkCodec {
       mergedHeaders = mergeStandardHeaders(input.headers, headers);
     }
     const method = fallbackContractConfig("defaultMethod", procedure["~orpc"].route.method);
-    const url = new URL(`${baseUrl.toString().replace(/\/$/, "")}${httpPath}`);
+    const url = new URL(baseUrl);
+    url.pathname = `${url.pathname.replace(/\/$/, "")}${httpPath}`;
     if (input?.query !== void 0) {
       const query = this.serializer.serialize(input.query, { outputFormat: "URLSearchParams" });
       for (const [key, value2] of query) {
@@ -310,12 +312,12 @@ class StandardOpenapiLinkCodec {
       }
     })();
     if (!isOk) {
-      if (ORPCError.isValidJSON(deserialized)) {
-        throw ORPCError.fromJSON(deserialized);
+      if (isORPCErrorJson(deserialized)) {
+        throw createORPCErrorFromJson(deserialized);
       }
       throw new ORPCError(getMalformedResponseErrorCode(response.status), {
         status: response.status,
-        data: deserialized
+        data: { ...response, body: deserialized }
       });
     }
     const procedure = get(this.contract, path);
@@ -387,8 +389,8 @@ class StandardOpenAPISerializer {
       return mapEventIterator(data, {
         value: async (value) => value,
         error: async (e) => {
-          if (e instanceof ErrorEvent && ORPCError$1.isValidJSON(e.data)) {
-            return ORPCError$1.fromJSON(e.data, { cause: e });
+          if (e instanceof ErrorEvent && isORPCErrorJson(e.data)) {
+            return createORPCErrorFromJson(e.data, { cause: e });
           }
           return e;
         }
@@ -398,4 +400,14 @@ class StandardOpenAPISerializer {
   }
 }
 
-export { StandardBracketNotationSerializer as S, StandardOpenAPIJsonSerializer as a, StandardOpenapiLinkCodec as b, StandardOpenAPISerializer as c, getDynamicParams as g, standardizeHTTPPath as s };
+class StandardOpenAPILink extends StandardLink {
+  constructor(contract, linkClient, options) {
+    const jsonSerializer = new StandardOpenAPIJsonSerializer(options);
+    const bracketNotationSerializer = new StandardBracketNotationSerializer();
+    const serializer = new StandardOpenAPISerializer(jsonSerializer, bracketNotationSerializer);
+    const linkCodec = new StandardOpenapiLinkCodec(contract, serializer, options);
+    super(linkCodec, linkClient, options);
+  }
+}
+
+export { StandardBracketNotationSerializer as S, StandardOpenAPIJsonSerializer as a, StandardOpenAPILink as b, StandardOpenapiLinkCodec as c, StandardOpenAPISerializer as d, getDynamicParams as g, standardizeHTTPPath as s };

package/dist/shared/{openapi-client.N18yafE2.d.mts → openapi-client.DArKvaqp.d.mts}

@@ -1,8 +1,8 @@
 import { ClientContext, ClientOptions } from '@orpc/client';
-import { StandardLinkCodec, StandardLinkOptions } from '@orpc/client/standard';
 import { AnyContractRouter } from '@orpc/contract';
-import { Segment, Value } from '@orpc/shared';
+import { StandardLinkCodec, StandardLinkOptions, StandardLink, StandardLinkClient } from '@orpc/client/standard';
 import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
+import { Segment, Value } from '@orpc/shared';
 
 type StandardBracketNotationSerialized = [string, unknown][];
 declare class StandardBracketNotationSerializer {
@@ -71,5 +71,8 @@ declare class StandardOpenapiLinkCodec<T extends ClientContext> implements Stand
 
 interface StandardOpenAPILinkOptions<T extends ClientContext> extends StandardLinkOptions<T>, StandardOpenapiLinkCodecOptions<T>, StandardOpenAPIJsonSerializerOptions {
 }
+declare class StandardOpenAPILink<T extends ClientContext> extends StandardLink<T> {
+    constructor(contract: AnyContractRouter, linkClient: StandardLinkClient<T>, options: StandardOpenAPILinkOptions<T>);
+}
 
-export { type StandardBracketNotationSerialized as S, StandardBracketNotationSerializer as a, type StandardOpenAPIJsonSerialized as b, type StandardOpenAPICustomJsonSerializer as c, type StandardOpenAPIJsonSerializerOptions as d, StandardOpenAPIJsonSerializer as e, type StandardOpenAPILinkOptions as f, type StandardOpenapiLinkCodecOptions as g, StandardOpenapiLinkCodec as h, type StandardOpenAPISerializeOptions as i, StandardOpenAPISerializer as j };
+export { type StandardBracketNotationSerialized as S, StandardBracketNotationSerializer as a, type StandardOpenAPIJsonSerialized as b, type StandardOpenAPICustomJsonSerializer as c, type StandardOpenAPIJsonSerializerOptions as d, StandardOpenAPIJsonSerializer as e, type StandardOpenAPILinkOptions as f, StandardOpenAPILink as g, type StandardOpenapiLinkCodecOptions as h, StandardOpenapiLinkCodec as i, type StandardOpenAPISerializeOptions as j, StandardOpenAPISerializer as k };

package/dist/shared/{openapi-client.N18yafE2.d.ts → openapi-client.DArKvaqp.d.ts}

@@ -1,8 +1,8 @@
 import { ClientContext, ClientOptions } from '@orpc/client';
-import { StandardLinkCodec, StandardLinkOptions } from '@orpc/client/standard';
 import { AnyContractRouter } from '@orpc/contract';
-import { Segment, Value } from '@orpc/shared';
+import { StandardLinkCodec, StandardLinkOptions, StandardLink, StandardLinkClient } from '@orpc/client/standard';
 import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
+import { Segment, Value } from '@orpc/shared';
 
 type StandardBracketNotationSerialized = [string, unknown][];
 declare class StandardBracketNotationSerializer {
@@ -71,5 +71,8 @@ declare class StandardOpenapiLinkCodec<T extends ClientContext> implements Stand
 
 interface StandardOpenAPILinkOptions<T extends ClientContext> extends StandardLinkOptions<T>, StandardOpenapiLinkCodecOptions<T>, StandardOpenAPIJsonSerializerOptions {
 }
+declare class StandardOpenAPILink<T extends ClientContext> extends StandardLink<T> {
+    constructor(contract: AnyContractRouter, linkClient: StandardLinkClient<T>, options: StandardOpenAPILinkOptions<T>);
+}
 
-export { type StandardBracketNotationSerialized as S, StandardBracketNotationSerializer as a, type StandardOpenAPIJsonSerialized as b, type StandardOpenAPICustomJsonSerializer as c, type StandardOpenAPIJsonSerializerOptions as d, StandardOpenAPIJsonSerializer as e, type StandardOpenAPILinkOptions as f, type StandardOpenapiLinkCodecOptions as g, StandardOpenapiLinkCodec as h, type StandardOpenAPISerializeOptions as i, StandardOpenAPISerializer as j };
+export { type StandardBracketNotationSerialized as S, StandardBracketNotationSerializer as a, type StandardOpenAPIJsonSerialized as b, type StandardOpenAPICustomJsonSerializer as c, type StandardOpenAPIJsonSerializerOptions as d, StandardOpenAPIJsonSerializer as e, type StandardOpenAPILinkOptions as f, StandardOpenAPILink as g, type StandardOpenapiLinkCodecOptions as h, StandardOpenapiLinkCodec as i, type StandardOpenAPISerializeOptions as j, StandardOpenAPISerializer as k };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi-client",
   "type": "module",
-  "version": "0.52.0",
+  "version": "0.53.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,13 +34,13 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/client": "0.52.0",
-    "@orpc/shared": "0.52.0",
-    "@orpc/contract": "0.52.0",
-    "@orpc/standard-server": "0.52.0"
+    "@orpc/client": "0.53.0",
+    "@orpc/contract": "0.53.0",
+    "@orpc/shared": "0.53.0",
+    "@orpc/standard-server": "0.53.0"
   },
   "devDependencies": {
-    "@orpc/server": "0.52.0"
+    "@orpc/server": "0.53.0"
   },
   "scripts": {
     "build": "unbuild",