@zenstackhq/server 1.0.0-beta.2 → 1.0.0-beta.21

package/api/rpc/index.js

@@ -8,21 +8,49 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const runtime_1 = require("@zenstackhq/runtime");
+const superjson_1 = __importDefault(require("superjson"));
+const upper_case_first_1 = require("upper-case-first");
+const zod_validation_error_1 = require("zod-validation-error");
+const base_1 = require("../base");
 const utils_1 = require("../utils");
+(0, utils_1.registerCustomSerializers)();
+const ERROR_STATUS_MAPPING = {
+    [runtime_1.PrismaErrorCode.CONSTRAINED_FAILED]: 403,
+    [runtime_1.PrismaErrorCode.REQUIRED_CONNECTED_RECORD_NOT_FOUND]: 404,
+    [runtime_1.PrismaErrorCode.DEPEND_ON_RECORD_NOT_FOUND]: 404,
+};
 /**
  * Prisma RPC style API request handler that mirrors the Prisma Client API
  */
-class RequestHandler {
-    handleRequest({ prisma, method, path, query, requestBody, zodSchemas, logger, }) {
+class RequestHandler extends base_1.APIHandlerBase {
+    handleRequest({ prisma, method, path, query, requestBody, modelMeta, zodSchemas, logger, }) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            modelMeta = modelMeta !== null && modelMeta !== void 0 ? modelMeta : this.defaultModelMeta;
+            if (!modelMeta) {
+                throw new Error('Model meta is not provided or loaded from default location');
+            }
             const parts = path.split('/').filter((p) => !!p);
             const op = parts.pop();
             const model = parts.pop();
             if (parts.length !== 0 || !op || !model) {
-                return { status: 400, body: { message: 'invalid request path' } };
+                return { status: 400, body: this.makeError('invalid request path') };
             }
             method = method.toUpperCase();
             const dbOp = op;
@@ -33,10 +61,13 @@ class RequestHandler {
                 case 'createMany':
                 case 'upsert':
                     if (method !== 'POST') {
-                        return { status: 400, body: { message: 'invalid request method, only POST is supported' } };
+                        return {
+                            status: 400,
+                            body: this.makeError('invalid request method, only POST is supported'),
+                        };
                     }
                     if (!requestBody) {
-                        return { status: 400, body: { message: 'missing request body' } };
+                        return { status: 400, body: this.makeError('missing request body') };
                     }
                     args = requestBody;
                     // TODO: upsert's status code should be conditional
@@ -49,13 +80,16 @@ class RequestHandler {
                 case 'groupBy':
                 case 'count':
                     if (method !== 'GET') {
-                        return { status: 400, body: { message: 'invalid request method, only GET is supported' } };
+                        return {
+                            status: 400,
+                            body: this.makeError('invalid request method, only GET is supported'),
+                        };
                     }
                     try {
-                        args = (query === null || query === void 0 ? void 0 : query.q) ? this.unmarshal(query.q) : {};
+                        args = (query === null || query === void 0 ? void 0 : query.q) ? this.unmarshalQ(query.q, query.meta) : {};
                     }
                     catch (_c) {
-                        return { status: 400, body: { message: 'query param must contain valid JSON' } };
+                        return { status: 400, body: this.makeError('invalid "q" query parameter') };
                     }
                     break;
                 case 'update':
@@ -63,81 +97,80 @@ class RequestHandler {
                     if (method !== 'PUT' && method !== 'PATCH') {
                         return {
                             status: 400,
-                            body: { message: 'invalid request method, only PUT AND PATCH are supported' },
+                            body: this.makeError('invalid request method, only PUT AND PATCH are supported'),
                         };
                     }
                     if (!requestBody) {
-                        return { status: 400, body: { message: 'missing request body' } };
+                        return { status: 400, body: this.makeError('missing request body') };
                     }
                     args = requestBody;
                     break;
                 case 'delete':
                 case 'deleteMany':
                     if (method !== 'DELETE') {
-                        return { status: 400, body: { message: 'invalid request method, only DELETE is supported' } };
+                        return {
+                            status: 400,
+                            body: this.makeError('invalid request method, only DELETE is supported'),
+                        };
                     }
                     try {
-                        args = (query === null || query === void 0 ? void 0 : query.q) ? this.unmarshal(query.q) : {};
+                        args = (query === null || query === void 0 ? void 0 : query.q) ? this.unmarshalQ(query.q, query.meta) : {};
                     }
                     catch (_d) {
-                        return { status: 400, body: { message: 'query param must contain valid JSON' } };
+                        return { status: 400, body: this.makeError('invalid "q" query parameter') };
                     }
                     break;
                 default:
-                    return { status: 400, body: { message: 'invalid operation: ' + op } };
+                    return { status: 400, body: this.makeError('invalid operation: ' + op) };
             }
-            if (zodSchemas) {
-                const { data, error } = (0, utils_1.zodValidate)(zodSchemas, model, dbOp, args);
-                if (error) {
-                    return { status: 400, body: { message: error } };
-                }
-                else {
-                    args = data;
-                }
+            const { error, data: parsedArgs } = yield this.processRequestPayload(args, model, dbOp, zodSchemas);
+            if (error) {
+                return { status: 400, body: this.makeError(error) };
             }
             try {
                 if (!prisma[model]) {
-                    return { status: 400, body: { message: `unknown model name: ${model}` } };
+                    return { status: 400, body: this.makeError(`unknown model name: ${model}`) };
                 }
-                const result = yield prisma[model][dbOp](args);
-                (0, utils_1.stripAuxFields)(result);
-                return { status: resCode, body: result };
+                const result = yield prisma[model][dbOp](parsedArgs);
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                let response = { data: result };
+                // superjson serialize response
+                if (result) {
+                    const { json, meta } = superjson_1.default.serialize(result);
+                    response = { data: json };
+                    if (meta) {
+                        response.meta = { serialization: meta };
+                    }
+                }
+                return { status: resCode, body: response };
             }
             catch (err) {
                 if ((0, runtime_1.isPrismaClientKnownRequestError)(err)) {
                     (0, utils_1.logError)(logger, err.code, err.message);
-                    if (err.code === 'P2004') {
-                        // rejected by policy
-                        return {
-                            status: 403,
-                            body: {
-                                prisma: true,
-                                rejectedByPolicy: true,
-                                code: err.code,
-                                message: err.message,
-                                reason: (_a = err.meta) === null || _a === void 0 ? void 0 : _a.reason,
-                            },
-                        };
-                    }
-                    else {
-                        return {
-                            status: 400,
-                            body: {
+                    const status = (_a = ERROR_STATUS_MAPPING[err.code]) !== null && _a !== void 0 ? _a : 400;
+                    const rejectedByPolicy = err.code === runtime_1.PrismaErrorCode.CONSTRAINED_FAILED ? true : undefined;
+                    return {
+                        status,
+                        body: {
+                            error: {
                                 prisma: true,
+                                rejectedByPolicy,
                                 code: err.code,
                                 message: err.message,
                                 reason: (_b = err.meta) === null || _b === void 0 ? void 0 : _b.reason,
                             },
-                        };
-                    }
+                        },
+                    };
                 }
                 else if ((0, runtime_1.isPrismaClientUnknownRequestError)(err) || (0, runtime_1.isPrismaClientValidationError)(err)) {
                     (0, utils_1.logError)(logger, err.message);
                     return {
                         status: 400,
                         body: {
-                            prisma: true,
-                            message: err.message,
+                            error: {
+                                prisma: true,
+                                message: err.message,
+                            },
                         },
                     };
                 }
@@ -146,16 +179,70 @@ class RequestHandler {
                     (0, utils_1.logError)(logger, _err.message + (_err.stack ? '\n' + _err.stack : ''));
                     return {
                         status: 400,
-                        body: {
-                            message: err.message,
-                        },
+                        body: this.makeError(err.message),
                     };
                 }
             }
         });
     }
-    unmarshal(value) {
-        return JSON.parse(value);
+    makeError(message) {
+        return { error: { message: message } };
+    }
+    processRequestPayload(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    args, model, dbOp, zodSchemas) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { meta } = args, rest = __rest(args, ["meta"]);
+            if (meta === null || meta === void 0 ? void 0 : meta.serialization) {
+                // superjson deserialization
+                args = superjson_1.default.deserialize({ json: rest, meta: meta.serialization });
+            }
+            return this.zodValidate(zodSchemas, model, dbOp, args);
+        });
+    }
+    getZodSchema(zodSchemas, model, operation) {
+        var _a, _b;
+        // e.g.: UserInputSchema { findUnique: [schema] }
+        return (_b = (_a = zodSchemas.input) === null || _a === void 0 ? void 0 : _a[`${(0, upper_case_first_1.upperCaseFirst)(model)}InputSchema`]) === null || _b === void 0 ? void 0 : _b[operation];
+    }
+    zodValidate(zodSchemas, model, operation, args) {
+        const zodSchema = zodSchemas && this.getZodSchema(zodSchemas, model, operation);
+        if (zodSchema) {
+            const parseResult = zodSchema.safeParse(args);
+            if (parseResult.success) {
+                return { data: args, error: undefined };
+            }
+            else {
+                return { data: undefined, error: (0, zod_validation_error_1.fromZodError)(parseResult.error).message };
+            }
+        }
+        else {
+            return { data: args, error: undefined };
+        }
+    }
+    unmarshalQ(value, meta) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        let parsedValue;
+        try {
+            parsedValue = JSON.parse(value);
+        }
+        catch (_a) {
+            throw new Error('invalid "q" query parameter');
+        }
+        if (meta) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            let parsedMeta;
+            try {
+                parsedMeta = JSON.parse(meta);
+            }
+            catch (_b) {
+                throw new Error('invalid "meta" query parameter');
+            }
+            if (parsedMeta.serialization) {
+                return superjson_1.default.deserialize({ json: parsedValue, meta: parsedMeta.serialization });
+            }
+        }
+        return parsedValue;
     }
 }
 function makeHandler() {

package/api/rpc/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/rpc/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/rpc/index.ts"],"names":[],"mappings":"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"}

package/api/utils.d.ts

@@ -1,18 +1,8 @@
-import { DbOperations } from '@zenstackhq/runtime';
-import type { ModelZodSchema } from '@zenstackhq/runtime/zod';
 import { LoggerConfig } from '../types';
-export declare function getZodSchema(zodSchemas: ModelZodSchema, model: string, operation: keyof DbOperations): import("zod").ZodType<any, import("zod").ZodTypeDef, any> | undefined;
-export declare function zodValidate(zodSchemas: ModelZodSchema | undefined, model: string, operation: keyof DbOperations, args: unknown): {
-    data: any;
-    error: undefined;
-} | {
-    data: undefined;
-    error: string;
-};
 export declare function logError(logger: LoggerConfig | undefined | null, message: string, code?: string): void;
 export declare function logWarning(logger: LoggerConfig | undefined | null, message: string): void;
 export declare function logInfo(logger: LoggerConfig | undefined | null, message: string): void;
 /**
- * Recursively strip auxiliary fields from the given data.
+ * Registers custom superjson serializers.
  */
-export declare function stripAuxFields(data: unknown): void;
+export declare function registerCustomSerializers(): void;

package/api/utils.js

@@ -1,37 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stripAuxFields = exports.logInfo = exports.logWarning = exports.logError = exports.zodValidate = exports.getZodSchema = void 0;
-const constants_1 = require("@zenstackhq/runtime/constants");
-const upper_case_first_1 = require("upper-case-first");
-const zod_validation_error_1 = require("zod-validation-error");
-function getZodSchema(zodSchemas, model, operation) {
-    if (zodSchemas[model]) {
-        return zodSchemas[model][operation];
-    }
-    else if (zodSchemas[(0, upper_case_first_1.upperCaseFirst)(model)]) {
-        return zodSchemas[(0, upper_case_first_1.upperCaseFirst)(model)][operation];
-    }
-    else {
-        return undefined;
-    }
-}
-exports.getZodSchema = getZodSchema;
-function zodValidate(zodSchemas, model, operation, args) {
-    const zodSchema = zodSchemas && getZodSchema(zodSchemas, model, operation);
-    if (zodSchema) {
-        const parseResult = zodSchema.safeParse(args);
-        if (parseResult.success) {
-            return { data: parseResult.data, error: undefined };
-        }
-        else {
-            return { data: undefined, error: (0, zod_validation_error_1.fromZodError)(parseResult.error).message };
-        }
-    }
-    else {
-        return { data: args, error: undefined };
-    }
-}
-exports.zodValidate = zodValidate;
+exports.registerCustomSerializers = exports.logInfo = exports.logWarning = exports.logError = void 0;
+const decimal_js_1 = require("decimal.js");
+const superjson_1 = __importDefault(require("superjson"));
 function logError(logger, message, code) {
     if (logger === undefined) {
         console.error(`@zenstackhq/server: error ${code ? '[' + code + ']' : ''}, ${message}`);
@@ -60,23 +34,19 @@ function logInfo(logger, message) {
 }
 exports.logInfo = logInfo;
 /**
- * Recursively strip auxiliary fields from the given data.
+ * Registers custom superjson serializers.
  */
-function stripAuxFields(data) {
-    if (Array.isArray(data)) {
-        return data.forEach(stripAuxFields);
-    }
-    else if (data && typeof data === 'object') {
-        for (const [key, value] of Object.entries(data)) {
-            if (constants_1.AUXILIARY_FIELDS.includes(key)) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                delete data[key];
-            }
-            else {
-                stripAuxFields(value);
-            }
-        }
-    }
+function registerCustomSerializers() {
+    superjson_1.default.registerCustom({
+        isApplicable: (v) => decimal_js_1.Decimal.isDecimal(v),
+        serialize: (v) => v.toJSON(),
+        deserialize: (v) => new decimal_js_1.Decimal(v),
+    }, 'Decimal');
+    superjson_1.default.registerCustom({
+        isApplicable: (v) => Buffer.isBuffer(v),
+        serialize: (v) => v.toString('base64'),
+        deserialize: (v) => Buffer.from(v, 'base64'),
+    }, 'Bytes');
 }
-exports.stripAuxFields = stripAuxFields;
+exports.registerCustomSerializers = registerCustomSerializers;
 //# sourceMappingURL=utils.js.map

package/api/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/api/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/api/utils.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAqC;AACrC,0DAAkC;AAGlC,SAAgB,QAAQ,CAAC,MAAuC,EAAE,OAAe,EAAE,IAAa;IAC5F,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,OAAO,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;KAC1F;SAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,EAAE;QACtB,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;KAC/B;AACL,CAAC;AAND,4BAMC;AAED,SAAgB,UAAU,CAAC,MAAuC,EAAE,OAAe;IAC/E,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,OAAO,CAAC,IAAI,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC;KAClD;SAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,EAAE;QACrB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACxB;AACL,CAAC;AAND,gCAMC;AAED,SAAgB,OAAO,CAAC,MAAuC,EAAE,OAAe;IAC5E,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC;KACjD;SAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,EAAE;QACrB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACxB;AACL,CAAC;AAND,0BAMC;AAED;;GAEG;AACH,SAAgB,yBAAyB;IACrC,mBAAS,CAAC,cAAc,CACpB;QACI,YAAY,EAAE,CAAC,CAAC,EAAgB,EAAE,CAAC,oBAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QACvD,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE;QAC5B,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,oBAAO,CAAC,CAAC,CAAC;KACrC,EACD,SAAS,CACZ,CAAC;IAEF,mBAAS,CAAC,cAAc,CACpB;QACI,YAAY,EAAE,CAAC,CAAC,EAAe,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACpD,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACtC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC;KAC/C,EACD,OAAO,CACV,CAAC;AACN,CAAC;AAlBD,8DAkBC"}

package/express/middleware.d.ts

@@ -8,6 +8,16 @@ export interface MiddlewareOptions extends AdapterBaseOptions {
      * Callback for getting a PrismaClient for the given request
      */
     getPrisma: (req: Request, res: Response) => unknown | Promise<unknown>;
+    /**
+     * Controls if the middleware directly sends a response. If set to false,
+     * the response is stored in the `res.locals` object and then the middleware
+     * calls the `next()` function to pass the control to the next middleware.
+     * Subsequent middleware or request handlers need to make sure to send
+     * a response.
+     *
+     * Defaults to true;
+     */
+    sendResponse?: boolean;
 }
 /**
  * Creates an Express middleware for handling CRUD requests.

package/express/middleware.js

@@ -12,9 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const zod_1 = require("@zenstackhq/runtime/zod");
 const rpc_1 = __importDefault(require("../api/rpc"));
-const utils_1 = require("../utils");
 /**
  * Creates an Express middleware for handling CRUD requests.
  */
@@ -24,53 +22,58 @@ const factory = (options) => {
         zodSchemas = options.zodSchemas;
     }
     else if (options.zodSchemas === true) {
-        zodSchemas = (0, zod_1.getModelZodSchemas)();
+        try {
+            zodSchemas = require('@zenstackhq/runtime/zod');
+        }
+        catch (_a) {
+            throw new Error('Unable to load zod schemas from default location');
+        }
     }
     const requestHandler = options.handler || (0, rpc_1.default)();
-    const useSuperJson = options.useSuperJson === true;
-    return (request, response) => __awaiter(void 0, void 0, void 0, function* () {
+    if (options.useSuperJson !== undefined) {
+        console.warn('The option "useSuperJson" is deprecated. The server APIs automatically use superjson for serialization.');
+    }
+    return (request, response, next) => __awaiter(void 0, void 0, void 0, function* () {
         const prisma = (yield options.getPrisma(request, response));
-        if (!prisma) {
-            response
-                .status(500)
-                .json((0, utils_1.marshalToObject)({ message: 'unable to get prisma from request context' }, useSuperJson));
-            return;
+        const { sendResponse } = options;
+        if (sendResponse === false && !prisma) {
+            throw new Error('unable to get prisma from request context');
         }
-        let query = {};
-        try {
-            // express converts query parameters with square brackets into object
-            // e.g.: filter[foo]=bar is parsed to { filter: { foo: 'bar' } }
-            // we need to revert this behavior and reconstruct params from original URL
-            const url = request.protocol + '://' + request.get('host') + request.originalUrl;
-            const searchParams = new URL(url).searchParams;
-            const rawQuery = {};
-            for (const key of searchParams.keys()) {
-                const values = searchParams.getAll(key);
-                rawQuery[key] = values.length === 1 ? values[0] : values;
-            }
-            query = (0, utils_1.buildUrlQuery)(rawQuery, useSuperJson);
-        }
-        catch (_a) {
-            response.status(400).json((0, utils_1.marshalToObject)({ message: 'invalid query parameters' }, useSuperJson));
-            return;
+        if (!prisma) {
+            return response.status(500).json({ message: 'unable to get prisma from request context' });
         }
+        // express converts query parameters with square brackets into object
+        // e.g.: filter[foo]=bar is parsed to { filter: { foo: 'bar' } }
+        // we need to revert this behavior and reconstruct params from original URL
+        const url = request.protocol + '://' + request.get('host') + request.originalUrl;
+        const searchParams = new URL(url).searchParams;
+        const query = Object.fromEntries(searchParams);
         try {
             const r = yield requestHandler({
                 method: request.method,
                 path: request.path,
                 query,
-                requestBody: (0, utils_1.unmarshalFromObject)(request.body, useSuperJson),
+                requestBody: request.body,
                 prisma,
                 modelMeta: options.modelMeta,
                 zodSchemas,
                 logger: options.logger,
             });
-            response.status(r.status).json((0, utils_1.marshalToObject)(r.body, useSuperJson));
+            if (sendResponse === false) {
+                // attach response and pass control to the next middleware
+                response.locals = {
+                    status: r.status,
+                    body: r.body,
+                };
+                return next();
+            }
+            return response.status(r.status).json(r.body);
         }
         catch (err) {
-            response
-                .status(500)
-                .json((0, utils_1.marshalToObject)({ message: `An unhandled error occurred: ${err}` }, useSuperJson));
+            if (sendResponse === false) {
+                throw err;
+            }
+            return response.status(500).json({ message: `An unhandled error occurred: ${err}` });
         }
     });
 };

package/express/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/express/middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,iDAA6E;AAE7E,qDAAuC;AAEvC,oCAA+E;AAY/E;;GAEG;AACH,MAAM,OAAO,GAAG,CAAC,OAA0B,EAAW,EAAE;IACpD,IAAI,UAAsC,CAAC;IAC3C,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,EAAE;QACxC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;KACnC;SAAM,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE;QACpC,UAAU,GAAG,IAAA,wBAAkB,GAAE,CAAC;KACrC;IAED,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,IAAI,IAAA,aAAa,GAAE,CAAC;IAC1D,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,KAAK,IAAI,CAAC;IAEnD,OAAO,CAAO,OAAO,EAAE,QAAQ,EAAE,EAAE;QAC/B,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAqB,CAAC;QAChF,IAAI,CAAC,MAAM,EAAE;YACT,QAAQ;iBACH,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CAAC,IAAA,uBAAe,EAAC,EAAE,OAAO,EAAE,2CAA2C,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC;YACnG,OAAO;SACV;QAED,IAAI,KAAK,GAAsC,EAAE,CAAC;QAClD,IAAI;YACA,qEAAqE;YACrE,gEAAgE;YAChE,2EAA2E;YAC3E,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,GAAG,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC;YACjF,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC;YAC/C,MAAM,QAAQ,GAAsC,EAAE,CAAC;YACvD,KAAK,MAAM,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE;gBACnC,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACxC,QAAQ,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;aAC5D;YACD,KAAK,GAAG,IAAA,qBAAa,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;SACjD;QAAC,WAAM;YACJ,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,uBAAe,EAAC,EAAE,OAAO,EAAE,0BAA0B,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC;YAClG,OAAO;SACV;QAED,IAAI;YACA,MAAM,CAAC,GAAG,MAAM,cAAc,CAAC;gBAC3B,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK;gBACL,WAAW,EAAE,IAAA,2BAAmB,EAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC;gBAC5D,MAAM;gBACN,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,UAAU;gBACV,MAAM,EAAE,OAAO,CAAC,MAAM;aACzB,CAAC,CAAC;YACH,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;SACzE;QAAC,OAAO,GAAG,EAAE;YACV,QAAQ;iBACH,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CAAC,IAAA,uBAAe,EAAC,EAAE,OAAO,EAAE,gCAAgC,GAAG,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC;SAChG;IACL,CAAC,CAAA,CAAC;AACN,CAAC,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/express/middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAIA,qDAAuC;AAwBvC;;GAEG;AACH,MAAM,OAAO,GAAG,CAAC,OAA0B,EAAW,EAAE;IACpD,IAAI,UAAkC,CAAC;IACvC,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,EAAE;QACxC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;KACnC;SAAM,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE;QACpC,IAAI;YACA,UAAU,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;SACnD;QAAC,WAAM;YACJ,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;SACvE;KACJ;IAED,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,IAAI,IAAA,aAAa,GAAE,CAAC;IAC1D,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;QACpC,OAAO,CAAC,IAAI,CACR,yGAAyG,CAC5G,CAAC;KACL;IAED,OAAO,CAAO,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAqB,CAAC;QAChF,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;QAEjC,IAAI,YAAY,KAAK,KAAK,IAAI,CAAC,MAAM,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAChE;QAED,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,2CAA2C,EAAE,CAAC,CAAC;SAC9F;QAED,qEAAqE;QACrE,gEAAgE;QAChE,2EAA2E;QAC3E,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,GAAG,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC;QACjF,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC;QAC/C,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAE/C,IAAI;YACA,MAAM,CAAC,GAAG,MAAM,cAAc,CAAC;gBAC3B,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK;gBACL,WAAW,EAAE,OAAO,CAAC,IAAI;gBACzB,MAAM;gBACN,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,UAAU;gBACV,MAAM,EAAE,OAAO,CAAC,MAAM;aACzB,CAAC,CAAC;YACH,IAAI,YAAY,KAAK,KAAK,EAAE;gBACxB,0DAA0D;gBAC1D,QAAQ,CAAC,MAAM,GAAG;oBACd,MAAM,EAAE,CAAC,CAAC,MAAM;oBAChB,IAAI,EAAE,CAAC,CAAC,IAAI;iBACf,CAAC;gBACF,OAAO,IAAI,EAAE,CAAC;aACjB;YACD,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACjD;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,YAAY,KAAK,KAAK,EAAE;gBACxB,MAAM,GAAG,CAAC;aACb;YACD,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gCAAgC,GAAG,EAAE,EAAE,CAAC,CAAC;SACxF;IACL,CAAC,CAAA,CAAC;AACN,CAAC,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/fastify/plugin.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { FastifyPluginCallback, FastifyReply, FastifyRequest } from 'fastify';
 import { AdapterBaseOptions } from '../types';
 /**
@@ -13,5 +14,5 @@ export interface PluginOptions extends AdapterBaseOptions {
      */
     getPrisma: (request: FastifyRequest, reply: FastifyReply) => unknown | Promise<unknown>;
 }
-declare const _default: FastifyPluginCallback<PluginOptions, import("fastify").RawServerDefault, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>;
+declare const _default: FastifyPluginCallback<PluginOptions, import("http").Server, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>;
 export default _default;