prisma-generator-express 1.16.6 → 1.18.0

package/README.md

@@ -8,11 +8,12 @@
 
 This tool helps you quickly create API endpoints in your Express app using your Prisma models.
 
-When you run `npx prisma generate`, it automatically creates two things:
+Exposes Prisma API to clients - all operations with database is available, including all relationships at any depth.
 
-- Exposes Prisma API to clients - all operations with database is available, including all relationships at any depth.
-- Service functions that you can import into your Express routes. By default, these functions handle CRUD operations and output validation. This behavior can be controlled.
-- Router generator function that lets you select which routes to add to the application and which middlewares to apply.
+When you run `npx prisma generate`, it will:
+
+- Generate service (CRUD) functions that you can import into your Express routes.
+- Create a router generator function that lets you select which routes to enable in your express app and which middlewares to apply.
 
 ## Table of Contents
 
@@ -172,7 +173,7 @@ const afterFindFirst: RequestHandler = (
  * 6. Custom middlewares: config.{method}.after[] (not available if req.passToNext is falsy)
  */
 const userAccounRouterConfig: RouteConfig<RequestHandler> = {
-  FindFirst: {
+  findFirst: {
     before: [beforeFindFirst],
     after: [afterFindFirst],
     input: {
@@ -209,7 +210,7 @@ The following properties can be attached to the `req` object to control the beha
 | ---------------------- | ------------ | ------------------------------------------------------------------------------------------------------------------------------- |
 | `prisma`               | PrismaClient | An instance of PrismaClient that allows the middleware to interact with your database.                                          |
 | `passToNext`           | boolean      | Optional, if `true` - the result of a Prisma request will be passed to the next middleware as `if (req.locals) req.locals.data` |
-| `outputValidation`     | ZodTypeAny   | (Optional) A Zod schema used to validate the data returned from the Prisma query before sending it to the client.               |
+| `outputValidation`     | ZodType   | (Optional) A Zod schema used to validate the data returned from the Prisma query before sending it to the client.               |
 
 ## Router Schema
 
@@ -276,11 +277,11 @@ type QueryParams = string | ParsedQs | string[] | ParsedQs[] | undefined
 
 Recursively converts strings "true", "false", "null", and "number" into correct formats.
 
-### allow<T extends z.ZodTypeAny>( schema: T, allowedPaths: string[] ): ZodEffects<T, any, any>
+### allow<T extends z.ZodType>( schema: T, allowedPaths: string[] )
 
 Accepts schema and `['array.of.allowed.paths']`. Throws an error if provided something that doesn't fit allowed schema.
 
-### forbid<T extends z.ZodTypeAny>( schema: T, forbiddenPaths: string[] ): ZodEffects<T, any, any>
+### forbid<T extends z.ZodType>( schema: T, forbiddenPaths: string[] )
 
 Same as `allow` but works in opposite way.
 

package/dist/generator.js

@@ -4,21 +4,9 @@ const generator_helper_1 = require("@prisma/generator-helper");
 const sdk_1 = require("@prisma/sdk");
 const constants_1 = require("./constants");
 const writeFileSafely_1 = require("./utils/writeFileSafely");
-const generateFindUnique_1 = require("./helpers/generateFindUnique");
 const generateImportPrismaStatement_1 = require("./helpers/generateImportPrismaStatement");
-const generateFindMany_1 = require("./helpers/generateFindMany");
-const generateFindFirst_1 = require("./helpers/generateFindFirst");
-const generateCreate_1 = require("./helpers/generateCreate");
 const generateRouteFile_1 = require("./helpers/generateRouteFile");
-const generateCreateMany_1 = require("./helpers/generateCreateMany");
-const generateUpdate_1 = require("./helpers/generateUpdate");
-const generateUpdateMany_1 = require("./helpers/generateUpdateMany");
-const generateUpsert_1 = require("./helpers/generateUpsert");
-const generateDelete_1 = require("./helpers/generateDelete");
-const generateDeleteMany_1 = require("./helpers/generateDeleteMany");
-const generateAggregate_1 = require("./helpers/generateAggregate");
-const generateCount_1 = require("./helpers/generateCount");
-const generateGroupBy_1 = require("./helpers/generateGroupBy");
+const generateOperation_1 = require("./helpers/generateOperation");
 const copyFiles_1 = require("./utils/copyFiles");
 const { version } = require('../package.json');
 (0, generator_helper_1.generatorHandler)({
@@ -38,123 +26,14 @@ const { version } = require('../package.json');
                 sdk_1.logger.info(`Skipping generation for model ${model.name} as it is marked with 'generator off'.`);
                 continue;
             }
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateFindUnique_1.generateFindUniqueFunction)({
+            for (const cfg of generateOperation_1.OPERATION_CONFIGS) {
+                await (0, writeFileSafely_1.writeFileSafely)({
+                    content: (0, generateOperation_1.generateOperationFunction)(cfg, model, prismaImportStatement),
+                    options,
                     model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'FindUnique',
-            });
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateFindFirst_1.generateFindFirstFunction)({
-                    model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'FindFirst',
-            });
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateFindMany_1.generateFindManyFunction)({
-                    model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'FindMany',
-            });
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateCreate_1.generateCreateFunction)({
-                    model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'Create',
-            });
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateCreateMany_1.generateCreateManyFunction)({
-                    model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'CreateMany',
-            });
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateUpdate_1.generateUpdateFunction)({
-                    model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'Update',
-            });
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateUpdateMany_1.generateUpdateManyFunction)({
-                    model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'UpdateMany',
-            });
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateUpsert_1.generateUpsertFunction)({
-                    model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'Upsert',
-            });
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateDelete_1.generateDeleteFunction)({
-                    model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'Delete',
-            });
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateDeleteMany_1.generateDeleteManyFunction)({
-                    model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'DeleteMany',
-            });
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateAggregate_1.generateAggregateFunction)({
-                    model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'Aggregate',
-            });
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateCount_1.generateCountFunction)({
-                    model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'Count',
-            });
-            await (0, writeFileSafely_1.writeFileSafely)({
-                content: (0, generateGroupBy_1.generateGroupByFunction)({
-                    model,
-                    prismaImportStatement,
-                }),
-                options,
-                model,
-                operation: 'GroupBy',
-            });
+                    operation: cfg.operation,
+                });
+            }
             await (0, writeFileSafely_1.writeFileSafely)({
                 content: (0, generateRouteFile_1.generateRouterFunction)({ model }),
                 options,

package/dist/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":";;AAAA,+DAA6E;AAC7E,qCAAoC;AACpC,2CAA4C;AAC5C,6DAAyD;AACzD,2FAAuF;AACvF,mEAAoE;AACpE,mEAA0F;AAC1F,iDAA6C;AAE7C,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAE9C,IAAA,mCAAgB,EAAC;IACf,UAAU;QACR,YAAM,CAAC,IAAI,CAAC,GAAG,0BAAc,aAAa,CAAC,CAAA;QAC3C,OAAO;YACL,OAAO;YACP,aAAa,EAAE,cAAc;YAC7B,UAAU,EAAE,0BAAc;SAC3B,CAAA;IACH,CAAC;IACD,UAAU,EAAE,KAAK,EAAE,OAAyB,EAAE,EAAE;QAC9C,MAAM,qBAAqB,GAAG,IAAA,6DAA6B,EAAC,OAAO,CAAC,CAAA;QAEpE,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACxD,IACE,KAAK,CAAC,aAAa;gBACnB,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,eAAe,CAAC,EAC7C,CAAC;gBACD,YAAM,CAAC,IAAI,CACT,iCAAiC,KAAK,CAAC,IAAI,wCAAwC,CACpF,CAAA;gBACD,SAAQ;YACV,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,qCAAiB,EAAE,CAAC;gBACpC,MAAM,IAAA,iCAAe,EAAC;oBACpB,OAAO,EAAE,IAAA,6CAAyB,EAAC,GAAG,EAAE,KAAK,EAAE,qBAAqB,CAAC;oBACrE,OAAO;oBACP,KAAK;oBACL,SAAS,EAAE,GAAG,CAAC,SAAS;iBACzB,CAAC,CAAA;YACJ,CAAC;YAED,MAAM,IAAA,iCAAe,EAAC;gBACpB,OAAO,EAAE,IAAA,0CAAsB,EAAC,EAAE,KAAK,EAAE,CAAC;gBAC1C,OAAO;gBACP,KAAK;gBACL,SAAS,EAAE,OAAO;aACnB,CAAC,CAAA;QACJ,CAAC;QAED,MAAM,IAAA,qBAAS,EAAC,OAAO,CAAC,CAAA;IAC1B,CAAC;CACF,CAAC,CAAA"}

package/dist/helpers/generateImportPrismaStatement.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateImportPrismaStatement = void 0;
+exports.generateImportPrismaStatement = generateImportPrismaStatement;
 const path_1 = __importDefault(require("path"));
 function getImportGeneratorOptions(options) {
     var _a, _b;
@@ -22,5 +22,4 @@ function generateImportPrismaStatement(generatorOptions) {
     const options = getImportGeneratorOptions(generatorOptions);
     return `import type { Prisma } from '${options.outputPath}';\nimport type { PrismaClient } from '${options.outputPath}';\n`;
 }
-exports.generateImportPrismaStatement = generateImportPrismaStatement;
 //# sourceMappingURL=generateImportPrismaStatement.js.map

package/dist/helpers/generateImportPrismaStatement.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateImportPrismaStatement.js","sourceRoot":"","sources":["../../src/helpers/generateImportPrismaStatement.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAMvB,SAAS,yBAAyB,CAChC,OAAyB;;IAEzB,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,CAClD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,CAC/B,CAAA;IAED,IAAI,CAAC,eAAe,IAAI,CAAC,CAAA,MAAA,eAAe,CAAC,MAAM,0CAAE,KAAK,CAAA,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;IACvD,CAAC;IAED,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAC5B,MAAA,OAAO,CAAC,SAAS,CAAC,MAAM,0CAAE,KAAM,EAChC,aAAa,CACd,CAAA;IACD,MAAM,gBAAgB,GAAG,eAAe,CAAC,MAAM,CAAC,KAAK,CAAA;IAErD,MAAM,kBAAkB,GAAG,cAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAA;IAExE,OAAO;QACL,UAAU,EAAE,kBAAkB,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,cAAI,CAAC,KAAK,CAAC,GAAG,CAAC;KACpE,CAAA;AACH,CAAC;AAED,SAAgB,6BAA6B,CAC3C,gBAAkC;IAElC,MAAM,OAAO,GAAG,yBAAyB,CAAC,gBAAgB,CAAC,CAAA;IAE3D,OAAO,gCAAgC,OAAO,CAAC,UAAU,0CAA0C,OAAO,CAAC,UAAU,MAAM,CAAA;AAC7H,CAAC;AAND,sEAMC"}
+{"version":3,"file":"generateImportPrismaStatement.js","sourceRoot":"","sources":["../../src/helpers/generateImportPrismaStatement.ts"],"names":[],"mappings":";;;;;AA+BA,sEAMC;AApCD,gDAAuB;AAMvB,SAAS,yBAAyB,CAChC,OAAyB;;IAEzB,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,CAClD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,CAC/B,CAAA;IAED,IAAI,CAAC,eAAe,IAAI,CAAC,CAAA,MAAA,eAAe,CAAC,MAAM,0CAAE,KAAK,CAAA,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;IACvD,CAAC;IAED,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAC5B,MAAA,OAAO,CAAC,SAAS,CAAC,MAAM,0CAAE,KAAM,EAChC,aAAa,CACd,CAAA;IACD,MAAM,gBAAgB,GAAG,eAAe,CAAC,MAAM,CAAC,KAAK,CAAA;IAErD,MAAM,kBAAkB,GAAG,cAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAA;IAExE,OAAO;QACL,UAAU,EAAE,kBAAkB,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,cAAI,CAAC,KAAK,CAAC,GAAG,CAAC;KACpE,CAAA;AACH,CAAC;AAED,SAAgB,6BAA6B,CAC3C,gBAAkC;IAElC,MAAM,OAAO,GAAG,yBAAyB,CAAC,gBAAgB,CAAC,CAAA;IAE3D,OAAO,gCAAgC,OAAO,CAAC,UAAU,0CAA0C,OAAO,CAAC,UAAU,MAAM,CAAA;AAC7H,CAAC"}