@trpc/client 10.0.0-alpha.42 → 10.0.0-alpha.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (58) hide show
  1. package/dist/TRPCClientError.d.ts +1 -1
  2. package/dist/TRPCClientError.d.ts.map +1 -1
  3. package/dist/createTRPCClient.d.ts +1 -1
  4. package/dist/createTRPCClient.d.ts.map +1 -1
  5. package/dist/createTRPCClientProxy.d.ts +9 -3
  6. package/dist/createTRPCClientProxy.d.ts.map +1 -1
  7. package/dist/index.js +33 -97
  8. package/dist/index.mjs +30 -94
  9. package/dist/internals/TRPCClient.d.ts +19 -3
  10. package/dist/internals/TRPCClient.d.ts.map +1 -1
  11. package/dist/links/httpBatchLink.d.ts.map +1 -1
  12. package/dist/links/httpBatchLink.js +18 -1
  13. package/dist/links/httpBatchLink.mjs +18 -1
  14. package/dist/links/httpLink.d.ts.map +1 -1
  15. package/dist/links/httpLink.js +21 -2
  16. package/dist/links/httpLink.mjs +21 -2
  17. package/dist/links/internals/httpUtils.d.ts +4 -3
  18. package/dist/links/internals/httpUtils.d.ts.map +1 -1
  19. package/dist/links/internals/transformResult.d.ts +28 -0
  20. package/dist/links/internals/transformResult.d.ts.map +1 -0
  21. package/dist/links/loggerLink.d.ts +3 -3
  22. package/dist/links/loggerLink.d.ts.map +1 -1
  23. package/dist/links/loggerLink.js +1 -1
  24. package/dist/links/loggerLink.mjs +1 -1
  25. package/dist/links/types.d.ts +6 -8
  26. package/dist/links/types.d.ts.map +1 -1
  27. package/dist/links/wsLink.d.ts +9 -4
  28. package/dist/links/wsLink.d.ts.map +1 -1
  29. package/dist/links/wsLink.js +400 -12
  30. package/dist/links/wsLink.mjs +391 -10
  31. package/dist/transformResult-06bec648.mjs +108 -0
  32. package/dist/transformResult-3ccc74ea.js +122 -0
  33. package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.dev.js +4 -4
  34. package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.prod.js +4 -4
  35. package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.esm.js +1 -1
  36. package/links/httpLink/dist/trpc-client-links-httpLink.cjs.dev.js +4 -4
  37. package/links/httpLink/dist/trpc-client-links-httpLink.cjs.prod.js +4 -4
  38. package/links/httpLink/dist/trpc-client-links-httpLink.esm.js +1 -1
  39. package/package.json +4 -4
  40. package/src/TRPCClientError.ts +1 -1
  41. package/src/createTRPCClient.ts +1 -0
  42. package/src/createTRPCClientProxy.ts +17 -2
  43. package/src/internals/TRPCClient.ts +43 -35
  44. package/src/links/dedupeLink.test.ts +8 -14
  45. package/src/links/httpBatchLink.ts +17 -7
  46. package/src/links/httpLink.ts +14 -2
  47. package/src/links/internals/createChain.test.ts +18 -33
  48. package/src/links/internals/httpUtils.ts +6 -5
  49. package/src/links/internals/transformResult.ts +40 -0
  50. package/src/links/loggerLink.ts +5 -5
  51. package/src/links/retryLink.ts +1 -1
  52. package/src/links/types.ts +8 -10
  53. package/src/links/wsLink.ts +26 -7
  54. package/dist/links/internals/transformOperationResult.d.ts +0 -30
  55. package/dist/links/internals/transformOperationResult.d.ts.map +0 -1
  56. package/dist/wsLink-27b93bd0.mjs +0 -451
  57. package/dist/wsLink-44703a83.js +0 -467
  58. package/src/links/internals/transformOperationResult.ts +0 -53
@@ -11,7 +11,7 @@ export declare class TRPCClientError<TRouter extends AnyRouter> extends Error im
11
11
  readonly data: Maybe<inferRouterError<TRouter>['data']>;
12
12
  readonly meta: Record<string, unknown> | undefined;
13
13
  constructor(message: string, opts?: {
14
- result: Maybe<TRPCErrorResponse<inferRouterError<TRouter>>>;
14
+ result?: Maybe<TRPCErrorResponse<inferRouterError<TRouter>>>;
15
15
  cause?: Error;
16
16
  meta?: Record<string, unknown>;
17
17
  });
