@orpc/openapi-client 0.0.0-next.9486ab5 → 0.0.0-next.96f9dd3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,9 +2,9 @@ import { ClientContext } from '@orpc/client';
2
2
  import { AnyContractRouter } from '@orpc/contract';
3
3
  import { LinkFetchClientOptions } from '@orpc/client/fetch';
4
4
  import { StandardLink } from '@orpc/client/standard';
5
- import { f as StandardOpenAPILinkOptions } from '../../shared/openapi-client.N18yafE2.mjs';
6
- import '@orpc/shared';
5
+ import { f as StandardOpenAPILinkOptions } from '../../shared/openapi-client.B5Lx5v-z.mjs';
7
6
  import '@orpc/standard-server';
7
+ import '@orpc/shared';
8
8
 
9
9
  interface OpenAPILinkOptions<T extends ClientContext> extends StandardOpenAPILinkOptions<T>, LinkFetchClientOptions<T> {
10
10
  }
@@ -2,9 +2,9 @@ import { ClientContext } from '@orpc/client';
2
2
  import { AnyContractRouter } from '@orpc/contract';
3
3
  import { LinkFetchClientOptions } from '@orpc/client/fetch';
4
4
  import { StandardLink } from '@orpc/client/standard';
5
- import { f as StandardOpenAPILinkOptions } from '../../shared/openapi-client.N18yafE2.js';
6
- import '@orpc/shared';
5
+ import { f as StandardOpenAPILinkOptions } from '../../shared/openapi-client.B5Lx5v-z.js';
7
6
  import '@orpc/standard-server';
7
+ import '@orpc/shared';
8
8
 
9
9
  interface OpenAPILinkOptions<T extends ClientContext> extends StandardOpenAPILinkOptions<T>, LinkFetchClientOptions<T> {
10
10
  }
@@ -1,6 +1,6 @@
1
1
  import { LinkFetchClient } from '@orpc/client/fetch';
2
2
  import { StandardLink } from '@orpc/client/standard';
3
- import { a as StandardOpenAPIJsonSerializer, b as StandardOpenapiLinkCodec, c as StandardOpenAPISerializer, S as StandardBracketNotationSerializer } from '../../shared/openapi-client.V75iq1Nn.mjs';
3
+ import { a as StandardOpenAPIJsonSerializer, b as StandardOpenapiLinkCodec, c as StandardOpenAPISerializer, S as StandardBracketNotationSerializer } from '../../shared/openapi-client.DafIYU7J.mjs';
4
4
  import '@orpc/shared';
5
5
  import '@orpc/client';
6
6
  import '@orpc/contract';
@@ -1,9 +1,9 @@
1
- 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';
1
+ 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.B5Lx5v-z.mjs';
2
2
  import { HTTPPath } from '@orpc/client';
3
3
  import '@orpc/client/standard';
4
4
  import '@orpc/contract';
5
- import '@orpc/shared';
6
5
  import '@orpc/standard-server';
6
+ import '@orpc/shared';
7
7
 
