@anthonylzq/simba.js 4.0.0 → 4.2.0

package/README.md

@@ -136,9 +136,8 @@ Regardless of the option chosen, a new folder will be generated with the name of
  ┃ ┗ 📜index.ts
  ┣ 📂network
  ┃ ┣ 📂routes
- ┃ ┃ ┣ 📂schemas
- ┃ ┃ ┃ ┣ 📜index.ts
- ┃ ┃ ┃ ┗ 📜user.ts
+ ┃ ┃ ┣ 📂utils
+ ┃ ┃ ┃ ┗ 📜docs.ts
  ┃ ┃ ┣ 📜home.ts
  ┃ ┃ ┣ 📜index.ts
  ┃ ┃ ┗ 📜user.ts
@@ -146,6 +145,9 @@ Regardless of the option chosen, a new folder will be generated with the name of
  ┃ ┣ 📜response.ts
  ┃ ┣ 📜routes.ts
  ┃ ┗ 📜server.ts
+ ┣ 📂schemas
+ ┃ ┣ 📜index.ts
+ ┃ ┗ 📜user.ts
  ┣ 📂services
  ┃ ┣ 📂utils
  ┃ ┃ ┣ 📂messages
@@ -183,8 +185,6 @@ Regardless of the option chosen, a new folder will be generated with the name of
 📂node_modules
 📂src
  ┣ 📂@types
- ┃ ┣ 📂dto
- ┃ ┃ ┗ 📜user.d.ts
  ┃ ┣ 📂models
  ┃ ┃ ┗ 📜user.d.ts
  ┃ ┗ 📜index.d.ts
@@ -200,9 +200,8 @@ Regardless of the option chosen, a new folder will be generated with the name of
  ┃ ┗ 📜index.ts
  ┣ 📂network
  ┃ ┣ 📂routes
- ┃ ┃ ┣ 📂schemas
- ┃ ┃ ┃ ┣ 📜index.ts
- ┃ ┃ ┃ ┗ 📜user.ts
+ ┃ ┃ ┣ 📂utils
+ ┃ ┃ ┃ ┗ 📜docs.ts
  ┃ ┃ ┣ 📜docs.ts
  ┃ ┃ ┣ 📜home.ts
  ┃ ┃ ┣ 📜index.ts
@@ -211,6 +210,9 @@ Regardless of the option chosen, a new folder will be generated with the name of
  ┃ ┣ 📜response.ts
  ┃ ┣ 📜routes.ts
  ┃ ┗ 📜server.ts
+ ┣ 📂schemas
+ ┃ ┣ 📜index.ts
+ ┃ ┗ 📜user.ts
  ┣ 📂services
  ┃ ┣ 📂utils
  ┃ ┃ ┣ 📂messages
