@trpc/client 10.24.0 → 10.25.1

package/dist/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
-var transformResult = require('./transformResult-12020457.js');
+var transformResult = require('./transformResult-ee98835f.js');
 var links_splitLink = require('./splitLink-f29e84be.js');
 var shared = require('@trpc/server/shared');
 var httpUtils = require('./httpUtils-90a6bccb.js');
@@ -11,7 +11,6 @@ var links_httpBatchLink = require('./links/httpBatchLink.js');
 var links_httpLink = require('./links/httpLink.js');
 var links_loggerLink = require('./links/loggerLink.js');
 var links_wsLink = require('./links/wsLink.js');
-require('./isObject-617ad59e.js');
 
 class TRPCUntypedClient {
     $request({ type , input , path , context ={}  }) {

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { share, observableToPromise } from '@trpc/server/observable';
-import { T as TRPCClientError } from './transformResult-403dc1d4.mjs';
-export { T as TRPCClientError } from './transformResult-403dc1d4.mjs';
+import { T as TRPCClientError } from './transformResult-a4d3dad0.mjs';
+export { T as TRPCClientError } from './transformResult-a4d3dad0.mjs';
 import { c as createChain } from './splitLink-4c75f7be.mjs';
 export { s as splitLink } from './splitLink-4c75f7be.mjs';
 import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared';
@@ -11,7 +11,6 @@ import { httpLinkFactory } from './links/httpLink.mjs';
 export { httpLink, httpLinkFactory } from './links/httpLink.mjs';
 export { loggerLink } from './links/loggerLink.mjs';
 export { createWSClient, wsLink } from './links/wsLink.mjs';
-import './isObject-3ec9fe00.mjs';
 
 class TRPCUntypedClient {
     $request({ type , input , path , context ={}  }) {

package/dist/links/httpBatchLink.js

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
-var transformResult = require('../transformResult-12020457.js');
+var transformResult = require('../transformResult-ee98835f.js');
 var httpUtils = require('../httpUtils-90a6bccb.js');
-require('../isObject-617ad59e.js');
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
  * A function that should never be called unless we messed something up.

package/dist/links/httpBatchLink.mjs

@@ -1,7 +1,6 @@
 import { observable } from '@trpc/server/observable';
-import { t as transformResult, T as TRPCClientError } from '../transformResult-403dc1d4.mjs';
+import { t as transformResult, T as TRPCClientError } from '../transformResult-a4d3dad0.mjs';
 import { r as resolveHTTPLinkOptions, a as getUrl, j as jsonHttpRequester } from '../httpUtils-8a5c637a.mjs';
-import '../isObject-3ec9fe00.mjs';
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
  * A function that should never be called unless we messed something up.

package/dist/links/httpLink.js

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
-var transformResult = require('../transformResult-12020457.js');
+var transformResult = require('../transformResult-ee98835f.js');
 var httpUtils = require('../httpUtils-90a6bccb.js');
-require('../isObject-617ad59e.js');
 
 function httpLinkFactory(factoryOpts) {
     return (opts)=>{

package/dist/links/httpLink.mjs

@@ -1,7 +1,6 @@
 import { observable } from '@trpc/server/observable';
-import { t as transformResult, T as TRPCClientError } from '../transformResult-403dc1d4.mjs';
+import { t as transformResult, T as TRPCClientError } from '../transformResult-a4d3dad0.mjs';
 import { r as resolveHTTPLinkOptions, j as jsonHttpRequester } from '../httpUtils-8a5c637a.mjs';
-import '../isObject-3ec9fe00.mjs';
 
 function httpLinkFactory(factoryOpts) {
     return (opts)=>{

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

@@ -1 +1 @@
-{"version":3,"file":"loggerLink.d.ts","sourceRoot":"","sources":["../../src/links/loggerLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEvE,aAAK,YAAY,GAAG;IAClB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACjC,CAAC;AAEF,aAAK,eAAe,CAAC,OAAO,SAAS,SAAS,IAC1C,CAAC,SAAS,GAAG;IACX,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC,GACF;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;CACrE,CAAC;AACN,aAAK,SAAS,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1C,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,KAC3B,OAAO,CAAC;AAEb,aAAK,mBAAmB,CAAC,OAAO,SAAS,SAAS,IAAI,SAAS,GAC7D,CACI;IACE;;OAEG;IACH,SAAS,EAAE,IAAI,CAAC;CACjB,GACD;IACE;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACpE,SAAS,EAAE,MAAM,CAAC;CACnB,CACJ,CAAC;AAEJ,aAAK,YAAY,CAAC,OAAO,SAAS,SAAS,IAAI,CAC7C,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,KAC/B,IAAI,CAAC;AAOV,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,SAAS;IAC1D,MAAM,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB;AAgED,wBAAgB,UAAU,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC9D,IAAI,GAAE,iBAAiB,CAAC,OAAO,CAAM,GACpC,QAAQ,CAAC,OAAO,CAAC,CA2CnB"}
+{"version":3,"file":"loggerLink.d.ts","sourceRoot":"","sources":["../../src/links/loggerLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEvE,aAAK,YAAY,GAAG;IAClB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACjC,CAAC;AAEF,aAAK,eAAe,CAAC,OAAO,SAAS,SAAS,IAC1C,CAAC,SAAS,GAAG;IACX,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC,GACF;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;CACrE,CAAC;AACN,aAAK,SAAS,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1C,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,KAC3B,OAAO,CAAC;AAEb,aAAK,mBAAmB,CAAC,OAAO,SAAS,SAAS,IAAI,SAAS,GAC7D,CACI;IACE;;OAEG;IACH,SAAS,EAAE,IAAI,CAAC;CACjB,GACD;IACE;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACpE,SAAS,EAAE,MAAM,CAAC;CACnB,CACJ,CAAC;AAEJ,aAAK,YAAY,CAAC,OAAO,SAAS,SAAS,IAAI,CAC7C,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,KAC/B,IAAI,CAAC;AAOV,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,SAAS;IAC1D,MAAM,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB;AAqED,wBAAgB,UAAU,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC9D,IAAI,GAAE,iBAAiB,CAAC,OAAO,CAAM,GACpC,QAAQ,CAAC,OAAO,CAAC,CA2CnB"}

package/dist/links/loggerLink.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
-var isObject = require('../isObject-617ad59e.js');
 
 const palette = {
     query: [
@@ -26,12 +25,19 @@ function isFormData(value) {
     }
     return value instanceof FormData;
 }
+function fromEntries(fd) {
+    const result = {};
+    for (const [key, value] of fd){
+        result[key] = value;
+    }
+    return result;
+}
 // maybe this should be moved to it's own package
 const defaultLogger = (c = console)=>(props)=>{
         const { direction , type , path , context , id  } = props;
         const [light, dark] = palette[type];
         const rawInput = props.input;
-        const input = isObject.isObject(rawInput) && isFormData(rawInput) ? Object.fromEntries(rawInput) : props.input;
+        const input = isFormData(rawInput) ? fromEntries(rawInput) : rawInput;
         const css = `
     background-color: #${direction === 'up' ? light : dark}; 
     color: ${direction === 'up' ? 'black' : 'white'};

package/dist/links/loggerLink.mjs

@@ -1,5 +1,4 @@
 import { observable, tap } from '@trpc/server/observable';
-import { i as isObject } from '../isObject-3ec9fe00.mjs';
 
 const palette = {
     query: [
@@ -22,12 +21,19 @@ function isFormData(value) {
     }
     return value instanceof FormData;
 }
+function fromEntries(fd) {
+    const result = {};
+    for (const [key, value] of fd){
+        result[key] = value;
+    }
+    return result;
+}
 // maybe this should be moved to it's own package
 const defaultLogger = (c = console)=>(props)=>{
         const { direction , type , path , context , id  } = props;
         const [light, dark] = palette[type];
         const rawInput = props.input;
-        const input = isObject(rawInput) && isFormData(rawInput) ? Object.fromEntries(rawInput) : props.input;
+        const input = isFormData(rawInput) ? fromEntries(rawInput) : rawInput;
         const css = `
     background-color: #${direction === 'up' ? light : dark}; 
     color: ${direction === 'up' ? 'black' : 'white'};

package/dist/links/wsLink.js

@@ -3,13 +3,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
-var transformResult = require('../transformResult-12020457.js');
-require('../isObject-617ad59e.js');
+var transformResult = require('../transformResult-ee98835f.js');
 
 /* istanbul ignore next -- @preserve */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
 
 function createWSClient(opts) {
-    const { url , WebSocket: WebSocketImpl = WebSocket , retryDelayMs: retryDelayFn = retryDelay , onOpen , onClose  } = opts;
+    const { url , WebSocket: WebSocketImpl = WebSocket , retryDelayMs: retryDelayFn = retryDelay , onOpen , onClose ,  } = opts;
     /* istanbul ignore next -- @preserve */ if (!WebSocketImpl) {
         throw new Error("No WebSocket implementation found - you probably don't want to use this on the server, but if you do you need to pass a `WebSocket`-ponyfill");
     }

package/dist/links/wsLink.mjs

@@ -1,11 +1,10 @@
 import { observable } from '@trpc/server/observable';
-import { T as TRPCClientError, t as transformResult } from '../transformResult-403dc1d4.mjs';
-import '../isObject-3ec9fe00.mjs';
+import { T as TRPCClientError, t as transformResult } from '../transformResult-a4d3dad0.mjs';
 
 /* istanbul ignore next -- @preserve */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
 
 function createWSClient(opts) {
-    const { url , WebSocket: WebSocketImpl = WebSocket , retryDelayMs: retryDelayFn = retryDelay , onOpen , onClose  } = opts;
+    const { url , WebSocket: WebSocketImpl = WebSocket , retryDelayMs: retryDelayFn = retryDelay , onOpen , onClose ,  } = opts;
     /* istanbul ignore next -- @preserve */ if (!WebSocketImpl) {
         throw new Error("No WebSocket implementation found - you probably don't want to use this on the server, but if you do you need to pass a `WebSocket`-ponyfill");
     }

package/dist/{transformResult-51c1bc81.js → transformResult-14403c95.js}

@@ -1,5 +1,3 @@
-import { i as isObject } from './isObject-246cec0f.js';
-
 class TRPCClientError extends Error {
     constructor(message, opts) {
         const cause = opts?.cause;
@@ -32,6 +30,11 @@ class TRPCClientError extends Error {
     }
 }
 
+function isObject(value) {
+    // check that value is object
+    return !!value && !Array.isArray(value) && typeof value === 'object';
+}
+
 // FIXME:
 // - the generics here are probably unnecessary
 // - the RPC-spec could probably be simplified to combine HTTP + WS

package/dist/{transformResult-403dc1d4.mjs → transformResult-a4d3dad0.mjs}

@@ -1,5 +1,3 @@
-import { i as isObject } from './isObject-3ec9fe00.mjs';
-
 class TRPCClientError extends Error {
     static from(cause, opts = {}) {
         if (!(cause instanceof Error)) {
@@ -34,6 +32,11 @@ class TRPCClientError extends Error {
     }
 }
 
+function isObject(value) {
+    // check that value is object
+    return !!value && !Array.isArray(value) && typeof value === 'object';
+}
+
 // FIXME:
 // - the generics here are probably unnecessary
 // - the RPC-spec could probably be simplified to combine HTTP + WS

package/dist/{transformResult-12020457.js → transformResult-ee98835f.js}

@@ -1,7 +1,5 @@
 'use strict';
 
-var isObject = require('./isObject-617ad59e.js');
-
 class TRPCClientError extends Error {
     static from(cause, opts = {}) {
         if (!(cause instanceof Error)) {
@@ -36,6 +34,11 @@ class TRPCClientError extends Error {
     }
 }
 
+function isObject(value) {
+    // check that value is object
+    return !!value && !Array.isArray(value) && typeof value === 'object';
+}
+
 // FIXME:
 // - the generics here are probably unnecessary
 // - the RPC-spec could probably be simplified to combine HTTP + WS
@@ -74,10 +77,10 @@ class TRPCClientError extends Error {
         throw new TRPCClientError('Unable to transform response from server');
     }
     // check that output of the transformers is a valid TRPCResponse
-    if (!result.ok && (!isObject.isObject(result.error.error) || typeof result.error.error.code !== 'number')) {
+    if (!result.ok && (!isObject(result.error.error) || typeof result.error.error.code !== 'number')) {
         throw new TRPCClientError('Badly formatted response from server');
     }
-    if (result.ok && !isObject.isObject(result.result)) {
+    if (result.ok && !isObject(result.result)) {
         throw new TRPCClientError('Badly formatted response from server');
     }
     return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.24.0",
+  "version": "10.25.1",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -69,24 +69,24 @@
     "links"
   ],
   "peerDependencies": {
-    "@trpc/server": "10.24.0"
+    "@trpc/server": "10.25.1"
   },
   "devDependencies": {
     "@testing-library/dom": "^9.0.0",
-    "@trpc/server": "10.24.0",
+    "@trpc/server": "10.25.1",
     "@types/isomorphic-fetch": "^0.0.36",
     "@types/node": "^18.7.20",
-    "eslint": "^8.30.0",
+    "eslint": "^8.40.0",
     "expect-type": "^0.15.0",
     "isomorphic-fetch": "^3.0.0",
     "node-fetch": "^3.3.0",
     "rollup": "^2.79.1",
-    "tsx": "^3.12.3",
+    "tsx": "^3.12.7",
     "undici": "^5.14.0",
     "vitest": "^0.28.5"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "165ff9fe6d8c52cbdf413b1eac52d66a7c2205f0"
+  "gitHead": "712b2adfe369f19ebfdbed5e5637aef513d38aea"
 }

package/src/links/loggerLink.ts

@@ -1,7 +1,6 @@
 import { AnyRouter } from '@trpc/server';
 import { observable, tap } from '@trpc/server/observable';
 import { TRPCClientError } from '..';
-import { isObject } from './internals/isObject';
 import { Operation, OperationResultEnvelope, TRPCLink } from './types';
 
 type ConsoleEsque = {
@@ -65,6 +64,14 @@ function isFormData(value: unknown): value is FormData {
   return value instanceof FormData;
 }
 
+function fromEntries(fd: FormData) {
+  const result: Record<string, unknown> = {};
+  for (const [key, value] of fd) {
+    result[key] = value;
+  }
+  return result;
+}
+
 // maybe this should be moved to it's own package
 const defaultLogger =
   <TRouter extends AnyRouter>(
@@ -76,10 +83,7 @@ const defaultLogger =
 
     const rawInput = props.input;
 
-    const input =
-      isObject(rawInput) && isFormData(rawInput)
-        ? Object.fromEntries(rawInput)
-        : props.input;
+    const input = isFormData(rawInput) ? fromEntries(rawInput) : rawInput;
 
     const css = `
     background-color: #${direction === 'up' ? light : dark}; 

package/dist/isObject-246cec0f.js

@@ -1,6 +0,0 @@
-function isObject(value) {
-    // check that value is object
-    return !!value && !Array.isArray(value) && typeof value === 'object';
-}
-
-export { isObject as i };

package/dist/isObject-3ec9fe00.mjs

@@ -1,6 +0,0 @@
-function isObject(value) {
-    // check that value is object
-    return !!value && !Array.isArray(value) && typeof value === 'object';
-}
-
-export { isObject as i };

package/dist/isObject-617ad59e.js

@@ -1,8 +0,0 @@
-'use strict';
-
-function isObject(value) {
-    // check that value is object
-    return !!value && !Array.isArray(value) && typeof value === 'object';
-}
-
-exports.isObject = isObject;