@trpc/server 10.0.0-alpha.38 → 10.0.0-alpha.39

package/src/deprecated/interop.ts

@@ -1,12 +1,12 @@
 import { CombinedDataTransformer, ProcedureParams, ProcedureType } from '..';
 import { CreateRootConfig, RootConfig } from '../core/internals/config';
 import { getParseFnOrPassThrough } from '../core/internals/getParseFn';
+import { mergeWithoutOverrides } from '../core/internals/mergeWithoutOverrides';
 import {
+  createBuilder,
   createInputMiddleware,
-  createInternalBuilder,
   createOutputMiddleware,
-} from '../core/internals/internalProcedure';
-import { mergeWithoutOverrides } from '../core/internals/mergeWithoutOverrides';
+} from '../core/internals/procedureBuilder';
 import {
   MutationProcedure,
   Procedure as NewProcedure,
@@ -175,7 +175,7 @@ function migrateProcedure<
 
   const inputMiddleware = createInputMiddleware(inputParser);
 
-  const builder = createInternalBuilder({
+  const builder = createBuilder({
     input: def.inputParser,
     middlewares: [
       ...(def.middlewares as any),

package/src/types.ts

@@ -74,3 +74,15 @@ type FilterKeys<T extends object, K> = {
  * @internal
  */
 export type Filter<T extends object, K> = Pick<T, FilterKeys<T, K>>;
+
+/**
+ * @internal
+ */
+export type NeverKeys<T> = {
+  [TKey in keyof T]: T[TKey] extends never ? TKey : never;
+}[keyof T];
+
+/**
+ * @internal
+ */
+export type OmitNeverKeys<T> = Omit<T, NeverKeys<T>>;

package/dist/core/internals/internalProcedure.d.ts

@@ -1,78 +0,0 @@
-import { MaybePromise } from '../../types';
-import { MiddlewareFunction } from '../middleware';
-import { Parser } from '../parser';
-import { ProcedureType } from '../types';
-import { ParseFn } from './getParseFn';
-import { ResolveOptions } from './utils';
-export interface InternalProcedureCallOptions {
-    ctx: unknown;
-    rawInput: unknown;
-    input?: unknown;
-    path: string;
-    type: ProcedureType;
-}
-export interface InternalProcedure {
-    _def: ProcedureBuilderInternal['_def'];
-    /**
-     * @deprecated use `._def.meta` instead
-     */
-    meta: ProcedureBuilderInternal['_def']['meta'];
-    mutation?: boolean;
-    query?: boolean;
-    subscription?: boolean;
-    (opts: InternalProcedureCallOptions): Promise<unknown>;
-}
-declare type ProcedureBuilderInternalResolver = (opts: ResolveOptions<any>) => Promise<unknown>;
-export declare type ProcedureBuilderInternalMiddleware = MiddlewareFunction<any, any>;
-declare type TResolver = (opts: ResolveOptions<any>) => MaybePromise<any>;
-interface ProcedureBuilderInternal {
-    _def: {
-        input?: Parser;
-        output?: Parser;
-        meta?: Record<string, unknown>;
-        resolver?: ProcedureBuilderInternalResolver;
-        middlewares: ProcedureBuilderInternalMiddleware[];
-        mutation?: boolean;
-        query?: boolean;
-        subscription?: boolean;
-    };
-    /**
-     * @internal
-     */
-    input: (parser: Parser) => ProcedureBuilderInternal;
-    /**
-     * @internal
-     */
-    output: (parser: Parser) => ProcedureBuilderInternal;
-    /**
-     * @internal
-     */
-    unstable_concat: (proc: ProcedureBuilderInternal) => ProcedureBuilderInternal;
-    /**
-     * @internal
-     */
-    use: (fn: MiddlewareFunction<any, any>) => ProcedureBuilderInternal;
-    /**
-     * @internal
-     */
-    meta: (meta: Record<string, unknown>) => ProcedureBuilderInternal;
-    /** @deprecated **/
-    resolve: (resolver: TResolver) => InternalProcedure;
-    /**
-     * @internal
-     */
-    query: (resolver: TResolver) => InternalProcedure;
-    /**
-     * @internal
-     */
-    mutation: (resolver: TResolver) => InternalProcedure;
-    /**
-     * @internal
-     */
-    subscription: (resolver: TResolver) => InternalProcedure;
-}
-export declare function createInputMiddleware<T>(parse: ParseFn<T>): ProcedureBuilderInternalMiddleware;
-export declare function createOutputMiddleware<T>(parse: ParseFn<T>): ProcedureBuilderInternalMiddleware;
-export declare function createInternalBuilder(initDef?: ProcedureBuilderInternal['_def']): ProcedureBuilderInternal;
-export {};
-//# sourceMappingURL=internalProcedure.d.ts.map

package/dist/core/internals/internalProcedure.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"internalProcedure.d.ts","sourceRoot":"","sources":["../../../src/core/internals/internalProcedure.ts"],"names":[],"mappings":"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"}

package/src/core/internals/internalProcedure.ts

@@ -1,297 +0,0 @@
-/**
- * This is the actual internal representation of a builder
- * FIXME - I want to get rid of this and use the public API instead
- */
-import { TRPCError } from '../../error/TRPCError';
-import { getCauseFromUnknown } from '../../error/utils';
-import { getErrorFromUnknown } from '../../error/utils';
-import { MaybePromise } from '../../types';
-import { MiddlewareFunction, MiddlewareResult } from '../middleware';
-import { Parser } from '../parser';
-import { ProcedureType } from '../types';
-import { ParseFn, getParseFn } from './getParseFn';
-import { mergeWithoutOverrides } from './mergeWithoutOverrides';
-import { ResolveOptions, middlewareMarker } from './utils';
-
-export interface InternalProcedureCallOptions {
-  ctx: unknown;
-  rawInput: unknown;
-  input?: unknown;
-  path: string;
-  type: ProcedureType;
-}
-export interface InternalProcedure {
-  _def: ProcedureBuilderInternal['_def'];
-  /**
-   * @deprecated use `._def.meta` instead
-   */
-  meta: ProcedureBuilderInternal['_def']['meta'];
-  mutation?: boolean;
-  query?: boolean;
-  subscription?: boolean;
-  (opts: InternalProcedureCallOptions): Promise<unknown>;
-}
-
-type ProcedureBuilderInternalResolver = (
-  opts: ResolveOptions<any>,
-) => Promise<unknown>;
-
-export type ProcedureBuilderInternalMiddleware = MiddlewareFunction<any, any>;
-type TResolver = (opts: ResolveOptions<any>) => MaybePromise<any>;
-
-interface ProcedureBuilderInternal {
-  _def: {
-    input?: Parser;
-    output?: Parser;
-    meta?: Record<string, unknown>;
-    resolver?: ProcedureBuilderInternalResolver;
-    middlewares: ProcedureBuilderInternalMiddleware[];
-    mutation?: boolean;
-    query?: boolean;
-    subscription?: boolean;
-  };
-  /**
-   * @internal
-   */
-  input: (parser: Parser) => ProcedureBuilderInternal;
-  /**
-   * @internal
-   */
-  output: (parser: Parser) => ProcedureBuilderInternal;
-  /**
-   * @internal
-   */
-  unstable_concat: (proc: ProcedureBuilderInternal) => ProcedureBuilderInternal;
-  /**
-   * @internal
-   */
-  use: (fn: MiddlewareFunction<any, any>) => ProcedureBuilderInternal;
-  /**
-   * @internal
-   */
-  meta: (meta: Record<string, unknown>) => ProcedureBuilderInternal;
-  /** @deprecated **/
-  resolve: (resolver: TResolver) => InternalProcedure;
-  /**
-   * @internal
-   */
-  query: (resolver: TResolver) => InternalProcedure;
-  /**
-   * @internal
-   */
-  mutation: (resolver: TResolver) => InternalProcedure;
-
-  /**
-   * @internal
-   */
-  subscription: (resolver: TResolver) => InternalProcedure;
-}
-function createNewInternalBuilder(
-  def1: ProcedureBuilderInternal['_def'],
-  def2: Partial<ProcedureBuilderInternal['_def']>,
-): ProcedureBuilderInternal {
-  const { middlewares = [], ...rest } = def2;
-
-  // TODO: maybe have a fn here to warn about calls
-  return createInternalBuilder({
-    ...mergeWithoutOverrides(def1, rest),
-    middlewares: [...def1.middlewares, ...middlewares],
-  });
-}
-
-const codeblock = `
-If you want to call this function on the server, you do the following:
-This is a client-only function.
-
-const caller = appRouter.createCaller({
-  /* ... your context */
-});
-
-const result = await caller.call('myProcedure', input);
-`.trim();
-
-function createProcedureCaller(
-  _def: InternalProcedure['_def'],
-): InternalProcedure {
-  const procedure = async function resolve(opts: InternalProcedureCallOptions) {
-    if (!opts || !('rawInput' in opts)) {
-      throw new Error(codeblock);
-    }
-
-    // run the middlewares recursively with the resolver as the last one
-    const callRecursive = async (
-      callOpts: { ctx: any; index: number; input?: unknown } = {
-        index: 0,
-        ctx: opts.ctx,
-      },
-    ): Promise<MiddlewareResult<any>> => {
-      try {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const middleware = _def.middlewares[callOpts.index]!;
-        const result = await middleware({
-          ctx: callOpts.ctx,
-          type: opts.type,
-          path: opts.path,
-          rawInput: opts.rawInput,
-          meta: _def.meta,
-          input: callOpts.input,
-          next: async (nextOpts?: { ctx: any; input?: any }) => {
-            return await callRecursive({
-              index: callOpts.index + 1,
-              ctx:
-                nextOpts && 'ctx' in nextOpts
-                  ? { ...callOpts.ctx, ...nextOpts.ctx }
-                  : callOpts.ctx,
-              input:
-                nextOpts && 'input' in nextOpts
-                  ? nextOpts.input
-                  : callOpts.input,
-            });
-          },
-        });
-        return result;
-      } catch (cause) {
-        return {
-          ok: false,
-          error: getErrorFromUnknown(cause),
-          marker: middlewareMarker,
-        };
-      }
-    };
-
-    // there's always at least one "next" since we wrap this.resolver in a middleware
-    const result = await callRecursive();
-
-    if (!result) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message:
-          'No result from middlewares - did you forget to `return next()`?',
-      });
-    }
-    if (!result.ok) {
-      // re-throw original error
-      throw result.error;
-    }
-    return result.data;
-  };
-  procedure._def = _def;
-  procedure.meta = _def.meta;
-
-  return procedure;
-}
-
-export function createInputMiddleware<T>(
-  parse: ParseFn<T>,
-): ProcedureBuilderInternalMiddleware {
-  return async function inputMiddleware({ next, rawInput }) {
-    let input: ReturnType<typeof parse>;
-    try {
-      input = await parse(rawInput);
-    } catch (cause) {
-      throw new TRPCError({
-        code: 'BAD_REQUEST',
-        cause: getCauseFromUnknown(cause),
-      });
-    }
-    // TODO fix this typing?
-    return next({ input } as any);
-  };
-}
-
-export function createOutputMiddleware<T>(
-  parse: ParseFn<T>,
-): ProcedureBuilderInternalMiddleware {
-  return async function outputMiddleware({ next }) {
-    const result = await next();
-    if (!result.ok) {
-      // pass through failures without validating
-      return result;
-    }
-    try {
-      const data = await parse(result.data);
-      return {
-        ...result,
-        data,
-      };
-    } catch (cause) {
-      throw new TRPCError({
-        message: 'Output validation failed',
-        code: 'INTERNAL_SERVER_ERROR',
-        cause: getCauseFromUnknown(cause),
-      });
-    }
-  };
-}
-
-function createResolver(
-  _def: ProcedureBuilderInternal['_def'],
-  resolver: TResolver,
-) {
-  const finalBuilder = createNewInternalBuilder(_def, {
-    resolver,
-    middlewares: [
-      async function resolveMiddleware(opts) {
-        const data = await resolver(opts);
-        return {
-          marker: middlewareMarker,
-          ok: true,
-          data,
-          ctx: opts.ctx,
-        } as const;
-      },
-    ],
-  });
-
-  return createProcedureCaller(finalBuilder._def);
-}
-export function createInternalBuilder(
-  initDef?: ProcedureBuilderInternal['_def'],
-): ProcedureBuilderInternal {
-  const _def: ProcedureBuilderInternal['_def'] = initDef || {
-    middlewares: [],
-  };
-
-  return {
-    _def,
-    // _call: createProcedureCaller(_def),
-    input(input: Parser) {
-      const parser = getParseFn(input);
-      return createNewInternalBuilder(_def, {
-        input,
-        middlewares: [createInputMiddleware(parser)],
-      });
-    },
-    output(output: Parser) {
-      const parseOutput = getParseFn(output);
-      return createNewInternalBuilder(_def, {
-        output,
-        middlewares: [createOutputMiddleware(parseOutput)],
-      });
-    },
-    meta(meta) {
-      return createNewInternalBuilder(_def, { meta });
-    },
-    /** @deprecated **/
-    resolve(resolver) {
-      return createResolver(_def, resolver);
-    },
-    unstable_concat(builder) {
-      return createNewInternalBuilder(_def, builder._def);
-    },
-    use(middleware) {
-      return createNewInternalBuilder(_def, {
-        middlewares: [middleware],
-      });
-    },
-    query(resolver) {
-      return createResolver({ ..._def, query: true }, resolver);
-    },
-    mutation(resolver) {
-      return createResolver({ ..._def, mutation: true }, resolver);
-    },
-    subscription(resolver) {
-      return createResolver({ ..._def, subscription: true }, resolver);
-    },
-  };
-}