@trpc/client 11.1.2-canary.7 → 11.1.3-alpha-tmp-issues-6785.34

package/dist/bundle-analysis.json

@@ -1,12 +1,12 @@
 {
-  "bundleSize": 76422,
-  "bundleOrigSize": 94937,
-  "bundleReduction": 19.5,
+  "bundleSize": 76613,
+  "bundleOrigSize": 95136,
+  "bundleReduction": 19.47,
   "modules": [
     {
       "id": "/src/links/wsLink/wsClient/wsClient.ts",
-      "size": 12067,
-      "origSize": 12199,
+      "size": 12116,
+      "origSize": 12248,
       "renderedExports": [
         "WsClient"
       ],
@@ -14,7 +14,7 @@
       "dependents": [
         "/src/links/wsLink/createWsClient.ts"
       ],
-      "percent": 15.79,
+      "percent": 15.81,
       "reduction": 1.08
     },
     {
@@ -27,7 +27,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 10.58,
+      "percent": 10.55,
       "reduction": 0
     },
     {
@@ -42,7 +42,7 @@
       "dependents": [
         "/src/links/wsLink/wsClient/wsClient.ts"
       ],
-      "percent": 8.08,
+      "percent": 8.06,
       "reduction": 4.9
     },
     {
@@ -55,7 +55,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 8.02,
+      "percent": 8,
       "reduction": 0
     },
     {
@@ -67,13 +67,13 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 7.32,
+      "percent": 7.3,
       "reduction": 19.44
     },
     {
       "id": "/src/links/wsLink/wsClient/requestManager.ts",
-      "size": 4792,
-      "origSize": 5216,
+      "size": 4992,
+      "origSize": 5433,
       "renderedExports": [
         "RequestManager"
       ],
@@ -81,8 +81,8 @@
       "dependents": [
         "/src/links/wsLink/wsClient/wsClient.ts"
       ],
-      "percent": 6.27,
-      "reduction": 8.13
+      "percent": 6.52,
+      "reduction": 8.12
     },
     {
       "id": "/src/links/httpBatchLink.ts",
@@ -93,13 +93,13 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 5.4,
+      "percent": 5.38,
       "reduction": 4.6
     },
     {
       "id": "/src/internals/dataLoader.ts",
-      "size": 4084,
-      "origSize": 4328,
+      "size": 4026,
+      "origSize": 4261,
       "renderedExports": [
         "dataLoader"
       ],
@@ -108,8 +108,8 @@
         "/src/links/httpBatchLink.ts",
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 5.34,
-      "reduction": 5.64
+      "percent": 5.25,
+      "reduction": 5.52
     },
     {
       "id": "/src/links/internals/httpUtils.ts",
@@ -131,7 +131,7 @@
         "/src/links/httpBatchStreamLink.ts",
         "/src/links/httpSubscriptionLink.ts"
       ],
-      "percent": 4.83,
+      "percent": 4.82,
       "reduction": 37.14
     },
     {
@@ -143,7 +143,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 4.31,
+      "percent": 4.3,
       "reduction": 12.56
     },
     {
@@ -158,7 +158,7 @@
         "/src/createTRPCUntypedClient.ts",
         "/src/createTRPCClient.ts"
       ],
-      "percent": 4.13,
+      "percent": 4.12,
       "reduction": 28.5
     },
     {
@@ -178,7 +178,7 @@
         "/src/internals/TRPCUntypedClient.ts",
         "/src/links/wsLink/wsClient/wsClient.ts"
       ],
-      "percent": 3.65,
+      "percent": 3.64,
       "reduction": 21.8
     },
     {
@@ -198,7 +198,7 @@
         "/src/links/wsLink/wsClient/requestManager.ts",
         "/src/links/wsLink/wsClient/wsConnection.ts"
       ],
