typescript-express-starter 8.0.2 → 8.1.7

package/lib/sequelize/src/config/index.ts

@@ -0,0 +1,5 @@
+import { config } from 'dotenv';
+config({ path: `.env.${process.env.NODE_ENV || 'development'}.local` });
+
+export const CREDENTIALS = process.env.CREDENTIALS === 'true';
+export const { NODE_ENV, PORT, DB_HOST, DB_PORT, DB_USER, DB_PASSWORD, DB_DATABASE, SECRET_KEY, LOG_FORMAT, LOG_DIR, ORIGIN } = process.env;

package/lib/sequelize/src/databases/index.ts

@@ -1,13 +1,12 @@
-import config from 'config';
 import Sequelize from 'sequelize';
-import { dbConfig } from '@interfaces/db.interface';
+import { NODE_ENV, DB_HOST, DB_PORT, DB_USER, DB_PASSWORD, DB_DATABASE } from '@config';
 import UserModel from '@models/users.model';
 import { logger } from '@utils/logger';
 
-const { host, user, password, database, pool }: dbConfig = config.get('dbConfig');
-const sequelize = new Sequelize.Sequelize(database, user, password, {
-  host: host,
+const sequelize = new Sequelize.Sequelize(DB_DATABASE, DB_USER, DB_PASSWORD, {
   dialect: 'mysql',
+  host: DB_HOST,
+  port: DB_PORT,
   timezone: '+09:00',
   define: {
     charset: 'utf8mb4',
@@ -16,10 +15,10 @@ const sequelize = new Sequelize.Sequelize(database, user, password, {
     freezeTableName: true,
   },
   pool: {
-    min: pool.min,
-    max: pool.max,
+    min: 0,
+    max: 5,
   },
-  logQueryParameters: process.env.NODE_ENV === 'development',
+  logQueryParameters: NODE_ENV === 'development',
   logging: (query, time) => {
     logger.info(time + 'ms' + ' ' + query);
   },

package/lib/sequelize/src/middlewares/auth.middleware.ts

@@ -1,6 +1,6 @@
-import config from 'config';
 import { NextFunction, Response } from 'express';
 import { verify } from 'jsonwebtoken';
+import { SECRET_KEY } from '@config';
 import DB from '@databases';
 import { HttpException } from '@exceptions/HttpException';
 import { DataStoredInToken, RequestWithUser } from '@interfaces/auth.interface';
@@ -10,7 +10,7 @@ const authMiddleware = async (req: RequestWithUser, res: Response, next: NextFun
     const Authorization = req.cookies['Authorization'] || (req.header('Authorization') ? req.header('Authorization').split('Bearer ')[1] : null);
 
     if (Authorization) {
-      const secretKey: string = config.get('secretKey');
+      const secretKey: string = SECRET_KEY;
       const verificationResponse = verify(Authorization, secretKey) as DataStoredInToken;
       const userId = verificationResponse.id;
       const findUser = await DB.Users.findByPk(userId);

package/lib/sequelize/src/server.ts

@@ -1,5 +1,3 @@
-import 'dotenv/config';
-import '@/index';
 import App from '@/app';
 import AuthRoute from '@routes/auth.route';
 import IndexRoute from '@routes/index.route';

package/lib/sequelize/src/services/auth.service.ts

@@ -1,6 +1,6 @@
 import { compare, hash } from 'bcrypt';
-import config from 'config';
 import { sign } from 'jsonwebtoken';
+import { SECRET_KEY } from '@config';
 import DB from '@databases';
 import { CreateUserDto } from '@dtos/users.dto';
 import { HttpException } from '@exceptions/HttpException';
@@ -49,7 +49,7 @@ class AuthService {
 
   public createToken(user: User): TokenData {
     const dataStoredInToken: DataStoredInToken = { id: user.id };
-    const secretKey: string = config.get('secretKey');
+    const secretKey: string = SECRET_KEY;
     const expiresIn: number = 60 * 60;
 
     return { expiresIn, token: sign(dataStoredInToken, secretKey, { expiresIn }) };

package/lib/sequelize/src/utils/logger.ts

@@ -1,11 +1,11 @@
-import config from 'config';
 import { existsSync, mkdirSync } from 'fs';
 import { join } from 'path';
 import winston from 'winston';
 import winstonDaily from 'winston-daily-rotate-file';
+import { LOG_DIR } from '@config';
 
 // logs dir
-const logDir: string = join(__dirname, config.get('log.dir'));
+const logDir: string = join(__dirname, LOG_DIR);
 
 if (!existsSync(logDir)) {
   mkdirSync(logDir);

package/lib/sequelize/tsconfig.json

@@ -22,6 +22,7 @@
     "baseUrl": "src",
     "paths": {
       "@/*": ["*"],
+      "@config": ["config"],
       "@controllers/*": ["controllers/*"],
       "@databases": ["databases"],
       "@dtos/*": ["dtos/*"],

package/lib/starter.js

@@ -29,7 +29,8 @@ const createProject = async (projectName) => {
 
   try {
     const template = await chooseTemplates();
-    const { isUpdated, isDeduped } = await setupModuleManagement();
+    const isUpdated = await dependenciesUpdates();
+    const isDeduped = await dependenciesDeduped();
 
     console.log("[ 1 / 3 ] 🔍  copying project...");
     console.log("[ 2 / 3 ] 🚚  fetching node_modules...");
@@ -91,29 +92,50 @@ const chooseTemplates = async () => {
 };
 
 /**
- * @method setupModuleManagement
- * @description Set up npm management features.
+ * @method dependenciesUpdates
+ * @description npm dependencies updated.
  */
-const setupModuleManagement = async () => {
+const dependenciesUpdates = async () => {
   const { isUpdated } = await inquirer.prompt([
     {
       type: "confirm",
       name: "isUpdated",
       message:
-        "This command will update all the packages listed to the latest version.",
+        "Do you want to update all packages in the node_modules directory and dependency ?"
     },
   ]);
 
+  if (isUpdated) {
+    const { isUpdatedReconfirm } = await inquirer.prompt([
+      {
+        type: "confirm",
+        name: "isUpdatedReconfirm",
+        message:
+          "However, updating to the latest version may cause package dependency issues. Do you still want to update ?"
+      },
+    ]);
+
+    return isUpdatedReconfirm;
+  }
+
+  return false;
+};
+
+/**
+ * @method dependenciesDeduped
+ * @description npm duplicate dependencies removed.
+ */
+const dependenciesDeduped = async () => {
   const { isDeduped } = await inquirer.prompt([
     {
       type: "confirm",
       name: "isDeduped",
-      message: "It is used to clean up duplicate packages in npm.",
+      message: "Used to removed duplicate packages at npm. Do you want to ?",
     },
   ]);
 
-  return { isUpdated, isDeduped };
-};
+  return isDeduped;
+}
 
 /**
  * @method copyProjectFiles

package/lib/typegoose/Makefile

@@ -1,6 +1,29 @@
+# app name should be overridden.
+# ex) production-stage: make build APP_NAME=<APP_NAME>
+# ex) development-stage: make build-dev APP_NAME=<APP_NAME>
+
+APP_NAME = typescript-express
+APP_NAME := $(APP_NAME)
+
+.PHONY: build
+# Build the container image - Dvelopment
+build-dev:
+	docker build -t ${APP_NAME}\
+		--target development-build-stage\
+		-f Dockerfile .
+
+# Build the container image - Production
 build:
-	docker build -t ${tag} .
+	docker build -t ${APP_NAME}\
+		--target production-build-stage\
+		-f Dockerfile .
+
+# Clean the container image
 clean:
-	docker rmi -f ${tag}
+	docker rmi -f ${APP_NAME}
+
+# Run the container image
 run:
-	docker run -d -p ${port}:${port} --name ${name} ${tag}
+	docker run -d -it -p 3000:3000 ${APP_NAME}
+
+all: build

package/lib/typegoose/package.json

@@ -7,8 +7,8 @@
   "scripts": {
     "start": "npm run build && cross-env NODE_ENV=production node dist/server.js",
     "dev": "cross-env NODE_ENV=development nodemon",
-    "build": "tsc && tsc-alias",
-    "build:swc": "swc src -d dist --source-maps --copy-files",
+    "build": "swc src -d dist --source-maps --copy-files",
+    "build:tsc": "tsc && tsc-alias",
     "test": "jest --forceExit --detectOpenHandles",
     "lint": "eslint --ignore-path .gitignore --ext .ts src/",
     "lint:fix": "npm run lint -- --fix",
@@ -29,7 +29,7 @@
     "helmet": "^4.6.0",
     "hpp": "^0.2.3",
     "jsonwebtoken": "^8.5.1",
-    "mongoose": "~6.1.3",
+    "mongoose": "~6.2.3",
     "morgan": "^1.10.0",
     "swagger-jsdoc": "^6.0.0",
     "swagger-ui-express": "^4.1.6",

package/lib/typeorm/.env.development.local

@@ -0,0 +1,20 @@
+# PORT
+PORT = 3000
+
+# DATABASE
+DB_HOST = localhost
+DB_PORT = 5432
+DB_USER = root
+DB_PASSWORD = password
+DB_DATABASE = test
+
+# TOKEN
+SECRET_KEY = secretKey
+
+# LOG
+LOG_FORMAT = dev
+LOG_DIR = ../logs
+
+# CORS
+ORIGIN = *
+CREDENTIALS = true

package/lib/typeorm/.env.production.local

@@ -0,0 +1,20 @@
+# PORT
+PORT = 3000
+
+# DATABASE
+DB_HOST = localhost
+DB_PORT = 5432
+DB_USER = root
+DB_PASSWORD = password
+DB_DATABASE = test
+
+# TOKEN
+SECRET_KEY = secretKey
+
+# LOG
+LOG_FORMAT = combined
+LOG_DIR = ../logs
+
+# CORS
+ORIGIN = your.domain.com
+CREDENTIALS = true

package/lib/typeorm/.env.test.local

@@ -0,0 +1,20 @@
+# PORT
+PORT = 3000
+
+# DATABASE
+DB_HOST = localhost
+DB_PORT = 5432
+DB_USER = root
+DB_PASSWORD = password
+DB_DATABASE = test
+
+# TOKEN
+SECRET_KEY = secretKey
+
+# LOG
+LOG_FORMAT = dev
+LOG_DIR = ../logs
+
+# CORS
+ORIGIN = *
+CREDENTIALS = true

package/lib/typeorm/.swcrc

@@ -21,6 +21,7 @@
     "baseUrl": "src",
     "paths": {
       "@/*": ["*"],
+      "@config": ["config"],
       "@controllers/*": ["controllers/*"],
       "@databases": ["databases"],
       "@dtos/*": ["dtos/*"],

package/lib/typeorm/Makefile

@@ -1,6 +1,29 @@
+# app name should be overridden.
+# ex) production-stage: make build APP_NAME=<APP_NAME>
+# ex) development-stage: make build-dev APP_NAME=<APP_NAME>
+
+APP_NAME = typescript-express
+APP_NAME := $(APP_NAME)
+
+.PHONY: build
+# Build the container image - Dvelopment
+build-dev:
+	docker build -t ${APP_NAME}\
+		--target development-build-stage\
+		-f Dockerfile .
+
+# Build the container image - Production
 build:
-	docker build -t ${tag} .
+	docker build -t ${APP_NAME}\
+		--target production-build-stage\
+		-f Dockerfile .
+
+# Clean the container image
 clean:
-	docker rmi -f ${tag}
+	docker rmi -f ${APP_NAME}
+
+# Run the container image
 run:
-	docker run -d -p ${port}:${port} --name ${name} ${tag}
+	docker run -d -it -p 3000:3000 ${APP_NAME}
+
+all: build

package/lib/typeorm/package.json

@@ -7,8 +7,8 @@
   "scripts": {
     "start": "npm run build && cross-env NODE_ENV=production node dist/server.js",
     "dev": "cross-env NODE_ENV=development nodemon",
-    "build": "tsc && tsc-alias",
-    "build:swc": "swc src -d dist --source-maps --copy-files",
+    "build": "swc src -d dist --source-maps --copy-files",
+    "build:tsc": "tsc && tsc-alias",
     "test": "jest --forceExit --detectOpenHandles",
     "lint": "eslint --ignore-path .gitignore --ext .ts src/",
     "lint:fix": "npm run lint -- --fix",
@@ -20,7 +20,6 @@
     "class-transformer": "^0.4.0",
     "class-validator": "^0.13.1",
     "compression": "^1.7.4",
-    "config": "^3.3.6",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
     "dotenv": "^10.0.0",
@@ -43,7 +42,6 @@
     "@swc/core": "^1.2.108",
     "@types/bcrypt": "^5.0.0",
     "@types/compression": "^1.7.1",
-    "@types/config": "^0.0.39",
     "@types/cookie-parser": "^1.4.2",
     "@types/cors": "^2.8.11",
     "@types/dotenv": "^8.2.0",

package/lib/typeorm/src/app.ts

@@ -1,8 +1,6 @@
 import 'reflect-metadata';
-import '@/index';
 import cookieParser from 'cookie-parser';
 import cors from 'cors';
-import config from 'config';
 import express from 'express';
 import helmet from 'helmet';
 import hpp from 'hpp';
@@ -11,6 +9,7 @@ import compression from 'compression';
 import swaggerUi from 'swagger-ui-express';
 import swaggerJSDoc from 'swagger-jsdoc';
 import { createConnection } from 'typeorm';
+import { NODE_ENV, PORT, LOG_FORMAT, ORIGIN, CREDENTIALS } from '@config';
 import { dbConnection } from '@databases';
 import { Routes } from '@interfaces/routes.interface';
 import errorMiddleware from '@middlewares/error.middleware';
@@ -18,13 +17,13 @@ import { logger, stream } from '@utils/logger';
 
 class App {
   public app: express.Application;
-  public port: string | number;
   public env: string;
+  public port: string | number;
 
   constructor(routes: Routes[]) {
     this.app = express();
-    this.port = process.env.PORT || 3000;
-    this.env = process.env.NODE_ENV || 'development';
+    this.env = NODE_ENV || 'development';
+    this.port = PORT || 3000;
 
     this.env !== 'test' && this.connectToDatabase();
     this.initializeMiddlewares();
@@ -51,8 +50,8 @@ class App {
   }
 
   private initializeMiddlewares() {
-    this.app.use(morgan(config.get('log.format'), { stream }));
-    this.app.use(cors({ origin: config.get('cors.origin'), credentials: config.get('cors.credentials') }));
+    this.app.use(morgan(LOG_FORMAT, { stream }));
+    this.app.use(cors({ origin: ORIGIN, credentials: CREDENTIALS }));
     this.app.use(hpp());
     this.app.use(helmet());
     this.app.use(compression());

package/lib/typeorm/src/config/index.ts

@@ -0,0 +1,5 @@
+import { config } from 'dotenv';
+config({ path: `.env.${process.env.NODE_ENV || 'development'}.local` });
+
+export const CREDENTIALS = process.env.CREDENTIALS === 'true';
+export const { NODE_ENV, PORT, DB_HOST, DB_PORT, DB_USER, DB_PASSWORD, DB_DATABASE, SECRET_KEY, LOG_FORMAT, LOG_DIR, ORIGIN } = process.env;

package/lib/typeorm/src/databases/index.ts

@@ -1,16 +1,14 @@
-import config from 'config';
 import { join } from 'path';
 import { ConnectionOptions } from 'typeorm';
-import { dbConfig } from '@interfaces/db.interface';
+import { DB_HOST, DB_PORT, DB_USER, DB_PASSWORD, DB_DATABASE } from '@config';
 
-const { host, user, password, database }: dbConfig = config.get('dbConfig');
 export const dbConnection: ConnectionOptions = {
   type: 'postgres',
-  host: host,
-  port: 5432,
-  username: user,
-  password: password,
-  database: database,
+  host: DB_HOST,
+  port: DB_PORT,
+  username: DB_USER,
+  password: DB_PASSWORD,
+  database: DB_DATABASE,
   synchronize: true,
   logging: false,
   entities: [join(__dirname, '../**/*.entity{.ts,.js}')],

package/lib/typeorm/src/middlewares/auth.middleware.ts

@@ -1,6 +1,6 @@
-import config from 'config';
 import { NextFunction, Response } from 'express';
 import { verify } from 'jsonwebtoken';
+import { SECRET_KEY } from '@config';
 import { UserEntity } from '@entities/users.entity';
 import { HttpException } from '@exceptions/HttpException';
 import { DataStoredInToken, RequestWithUser } from '@interfaces/auth.interface';
@@ -10,7 +10,7 @@ const authMiddleware = async (req: RequestWithUser, res: Response, next: NextFun
     const Authorization = req.cookies['Authorization'] || (req.header('Authorization') ? req.header('Authorization').split('Bearer ')[1] : null);
 
     if (Authorization) {
-      const secretKey: string = config.get('secretKey');
+      const secretKey: string = SECRET_KEY;
       const { id } = (await verify(Authorization, secretKey)) as DataStoredInToken;
       const findUser = await UserEntity.findOne(id, { select: ['id', 'email', 'password'] });
 

package/lib/typeorm/src/server.ts

@@ -1,5 +1,3 @@
-import 'dotenv/config';
-import '@/index';
 import App from '@/app';
 import AuthRoute from '@routes/auth.route';
 import IndexRoute from '@routes/index.route';

package/lib/typeorm/src/services/auth.service.ts

@@ -1,7 +1,7 @@
 import { compare, hash } from 'bcrypt';
-import config from 'config';
 import { sign } from 'jsonwebtoken';
 import { EntityRepository, Repository } from 'typeorm';
+import { SECRET_KEY } from '@config';
 import { CreateUserDto } from '@dtos/users.dto';
 import { UserEntity } from '@entities/users.entity';
 import { HttpException } from '@exceptions/HttpException';
@@ -48,7 +48,7 @@ class AuthService extends Repository<UserEntity> {
 
   public createToken(user: User): TokenData {
     const dataStoredInToken: DataStoredInToken = { id: user.id };
-    const secretKey: string = config.get('secretKey');
+    const secretKey: string = SECRET_KEY;
     const expiresIn: number = 60 * 60;
 
     return { expiresIn, token: sign(dataStoredInToken, secretKey, { expiresIn }) };

package/lib/typeorm/src/utils/logger.ts

@@ -1,11 +1,11 @@
-import config from 'config';
 import { existsSync, mkdirSync } from 'fs';
 import { join } from 'path';
 import winston from 'winston';
 import winstonDaily from 'winston-daily-rotate-file';
+import { LOG_DIR } from '@config';
 
 // logs dir
-const logDir: string = join(__dirname, config.get('log.dir'));
+const logDir: string = join(__dirname, LOG_DIR);
 
 if (!existsSync(logDir)) {
   mkdirSync(logDir);

package/lib/typeorm/tsconfig.json

@@ -22,6 +22,7 @@
     "baseUrl": "src",
     "paths": {
       "@/*": ["*"],
+      "@config": ["config"],
       "@controllers/*": ["controllers/*"],
       "@databases": ["databases"],
       "@dtos/*": ["dtos/*"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-express-starter",
-  "version": "8.0.2",
+  "version": "8.1.7",
   "description": "Quick and Easy TypeScript Express Starter",
   "author": "AGUMON <ljlm0402@gmail.com>",
   "license": "MIT",

package/lib/default/.env

@@ -1 +0,0 @@
-PORT=3000

package/lib/default/src/configs/development.json

@@ -1,12 +0,0 @@
-{
-    "env": "development",
-    "secretKey": "secretKey",
-    "log": {
-        "format": "dev",
-        "dir": "../logs"
-    },
-    "cors": {
-        "origin": true,
-        "credentials": true
-    }
-}

package/lib/default/src/configs/production.json

@@ -1,12 +0,0 @@
-{
-    "env": "production",
-    "secretKey": "secretKey",
-    "log": {
-        "format": "combined",
-        "dir": "../logs"
-    },
-    "cors": {
-        "origin": "your.domain.com",
-        "credentials": true
-    }
-}

package/lib/default/src/configs/test.json

@@ -1,12 +0,0 @@
-{
-    "env": "test",
-    "secretKey": "secretKey",
-    "log": {
-        "format": "dev",
-        "dir": "../logs"
-    },
-    "cors": {
-        "origin": true,
-        "credentials": true
-    }
-}

package/lib/default/src/index.ts

@@ -1 +0,0 @@
-process.env['NODE_CONFIG_DIR'] = __dirname + '/configs';

package/lib/graphql/.env

@@ -1 +0,0 @@
-PORT=3000

package/lib/graphql/src/configs/development.json

@@ -1,19 +0,0 @@
-{
-    "env": "development",
-    "dbConfig": {
-        "host": "localhost",
-        "user": "root",
-        "port": 5432,
-        "password": "password",
-        "database": "test"
-    },
-    "secretKey": "secretKey",
-    "log": {
-        "format": "dev",
-        "dir": "../logs"
-    },
-    "cors": {
-        "origin": true,
-        "credentials": true
-    }
-}

package/lib/graphql/src/configs/production.json

@@ -1,19 +0,0 @@
-{
-    "env": "production",
-    "dbConfig": {
-        "host": "localhost",
-        "user": "root",
-        "port": 5432,
-        "password": "password",
-        "database": "test"
-    },
-    "secretKey": "secretKey",
-    "log": {
-        "format": "combined",
-        "dir": "../logs"
-    },
-    "cors": {
-        "origin": "your.domain.com",
-        "credentials": true
-    }
-}

package/lib/graphql/src/configs/test.json

@@ -1,19 +0,0 @@
-{
-    "env": "test",
-    "dbConfig": {
-        "host": "localhost",
-        "user": "root",
-        "port": 5432,
-        "password": "password",
-        "database": "test"
-    },
-    "secretKey": "secretKey",
-    "log": {
-        "format": "dev",
-        "dir": "../logs"
-    },
-    "cors": {
-        "origin": true,
-        "credentials": true
-    }
-}

package/lib/graphql/src/index.ts

@@ -1 +0,0 @@
-process.env['NODE_CONFIG_DIR'] = __dirname + '/configs';

package/lib/graphql/src/interfaces/db.interface.ts

@@ -1,7 +0,0 @@
-export interface dbConfig {
-  host: string;
-  user: string;
-  port: number;
-  password: string;
-  database: string;
-}

package/lib/knex/.env

@@ -1 +0,0 @@
-PORT=3000