@@ -331,12 +333,14 @@ As `dependencies`:
 As `devDependencies`:
 
 - [`@types/express`](https://www.npmjs.com/package/@types/express)
+- [`@types/cors`](https://www.npmjs.com/package/@types/cors)
 - [`@types/morgan`](https://www.npmjs.com/package/@types/morgan)
 - [`@types/swagger-ui-express`](https://www.npmjs.com/package/@types/swagger-ui-express)
 
 As `dependencies`:
 
-- [`express`](https://expressjs.com/)
+- [`cors`](https://www.npmjs.com/package/cors)
+- [`express`](https://www.npmjs.com/package/express)
 - [`morgan`](https://www.npmjs.com/package/morgan)
 - [`swagger-ui-express`](https://www.npmjs.com/package/swagger-ui-express)
 
@@ -345,6 +349,7 @@ As `dependencies`:
 As `dependencies`:
 
 - [`fastify`](https://www.npmjs.com/package/fastify)
+- [`fastify-cors`](https://www.npmjs.com/package/fastify-cors)
 - [`fastify-swagger`](https://www.npmjs.com/package/fastify-swagger)
 
 Feel free to contribute to this project. Every contribution will be appreciated.

package/lib/src/functions/api.js

@@ -121,17 +121,6 @@ export {}
         file: `${projectName}/src/@types/index.d.ts`
       }
     },
-    '@types/dto': {
-      user: {
-        content: `interface UserDTO {
-  id: string
-  lastName: string
-  name: string
-}
-`,
-        file: `${projectName}/src/@types/dto/user.d.ts`
-      }
-    },
     '@types/models': {
       user: {
         content: `interface UserDBO {
@@ -661,26 +650,27 @@ export { applyRoutes }
         content: `import express from 'express'
 import mongoose from 'mongoose'
 import morgan from 'morgan'
+import cors from 'cors'
 
 import { applyRoutes } from './router'
 
 const PORT = (process.env.PORT as string) || '1996'
 
 class Server {
-  private _app: express.Application
-  private _connection: mongoose.Connection | undefined
+  #app: express.Application
+  #connection: mongoose.Connection | undefined
 
   constructor() {
-    this._app = express()
-    this._config()
+    this.#app = express()
+    this.#config()
   }
 
-  private _config() {
-    this._app.set('port', PORT)
-    this._app.use(morgan('dev'))
-    this._app.use(express.json())
-    this._app.use(express.urlencoded({ extended: false }))
-    this._app.use(
+  #config() {
+    this.#app.use(cors())
+    this.#app.use(morgan('dev'))
+    this.#app.use(express.json())
+    this.#app.use(express.urlencoded({ extended: false }))
+    this.#app.use(
       (
         req: express.Request,
         res: express.Response,
@@ -696,23 +686,23 @@ class Server {
       }
     )
 
-    applyRoutes(this._app)
+    applyRoutes(this.#app)
   }
 
-  private async _mongo(): Promise<void> {
-    this._connection = mongoose.connection
+  async #mongo(): Promise<void> {
+    this.#connection = mongoose.connection
     const connection = {
       keepAlive: true,
       useNewUrlParser: true,
       useUnifiedTopology: true
     }
-    this._connection.on('connected', () => {
+    this.#connection.on('connected', () => {
       console.log('Mongo connection established.')
     })
-    this._connection.on('reconnected', () => {
+    this.#connection.on('reconnected', () => {
       console.log('Mongo connection reestablished')
     })
-    this._connection.on('disconnected', () => {
+    this.#connection.on('disconnected', () => {
       console.log('Mongo connection disconnected')
       console.log('Trying to reconnected to Mongo...')
       setTimeout(() => {
@@ -723,10 +713,10 @@ class Server {
         })
       }, 3000)
     })
-    this._connection.on('close', () => {
+    this.#connection.on('close', () => {
       console.log('Mongo connection closed')
     })
-    this._connection.on('error', (e: Error) => {
+    this.#connection.on('error', (e: Error) => {
       console.log('Mongo connection error:')
       console.error(e)
     })
@@ -734,12 +724,12 @@ class Server {
   }
 
   public start(): void {
-    this._app.listen(PORT, () => {
+    this.#app.listen(PORT, () => {
       console.log(\`Server running at port \${PORT}\`)
     })
 
     try {
-      this._mongo()
+      this.#mongo()
     } catch (e) {
       console.error(e)
     }
@@ -1405,16 +1395,17 @@ import { applyRoutes } from './router'
 const PORT = process.env.PORT ?? '1996'
 
 class Server {
-  private _app: FastifyInstance
-  private _connection: mongoose.Connection | undefined
+  #app: FastifyInstance
+  #connection: mongoose.Connection | undefined
 
   constructor() {
-    this._app = Fastify({ logger: true })
-    this._config()
+    this.#app = Fastify({ logger: true })
+    this.#config()
   }
 
-  private _config() {
-    this._app.addHook('preHandler', (req, reply, done) => {
+  #config() {
+    this.#app.register(require('fastify-cors'), {})
+    this.#app.addHook('preHandler', (req, reply, done) => {
       reply.header('Access-Control-Allow-Methods', 'GET, POST, PATCH, DELETE')
       reply.header('Access-Control-Allow-Origin', '*')
       reply.header(
@@ -1423,25 +1414,25 @@ class Server {
       )
       done()
     })
-    applyRoutes(this._app)
+    applyRoutes(this.#app)
   }
 
-  private async _mongo(): Promise<void> {
-    this._connection = mongoose.connection
+  async #mongo(): Promise<void> {
+    this.#connection = mongoose.connection
     const connection = {
       keepAlive: true,
       useNewUrlParser: true,
       useUnifiedTopology: true
     }
-    this._connection.on('connected', () => {
-      this._app.log.info('Mongo connection established.')
+    this.#connection.on('connected', () => {
+      this.#app.log.info('Mongo connection established.')
     })
-    this._connection.on('reconnected', () => {
-      this._app.log.info('Mongo connection reestablished')
+    this.#connection.on('reconnected', () => {
+      this.#app.log.info('Mongo connection reestablished')
     })
-    this._connection.on('disconnected', () => {
-      this._app.log.info('Mongo connection disconnected')
-      this._app.log.info('Trying to reconnected to Mongo...')
+    this.#connection.on('disconnected', () => {
+      this.#app.log.info('Mongo connection disconnected')
+      this.#app.log.info('Trying to reconnected to Mongo...')
       setTimeout(() => {
         mongoose.connect(process.env.MONGO_URI as string, {
           ...connection,
@@ -1450,20 +1441,20 @@ class Server {
         })
       }, 3000)
     })
-    this._connection.on('close', () => {
-      this._app.log.info('Mongo connection closed')
+    this.#connection.on('close', () => {
+      this.#app.log.info('Mongo connection closed')
     })
-    this._connection.on('error', (e: Error) => {
-      this._app.log.info('Mongo connection error:')
-      this._app.log.error(e)
+    this.#connection.on('error', (e: Error) => {
+      this.#app.log.info('Mongo connection error:')
+      this.#app.log.error(e)
     })
     await mongoose.connect(process.env.MONGO_URI as string, connection)
   }
 
   public async start(): Promise<void> {
     try {
-      await this._app.listen(PORT)
-      this._mongo()
+      await this.#app.listen(PORT)
+      this.#mongo()
     } catch (e) {
       console.error(e)
     }
@@ -1811,7 +1802,6 @@ ${projectName}/src/@types/custom`
 
   const createFoldersCommands = `mkdir ${projectName}/src \
 ${projectName}/src/@types \
-${projectName}/src/@types/dto \
 ${projectName}/src/@types/models \
 ${projectName}/src/database \
 ${projectName}/src/database/mongo \
@@ -1834,9 +1824,6 @@ ${fastify ? '' : `${expressFolders}`}
   // /@types
   await writeFile(data['@types'].index.file, data['@types'].index.content)
 
-  // /@types/dto
-  await writeFile(data['@types/dto'].user.file, data['@types/dto'].user.content)
-
   // /@types/models
   await writeFile(
     data['@types/models'].user.file,

package/lib/src/index.js

@@ -57,13 +57,13 @@ module.exports = async ({
     cliProgress.Presets.shades_classic
   )
 
-  const expressProdPackages = 'express morgan swagger-ui-express'
-  const fastifyProdPackages = 'fastify fastify-swagger'
+  const expressProdPackages = 'express morgan swagger-ui-express cors'
+  const fastifyProdPackages = 'fastify fastify-swagger fastify-cors'
   const prodPackages = `${manager} http-errors mongoose @sinclair/typebox ajv@^6 ${
     fastify ? fastifyProdPackages : expressProdPackages
   }`
 
-  const expressDevPackages = `@types/express @types/morgan @types/swagger-ui-express`
+  const expressDevPackages = `@types/express @types/morgan @types/swagger-ui-express @types/cors`
   const fastifyDevPackages = ''
   const devPackages = `${manager} -D \
 @types/http-errors \

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anthonylzq/simba.js",
-  "version": "4.0.0",
+  "version": "4.2.0",
   "description": "set up a modern backend app by running one command",
   "main": "lib/index.js",
   "directories": {