@trpc/client 11.0.0-rc.452 → 11.0.0-rc.456

package/dist/TRPCClientError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,qBAAqB,EACrB,KAAK,EACL,iBAAiB,EAClB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,0CAA0C,CAAC;AAElD,KAAK,eAAe,CAAC,WAAW,SAAS,qBAAqB,IAC5D,gBAAgB,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC;AAC9C,MAAM,WAAW,mBAAmB,CAAC,MAAM,SAAS,iBAAiB;IACnE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;CACtC;AACD,MAAM,MAAM,mBAAmB,CAAC,WAAW,SAAS,qBAAqB,IACvE,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AAsBpD,qBAAa,eAAe,CAAC,kBAAkB,SAAS,qBAAqB,CAC3E,SAAQ,KACR,YAAW,mBAAmB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;IAInE,SAAyB,KAAK,oBAAC;IAC/B,SAAgB,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAClE,SAAgB,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAEzE;;;OAGG;IACI,IAAI,sCAAC;gBAGV,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACvE,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC;WAkBW,IAAI,CAAC,kBAAkB,SAAS,qBAAqB,EACjE,MAAM,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,EACtC,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,kBAAkB,CAAC;CA+BvC"}
+{"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,qBAAqB,EACrB,KAAK,EACL,iBAAiB,EAClB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,0CAA0C,CAAC;AAElD,KAAK,eAAe,CAAC,WAAW,SAAS,qBAAqB,IAC5D,gBAAgB,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC;AAC9C,MAAM,WAAW,mBAAmB,CAAC,MAAM,SAAS,iBAAiB;IACnE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;CACtC;AACD,MAAM,MAAM,mBAAmB,CAAC,WAAW,SAAS,qBAAqB,IACvE,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AAgCpD,qBAAa,eAAe,CAAC,kBAAkB,SAAS,qBAAqB,CAC3E,SAAQ,KACR,YAAW,mBAAmB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;IAInE,SAAyB,KAAK,oBAAC;IAC/B,SAAgB,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAClE,SAAgB,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAEzE;;;OAGG;IACI,IAAI,sCAAC;gBAGV,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACvE,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC;WAkBW,IAAI,CAAC,kBAAkB,SAAS,qBAAqB,EACjE,MAAM,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,EACtC,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,kBAAkB,CAAC;CA2BvC"}

package/dist/TRPCClientError.js

