@trpc/client 11.0.0-alpha-tmp-issues-5851-take-two.481 → 11.0.0-alpha-tmp-issues-5851-take-two.485

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 51133,
-  "bundleOrigSize": 68325,
-  "bundleReduction": 25.16,
+  "bundleSize": 51041,
+  "bundleOrigSize": 68216,
+  "bundleReduction": 25.18,
   "modules": [
     {
       "id": "/src/links/wsLink.ts",
@@ -13,7 +13,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 25.56,
+      "percent": 25.6,
       "reduction": 10.22
     },
     {
@@ -25,7 +25,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 11.56,
+      "percent": 11.58,
       "reduction": 3.32
     },
     {
@@ -37,7 +37,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 10.67,
+      "percent": 10.69,
       "reduction": 18.48
     },
     {
@@ -52,7 +52,7 @@
         "/src/links/httpBatchLink.ts",
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 7.99,
+      "percent": 8,
       "reduction": 5.64
     },
     {
@@ -64,7 +64,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 7.77,
+      "percent": 7.78,
       "reduction": 4.4
     },
     {
@@ -83,12 +83,12 @@
       ],
       "removedExports": [],
       "dependents": [
-        "/src/links/httpLink.ts",
         "/src/links/httpBatchLink.ts",
+        "/src/links/httpLink.ts",
         "/src/links/httpBatchStreamLink.ts",
         "/src/links/httpSubscriptionLink.ts"
       ],
-      "percent": 7.18,
+      "percent": 7.19,
       "reduction": 37.5
     },
     {
@@ -100,7 +100,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.89,
+      "percent": 6.9,
       "reduction": 6.13
     },
     {
@@ -112,13 +112,13 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.23,
+      "percent": 6.24,
       "reduction": 14.15
     },
     {
       "id": "/src/internals/TRPCUntypedClient.ts",
-      "size": 2254,
-      "origSize": 4235,
+      "size": 2162,
+      "origSize": 4126,
       "renderedExports": [
         "TRPCUntypedClient"
       ],
@@ -127,8 +127,8 @@
         "/src/createTRPCUntypedClient.ts",
         "/src/createTRPCClient.ts"
       ],
-      "percent": 4.41,
-      "reduction": 46.78
+      "percent": 4.24,
+      "reduction": 47.6
     },
     {
       "id": "/src/TRPCClientError.ts",
@@ -140,14 +140,14 @@
       "removedExports": [],
       "dependents": [
         "/src/index.ts",
-        "/src/links/httpLink.ts",
         "/src/links/httpBatchLink.ts",
+        "/src/links/httpLink.ts",
         "/src/links/wsLink.ts",
         "/src/links/httpBatchStreamLink.ts",
         "/src/links/httpSubscriptionLink.ts",
         "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 3.79,
+      "percent": 3.8,
       "reduction": 45.43
     },
     {
@@ -164,7 +164,7 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 2.32,
+      "percent": 2.33,
       "reduction": 73.19
     },
     {
@@ -191,7 +191,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.19,
+      "percent": 1.2,
       "reduction": 44.95
     },
     {
@@ -205,7 +205,7 @@
       "dependents": [
         "/src/unstable-internals.ts"
       ],
-      "percent": 1.1,
+      "percent": 1.11,
       "reduction": 66.75
     },
     {

package/dist/internals/TRPCUntypedClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TRPCUntypedClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCUntypedClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EAErB,SAAS,EACV,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EACV,gBAAgB,EAEhB,iBAAiB,EACjB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB,CAAC,MAAM,EAAE,MAAM;IACtD,SAAS,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;KAAE,KAAK,IAAI,CAAC;IACrE,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,qBAAqB,IAAI;IAC3E,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,CAAC,qEAAqE,CAAC,CAAC;CAChG,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,GAC/B,UAAU,GACV,OAAO,GACP,UAAU,GACV,OAAO,GACP,kBAAkB,GAClB,WAAW,GACX,SAAS,GACT,cAAc,CAAC;AAEnB,qBAAa,iBAAiB,CAAC,OAAO,SAAS,SAAS;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,SAAgB,OAAO,EAAE,iBAAiB,CAAC;IAC3C,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC;IASlD,OAAO,CAAC,QAAQ;IAkBhB,OAAO,CAAC,gBAAgB;IAuBjB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IAS9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IASjE,YAAY,CACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,CACX,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAC9D,GACC,kBAAkB,GACnB,cAAc;CA4BlB"}
+{"version":3,"file":"TRPCUntypedClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCUntypedClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EAErB,SAAS,EACV,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EACV,gBAAgB,EAEhB,iBAAiB,EACjB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB,CAAC,MAAM,EAAE,MAAM;IACtD,SAAS,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;KAAE,KAAK,IAAI,CAAC;IACrE,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,qBAAqB,IAAI;IAC3E,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,CAAC,qEAAqE,CAAC,CAAC;CAChG,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,GAC/B,UAAU,GACV,OAAO,GACP,UAAU,GACV,OAAO,GACP,kBAAkB,GAClB,WAAW,GACX,SAAS,GACT,cAAc,CAAC;AAEnB,qBAAa,iBAAiB,CAAC,OAAO,SAAS,SAAS;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,SAAgB,OAAO,EAAE,iBAAiB,CAAC;IAC3C,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC;IASlD,OAAO,CAAC,QAAQ;YAkBF,gBAAgB;IAkBvB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IAS9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IASjE,YAAY,CACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,CACX,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAC9D,GACC,kBAAkB,GACnB,cAAc;CA4BlB"}

package/dist/internals/TRPCUntypedClient.js

@@ -16,17 +16,15 @@ class TRPCUntypedClient {
         });
         return chain$.pipe(observable.share());
     }
