@trpc/client 10.4.3 → 10.5.0

package/dist/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
-var transformResult = require('./transformResult-f5705001.js');
+var transformResult = require('./transformResult-e7a1e69e.js');
 var links_splitLink = require('./splitLink-f29e84be.js');
 var links_httpBatchLink = require('./links/httpBatchLink.js');
 var shared = require('@trpc/server/shared');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { share, observableToPromise } from '@trpc/server/observable';
-import { T as TRPCClientError } from './transformResult-4e0db787.mjs';
-export { T as TRPCClientError } from './transformResult-4e0db787.mjs';
+import { T as TRPCClientError } from './transformResult-6fb67924.mjs';
+export { T as TRPCClientError } from './transformResult-6fb67924.mjs';
 import { c as createChain } from './splitLink-4c75f7be.mjs';
 export { s as splitLink } from './splitLink-4c75f7be.mjs';
 import { httpBatchLink } from './links/httpBatchLink.mjs';

package/dist/links/httpBatchLink.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
-var transformResult = require('../transformResult-f5705001.js');
+var transformResult = require('../transformResult-e7a1e69e.js');
 var httpUtils = require('../httpUtils-277fd63a.js');
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**

package/dist/links/httpBatchLink.mjs

@@ -1,5 +1,5 @@
 import { observable } from '@trpc/server/observable';
-import { t as transformResult, T as TRPCClientError } from '../transformResult-4e0db787.mjs';
+import { t as transformResult, T as TRPCClientError } from '../transformResult-6fb67924.mjs';
 import { r as resolveHTTPLinkOptions, a as getUrl, h as httpRequest } from '../httpUtils-939364d7.mjs';
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**

