@trpc/server 10.0.0-proxy-alpha.76 → 10.0.0-proxy-alpha.77

package/dist/router-fee6849a.js

@@ -0,0 +1,452 @@
+'use strict';
+
+var resolveHTTPResponse = require('./resolveHTTPResponse-9a70b9b2.js');
+var codes = require('./codes-1c24d919.js');
+var TRPCError = require('./TRPCError-fe9113e5.js');
+
+resolveHTTPResponse.assertNotBrowser();
+
+/**
+ * @deprecated
+ */ const middlewareMarker = 'middlewareMarker';
+
+resolveHTTPResponse.assertNotBrowser();
+function getParseFn(procedureParser) {
+    const parser = procedureParser;
+    if (typeof parser === 'function') {
+        // ProcedureParserCustomValidatorEsque
+        return parser;
+    }
+    if (typeof parser.parseAsync === 'function') {
+        // ProcedureParserZodEsque
+        return parser.parseAsync.bind(parser);
+    }
+    if (typeof parser.parse === 'function') {
+        // ProcedureParserZodEsque
+        return parser.parse.bind(parser);
+    }
+    if (typeof parser.validateSync === 'function') {
+        // ProcedureParserYupEsque
+        return parser.validateSync.bind(parser);
+    }
+    if (typeof parser.create === 'function') {
+        // ProcedureParserSuperstructEsque
+        return parser.create.bind(parser);
+    }
+    throw new Error('Could not find a validator fn');
+}
+/**
+ * @internal
+ * @deprecated
+ */ class Procedure {
+    _def() {
+        return {
+            middlewares: this.middlewares,
+            resolver: this.resolver,
+            inputParser: this.inputParser,
+            outputParser: this.outputParser,
+            meta: this.meta
+        };
+    }
+    async parseInput(rawInput) {
+        try {
+            return await this.parseInputFn(rawInput);
+        } catch (cause) {
+            throw new TRPCError.TRPCError({
+                code: 'BAD_REQUEST',
+                cause: TRPCError.getCauseFromUnknown(cause)
+            });
+        }
+    }
+    async parseOutput(rawOutput) {
+        try {
+            return await this.parseOutputFn(rawOutput);
+        } catch (cause) {
+            throw new TRPCError.TRPCError({
+                code: 'INTERNAL_SERVER_ERROR',
+                cause: TRPCError.getCauseFromUnknown(cause),
+                message: 'Output validation failed'
+            });
+        }
+    }
+    /**
+   * Trigger middlewares in order, parse raw input, call resolver & parse raw output
+   * @internal
+   */ async call(opts) {
+        // wrap the actual resolver and treat as the last "middleware"
+        const middlewaresWithResolver = this.middlewares.concat([
+            async ({ ctx  })=>{
+                const input = await this.parseInput(opts.rawInput);
+                const rawOutput = await this.resolver({
+                    ...opts,
+                    ctx,
+                    input
+                });
+                const data = await this.parseOutput(rawOutput);
+                return {
+                    marker: middlewareMarker,
+                    ok: true,
+                    data,
+                    ctx
+                };
+            }, 
+        ]);
+        // run the middlewares recursively with the resolver as the last one
+        const callRecursive = async (callOpts = {
+            index: 0,
+            ctx: opts.ctx
+        })=>{
+            try {
+                const result = await middlewaresWithResolver[callOpts.index]({
+                    ctx: callOpts.ctx,
+                    type: opts.type,
+                    path: opts.path,
+                    rawInput: opts.rawInput,
+                    meta: this.meta,
+                    next: async (nextOpts)=>{
+                        return await callRecursive({
+                            index: callOpts.index + 1,
+                            ctx: nextOpts ? nextOpts.ctx : callOpts.ctx
+                        });
+                    }
+                });
+                return result;
+            } catch (cause) {
+                return {
+                    ctx: callOpts.ctx,
+                    ok: false,
+                    error: TRPCError.getTRPCErrorFromUnknown(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.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;
+    }
+    /**
+   * Create new procedure with passed middlewares
+   * @param middlewares
+   */ inheritMiddlewares(middlewares) {
+        const Constructor = this.constructor;
+        const instance = new Constructor({
+            middlewares: [
+                ...middlewares,
+                ...this.middlewares
+            ],
+            resolver: this.resolver,
+            inputParser: this.inputParser,
+            outputParser: this.outputParser,
+            meta: this.meta
+        });
+        return instance;
+    }
+    constructor(opts){
+        this.middlewares = opts.middlewares;
+        this.resolver = opts.resolver;
+        this.inputParser = opts.inputParser;
+        this.parseInputFn = getParseFn(this.inputParser);
+        this.outputParser = opts.outputParser;
+        this.parseOutputFn = getParseFn(this.outputParser);
+        this.meta = opts.meta;
+    }
+}
+function createProcedure(opts) {
+    const inputParser = 'input' in opts ? opts.input : (input)=>{
+        if (input != null) {
+            throw new TRPCError.TRPCError({
+                code: 'BAD_REQUEST',
+                message: 'No input expected'
+            });
+        }
+        return undefined;
+    };
+    const outputParser = 'output' in opts && opts.output ? opts.output : (output)=>output;
+    return new Procedure({
+        inputParser: inputParser,
+        resolver: opts.resolve,
+        middlewares: [],
+        outputParser: outputParser,
+        meta: opts.meta
+    });
+}
+
+function migrateProcedure(oldProc, type) {
+    const def = oldProc._def();
+    const inputParser = resolveHTTPResponse.getParseFnOrPassThrough(def.inputParser);
+    const outputParser = resolveHTTPResponse.getParseFnOrPassThrough(def.outputParser);
+    const inputMiddleware = resolveHTTPResponse.createInputMiddleware(inputParser);
+    const builder = resolveHTTPResponse.createBuilder({
+        inputs: [
+            def.inputParser
+        ],
+        middlewares: [
+            ...def.middlewares,
+            inputMiddleware,
+            resolveHTTPResponse.createOutputMiddleware(outputParser), 
+        ],
+        meta: def.meta,
+        output: def.outputParser,
+        mutation: type === 'mutation',
+        query: type === 'query',
+        subscription: type === 'subscription'
+    });
+    const proc = builder[type]((opts)=>def.resolver(opts));
+    return proc;
+}
+function migrateRouter(oldRouter) {
+    const errorFormatter = oldRouter._def.errorFormatter;
+    const transformer = oldRouter._def.transformer;
+    const queries = {};
+    const mutations = {};
+    const subscriptions = {};
+    for (const [name, procedure] of Object.entries(oldRouter._def.queries)){
+        queries[name] = migrateProcedure(procedure, 'query');
+    }
+    for (const [name1, procedure1] of Object.entries(oldRouter._def.mutations)){
+        mutations[name1] = migrateProcedure(procedure1, 'mutation');
+    }
+    for (const [name2, procedure2] of Object.entries(oldRouter._def.subscriptions)){
+        subscriptions[name2] = migrateProcedure(procedure2, 'subscription');
+    }
+    const procedures = resolveHTTPResponse.mergeWithoutOverrides(queries, mutations, subscriptions);
+    const newRouter = resolveHTTPResponse.createRouterFactory({
+        transformer,
+        errorFormatter
+    })(procedures);
+    return newRouter;
+}
+
+resolveHTTPResponse.assertNotBrowser();
+function getDataTransformer(transformer) {
+    if ('input' in transformer) {
+        return transformer;
+    }
+    return {
+        input: transformer,
+        output: transformer
+    };
+}
+const PROCEDURE_DEFINITION_MAP = {
+    query: 'queries',
+    mutation: 'mutations',
+    subscription: 'subscriptions'
+};
+function safeObject(...args) {
+    return Object.assign(Object.create(null), ...args);
+}
+/**
+ * @internal The type signature of this class may change without warning.
+ * @deprecated
+ */ class Router {
+    static prefixProcedures(procedures, prefix) {
+        const eps = safeObject();
+        for (const [key, procedure] of Object.entries(procedures)){
+            eps[prefix + key] = procedure;
+        }
+        return eps;
+    }
+    query(path, procedure) {
+        const router = new Router({
+            queries: safeObject({
+                [path]: createProcedure(procedure)
+            })
+        });
+        return this.merge(router);
+    }
+    mutation(path, procedure) {
+        const router = new Router({
+            mutations: safeObject({
+                [path]: createProcedure(procedure)
+            })
+        });
+        return this.merge(router);
+    }
+    subscription(path, procedure) {
+        const router = new Router({
+            subscriptions: safeObject({
+                [path]: createProcedure(procedure)
+            })
+        });
+        return this.merge(router);
+    }
+    merge(prefixOrRouter, maybeRouter) {
+        let prefix = '';
+        let childRouter;
+        if (typeof prefixOrRouter === 'string' && maybeRouter instanceof Router) {
+            prefix = prefixOrRouter;
+            childRouter = maybeRouter;
+        } else if (prefixOrRouter instanceof Router) {
+            childRouter = prefixOrRouter;
+        } else {
+            throw new Error('Invalid args');
+        }
+        const duplicateQueries = Object.keys(childRouter._def.queries).filter((key)=>!!this._def['queries'][prefix + key]);
+        const duplicateMutations = Object.keys(childRouter._def.mutations).filter((key)=>!!this._def['mutations'][prefix + key]);
+        const duplicateSubscriptions = Object.keys(childRouter._def.subscriptions).filter((key)=>!!this._def['subscriptions'][prefix + key]);
+        const duplicates = [
+            ...duplicateQueries,
+            ...duplicateMutations,
+            ...duplicateSubscriptions, 
+        ];
+        if (duplicates.length) {
+            throw new Error(`Duplicate endpoint(s): ${duplicates.join(', ')}`);
+        }
+        const mergeProcedures = (defs)=>{
+            const newDefs = safeObject();
+            for (const [key, procedure] of Object.entries(defs)){
+                const newProcedure = procedure.inheritMiddlewares(this._def.middlewares);
+                newDefs[key] = newProcedure;
+            }
+            return Router.prefixProcedures(newDefs, prefix);
+        };
+        return new Router({
+            ...this._def,
+            queries: safeObject(this._def.queries, mergeProcedures(childRouter._def.queries)),
+            mutations: safeObject(this._def.mutations, mergeProcedures(childRouter._def.mutations)),
+            subscriptions: safeObject(this._def.subscriptions, mergeProcedures(childRouter._def.subscriptions))
+        });
+    }
+    /**
+   * Invoke procedure. Only for internal use within library.
+   */ async call(opts) {
+        const { type , path  } = opts;
+        const defTarget = PROCEDURE_DEFINITION_MAP[type];
+        const defs = this._def[defTarget];
+        const procedure = defs[path];
+        if (!procedure) {
+            throw new TRPCError.TRPCError({
+                code: 'NOT_FOUND',
+                message: `No "${type}"-procedure on path "${path}"`
+            });
+        }
+        return procedure.call(opts);
+    }
+    createCaller(ctx) {
+        return {
+            query: (path, ...args)=>{
+                return this.call({
+                    type: 'query',
+                    ctx,
+                    path,
+                    rawInput: args[0]
+                });
+            },
+            mutation: (path, ...args)=>{
+                return this.call({
+                    type: 'mutation',
+                    ctx,
+                    path,
+                    rawInput: args[0]
+                });
+            },
+            subscription: (path, ...args)=>{
+                return this.call({
+                    type: 'subscription',
+                    ctx,
+                    path,
+                    rawInput: args[0]
+                });
+            }
+        };
+    }
+    /**
+   * Function to be called before any procedure is invoked
+   * @link https://trpc.io/docs/middlewares
+   */ middleware(middleware) {
+        return new Router({
+            ...this._def,
+            middlewares: [
+                ...this._def.middlewares,
+                middleware
+            ]
+        });
+    }
+    /**
+   * Format errors
+   * @link https://trpc.io/docs/error-formatting
+   */ formatError(errorFormatter) {
+        if (this._def.errorFormatter !== resolveHTTPResponse.defaultFormatter) {
+            throw new Error('You seem to have double `formatError()`-calls in your router tree');
+        }
+        return new Router({
+            ...this._def,
+            errorFormatter: errorFormatter
+        });
+    }
+    getErrorShape(opts) {
+        const { path , error  } = opts;
+        const { code  } = opts.error;
+        const shape = {
+            message: error.message,
+            code: codes.TRPC_ERROR_CODES_BY_KEY[code],
+            data: {
+                code,
+                httpStatus: resolveHTTPResponse.getHTTPStatusCodeFromError(error)
+            }
+        };
+        if (process.env.NODE_ENV !== 'production' && typeof opts.error.stack === 'string') {
+            shape.data.stack = opts.error.stack;
+        }
+        if (typeof path === 'string') {
+            shape.data.path = path;
+        }
+        return this._def.errorFormatter({
+            ...opts,
+            shape
+        });
+    }
+    /**
+   * Add data transformer to serialize/deserialize input args + output
+   * @link https://trpc.io/docs/data-transformers
+   */ transformer(_transformer) {
+        const transformer = getDataTransformer(_transformer);
+        if (this._def.transformer !== resolveHTTPResponse.defaultTransformer) {
+            throw new Error('You seem to have double `transformer()`-calls in your router tree');
+        }
+        return new Router({
+            ...this._def,
+            transformer
+        });
+    }
+    /**
+   * Flattens the generics of TQueries/TMutations/TSubscriptions.
+   * ⚠️ Experimental - might disappear. ⚠️
+   *
+   * @alpha
+   */ flat() {
+        return this;
+    }
+    /**
+   * Interop mode for v9.x -> v10.x
+   */ interop() {
+        return migrateRouter(this);
+    }
+    constructor(def){
+        this._def = {
+            queries: def?.queries ?? safeObject(),
+            mutations: def?.mutations ?? safeObject(),
+            subscriptions: def?.subscriptions ?? safeObject(),
+            middlewares: def?.middlewares ?? [],
+            errorFormatter: def?.errorFormatter ?? resolveHTTPResponse.defaultFormatter,
+            transformer: def?.transformer ?? resolveHTTPResponse.defaultTransformer
+        };
+    }
+}
+/**
+ * @deprecated
+ */ function router() {
+    return new Router();
+}
+
+exports.router = router;

package/dist/shared/index.d.ts

@@ -1,3 +1,2 @@
 export * from './createProxy';
-export type { LegacyV9ProcedureTag } from '../deprecated/interop';
 //# sourceMappingURL=index.d.ts.map

package/dist/shared/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/shared/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAE9B,YAAY,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/shared/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC"}

package/dist/subscription.mjs

@@ -1,4 +1,4 @@
-import { g as getTRPCErrorFromUnknown } from './TRPCError-281ac25a.mjs';
+import { a as getTRPCErrorFromUnknown } from './TRPCError-e99e7cbe.mjs';
 import { o as observable } from './observable-e129ac9d.mjs';
 
 function subscriptionPullFactory(opts) {

package/dist/types.d.ts

@@ -50,15 +50,5 @@ declare type FilterKeys<T extends object, K> = {
  * @internal
  */
 export declare type Filter<T extends object, K> = Pick<T, FilterKeys<T, K>>;
-/**
- * @internal
- */
-export declare type NeverKeys<T> = {
-    [TKey in keyof T]: T[TKey] extends never ? TKey : never;
-}[keyof T];
-/**
- * @internal
- */
-export declare type OmitNeverKeys<T> = Omit<T, NeverKeys<T>>;
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,oBAAY,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC;KACxC,IAAI,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,IAAI,SAAS,MAAM,CAAC,GAC7C,CAAC,CAAC,IAAI,CAAC,GACP,IAAI,SAAS,MAAM,CAAC,GACpB,CAAC,CAAC,IAAI,CAAC,GACP,KAAK;CACV,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAE5C;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEzE;;GAEG;AACH,oBAAY,QAAQ,CAAC,CAAC,IAAI;KAAG,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;CAAE,CAAC;AAE/D;;GAEG;AACH,oBAAY,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;AAEpD;;GAEG;AACH,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE7C;;;;;GAKG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAExD;;GAEG;AACH,oBAAY,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IACtE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AAEjC,aAAK,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI;KACpC,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,GAAG,KAAK;CACpD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAEpE;;GAEG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI;KACxB,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,KAAK;CACxD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX;;GAEG;AACH,oBAAY,aAAa,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,oBAAY,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC;KACxC,IAAI,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,IAAI,SAAS,MAAM,CAAC,GAC7C,CAAC,CAAC,IAAI,CAAC,GACP,IAAI,SAAS,MAAM,CAAC,GACpB,CAAC,CAAC,IAAI,CAAC,GACP,KAAK;CACV,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAE5C;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEzE;;GAEG;AACH,oBAAY,QAAQ,CAAC,CAAC,IAAI;KAAG,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;CAAE,CAAC;AAE/D;;GAEG;AACH,oBAAY,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;AAEpD;;GAEG;AACH,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE7C;;;;;GAKG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAExD;;GAEG;AACH,oBAAY,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IACtE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AAEjC,aAAK,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI;KACpC,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,GAAG,KAAK;CACpD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.0.0-proxy-alpha.76",
+  "version": "10.0.0-proxy-alpha.77",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -136,5 +136,5 @@
     "yup": "^0.32.8",
     "zod": "^3.0.0"
   },
-  "gitHead": "56bcacc869da9ee04c78c1eff2b4f9ad6ae9dece"
+  "gitHead": "11f75af120ffea027f5be8eabcfb50c449185355"
 }

package/src/core/index.ts

@@ -6,6 +6,10 @@ export type {
 export { callProcedure } from './router';
 export type {
   Procedure,
+  AnyProcedure,
+  AnyQueryProcedure,
+  AnyMutationProcedure,
+  AnySubscriptionProcedure,
   ProcedureParams,
   ProcedureArgs,
   ProcedureOptions,