@@ -1 +1 @@
1
- {"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,WAAW,mBAAmB,CAAC,OAAO,SAAS,SAAS;IAC5D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;CACzD;AAED,qBAAa,eAAe,CAAC,OAAO,SAAS,SAAS,CACpD,SAAQ,KACR,YAAW,mBAAmB,CAAC,OAAO,CAAC;IAEvC,SAAgB,KAAK,oBAAC;IACtB,SAAgB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,SAAgB,IAAI,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/D,SAAgB,IAAI,sCAAC;gBAGnB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QACL,MAAM,EAAE,KAAK,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC5D,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC;WAkBW,IAAI,CAAC,OAAO,SAAS,SAAS,EAC1C,KAAK,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,EACrC,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,OAAO,CAAC;CAkB5B"}
1
+ {"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,WAAW,mBAAmB,CAAC,OAAO,SAAS,SAAS;IAC5D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;CACzD;AAED,qBAAa,eAAe,CAAC,OAAO,SAAS,SAAS,CACpD,SAAQ,KACR,YAAW,mBAAmB,CAAC,OAAO,CAAC;IAEvC,SAAgB,KAAK,oBAAC;IACtB,SAAgB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,SAAgB,IAAI,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/D,SAAgB,IAAI,sCAAC;gBAGnB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC7D,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC;WAkBW,IAAI,CAAC,OAAO,SAAS,SAAS,EAC1C,KAAK,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,EACrC,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,OAAO,CAAC;CAkB5B"}
@@ -1,5 +1,5 @@
1
1
  import type { AnyRouter } from '@trpc/server';
2
2
  import { TRPCClient as Client, CreateTRPCClientOptions } from './internals/TRPCClient';
3
3
  export declare function createTRPCClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): Client<TRouter>;
4
- export type { TRPCRequestOptions, CreateTRPCClientOptions, TRPCClient, } from './internals/TRPCClient';
4
+ export type { TRPCRequestOptions, CreateTRPCClientOptions, TRPCClient, AssertLegacyDef, } from './internals/TRPCClient';
5
5
  //# sourceMappingURL=createTRPCClient.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"createTRPCClient.d.ts","sourceRoot":"","sources":["../src/createTRPCClient.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EACL,UAAU,IAAI,MAAM,EACpB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,mBAIvC;AAID,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,UAAU,GACX,MAAM,wBAAwB,CAAC"}
