@trpc/client 10.0.0-alpha.45 → 10.0.0-alpha.46

package/dist/splitLink-695ae288.js

@@ -0,0 +1,48 @@
+'use strict';
+
+var observable = require('@trpc/server/observable');
+
+/** @internal */ function createChain(opts) {
+    return observable.observable((observer)=>{
+        function execute(index = 0, op = opts.op) {
+            const next = opts.links[index];
+            if (!next) {
+                throw new Error('No more links to execute - did you forget to add an ending link?');
+            }
+            const subscription = next({
+                op,
+                next (nextOp) {
+                    const nextObserver = execute(index + 1, nextOp);
+                    return nextObserver;
+                }
+            });
+            return subscription;
+        }
+        const obs$ = execute();
+        return obs$.subscribe(observer);
+    });
+}
+
+function asArray(value) {
+    return Array.isArray(value) ? value : [
+        value
+    ];
+}
+function splitLink(opts) {
+    return (runtime)=>{
+        const yes = asArray(opts.true).map((link)=>link(runtime));
+        const no = asArray(opts.false).map((link)=>link(runtime));
+        return (props)=>{
+            return observable.observable((observer)=>{
+                const links = opts.condition(props.op) ? yes : no;
+                return createChain({
+                    op: props.op,
+                    links
+                }).subscribe(observer);
+            });
+        };
+    };
+}
+
+exports.createChain = createChain;
+exports.splitLink = splitLink;

package/dist/splitLink-ad44a55d.mjs

@@ -0,0 +1,45 @@
+import { observable } from '@trpc/server/observable';
+
+/** @internal */ function createChain(opts) {
+    return observable((observer)=>{
+        function execute(index = 0, op = opts.op) {
+            const next = opts.links[index];
+            if (!next) {
+                throw new Error('No more links to execute - did you forget to add an ending link?');
+            }
+            const subscription = next({
+                op,
+                next (nextOp) {
+                    const nextObserver = execute(index + 1, nextOp);
+                    return nextObserver;
+                }
+            });
+            return subscription;
+        }
+        const obs$ = execute();
+        return obs$.subscribe(observer);
+    });
+}
+
+function asArray(value) {
+    return Array.isArray(value) ? value : [
+        value
+    ];
+}
+function splitLink(opts) {
+    return (runtime)=>{
+        const yes = asArray(opts.true).map((link)=>link(runtime));
+        const no = asArray(opts.false).map((link)=>link(runtime));
+        return (props)=>{
+            return observable((observer)=>{
+                const links = opts.condition(props.op) ? yes : no;
+                return createChain({
+                    op: props.op,
+                    links
+                }).subscribe(observer);
+            });
+        };
+    };
+}
+
+export { createChain as c, splitLink as s };

package/dist/transformResult-106791d7.mjs

@@ -0,0 +1,62 @@
+class TRPCClientError extends Error {
+    static from(cause, opts = {}) {
+        if (!(cause instanceof Error)) {
+            return new TRPCClientError(cause.error.message ?? '', {
+                ...opts,
+                cause: undefined,
+                result: cause
+            });
+        }
+        if (cause.name === 'TRPCClientError') {
+            return cause;
+        }
+        return new TRPCClientError(cause.message, {
+            ...opts,
+            cause,
+            result: null
+        });
+    }
+    constructor(message, opts){
+        const cause = opts?.cause;
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore https://github.com/tc39/proposal-error-cause
+        super(message, {
+            cause
+        });
+        this.meta = opts?.meta;
+        this.cause = cause;
+        this.shape = opts?.result?.error;
+        this.data = opts?.result?.error.data;
+        this.name = 'TRPCClientError';
+        Object.setPrototypeOf(this, TRPCClientError.prototype);
+    }
+}
+
+// FIXME:
+// - the generics here are probably unnecessary
+// - the RPC-spec could probably be simplified to combine HTTP + WS
+/** @internal */ function transformResult(response, runtime) {
+    if ('error' in response) {
+        const error = runtime.transformer.deserialize(response.error);
+        return {
+            ok: false,
+            error: {
+                ...response,
+                error
+            }
+        };
+    }
+    const result = {
+        ...response.result,
+        ...(!response.result.type || response.result.type === 'data') && {
+            type: 'data',
+            data: runtime.transformer.deserialize(response.result.data)
+        }
+    };
+    return {
+        ok: true,
+        result
+    };
+}
+
+export { TRPCClientError as T, transformResult as t };

package/dist/transformResult-e15ccdf6.js