@@ -11,6 +11,15 @@ function isTRPCClientError(cause) {
 function isTRPCErrorResponse(obj) {
     return unstableCoreDoNotImport.isObject(obj) && unstableCoreDoNotImport.isObject(obj['error']) && typeof obj['error']['code'] === 'number' && typeof obj['error']['message'] === 'string';
 }
+function getMessageFromUnknownError(err, fallback) {
+    if (typeof err === 'string') {
+        return err;
+    }
+    if (unstableCoreDoNotImport.isObject(err) && typeof err['message'] === 'string') {
+        return err['message'];
+    }
+    return fallback;
+}
 class TRPCClientError extends Error {
     static from(_cause, opts = {}) {
         const cause = _cause;
@@ -30,15 +39,9 @@ class TRPCClientError extends Error {
                 result: cause
             });
         }
-        if (!(cause instanceof Error)) {
-            return new TRPCClientError('Unknown error', {
-                ...opts,
-                cause: cause
-            });
-        }
-        return new TRPCClientError(cause.message, {
+        return new TRPCClientError(getMessageFromUnknownError(cause, 'Unknown error'), {
             ...opts,
-            cause: unstableCoreDoNotImport.getCauseFromUnknown(cause)
+            cause: cause
         });
     }
     constructor(message, opts){

package/dist/TRPCClientError.mjs

@@ -1,4 +1,4 @@
-import { getCauseFromUnknown, isObject } from '@trpc/server/unstable-core-do-not-import';
+import { isObject } from '@trpc/server/unstable-core-do-not-import';
 
 function isTRPCClientError(cause) {
     return cause instanceof TRPCClientError || /**
@@ -9,6 +9,15 @@ function isTRPCClientError(cause) {
 function isTRPCErrorResponse(obj) {
     return isObject(obj) && isObject(obj['error']) && typeof obj['error']['code'] === 'number' && typeof obj['error']['message'] === 'string';
 }
+function getMessageFromUnknownError(err, fallback) {
+    if (typeof err === 'string') {
+        return err;
+    }
+    if (isObject(err) && typeof err['message'] === 'string') {
+        return err['message'];
+    }
+    return fallback;
+}
 class TRPCClientError extends Error {
     static from(_cause, opts = {}) {
         const cause = _cause;
@@ -28,15 +37,9 @@ class TRPCClientError extends Error {
                 result: cause
             });
         }
-        if (!(cause instanceof Error)) {
-            return new TRPCClientError('Unknown error', {
-                ...opts,
-                cause: cause
-            });
-        }
-        return new TRPCClientError(cause.message, {
+        return new TRPCClientError(getMessageFromUnknownError(cause, 'Unknown error'), {
             ...opts,
-            cause: getCauseFromUnknown(cause)
+            cause: cause
         });
     }
     constructor(message, opts){

package/dist/bundle-analysis.json

@@ -1,32 +1,32 @@
 {
-  "bundleSize": 52206,
-  "bundleOrigSize": 69751,
-  "bundleReduction": 25.15,
+  "bundleSize": 50976,
+  "bundleOrigSize": 68169,
+  "bundleReduction": 25.22,
   "modules": [
     {
       "id": "/src/links/wsLink.ts",
-      "size": 13035,
-      "origSize": 14542,
+      "size": 13069,
+      "origSize": 14556,
       "renderedExports": [
         "createWSClient",
         "wsLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 24.97,
-      "reduction": 10.36
+      "percent": 25.64,
+      "reduction": 10.22
     },
     {
       "id": "/src/links/httpBatchStreamLink.ts",
-      "size": 6237,
-      "origSize": 6400,
+      "size": 5861,
+      "origSize": 6074,
       "renderedExports": [
         "unstable_httpBatchStreamLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 11.95,
-      "reduction": 2.55
+      "percent": 11.5,
+      "reduction": 3.51
     },
     {
       "id": "/src/links/loggerLink.ts",
@@ -37,13 +37,13 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 10.45,
+      "percent": 10.71,
       "reduction": 18.48
     },
     {
       "id": "/src/internals/dataLoader.ts",
-      "size": 4504,
-      "origSize": 4809,
+      "size": 4084,
+      "origSize": 4328,
       "renderedExports": [
         "dataLoader"
       ],
@@ -52,25 +52,25 @@
         "/src/links/httpBatchLink.ts",
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 8.63,
-      "reduction": 6.34
+      "percent": 8.01,
+      "reduction": 5.64
     },
     {
       "id": "/src/links/httpBatchLink.ts",
-      "size": 4030,
-      "origSize": 4173,
+      "size": 3925,
+      "origSize": 4118,
       "renderedExports": [
         "httpBatchLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 7.72,
-      "reduction": 3.43
+      "percent": 7.7,
+      "reduction": 4.69
     },
     {
       "id": "/src/links/internals/httpUtils.ts",
-      "size": 3543,
-      "origSize": 6008,
+      "size": 3704,
+      "origSize": 5903,
       "renderedExports": [
         "resolveHTTPLinkOptions",
         "getInput",
@@ -78,7 +78,8 @@
         "getBody",
         "jsonHttpRequester",
         "fetchHTTPResponse",
-        "httpRequest"
+        "httpRequest",
+        "mergeAbortSignals"
       ],
       "removedExports": [],
       "dependents": [
@@ -87,37 +88,37 @@
         "/src/links/httpBatchStreamLink.ts",
         "/src/links/httpSubscriptionLink.ts"
       ],
-      "percent": 6.79,
-      "reduction": 41.03
+      "percent": 7.27,
+      "reduction": 37.25
     },
     {
       "id": "/src/links/httpSubscriptionLink.ts",
-      "size": 3531,
-      "origSize": 3761,
+      "size": 3522,
+      "origSize": 3752,
       "renderedExports": [
         "unstable_httpSubscriptionLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.76,
-      "reduction": 6.12
+      "percent": 6.91,
+      "reduction": 6.13
     },
     {
       "id": "/src/links/httpLink.ts",
-      "size": 3167,
-      "origSize": 3698,
+      "size": 3184,
+      "origSize": 3709,
       "renderedExports": [
         "httpLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.07,
-      "reduction": 14.36
+      "percent": 6.25,
+      "reduction": 14.15
     },
     {
       "id": "/src/internals/TRPCUntypedClient.ts",
-      "size": 2372,
-      "origSize": 4306,
+      "size": 2162,
+      "origSize": 4126,
       "renderedExports": [
         "TRPCUntypedClient"
       ],
@@ -126,13 +127,13 @@
         "/src/createTRPCUntypedClient.ts",
         "/src/createTRPCClient.ts"
       ],
-      "percent": 4.54,
-      "reduction": 44.91
+      "percent": 4.24,
+      "reduction": 47.6
     },
     {
       "id": "/src/TRPCClientError.ts",
-      "size": 1866,
-      "origSize": 3437,
+      "size": 1940,
+      "origSize": 3555,
       "renderedExports": [
         "TRPCClientError"
       ],
@@ -144,11 +145,10 @@
         "/src/links/wsLink.ts",
         "/src/links/httpBatchStreamLink.ts",
         "/src/links/httpSubscriptionLink.ts",
-        "/src/internals/TRPCUntypedClient.ts",
-        "/src/links/internals/httpUtils.ts"
+        "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 3.57,
-      "reduction": 45.71
+      "percent": 3.81,
+      "reduction": 45.43
     },
     {
       "id": "/src/createTRPCClient.ts",
@@ -164,7 +164,7 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 2.27,
+      "percent": 2.33,
       "reduction": 73.19
     },
     {
@@ -179,7 +179,7 @@
         "/src/links/splitLink.ts",
         "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 1.32,
+      "percent": 1.35,
       "reduction": 32.75
     },
     {
@@ -191,7 +191,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.17,
+      "percent": 1.2,
       "reduction": 44.95
     },
     {
@@ -205,7 +205,7 @@
       "dependents": [
         "/src/unstable-internals.ts"
       ],
-      "percent": 1.08,
+      "percent": 1.11,
       "reduction": 66.75
     },
     {
@@ -220,23 +220,9 @@
         "/src/index.ts",
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 0.82,
+      "percent": 0.84,
       "reduction": 33.54
     },
-    {
-      "id": "/src/internals/getAbortController.ts",
-      "size": 396,
-      "origSize": 569,
-      "renderedExports": [
-        "getAbortController"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/links/internals/httpUtils.ts"
-      ],
-      "percent": 0.76,
-      "reduction": 30.4
-    },
     {
       "id": "/src/links/internals/contentTypes.ts",
       "size": 330,
@@ -248,7 +234,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.63,
+      "percent": 0.65,
       "reduction": 15.17
     },
     {
@@ -263,7 +249,7 @@
         "/src/links/wsLink.ts",
         "/src/links/httpSubscriptionLink.ts"
       ],
-      "percent": 0.3,
+      "percent": 0.31,
       "reduction": 81.56
     },
     {
@@ -277,7 +263,7 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 0.19,
+      "percent": 0.2,
       "reduction": 82.58
     },
     {
@@ -305,5 +291,5 @@
       "reduction": 100
     }
   ],
-  "moduleCount": 21
+  "moduleCount": 20
 }

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,EACrB,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;IAuBhB,OAAO,CAAC,gBAAgB;IAyBjB,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;CA2BlB"}
+{"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

@@ -5,31 +5,26 @@ var createChain = require('../links/internals/createChain.js');
 var TRPCClientError = require('../TRPCClientError.js');
 
 class TRPCUntypedClient {
-    $request({ type , input , path , context ={}  }) {
+    $request(opts) {
         const chain$ = createChain.createChain({
             links: this.links,
             op: {
-                id: ++this.requestId,
-                type,
-                path,
-                input,
-                context
+                ...opts,
+                context: opts.context ?? {},
+                id: ++this.requestId
             }
         });
         return chain$.pipe(observable.share());
     }
-    requestAsPromise(opts) {
-        const req$ = this.$request(opts);
-        const { promise , abort  } = observable.observableToPromise(req$);
-        const abortablePromise = new Promise((resolve, reject)=>{
-            opts.signal?.addEventListener('abort', abort);
-            promise.then((envelope)=>{
-                resolve(envelope.result.data);
-            }).catch((err)=>{
-                reject(TRPCClientError.TRPCClientError.from(err));
-            });
-        });
-        return abortablePromise;
+    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({
@@ -54,7 +49,8 @@ class TRPCUntypedClient {
             type: 'subscription',
             path,
             input,
-            context: opts?.context
+            context: opts?.context,
+            signal: null
         });
         return observable$.subscribe({
             next (envelope) {

package/dist/internals/TRPCUntypedClient.mjs

@@ -3,31 +3,26 @@ import { createChain } from '../links/internals/createChain.mjs';
 import { TRPCClientError } from '../TRPCClientError.mjs';
 
 class TRPCUntypedClient {
-    $request({ type , input , path , context ={}  }) {
+    $request(opts) {
         const chain$ = createChain({
             links: this.links,
             op: {
-                id: ++this.requestId,
-                type,
-                path,
-                input,
-                context
+                ...opts,
+                context: opts.context ?? {},
+                id: ++this.requestId
             }
         });
         return chain$.pipe(share());
     }
-    requestAsPromise(opts) {
-        const req$ = this.$request(opts);
-        const { promise , abort  } = observableToPromise(req$);
-        const abortablePromise = new Promise((resolve, reject)=>{
-            opts.signal?.addEventListener('abort', abort);
-            promise.then((envelope)=>{
-                resolve(envelope.result.data);
-            }).catch((err)=>{
-                reject(TRPCClientError.from(err));
-            });
-        });
-        return abortablePromise;
+    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({
@@ -52,7 +47,8 @@ class TRPCUntypedClient {
             type: 'subscription',
             path,
             input,
-            context: opts?.context
+            context: opts?.context,
+            signal: null
         });
         return observable$.subscribe({
             next (envelope) {

package/dist/internals/dataLoader.d.ts

@@ -1,10 +1,6 @@
-import type { CancelFn, PromiseAndCancel } from '../links/types';
 export type BatchLoader<TKey, TValue> = {
     validate: (keys: TKey[]) => boolean;
-    fetch: (keys: TKey[]) => {
-        promise: Promise<TValue[] | Promise<TValue>[]>;
-        cancel: CancelFn;
-    };
+    fetch: (keys: TKey[]) => Promise<TValue[] | Promise<TValue>[]>;
 };
 /**
  * Dataloader that's very inspired by https://github.com/graphql/dataloader
@@ -12,6 +8,6 @@ export type BatchLoader<TKey, TValue> = {
  * When cancelling a single fetch the whole batch will be cancelled only when _all_ items are cancelled
  */
 export declare function dataLoader<TKey, TValue>(batchLoader: BatchLoader<TKey, TValue>): {
-    load: (key: TKey) => PromiseAndCancel<TValue>;
+    load: (key: TKey) => Promise<TValue>;
 };
 //# sourceMappingURL=dataLoader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dataLoader.d.ts","sourceRoot":"","sources":["../../src/internals/dataLoader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAajE,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;QACvB,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/C,MAAM,EAAE,QAAQ,CAAC;KAClB,CAAC;CACH,CAAC;AAWF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EACrC,WAAW,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC;gBA0GnB,IAAI,KAAG,gBAAgB,CAAC,MAAM,CAAC;EAsCnD"}
+{"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"}

package/dist/internals/dataLoader.js

@@ -61,14 +61,12 @@
                 continue;
             }
             const batch = {
-                items,
-                cancel: throwFatalError
+                items
             };
             for (const item of items){
                 item.batch = batch;
             }
-            const { promise , cancel  } = batchLoader.fetch(batch.items.map((_item)=>_item.key));
-            batch.cancel = cancel;
+            const promise = batchLoader.fetch(batch.items.map((_item)=>_item.key));
             promise.then(async (result)=>{
                 await Promise.all(result.map(async (valueOrPromise, index)=>{
                     const item = batch.items[index];
@@ -113,18 +111,7 @@
         if (!dispatchTimer) {
             dispatchTimer = setTimeout(dispatch);
         }
-        const cancel = ()=>{
-            item.aborted = true;
-            if (item.batch?.items.every((item)=>item.aborted)) {
-                // All items in the batch have been cancelled
-                item.batch.cancel();
-                item.batch = null;
-            }
-        };
-        return {
-            promise,
-            cancel
-        };
+        return promise;
     }
     return {
         load

package/dist/internals/dataLoader.mjs

@@ -59,14 +59,12 @@
                 continue;
             }
             const batch = {
-                items,
-                cancel: throwFatalError
+                items
             };
             for (const item of items){
                 item.batch = batch;
             }
-            const { promise , cancel  } = batchLoader.fetch(batch.items.map((_item)=>_item.key));
-            batch.cancel = cancel;
+            const promise = batchLoader.fetch(batch.items.map((_item)=>_item.key));
             promise.then(async (result)=>{
                 await Promise.all(result.map(async (valueOrPromise, index)=>{
                     const item = batch.items[index];
@@ -111,18 +109,7 @@
         if (!dispatchTimer) {
             dispatchTimer = setTimeout(dispatch);
         }
-        const cancel = ()=>{
-            item.aborted = true;
-            if (item.batch?.items.every((item)=>item.aborted)) {
-                // All items in the batch have been cancelled
-                item.batch.cancel();
-                item.batch = null;
-            }
-        };
-        return {
-            promise,
-            cancel
-        };
+        return promise;
     }
     return {
         load

package/dist/internals/types.d.ts

@@ -1,18 +1,3 @@
-export type AbortControllerEsque = new () => AbortControllerInstanceEsque;
-/**
- * Allows you to abort one or more requests.
- */
-export interface AbortControllerInstanceEsque {
-    /**
-     * The AbortSignal object associated with this object.
-     */
-    readonly signal: AbortSignal;
-    /**
-     * Sets this object's AbortSignal's aborted flag and signals to
-     * any observers that the associated activity is to be aborted.
-     */
-    abort(): void;
-}
 /**
  * A subset of the standard fetch function type needed by tRPC internally.
  * @see fetch from lib.dom.d.ts

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/internals/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG,UAAU,4BAA4B,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B;;;OAGG;IACH,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,WAAW,GAAG,GAAG,GAAG,MAAM,EACjC,IAAI,CAAC,EAAE,WAAW,GAAG,gBAAgB,KAClC,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAC7B,GAAG,EAAE,GAAG,GAAG,MAAM,EACjB,IAAI,CAAC,EAAE,yBAAyB,KAC7B,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B,MAAM,WAAW,yBAAyB;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,GAAG,IAAI,CAAC;IAE3D;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEtD;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;CAC7B;AAED;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,2BAA2B,CAAC,UAAU,CAAC,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,EAAE,CACA,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GACjC,yBAAyB,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,IAAI,CAAC;IAC1E;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/internals/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,WAAW,GAAG,GAAG,GAAG,MAAM,EACjC,IAAI,CAAC,EAAE,WAAW,GAAG,gBAAgB,KAClC,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAC7B,GAAG,EAAE,GAAG,GAAG,MAAM,EACjB,IAAI,CAAC,EAAE,yBAAyB,KAC7B,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B,MAAM,WAAW,yBAAyB;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,GAAG,IAAI,CAAC;IAE3D;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEtD;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;CAC7B;AAED;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,2BAA2B,CAAC,UAAU,CAAC,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,EAAE,CACA,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GACjC,yBAAyB,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,IAAI,CAAC;IAC1E;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC"}

package/dist/links/httpBatchLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAO7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAOnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC/D,QAAQ,CAAC,OAAO,CAAC,CAsHnB"}
+{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAO7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC/D,QAAQ,CAAC,OAAO,CAAC,CAkHnB"}