@anthonylzq/simba.js 7.0.1 → 7.1.0

package/lib/index.js

@@ -92,6 +92,8 @@ const argv = yargs(hideBin(process.argv))
   .alias('h', 'help')
   .epilog('Developed by AnthonyLzq').argv
 
+const PROJECT_VERSION = '0.1.0'
+const MAIN_FILE = 'src/index.ts'
 /** @type {Config} */
 const config = {
   author: '',
@@ -100,11 +102,11 @@ const config = {
   projectDescription: '',
   heroku: false,
   license: 'unlicensed',
-  version: '0.1.0',
+  version: PROJECT_VERSION,
   licenseYear: CURRENT_YEAR,
   npm: false,
   manager: 'yarn add',
-  mainFile: 'src/index.ts',
+  mainFile: MAIN_FILE,
   fastify: false,
   graphql: false,
   tests: true,
@@ -210,17 +212,12 @@ const main = async () => {
       limitMessage: 'That is not a valid email!'
     })
     config.version = readLineSync.question('> Project version (0.1.0): ')
-    config.version = config.version === '' ? '0.1.0' : config.version
-
-    const licensePos = readLineSync.keyInSelect(
-      LICENSES,
-      '> Select your license: ',
-      {
+    config.version = config.version === '' ? PROJECT_VERSION : config.version
+    config.license = LICENSES[
+      readLineSync.keyInSelect(LICENSES, '> Select your license: ', {
         cancel: false
-      }
-    )
-
-    config.license = LICENSES[licensePos]
+      })
+    ]
       .toLowerCase()
       .replace(/ /g, '-')
       .replace('d', '')
@@ -249,6 +246,7 @@ const main = async () => {
       }
     )
     config.mainFile = readLineSync.question('> Main file (src/index.ts): ')