8
8
  /**
9
9
  * @internal
@@ -1,9 +1,9 @@
1
- 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';
1
+ 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.B5Lx5v-z.js';
2
2
  import { HTTPPath } from '@orpc/client';
3
3
  import '@orpc/client/standard';
4
4
  import '@orpc/contract';
5
- import '@orpc/shared';
6
5
  import '@orpc/standard-server';
6
+ import '@orpc/shared';
7
7
 
8
8
  /**
9
9
  * @internal
@@ -1,4 +1,4 @@
1
- export { S as StandardBracketNotationSerializer, a as StandardOpenAPIJsonSerializer, c as StandardOpenAPISerializer, b as StandardOpenapiLinkCodec, g as getDynamicParams, s as standardizeHTTPPath } from '../../shared/openapi-client.V75iq1Nn.mjs';
1
+ export { S as StandardBracketNotationSerializer, a as StandardOpenAPIJsonSerializer, c as StandardOpenAPISerializer, b as StandardOpenapiLinkCodec, g as getDynamicParams, s as standardizeHTTPPath } from '../../shared/openapi-client.DafIYU7J.mjs';
2
2
  import '@orpc/shared';
3
3
  import '@orpc/client';
4
4
  import '@orpc/client/standard';
@@ -1,6 +1,6 @@
1
1
  import { isObject, value, get, isAsyncIteratorObject } from '@orpc/shared';
2
- import { isORPCErrorStatus, mapEventIterator, toORPCError, ORPCError as ORPCError$1 } from '@orpc/client';
3
- import { toHttpPath } from '@orpc/client/standard';
2
+ import { isORPCErrorStatus, isORPCErrorJson, createORPCErrorFromJson, mapEventIterator, toORPCError } from '@orpc/client';
3
+ import { toHttpPath, getMalformedResponseErrorCode } from '@orpc/client/standard';
4
4
  import { isContractProcedure, fallbackContractConfig, ORPCError } from '@orpc/contract';
5
5
  import { mergeStandardHeaders, ErrorEvent } from '@orpc/standard-server';
6
6
 
@@ -202,7 +202,7 @@ class StandardOpenapiLinkCodec {
202
202
  throw new Error(`[StandardOpenapiLinkCodec] expect a contract procedure at ${path.join(".")}`);
203
203
  }
204
204
  const inputStructure = fallbackContractConfig("defaultInputStructure", procedure["~orpc"].route.inputStructure);
205
- return inputStructure === "compact" ? this.#encodeCompact(procedure, path, input, options, baseUrl.toString(), headers) : this.#encodeDetailed(procedure, path, input, options, baseUrl.toString(), headers);
205
+ return inputStructure === "compact" ? this.#encodeCompact(procedure, path, input, options, baseUrl, headers) : this.#encodeDetailed(procedure, path, input, options, baseUrl, headers);
206
206
  }
207
207
  #encodeCompact(procedure, path, input, options, baseUrl, headers) {
208
208
  let httpPath = standardizeHTTPPath(procedure["~orpc"].route.path ?? toHttpPath(path));
@@ -221,7 +221,8 @@ class StandardOpenapiLinkCodec {
221
221
  httpBody = Object.keys(body).length ? body : void 0;
222
222
  }
223
223
  const method = fallbackContractConfig("defaultMethod", procedure["~orpc"].route.method);
224
- const url = new URL(`${baseUrl.toString().replace(/\/$/, "")}${httpPath}`);
224
+ const url = new URL(baseUrl);
225
+ url.pathname = `${url.pathname.replace(/\/$/, "")}${httpPath}`;
225
226
  if (method === "GET") {
226
227
  const serialized = this.serializer.serialize(httpBody, { outputFormat: "URLSearchParams" });
227
228
  for (const [key, value2] of serialized) {
@@ -266,7 +267,8 @@ class StandardOpenapiLinkCodec {
266
267
  mergedHeaders = mergeStandardHeaders(input.headers, headers);
267
268
  }
268
269
  const method = fallbackContractConfig("defaultMethod", procedure["~orpc"].route.method);
269
- const url = new URL(`${baseUrl.toString().replace(/\/$/, "")}${httpPath}`);
270
+ const url = new URL(baseUrl);
271
+ url.pathname = `${url.pathname.replace(/\/$/, "")}${httpPath}`;
270
272
  if (input?.query !== void 0) {
271
273
  const query = this.serializer.serialize(input.query, { outputFormat: "URLSearchParams" });
272
274
  for (const [key, value2] of query) {
@@ -310,12 +312,12 @@ class StandardOpenapiLinkCodec {
310
312
  }
311
313
  })();
312
314
  if (!isOk) {
313
- if (ORPCError.isValidJSON(deserialized)) {
314
- throw ORPCError.fromJSON(deserialized);
315
+ if (isORPCErrorJson(deserialized)) {
316
+ throw createORPCErrorFromJson(deserialized);
315
317
  }
316
- throw new ORPCError("MALFORMED_ORPC_ERROR_RESPONSE", {
318
+ throw new ORPCError(getMalformedResponseErrorCode(response.status), {
317
319
  status: response.status,
318
- data: deserialized
320
+ data: { ...response, body: deserialized }
319
321
  });
320
322
  }
321
323
  const procedure = get(this.contract, path);
@@ -387,8 +389,8 @@ class StandardOpenAPISerializer {
387
389
  return mapEventIterator(data, {
388
390
  value: async (value) => value,
389
391
  error: async (e) => {
390
- if (e instanceof ErrorEvent && ORPCError$1.isValidJSON(e.data)) {
391
- return ORPCError$1.fromJSON(e.data, { cause: e });
392
+ if (e instanceof ErrorEvent && isORPCErrorJson(e.data)) {
393
+ return createORPCErrorFromJson(e.data, { cause: e });
392
394
  }
393
395
  return e;
394
396
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@orpc/openapi-client",
3
3
  "type": "module",
4
- "version": "0.0.0-next.9486ab5",
4
+ "version": "0.0.0-next.96f9dd3",
5
5
  "license": "MIT",
6
6
  "homepage": "https://orpc.unnoq.com",
7
7
  "repository": {
@@ -34,13 +34,13 @@
34
34
  "dist"
35
35
  ],
36
36
  "dependencies": {
37
- "@orpc/client": "0.0.0-next.9486ab5",
38
- "@orpc/contract": "0.0.0-next.9486ab5",
39
- "@orpc/shared": "0.0.0-next.9486ab5",
40
- "@orpc/standard-server": "0.0.0-next.9486ab5"
37
+ "@orpc/client": "0.0.0-next.96f9dd3",
38
+ "@orpc/shared": "0.0.0-next.96f9dd3",
39
+ "@orpc/standard-server": "0.0.0-next.96f9dd3",
40
+ "@orpc/contract": "0.0.0-next.96f9dd3"
41
41
  },
42
42
  "devDependencies": {
43
- "@orpc/server": "0.0.0-next.9486ab5"
43
+ "@orpc/server": "0.0.0-next.96f9dd3"
44
44
  },
45
45
  "scripts": {
46
46
  "build": "unbuild",
@@ -1,8 +1,8 @@
1
1
  import { ClientContext, ClientOptions } from '@orpc/client';
2
2
  import { StandardLinkCodec, StandardLinkOptions } from '@orpc/client/standard';
3
3
  import { AnyContractRouter } from '@orpc/contract';
4
- import { Segment, Value } from '@orpc/shared';
5
4
  import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
5
+ import { Segment, Value } from '@orpc/shared';
6
6
 
7
7
  type StandardBracketNotationSerialized = [string, unknown][];
8
8
  declare class StandardBracketNotationSerializer {
@@ -1,8 +1,8 @@
1
1
  import { ClientContext, ClientOptions } from '@orpc/client';
2
2
  import { StandardLinkCodec, StandardLinkOptions } from '@orpc/client/standard';
3
3
  import { AnyContractRouter } from '@orpc/contract';
4
- import { Segment, Value } from '@orpc/shared';
5
4
  import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
5
+ import { Segment, Value } from '@orpc/shared';
6
6
 
7
7
  type StandardBracketNotationSerialized = [string, unknown][];
8
8
  declare class StandardBracketNotationSerializer {