-    requestAsPromise(opts) {
-        const req$ = this.$request(opts);
-        const promise = observable.observableToPromise(req$);
-        return new Promise((resolve, reject)=>{
-            promise.then((envelope)=>{
-                const data = envelope.result.data;
-                resolve(data);
-            }).catch((err)=>{
-                reject(TRPCClientError.TRPCClientError.from(err));
-            });
-        });
+    async requestAsPromise(opts) {
+        try {
+            const req$ = this.$request(opts);
+            const envelope = await observable.observableToPromise(req$);
+            const data = envelope.result.data;
+            return data;
+        } catch (err) {
+            throw TRPCClientError.TRPCClientError.from(err);
+        }
     }
     query(path, input, opts) {
         return this.requestAsPromise({

package/dist/internals/TRPCUntypedClient.mjs

@@ -14,17 +14,15 @@ class TRPCUntypedClient {
         });
         return chain$.pipe(share());
     }
-    requestAsPromise(opts) {
-        const req$ = this.$request(opts);
-        const promise = observableToPromise(req$);
-        return new Promise((resolve, reject)=>{
-            promise.then((envelope)=>{
-                const data = envelope.result.data;
-                resolve(data);
-            }).catch((err)=>{
-                reject(TRPCClientError.from(err));
-            });
-        });
+    async requestAsPromise(opts) {
+        try {
+            const req$ = this.$request(opts);
+            const envelope = await observableToPromise(req$);
+            const data = envelope.result.data;
+            return data;
+        } catch (err) {
+            throw TRPCClientError.from(err);
+        }
     }
     query(path, input, opts) {
         return this.requestAsPromise({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.0.0-alpha-tmp-issues-5851-take-two.481+521a58480",
+  "version": "11.0.0-alpha-tmp-issues-5851-take-two.485+12edd65f5",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -76,10 +76,10 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "11.0.0-alpha-tmp-issues-5851-take-two.481+521a58480"
+    "@trpc/server": "11.0.0-alpha-tmp-issues-5851-take-two.485+12edd65f5"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-alpha-tmp-issues-5851-take-two.481+521a58480",
+    "@trpc/server": "11.0.0-alpha-tmp-issues-5851-take-two.485+12edd65f5",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/node": "^20.10.0",
     "eslint": "^8.56.0",
@@ -96,5 +96,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "521a58480a40f3448c788cf38297f0fab5d51558"
+  "gitHead": "12edd65f58886c26fd4539484e12fb2f507556cb"
 }

package/src/internals/TRPCUntypedClient.ts

@@ -84,28 +84,23 @@ export class TRPCUntypedClient<TRouter extends AnyRouter> {
     return chain$.pipe(share());
   }
 
-  private requestAsPromise<TInput = unknown, TOutput = unknown>(opts: {
+  private async requestAsPromise<TInput = unknown, TOutput = unknown>(opts: {
     type: TRPCType;
     input: TInput;
     path: string;
     context?: OperationContext;
     signal: Maybe<AbortSignal>;
   }): Promise<TOutput> {
-    const req$ = this.$request<TInput, TOutput>(opts);
-    type TValue = inferObservableValue<typeof req$>;
-    const promise = observableToPromise<TValue>(req$);
+    try {
+      const req$ = this.$request<TInput, TOutput>(opts);
+      type TValue = inferObservableValue<typeof req$>;
 
-    return new Promise<TOutput>((resolve, reject) => {
-      promise
-        .then((envelope) => {
-          const data = (envelope.result as any).data;
-
-          resolve(data);
-        })
-        .catch((err) => {
-          reject(TRPCClientError.from(err));
-        });
-    });
+      const envelope = await observableToPromise<TValue>(req$);
+      const data = (envelope.result as any).data;
+      return data;
+    } catch (err) {
+      throw TRPCClientError.from(err as Error);
+    }
   }
   public query(path: string, input?: unknown, opts?: TRPCRequestOptions) {
     return this.requestAsPromise<unknown, unknown>({