+    config.mainFile = config.mainFile === '' ? MAIN_FILE : config.mainFile
     config.tests = readLineSync.keyInYNStrict(
       '> Would you want to have a basic suit of tests with Jest? ',
       {
@@ -265,13 +263,18 @@ const main = async () => {
       )
     else config.ghat = false
 
-    config.database = readLineSync.keyInSelect(
-      Object.keys(DATABASES),
-      '> Select your database: ',
-      {
-        cancel: false
-      }
-    )
+    config.database =
+      DATABASES[
+        Object.keys(DATABASES)[
+          readLineSync.keyInSelect(
+            Object.keys(DATABASES),
+            '> Select your database: ',
+            {
+              cancel: false
+            }
+          )
+        ]
+      ]
   } else {
     if (!argv.author) return console.log('Error! An author is required!')
     else config.author = argv.author

package/lib/src/functions/api/express.js

@@ -124,7 +124,7 @@ import { HttpLogger } from 'express-pino-logger'
 
 const ENVIRONMENTS_WITHOUT_RECONNECTION = ['ci', 'local']
 const dbConnection = async (
-  logger: HttpLogger['logger']
+  logger?: HttpLogger['logger']
 ): Promise<{
   connect: () => Promise<typeof import('mongoose')>
   disconnect: () => Promise<void>
@@ -136,10 +136,10 @@ const dbConnection = async (
   }
 
   connection.on('connected', () => {
-    logger.info('Mongo connection established.')
+    logger?.info('Mongo connection established.')
   })
   connection.on('reconnected', () => {
-    logger.info('Mongo connection reestablished')
+    logger?.info('Mongo connection reestablished')
   })
   connection.on('disconnected', () => {
     if (
@@ -147,7 +147,7 @@ const dbConnection = async (
         process.env.NODE_ENV as string
       )
     ) {
-      logger.info(
+      logger?.info(
         'Mongo connection disconnected. Trying to reconnected to Mongo...'
       )
       setTimeout(() => {
@@ -160,11 +160,11 @@ const dbConnection = async (
     }
   })
   connection.on('close', () => {
-    logger.info('Mongo connection closed')
+    logger?.info('Mongo connection closed')
   })
   connection.on('error', (e: Error) => {
-    logger.info('Mongo connection error:')
-    logger.error(e)
+    logger?.info('Mongo connection error:')
+    logger?.error(e)
   })
 
   return {

package/lib/src/functions/api/fastify.js

@@ -91,7 +91,7 @@ import { FastifyLoggerInstance } from 'fastify'
 
 const ENVIRONMENTS_WITHOUT_RECONNECTION = ['ci', 'local']
 const dbConnection = async (
-  logger: FastifyLoggerInstance
+  logger?: FastifyLoggerInstance
 ): Promise<{
   connect: () => Promise<typeof import('mongoose')>
   disconnect: () => Promise<void>
@@ -103,10 +103,10 @@ const dbConnection = async (
   }
 
   connection.on('connected', () => {
-    logger.info('Mongo connection established.')
+    logger?.info('Mongo connection established.')
   })
   connection.on('reconnected', () => {
-    logger.info('Mongo connection reestablished')
+    logger?.info('Mongo connection reestablished')
   })
   connection.on('disconnected', () => {
     if (
@@ -114,7 +114,7 @@ const dbConnection = async (
         process.env.NODE_ENV as string
       )
     ) {
-      logger.info(
+      logger?.info(
         'Mongo connection disconnected. Trying to reconnected to Mongo...'
       )
       setTimeout(() => {
@@ -127,11 +127,11 @@ const dbConnection = async (
     }
   })
   connection.on('close', () => {
-    logger.info('Mongo connection closed')
+    logger?.info('Mongo connection closed')
   })
   connection.on('error', (e: Error) => {
-    logger.info('Mongo connection error:')
-    logger.error(e)
+    logger?.info('Mongo connection error:')
+    logger?.error(e)
   })
 
   return {
@@ -336,7 +336,7 @@ import * as models from './models'
 let sequelize: Sequelize
 
 const dbConnection = async (
-  logger: FastifyLoggerInstance
+  logger?: FastifyLoggerInstance
 ): Promise<{
   connect: () => Promise<Sequelize>
   disconnect: () => Promise<void>

package/lib/src/functions/index.js

@@ -0,0 +1,16 @@
+module.exports = {
+  api: require('./api'),
+  changelog: require('./changelog'),
+  docker: require('./docker'),
+  eslint: require('./eslint'),
+  ghat: require('./ghat'),
+  gitignore: require('./gitignore'),
+  herokuF: require('./heroku'),
+  licenseF: require('./license'),
+  packageJson: require('./packageJson'),
+  readme: require('./readme'),
+  testsF: require('./tests'),
+  tsconfig: require('./tsconfig'),
+  ghatF: require('./ghat'),
+  webpack: require('./webpack')
+}

package/lib/src/functions/packageJson.js

@@ -47,7 +47,18 @@ module.exports = async ({
       : ''
   }
   "dependencies": {},
-  "devDependencies": {}
+  "devDependencies": {},
+  "nodemonConfig": {
+    "watch": [
+      ".env",
+      "src"
+    ],
+    "ext": "ts",
+    "ignore": [
+      "src/**/*.test.ts"
+    ],
+    "exec": "npx ts-node -r dotenv/config ./src/index"
+  }
 }
 `
   await writeFile(`${projectName}/${data.file}`, data.content)

package/lib/src/index.js

@@ -3,20 +3,21 @@ const colors = require('colors')
 const util = require('util')
 const exec = util.promisify(require('child_process').exec)
 
-const packageJson = require('./functions/packageJson')
-const readme = require('./functions/readme')
-const changelog = require('./functions/changelog')
-const licenseF = require('./functions/license')
-const gitignore = require('./functions/gitignore')
-const tsconfig = require('./functions/tsconfig')
-const nodemon = require('./functions/nodemon')
-const eslint = require('./functions/eslint')
-const webpack = require('./functions/webpack')
-const docker = require('./functions/docker')
-const herokuF = require('./functions/heroku')
-const api = require('./functions/api')
-const testsF = require('./functions/tests')
-const ghatF = require('./functions/ghat')
+const {
+  packageJson,
+  readme,
+  changelog,
+  licenseF,
+  gitignore,
+  tsconfig,
+  eslint,
+  webpack,
+  docker,
+  herokuF,
+  api,
+  testsF,
+  ghatF
+} = require('./functions')
 
 /**
  * @param {Number} process number of process
@@ -96,6 +97,9 @@ module.exports = async ({
     case 'sqlServer':
       prodPackages +=
         ' sequelize sequelize-typescript sequelize-typescript-migration-lts tedious'
+      break
+    default:
+      throw new Error('Wrong database')
   }
 
   const expressDevPackages =
@@ -156,7 +160,6 @@ webpack-node-externals`
       changelog(projectName),
       gitignore(projectName),
       tsconfig(projectName, dbIsSQL),
-      nodemon(projectName),
       eslint({ projectName, tests, dbIsSQL }),
       webpack(projectName),
       docker(projectName),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anthonylzq/simba.js",
-  "version": "7.0.1",
+  "version": "7.1.0",
   "description": "set up a modern backend app by running one command",
   "main": "lib/index.js",
   "scripts": {
@@ -101,18 +101,18 @@
     "cli-progress": "^3.11.2",
     "colors": "^1.4.0",
     "readline-sync": "^1.4.10",
-    "underscore": "^1.13.4",
-    "yargs": "^17.5.1"
+    "underscore": "^1.13.6",
+    "yargs": "^17.6.0"
   },
   "devDependencies": {
-    "dotenv": "^16.0.2",
-    "eslint": "^8.23.0",
+    "dotenv": "^16.0.3",
+    "eslint": "^8.26.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-promise": "^6.0.1",
+    "eslint-plugin-promise": "^6.1.1",
     "prettier": "^2.7.1",
     "standard-version": "^9.5.0"
   },

package/lib/src/functions/nodemon.js

@@ -1,25 +0,0 @@
-const writeFile = require('../utils/writeFile')
-
-/**
- * @param {String} projectName
- * @returns {Promise<void>}
- */
-module.exports = async projectName => {
-  const data = {
-    nodemonContent: `{
-  "watch": [
-    ".env",
-    "src"
-  ],
-  "ext": "ts",
-  "ignore": [
-    "src/**/*.test.ts"
-  ],
-  "exec": "npx ts-node -r dotenv/config ./src/index"
-}
-`,
-    nodemonFile: 'nodemon.json'
-  }
-
-  await writeFile(`${projectName}/${data.nodemonFile}`, data.nodemonContent)
-}