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

package/dist/index.mjs

@@ -3,6 +3,7 @@ export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPRe
 import { T as TRPC_ERROR_CODES_BY_KEY } from './envelopes-af8c2959.mjs';
 import { T as TRPCError, g as getCauseFromUnknown, a as getErrorFromUnknown } from './TRPCError-b7fa0c31.mjs';
 export { T as TRPCError } from './TRPCError-b7fa0c31.mjs';
+import { c as createProxy } from './index-a3bd54c7.mjs';
 import './transformTRPCResponse-747b9a68.mjs';
 
 assertNotBrowser();
@@ -361,96 +362,82 @@ const middlewareMarker = 'middlewareMarker';
  * @internal
  */
 
-/**
- * This is the actual internal representation of a builder
- * FIXME - I want to get rid of this and use the public API instead
- */
-
-function createNewInternalBuilder(def1, def2) {
+function createNewBuilder(def1, def2) {
   const {
     middlewares = [],
     ...rest
   } = def2; // TODO: maybe have a fn here to warn about calls
 
-  return createInternalBuilder({ ...mergeWithoutOverrides(def1, rest),
+  return createBuilder({ ...mergeWithoutOverrides(def1, rest),
     middlewares: [...def1.middlewares, ...middlewares]
   });
 }
 
-const codeblock = /*#__PURE__*/`
-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 */
-});
+function createBuilder(initDef) {
+  const _def = initDef || {
+    middlewares: []
+  };
 
-const result = await caller.call('myProcedure', input);
-`.trim();
+  return {
+    _def,
 
-function createProcedureCaller(_def) {
-  const procedure = async function resolve(opts) {
-    if (!opts || !('rawInput' in opts)) {
-      throw new Error(codeblock);
-    } // run the middlewares recursively with the resolver as the last one
+    input(input) {
+      const parser = getParseFn(input);
+      return createNewBuilder(_def, {
+        input,
+        middlewares: [createInputMiddleware(parser)]
+      });
+    },
 
+    output(output) {
+      const parseOutput = getParseFn(output);
+      return createNewBuilder(_def, {
+        output,
+        middlewares: [createOutputMiddleware(parseOutput)]
+      });
+    },
 
-    const callRecursive = async (callOpts = {
-      index: 0,
-      ctx: opts.ctx
-    }) => {
-      try {
-        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 => {
-            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
+    meta(meta) {
+      return createNewBuilder(_def, {
+        meta: meta
+      });
+    },
 
+    /** @deprecated **/
+    resolve(resolver) {
+      return createResolver(_def, resolver);
+    },
 
-    const result = await callRecursive();
+    unstable_concat(builder) {
+      return createNewBuilder(_def, builder._def);
+    },
 
-    if (!result) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: 'No result from middlewares - did you forget to `return next()`?'
+    use(middleware) {
+      return createNewBuilder(_def, {
+        middlewares: [middleware]
       });
-    }
+    },
 
-    if (!result.ok) {
-      // re-throw original error
-      throw result.error;
+    query(resolver) {
+      return createResolver({ ..._def,
+        query: true
+      }, resolver);
+    },
+
+    mutation(resolver) {
+      return createResolver({ ..._def,
+        mutation: true
+      }, resolver);
+    },
+
+    subscription(resolver) {
+      return createResolver({ ..._def,
+        subscription: true
+      }, resolver);
     }
 
-    return result.data;
   };
-
-  procedure._def = _def;
-  procedure.meta = _def.meta;
-  return procedure;
 }
-
 function createInputMiddleware(parse) {
   return async function inputMiddleware({
     next,
@@ -500,7 +487,7 @@ function createOutputMiddleware(parse) {
 }
 
 function createResolver(_def, resolver) {
-  const finalBuilder = createNewInternalBuilder(_def, {
+  const finalBuilder = createNewBuilder(_def, {
     resolver,
     middlewares: [async function resolveMiddleware(opts) {
       const data = await resolver(opts);
@@ -514,72 +501,85 @@ function createResolver(_def, resolver) {
   });
   return createProcedureCaller(finalBuilder._def);
 }
+/**
+ * @internal
+ */
 
-function createInternalBuilder(initDef) {
-  const _def = initDef || {
-    middlewares: []
-  };
 
-  return {
-    _def,
+const codeblock = /*#__PURE__*/`
+If you want to call this function on the server, you do the following:
+This is a client-only function.
 
-    // _call: createProcedureCaller(_def),
-    input(input) {
-      const parser = getParseFn(input);
-      return createNewInternalBuilder(_def, {
-        input,
-        middlewares: [createInputMiddleware(parser)]
-      });
-    },
+const caller = appRouter.createCaller({
+  /* ... your context */
+});
 
-    output(output) {
-      const parseOutput = getParseFn(output);
-      return createNewInternalBuilder(_def, {
-        output,
-        middlewares: [createOutputMiddleware(parseOutput)]
-      });
-    },
+const result = await caller.call('myProcedure', input);
+`.trim();
 
-    meta(meta) {
-      return createNewInternalBuilder(_def, {
-        meta
-      });
-    },
+function createProcedureCaller(_def) {
+  const procedure = async function resolve(opts) {
+    // is direct server-side call
+    if (!opts || !('rawInput' in opts)) {
+      throw new Error(codeblock);
+    } // run the middlewares recursively with the resolver as the last one
 
-    /** @deprecated **/
-    resolve(resolver) {
-      return createResolver(_def, resolver);
-    },
 
-    unstable_concat(builder) {
-      return createNewInternalBuilder(_def, builder._def);
-    },
+    const callRecursive = async (callOpts = {
+      index: 0,
+      ctx: opts.ctx
+    }) => {
+      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 => {
+            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
 
-    use(middleware) {
-      return createNewInternalBuilder(_def, {
-        middlewares: [middleware]
-      });
-    },
 
-    query(resolver) {
-      return createResolver({ ..._def,
-        query: true
-      }, resolver);
-    },
+    const result = await callRecursive();
 
-    mutation(resolver) {
-      return createResolver({ ..._def,
-        mutation: true
-      }, resolver);
-    },
+    if (!result) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: 'No result from middlewares - did you forget to `return next()`?'
+      });
+    }
 
-    subscription(resolver) {
-      return createResolver({ ..._def,
-        subscription: true
-      }, resolver);
+    if (!result.ok) {
+      // re-throw original error
+      throw result.error;
     }
 
+    return result.data;
   };
+
+  procedure._def = _def;
+  procedure.meta = _def.meta;
+  return procedure;
 }
 
 /**
@@ -590,15 +590,15 @@ function omitPrototype(obj1) {
   return Object.assign(Object.create(null), obj1);
 }
 
-/* eslint-disable @typescript-eslint/ban-types */
+const procedureTypes = ['query', 'mutation', 'subscription'];
+/**
+ * @public
+ */
 
-function createRouterProxy(callback) {
-  return new Proxy({}, {
-    get(_, path) {
-      return (...args) => callback(path, ...args);
-    }
+/* eslint-disable @typescript-eslint/ban-types */
 
-  });
+function isRouter(procedureOrRouter) {
+  return 'router' in procedureOrRouter._def;
 }
 
 const emptyRouter = {
@@ -626,9 +626,8 @@ function createRouterFactory(defaults) {
       for (const [key, procedureOrRouter] of Object.entries(procedures !== null && procedures !== void 0 ? procedures : {})) {
         const newPath = `${path}${key}`;
 
-        if (typeof procedureOrRouter === 'object') {
-          const router = procedureOrRouter;
-          recursiveGetPaths(router._def.procedures, `${newPath}.`);
+        if (isRouter(procedureOrRouter)) {
+          recursiveGetPaths(procedureOrRouter._def.procedures, `${newPath}.`);
           continue;
         }
 
@@ -662,68 +661,45 @@ function createRouterFactory(defaults) {
         [key]: val
       }), {})
     };
-
-    function callProcedure(opts) {
-      const {
-        type,
-        path
-      } = opts;
-
-      if (!(path in _def.procedures) || !_def.procedures[path]['_def'][type]) {
-        throw new TRPCError({
-          code: 'NOT_FOUND',
-          message: `No "${type}"-procedure on path "${path}"`
-        });
-      }
-
-      const procedure = _def.procedures[path];
-      return procedure(opts);
-    }
-
     const router = { ...opts,
       _def,
       transformer: _def.transformer,
       errorFormatter: _def.errorFormatter,
 
       createCaller(ctx) {
-        return {
-          query: (path, ...args) => callProcedure({
-            path,
-            rawInput: args[0],
-            ctx,
-            type: 'query'
-          }),
-          mutation: (path, ...args) => callProcedure({
-            path,
-            rawInput: args[0],
-            ctx,
-            type: 'mutation'
-          }),
-          subscription: (path, ...args) => callProcedure({
-            path,
+        const proxy = createProxy(({
+          path,
+          args
+        }) => {
+          // interop mode
+          if (path.length === 1 && procedureTypes.includes(path[0])) {
+            return callProcedure({
+              procedures: _def.procedures,
+              path: args[0],
+              rawInput: args[1],
+              ctx,
+              type: path[0]
+            });
+          }
+
+          const fullPath = path.join('.');
+          const procedure = _def.procedures[fullPath];
+          let type = 'query';
+
+          if (procedure._def.mutation) {
+            type = 'mutation';
+          } else if (procedure._def.subscription) {
+            type = 'subscription';
+          }
+
+          return procedure({
+            path: fullPath,
             rawInput: args[0],
             ctx,
-            type: 'subscription'
-          }),
-          queries: createRouterProxy((path, rawInput) => callProcedure({
-            path,
-            rawInput,
-            ctx,
-            type: 'query'
-          })),
-          mutations: createRouterProxy((path, rawInput) => callProcedure({
-            path,
-            rawInput,
-            ctx,
-            type: 'mutation'
-          })),
-          subscriptions: createRouterProxy((path, rawInput) => callProcedure({
-            path,
-            rawInput,
-            ctx,
-            type: 'subscription'
-          }))
-        };
+            type
+          });
+        });
+        return proxy;
       },
 
       getErrorShape(opts) {
@@ -760,6 +736,28 @@ function createRouterFactory(defaults) {
     return router;
   };
 }
+/**
+ * @internal
+ */
+
+function callProcedure(opts) {
+  var _opts$procedures$path;
+
+  const {
+    type,
+    path
+  } = opts;
+
+  if (!(path in opts.procedures) || !((_opts$procedures$path = opts.procedures[path]) !== null && _opts$procedures$path !== void 0 && _opts$procedures$path._def[type])) {
+    throw new TRPCError({
+      code: 'NOT_FOUND',
+      message: `No "${type}"-procedure on path "${path}"`
+    });
+  }
+
+  const procedure = opts.procedures[path];
+  return procedure(opts);
+}
 
 function migrateProcedure(oldProc, type) {
   const def = oldProc._def();
@@ -767,7 +765,7 @@ function migrateProcedure(oldProc, type) {
   const inputParser = getParseFnOrPassThrough(def.inputParser);
   const outputParser = getParseFnOrPassThrough(def.outputParser);
   const inputMiddleware = createInputMiddleware(inputParser);
-  const builder = createInternalBuilder({
+  const builder = createBuilder({
     input: def.inputParser,
     middlewares: [...def.middlewares, inputMiddleware, createOutputMiddleware(outputParser)],
     meta: def.meta,
@@ -862,8 +860,8 @@ class Router {
   static prefixProcedures(procedures, prefix) {
     const eps = safeObject();
 
-    for (const key in procedures) {
-      eps[prefix + key] = procedures[key];
+    for (const [key, procedure] of Object.entries(procedures)) {
+      eps[prefix + key] = procedure;
     }
 
     return eps;
@@ -932,8 +930,7 @@ class Router {
     const mergeProcedures = defs => {
       const newDefs = safeObject();
 
-      for (const key in defs) {
-        const procedure = defs[key];
+      for (const [key, procedure] of Object.entries(defs)) {
         const newProcedure = procedure.inheritMiddlewares(this._def.middlewares);
         newDefs[key] = newProcedure;
       }
@@ -1136,10 +1133,6 @@ function mergeRoutersGeneric(...args) {
   return mergeRouters(...args);
 }
 
-function createBuilder() {
-  return createInternalBuilder();
-}
-
 /**
  * @internal
  */
@@ -1216,4 +1209,4 @@ function initTRPC() {
   };
 }
 
-export { defaultTransformer, getDataTransformer$1 as getDataTransformer, initTRPC, router };
+export { callProcedure, defaultTransformer, getDataTransformer$1 as getDataTransformer, initTRPC, procedureTypes, router };

package/dist/internals.d.ts

@@ -0,0 +1,11 @@
+/**
+ * These types have to be exported so users can generate their own types definitions files
+ */
+export type { DefaultErrorShape } from './error/formatter';
+export type { mergeRoutersGeneric } from './core/internals/__generated__/mergeRoutersGeneric';
+export type { ProcedureBuilder } from './core/internals/procedureBuilder';
+export type { Overwrite, unsetMarker } from './core/internals/utils';
+export type { MiddlewareFunction } from './core/middleware';
+export type { Router, RouterDef } from './core/router';
+export type { MutationProcedure, QueryProcedure, SubscriptionProcedure, } from './core/procedure';
+//# sourceMappingURL=internals.d.ts.map

package/dist/internals.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internals.d.ts","sourceRoot":"","sources":["../src/internals.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,YAAY,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,YAAY,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrE,YAAY,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EACV,iBAAiB,EACjB,cAAc,EACd,qBAAqB,GACtB,MAAM,kBAAkB,CAAC"}

package/dist/observable/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var observable = require('../observable-3aa4d911.js');
+var observable = require('../observable-341a0506.js');
 
 /* eslint-disable @typescript-eslint/no-empty-interface */
 function share( // eslint-disable-next-line @typescript-eslint/no-unused-vars

package/dist/observable/index.mjs

@@ -1,4 +1,4 @@
-export { i as isObservable, o as observable } from '../observable-137ea1bd.mjs';
+export { i as isObservable, o as observable } from '../observable-cfedfa30.mjs';
 
 /* eslint-disable @typescript-eslint/no-empty-interface */
 function share( // eslint-disable-next-line @typescript-eslint/no-unused-vars

package/dist/observable/internals/pipe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipe.d.ts","sourceRoot":"","sources":["../../../src/observable/internals/pipe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,gBAAgB;AAChB,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EAChC,GAAG,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAC9B,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAerB"}
+{"version":3,"file":"pipe.d.ts","sourceRoot":"","sources":["../../../src/observable/internals/pipe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,gBAAgB;AAChB,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EAChC,GAAG,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAC9B,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAgBrB"}

package/dist/{observable-3aa4d911.js → observable-341a0506.js}

@@ -12,6 +12,7 @@ function pipeFromArray(fns) {
   }
 
   if (fns.length === 1) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     return fns[0];
   }
 

package/dist/{observable-137ea1bd.mjs → observable-cfedfa30.mjs}

@@ -10,6 +10,7 @@ function pipeFromArray(fns) {
   }
 
   if (fns.length === 1) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     return fns[0];
   }
 

package/dist/shared/index.js

@@ -2,34 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-function createProxyInner(callback, ...path) {
-  const proxy = new Proxy(() => {// noop
-  }, {
-    get(_obj, name) {
-      if (typeof name === 'string') {
-        return createProxyInner(callback, ...path, name);
-      }
+var index = require('../index-1a25ccbd.js');
 
-      throw new Error('Not supported');
-    },
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    apply(_1, _2, args) {
-      return callback({
-        args,
-        path
-      });
-    }
 
-  });
-  return proxy;
-}
-/**
- * Creates a proxy that calls the callback with the path and arguments
- * @internal
- */
-
-
-const createProxy = callback => createProxyInner(callback);
-
-exports.createProxy = createProxy;
+exports.createProxy = index.createProxy;

package/dist/shared/index.mjs

@@ -1,31 +1 @@
-function createProxyInner(callback, ...path) {
-  const proxy = new Proxy(() => {// noop
-  }, {
-    get(_obj, name) {
-      if (typeof name === 'string') {
-        return createProxyInner(callback, ...path, name);
-      }
-
-      throw new Error('Not supported');
-    },
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    apply(_1, _2, args) {
-      return callback({
-        args,
-        path
-      });
-    }
-
-  });
-  return proxy;
-}
-/**
- * Creates a proxy that calls the callback with the path and arguments
- * @internal
- */
-
-
-const createProxy = callback => createProxyInner(callback);
-
-export { createProxy };
+export { c as createProxy } from '../index-a3bd54c7.mjs';

package/dist/subscription.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var TRPCError = require('./TRPCError-9050a68d.js');
-var observable = require('./observable-3aa4d911.js');
+var observable = require('./observable-341a0506.js');
 
 function subscriptionPullFactory(opts) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/dist/subscription.mjs

@@ -1,5 +1,5 @@
 import { a as getErrorFromUnknown } from './TRPCError-b7fa0c31.mjs';
-import { o as observable } from './observable-137ea1bd.mjs';
+import { o as observable } from './observable-cfedfa30.mjs';
 
 function subscriptionPullFactory(opts) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/dist/types.d.ts

@@ -54,5 +54,15 @@ 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