1
+ {"version":3,"file":"createTRPCClient.d.ts","sourceRoot":"","sources":["../src/createTRPCClient.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EACL,UAAU,IAAI,MAAM,EACpB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,mBAIvC;AAID,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,UAAU,EACV,eAAe,GAChB,MAAM,wBAAwB,CAAC"}
@@ -2,6 +2,7 @@ import type { AnyRouter, OmitNeverKeys, Procedure, ProcedureArgs, ProcedureRoute
2
2
  import type { Unsubscribable, inferObservableValue } from '@trpc/server/observable';
3
3
  import type { TRPCResultMessage } from '@trpc/server/rpc';
4
4
  import { TRPCClientError } from './TRPCClientError';
5
+ import { CreateTRPCClientOptions } from './createTRPCClient';
5
6
  import { TRPCClient as Client, TRPCSubscriptionObserver } from './internals/TRPCClient';
6
7
  declare type Resolver<TProcedure extends Procedure<any>> = (...args: ProcedureArgs<TProcedure['_def']>) => Promise<inferProcedureOutput<TProcedure>>;
7
8
  declare type SubscriptionResolver<TProcedure extends Procedure<any>, TRouter extends AnyRouter> = (...args: [
@@ -23,9 +24,14 @@ declare type assertProcedure<T> = T extends Procedure<any> ? T : never;
23
24
  /**
24
25
  * @internal
25
26
  */
26
- declare type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord, TRouter extends AnyRouter> = {
27
- [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record'], TProcedures[TKey]> : DecorateProcedure<assertProcedure<TProcedures[TKey]>, TRouter>;
28
- };
27
+ declare type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord, TRouter extends AnyRouter> = OmitNeverKeys<{
28
+ [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record'], TProcedures[TKey]> : assertProcedure<TProcedures[TKey]>['_def']['_old'] extends true ? never : DecorateProcedure<assertProcedure<TProcedures[TKey]>, TRouter>;
29
+ }>;
30
+ /**
31
+ * @deprecated use createTRPCProxyClient instead
32
+ * @internal
33
+ */
29
34
  export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>): DecoratedProcedureRecord<TRouter["_def"]["record"], TRouter>;
35
+ export declare function createTRPCProxyClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): DecoratedProcedureRecord<TRouter["_def"]["record"], TRouter>;
30
36
  export {};
31
37
  //# sourceMappingURL=createTRPCClientProxy.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"createTRPCClientProxy.d.ts","sourceRoot":"","sources":["../src/createTRPCClientProxy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EACb,SAAS,EACT,aAAa,EACb,qBAAqB,EAErB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,UAAU,IAAI,MAAM,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC,aAAK,QAAQ,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAAI,CACjD,GAAG,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KACvC,OAAO,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;AAE/C,aAAK,oBAAoB,CACvB,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,EACjC,OAAO,SAAS,SAAS,IACvB,CACF,GAAG,IAAI,EAAE;IACP,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GACxC,OAAO,CACL,wBAAwB,CACtB,iBAAiB,CACf,oBAAoB,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CACvD,EACD,eAAe,CAAC,OAAO,CAAC,CACzB,CACF;CACJ,KACE,cAAc,CAAC;AAEpB,aAAK,iBAAiB,CACpB,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,EACjC,OAAO,SAAS,SAAS,IACvB,aAAa,CAAC;IAChB,KAAK,EAAE,UAAU,SAAS;QAAE,MAAM,EAAE,IAAI,CAAA;KAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;IAE1E,MAAM,EAAE,UAAU,SAAS;QAAE,SAAS,EAAE,IAAI,CAAA;KAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;IAE9E,SAAS,EAAE,UAAU,SAAS;QAAE,aAAa,EAAE,IAAI,CAAA;KAAE,GACjD,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,GACzC,KAAK,CAAC;CACX,CAAC,CAAC;AAEH,aAAK,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAE/D;;GAEG;AACH,aAAK,wBAAwB,CAC3B,WAAW,SAAS,qBAAqB,EACzC,OAAO,SAAS,SAAS,IACvB;KACD,IAAI,IAAI,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,SAAS,GAC5D,wBAAwB,CACtB,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACnC,WAAW,CAAC,IAAI,CAAC,CAClB,GACD,iBAAiB,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;CACnE,CAAC;AAWF,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,gEAWxB"}
1
+ {"version":3,"file":"createTRPCClientProxy.d.ts","sourceRoot":"","sources":["../src/createTRPCClientProxy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EACb,SAAS,EACT,aAAa,EACb,qBAAqB,EAErB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAoB,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EACL,UAAU,IAAI,MAAM,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC,aAAK,QAAQ,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAAI,CACjD,GAAG,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KACvC,OAAO,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;AAE/C,aAAK,oBAAoB,CACvB,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,EACjC,OAAO,SAAS,SAAS,IACvB,CACF,GAAG,IAAI,EAAE;IACP,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GACxC,OAAO,CACL,wBAAwB,CACtB,iBAAiB,CACf,oBAAoB,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CACvD,EACD,eAAe,CAAC,OAAO,CAAC,CACzB,CACF;CACJ,KACE,cAAc,CAAC;AAEpB,aAAK,iBAAiB,CACpB,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,EACjC,OAAO,SAAS,SAAS,IACvB,aAAa,CAAC;IAChB,KAAK,EAAE,UAAU,SAAS;QAAE,MAAM,EAAE,IAAI,CAAA;KAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;IAE1E,MAAM,EAAE,UAAU,SAAS;QAAE,SAAS,EAAE,IAAI,CAAA;KAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;IAE9E,SAAS,EAAE,UAAU,SAAS;QAAE,aAAa,EAAE,IAAI,CAAA;KAAE,GACjD,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,GACzC,KAAK,CAAC;CACX,CAAC,CAAC;AAEH,aAAK,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAE/D;;GAEG;AACH,aAAK,wBAAwB,CAC3B,WAAW,SAAS,qBAAqB,EACzC,OAAO,SAAS,SAAS,IACvB,aAAa,CAAC;KACf,IAAI,IAAI,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,SAAS,GAC5D,wBAAwB,CACtB,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACnC,WAAW,CAAC,IAAI,CAAC,CAClB,GACD,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,IAAI,GAC/D,KAAK,GACL,iBAAiB,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;CACnE,CAAC,CAAC;AAWH;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,gEAWxB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,gEAKvC"}
package/dist/index.js CHANGED
@@ -5,9 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
5
5
  var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
6
6
  var _createClass = require('@babel/runtime/helpers/createClass');
7
7
  var observable = require('@trpc/server/observable');
8
- var links_wsLink = require('./wsLink-44703a83.js');
8
+ var transformResult = require('./transformResult-3ccc74ea.js');
9
9
  var links_httpBatchLink = require('./links/httpBatchLink.js');
10
- var _defineProperty = require('@babel/runtime/helpers/defineProperty');
10
+ require('@babel/runtime/helpers/defineProperty');
11
11
  require('@babel/runtime/helpers/slicedToArray');
12
12
  var links_splitLink = require('./splitLink-23c5ce5c.js');
13
13
  require('@babel/runtime/helpers/assertThisInitialized');
@@ -19,13 +19,13 @@ var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
19
19
  var shared = require('@trpc/server/shared');
20
20
  var links_httpLink = require('./links/httpLink.js');
21
21
  var links_loggerLink = require('./links/loggerLink.js');
22
+ var links_wsLink = require('./links/wsLink.js');
22
23
  require('./httpUtils-a0169eef.js');
23
24
 
24
25
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
25
26
 
26
27
  var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallCheck);
27
28
  var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
28
- var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
29
29
  var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
30
30
 
31
31
  function getWindow() {
@@ -136,7 +136,7 @@ function retryLink(opts) {
136
136
  attempt();
137
137
  },
138
138
  next: function next(result) {
139
- if ('result' in result.data) {
139
+ if ('result' in result.result) {
140
140
  isDone = true;
141
141
  observer.next(result);
142
142
  return;
@@ -170,61 +170,6 @@ function retryLink(opts) {
170
170
  };
171
171
  }
172
172
 
173
- 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; }
174
-
175
- 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; }
176
-
177
- /** @internal */
178
- function transformOperationResult(result, runtime) {
179
- var context = result.context;
180
-
181
- if ('error' in result.data) {
182
- var error = links_wsLink.TRPCClientError.from(_objectSpread(_objectSpread({}, result.data), {}, {
183
- error: runtime.transformer.deserialize(result.data.error)
184
- }));
185
- return {
186
- ok: false,
187
- error: error,
188
- context: context
189
- };
190
- }
191
-
192
- var data = runtime.transformer.deserialize(result.data.result.data);
193
- return {
194
- ok: true,
195
- data: data,
196
- context: context
197
- };
198
- }
199
- /** @internal */
200
-
201
- function transformSubscriptionOperationResult(result, runtime) {
202
- var context = result.context;
203
-
204
- if ('error' in result.data) {
205
- var error = links_wsLink.TRPCClientError.from(_objectSpread(_objectSpread({}, result.data), {}, {
206
- error: runtime.transformer.deserialize(result.data.error)
207
- }), {
208
- meta: context
209
- });
210
- return {
211
- ok: false,
212
- error: error,
213
- context: context
214
- };
215
- }
216
-
217
- var data = _objectSpread(_objectSpread({}, result.data.result), result.data.result.type === 'data' && {
218
- data: runtime.transformer.deserialize(result.data.result.data)
219
- });
220
-
221
- return {
222
- ok: true,
223
- data: data,
224
- context: context
225
- };
226
- }
227
-
228
173
  var idCounter = 0;
229
174
 
230
175
  function getRequestId() {
@@ -309,8 +254,6 @@ var TRPCClient = /*#__PURE__*/function () {
309
254
  }, {
310
255
  key: "requestAsPromise",
311
256
  value: function requestAsPromise(opts) {
312
- var _this2 = this;
313
-
314
257
  var req$ = this.$request(opts);
315
258
 
316
259
  var _observableToPromise = observable.observableToPromise(req$),
@@ -318,17 +261,10 @@ var TRPCClient = /*#__PURE__*/function () {
318
261
  abort = _observableToPromise.abort;
319
262
 
320
263
  var cancellablePromise = new Promise(function (resolve, reject) {
321
- promise.then(function (result) {
322
- var transformed = transformOperationResult(result, _this2.runtime);
323
-
324
- if (transformed.ok) {
325
- resolve(transformed.data);
326
- return;
327
- }
328
-
329
- reject(transformed.error);
264
+ promise.then(function (envelope) {
265
+ resolve(envelope.result.data);
330
266
  }).catch(function (err) {
331
- reject(links_wsLink.TRPCClientError.from(err));
267
+ reject(transformResult.TRPCClientError.from(err));
332
268
  });
333
269
  });
334
270
  cancellablePromise.cancel = abort;
@@ -377,37 +313,26 @@ var TRPCClient = /*#__PURE__*/function () {
377
313
  input: input,
378
314
  context: opts.requestContext
379
315
  });
380
- var runtime = this.runtime;
381
316
  return observable$.subscribe({
382
- next: function next(result) {
383
- var _opts$onError;
384
-
385
- var transformed = transformSubscriptionOperationResult(result, runtime);
317
+ next: function next(envelope) {
318
+ if (envelope.result.type === 'started') {
319
+ var _opts$onStarted;
386
320
 
387
- if (transformed.ok) {
388
- if (transformed.data.type === 'started') {
389
- var _opts$onStarted;
321
+ (_opts$onStarted = opts.onStarted) === null || _opts$onStarted === void 0 ? void 0 : _opts$onStarted.call(opts);
322
+ } else if (envelope.result.type === 'stopped') {
323
+ var _opts$onStopped;
390
324
 
391
- (_opts$onStarted = opts.onStarted) === null || _opts$onStarted === void 0 ? void 0 : _opts$onStarted.call(opts);
392
- } else if (transformed.data.type === 'stopped') {
393
- var _opts$onStopped;
325
+ (_opts$onStopped = opts.onStopped) === null || _opts$onStopped === void 0 ? void 0 : _opts$onStopped.call(opts);
326
+ } else {
327
+ var _opts$onData;
394
328
 
395
- (_opts$onStopped = opts.onStopped) === null || _opts$onStopped === void 0 ? void 0 : _opts$onStopped.call(opts);
396
- } else if (transformed.data.type === 'data') {
397
- var _opts$onData;
398
-
399
- (_opts$onData = opts.onData) === null || _opts$onData === void 0 ? void 0 : _opts$onData.call(opts, transformed.data.data);
400
- }
401
-
402
- return;
329
+ (_opts$onData = opts.onData) === null || _opts$onData === void 0 ? void 0 : _opts$onData.call(opts, envelope.result.data);
403
330
  }
404
-
405
- (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, transformed.error);
406
331
  },
407
332
  error: function error(err) {
408
- var _opts$onError2;
333
+ var _opts$onError;
409
334
 
410
- (_opts$onError2 = opts.onError) === null || _opts$onError2 === void 0 ? void 0 : _opts$onError2.call(opts, err);
335
+ (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, err);
411
336
  },
412
337
  complete: function complete() {
413
338
  var _opts$onComplete;
@@ -432,6 +357,11 @@ var clientCallTypeMap = {
432
357
  mutate: 'mutation',
433
358
  subscribe: 'subscription'
434
359
  };
360
+ /**
361
+ * @deprecated use createTRPCProxyClient instead
362
+ * @internal
363
+ */
364
+
435
365
  function createTRPCClientProxy(client) {
436
366
  var proxy = shared.createProxy(function (_ref) {
437
367
  var _ref2;
@@ -448,16 +378,22 @@ function createTRPCClientProxy(client) {
448
378
  });
449
379
  return proxy;
450
380
  }
381
+ function createTRPCProxyClient(opts) {
382
+ var client = createTRPCClient(opts);
383
+ var proxy = createTRPCClientProxy(client);
384
+ return proxy;
385
+ }
451
386
 
452
- exports.TRPCClientError = links_wsLink.TRPCClientError;
453
- exports.createWSClient = links_wsLink.createWSClient;
454
- exports.wsLink = links_wsLink.wsLink;
387
+ exports.TRPCClientError = transformResult.TRPCClientError;
455
388
  exports.httpBatchLink = links_httpBatchLink.httpBatchLink;
456
389
  exports.splitLink = links_splitLink.splitLink;
457
390
  exports.httpLink = links_httpLink.httpLink;
458
391
  exports.loggerLink = links_loggerLink.loggerLink;
392
+ exports.createWSClient = links_wsLink.createWSClient;
393
+ exports.wsLink = links_wsLink.wsLink;
459
394
  exports.createTRPCClient = createTRPCClient;
460
395
  exports.createTRPCClientProxy = createTRPCClientProxy;
396
+ exports.createTRPCProxyClient = createTRPCProxyClient;
461
397
  exports.dedupeLink = dedupeLink;
462
398
  exports.getFetch = getFetch;
463
399
  exports.retryLink = retryLink;
package/dist/index.mjs CHANGED
@@ -1,11 +1,11 @@
1
1
  import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
2
2
  import _createClass from '@babel/runtime/helpers/createClass';
3
3
  import { observable, share, observableToPromise } from '@trpc/server/observable';
4
- import { T as TRPCClientError } from './wsLink-27b93bd0.mjs';
5
- export { T as TRPCClientError, c as createWSClient, w as wsLink } from './wsLink-27b93bd0.mjs';
4
+ import { T as TRPCClientError } from './transformResult-06bec648.mjs';
5
+ export { T as TRPCClientError } from './transformResult-06bec648.mjs';
6
6
  import { httpBatchLink } from './links/httpBatchLink.mjs';
7
7
  export { httpBatchLink } from './links/httpBatchLink.mjs';
8
- import _defineProperty from '@babel/runtime/helpers/defineProperty';
8
+ import '@babel/runtime/helpers/defineProperty';
9
9
  import '@babel/runtime/helpers/slicedToArray';
10
10
  import { c as createChain } from './splitLink-0202cd7b.mjs';
11
11
  export { s as splitLink } from './splitLink-0202cd7b.mjs';
@@ -18,6 +18,7 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
18
18
  import { createProxy } from '@trpc/server/shared';
19
19
  export { httpLink } from './links/httpLink.mjs';
20
20
  export { loggerLink } from './links/loggerLink.mjs';
21
+ export { createWSClient, wsLink } from './links/wsLink.mjs';
21
22
  import './httpUtils-089853f6.mjs';
22
23
 
23
24
  function getWindow() {
@@ -128,7 +129,7 @@ function retryLink(opts) {
128
129
  attempt();
129
130
  },
130
131
  next: function next(result) {
131
- if ('result' in result.data) {
132
+ if ('result' in result.result) {
132
133
  isDone = true;
133
134
  observer.next(result);
134
135
  return;
@@ -162,61 +163,6 @@ function retryLink(opts) {
162
163
  };
163
164
  }
164
165
 
165
- 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; }
166
-
167
- 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; }
168
-
169
- /** @internal */
170
- function transformOperationResult(result, runtime) {
171
- var context = result.context;
172
-
173
- if ('error' in result.data) {
174
- var error = TRPCClientError.from(_objectSpread(_objectSpread({}, result.data), {}, {
175
- error: runtime.transformer.deserialize(result.data.error)
176
- }));
177
- return {
178
- ok: false,
179
- error: error,
180
- context: context
181
- };
182
- }
183
-
184
- var data = runtime.transformer.deserialize(result.data.result.data);
185
- return {
186
- ok: true,
187
- data: data,
188
- context: context
189
- };
190
- }
191
- /** @internal */
192
-
193
- function transformSubscriptionOperationResult(result, runtime) {
194
- var context = result.context;
195
-
196
- if ('error' in result.data) {
197
- var error = TRPCClientError.from(_objectSpread(_objectSpread({}, result.data), {}, {
198
- error: runtime.transformer.deserialize(result.data.error)
199
- }), {
200
- meta: context
201
- });
202
- return {
203
- ok: false,
204
- error: error,
205
- context: context
206
- };
207
- }
208
-
209
- var data = _objectSpread(_objectSpread({}, result.data.result), result.data.result.type === 'data' && {
210
- data: runtime.transformer.deserialize(result.data.result.data)
211
- });
212
-
213
- return {
214
- ok: true,
215
- data: data,
216
- context: context
217
- };
218
- }
219
-
220
166
  var idCounter = 0;
221
167
 
222
168
  function getRequestId() {
@@ -301,8 +247,6 @@ var TRPCClient = /*#__PURE__*/function () {
301
247
  }, {
302
248
  key: "requestAsPromise",
303
249
  value: function requestAsPromise(opts) {
304
- var _this2 = this;
305
-
306
250
  var req$ = this.$request(opts);
307
251
 
308
252
  var _observableToPromise = observableToPromise(req$),
@@ -310,15 +254,8 @@ var TRPCClient = /*#__PURE__*/function () {
310
254
  abort = _observableToPromise.abort;
311
255
 
312
256
  var cancellablePromise = new Promise(function (resolve, reject) {
313
- promise.then(function (result) {
314
- var transformed = transformOperationResult(result, _this2.runtime);
315
-
316
- if (transformed.ok) {
317
- resolve(transformed.data);
318
- return;
319
- }
320
-
321
- reject(transformed.error);
257
+ promise.then(function (envelope) {
258
+ resolve(envelope.result.data);
322
259
  }).catch(function (err) {
323
260
  reject(TRPCClientError.from(err));
324
261
  });
@@ -369,37 +306,26 @@ var TRPCClient = /*#__PURE__*/function () {
369
306
  input: input,
370
307
  context: opts.requestContext
371
308
  });
372
- var runtime = this.runtime;
373
309
  return observable$.subscribe({
374
- next: function next(result) {
375
- var _opts$onError;
376
-
377
- var transformed = transformSubscriptionOperationResult(result, runtime);
378
-
379
- if (transformed.ok) {
380
- if (transformed.data.type === 'started') {
381
- var _opts$onStarted;
310
+ next: function next(envelope) {
311
+ if (envelope.result.type === 'started') {
312
+ var _opts$onStarted;
382
313
 
383
- (_opts$onStarted = opts.onStarted) === null || _opts$onStarted === void 0 ? void 0 : _opts$onStarted.call(opts);
384
- } else if (transformed.data.type === 'stopped') {
385
- var _opts$onStopped;
314
+ (_opts$onStarted = opts.onStarted) === null || _opts$onStarted === void 0 ? void 0 : _opts$onStarted.call(opts);
315
+ } else if (envelope.result.type === 'stopped') {
316
+ var _opts$onStopped;
386
317
 
387
- (_opts$onStopped = opts.onStopped) === null || _opts$onStopped === void 0 ? void 0 : _opts$onStopped.call(opts);
388
- } else if (transformed.data.type === 'data') {
389
- var _opts$onData;
318
+ (_opts$onStopped = opts.onStopped) === null || _opts$onStopped === void 0 ? void 0 : _opts$onStopped.call(opts);
319
+ } else {
320
+ var _opts$onData;
390
321
 
391
- (_opts$onData = opts.onData) === null || _opts$onData === void 0 ? void 0 : _opts$onData.call(opts, transformed.data.data);
392
- }
393
-
394
- return;
322
+ (_opts$onData = opts.onData) === null || _opts$onData === void 0 ? void 0 : _opts$onData.call(opts, envelope.result.data);
395
323
  }
396
-
397
- (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, transformed.error);
398
324
  },
399
325
  error: function error(err) {
400
- var _opts$onError2;
326
+ var _opts$onError;
401
327
 
402
- (_opts$onError2 = opts.onError) === null || _opts$onError2 === void 0 ? void 0 : _opts$onError2.call(opts, err);
328
+ (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, err);
403
329
  },
404
330
  complete: function complete() {
405
331
  var _opts$onComplete;
@@ -424,6 +350,11 @@ var clientCallTypeMap = {
424
350
  mutate: 'mutation',
425
351
  subscribe: 'subscription'
426
352
  };
353
+ /**
354
+ * @deprecated use createTRPCProxyClient instead
355
+ * @internal
356
+ */
357
+
427
358
  function createTRPCClientProxy(client) {
428
359
  var proxy = createProxy(function (_ref) {
429
360
  var _ref2;
@@ -440,5 +371,10 @@ function createTRPCClientProxy(client) {
440
371
  });
441
372
  return proxy;
442
373
  }
374
+ function createTRPCProxyClient(opts) {
375
+ var client = createTRPCClient(opts);
376
+ var proxy = createTRPCClientProxy(client);
377
+ return proxy;
378
+ }
443
379
 
444
- export { createTRPCClient, createTRPCClientProxy, dedupeLink, getFetch, retryLink };
380
+ export { createTRPCClient, createTRPCClientProxy, createTRPCProxyClient, dedupeLink, getFetch, retryLink };
@@ -1,4 +1,5 @@
1
1
  import { AnyRouter, ClientDataTransformerOptions, inferHandlerInput, inferProcedureInput, inferProcedureOutput, inferSubscriptionOutput } from '@trpc/server';
2
+ import { ProcedureRecord } from '@trpc/server';
2
3
  import { Unsubscribable } from '@trpc/server/observable';
3
4
  import { CancelFn } from '..';
4
5
  import { TRPCClientError } from '../TRPCClientError';
@@ -54,15 +55,30 @@ export interface TRPCSubscriptionObserver<TValue, TError> {
54
55
  }
55
56
  /** @internal */
56
57
  export declare type CreateTRPCClientOptions<TRouter extends AnyRouter> = CreateTRPCClientWithLinksOptions<TRouter> | CreateTRPCClientWithURLOptions;
58
+ export declare type AssertType<T, K> = T extends K ? T : never;
59
+ /**
60
+ * @deprecated
61
+ */
62
+ export declare type AssertLegacyDef<TRouter extends AnyRouter> = TRouter['_def']['legacy'] extends Record<'subscriptions' | 'queries' | 'mutations', ProcedureRecord> ? TRouter['_def']['legacy'] : {
63
+ subscriptions: {};
64
+ queries: {};
65
+ mutations: {};
66
+ };
57
67
  export declare class TRPCClient<TRouter extends AnyRouter> {
58
68
  private readonly links;
59
69
  readonly runtime: TRPCClientRuntime;
60
70
  constructor(opts: CreateTRPCClientOptions<TRouter>);
61
71
  private $request;
62
72
  private requestAsPromise;
63
- query<TQueries extends TRouter['_def']['queries'], TPath extends string & keyof TQueries>(path: TPath, ...args: [...inferHandlerInput<TQueries[TPath]>, TRPCRequestOptions?]): CancellablePromise<inferProcedureOutput<TQueries[TPath]>>;
64
- mutation<TMutations extends TRouter['_def']['mutations'], TPath extends string & keyof TMutations>(path: TPath, ...args: [...inferHandlerInput<TMutations[TPath]>, TRPCRequestOptions?]): CancellablePromise<inferProcedureOutput<TMutations[TPath]>>;
65
- subscription<TSubscriptions extends TRouter['_def']['subscriptions'], TPath extends string & keyof TSubscriptions, TOutput extends inferSubscriptionOutput<TRouter, TPath>, TInput extends inferProcedureInput<TSubscriptions[TPath]>>(path: TPath, input: TInput, opts: TRPCRequestOptions & Partial<TRPCSubscriptionObserver<TOutput, TRPCClientError<TRouter>>>): Unsubscribable;
73
+ query<TQueries extends AssertLegacyDef<TRouter>['queries'], TPath extends string & keyof TQueries>(path: TPath, ...args: [
74
+ ...inferHandlerInput<AssertType<TQueries, ProcedureRecord>[TPath]>,
75
+ TRPCRequestOptions?
76
+ ]): CancellablePromise<inferProcedureOutput<TQueries[TPath]>>;
77
+ mutation<TMutations extends AssertLegacyDef<TRouter>['mutations'], TPath extends string & keyof TMutations>(path: TPath, ...args: [
78
+ ...inferHandlerInput<AssertType<TMutations, ProcedureRecord>[TPath]>,
79
+ TRPCRequestOptions?
80
+ ]): CancellablePromise<inferProcedureOutput<TMutations[TPath]>>;
81
+ subscription<TSubscriptions extends AssertLegacyDef<TRouter>['subscriptions'], TPath extends string & keyof TSubscriptions, TOutput extends inferSubscriptionOutput<TRouter, TPath>, TInput extends inferProcedureInput<AssertType<TSubscriptions, ProcedureRecord>[TPath]>>(path: TPath, input: TInput, opts: TRPCRequestOptions & Partial<TRPCSubscriptionObserver<TOutput, TRPCClientError<TRouter>>>): Unsubscribable;
66
82
  }
67
83
  export {};
68
84
  //# sourceMappingURL=TRPCClient.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"TRPCClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TRPCClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCClient.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAGxD,OAAO,EACL,eAAe,EAIhB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CAoFnB"}
1
+ {"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAIxD,OAAO,EACL,eAAe,EAIhB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CA4FnB"}
@@ -3,8 +3,16 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var observable = require('@trpc/server/observable');
6
+ var transformResult = require('../transformResult-3ccc74ea.js');
6
7
  var httpUtils = require('../httpUtils-a0169eef.js');
7
8
  require('@babel/runtime/helpers/defineProperty');
9
+ require('@babel/runtime/helpers/classCallCheck');
10
+ require('@babel/runtime/helpers/createClass');
11
+ require('@babel/runtime/helpers/assertThisInitialized');
12
+ require('@babel/runtime/helpers/inherits');
13
+ require('@babel/runtime/helpers/possibleConstructorReturn');
14
+ require('@babel/runtime/helpers/getPrototypeOf');
15
+ require('@babel/runtime/helpers/wrapNativeSuper');
8
16
 
9
17
  function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
10
18
 
@@ -298,9 +306,18 @@ function httpBatchLink(opts) {
298
306
  cancel = _loader$load.cancel;
299
307
 
300
308
  promise.then(function (res) {
309
+ var transformed = transformResult.transformResult(res.json, runtime);
310
+
311
+ if (!transformed.ok) {
312
+ observer.error(transformResult.TRPCClientError.from(transformed.error, {
313
+ meta: res.meta
314
+ }));
315
+ return;
316
+ }
317
+
301
318
  observer.next({
302
319
  context: res.meta,
303
- data: res.json
320
+ result: transformed.result
304
321
  });
305
322
  observer.complete();
306
323
  }).catch(function (err) {
@@ -1,6 +1,14 @@
1
1
  import { observable } from '@trpc/server/observable';
2
+ import { t as transformResult, T as TRPCClientError } from '../transformResult-06bec648.mjs';
2
3
  import { g as getUrl, h as httpRequest } from '../httpUtils-089853f6.mjs';
3
4
  import '@babel/runtime/helpers/defineProperty';
5
+ import '@babel/runtime/helpers/classCallCheck';
6
+ import '@babel/runtime/helpers/createClass';
7
+ import '@babel/runtime/helpers/assertThisInitialized';
8
+ import '@babel/runtime/helpers/inherits';
9
+ import '@babel/runtime/helpers/possibleConstructorReturn';
10
+ import '@babel/runtime/helpers/getPrototypeOf';
11
+ import '@babel/runtime/helpers/wrapNativeSuper';
4
12
 
5
13
  function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
6
14
 
@@ -294,9 +302,18 @@ function httpBatchLink(opts) {
294
302
  cancel = _loader$load.cancel;
295
303
 
296
304
  promise.then(function (res) {
305
+ var transformed = transformResult(res.json, runtime);
306
+
307
+ if (!transformed.ok) {
308
+ observer.error(TRPCClientError.from(transformed.error, {
309
+ meta: res.meta
310
+ }));
311
+ return;
312
+ }
313
+
297
314
  observer.next({
298
315
  context: res.meta,
299
- data: res.json
316
+ result: transformed.result
300
317
  });
301
318
  observer.complete();
302
319
  }).catch(function (err) {
@@ -1 +1 @@
1
- {"version":3,"file":"httpLink.d.ts","sourceRoot":"","sources":["../../src/links/httpLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,wBAAgB,QAAQ,CAAC,OAAO,SAAS,SAAS,EAChD,IAAI,EAAE,eAAe,GACpB,QAAQ,CAAC,OAAO,CAAC,CA2BnB"}
1
+ {"version":3,"file":"httpLink.d.ts","sourceRoot":"","sources":["../../src/links/httpLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,wBAAgB,QAAQ,CAAC,OAAO,SAAS,SAAS,EAChD,IAAI,EAAE,eAAe,GACpB,QAAQ,CAAC,OAAO,CAAC,CAqCnB"}