@trpc/client 11.0.0-alpha-tmp-issues-5851-take-two.469 → 11.0.0-alpha-tmp-issues-5851-take-two.472

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 51545,
-  "bundleOrigSize": 68608,
-  "bundleReduction": 24.87,
+  "bundleSize": 51744,
+  "bundleOrigSize": 68776,
+  "bundleReduction": 24.76,
   "modules": [
     {
       "id": "/src/links/wsLink.ts",
@@ -13,7 +13,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 25.35,
+      "percent": 25.26,
       "reduction": 10.22
     },
     {
@@ -25,7 +25,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 12.04,
+      "percent": 12,
       "reduction": 1.26
     },
     {
@@ -37,7 +37,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 10.59,
+      "percent": 10.55,
       "reduction": 18.48
     },
     {
@@ -49,7 +49,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 7.95,
+      "percent": 7.92,
       "reduction": 3.26
     },
     {
@@ -64,13 +64,13 @@
         "/src/links/httpBatchLink.ts",
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 7.93,
+      "percent": 7.9,
       "reduction": 6.41
     },
     {
       "id": "/src/links/internals/httpUtils.ts",
-      "size": 3729,
-      "origSize": 5978,
+      "size": 3928,
+      "origSize": 6146,
       "renderedExports": [
         "resolveHTTPLinkOptions",
         "getInput",
@@ -83,13 +83,13 @@
       ],
       "removedExports": [],
       "dependents": [
-        "/src/links/httpBatchLink.ts",
         "/src/links/httpLink.ts",
+        "/src/links/httpBatchLink.ts",
         "/src/links/httpBatchStreamLink.ts",
         "/src/links/httpSubscriptionLink.ts"
       ],
-      "percent": 7.23,
-      "reduction": 37.62
+      "percent": 7.59,
+      "reduction": 36.09
     },
     {
       "id": "/src/links/httpSubscriptionLink.ts",
@@ -100,7 +100,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.83,
+      "percent": 6.81,
       "reduction": 6.13
     },
     {
@@ -112,7 +112,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.18,
+      "percent": 6.15,
       "reduction": 14.15
     },
     {
@@ -127,7 +127,7 @@
         "/src/createTRPCUntypedClient.ts",
         "/src/createTRPCClient.ts"
       ],
-      "percent": 4.37,
+      "percent": 4.36,
       "reduction": 46.78
     },
     {
@@ -140,15 +140,15 @@
       "removedExports": [],
       "dependents": [
         "/src/index.ts",
-        "/src/links/httpBatchLink.ts",
         "/src/links/httpLink.ts",
+        "/src/links/httpBatchLink.ts",
         "/src/links/wsLink.ts",
         "/src/links/httpBatchStreamLink.ts",
         "/src/links/httpSubscriptionLink.ts",
         "/src/internals/TRPCUntypedClient.ts",
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 3.62,
+      "percent": 3.61,
       "reduction": 45.71
     },
     {
@@ -165,7 +165,7 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 2.3,
+      "percent": 2.29,
       "reduction": 73.19
     },
     {
@@ -180,7 +180,7 @@
         "/src/links/splitLink.ts",
         "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 1.34,
+      "percent": 1.33,
       "reduction": 32.75
     },
     {
@@ -206,7 +206,7 @@
       "dependents": [
         "/src/unstable-internals.ts"
       ],
-      "percent": 1.1,
+      "percent": 1.09,
       "reduction": 66.75
     },
     {

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

@@ -1 +1 @@
-{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../src/links/internals/httpUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../src/links/internals/httpUtils.ts"],"names":[],"mappings":"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"}

package/dist/links/internals/httpUtils.js

@@ -128,9 +128,15 @@ function httpRequest(opts) {
         }
     };
     for (const o of opts){
-        o.signal?.addEventListener('abort', onAbort, {
-            once: true
-        });
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const signal = o.signal;
+        if (signal.aborted) {
+            onAbort();
+        } else {
+            signal.addEventListener('abort', onAbort, {
+                once: true
+            });
+        }
     }
     return ac;
 }

package/dist/links/internals/httpUtils.mjs

@@ -126,9 +126,15 @@ function httpRequest(opts) {
         }
     };
     for (const o of opts){
-        o.signal?.addEventListener('abort', onAbort, {
-            once: true
-        });
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const signal = o.signal;
+        if (signal.aborted) {
+            onAbort();
+        } else {
+            signal.addEventListener('abort', onAbort, {
+                once: true
+            });
+        }
     }
     return ac;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.0.0-alpha-tmp-issues-5851-take-two.469+30b7dd3bb",
+  "version": "11.0.0-alpha-tmp-issues-5851-take-two.472+a33f0df27",
   "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.469+30b7dd3bb"
+    "@trpc/server": "11.0.0-alpha-tmp-issues-5851-take-two.472+a33f0df27"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-alpha-tmp-issues-5851-take-two.469+30b7dd3bb",
+    "@trpc/server": "11.0.0-alpha-tmp-issues-5851-take-two.472+a33f0df27",
     "@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": "30b7dd3bbecced28be7e29f734bc55c4850c51e5"
+  "gitHead": "a33f0df275e85106f882b8b2d6f07d2df57ed138"
 }

package/src/links/internals/httpUtils.ts

@@ -238,9 +238,15 @@ export function mergeAbortSignals(
   };
 
   for (const o of opts) {
-    o.signal?.addEventListener('abort', onAbort, {
-      once: true,
-    });
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const signal = o.signal!;
+    if (signal.aborted) {
+      onAbort();
+    } else {
+      signal.addEventListener('abort', onAbort, {
+        once: true,
+      });
+    }
   }
 
   return ac;