@anthonylzq/simba.js 8.0.0 → 8.1.0

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

@@ -50,13 +50,11 @@ datasource db {
 model User {
   ${
     isMongo
-      ? `id       String @id @default(auto()) @map("_id") @db.ObjectId
-  lastName String
-  name     String`
-      : `id       Int    @id @default(autoincrement())
-  lastName String
-  name     String`
+      ? 'id       String @id @default(auto()) @map("_id") @db.ObjectId'
+      : 'id       Int    @id @default(autoincrement())'
   }
+  lastName String
+  name     String
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -132,14 +130,14 @@ import { dbConnection } from '../connection'
 import { Id, User as UserSchema, UserDTO } from 'schemas'
 import { Logger } from 'utils'
 
-const LOGGER = new Logger(debug('App:Database:Queries:User'))
+const logger = new Logger(debug('App:Database:Queries:User'))
 
-const userDBOtoDTO = (userDBO: User): UserDTO =>
+const userDBOtoDTO = (userDBO: User) =>
   ({
     ...userDBO,
     createdAt: userDBO.createdAt.toISOString(),
     updatedAt: userDBO.updatedAt.toISOString()
-  }) as UserDTO
+  }) satisfies UserDTO
 
 const store = async (userData: UserSchema) => {
   try {
@@ -150,7 +148,7 @@ const store = async (userData: UserSchema) => {
 
     return userDBOtoDTO(user)
   } catch (error) {
-    LOGGER.log({
+    logger.log({
       origin: 'queries/user.ts',
       method: store.name,
       value: 'error',
@@ -170,7 +168,7 @@ const removeById = async (id: Id) => {
 
     return true
   } catch (error) {
-    LOGGER.log({
+    logger.log({
       origin: 'queries/user.ts',
       method: removeById.name,
       value: 'error',
@@ -192,7 +190,7 @@ const getById = async (id: Id) => {
 
     return userDBOtoDTO(user)
   } catch (error) {
-    LOGGER.log({
+    logger.log({
       origin: 'queries/user.ts',
       method: getById.name,
       value: 'error',
@@ -215,7 +213,7 @@ const update = async (id: Id, user: UserSchema) => {
 
     return userDBOtoDTO(userUpdated)
   } catch (error) {
-    LOGGER.log({
+    logger.log({
       origin: 'queries/user.ts',
       method: update.name,
       value: 'error',

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

@@ -15,10 +15,8 @@ const utils = require('./utils')
  * @param {Boolean} args.dbIsSQL
  */
 const types = async ({ projectName, graphQL, dbIsSQL }) => {
-  const createFoldersCommand = `mkdir ${projectName}/src/@types ${projectName}/src/@types/custom \
-${!dbIsSQL ? ` ${projectName}/src/@types/models` : ''} ${
-    graphQL ? ` ${projectName}/src/@types/graphQL` : ''
-  }`
+  const createFoldersCommand = `mkdir ${projectName}/src/@types \
+${!dbIsSQL ? ` ${projectName}/src/@types/models` : ''}`
 
   if (platform() === 'win32')
     await exec(createFoldersCommand.replaceAll('/', '\\'))
@@ -32,36 +30,9 @@ declare global {}
 export {}
 `,
       file: `${projectName}/src/@types/index.d.ts`
-    },
-    custom: {
-      params: {
-        content: `type Params = {
-  [key: string]: string
-}\n`,
-        file: `${projectName}/src/@types/custom/params.d.ts`
-      }
-    },
-    ...(graphQL && {
-      graphQL: {
-        context: {
-          content: `type Context = {
-  log: import('express-pino-logger').HttpLogger['logger']
-}
-`,
-          file: `${projectName}/src/@types/graphQL/context.d.ts`
-        }
-      }
-    })
+    }
   }
-  const processes = [
-    writeFile(types.index.file, types.index.content),
-    writeFile(types.custom.params.file, types.custom.params.content)
-  ]
-
-  if (graphQL)
-    processes.push(
-      writeFile(types.graphQL.context.file, types.graphQL.context.content)
-    )
+  const processes = [writeFile(types.index.file, types.index.content)]
 
   await Promise.all(processes)
 }
@@ -406,7 +377,13 @@ const User = Router()
 User.route('/users').post(
   validatorCompiler(storeUserDto, 'body'),
   async (
-    req: Request<Params, Record<string, unknown>, { args: UserDTO }>,
+    req: Request<
+      {
+        [key: string]: string
+      },
+      Record<string, unknown>,
+      { args: UserDTO }
+    >,
     res: Response,
     next: NextFunction
   ): Promise<void> => {

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

@@ -76,12 +76,12 @@ DELETE http://localhost:1996/api/user/60e7e3b93b01c1a7aa74cd6b
                 : `${database}://${database}:${database}@${database}:${dbDefaultPorts[database]}/${projectName}`
             }`
           : database === 'sqlite'
-          ? ''
-          : `DATABASE_URL = ${
-              ENVIRONMENTS_WITH_DB_URI.includes(process.env.NODE_ENV)
-                ? process.env.MONGO_URI
-                : `mongodb://mongo:mongo@mongo:27017/${projectName}`
-            }`,
+            ? ''
+            : `DATABASE_URL = ${
+                ENVIRONMENTS_WITH_DB_URI.includes(process.env.NODE_ENV)
+                  ? process.env.MONGO_URI
+                  : `mongodb://mongo:mongo@mongo:27017/${projectName}`
+              }`,
       file: `${projectName}/.env`
     },
     index: {

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

@@ -87,15 +87,11 @@ class BaseHttpService implements Log {
       value: 'error',
       content: error
     })
+    const errorMessage = message ?? (error as { message: string }).message
 
-    if (code)
-      throw new httpErrors[code](
-        message ?? (error as { message: string }).message
-      )
+    if (code) throw new httpErrors[code](errorMessage)
 
-    throw new httpErrors.InternalServerError(
-      message ?? (error as { message: string }).message
-    )
+    throw new httpErrors.InternalServerError(errorMessage)
   }
 }
 

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

@@ -104,8 +104,7 @@ export { Logger }\n`,
       "name": "user",
       "description": "Operations related to the user"
     }
-  ]
-  ${
+  ]${
     !graphQL
       ? `,
   "paths": {
@@ -424,7 +423,7 @@ export { Logger }\n`,
     }
   }
   }`
-      : '}'
+      : '\n}'
   }`,
         file: `${projectName}/src/utils/docs.json`
       }

package/lib/src/functions/ghat.js

@@ -52,8 +52,8 @@ ${
           managerName === 'yarn'
             ? 'yarn install --frozen-lockfile'
             : managerName
-            ? 'pnpm i --frozen-lockfile'
-            : 'npm ci'
+              ? 'pnpm i --frozen-lockfile'
+              : 'npm ci'
         }
 
       - name: Run linters
@@ -99,8 +99,8 @@ ${
           managerName === 'yarn'
             ? 'yarn install --frozen-lockfile'
             : managerName
-            ? 'pnpm i --frozen-lockfile'
-            : 'npm ci'
+              ? 'pnpm i --frozen-lockfile'
+              : 'npm ci'
         }
 
       - name: Run test

package/lib/src/index.js

@@ -97,8 +97,8 @@ module.exports = async ({
 @typescript-eslint/parser \
 axios \
 dotenv \
-eslint \
-eslint-config-prettier \
+eslint@^8 \
+eslint-config-prettier@^8 \
 eslint-config-standard \
 eslint-plugin-import \
 eslint-plugin-node \

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anthonylzq/simba.js",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "description": "set up a modern backend app by running one command",
   "main": "lib/index.js",
   "scripts": {
@@ -8,25 +8,31 @@
     "service:q": "node ./bin -q",
     "help": "node ./bin -h",
     "lint": "eslint --ext js lib/ --fix",
+    "db:create": "node ./scripts/db/sql/create.mjs && node ./scripts/db/mongo/create.mjs",
+    "db:create:mongo": "node ./scripts/db/mongo/create.mjs",
+    "db:create:sql": "node ./scripts/db/sql/create.mjs",
+    "db:restore": "node ./scripts/db/sql/restore.mjs && node ./scripts/db/mongo/restore.mjs",
+    "db:restore:mongo": "node ./scripts/db/mongo/restore.mjs",
+    "db:restore:sql": "node ./scripts/db/sql/restore.mjs",
     "example": "node -r dotenv/config ./bin -N local-example -D 'This is a test using fastify' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H --tests --ghat -F",
     "build": "npm run build:express:all && npm run build:fastify:all",
-    "build:mongo": "npm run rm:mongo && npm run build:express && npm run build:fastify && npm run build:express:graphql && npm run build:fastify:graphql",
-    "build:sql": "npm run rm:sql && npm run build:express && npm run build:fastify && npm run build:express:graphql && npm run build:fastify:graphql",
-    "build:express:all": "npm run build:express && npm run build:express:mongo && npm run build:express:graphql && npm run build:express:mongo:graphql",
-    "build:fastify:all": "npm run build:fastify && npm run build:fastify:mongo && npm run build:fastify:graphql && npm run build:fastify:mongo:graphql",
-    "build:express": "npm run rm:express && npm run cd:mv:example && node -r dotenv/config ./bin -N example/express -D 'This is a test using Express with Prisma and PostgreSQL' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H --tests --ghat -d postgres && npm run rm:git:express:mongo",
-    "build:express:mongo": "npm run rm:express:mongo && npm run cd:mv:example && node -r dotenv/config ./bin -N example/express-mongo -D 'This is a test using Express with Prisma and MongoDB' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H --tests --ghat && npm run rm:git:express",
-    "build:fastify": "npm run rm:fastify && npm run cd:mv:example && node -r dotenv/config ./bin -N example/fastify -D 'This is a test using Fastify with Prisma and PostgreSQL' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H--tests --ghat -d postgres -F && npm run rm:git:fastify",
-    "build:fastify:mongo": "npm run rm:fastify:mongo && npm run cd:mv:example && node -r dotenv/config ./bin -N example/fastify-mongo -D 'This is a test using Fastify with Prisma and MongoDB' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H --tests --ghat -F && npm run rm:git:fastify:mongo",
-    "build:express:graphql": "npm run rm:express:graphql && npm run cd:mv:example && node -r dotenv/config ./bin -N example/express-graphql -D 'This is a test using Express with GraphQL with Prisma and PostgreSQL' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H -g --tests --ghat -d postgres && npm run rm:git:express:graphql",
-    "build:express:mongo:graphql": "npm run rm:express:mongo:graphql && npm run cd:mv:example && node -r dotenv/config ./bin -N example/express-mongo-graphql -D 'This is a test using Express with GraphQL with Prisma and MongoDB' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H -g --tests --ghat && npm run rm:git:express:mongo:graphql",
-    "build:fastify:graphql": "npm run rm:fastify:graphql && npm run cd:mv:example && node -r dotenv/config ./bin -N example/fastify-graphql -D 'This is a test using Fastify with GraphQL with Prisma and PostgreSQL' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H -g --tests --ghat -d postgres -F && npm run rm:git:fastify:graphql",
-    "build:fastify:mongo:graphql": "npm run rm:fastify:mongo:graphql && npm run cd:mv:example && node -r dotenv/config ./bin -N example/fastify-mongo-graphql -D 'This is a test using Fastify with GraphQL with Prisma and MongoDB' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H -g --tests --ghat -F && npm run rm:git:fastify:mongo:graphql",
+    "build:mongo": "npm run rm:mongo && npm run db:create:mongo && npm run build:express:mongo && npm run build:fastify:mongo && npm run build:express:mongo:graphql && npm run build:fastify:mongo:graphql",
+    "build:sql": "npm run rm:sql && npm run db:create:sql && npm run build:express && npm run build:fastify && npm run build:express:graphql && npm run build:fastify:graphql",
+    "build:express:all": "npm run db:create && npm run build:express && npm run build:express:mongo && npm run build:express:graphql && npm run build:express:mongo:graphql",
+    "build:fastify:all": "npm run db:create && npm run build:fastify && npm run build:fastify:mongo && npm run build:fastify:graphql && npm run build:fastify:mongo:graphql",
+    "build:express": "npm run db:create:sql && npm run rm:express && npm run cd:mv:example && node -r dotenv/config ./bin -N example/express -D 'This is a test using Express with Prisma and PostgreSQL' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H --tests --ghat -d postgres && npm run rm:git:express:mongo",
+    "build:express:mongo": "npm run db:create:mongo && npm run rm:express:mongo && npm run cd:mv:example && node -r dotenv/config ./bin -N example/express-mongo -D 'This is a test using Express with Prisma and MongoDB' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H --tests --ghat && npm run rm:git:express",
+    "build:fastify": "npm run db:create:sql && npm run rm:fastify && npm run cd:mv:example && node -r dotenv/config ./bin -N example/fastify -D 'This is a test using Fastify with Prisma and PostgreSQL' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H--tests --ghat -d postgres -F && npm run rm:git:fastify",
+    "build:fastify:mongo": "npm run db:create:mongo && npm run rm:fastify:mongo && npm run cd:mv:example && node -r dotenv/config ./bin -N example/fastify-mongo -D 'This is a test using Fastify with Prisma and MongoDB' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H --tests --ghat -F && npm run rm:git:fastify:mongo",
+    "build:express:graphql": "npm run db:create:sql && npm run rm:express:graphql && npm run cd:mv:example && node -r dotenv/config ./bin -N example/express-graphql -D 'This is a test using Express with GraphQL with Prisma and PostgreSQL' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H -g --tests --ghat -d postgres && npm run rm:git:express:graphql",
+    "build:express:mongo:graphql": "npm run db:create:mongo && npm run rm:express:mongo:graphql && npm run cd:mv:example && node -r dotenv/config ./bin -N example/express-mongo-graphql -D 'This is a test using Express with GraphQL with Prisma and MongoDB' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H -g --tests --ghat && npm run rm:git:express:mongo:graphql",
+    "build:fastify:graphql": "npm run db:create:sql && npm run rm:fastify:graphql && npm run cd:mv:example && node -r dotenv/config ./bin -N example/fastify-graphql -D 'This is a test using Fastify with GraphQL with Prisma and PostgreSQL' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H -g --tests --ghat -d postgres -F && npm run rm:git:fastify:graphql",
+    "build:fastify:mongo:graphql": "npm run db:create:mongo && npm run rm:fastify:mongo:graphql && npm run cd:mv:example && node -r dotenv/config ./bin -N example/fastify-mongo-graphql -D 'This is a test using Fastify with GraphQL with Prisma and MongoDB' -a AnthonyLzq -e sluzquinosa@uni.pe -l mit -H -g --tests --ghat -F && npm run rm:git:fastify:mongo:graphql",
     "build:and:test:only": "npm run build && npm run test:only",
     "test": "npm run test:without:restore && git restore .",
-    "test:local": "npm run test:without:restore && git restore .",
-    "test:integration": "jest --testPathPattern=test/integration",
-    "test:without:restore": "npm run build && npm run test:express:local && npm run test:express:mongo:local && npm run test:express:graphql:local && npm run test:express:mongo:graphql:local && npm run test:fastify:local && npm run test:fastify:mongo:local && npm run test:fastify:graphql:local && npm run test:fastify:mongo:graphql:local",
+    "test:local": "npm run test:without:restore",
+    "test:integration": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config jest.integration.config.js --testPathPattern=test/integration",
+    "test:without:restore": "npm run db:create && npm run build && npm run test:express:local && npm run test:express:mongo:local && npm run test:express:graphql:local && npm run test:express:mongo:graphql:local && npm run test:fastify:local && npm run test:fastify:mongo:local && npm run test:fastify:graphql:local && npm run test:fastify:mongo:graphql:local",
     "test:mongo:ci": "npm run build:mongo && npm run test:express:mongo:ci && npm run test:fastify:mongo:ci && npm run test:express:mongo:graphql:ci && npm run test:fastify:mongo:graphql:ci",
     "test:sql:ci": "npm run build:sql && npm run test:express:ci && npm run test:fastify:ci && npm run test:express:graphql:ci && npm run test:fastify:graphql:ci",
     "test:only": "npm run test:express:only && npm run test:fastify:only",
@@ -78,7 +84,6 @@
     "rm:git:fastify:mongo:graphql": "if [ -d \"example/fastify-mongo-graphql/.git\" ]; then rm -rf example/fastify-mongo-graphql/.git; fi",
     "rm:project:structures": "if [ -d \"projectStructureExamples\" ]; then rm -rf projectStructureExamples/*; fi",
     "cd:mv:example": "if [ ! -d \"example\" ]; then mkdir example && cd example; fi",
-    "restore:db": "node ./scripts/restoreRelationalDb.js && node ./scripts/restoreMongoDb.js",
     "release": "standard-version",
     "version": "npm run release && npm run list:directory:tree:examples && git add ."
   },
@@ -100,28 +105,28 @@
   "author": "AnthonyLzq",
   "license": "MIT",
   "dependencies": {
-    "cli-progress": "^3.12.0",
-    "colors": "^1.4.0",
-    "prompts": "^2.4.2",
-    "underscore": "^1.13.6",
-    "yargs": "^17.7.2"
+    "cli-progress": "3.12.0",
+    "colors": "1.4.0",
+    "prompts": "2.4.2",
+    "underscore": "1.13.7",
+    "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.3",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.46.0",
-    "eslint-config-prettier": "^8.10.0",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.28.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "jest": "^29.6.2",
-    "knex": "^2.5.1",
-    "mongodb": "^5.7.0",
-    "pg": "^8.11.2",
-    "prettier": "^3.0.1",
-    "standard-version": "^9.5.0"
+    "@types/jest": "29.5.12",
+    "dotenv": "16.4.5",
+    "eslint": "^8",
+    "eslint-config-prettier": "^8",
+    "eslint-config-standard": "17.1.0",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-prettier": "5.2.1",
+    "eslint-plugin-promise": "^6",
+    "jest": "29.7.0",
+    "knex": "3.1.0",
+    "mongodb": "6.8.0",
+    "pg": "8.12.0",
+    "prettier": "3.3.3",
+    "standard-version": "9.5.0"
   },
   "repository": {
     "type": "git",