-      "percent": 3.64,
+      "percent": 3.63,
       "reduction": 0.47
     },
     {
@@ -210,7 +210,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 3.39,
+      "percent": 3.38,
       "reduction": 19.62
     },
     {

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

@@ -1 +1 @@
-{"version":3,"file":"dataLoader.d.ts","sourceRoot":"","sources":["../../src/internals/dataLoader.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI;IACtC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC;IACpC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;CAChE,CAAC;AAWF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EACrC,WAAW,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC;gBAsGnB,IAAI,KAAG,OAAO,CAAC,MAAM,CAAC;EA6B1C"}
+{"version":3,"file":"dataLoader.d.ts","sourceRoot":"","sources":["../../src/internals/dataLoader.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI;IACtC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC;IACpC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;CAChE,CAAC;AAWF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EACrC,WAAW,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC;gBAsGnB,IAAI,KAAG,OAAO,CAAC,MAAM,CAAC;EAyB1C"}

package/dist/internals/dataLoader.js

@@ -103,14 +103,10 @@
         const promise = new Promise((resolve, reject)=>{
             item.reject = reject;
             item.resolve = resolve;
-            if (!pendingItems) {
-                pendingItems = [];
-            }
+            pendingItems ?? (pendingItems = []);
             pendingItems.push(item);
         });
-        if (!dispatchTimer) {
-            dispatchTimer = setTimeout(dispatch);
-        }
+        dispatchTimer ?? (dispatchTimer = setTimeout(dispatch));
         return promise;
     }
     return {

package/dist/internals/dataLoader.mjs

@@ -101,14 +101,10 @@
         const promise = new Promise((resolve, reject)=>{
             item.reject = reject;
             item.resolve = resolve;
-            if (!pendingItems) {
-                pendingItems = [];
-            }
+            pendingItems ?? (pendingItems = []);
             pendingItems.push(item);
         });
-        if (!dispatchTimer) {
-            dispatchTimer = setTimeout(dispatch);
-        }
+        dispatchTimer ?? (dispatchTimer = setTimeout(dispatch));
         return promise;
     }
     return {

package/dist/links/wsLink/wsClient/requestManager.d.ts

@@ -93,6 +93,10 @@ export declare class RequestManager {
      * Checks if there are any pending requests, including ongoing subscriptions.
      */
     hasPendingRequests(): boolean;
+    /**
+     * Checks if there are any pending subscriptions
+     */
+    hasPendingSubscriptions(): boolean;
     /**
      * Checks if there are any outgoing requests waiting to be sent.
      */

package/dist/links/wsLink/wsClient/requestManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestManager.d.ts","sourceRoot":"","sources":["../../../../src/links/wsLink/wsClient/requestManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EACV,yBAAyB,EACzB,mBAAmB,EACpB,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE,MAAM,MAAM,UAAU,GAAG,QAAQ,CAC/B,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC,EAC7D,eAAe,CAAC,aAAa,CAAC,CAC/B,CAAC;AAEF,KAAK,SAAS,GAAG,MAAM,CAAC;AACxB,KAAK,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAE5C;;;;GAIG;AACH,UAAU,OAAO;IACf,OAAO,EAAE,yBAAyB,CAAC;IACnC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,SAAS,EAAE,UAAU,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;OAEG;IACH,OAAO,CAAC,gBAAgB,CAA4C;IAEpE;;;;OAIG;IACH,OAAO,CAAC,eAAe,CAAkC;IAEzD;;;;;;;OAOG;IACI,QAAQ,CAAC,OAAO,EAAE,yBAAyB,EAAE,SAAS,EAAE,UAAU;IA2BzE;;OAEG;IACI,MAAM,CAAC,SAAS,EAAE,aAAa;IAStC;;;;;;;OAOG;IACI,KAAK;YAhEyC,SAAS;;IA0E9D;;;OAGG;IACI,kBAAkB;IAIzB;;OAEG;IACI,iBAAiB,CAAC,SAAS,EAAE,aAAa;IAMjD;;OAEG;IACI,mBAAmB;YA9F2B,SAAS;;IAkG9D;;;;OAIG;IACI,WAAW;;;;;;;;;;;IAiBlB;;OAEG;IACI,kBAAkB;IAIzB;;OAEG;IACI,mBAAmB;CAG3B"}
+{"version":3,"file":"requestManager.d.ts","sourceRoot":"","sources":["../../../../src/links/wsLink/wsClient/requestManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EACV,yBAAyB,EACzB,mBAAmB,EACpB,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE,MAAM,MAAM,UAAU,GAAG,QAAQ,CAC/B,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC,EAC7D,eAAe,CAAC,aAAa,CAAC,CAC/B,CAAC;AAEF,KAAK,SAAS,GAAG,MAAM,CAAC;AACxB,KAAK,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAE5C;;;;GAIG;AACH,UAAU,OAAO;IACf,OAAO,EAAE,yBAAyB,CAAC;IACnC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,SAAS,EAAE,UAAU,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;OAEG;IACH,OAAO,CAAC,gBAAgB,CAA4C;IAEpE;;;;OAIG;IACH,OAAO,CAAC,eAAe,CAAkC;IAEzD;;;;;;;OAOG;IACI,QAAQ,CAAC,OAAO,EAAE,yBAAyB,EAAE,SAAS,EAAE,UAAU;IA2BzE;;OAEG;IACI,MAAM,CAAC,SAAS,EAAE,aAAa;IAStC;;;;;;;OAOG;IACI,KAAK;YAhEyC,SAAS;;IA0E9D;;;OAGG;IACI,kBAAkB;IAIzB;;OAEG;IACI,iBAAiB,CAAC,SAAS,EAAE,aAAa;IAMjD;;OAEG;IACI,mBAAmB;YA9F2B,SAAS;;IAkG9D;;;;OAIG;IACI,WAAW;;;;;;;;;;;IAiBlB;;OAEG;IACI,kBAAkB;IAIzB;;OAEG;IACI,uBAAuB;IAM9B;;OAEG;IACI,mBAAmB;CAG3B"}

package/dist/links/wsLink/wsClient/requestManager.js

@@ -119,6 +119,11 @@ function _define_property(obj, key, value) {
         return this.getPendingRequests().length > 0;
     }
     /**
+   * Checks if there are any pending subscriptions
+   */ hasPendingSubscriptions() {
+        return this.getPendingRequests().some((request)=>request.message.method === 'subscription');
+    }
+    /**
    * Checks if there are any outgoing requests waiting to be sent.
    */ hasOutgoingRequests() {
         return this.outgoingRequests.length > 0;

package/dist/links/wsLink/wsClient/requestManager.mjs

@@ -117,6 +117,11 @@ function _define_property(obj, key, value) {
         return this.getPendingRequests().length > 0;
     }
     /**
+   * Checks if there are any pending subscriptions
+   */ hasPendingSubscriptions() {
+        return this.getPendingRequests().some((request)=>request.message.method === 'subscription');
+    }
+    /**
    * Checks if there are any outgoing requests waiting to be sent.
    */ hasOutgoingRequests() {
         return this.outgoingRequests.length > 0;

package/dist/links/wsLink/wsClient/wsClient.js

@@ -188,7 +188,7 @@ function _define_property(obj, key, value) {
         ws.addEventListener('close', (event)=>{
             handleCloseOrError(event);
             this.callbacks.onClose?.(event);
-            if (!this.lazyMode) {
+            if (!this.lazyMode || this.requestManager.hasPendingSubscriptions()) {
                 this.reconnect(new utils.TRPCWebSocketClosedError({
                     message: 'WebSocket closed',
                     cause: event

package/dist/links/wsLink/wsClient/wsClient.mjs

@@ -186,7 +186,7 @@ function _define_property(obj, key, value) {
         ws.addEventListener('close', (event)=>{
             handleCloseOrError(event);
             this.callbacks.onClose?.(event);
-            if (!this.lazyMode) {
+            if (!this.lazyMode || this.requestManager.hasPendingSubscriptions()) {
                 this.reconnect(new TRPCWebSocketClosedError({
                     message: 'WebSocket closed',
                     cause: event

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.1.2-canary.7+6f382ac71",
+  "version": "11.1.3-alpha-tmp-issues-6785.34+051d951a8",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -77,15 +77,15 @@
     "!**/__tests__"
   ],
   "peerDependencies": {
-    "@trpc/server": "11.1.2-canary.7+6f382ac71",
+    "@trpc/server": "11.1.3-alpha-tmp-issues-6785.34+051d951a8",
     "typescript": ">=5.7.2"
   },
   "devDependencies": {
-    "@trpc/server": "11.1.2-canary.7+6f382ac71",
+    "@trpc/server": "11.1.3-alpha-tmp-issues-6785.34+051d951a8",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/node": "^22.13.5",
     "dataloader": "^2.2.2",
-    "eslint": "^9.21.0",
+    "eslint": "^9.26.0",
     "isomorphic-fetch": "^3.0.0",
     "node-fetch": "^3.3.0",
     "rollup": "^4.34.8",
@@ -101,5 +101,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "6f382ac714f864d80b206044f7b1bc8bf31590d0"
+  "gitHead": "051d951a890850119f639d8a62db85cc8335b884"
 }

package/src/internals/dataLoader.ts

@@ -145,15 +145,11 @@ export function dataLoader<TKey, TValue>(
       item.reject = reject;
       item.resolve = resolve;
 
-      if (!pendingItems) {
-        pendingItems = [];
-      }
+      pendingItems ??= [];
       pendingItems.push(item);
     });
 
-    if (!dispatchTimer) {
-      dispatchTimer = setTimeout(dispatch);
-    }
+    dispatchTimer ??= setTimeout(dispatch);
 
     return promise;
   }

package/src/links/wsLink/wsClient/requestManager.ts

@@ -165,6 +165,15 @@ export class RequestManager {
     return this.getPendingRequests().length > 0;
   }
 
+  /**
+   * Checks if there are any pending subscriptions
+   */
+  public hasPendingSubscriptions() {
+    return this.getPendingRequests().some(
+      (request) => request.message.method === 'subscription',
+    );
+  }
+
   /**
    * Checks if there are any outgoing requests waiting to be sent.
    */

package/src/links/wsLink/wsClient/wsClient.ts

@@ -330,7 +330,7 @@ export class WsClient {
       handleCloseOrError(event);
       this.callbacks.onClose?.(event);
 
-      if (!this.lazyMode) {
+      if (!this.lazyMode || this.requestManager.hasPendingSubscriptions()) {
         this.reconnect(
           new TRPCWebSocketClosedError({
             message: 'WebSocket closed',