@trpc/server 10.0.0-alpha.43 → 10.0.0-alpha.46

package/adapters/aws-lambda/index.js

@@ -1 +1 @@
-module.exports = require('../../dist/adapters/aws-lambda/index');
+module.exports = require('../../dist/adapters/aws-lambda');

package/adapters/fastify/index.js

@@ -1 +1 @@
-module.exports = require('../../dist/adapters/fastify/index');
+module.exports = require('../../dist/adapters/fastify');

package/adapters/fetch/index.js

@@ -1 +1 @@
-module.exports = require('../../dist/adapters/fetch/index');
+module.exports = require('../../dist/adapters/fetch');

package/adapters/node-http/index.js

@@ -1 +1 @@
-module.exports = require('../../dist/adapters/node-http/index');
+module.exports = require('../../dist/adapters/node-http');

package/dist/TRPCError-6f61762c.mjs

@@ -0,0 +1,54 @@
+function getMessageFromUnkownError(err, fallback) {
+    if (typeof err === 'string') {
+        return err;
+    }
+    if (err instanceof Error && typeof err.message === 'string') {
+        return err.message;
+    }
+    return fallback;
+}
+function getErrorFromUnknown(cause) {
+    // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
+    // ref https://github.com/trpc/trpc/issues/331
+    if (cause instanceof Error && cause.name === 'TRPCError') {
+        return cause;
+    }
+    let errorCause = undefined;
+    let stack = undefined;
+    if (cause instanceof Error) {
+        errorCause = cause;
+        // take stack trace from cause
+        stack = cause.stack;
+    }
+    const err = new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        cause: errorCause
+    });
+    err.stack = stack;
+    return err;
+}
+function getCauseFromUnknown(cause) {
+    if (cause instanceof Error) {
+        return cause;
+    }
+    return undefined;
+}
+
+class TRPCError extends Error {
+    constructor(opts){
+        const cause = opts.cause;
+        const code = opts.code;
+        const message = opts.message ?? getMessageFromUnkownError(cause, code);
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore https://github.com/tc39/proposal-error-cause
+        super(message, {
+            cause
+        });
+        this.code = code;
+        this.cause = cause;
+        this.name = 'TRPCError';
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+
+export { TRPCError as T, getCauseFromUnknown as a, getErrorFromUnknown as g };

package/dist/TRPCError-9c7830b4.js

@@ -0,0 +1,58 @@
+'use strict';
+
+function getMessageFromUnkownError(err, fallback) {
+    if (typeof err === 'string') {
+        return err;
+    }
+    if (err instanceof Error && typeof err.message === 'string') {
+        return err.message;
+    }
+    return fallback;
+}
+function getErrorFromUnknown(cause) {
+    // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
+    // ref https://github.com/trpc/trpc/issues/331
+    if (cause instanceof Error && cause.name === 'TRPCError') {
+        return cause;
+    }
+    let errorCause = undefined;
+    let stack = undefined;
+    if (cause instanceof Error) {
+        errorCause = cause;
+        // take stack trace from cause
+        stack = cause.stack;
+    }
+    const err = new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        cause: errorCause
+    });
+    err.stack = stack;
+    return err;
+}
+function getCauseFromUnknown(cause) {
+    if (cause instanceof Error) {
+        return cause;
+    }
+    return undefined;
+}
+
+class TRPCError extends Error {
+    constructor(opts){
+        const cause = opts.cause;
+        const code = opts.code;
+        const message = opts.message ?? getMessageFromUnkownError(cause, code);
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore https://github.com/tc39/proposal-error-cause
+        super(message, {
+            cause
+        });
+        this.code = code;
+        this.cause = cause;
+        this.name = 'TRPCError';
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+
+exports.TRPCError = TRPCError;
+exports.getCauseFromUnknown = getCauseFromUnknown;
+exports.getErrorFromUnknown = getErrorFromUnknown;

package/dist/adapters/aws-lambda/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/aws-lambda/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,IAAI,YAAY,EACvB,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,iCAAiC,EAClC,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,SAAS,EAAsB,MAAM,YAAY,CAAC;AAG3D,OAAO,EACL,eAAe,EAEf,gBAAgB,EAIjB,MAAM,SAAS,CAAC;AAEjB,YAAY,EAAE,6BAA6B,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAkG/E;;IAEI;AACJ,aAAK,eAAe,CAClB,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,IAC5B,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,eAAe,CAAC,SAAS,WAAW,CACxE,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,eAAe,CAAC,CACnD,GACG,UAAU,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAC1E,eAAe,CAAC;AAEpB;;IAEI;AACJ,aAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,oBAAoB,GACrD,qBAAqB,GACrB,CAAC,SAAS,sBAAsB,GAChC,iCAAiC,GACjC,KAAK,CAAC;AACV,wBAAgB,uBAAuB,CACrC,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,EAC/C,OAAO,SAAS,gBAAgB,CAAC,MAAM,CAAC,EAExC,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,GACtC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,OAAO,CAAC,CA4B5D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/adapters/aws-lambda/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,IAAI,YAAY,EACvB,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,iCAAiC,EAClC,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,SAAS,EAAsB,MAAM,YAAY,CAAC;AAG3D,OAAO,EACL,eAAe,EAEf,gBAAgB,EAIjB,MAAM,SAAS,CAAC;AAEjB,YAAY,EAAE,6BAA6B,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAkG/E;;IAEI;AACJ,aAAK,eAAe,CAClB,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,IAC5B,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,eAAe,CAAC,SAAS,WAAW,CACxE,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,eAAe,CAAC,CACnD,GACG,UAAU,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAC1E,eAAe,CAAC;AAEpB;;IAEI;AACJ,aAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,oBAAoB,GACrD,qBAAqB,GACrB,CAAC,SAAS,sBAAsB,GAChC,iCAAiC,GACjC,KAAK,CAAC;AACV,wBAAgB,uBAAuB,CACrC,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,EAC/C,OAAO,SAAS,gBAAgB,CAAC,MAAM,CAAC,EAExC,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,GACtC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,OAAO,CAAC,CA4B5D"}

package/dist/adapters/aws-lambda/index.js

@@ -2,189 +2,152 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('../../router-4e50a6ac.js');
-var TRPCError = require('../../TRPCError-9050a68d.js');
-require('../../envelopes-2ae27c9f.js');
-var resolveHTTPResponse = require('../../resolveHTTPResponse-5d90abc5.js');
-require('../../index-1a25ccbd.js');
-require('../../transformTRPCResponse-0c261655.js');
+require('../../router-8372703e.js');
+var TRPCError = require('../../TRPCError-9c7830b4.js');
+var resolveHTTPResponse = require('../../resolveHTTPResponse-b486996d.js');
+require('../../codes-1c24d919.js');
+require('../../index-9d687d33.js');
+require('../../transformTRPCResponse-11ac69cc.js');
 
 function isPayloadV1(event) {
-  return determinePayloadFormat(event) == '1.0';
+    return determinePayloadFormat(event) == '1.0';
 }
 function isPayloadV2(event) {
-  return determinePayloadFormat(event) == '2.0';
+    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;
+    // 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 {
-      return 'custom';
+        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);
+    const query = new URLSearchParams();
+    for (const [key, value] of Object.entries(event.queryStringParameters ?? {})){
+        if (typeof value !== 'undefined') {
+            query.append(key, value);
+        }
     }
-  }
-
-  return {
-    method: getHTTPMethod(event),
-    query: query,
-    headers: event.headers,
-    body: event.body
-  };
+    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 TRPCError.TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-  });
+    if (isPayloadV1(event)) {
+        return event.httpMethod;
+    }
+    if (isPayloadV2(event)) {
+        return event.requestContext.http.method;
+    }
+    throw new TRPCError.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) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const group = match[1];
-
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
+    if (isPayloadV1(event)) {
+        const matches = event.resource.matchAll(/\{(.*?)\}/g);
+        for (const match of matches){
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const group = match[1];
+            if (group.includes('+') && event.pathParameters) {
+                return event.pathParameters[group.replace('+', '')] || '';
+            }
+        }
+        return event.path.slice(1);
     }
