chore: update deps

chertik77 · chertik77 · commit 1284d3762e9f · 2025-08-01T13:58:29.000+01:00
diff --git a/app/config/env.config.ts b/app/config/env.config.ts
@@ -8,44 +8,37 @@ const envSchema = z.object({
   CLOUDINARY_API_KEY: z.string(),
   CLOUDINARY_API_SECRET: z.string(),
   CLOUDINARY_CLOUD_NAME: z.string(),
-  DATABASE_URL: z.string().url(),
-  FRONTEND_URL: z.string().url(),
+  DATABASE_URL: z.url(),
+  FRONTEND_URL: z.url(),
   GOOGLE_CLIENT_ID: z.string(),
   GOOGLE_CLIENT_SECRET: z.string(),
-  GOOGLE_REDIRECT_URI: z.string().url(),
+  GOOGLE_REDIRECT_URI: z.url(),
   REDIS_USERNAME: z.string(),
   REDIS_PASSWORD: z.string(),
   REDIS_HOST: z.string(),
-  REDIS_PORT: z.preprocess(
-    v => (v ? v : undefined),
-    z.coerce.number().int().positive()
-  ),
+  REDIS_PORT: z.coerce.number().int().positive().min(1000).max(65535),
   NODE_ENV: z.enum(['development', 'production']),
-  COOKIE_HTTP_ONLY: z
-    .enum(['true', 'false'])
-    .transform(value => value === 'true'),
-  COOKIE_SECURE: z.enum(['true', 'false']).transform(value => value === 'true'),
+  COOKIE_HTTP_ONLY: z.stringbool(),
+  COOKIE_SECURE: z.stringbool(),
   COOKIE_SAME_SITE: z.enum(['lax', 'strict', 'none']),
   COOKIE_DOMAIN: z.string(),
   ACCESS_JWT_SECRET: z.string().transform(v => new TextEncoder().encode(v)),
   REFRESH_JWT_SECRET: z.string().transform(v => new TextEncoder().encode(v)),
-  PORT: z.preprocess(
-    v => (v ? v : undefined),
-    z.coerce.number().int().positive()
-  ),
+  PORT: z.coerce.number().int().positive().min(1000).max(65535),
   API_PREFIX: z.string(),
   ALLOWED_ORIGINS: z
     .string()
     .transform(v => v.split(','))
-    .pipe(z.array(z.string().url())),
+    .pipe(z.array(z.url())),
   EMAIL_HOST: z.string(),
-  EMAIL_PORT: z
-    .number({ coerce: true })
-    .refine(v => availableEmailPorts.includes(v), {
-      message: `Email port must be one of the following: ${availableEmailPorts.join(', ')}`
-    }),
-  EMAIL_USER: z.string().email(),
-  EMAIL_RECEIVER: z.string().email(),
+  EMAIL_PORT: z.coerce
+    .number()
+    .refine(
+      v => availableEmailPorts.includes(v),
+      `Email port must be one of the following: ${availableEmailPorts.join(', ')}`
+    ),
+  EMAIL_USER: z.email(),
+  EMAIL_RECEIVER: z.email(),
   EMAIL_PASSWORD: z.string(),
   ACCESS_JWT_EXPIRES_IN: z.string(),
   REFRESH_JWT_EXPIRES_IN: z.string(),
diff --git a/app/controllers/auth.controller.ts b/app/controllers/auth.controller.ts
@@ -1,11 +1,7 @@
 import crypto from 'crypto'
 import type { GoogleCodeSchema, SigninSchema, SignupSchema } from '@/schemas'
-import type { JwtPayload } from '@/types'
+import type { JwtPayload, TypedRequestBody, TypedRequestQuery } from '@/types'
 import type { NextFunction, Request, Response } from 'express'
-import type {
-  TypedRequestBody,
-  TypedRequestQuery
-} from 'zod-express-middleware'
 
 import { prisma } from '@/prisma'
 import { hash, verify } from 'argon2'
diff --git a/app/controllers/board.controller.ts b/app/controllers/board.controller.ts
@@ -3,13 +3,13 @@ import type {
   BoardParamsSchema,
   EditBoardSchema
 } from '@/schemas'
-import type { NextFunction, Request, Response } from 'express'
-import type { ZodType } from 'zod'
 import type {
   TypedRequest,
   TypedRequestBody,
   TypedRequestParams
-} from 'zod-express-middleware'
+} from '@/types'
+import type { NextFunction, Request, Response } from 'express'
+import type { ZodType } from 'zod'
 
 import { prisma } from '@/prisma'
 import { NotFound } from 'http-errors'
diff --git a/app/controllers/card.controller.ts b/app/controllers/card.controller.ts
@@ -5,9 +5,9 @@ import type {
   EditCardSchema,
   UpdateCardOrderSchema
 } from '@/schemas'
+import type { TypedRequest, TypedRequestParams } from '@/types'
 import type { NextFunction, Response } from 'express'
 import type { ZodType } from 'zod'
-import type { TypedRequest, TypedRequestParams } from 'zod-express-middleware'
 
 import { prisma } from '@/prisma'
 import { BadRequest, NotFound } from 'http-errors'
diff --git a/app/controllers/column.controller.ts b/app/controllers/column.controller.ts
@@ -5,9 +5,9 @@ import type {
   EditColumnSchema,
   UpdateColumnOrderSchema
 } from '@/schemas'
+import type { TypedRequest, TypedRequestParams } from '@/types'
 import type { NextFunction, Response } from 'express'
 import type { ZodType } from 'zod'
-import type { TypedRequest, TypedRequestParams } from 'zod-express-middleware'
 
 import { prisma } from '@/prisma'
 import { BadRequest, NotFound } from 'http-errors'
diff --git a/app/controllers/user.controller.ts b/app/controllers/user.controller.ts
@@ -1,8 +1,8 @@
 import type { EditUserSchema, NeedHelpSchema } from '@/schemas'
+import type { TypedRequestBody } from '@/types'
 import type { User } from '@prisma/client'
 import type { NextFunction, Request, Response } from 'express'
 import type { Options } from 'nodemailer/lib/mailer'
-import type { TypedRequestBody } from 'zod-express-middleware'
 
 import { prisma } from '@/prisma'
 import { hash } from 'argon2'
diff --git a/app/middlewares/index.ts b/app/middlewares/index.ts
@@ -1,4 +1,5 @@
 export { authenticate } from './authenticate'
 export { upload } from './multer'
 export { globalLimiter } from './limiter'
+export { validateRequest } from './validate-request'
 export { notFoundHandler, globalErrorHandler } from './errorHandler'
diff --git a/app/middlewares/validate-request.ts b/app/middlewares/validate-request.ts
@@ -0,0 +1,57 @@
+import type { RequestHandler } from 'express'
+import type * as z from 'zod'
+
+import createHttpError from 'http-errors'
+
+type RequestValidation<P, Q, B> = {
+  params?: z.ZodType<P>
+  query?: z.ZodType<Q>
+  body?: z.ZodType<B>
+}
+
+export const validateRequest: <P, Q, B>(
+  schemas: RequestValidation<P, Q, B>
+) => RequestHandler<P, unknown, B, Q> =
+  ({ params, query, body }) =>
+  (req, _, next) => {
+    const errors: Record<string, string> = {}
+
+    if (params) {
+      const parsed = params.safeParse(req.params)
+
+      if (!parsed.success) {
+        parsed.error.issues.forEach(({ path, message }) => {
+          const errorPath = `${path.join('.')}`
+          errors[errorPath] = message
+        })
+      }
+    }
+
+    if (query) {
+      const parsed = query.safeParse(req.query)
+
+      if (!parsed.success) {
+        parsed.error.issues.forEach(({ path, message }) => {
+          const errorPath = `${path.join('.')}`
+          errors[errorPath] = message
+        })
+      }
+    }
+
+    if (body) {
+      const parsed = body.safeParse(req.body)
+
+      if (!parsed.success) {
+        parsed.error.issues.forEach(({ path, message }) => {
+          const errorPath = `${path.join('.')}`
+          errors[errorPath] = message
+        })
+      }
+    }
+
+    if (Object.keys(errors).length > 0) {
+      return next(createHttpError(400, { message: errors }))
+    }
+
+    return next()
+  }
diff --git a/app/routes/api/auth.ts b/app/routes/api/auth.ts
@@ -1,9 +1,9 @@
 import { Router } from 'express'
-import { validateRequest } from 'zod-express-middleware'
 
 import { authController } from '@/controllers'
 
 import { authenticate } from '@/middlewares'
+import { validateRequest } from '@/middlewares/validate-request'
 
 import { GoogleCodeSchema, SigninSchema, SignupSchema } from '@/schemas'
 
diff --git a/app/routes/api/board.ts b/app/routes/api/board.ts
@@ -1,9 +1,8 @@
 import { Router } from 'express'
-import { validateRequest } from 'zod-express-middleware'
 
 import { boardController } from '@/controllers'
 
-import { authenticate } from '@/middlewares'
+import { authenticate, validateRequest } from '@/middlewares'
 
 import { AddBoardSchema, BoardParamsSchema, EditBoardSchema } from '@/schemas'
 
diff --git a/app/routes/api/card.ts b/app/routes/api/card.ts
@@ -1,9 +1,8 @@
 import { Router } from 'express'
-import { validateRequest } from 'zod-express-middleware'
 
 import { cardController } from '@/controllers'
 
-import { authenticate } from '@/middlewares'
+import { authenticate, validateRequest } from '@/middlewares'
 
 import {
   AddCardSchema,
diff --git a/app/routes/api/column.ts b/app/routes/api/column.ts
@@ -1,9 +1,8 @@
 import { Router } from 'express'
-import { validateRequest } from 'zod-express-middleware'
 
 import { columnController } from '@/controllers'
 
-import { authenticate } from '@/middlewares'
+import { authenticate, validateRequest } from '@/middlewares'
 
 import {
   AddColumnSchema,
diff --git a/app/routes/api/user.ts b/app/routes/api/user.ts
@@ -1,9 +1,8 @@
 import { Router } from 'express'
-import { validateRequest } from 'zod-express-middleware'
 
 import { userController } from '@/controllers'
 
-import { authenticate, upload } from '@/middlewares'
+import { authenticate, upload, validateRequest } from '@/middlewares'
 
 import { EditUserSchema, NeedHelpSchema } from '@/schemas'
 
diff --git a/app/schemas/auth.schema.ts b/app/schemas/auth.schema.ts
@@ -1,14 +1,15 @@
 import * as z from 'zod'
 
 export const SigninSchema = z.object({
-  email: z.string().email({ message: 'Email is invalid' }),
+  email: z.email('Email is invalid'),
   password: z
     .string()
     .min(8, 'Password must be at least 8 characters')
     .max(64, 'Password must be at most 64 characters')
 })
 
-export const SignupSchema = SigninSchema.extend({
+export const SignupSchema = z.object({
+  ...SigninSchema.shape,
   name: z.string().min(2, 'Name must be at least 2 characters')
 })
 
diff --git a/app/schemas/board.schema.ts b/app/schemas/board.schema.ts
@@ -5,18 +5,18 @@ import boardImages from '@/data/board-bg-images.json'
 
 import { objectIdSchema } from './object-id.schema'
 
-function zodEnumFromObjKeys<K extends string>(
-  obj: Record<K, unknown>
-): z.ZodEnum<[K, ...K[]]> {
-  const [firstKey, ...otherKeys] = Object.keys(obj) as K[]
+function zObjectKeys<T extends Record<string, unknown>>(obj: T) {
+  const keys = Object.keys(obj) as Extract<keyof T, string>[]
 
-  return z.enum([firstKey, ...otherKeys])
+  return z.enum(
+    keys as [Extract<keyof T, string>, ...Extract<keyof T, string>[]]
+  )
 }
 
 export const AddBoardSchema = z.object({
   title: z.string().min(3, 'Title must be at least 3 characters'),
-  icon: z.nativeEnum(Icon),
-  background: zodEnumFromObjKeys(boardImages)
+  icon: z.enum(Icon),
+  background: zObjectKeys(boardImages)
 })
 
 export const EditBoardSchema = AddBoardSchema.partial()
diff --git a/app/schemas/card.schema.ts b/app/schemas/card.schema.ts
@@ -6,15 +6,19 @@ import { objectIdSchema } from './object-id.schema'
 export const AddCardSchema = z.object({
   title: z.string().min(3, 'Title must be at least 3 characters'),
   description: z.string().min(3, 'Description must be at least 3 characters'),
-  priority: z.nativeEnum(Priority, {
-    message: 'Priority must be one of the following: Without, Low, Medium, High'
-  }),
-  deadline: z.coerce.date({ message: 'Deadline must be a valid date' })
+  priority: z.enum(
+    Priority,
+    'Priority must be one of the following: Without, Low, Medium, High'
+  ),
+  deadline: z.iso.datetime('Deadline must be a valid datetime')
 })
 
-export const EditCardSchema = AddCardSchema.extend({
-  columnId: objectIdSchema()
-}).partial()
+export const EditCardSchema = z
+  .object({
+    ...AddCardSchema.shape,
+    columnId: objectIdSchema()
+  })
+  .partial()
 
 export const CardParamsSchema = z.object({ cardId: objectIdSchema() })
 
diff --git a/app/schemas/user.schema.ts b/app/schemas/user.schema.ts
@@ -2,20 +2,21 @@ import { Theme } from '@prisma/client'
 import * as z from 'zod'
 
 export const NeedHelpSchema = z.object({
-  email: z.string().email({ message: 'Email is invalid' }),
+  email: z.email('Email is invalid'),
   comment: z.string().min(5, 'Comment must be at least 5 characters')
 })
 
 export const EditUserSchema = z
   .object({
     name: z.string().min(2, 'Name must be at least 2 characters'),
-    email: z.string().email({ message: 'Email is invalid' }),
+    email: z.email('Email is invalid'),
     password: z
       .string()
       .min(8, 'Password must be at least 8 characters')
       .max(64, 'Password must be at most 64 characters'),
-    theme: z.nativeEnum(Theme, {
-      message: 'Theme must be one of the following: light, dark, violet'
-    })
+    theme: z.enum(
+      Theme,
+      'Theme must be one of the following: light, dark, violet'
+    )
   })
   .partial()
diff --git a/app/types/index.ts b/app/types/index.ts
@@ -1 +1,7 @@
 export type { JwtPayload } from './jwt-payload'
+export type {
+  TypedRequest,
+  TypedRequestBody,
+  TypedRequestQuery,
+  TypedRequestParams
+} from './request'
diff --git a/app/types/request.ts b/app/types/request.ts
@@ -0,0 +1,30 @@
+import type { Request } from 'express'
+import type { ParamsDictionary } from 'express-serve-static-core'
+import type * as z from 'zod'
+
+export type TypedRequest<
+  P extends z.ZodType,
+  Q extends z.ZodType,
+  B extends z.ZodType
+> = Request<z.infer<P>, unknown, z.infer<B>, z.infer<Q>>
+
+export type TypedRequestBody<B extends z.ZodType> = Request<
+  ParamsDictionary,
+  unknown,
+  z.infer<B>,
+  unknown
+>
+
+export type TypedRequestParams<P extends z.ZodType> = Request<
+  z.infer<P>,
+  unknown,
+  unknown,
+  unknown
+>
+
+export type TypedRequestQuery<Q extends z.ZodType> = Request<
+  ParamsDictionary,
+  unknown,
+  unknown,
+  z.infer<Q>
+>
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock
