@trpc/client 11.0.0-next-alpha.152 → 11.0.0-next-alpha.154

package/src/createTRPCClient.ts

@@ -9,15 +9,15 @@ import type {
   ProcedureArgs,
   ProcedureRouterRecord,
   ProcedureType,
-} from '@trpc/server';
-import type { Unsubscribable } from '@trpc/server/observable';
+} from '@trpc/core';
 import {
   createFlatProxy,
   createRecursiveProxy,
   inferTransformedProcedureOutput,
   inferTransformedSubscriptionOutput,
-} from '@trpc/server/shared';
-import { IntersectionError } from '@trpc/server/unstableInternalsExport';
+  IntersectionError,
+} from '@trpc/core';
+import type { Unsubscribable } from '@trpc/core/observable';
 import { CreateTRPCClientOptions } from './createTRPCUntypedClient';
 import {
   TRPCSubscriptionObserver,

package/src/createTRPCUntypedClient.ts

@@ -1,4 +1,4 @@
-import { AnyRouter } from '@trpc/server';
+import { AnyRouter } from '@trpc/core';
 import {
   CreateTRPCClientOptions,
   TRPCUntypedClient,

package/src/internals/TRPCUntypedClient.ts

@@ -3,13 +3,13 @@ import {
   CombinedDataTransformer,
   DataTransformerOptions,
   DefaultDataTransformer,
-} from '@trpc/server';
+} from '@trpc/core';
 import {
   inferObservableValue,
   observableToPromise,
   share,
   Unsubscribable,
-} from '@trpc/server/observable';
+} from '@trpc/core/observable';
 import { createChain } from '../links/internals/createChain';
 import {
   OperationContext,

package/src/internals/getAbortController.ts

@@ -1,4 +1,4 @@
-import { Maybe } from '@trpc/server/unstableInternalsExport';
+import { Maybe } from '@trpc/core';
 import { AbortControllerEsque } from './types';
 
 export function getAbortController(

package/src/links/httpFormDataLink.ts

@@ -1,15 +1,5 @@
 import { httpLinkFactory } from './httpLink';
-import { GetBody, httpRequest, Requester } from './internals/httpUtils';
-
-const getBody: GetBody = (opts) => {
-  if (!('input' in opts)) {
-    return undefined;
-  }
-  if (!(opts.input instanceof FormData)) {
-    throw new Error('Input is not FormData');
-  }
-  return opts.input;
-};
+import { httpRequest, Requester } from './internals/httpUtils';
 
 const formDataRequester: Requester = (opts) => {
   if (opts.type !== 'mutation') {
@@ -21,7 +11,15 @@ const formDataRequester: Requester = (opts) => {
     getUrl() {
       return `${opts.url}/${opts.path}`;
     },
-    getBody,
+    getBody(opts) {
+      if (!('input' in opts)) {
+        return undefined;
+      }
+      if (!(opts.input instanceof FormData)) {
+        throw new Error('Input is not FormData');
+      }
+      return opts.input;
+    },
   });
 };
 

package/src/links/httpLink.ts

@@ -1,5 +1,5 @@
-import { AnyRouter } from '@trpc/server';
-import { observable } from '@trpc/server/observable';
+import { AnyRouter } from '@trpc/core';
+import { observable } from '@trpc/core/observable';
 import { transformResult } from '../shared/transformResult';
 import { TRPCClientError } from '../TRPCClientError';
 import {

package/src/links/internals/createChain.ts

@@ -1,5 +1,5 @@
-import { AnyRouter } from '@trpc/server';
-import { observable } from '@trpc/server/observable';
+import { AnyRouter } from '@trpc/core';
+import { observable } from '@trpc/core/observable';
 import { Operation, OperationLink, OperationResultObservable } from '../types';
 
 /** @internal */

package/src/links/internals/createHTTPBatchLink.ts

@@ -1,5 +1,5 @@
-import { AnyRouter, ProcedureType } from '@trpc/server';
-import { observable } from '@trpc/server/observable';
+import { AnyRouter, ProcedureType } from '@trpc/core';
+import { observable } from '@trpc/core/observable';
 import { dataLoader } from '../../internals/dataLoader';
 import { transformResult } from '../../shared/transformResult';
 import { TRPCClientError } from '../../TRPCClientError';

package/src/links/internals/dedupeLink.ts

@@ -1,7 +1,7 @@
 /* istanbul ignore file -- @preserve */
 // We're not actually exporting this link
-import { AnyRouter } from '@trpc/server';
-import { Observable, observable, share } from '@trpc/server/observable';
+import { AnyRouter } from '@trpc/core';
+import { Observable, observable, share } from '@trpc/core/observable';
 import { TRPCLink } from '../types';
 
 /**

package/src/links/internals/httpUtils.ts

@@ -1,5 +1,5 @@
-import { ProcedureType } from '@trpc/server';
-import { TRPCResponse } from '@trpc/server/rpc';
+import { ProcedureType } from '@trpc/core';
+import { TRPCResponse } from '@trpc/core/rpc';
 import { getFetch } from '../../getFetch';
 import { getAbortController } from '../../internals/getAbortController';
 import {
@@ -85,11 +85,8 @@ export type HTTPBaseRequestOptions = GetInputOptions &
     path: string;
   };
 
-export type GetUrl = (opts: HTTPBaseRequestOptions) => string;
-export type GetBody = (
-  opts: HTTPBaseRequestOptions,
-) => RequestInitEsque['body'];
-
+type GetUrl = (opts: HTTPBaseRequestOptions) => string;
+type GetBody = (opts: HTTPBaseRequestOptions) => RequestInitEsque['body'];
 export type ContentOptions = {
   batchModeHeader?: 'stream';
   contentTypeHeader?: string;

package/src/links/internals/parseJSONStream.ts

@@ -1,5 +1,5 @@
 // Stream parsing adapted from https://www.loginradius.com/blog/engineering/guest-post/http-streaming-with-nodejs-and-fetch-api/
-import { TRPCResponse } from '@trpc/server/rpc';
+import { TRPCResponse } from '@trpc/core/rpc';
 import { WebReadableStreamEsque } from '../../internals/types';
 import { HTTPHeaders } from '../types';
 import {

package/src/links/internals/retryLink.ts

@@ -1,7 +1,7 @@
 /* istanbul ignore file -- @preserve */
 // We're not actually exporting this link
-import { AnyRouter } from '@trpc/server';
-import { observable, Unsubscribable } from '@trpc/server/observable';
+import { AnyRouter } from '@trpc/core';
+import { observable, Unsubscribable } from '@trpc/core/observable';
 import { TRPCLink } from '../types';
 
 /**

package/src/links/loggerLink.ts

@@ -5,9 +5,9 @@
 // Using triple-slash directive makes sure that it will be available,
 // even if end-user `tsconfig.json` omits it in the `lib` array.
 
-import { AnyRouter } from '@trpc/server';
-import { observable, tap } from '@trpc/server/observable';
-import { TRPCClientError } from '..';
+import { AnyRouter } from '@trpc/core';
+import { observable, tap } from '@trpc/core/observable';
+import { TRPCClientError } from '../TRPCClientError';
 import { Operation, OperationResultEnvelope, TRPCLink } from './types';
 
 type ConsoleEsque = {

package/src/links/splitLink.ts

@@ -1,5 +1,5 @@
-import { AnyRouter } from '@trpc/server';
-import { observable } from '@trpc/server/observable';
+import { AnyRouter } from '@trpc/core';
+import { observable } from '@trpc/core/observable';
 import { createChain } from './internals/createChain';
 import { Operation, TRPCLink } from './types';
 

package/src/links/types.ts

@@ -2,9 +2,9 @@ import {
   AnyRouter,
   CombinedDataTransformer,
   DataTransformer,
-} from '@trpc/server';
-import { Observable, Observer } from '@trpc/server/observable';
-import { TRPCResultMessage, TRPCSuccessResponse } from '@trpc/server/rpc';
+} from '@trpc/core';
+import { Observable, Observer } from '@trpc/core/observable';
+import { TRPCResultMessage, TRPCSuccessResponse } from '@trpc/core/rpc';
 import { ResponseEsque } from '../internals/types';
 import { TRPCClientError } from '../TRPCClientError';
 

package/src/links/wsLink.ts

@@ -1,13 +1,17 @@
-import { AnyRouter, inferRouterError, ProcedureType } from '@trpc/server';
-import { observable, Observer, UnsubscribeFn } from '@trpc/server/observable';
+import {
+  AnyRouter,
+  inferRouterError,
+  MaybePromise,
+  ProcedureType,
+} from '@trpc/core';
+import { observable, Observer, UnsubscribeFn } from '@trpc/core/observable';
 import {
   TRPCClientIncomingMessage,
   TRPCClientIncomingRequest,
   TRPCClientOutgoingMessage,
   TRPCRequestMessage,
   TRPCResponseMessage,
-} from '@trpc/server/rpc';
-import { MaybePromise } from '@trpc/server/unstableInternalsExport';
+} from '@trpc/core/rpc';
 import { transformResult } from '../shared/transformResult';
 import { TRPCClientError } from '../TRPCClientError';
 import { Operation, TRPCLink } from './types';

package/src/shared/transformResult.ts

@@ -1,10 +1,9 @@
-import type { AnyRouter, inferRouterError } from '@trpc/server';
+import { isObject, type AnyRouter, type inferRouterError } from '@trpc/core';
 import type {
   TRPCResponse,
   TRPCResponseMessage,
   TRPCResultMessage,
-} from '@trpc/server/rpc';
-import { isObject } from '../internals/isObject';
+} from '@trpc/core/rpc';
 import type { TRPCClientRuntime } from '../links';
 
 // FIXME:

package/dist/internals/isObject.d.ts

@@ -1,2 +0,0 @@
-export declare function isObject(value: unknown): value is Record<string, unknown>;
-//# sourceMappingURL=isObject.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"isObject.d.ts","sourceRoot":"","sources":["../../src/internals/isObject.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGzE"}

package/src/internals/isObject.ts

@@ -1,4 +0,0 @@
-export function isObject(value: unknown): value is Record<string, unknown> {
-  // check that value is object
-  return !!value && !Array.isArray(value) && typeof value === 'object';
-}