@trpc/server 10.0.0-proxy-beta.5 → 10.0.0-proxy-beta.6

package/dist/{router-cf869ecb.js → router-bf52be2e.js}

@@ -1,9 +1,276 @@
 'use strict';
 
-var resolveHTTPResponse = require('./resolveHTTPResponse-6fecf1e4.js');
+var resolveHTTPResponse = require('./resolveHTTPResponse-0a8e47b8.js');
 var codes = require('./codes-76c38a34.js');
 var TRPCError = require('./TRPCError-fe9113e5.js');
 
+/**
+ * @internal
+ */ // FIXME this should use RootConfig
+function createMiddlewareFactory() {
+    return function createMiddleware(fn) {
+        return fn;
+    };
+}
+function isPlainObject(obj) {
+    return obj && typeof obj === 'object' && !Array.isArray(obj);
+}
+/**
+ * @internal
+ * Please note, `trpc-openapi` uses this function.
+ */ function createInputMiddleware(parse) {
+    const inputMiddleware = async ({ next , rawInput , input ,  })=>{
+        let parsedInput;
+        try {
+            parsedInput = await parse(rawInput);
+        } catch (cause) {
+            throw new TRPCError.TRPCError({
+                code: 'BAD_REQUEST',
+                cause: TRPCError.getCauseFromUnknown(cause)
+            });
+        }
+        // Multiple input parsers
+        const combinedInput = isPlainObject(input) && isPlainObject(parsedInput) ? {
+            ...input,
+            ...parsedInput
+        } : parsedInput;
+        // TODO fix this typing?
+        return next({
+            input: combinedInput
+        });
+    };
+    inputMiddleware._type = 'input';
+    return inputMiddleware;
+}
+/**
+ * @internal
+ */ function createOutputMiddleware(parse) {
+    const outputMiddleware = async ({ 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.TRPCError({
+                message: 'Output validation failed',
+                code: 'INTERNAL_SERVER_ERROR',
+                cause: TRPCError.getCauseFromUnknown(cause)
+            });
+        }
+    };
+    outputMiddleware._type = 'output';
+    return outputMiddleware;
+}
+
+function getParseFn$1(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');
+}
+/**
+ * @deprecated only for backwards compat
+ * @internal
+ */ function getParseFnOrPassThrough(procedureParser) {
+    if (!procedureParser) {
+        return (v)=>v;
+    }
+    return getParseFn$1(procedureParser);
+}
+
+/**
+ * @internal
+ */ const middlewareMarker$1 = 'middlewareMarker';
+
+function createNewBuilder(def1, def2) {
+    const { middlewares =[] , inputs , ...rest } = def2;
+    // TODO: maybe have a fn here to warn about calls
+    return createBuilder({
+        ...resolveHTTPResponse.mergeWithoutOverrides(def1, rest),
+        inputs: [
+            ...def1.inputs,
+            ...inputs ?? []
+        ],
+        middlewares: [
+            ...def1.middlewares,
+            ...middlewares
+        ]
+    });
+}
+function createBuilder(initDef) {
+    const _def = initDef || {
+        inputs: [],
+        middlewares: []
+    };
+    return {
+        _def,
+        input (input) {
+            const parser = getParseFn$1(input);
+            return createNewBuilder(_def, {
+                inputs: [
+                    input
+                ],
+                middlewares: [
+                    createInputMiddleware(parser)
+                ]
+            });
+        },
+        output (output) {
+            const parseOutput = getParseFn$1(output);
+            return createNewBuilder(_def, {
+                output,
+                middlewares: [
+                    createOutputMiddleware(parseOutput)
+                ]
+            });
+        },
+        meta (meta) {
+            return createNewBuilder(_def, {
+                meta: meta
+            });
+        },
+        unstable_concat (builder) {
+            return createNewBuilder(_def, builder._def);
+        },
+        use (middleware) {
+            return createNewBuilder(_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);
+        }
+    };
+}
+function createResolver(_def, resolver) {
+    const finalBuilder = createNewBuilder(_def, {
+        resolver,
+        middlewares: [
+            async function resolveMiddleware(opts) {
+                const data = await resolver(opts);
+                return {
+                    marker: middlewareMarker$1,
+                    ok: true,
+                    data,
+                    ctx: opts.ctx
+                };
+            }
+        ]
+    });
+    return createProcedureCaller(finalBuilder._def);
+}
+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) {
+    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
+        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: TRPCError.getTRPCErrorFromUnknown(cause),
+                    marker: middlewareMarker$1
+                };
+            }
+        };
+        // 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;
+    };
+    procedure._def = _def;
+    procedure.meta = _def.meta;
+    return procedure;
+}
+
 resolveHTTPResponse.assertNotBrowser();
 
 /**
@@ -89,7 +356,7 @@ function getParseFn(procedureParser) {
                     data,
                     ctx
                 };
-            }, 
+            }
         ]);
         // run the middlewares recursively with the resolver as the last one
         const callRecursive = async (callOpts = {
@@ -184,17 +451,17 @@ function createProcedure(opts) {
 
 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({
+    const inputParser = getParseFnOrPassThrough(def.inputParser);
+    const outputParser = getParseFnOrPassThrough(def.outputParser);
+    const inputMiddleware = createInputMiddleware(inputParser);
+    const builder = createBuilder({
         inputs: [
             def.inputParser
         ],
         middlewares: [
             ...def.middlewares,
             inputMiddleware,
-            resolveHTTPResponse.createOutputMiddleware(outputParser), 
+            createOutputMiddleware(outputParser)
         ],
         meta: def.meta,
         output: def.outputParser,
@@ -298,7 +565,7 @@ function safeObject(...args) {
         const duplicates = [
             ...duplicateQueries,
             ...duplicateMutations,
-            ...duplicateSubscriptions, 
+            ...duplicateSubscriptions
         ];
         if (duplicates.length) {
             throw new Error(`Duplicate endpoint(s): ${duplicates.join(', ')}`);
@@ -450,4 +717,8 @@ function safeObject(...args) {
     return new Router();
 }
 
+exports.createBuilder = createBuilder;
+exports.createInputMiddleware = createInputMiddleware;
+exports.createMiddlewareFactory = createMiddlewareFactory;
+exports.createOutputMiddleware = createOutputMiddleware;
 exports.router = router;

package/dist/subscription.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.0.0-proxy-beta.5",
+  "version": "10.0.0-proxy-beta.6",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -11,16 +11,23 @@
     "directory": "packages/server"
   },
   "eslintConfig": {
-    "rules": {
-      "explicit-module-boundary-types": "off",
-      "no-restricted-imports": [
-        "error",
-        "@trpc/server"
-      ]
-    }
+    "overrides": [
+      {
+        "files": [
+          "src"
+        ],
+        "rules": {
+          "explicit-module-boundary-types": "off",
+          "no-restricted-imports": [
+            "error",
+            "@trpc/server"
+          ]
+        }
+      }
+    ]
   },
   "scripts": {
-    "benchmark": "yarn tsc --project tsconfig.benchmark.json",
+    "benchmark": "tsc --project tsconfig.benchmark.json",
     "ts-watch": "tsc --project tsconfig.watch.json"
   },
   "main": "dist/index.js",
@@ -109,11 +116,16 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^3.14.1",
     "@fastify/websocket": "^5.0.0",
-    "@miniflare/core": "^2.4.0",
-    "@tanstack/react-query": "^4.3.0",
+    "@miniflare/core": "^2.9.0",
+    "@trpc/client": "10.0.0-proxy-beta.6",
+    "@trpc/next": "10.0.0-proxy-beta.6",
+    "@trpc/react": "10.0.0-proxy-beta.6",
+    "@trpc/server": "10.0.0-proxy-beta.6",
     "@types/aws-lambda": "^8.10.97",
     "@types/express": "^4.17.12",
     "@types/hash-sum": "^1.0.0",
+    "@types/node": "^18.7.20",
+    "@types/node-fetch": "^2.5.11",
     "@types/ws": "^8.2.0",
     "abort-controller": "^3.0.0",
     "aws-lambda": "^1.0.7",
@@ -130,11 +142,12 @@
     "myzod": "^1.3.1",
     "next": "^12.3.1",
     "node-fetch": "^2.6.1",
+    "superjson": "^1.7.4",
     "superstruct": "^0.15.2",
     "typescript": "^4.8.3",
     "ws": "^8.0.0",
     "yup": "^0.32.8",
     "zod": "^3.0.0"
   },
-  "gitHead": "54b1938bdca755d2d8ff6e79712ba57d3e29edab"
+  "gitHead": "840af567d6634243e0b6a09d9fdb5bf19554cc93"
 }

package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.d.ts

@@ -1 +0,0 @@
-export * from "../../../dist/declarations/src/adapters/aws-lambda/index";

package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.dev.js

@@ -1,190 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var transformTRPCResponse = require('../../../dist/transformTRPCResponse-36a41418.cjs.dev.js');
-require('../../../dist/router-ee876044.cjs.dev.js');
-require('events');
-require('http');
-require('url');
-require('../../../dist/nodeHTTPRequestHandler-9a93c255.cjs.dev.js');
-var resolveHTTPResponse = require('../../../dist/resolveHTTPResponse-ab01e4b9.cjs.dev.js');
-require('../../../dist/codes-130e62df.cjs.dev.js');
-
-function isPayloadV1(event) {
-  return determinePayloadFormat(event) == '1.0';
-}
-function isPayloadV2(event) {
-  return determinePayloadFormat(event) == '2.0';
-}
-
-function determinePayloadFormat(event) {
-  // https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
-  // According to AWS support, version is is extracted from the version property in the event.
-  // If there is no version property, then the version is implied as 1.0
-  const unknownEvent = event;
-
-  if (typeof unknownEvent.version === 'undefined') {
-    return '1.0';
-  } else {
-    if (['1.0', '2.0'].includes(unknownEvent.version)) {
-      return unknownEvent.version;
-    } else {
-      return 'custom';
-    }
-  }
-}
-
-const UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE = 'Custom payload format version not handled by this adapter. Please use either 1.0 or 2.0. More information here' + 'https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html';
-
-function lambdaEventToHTTPRequest(event) {
-  const query = new URLSearchParams();
-
-  for (const [key, value] of Object.entries((_event$queryStringPar = event.queryStringParameters) !== null && _event$queryStringPar !== void 0 ? _event$queryStringPar : {})) {
-    var _event$queryStringPar;
-
-    if (typeof value !== 'undefined') {
-      query.append(key, value);
-    }
-  }
-
-  return {
-    method: getHTTPMethod(event),
-    query: query,
-    headers: event.headers,
-    body: event.body
-  };
-}
-
-function getHTTPMethod(event) {
-  if (isPayloadV1(event)) {
-    return event.httpMethod;
-  }
-
-  if (isPayloadV2(event)) {
-    return event.requestContext.http.method;
-  }
-
-  throw new transformTRPCResponse.TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-  });
-}
-
-function getPath(event) {
-  if (isPayloadV1(event)) {
-    const matches = event.resource.matchAll(/\{(.*?)\}/g);
-
-    for (const match of matches) {
-      const group = match[1];
-
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
-    }
-
-    return event.path.slice(1);
-  }
-
-  if (isPayloadV2(event)) {
-    const matches = event.routeKey.matchAll(/\{(.*?)\}/g);
-
-    for (const match of matches) {
-      const group = match[1];
-
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
-    }
-
-    return event.rawPath.slice(1);
-  }
-
-  throw new transformTRPCResponse.TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-  });
-}
-
-function transformHeaders(headers) {
-  const obj = {};
-
-  for (const [key, value] of Object.entries(headers)) {
-    if (typeof value === 'undefined') {
-      continue;
-    }
-
-    obj[key] = Array.isArray(value) ? value.join(',') : value;
-  }
-
-  return obj;
-}
-
-function tRPCOutputToAPIGatewayOutput(event, response) {
-  if (isPayloadV1(event)) {
-    var _response$body, _response$headers;
-
-    const resp = {
-      statusCode: response.status,
-      body: (_response$body = response.body) !== null && _response$body !== void 0 ? _response$body : '',
-      headers: transformHeaders((_response$headers = response.headers) !== null && _response$headers !== void 0 ? _response$headers : {})
-    };
-    return resp;
-  } else if (isPayloadV2(event)) {
-    var _response$body2, _response$headers2;
-
-    const resp = {
-      statusCode: response.status,
-      body: (_response$body2 = response.body) !== null && _response$body2 !== void 0 ? _response$body2 : undefined,
-      headers: transformHeaders((_response$headers2 = response.headers) !== null && _response$headers2 !== void 0 ? _response$headers2 : {})
-    };
-    return resp;
-  } else {
-    throw new transformTRPCResponse.TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-    });
-  }
-}
-/** Will check the createContext of the TRouter and get the parameter of event.
- * @internal
- **/
-
-
-function awsLambdaRequestHandler(opts) {
-  return async (event, context) => {
-    const req = lambdaEventToHTTPRequest(event);
-    const path = getPath(event);
-
-    const createContext = async function _createContext() {
-      var _opts$createContext;
-
-      return await ((_opts$createContext = opts.createContext) === null || _opts$createContext === void 0 ? void 0 : _opts$createContext.call(opts, {
-        event,
-        context
-      }));
-    };
-
-    const response = await resolveHTTPResponse.resolveHTTPResponse({
-      router: opts.router,
-      batching: opts.batching,
-      responseMeta: opts === null || opts === void 0 ? void 0 : opts.responseMeta,
-      createContext,
-      req,
-      path,
-      error: null,
-
-      onError(o) {
-        var _opts$onError;
-
-        opts === null || opts === void 0 ? void 0 : (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, { ...o,
-          req: event
-        });
-      }
-
-    });
-    return tRPCOutputToAPIGatewayOutput(event, response);
-  };
-}
-
-exports.awsLambdaRequestHandler = awsLambdaRequestHandler;

package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.js

@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === "production") {
-  module.exports = require("./trpc-server-adapters-aws-lambda.cjs.prod.js");
-} else {
-  module.exports = require("./trpc-server-adapters-aws-lambda.cjs.dev.js");
-}