@orpc/openapi-client 1.15.6 → 1.16.0

package/dist/adapters/fetch/index.mjs

@@ -1,5 +1,5 @@
 import { LinkFetchClient } from '@orpc/client/fetch';
-import { a as StandardOpenAPILink } from '../../shared/openapi-client.B2Q9qU5m.mjs';
+import { a as StandardOpenAPILink } from '../../shared/openapi-client.DgkI_tTF.mjs';
 import '@orpc/client/standard';
 import '../../shared/openapi-client.t9fCAe3x.mjs';
 import '@orpc/shared';

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

@@ -6,6 +6,13 @@ import '@orpc/contract';
 import '@orpc/shared';
 import '@orpc/standard-server';
 
+/**
+ * OpenAPIHandler v2 omits `status` from error JSON, so fill it in
+ * (from `status`, or from the error code when omitted) to let v2 errors pass `isORPCErrorJson`.
+ *
+ * @internal
+ */
+declare function fillORPCErrorJsonStatus(json: unknown, status?: number): unknown;
 /**
  * @internal
  */
@@ -18,4 +25,4 @@ declare function getDynamicParams(path: HTTPPath | undefined): {
     name: string;
 }[] | undefined;
 
-export { getDynamicParams, standardizeHTTPPath };
+export { fillORPCErrorJsonStatus, getDynamicParams, standardizeHTTPPath };

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

@@ -6,6 +6,13 @@ import '@orpc/contract';
 import '@orpc/shared';
 import '@orpc/standard-server';
 
+/**
+ * OpenAPIHandler v2 omits `status` from error JSON, so fill it in
+ * (from `status`, or from the error code when omitted) to let v2 errors pass `isORPCErrorJson`.
+ *
+ * @internal
+ */
+declare function fillORPCErrorJsonStatus(json: unknown, status?: number): unknown;
 /**
  * @internal
  */
@@ -18,4 +25,4 @@ declare function getDynamicParams(path: HTTPPath | undefined): {
     name: string;
 }[] | undefined;
 
-export { getDynamicParams, standardizeHTTPPath };
+export { fillORPCErrorJsonStatus, getDynamicParams, standardizeHTTPPath };

package/dist/adapters/standard/index.mjs

@@ -1,6 +1,6 @@
 export { S as StandardBracketNotationSerializer } from '../../shared/openapi-client.t9fCAe3x.mjs';
 export { g as getIssueMessage, p as parseFormData } from '../../shared/openapi-client.Dgl8z2tb.mjs';
-export { S as StandardOpenAPIJsonSerializer, a as StandardOpenAPILink, c as StandardOpenAPISerializer, b as StandardOpenapiLinkCodec, g as getDynamicParams, s as standardizeHTTPPath } from '../../shared/openapi-client.B2Q9qU5m.mjs';
+export { S as StandardOpenAPIJsonSerializer, a as StandardOpenAPILink, c as StandardOpenAPISerializer, b as StandardOpenapiLinkCodec, f as fillORPCErrorJsonStatus, g as getDynamicParams, s as standardizeHTTPPath } from '../../shared/openapi-client.DgkI_tTF.mjs';
 import '@orpc/shared';
 import '@orpc/contract';
 import '@orpc/client/standard';

package/dist/shared/{openapi-client.B2Q9qU5m.mjs → openapi-client.DgkI_tTF.mjs}

@@ -1,7 +1,7 @@
 import { toStandardHeaders, toHttpPath, getMalformedResponseErrorCode, StandardLink } from '@orpc/client/standard';
 import { S as StandardBracketNotationSerializer } from './openapi-client.t9fCAe3x.mjs';
 import { isObject, value, get, isAsyncIteratorObject } from '@orpc/shared';
-import { isORPCErrorStatus, isORPCErrorJson, createORPCErrorFromJson, mapEventIterator, toORPCError } from '@orpc/client';
+import { fallbackORPCErrorStatus, isORPCErrorStatus, isORPCErrorJson, createORPCErrorFromJson, mapEventIterator, toORPCError } from '@orpc/client';
 import { isContractProcedure, fallbackContractConfig, ORPCError } from '@orpc/contract';
 import { mergeStandardHeaders, ErrorEvent } from '@orpc/standard-server';
 
@@ -54,6 +54,12 @@ class StandardOpenAPIJsonSerializer {
   }
 }
 
+function fillORPCErrorJsonStatus(json, status) {
+  if (!isObject(json) || json.status !== void 0 || typeof json.code !== "string") {
+    return json;
+  }
+  return { ...json, status: fallbackORPCErrorStatus(json.code, status) };
+}
 function standardizeHTTPPath(path) {
   return `/${path.replace(/\/{2,}/g, "/").replace(/^\/|\/$/g, "")}`;
 }
@@ -200,8 +206,9 @@ class StandardOpenapiLinkCodec {
       if (error !== null && error !== void 0) {
         throw error;
       }
-      if (isORPCErrorJson(deserialized)) {
-        throw createORPCErrorFromJson(deserialized);
+      const errorJson = fillORPCErrorJsonStatus(deserialized, response.status);
+      if (isORPCErrorJson(errorJson)) {
+        throw createORPCErrorFromJson(errorJson);
       }
       throw new ORPCError(getMalformedResponseErrorCode(response.status), {
         status: response.status,
@@ -278,8 +285,11 @@ class StandardOpenAPISerializer {
       return mapEventIterator(data, {
         value: async (value) => value,
         error: async (e) => {
-          if (e instanceof ErrorEvent && isORPCErrorJson(e.data)) {
-            return createORPCErrorFromJson(e.data, { cause: e });
+          if (e instanceof ErrorEvent) {
+            const errorJson = fillORPCErrorJsonStatus(e.data);
+            if (isORPCErrorJson(errorJson)) {
+              return createORPCErrorFromJson(errorJson, { cause: e });
+            }
           }
           return e;
         }
@@ -299,4 +309,4 @@ class StandardOpenAPILink extends StandardLink {
   }
 }
 
-export { StandardOpenAPIJsonSerializer as S, StandardOpenAPILink as a, StandardOpenapiLinkCodec as b, StandardOpenAPISerializer as c, getDynamicParams as g, standardizeHTTPPath as s };
+export { StandardOpenAPIJsonSerializer as S, StandardOpenAPILink as a, StandardOpenapiLinkCodec as b, StandardOpenAPISerializer as c, fillORPCErrorJsonStatus as f, getDynamicParams as g, standardizeHTTPPath as s };

package/package.json

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