package/dist/links/httpLink.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
-var transformResult = require('../transformResult-f5705001.js');
+var transformResult = require('../transformResult-e7a1e69e.js');
 var httpUtils = require('../httpUtils-277fd63a.js');
 
 function httpLink(opts) {

package/dist/links/httpLink.mjs

@@ -1,5 +1,5 @@
 import { observable } from '@trpc/server/observable';
-import { t as transformResult, T as TRPCClientError } from '../transformResult-4e0db787.mjs';
+import { t as transformResult, T as TRPCClientError } from '../transformResult-6fb67924.mjs';
 import { r as resolveHTTPLinkOptions, h as httpRequest } from '../httpUtils-939364d7.mjs';
 
 function httpLink(opts) {

package/dist/links/internals/transformResult.d.ts

@@ -2,7 +2,7 @@ import { AnyRouter, inferRouterError } from '@trpc/server';
 import { TRPCResponse, TRPCResponseMessage } from '@trpc/server/rpc';
 import { TRPCClientRuntime } from '..';
 /** @internal */
-export declare function transformResult<TRouter extends AnyRouter, TOutput>(response: TRPCResponseMessage<TOutput, inferRouterError<TRouter>> | TRPCResponse<TOutput, inferRouterError<TRouter>>, runtime: TRPCClientRuntime): {
+declare function transformResultInner<TRouter extends AnyRouter, TOutput>(response: TRPCResponseMessage<TOutput, inferRouterError<TRouter>> | TRPCResponse<TOutput, inferRouterError<TRouter>>, runtime: TRPCClientRuntime): {
     readonly ok: false;
     readonly error: {
         readonly error: inferRouterError<TRouter>;
@@ -25,4 +25,10 @@ export declare function transformResult<TRouter extends AnyRouter, TOutput>(resp
     });
     readonly error?: undefined;
 };
+/**
+ * Transforms and validates that the result is a valid TRPCResponse
+ * @internal
+ */
+export declare function transformResult<TRouter extends AnyRouter, TOutput>(response: TRPCResponseMessage<TOutput, inferRouterError<TRouter>> | TRPCResponse<TOutput, inferRouterError<TRouter>>, runtime: TRPCClientRuntime): ReturnType<typeof transformResultInner>;
+export {};
 //# sourceMappingURL=transformResult.d.ts.map

package/dist/links/internals/transformResult.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformResult.d.ts","sourceRoot":"","sources":["../../../src/links/internals/transformResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EACL,YAAY,EACZ,mBAAmB,EAEpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AAKvC,gBAAgB;AAChB,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAChE,QAAQ,EACJ,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GACvD,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EACpD,OAAO,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;;;;;EA0B3B"}
+{"version":3,"file":"transformResult.d.ts","sourceRoot":"","sources":["../../../src/links/internals/transformResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EACL,YAAY,EACZ,mBAAmB,EAEpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AAMvC,gBAAgB;AAChB,iBAAS,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAC9D,QAAQ,EACJ,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GACvD,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EACpD,OAAO,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;;;;;EAuB3B;AAOD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAChE,QAAQ,EACJ,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GACvD,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EACpD,OAAO,EAAE,iBAAiB,GACzB,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAqBzC"}

package/dist/links/wsLink.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
-var transformResult = require('../transformResult-f5705001.js');
+var transformResult = require('../transformResult-e7a1e69e.js');
 
 /* istanbul ignore next */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
 

package/dist/links/wsLink.mjs

@@ -1,5 +1,5 @@
 import { observable } from '@trpc/server/observable';
-import { T as TRPCClientError, t as transformResult } from '../transformResult-4e0db787.mjs';
+import { T as TRPCClientError, t as transformResult } from '../transformResult-6fb67924.mjs';
 
 /* istanbul ignore next */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
 

package/dist/{transformResult-4e0db787.mjs → transformResult-6fb67924.mjs}

@@ -35,7 +35,7 @@ class TRPCClientError extends Error {
 // FIXME:
 // - the generics here are probably unnecessary
 // - the RPC-spec could probably be simplified to combine HTTP + WS
-/** @internal */ function transformResult(response, runtime) {
+/** @internal */ function transformResultInner(response, runtime) {
     if ('error' in response) {
         const error = runtime.transformer.deserialize(response.error);
         return {
@@ -46,9 +46,6 @@ class TRPCClientError extends Error {
             }
         };
     }
-    if (!('result' in response)) {
-        throw new Error('Badly formatted response from server');
-    }
     const result = {
         ...response.result,
         ...(!response.result.type || response.result.type === 'data') && {
@@ -61,5 +58,29 @@ class TRPCClientError extends Error {
         result
     };
 }
+function isObject(value) {
+    // check that value is object
+    return !!value && !Array.isArray(value) && typeof value === 'object';
+}
+/**
+ * Transforms and validates that the result is a valid TRPCResponse
+ * @internal
+ */ function transformResult(response, runtime) {
+    let result;
+    try {
+        // Use the data transformers on the JSON-response
+        result = transformResultInner(response, runtime);
+    } catch (err) {
+        throw new TRPCClientError('Unable to transform response from server');
+    }
+    // check that output of the transformers is a valid TRPCResponse
+    if (!result.ok && (!isObject(result.error.error) || typeof result.error.error.code !== 'number')) {
+        throw new TRPCClientError('Badly formatted response from server');
+    }
+    if (result.ok && !isObject(result.result)) {
+        throw new TRPCClientError('Badly formatted response from server');
+    }
+    return result;
+}
 
 export { TRPCClientError as T, transformResult as t };

package/dist/{transformResult-f5705001.js → transformResult-e7a1e69e.js}

@@ -37,7 +37,7 @@ class TRPCClientError extends Error {
 // FIXME:
 // - the generics here are probably unnecessary
 // - the RPC-spec could probably be simplified to combine HTTP + WS
-/** @internal */ function transformResult(response, runtime) {
+/** @internal */ function transformResultInner(response, runtime) {
     if ('error' in response) {
         const error = runtime.transformer.deserialize(response.error);
         return {
@@ -48,9 +48,6 @@ class TRPCClientError extends Error {
             }
         };
     }
-    if (!('result' in response)) {
-        throw new Error('Badly formatted response from server');
-    }
     const result = {
         ...response.result,
         ...(!response.result.type || response.result.type === 'data') && {
@@ -63,6 +60,30 @@ class TRPCClientError extends Error {
         result
     };
 }
+function isObject(value) {
+    // check that value is object
+    return !!value && !Array.isArray(value) && typeof value === 'object';
+}
+/**
+ * Transforms and validates that the result is a valid TRPCResponse
+ * @internal
+ */ function transformResult(response, runtime) {
+    let result;
+    try {
+        // Use the data transformers on the JSON-response
+        result = transformResultInner(response, runtime);
+    } catch (err) {
+        throw new TRPCClientError('Unable to transform response from server');
+    }
+    // check that output of the transformers is a valid TRPCResponse
+    if (!result.ok && (!isObject(result.error.error) || typeof result.error.error.code !== 'number')) {
+        throw new TRPCClientError('Badly formatted response from server');
+    }
+    if (result.ok && !isObject(result.result)) {
+        throw new TRPCClientError('Badly formatted response from server');
+    }
+    return result;
+}
 
 exports.TRPCClientError = TRPCClientError;
 exports.transformResult = transformResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.4.3",
+  "version": "10.5.0",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -66,11 +66,11 @@
     "links"
   ],
   "peerDependencies": {
-    "@trpc/server": "10.4.3"
+    "@trpc/server": "10.5.0"
   },
   "devDependencies": {
     "@testing-library/dom": "^8.18.1",
-    "@trpc/server": "10.4.3",
+    "@trpc/server": "10.5.0",
     "@types/node": "^18.7.20",
     "rollup": "^2.79.1",
     "tsx": "^3.9.0"
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c5b49adb1d4e875633bb88ce282a3573fa00b404"
+  "gitHead": "c7f2d301cb1ab5713bf8b4e7dcaa05d66311cc9f"
 }

package/src/links/internals/transformResult.ts

@@ -5,12 +5,13 @@ import {
   TRPCResultMessage,
 } from '@trpc/server/rpc';
 import { TRPCClientRuntime } from '..';
+import { TRPCClientError } from '../../TRPCClientError';
 
 // FIXME:
 // - the generics here are probably unnecessary
 // - the RPC-spec could probably be simplified to combine HTTP + WS
 /** @internal */
-export function transformResult<TRouter extends AnyRouter, TOutput>(
+function transformResultInner<TRouter extends AnyRouter, TOutput>(
   response:
     | TRPCResponseMessage<TOutput, inferRouterError<TRouter>>
     | TRPCResponse<TOutput, inferRouterError<TRouter>>,
@@ -28,9 +29,6 @@ export function transformResult<TRouter extends AnyRouter, TOutput>(
       },
     } as const;
   }
-  if (!('result' in response)) {
-    throw new Error('Badly formatted response from server');
-  }
 
   const result = {
     ...response.result,
@@ -41,3 +39,40 @@ export function transformResult<TRouter extends AnyRouter, TOutput>(
   } as TRPCResultMessage<TOutput>['result'];
   return { ok: true, result } as const;
 }
+
+function isObject(value: unknown): value is Record<string, unknown> {
+  // check that value is object
+  return !!value && !Array.isArray(value) && typeof value === 'object';
+}
+
+/**
+ * Transforms and validates that the result is a valid TRPCResponse
+ * @internal
+ */
+export function transformResult<TRouter extends AnyRouter, TOutput>(
+  response:
+    | TRPCResponseMessage<TOutput, inferRouterError<TRouter>>
+    | TRPCResponse<TOutput, inferRouterError<TRouter>>,
+  runtime: TRPCClientRuntime,
+): ReturnType<typeof transformResultInner> {
+  let result: ReturnType<typeof transformResultInner>;
+  try {
+    // Use the data transformers on the JSON-response
+    result = transformResultInner(response, runtime);
+  } catch (err) {
+    throw new TRPCClientError('Unable to transform response from server');
+  }
+
+  // check that output of the transformers is a valid TRPCResponse
+  if (
+    !result.ok &&
+    (!isObject(result.error.error) ||
+      typeof result.error.error.code !== 'number')
+  ) {
+    throw new TRPCClientError('Badly formatted response from server');
+  }
+  if (result.ok && !isObject(result.result)) {
+    throw new TRPCClientError('Badly formatted response from server');
+  }
+  return result;
+}