-
-    return event.path.slice(1);
-  }
-
-  if (isPayloadV2(event)) {
-    const matches = event.routeKey.matchAll(/\{(.*?)\}/g);
-
-    for (const match of matches) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const group = match[1];
-
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
+    if (isPayloadV2(event)) {
+        const matches1 = event.routeKey.matchAll(/\{(.*?)\}/g);
+        for (const match1 of matches1){
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const group1 = match1[1];
+            if (group1.includes('+') && event.pathParameters) {
+                return event.pathParameters[group1.replace('+', '')] || '';
+            }
+        }
+        return event.rawPath.slice(1);
     }
-
-    return event.rawPath.slice(1);
-  }
-
-  throw new TRPCError.TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-  });
+    throw new TRPCError.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;
+    const obj = {};
+    for (const [key, value] of Object.entries(headers)){
+        if (typeof value === 'undefined') {
+            continue;
+        }
+        obj[key] = Array.isArray(value) ? value.join(',') : value;
     }
-
-    obj[key] = Array.isArray(value) ? value.join(',') : value;
-  }
-
-  return obj;
+    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 TRPCError.TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-    });
-  }
+    if (isPayloadV1(event)) {
+        const resp = {
+            statusCode: response.status,
+            body: response.body ?? '',
+            headers: transformHeaders(response.headers ?? {})
+        };
+        return resp;
+    } else if (isPayloadV2(event)) {
+        const resp1 = {
+            statusCode: response.status,
+            body: response.body ?? undefined,
+            headers: transformHeaders(response.headers ?? {})
+        };
+        return resp1;
+    } else {
+        throw new TRPCError.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 async (event, context)=>{
+        const req = lambdaEventToHTTPRequest(event);
+        const path = getPath(event);
+        const createContext = async function _createContext() {
+            return await opts.createContext?.({
+                event,
+                context
+            });
+        };
+        const response = await resolveHTTPResponse.resolveHTTPResponse({
+            router: opts.router,
+            batching: opts.batching,
+            responseMeta: opts?.responseMeta,
+            createContext,
+            req,
+            path,
+            error: null,
+            onError (o) {
+                opts?.onError?.({
+                    ...o,
+                    req: event
+                });
+            }
         });
-      }
-
-    });
-    return tRPCOutputToAPIGatewayOutput(event, response);
-  };
+        return tRPCOutputToAPIGatewayOutput(event, response);
+    };
 }
 
 exports.awsLambdaRequestHandler = awsLambdaRequestHandler;