@@ -0,0 +1,65 @@
+'use strict';
+
+class TRPCClientError extends Error {
+    static from(cause, opts = {}) {
+        if (!(cause instanceof Error)) {
+            return new TRPCClientError(cause.error.message ?? '', {
+                ...opts,
+                cause: undefined,
+                result: cause
+            });
+        }
+        if (cause.name === 'TRPCClientError') {
+            return cause;
+        }
+        return new TRPCClientError(cause.message, {
+            ...opts,
+            cause,
+            result: null
+        });
+    }
+    constructor(message, opts){
+        const cause = opts?.cause;
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore https://github.com/tc39/proposal-error-cause
+        super(message, {
+            cause
+        });
+        this.meta = opts?.meta;
+        this.cause = cause;
+        this.shape = opts?.result?.error;
+        this.data = opts?.result?.error.data;
+        this.name = 'TRPCClientError';
+        Object.setPrototypeOf(this, TRPCClientError.prototype);
+    }
+}
+
+// FIXME:
+// - the generics here are probably unnecessary
+// - the RPC-spec could probably be simplified to combine HTTP + WS
+/** @internal */ function transformResult(response, runtime) {
+    if ('error' in response) {
+        const error = runtime.transformer.deserialize(response.error);
+        return {
+            ok: false,
+            error: {
+                ...response,
+                error
+            }
+        };
+    }
+    const result = {
+        ...response.result,
+        ...(!response.result.type || response.result.type === 'data') && {
+            type: 'data',
+            data: runtime.transformer.deserialize(response.result.data)
+        }
+    };
+    return {
+        ok: true,
+        result
+    };
+}
+
+exports.TRPCClientError = TRPCClientError;
+exports.transformResult = transformResult;

package/links/httpBatchLink/index.d.ts

@@ -1 +1 @@
-export * from '../../dist/./links/httpBatchLink';
+export * from '../../dist/links/httpBatchLink';

package/links/httpBatchLink/index.js

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

package/links/httpLink/index.d.ts

@@ -1 +1 @@
-export * from '../../dist/./links/httpLink';
+export * from '../../dist/links/httpLink';

package/links/httpLink/index.js

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

package/links/loggerLink/index.d.ts

@@ -1 +1 @@
-export * from '../../dist/./links/loggerLink';
+export * from '../../dist/links/loggerLink';

package/links/loggerLink/index.js

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

package/links/splitLink/index.d.ts

@@ -1 +1 @@
-export * from '../../dist/./links/splitLink';
+export * from '../../dist/links/splitLink';

package/links/splitLink/index.js

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

package/links/wsLink/index.d.ts

@@ -1 +1 @@
-export * from '../../dist/./links/wsLink';
+export * from '../../dist/links/wsLink';

package/links/wsLink/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.0.0-alpha.45",
+  "version": "10.0.0-alpha.46",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -54,26 +54,22 @@
     }
   },
   "files": [
-    "README.md",
     "dist",
-    "links",
-    "src"
+    "src",
+    "README.md",
+    "links"
   ],
   "scripts": {
-    "build": "rollup -c",
     "ts-watch": "tsc --project tsconfig.watch.json"
   },
-  "dependencies": {
-    "@babel/runtime": "^7.9.0"
-  },
   "peerDependencies": {
-    "@trpc/server": "10.0.0-alpha.45"
+    "@trpc/server": "10.0.0-alpha.46"
   },
   "devDependencies": {
-    "@trpc/server": "10.0.0-alpha.45"
+    "@trpc/server": "10.0.0-alpha.46"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "337fc1ec6ff60b1cd38a85ba4d564e96d6ba7a40"
+  "gitHead": "1dc2d31cafc22c6303445aa33d526fbd848ca141"
 }

package/src/internals/TRPCClient.ts

@@ -32,10 +32,6 @@ type CancellablePromise<T = unknown> = Promise<T> & {
   cancel: CancelFn;
 };
 
