feat: improved validator schema

AnthonyLzq · Apr 10, 2022 · a76a6a8 · a76a6a8
1 parent a34dcec
commit a76a6a8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/example/fastify/src/network/routes/user.ts b/example/fastify/src/network/routes/user.ts
@@ -10,7 +10,6 @@ import {
   StoreUser
 } from 'schemas'
 import { UserService } from 'services'
-import { validatorCompiler } from './utils'
 
 const User = (app: FastifyInstance, prefix = '/api'): void => {
   app
@@ -28,8 +27,7 @@ const User = (app: FastifyInstance, prefix = '/api'): void => {
             }
           },
           tags: ['user']
-        },
-        validatorCompiler
+        }
       },
       async (request, reply) => {
         const {
@@ -120,8 +118,7 @@ const User = (app: FastifyInstance, prefix = '/api'): void => {
             }
           },
           tags: ['user']
-        },
-        validatorCompiler
+        }
       },
       async (request, reply) => {
         const {

diff --git a/example/fastify/src/network/server.ts b/example/fastify/src/network/server.ts
@@ -2,6 +2,7 @@ import Fastify, { FastifyInstance } from 'fastify'
 import mongoose from 'mongoose'
 
 import { applyRoutes } from './router'
+import { validatorCompiler } from './utils'
 
 const PORT = process.env.PORT ?? '1996'
 
@@ -25,6 +26,7 @@ class Server {
       )
       done()
     })
+    this.#app.setValidatorCompiler(validatorCompiler)
     applyRoutes(this.#app)
   }
 

diff --git a/...fastify/src/network/routes/utils/index.ts → example/fastify/src/network/utils/index.ts b/...fastify/src/network/routes/utils/index.ts → example/fastify/src/network/utils/index.ts
diff --git a/lib/src/functions/api.js b/lib/src/functions/api.js
@@ -1391,6 +1391,7 @@ export { applyRoutes }
 import mongoose from 'mongoose'
 
 import { applyRoutes } from './router'
+import { validatorCompiler } from './utils'
 
 const PORT = process.env.PORT ?? '1996'
 
@@ -1414,6 +1415,7 @@ class Server {
       )
       done()
     })
+    this.#app.setValidatorCompiler(validatorCompiler)
     applyRoutes(this.#app)
   }
 
@@ -1549,7 +1551,6 @@ import {
   StoreUser
 } from 'schemas'
 import { UserService } from 'services'
-import { validatorCompiler } from './utils'
 
 const User = (app: FastifyInstance, prefix = '/api'): void => {
   app
@@ -1567,8 +1568,7 @@ const User = (app: FastifyInstance, prefix = '/api'): void => {
             }
           },
           tags: ['user']
-        },
-        validatorCompiler
+        }
       },
       async (request, reply) => {
         const {
@@ -1659,8 +1659,7 @@ const User = (app: FastifyInstance, prefix = '/api'): void => {
             }
           },
           tags: ['user']
-        },
-        validatorCompiler
+        }
       },
       async (request, reply) => {
         const {
@@ -1754,7 +1753,7 @@ export { User }
         file: `${projectName}/src/network/routes/user.ts`
       }
     },
-    'network/routes/utils': {
+    'network/utils': {
       index: {
         content: `/* eslint-disable @typescript-eslint/no-explicit-any */
 import {
@@ -1792,13 +1791,16 @@ const validatorCompiler = ({
 
 export { validatorCompiler }
 `,
-        file: `${projectName}/src/network/routes/utils/index.ts`
+        file: `${projectName}/src/network/utils/index.ts`
       }
     }
   }
 
   const expressFolders = `${projectName}/src/utils \
-${projectName}/src/@types/custom`
+${projectName}/src/@types/custom \
+${projectName}/src/network/routes/utils`
+
+  const fastifyFolders = `${projectName}/src/network/utils`
 
   const createFoldersCommands = `mkdir ${projectName}/src \
 ${projectName}/src/@types \
@@ -1809,12 +1811,11 @@ ${projectName}/src/database/mongo/models \
 ${projectName}/src/database/mongo/queries \
 ${projectName}/src/network \
 ${projectName}/src/network/routes \
-${projectName}/src/network/routes/utils \
 ${projectName}/src/schemas \
 ${projectName}/src/services \
 ${projectName}/src/services/utils \
 ${projectName}/src/services/utils/messages \
-${fastify ? '' : `${expressFolders}`}
+${fastify ? `${fastifyFolders}` : `${expressFolders}`}
 `
 
   if (os.platform() === 'win32')
@@ -1924,8 +1925,8 @@ ${fastify ? '' : `${expressFolders}`}
 
     // /network/routes/utils
     await writeFile(
-      fastifyData['network/routes/utils'].index.file,
-      fastifyData['network/routes/utils'].index.content
+      fastifyData['network/utils'].index.file,
+      fastifyData['network/utils'].index.content
     )
   } else {
     // /@types/custom