prisma-generator-express 1.14.0 → 1.14.1

package/README.md

@@ -164,7 +164,7 @@ const afterFindFirst: RequestHandler = (
 
 /**
  * For generated route the middleware order will be as follows:
- * 1. Query parser
+ * 1. Query parser (kicks in for GET requests)
  * 2. Custom middlewares: config.{method}.before[]
  * 3. Input validator middleware (Optional): config.{method}.input
  * 4. Generated middleware
@@ -176,7 +176,7 @@ const someRouterConfig: RouteConfig<RequestHandler> = {
     before: [beforeFindFirst],
     after: [afterFindFirst],
     input: {
-      schema: UserAccountFindFirstSchema,
+      schema: UserAccountFindFirstSchema, // make sure you set `isGenerateSelect = true` in prisma-zod-generator
       allow: [
         'select.id',
         'select.full_name',

package/dist/helpers/generateRouteFile.js

@@ -27,7 +27,7 @@ import { ${modelName}GroupBy } from './${modelName}GroupBy';
 import { createValidatorMiddleware, ValidatorOptions } from '../createValidatorMiddleware'
 import { createOutputValidatorMiddleware } from '../createOutputValidatorMiddleware'
 import { RouteConfig, ValidatorConfig } from '../routeConfig'
-import { parseQueryParams } from "../ParseQueryParams";
+import { parseQueryParams } from "../parseQueryParams";
 
 const defaultBeforeAfter = {
   before: [] as RequestHandler[],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "prisma-generator-express",
   "description": "Prisma generator of Express CRUD API",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "main": "dist/generator.js",
   "license": "MIT",
   "bin": {

package/src/copy/transformZod.spec.ts

@@ -553,106 +553,7 @@ describe('Cryptocurrency Schema Validation', () => {
       expect(error).toBeInstanceOf(ZodError)
     }
   })
-
-  it('deep nesting', () => {
-    const taskSchema = z.object({
-      select: z
-        .object({
-          id: z.boolean().optional(),
-          project_id: z.boolean().optional(),
-          list_id: z.boolean().optional(),
-          user_assignments: z
-            .object({
-              select: z.object({
-                user: z.boolean().optional(),
-              }),
-            })
-            .optional(),
-          tags_mappings: z
-            .object({
-              select: z.object({
-                tag: z.boolean().optional(),
-              }),
-            })
-            .optional(),
-          attachments: z
-            .object({
-              select: z.object({
-                attachment: z.boolean().optional(),
-              }),
-              where: z
-                .object({
-                  is_image: z.boolean().optional(),
-                })
-                .optional(),
-              take: z.number().optional(),
-              orderBy: z
-                .object({
-                  created_at: z.enum(['asc', 'desc']).optional(),
-                })
-                .optional(),
-            })
-            .optional(),
-          rendered_description: z.boolean().optional(),
-          description: z.boolean().optional(),
-          created_at: z.boolean().optional(),
-          start_date: z.boolean().optional(),
-          reactions: z.boolean().optional(),
-          intervals: z.boolean().optional(),
-          column_id: z.boolean().optional(),
-          priority: z.boolean().optional(),
-          due_date: z.boolean().optional(),
-          column: z.boolean().optional(),
-          title: z.boolean().optional(),
-          order: z.boolean().optional(),
-          color: z.boolean().optional(),
-        })
-        .optional(),
-      where: z
-        .object({
-          id: z.string().optional(),
-          AND: z
-            .array(
-              z.object({
-                OR: z
-                  .array(
-                    z.object({
-                      to_delete: z.boolean().nullable().optional(),
-                    }),
-                  )
-                  .optional(),
-              }),
-            )
-            .optional(),
-        })
-        .optional(),
-    })
-
-    const allowedFields = [
-      'select.id',
-      'select.project_id',
-      'select.list_id',
-      'select.user_assignments.select.user',
-      'select.tags_mappings.select.tag',
-      'select.attachments.select.attachment',
-      'select.attachments.where.is_image',
-      'select.attachments.take',
-      'select.attachments.orderBy.created_at',
-      'select.rendered_description',
-      'select.description',
-      'select.created_at',
-      'select.start_date',
-      'select.reactions',
-      'select.intervals',
-      'select.column_id',
-      'select.priority',
-      'select.due_date',
-      'select.column',
-      'select.order',
-      'select.color',
-      'where.id',
-      'where.AND[].OR[].to_delete',
-    ]
+  describe('Prisma example', () => {
     const inputData = {
       select: {
         id: true,
@@ -703,12 +604,160 @@ describe('Cryptocurrency Schema Validation', () => {
         ],
       },
     }
+    it('deep nesting', () => {
+      const taskSchema = z.object({
+        select: z
+          .object({
+            id: z.boolean().optional(),
+            project_id: z.boolean().optional(),
+            list_id: z.boolean().optional(),
+            user_assignments: z
+              .object({
+                select: z.object({
+                  user: z.boolean().optional(),
+                }),
+              })
+              .optional(),
+            tags_mappings: z
+              .object({
+                select: z.object({
+                  tag: z.boolean().optional(),
+                }),
+              })
+              .optional(),
+            attachments: z
+              .object({
+                select: z.object({
+                  attachment: z.boolean().optional(),
+                }),
+                where: z
+                  .object({
+                    is_image: z.boolean().optional(),
+                  })
+                  .optional(),
+                take: z.number().optional(),
+                orderBy: z
+                  .object({
+                    created_at: z.enum(['asc', 'desc']).optional(),
+                  })
+                  .optional(),
+              })
+              .optional(),
+            rendered_description: z.boolean().optional(),
+            description: z.boolean().optional(),
+            created_at: z.boolean().optional(),
+            start_date: z.boolean().optional(),
+            reactions: z.boolean().optional(),
+            intervals: z.boolean().optional(),
+            column_id: z.boolean().optional(),
+            priority: z.boolean().optional(),
+            due_date: z.boolean().optional(),
+            column: z.boolean().optional(),
+            title: z.boolean().optional(),
+            order: z.boolean().optional(),
+            color: z.boolean().optional(),
+          })
+          .optional(),
+        where: z
+          .object({
+            id: z.string().optional(),
+            AND: z
+              .array(
+                z.object({
+                  OR: z
+                    .array(
+                      z.object({
+                        to_delete: z.boolean().nullable().optional(),
+                      }),
+                    )
+                    .optional(),
+                }),
+              )
+              .optional(),
+          })
+          .optional(),
+      })
 
-    try {
-      const result = allow(taskSchema, allowedFields).safeParse(inputData)
-      expect(result.success).toBe(false)
-    } catch (error) {
-      expect(error).toBeInstanceOf(ZodError)
-    }
+      const allowedFields = [
+        'select.id',
+        'select.project_id',
+        'select.list_id',
+        'select.user_assignments.select.user',
+        'select.tags_mappings.select.tag',
+        'select.attachments.select.attachment',
+        'select.attachments.where.is_image',
+        'select.attachments.take',
+        'select.attachments.orderBy.created_at',
+        'select.rendered_description',
+        'select.description',
+        'select.created_at',
+        'select.start_date',
+        'select.reactions',
+        'select.intervals',
+        'select.column_id',
+        'select.priority',
+        'select.due_date',
+        'select.column',
+        'select.order',
+        'select.color',
+        'where.id',
+        'where.AND[].OR[].to_delete',
+      ]
+
+      try {
+        const result = allow(taskSchema, allowedFields).safeParse(inputData)
+        expect(result.success).toBe(false)
+      } catch (error) {
+        expect(error).toBeInstanceOf(ZodError)
+      }
+    })
+
+    it('deep nesting 2', () => {
+      const taskSchema = z.object({
+        where: z
+          .object({
+            id: z.string().optional(),
+            AND: z
+              .array(
+                z.object({
+                  OR: z
+                    .array(
+                      z.object({
+                        to_delete: z.boolean().nullable().optional(),
+                      }),
+                    )
+                    .optional(),
+                }),
+              )
+              .optional(),
+          })
+          .optional(),
+      })
+
+      const allowedFields = [
+        'select.id',
+        'select.project_id',
+        'select.list_id',
+        'select.user_assignments.select.user',
+        'select.tags_mappings.select.tag',
+        'select.attachments.select.attachment',
+        'select.attachments.where.is_image',
+        'select.attachments.take',
+        'select.attachments.orderBy.created_at',
+        'select.rendered_description',
+        'select.description',
+        'select.created_at',
+        'select.start_date',
+        'where.id',
+        'where.AND[].OR[].to_delete',
+      ]
+
+      try {
+        const result = allow(taskSchema, allowedFields).safeParse(inputData)
+        expect(result.success).toBe(false)
+      } catch (error) {
+        expect(error).toBeInstanceOf(ZodError)
+      }
+    })
   })
 })

package/src/copy/transformZod.ts

@@ -38,10 +38,11 @@ export function allow<T extends ZodTypeAny>(
   schema: T,
   allowedPaths: string[],
 ): ZodEffects<T, any, any> {
-  const rootSchema = schema instanceof z.ZodObject ? schema : undefined
+  const rootSchema = schema instanceof z.ZodObject ? schema.strict() : undefined
 
-  return schema.transform((data) => {
+  return rootSchema?.transform((data) => {
     const flatData = flattenObject(data, '', rootSchema)
+
     const disallowedPaths: string[] = []
 
     for (const key of Object.keys(flatData)) {
@@ -51,19 +52,11 @@ export function allow<T extends ZodTypeAny>(
     }
 
     if (disallowedPaths.length > 0) {
-      const errors: ZodIssue[] = []
-      for (const path of disallowedPaths) {
-        errors.push({
-          code: ZodIssueCode.custom,
-          message: `Field '${path}' is not allowed.`,
-          path: path.split('.'),
-        })
-      }
-      throw new ZodError(errors)
+      throw createZodErrorFromPaths(disallowedPaths, 'Field is not allowed:')
     }
 
     return data
-  }) as ZodEffects<T, any, any>
+  }) as unknown as ZodEffects<T, any, any>
 }
 
 export function forbid<T extends z.ZodTypeAny>(
@@ -82,15 +75,7 @@ export function forbid<T extends z.ZodTypeAny>(
     }
 
     if (forbiddenMatches.length > 0) {
-      const errors: ZodIssue[] = []
-      for (const path of forbiddenMatches) {
-        errors.push({
-          code: ZodIssueCode.custom,
-          message: `Field '${path}' is forbidden.`,
-          path: [path],
-        })
-      }
-      throw new ZodError(errors)
+      throw createZodErrorFromPaths(forbiddenMatches, 'Field is forbidden:')
     }
     return data
   }) as ZodEffects<T, any, any>
@@ -138,3 +123,18 @@ export function flattenObject(
   flatten(obj, prefix, schema)
   return result
 }
+
+function createZodErrorFromPaths(
+  disallowedPaths: string[],
+  errorMessage: string,
+): ZodError {
+  const errors: ZodIssue[] = []
+  for (const path of disallowedPaths) {
+    errors.push({
+      code: ZodIssueCode.custom,
+      message: `${errorMessage} '${path}'`,
+      path: path.split('.'),
+    })
+  }
+  return new ZodError(errors)
+}

package/src/helpers/generateRouteFile.ts

@@ -31,7 +31,7 @@ import { ${modelName}GroupBy } from './${modelName}GroupBy';
 import { createValidatorMiddleware, ValidatorOptions } from '../createValidatorMiddleware'
 import { createOutputValidatorMiddleware } from '../createOutputValidatorMiddleware'
 import { RouteConfig, ValidatorConfig } from '../routeConfig'
-import { parseQueryParams } from "../ParseQueryParams";
+import { parseQueryParams } from "../parseQueryParams";
 
 const defaultBeforeAfter = {
   before: [] as RequestHandler[],