@trpc/client 10.38.1 → 10.38.2

package/dist/{httpBatchLink-520db465.mjs → httpBatchLink-64296887.mjs}

@@ -1,7 +1,7 @@
 import { observable } from '@trpc/server/observable';
 import { t as transformResult } from './transformResult-7ab522e6.mjs';
 import { T as TRPCClientError } from './TRPCClientError-fef6cf44.mjs';
-import { r as resolveHTTPLinkOptions, g as getUrl, j as jsonHttpRequester } from './httpUtils-ad76b802.mjs';
+import { r as resolveHTTPLinkOptions, g as getUrl, j as jsonHttpRequester } from './httpUtils-e8fecf0a.mjs';
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
  * A function that should never be called unless we messed something up.

package/dist/{httpBatchLink-7e0759b7.js → httpBatchLink-7ecce46b.js}

@@ -1,7 +1,7 @@
 import { observable } from '@trpc/server/observable';
 import { t as transformResult } from './transformResult-82684494.js';
 import { T as TRPCClientError } from './TRPCClientError-8462a9bf.js';
-import { r as resolveHTTPLinkOptions, g as getUrl, j as jsonHttpRequester } from './httpUtils-f23aeadb.js';
+import { r as resolveHTTPLinkOptions, g as getUrl, j as jsonHttpRequester } from './httpUtils-5142e9e1.js';
 
 /**
  * A function that should never be called unless we messed something up.

package/dist/{httpBatchLink-3d721a5c.js → httpBatchLink-8b963505.js}

@@ -3,7 +3,7 @@
 var observable = require('@trpc/server/observable');
 var transformResult = require('./transformResult-26a22823.js');
 var TRPCClientError = require('./TRPCClientError-dffb44e0.js');
-var httpUtils = require('./httpUtils-fd6f3ad7.js');
+var httpUtils = require('./httpUtils-b94fce6f.js');
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
  * A function that should never be called unless we messed something up.

package/dist/{httpUtils-f23aeadb.js → httpUtils-5142e9e1.js}

@@ -114,10 +114,12 @@ async function fetchHTTPResponse(opts, ac) {
 function httpRequest(opts) {
     const ac = opts.AbortController ? new opts.AbortController() : null;
     const meta = {};
+    let done = false;
     const promise = new Promise((resolve, reject) => {
         fetchHTTPResponse(opts, ac)
             .then((_res) => {
             meta.response = _res;
+            done = true;
             return _res.json();
         })
             .then((json) => {
@@ -128,11 +130,14 @@ function httpRequest(opts) {
             });
         })
             .catch((err) => {
+            done = true;
             reject(TRPCClientError.from(err, { meta }));
         });
     });
     const cancel = () => {
-        ac?.abort();
+        if (!done) {
+            ac?.abort();
+        }
     };
     return { promise, cancel };
 }

package/dist/{httpUtils-fd6f3ad7.js → httpUtils-b94fce6f.js}

@@ -113,9 +113,11 @@ async function fetchHTTPResponse(opts, ac) {
 function httpRequest(opts) {
     const ac = opts.AbortController ? new opts.AbortController() : null;
     const meta = {};
+    let done = false;
     const promise = new Promise((resolve, reject)=>{
         fetchHTTPResponse(opts, ac).then((_res)=>{
             meta.response = _res;
+            done = true;
             return _res.json();
         }).then((json)=>{
             meta.responseJSON = json;
@@ -124,13 +126,16 @@ function httpRequest(opts) {
                 meta
             });
         }).catch((err)=>{
+            done = true;
             reject(TRPCClientError.TRPCClientError.from(err, {
                 meta
             }));
         });
     });
     const cancel = ()=>{
-        ac?.abort();
+        if (!done) {
+            ac?.abort();
+        }
     };
     return {
         promise,

package/dist/{httpUtils-ad76b802.mjs → httpUtils-e8fecf0a.mjs}

@@ -111,9 +111,11 @@ async function fetchHTTPResponse(opts, ac) {
 function httpRequest(opts) {
     const ac = opts.AbortController ? new opts.AbortController() : null;
     const meta = {};
+    let done = false;
     const promise = new Promise((resolve, reject)=>{
         fetchHTTPResponse(opts, ac).then((_res)=>{
             meta.response = _res;
+            done = true;
             return _res.json();
         }).then((json)=>{
             meta.responseJSON = json;
@@ -122,13 +124,16 @@ function httpRequest(opts) {
                 meta
             });
         }).catch((err)=>{
+            done = true;
             reject(TRPCClientError.from(err, {
                 meta
             }));
         });
     });
     const cancel = ()=>{
-        ac?.abort();
+        if (!done) {
+            ac?.abort();
+        }
     };
     return {
         promise,

package/dist/index.js

@@ -6,8 +6,8 @@ var observable = require('@trpc/server/observable');
 var links_splitLink = require('./splitLink-f29e84be.js');
 var TRPCClientError = require('./TRPCClientError-dffb44e0.js');
 var shared = require('@trpc/server/shared');
-var httpUtils = require('./httpUtils-fd6f3ad7.js');
-var links_httpBatchLink = require('./httpBatchLink-3d721a5c.js');
+var httpUtils = require('./httpUtils-b94fce6f.js');
+var links_httpBatchLink = require('./httpBatchLink-8b963505.js');
 var links_httpLink = require('./links/httpLink.js');
 var links_loggerLink = require('./links/loggerLink.js');
 var links_wsLink = require('./links/wsLink.js');

package/dist/index.mjs

@@ -4,10 +4,10 @@ export { s as splitLink } from './splitLink-4c75f7be.mjs';
 import { T as TRPCClientError } from './TRPCClientError-fef6cf44.mjs';
 export { T as TRPCClientError } from './TRPCClientError-fef6cf44.mjs';
 import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared';
-import { f as fetchHTTPResponse, g as getUrl, a as getBody$1, h as httpRequest } from './httpUtils-ad76b802.mjs';
-export { b as getFetch } from './httpUtils-ad76b802.mjs';
-import { c as createHTTPBatchLink } from './httpBatchLink-520db465.mjs';
-export { h as httpBatchLink } from './httpBatchLink-520db465.mjs';
+import { f as fetchHTTPResponse, g as getUrl, a as getBody$1, h as httpRequest } from './httpUtils-e8fecf0a.mjs';
+export { b as getFetch } from './httpUtils-e8fecf0a.mjs';
+import { c as createHTTPBatchLink } from './httpBatchLink-64296887.mjs';
+export { h as httpBatchLink } from './httpBatchLink-64296887.mjs';
 import { httpLinkFactory } from './links/httpLink.mjs';
 export { httpLink, httpLinkFactory } from './links/httpLink.mjs';
 export { loggerLink } from './links/loggerLink.mjs';

package/dist/links/httpBatchLink.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var links_httpBatchLink = require('../httpBatchLink-3d721a5c.js');
-require('../httpUtils-fd6f3ad7.js');
+var links_httpBatchLink = require('../httpBatchLink-8b963505.js');
+require('../httpUtils-b94fce6f.js');
 require('@trpc/server/observable');
 require('../transformResult-26a22823.js');
 require('../TRPCClientError-dffb44e0.js');

package/dist/links/httpBatchLink.mjs

@@ -1,5 +1,5 @@
-export { h as httpBatchLink } from '../httpBatchLink-520db465.mjs';
-import '../httpUtils-ad76b802.mjs';
+export { h as httpBatchLink } from '../httpBatchLink-64296887.mjs';
+import '../httpUtils-e8fecf0a.mjs';
 import '@trpc/server/observable';
 import '../transformResult-7ab522e6.mjs';
 import '../TRPCClientError-fef6cf44.mjs';

package/dist/links/httpLink.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var observable = require('@trpc/server/observable');
 var transformResult = require('../transformResult-26a22823.js');
 var TRPCClientError = require('../TRPCClientError-dffb44e0.js');
-var httpUtils = require('../httpUtils-fd6f3ad7.js');
+var httpUtils = require('../httpUtils-b94fce6f.js');
 
 function httpLinkFactory(factoryOpts) {
     return (opts)=>{

package/dist/links/httpLink.mjs

@@ -1,7 +1,7 @@
 import { observable } from '@trpc/server/observable';
 import { t as transformResult } from '../transformResult-7ab522e6.mjs';
 import { T as TRPCClientError } from '../TRPCClientError-fef6cf44.mjs';
-import { r as resolveHTTPLinkOptions, j as jsonHttpRequester } from '../httpUtils-ad76b802.mjs';
+import { r as resolveHTTPLinkOptions, j as jsonHttpRequester } from '../httpUtils-e8fecf0a.mjs';
 
 function httpLinkFactory(factoryOpts) {
     return (opts)=>{

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":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE5E;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,eAAe,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC/C;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,eAAe,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC9C;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,mBAAmB,GACxB,uBAAuB,CAMzB;AAiBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE;QACJ,QAAQ,EAAE,aAAa,CAAC;QACxB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAED,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GAAG,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAAC,CAAC;AAUjD,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAClD,uBAAuB,GAAG;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,MAAM,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,MAAM,CAAC;AAC9D,MAAM,MAAM,OAAO,GAAG,CACpB,IAAI,EAAE,sBAAsB,KACzB,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAE9B,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,CAAC,EAAE,QAAQ,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,MAgBpB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,OAMrB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CACtB,IAAI,EAAE,sBAAsB,GAAG;IAC7B,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD,KACE,gBAAgB,CAAC,UAAU,CAAC,CAAC;AAElC,eAAO,MAAM,iBAAiB,EAAE,SAO/B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAC7C,sBAAsB,GAAG;IACvB,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,gBAAgB,CAAC;CAChC,CAAC;AAEJ,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,EACxB,EAAE,CAAC,EAAE,4BAA4B,GAAG,IAAI,0BA0BzC;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CAyB9B"}
+{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../src/links/internals/httpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE5E;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,eAAe,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC/C;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,eAAe,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC9C;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,mBAAmB,GACxB,uBAAuB,CAMzB;AAiBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE;QACJ,QAAQ,EAAE,aAAa,CAAC;QACxB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAED,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GAAG,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAAC,CAAC;AAUjD,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAClD,uBAAuB,GAAG;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,MAAM,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,MAAM,CAAC;AAC9D,MAAM,MAAM,OAAO,GAAG,CACpB,IAAI,EAAE,sBAAsB,KACzB,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAE9B,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,CAAC,EAAE,QAAQ,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,MAgBpB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,OAMrB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CACtB,IAAI,EAAE,sBAAsB,GAAG;IAC7B,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD,KACE,gBAAgB,CAAC,UAAU,CAAC,CAAC;AAElC,eAAO,MAAM,iBAAiB,EAAE,SAO/B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAC7C,sBAAsB,GAAG;IACvB,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,gBAAgB,CAAC;CAChC,CAAC;AAEJ,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,EACxB,EAAE,CAAC,EAAE,4BAA4B,GAAG,IAAI,0BA0BzC;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CA8B9B"}

package/links/formDataLink/index.d.ts

@@ -0,0 +1 @@
+export * from '../../dist/links/formDataLink';

package/links/formDataLink/index.js

@@ -0,0 +1 @@
+module.exports = require('../../dist/links/formDataLink');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.38.1",
+  "version": "10.38.2",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -24,7 +24,7 @@
   "scripts": {
     "build": "rollup --config rollup.config.ts --configPlugin rollup-plugin-swc3",
     "dev": "pnpm build --watch",
-    "codegen:entrypoints": "tsx entrypoints.script.ts",
+    "codegen-entrypoints": "tsx entrypoints.script.ts",
     "lint": "eslint --cache --ext \".js,.ts,.tsx\" --ignore-path ../../.gitignore --report-unused-disable-directives src",
     "ts-watch": "tsc --project tsconfig.watch.json"
   },
@@ -76,11 +76,11 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "10.38.1"
+    "@trpc/server": "10.38.2"
   },
   "devDependencies": {
     "@testing-library/dom": "^9.0.0",
-    "@trpc/server": "10.38.1",
+    "@trpc/server": "10.38.2",
     "@types/isomorphic-fetch": "^0.0.36",
     "@types/node": "^18.16.16",
     "eslint": "^8.40.0",
@@ -98,5 +98,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "c48811ab55efbec8d1a9db778c46be2dc5c25818"
+  "gitHead": "3ae64cc8b8c73306d6b022dec9eae769b246b0fb"
 }

package/src/links/internals/httpUtils.ts

@@ -180,10 +180,12 @@ export function httpRequest(
   const ac = opts.AbortController ? new opts.AbortController() : null;
   const meta = {} as HTTPResult['meta'];
 
+  let done = false;
   const promise = new Promise<HTTPResult>((resolve, reject) => {
     fetchHTTPResponse(opts, ac)
       .then((_res) => {
         meta.response = _res;
+        done = true;
         return _res.json();
       })
       .then((json) => {
@@ -194,11 +196,14 @@ export function httpRequest(
         });
       })
       .catch((err) => {
+        done = true;
         reject(TRPCClientError.from(err, { meta }));
       });
   });
   const cancel = () => {
-    ac?.abort();
+    if (!done) {
+      ac?.abort();
+    }
   };
   return { promise, cancel };
 }

package/links/shared/index.d.ts

@@ -1 +0,0 @@
-export * from '../../dist/links/shared';

package/links/shared/index.js

@@ -1 +0,0 @@
-module.exports = require('../../dist/links/shared');

package/links/ssrLink/index.d.ts

@@ -1 +0,0 @@
-export * from '../../dist/links/ssrLink';

package/links/ssrLink/index.js

@@ -1 +0,0 @@
-module.exports = require('../../dist/links/ssrLink');