-let idCounter = 0;
-function getRequestId() {
-  return ++idCounter;
-}
 interface CreateTRPCClientBaseOptions {
   /**
    * Add ponyfill for fetch
@@ -79,7 +75,7 @@ export interface TRPCRequestOptions {
   /**
    * Pass additional context to links
    */
-  requestContext?: OperationContext;
+  context?: OperationContext;
 }
 
 export interface TRPCSubscriptionObserver<TValue, TError> {
@@ -114,10 +110,15 @@ export type AssertLegacyDef<TRouter extends AnyRouter> =
 export class TRPCClient<TRouter extends AnyRouter> {
   private readonly links: OperationLink<TRouter>[];
   public readonly runtime: TRPCClientRuntime;
+  private requestId: number;
+  private getRequestId() {
+    return ++this.requestId;
+  }
 
   constructor(opts: CreateTRPCClientOptions<TRouter>) {
     const _fetch = getFetch(opts?.fetch);
     const AC = getAbortController(opts?.AbortController);
+    this.requestId = 0;
 
     function getHeadersFn(): TRPCClientRuntime['headers'] {
       if (opts.headers) {
@@ -171,7 +172,7 @@ export class TRPCClient<TRouter extends AnyRouter> {
     const chain$ = createChain<TRouter, TInput, TOutput>({
       links: this.links as OperationLink<any, any, any>[],
       op: {
-        id: getRequestId(),
+        id: this.getRequestId(),
         type,
         path,
         input,
@@ -215,7 +216,7 @@ export class TRPCClient<TRouter extends AnyRouter> {
       TRPCRequestOptions?,
     ]
   ) {
-    const context = (args[1] as TRPCRequestOptions | undefined)?.requestContext;
+    const context = (args[1] as TRPCRequestOptions | undefined)?.context;
     return this.requestAsPromise<
       inferHandlerInput<AssertType<TQueries, ProcedureRecord>[TPath]>,
       inferProcedureOutput<TQueries[TPath]>
@@ -236,7 +237,7 @@ export class TRPCClient<TRouter extends AnyRouter> {
       TRPCRequestOptions?,
     ]
   ) {
-    const context = (args[1] as TRPCRequestOptions | undefined)?.requestContext;
+    const context = (args[1] as TRPCRequestOptions | undefined)?.context;
     return this.requestAsPromise<
       inferHandlerInput<AssertType<TMutations, ProcedureRecord>[TPath]>,
       inferProcedureOutput<TMutations[TPath]>
@@ -264,7 +265,7 @@ export class TRPCClient<TRouter extends AnyRouter> {
       type: 'subscription',
       path,
       input,
-      context: opts.requestContext,
+      context: opts?.context,
     });
     return observable$.subscribe({
       next(envelope) {

package/src/links/wsLink.ts

@@ -317,7 +317,7 @@ export function wsLink<TRouter extends AnyRouter>(
           {
             error(err) {
               isDone = true;
-              observer.error(err as any);
+              observer.error(err);
               unsub();
             },
             complete() {

package/dist/httpUtils-089853f6.mjs

@@ -1,99 +0,0 @@
-import _defineProperty from '@babel/runtime/helpers/defineProperty';
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-// https://github.com/trpc/trpc/pull/669
-function arrayToDict(array) {
-  var dict = {};
-
-  for (var index = 0; index < array.length; index++) {
-    var element = array[index];
-    dict[index] = element;
-  }
-
-  return dict;
-}
-
-var METHOD = {
-  query: 'GET',
-  mutation: 'POST',
-  subscription: 'PATCH'
-};
-
-function getInput(opts) {
-  return 'input' in opts ? opts.runtime.transformer.serialize(opts.input) : arrayToDict(opts.inputs.map(function (_input) {
-    return opts.runtime.transformer.serialize(_input);
-  }));
-}
-
-function getUrl(opts) {
-  var url = opts.url + '/' + opts.path;
-  var queryParts = [];
-
-  if ('inputs' in opts) {
-    queryParts.push('batch=1');
-  }
-
-  if (opts.type === 'query') {
-    var input = getInput(opts);
-
-    if (input !== undefined) {
-      queryParts.push("input=".concat(encodeURIComponent(JSON.stringify(input))));
-    }
-  }
-
-  if (queryParts.length) {
-    url += '?' + queryParts.join('&');
-  }
-
-  return url;
-}
-function getBody(opts) {
-  if (opts.type === 'query') {
-    return undefined;
-  }
-
-  var input = getInput(opts);
-  return input !== undefined ? JSON.stringify(input) : undefined;
-}
-function httpRequest(opts) {
-  var type = opts.type,
-      runtime = opts.runtime;
-  var ac = runtime.AbortController ? new runtime.AbortController() : null;
-  var promise = new Promise(function (resolve, reject) {
-    var url = getUrl(opts);
-    var body = getBody(opts);
-    var meta = {};
-    Promise.resolve(runtime.headers()).then(function (headers) {
-      return runtime.fetch(url, {
-        method: METHOD[type],
-        signal: ac === null || ac === void 0 ? void 0 : ac.signal,
-        body: body,
-        headers: _objectSpread({
-          'content-type': 'application/json'
-        }, headers)
-      });
-    }).then(function (_res) {
-      meta.response = _res;
-      return _res.json();
-    }).then(function (json) {
-      resolve({
-        json: json,
-        meta: meta
-      });
-    }).catch(reject);
-  });
-
-  var cancel = function cancel() {
-    ac === null || ac === void 0 ? void 0 : ac.abort();
-  };
-
-  return {
-    promise: promise,
-    cancel: cancel
-  };
-}
-
-export { getUrl as g, httpRequest as h };

package/dist/httpUtils-a0169eef.js

@@ -1,106 +0,0 @@
-'use strict';
-
-var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-// https://github.com/trpc/trpc/pull/669
-function arrayToDict(array) {
-  var dict = {};
-
-  for (var index = 0; index < array.length; index++) {
-    var element = array[index];
-    dict[index] = element;
-  }
-
-  return dict;
-}
-
-var METHOD = {
-  query: 'GET',
-  mutation: 'POST',
-  subscription: 'PATCH'
-};
-
-function getInput(opts) {
-  return 'input' in opts ? opts.runtime.transformer.serialize(opts.input) : arrayToDict(opts.inputs.map(function (_input) {
-    return opts.runtime.transformer.serialize(_input);
-  }));
-}
-
-function getUrl(opts) {
-  var url = opts.url + '/' + opts.path;
-  var queryParts = [];
-
-  if ('inputs' in opts) {
-    queryParts.push('batch=1');
-  }
-
-  if (opts.type === 'query') {
-    var input = getInput(opts);
-
-    if (input !== undefined) {
-      queryParts.push("input=".concat(encodeURIComponent(JSON.stringify(input))));
-    }
-  }
-
-  if (queryParts.length) {
-    url += '?' + queryParts.join('&');
-  }
-
-  return url;
-}
-function getBody(opts) {
-  if (opts.type === 'query') {
-    return undefined;
-  }
-
-  var input = getInput(opts);
-  return input !== undefined ? JSON.stringify(input) : undefined;
-}
-function httpRequest(opts) {
-  var type = opts.type,
-      runtime = opts.runtime;
-  var ac = runtime.AbortController ? new runtime.AbortController() : null;
-  var promise = new Promise(function (resolve, reject) {
-    var url = getUrl(opts);
-    var body = getBody(opts);
-    var meta = {};
-    Promise.resolve(runtime.headers()).then(function (headers) {
-      return runtime.fetch(url, {
-        method: METHOD[type],
-        signal: ac === null || ac === void 0 ? void 0 : ac.signal,
-        body: body,
-        headers: _objectSpread({
-          'content-type': 'application/json'
-        }, headers)
-      });
-    }).then(function (_res) {
-      meta.response = _res;
-      return _res.json();
-    }).then(function (json) {
-      resolve({
-        json: json,
-        meta: meta
-      });
-    }).catch(reject);
-  });
-
-  var cancel = function cancel() {
-    ac === null || ac === void 0 ? void 0 : ac.abort();
-  };
-
-  return {
-    promise: promise,
-    cancel: cancel
-  };
-}
-
-exports.getUrl = getUrl;
-exports.httpRequest = httpRequest;

package/dist/index.ts.js

@@ -1 +0,0 @@
-

package/dist/links/httpBatchLink.ts.js

@@ -1 +0,0 @@
-

package/dist/links/httpLink.ts.js

@@ -1 +0,0 @@
-

package/dist/links/loggerLink.ts.js

@@ -1 +0,0 @@
-

package/dist/links/splitLink.ts.js

@@ -1 +0,0 @@
-

package/dist/links/wsLink.ts.js

@@ -1 +0,0 @@
-

package/dist/splitLink-0202cd7b.mjs

@@ -1,54 +0,0 @@
-import { observable } from '@trpc/server/observable';
-
-/** @internal */
-function createChain(opts) {
-  return observable(function (observer) {
-    function execute() {
-      var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-      var op = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : opts.op;
-      var next = opts.links[index];
-
-      if (!next) {
-        throw new Error('No more links to execute - did you forget to add an ending link?');
-      }
-
-      var subscription = next({
-        op: op,
-        next: function next(nextOp) {
-          var nextObserver = execute(index + 1, nextOp);
-          return nextObserver;
-        }
-      });
-      return subscription;
-    }
-
-    var obs$ = execute();
-    return obs$.subscribe(observer);
-  });
-}
-
-function asArray(value) {
-  return Array.isArray(value) ? value : [value];
-}
-
-function splitLink(opts) {
-  return function (runtime) {
-    var yes = asArray(opts.true).map(function (link) {
-      return link(runtime);
-    });
-    var no = asArray(opts.false).map(function (link) {
-      return link(runtime);
-    });
-    return function (props) {
-      return observable(function (observer) {
-        var links = opts.condition(props.op) ? yes : no;
-        return createChain({
-          op: props.op,
-          links: links
-        }).subscribe(observer);
-      });
-    };
-  };
-}
-
-export { createChain as c, splitLink as s };