express-generator-typescript 2.7.12 → 2.7.15

package/lib/project-files/README.md

@@ -23,19 +23,15 @@ app.use(helmet());
 
 Remove the existing `node_modules/` folder, `package-lock.json`, and reinstall all library modules.
 
-### `npm run dev` or `npm run dev:hot` (hot reloading)
+### `npm run dev` or `npm run dev:watch` (hot reloading)
 
 Run the server in development mode.<br/>
 
 **IMPORTANT** development mode uses `swc` for performance reasons which DOES NOT check for typescript errors. Run `npm run type-check` to check for type errors. NOTE: you should use your IDE to prevent most type errors.
 
-### `npm test` or `npm run test:hot` (hot reloading)
+### `npm test`
 
-Run all unit-tests.
-
-### `npm test -- "name of test file" (i.e. users).`
-
-Run a single unit-test.
+Run unit-tests with <a href="https://vitest.dev/guide/">vitest</a>.
 
 ### `npm run lint`
 

package/lib/project-files/gitignore

@@ -1,6 +1,4 @@
 **/node_modules
 dist/
-temp/
 **/**/*.log
-config.js
 tsconfig.tsbuildinfo

package/lib/project-files/package.json

@@ -2,19 +2,22 @@
   "name": "express-typescript-example",
   "version": "0.0.0",
   "scripts": {
-    "build": "ts-node ./scripts/build.ts",
+    "build": "npm run lint && tsc --project tsconfig.prod.json",
     "clean-install": "rm -rf ./node_modules && rm -r package-lock.json && npm i",
-    "dev": "NODE_ENV=development ts-node ./src/main",
-    "dev:hot": "nodemon --exec \"npm run dev\" --watch ./src --ext .ts",
+    "dev": "DOTENV_CONFIG_PATH=./config/.env.development ts-node ./src/main",
+    "dev:watch": "nodemon --exec \"npm run dev\" --watch ./src --ext .ts",
     "lint": "eslint .",
     "format": "prettier --write .",
-    "start": "NODE_ENV=production node -r ./config.js ./dist/main",
+    "start": "DOTENV_CONFIG_PATH=./config/.env.production node -r dotenv/config -r module-alias/register ./dist/main.js",
     "test": "NODE_ENV=test vitest",
     "type-check": "tsc -b --noEmit"
   },
   "engines": {
     "node": ">=16.0.0"
   },
+  "_moduleAliases": {
+    "@src": "dist"
+  },
   "dependencies": {
     "cookie-parser": "^1.4.7",
     "dayjs": "^1.11.19",
@@ -24,7 +27,7 @@
     "jet-env": "^1.1.6",
     "jet-logger": "^2.2.3",
     "jet-paths": "^2.0.1",
-    "jet-validators": "2.2.5",
+    "jet-validators": "^2.2.5",
     "jsonfile": "^6.2.0",
     "module-alias": "^2.2.3",
     "morgan": "^1.10.1"
@@ -39,7 +42,7 @@
     "@types/jsonfile": "^6.1.4",
     "@types/module-alias": "^2.0.4",
     "@types/morgan": "^1.9.10",
-    "@types/node": "^25.0.5",
+    "@types/node": "^25.0.9",
     "@types/supertest": "^6.0.3",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
@@ -53,7 +56,7 @@
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.52.0",
-    "vitest": "^4.0.16"
+    "typescript-eslint": "^8.53.0",
+    "vitest": "^4.0.17"
   }
 }

package/lib/project-files/src/main.ts

@@ -7,7 +7,7 @@ import server from './server';
                                 Constants
 ******************************************************************************/
 
-const SERVER_START_MSG =
+const SERVER_START_MESSAGE =
   'Express server started on port: ' + EnvVars.Port.toString();
 
 /******************************************************************************
@@ -19,6 +19,6 @@ server.listen(EnvVars.Port, (err) => {
   if (!!err) {
     logger.err(err.message);
   } else {
-    logger.info(SERVER_START_MSG);
+    logger.info(SERVER_START_MESSAGE);
   }
 });

package/lib/project-files/src/models/{User.ts → UserModel.ts}

@@ -3,44 +3,47 @@ import { parseObject, Schema, testObject } from 'jet-validators/utils';
 
 import { transformIsDate } from '@src/common/utils/validators';
 
-import { IModel } from './common/IModel';
+import { Entity } from './common/types';
 
 /******************************************************************************
                                  Constants
 ******************************************************************************/
 
-const GetDefaults = (): IUser => ({
+const GetDefaults = (): User => ({
   id: 0,
   name: '',
   email: '',
   created: new Date(),
 });
 
+const schema: Schema<User> = {
+  id: isUnsignedInteger,
+  name: isString,
+  email: isString,
+  created: transformIsDate,
+};
+
 /******************************************************************************
                                   Types
 ******************************************************************************/
 
-export interface IUser extends IModel {
+/**
+ * @entity users
+ */
+export type User = Entity & {
   name: string;
   email: string;
-}
+};
 
 /******************************************************************************
                                   Setup
 ******************************************************************************/
 
-const schema: Schema<IUser> = {
-  id: isUnsignedInteger,
-  name: isString,
-  email: isString,
-  created: transformIsDate,
-};
-
 // Set the "parseUser" function
-const parseUser = parseObject<IUser>(schema);
+const parseUser = parseObject<User>(schema);
 
 // For the APIs make sure the right fields are complete
-const testIsCompleteUser = testObject<IUser>({
+const isCompleteUser = testObject<User>({
   ...schema,
   name: isNonEmptyString,
   email: isNonEmptyString,
@@ -53,7 +56,7 @@ const testIsCompleteUser = testObject<IUser>({
 /**
  * New user object.
  */
-function __new__(user?: Partial<IUser>): IUser {
+function newUser(user?: Partial<User>): User {
   return parseUser({ ...GetDefaults(), ...user }, (errors) => {
     throw new Error('Setup new user failed ' + JSON.stringify(errors, null, 2));
   });
@@ -64,6 +67,6 @@ function __new__(user?: Partial<IUser>): IUser {
 ******************************************************************************/
 
 export default {
-  new: __new__,
-  isComplete: testIsCompleteUser,
+  new: newUser,
+  isComplete: isCompleteUser,
 } as const;

package/lib/project-files/src/models/common/types.ts

@@ -0,0 +1,4 @@
+export type Entity = {
+  id: number; // @PK
+  created: Date | string; // @audit
+};

package/lib/project-files/src/repos/MockOrm.ts

@@ -1,25 +1,26 @@
 import jsonfile from 'jsonfile';
 
 import EnvVars, { NodeEnvs } from '@src/common/constants/env';
-import { IUser } from '@src/models/User';
+import { User } from '@src/models/UserModel';
 
 /******************************************************************************
                                 Constants
 ******************************************************************************/
 
-const DATABASE_FILE_PATH = __dirname + '/common' + (
-  EnvVars.NodeEnv === NodeEnvs.TEST 
-  ? '/database.test.json' 
-  : '/database.json'
-);
+const DATABASE_FILE_PATH =
+  __dirname +
+  '/common' +
+  (EnvVars.NodeEnv === NodeEnvs.TEST
+    ? '/database.test.json'
+    : '/database.json');
 
 /******************************************************************************
                                 Types
 ******************************************************************************/
 
-interface IDatabase {
-  users: IUser[];
-}
+type Database = {
+  users: User[];
+};
 
 /******************************************************************************
                                 Functions
@@ -28,14 +29,14 @@ interface IDatabase {
 /**
  * Fetch the json from the file.
  */
-function openDb(): Promise<IDatabase> {
-  return jsonfile.readFile(DATABASE_FILE_PATH) as Promise<IDatabase>;
+function openDb(): Promise<Database> {
+  return jsonfile.readFile(DATABASE_FILE_PATH) as Promise<Database>;
 }
 
 /**
  * Update the file.
  */
-function saveDb(db: IDatabase): Promise<void> {
+function saveDb(db: Database): Promise<void> {
   return jsonfile.writeFile(DATABASE_FILE_PATH, db);
 }
 
@@ -43,7 +44,7 @@ function saveDb(db: IDatabase): Promise<void> {
  * Empty the database
  */
 function cleanDb(): Promise<void> {
-  return jsonfile.writeFile( DATABASE_FILE_PATH, {});
+  return jsonfile.writeFile(DATABASE_FILE_PATH, {});
 }
 
 /******************************************************************************

package/lib/project-files/src/repos/UserRepo.ts

@@ -1,5 +1,5 @@
 import { getRandomInt } from '@src/common/utils/number-utils';
-import { IUser } from '@src/models/User';
+import { User } from '@src/models/UserModel';
 
 import orm from './MockOrm';
 
@@ -10,7 +10,7 @@ import orm from './MockOrm';
 /**
  * Get one user.
  */
-async function getOne(email: string): Promise<IUser | null> {
+async function getOne(email: string): Promise<User | null> {
   const db = await orm.openDb();
   for (const user of db.users) {
     if (user.email === email) {
@@ -36,7 +36,7 @@ async function persists(id: number): Promise<boolean> {
 /**
  * Get all users.
  */
-async function getAll(): Promise<IUser[]> {
+async function getAll(): Promise<User[]> {
   const db = await orm.openDb();
   return db.users;
 }
@@ -44,7 +44,7 @@ async function getAll(): Promise<IUser[]> {
 /**
  * Add one user.
  */
-async function add(user: IUser): Promise<void> {
+async function add(user: User): Promise<void> {
   const db = await orm.openDb();
   user.id = getRandomInt();
   db.users.push(user);
@@ -54,7 +54,7 @@ async function add(user: IUser): Promise<void> {
 /**
  * Update a user.
  */
-async function update(user: IUser): Promise<void> {
+async function update(user: User): Promise<void> {
   const db = await orm.openDb();
   for (let i = 0; i < db.users.length; i++) {
     if (db.users[i].id === user.id) {
@@ -85,10 +85,9 @@ async function __delete__(id: number): Promise<void> {
 // **** Unit-Tests Only **** //
 
 /**
- * Delete every user record.
+ * @testOnly
  *
- * @internal
- * Test-only helper. Do not use in production code.
+ * Delete every user record.
  */
 async function deleteAllUsers(): Promise<void> {
   const db = await orm.openDb();
@@ -97,15 +96,14 @@ async function deleteAllUsers(): Promise<void> {
 }
 
 /**
+ * @testOnly
+ *
  * Insert multiple users. Can't do multiple at once cause using a plain file
  * for now.
- *
- * @internal
- * Test-only helper. Do not use in production code.
  */
 async function insertMultiple(
-  users: IUser[] | readonly IUser[],
-): Promise<IUser[]> {
+  users: User[] | readonly User[],
+): Promise<User[]> {
   const db = await orm.openDb(),
     usersF = [...users];
   for (const user of usersF) {

package/lib/project-files/src/repos/common/database.json

@@ -1 +1,22 @@
-{"users":[{"id":366115170645,"name":"Sean Maxwell","email":"smaxwell@example.com","created":"2024-03-22T05:14:36.252Z"},{"id":310946254456,"name":"John Smith","email":"john.smith@example.com","created":"2024-03-22T05:20:55.079Z"},{"id":143027113460,"name":"Gordan Freeman","email":"nova@prospect.com","created":"2024-03-22T05:42:18.895Z"}]}
+{
+  "users": [
+    {
+      "id": 366115170645,
+      "name": "Sean Maxwell",
+      "email": "smaxwell@example.com",
+      "created": "2024-03-22T05:14:36.252Z"
+    },
+    {
+      "id": 310946254456,
+      "name": "John Smith",
+      "email": "john.smith@example.com",
+      "created": "2024-03-22T05:20:55.079Z"
+    },
+    {
+      "id": 143027113460,
+      "name": "Gordan Freeman",
+      "email": "nova@prospect.com",
+      "created": "2024-03-22T05:42:18.895Z"
+    }
+  ]
+}

package/lib/project-files/src/repos/common/database.test.json

@@ -1,22 +1 @@
-{
-  "users": [
-    {
-      "id": 547317739445,
-      "name": "Bill",
-      "email": "sean.maxwell@gmail.com",
-      "created": "2026-01-10T04:06:20.291Z"
-    },
-    {
-      "id": 332906029656,
-      "name": "John Smith",
-      "email": "john.smith@gmail.com",
-      "created": "2026-01-10T04:06:20.291Z"
-    },
-    {
-      "id": 421195709596,
-      "name": "Gordan Freeman",
-      "email": "gordan.freeman@gmail.com",
-      "created": "2026-01-10T04:06:20.291Z"
-    }
-  ]
-}
+{"users":[{"id":146631637670,"name":"Bill","email":"sean.maxwell@gmail.com","created":"2026-01-26T00:52:08.804Z"},{"id":498481378998,"name":"John Smith","email":"john.smith@gmail.com","created":"2026-01-26T00:52:08.804Z"},{"id":878476468362,"name":"Gordan Freeman","email":"gordan.freeman@gmail.com","created":"2026-01-26T00:52:08.804Z"}]}

package/lib/project-files/src/routes/UserRoutes.ts

@@ -2,7 +2,7 @@ import { isNumber } from 'jet-validators';
 import { transform } from 'jet-validators/utils';
 
 import HttpStatusCodes from '@src/common/constants/HttpStatusCodes';
-import User from '@src/models/User';
+import UserModel from '@src/models/UserModel';
 import UserService from '@src/services/UserService';
 
 import { IReq, IRes } from './common/express-types';
@@ -12,9 +12,9 @@ import parseReq from './common/parseReq';
                                 Constants
 ******************************************************************************/
 
-const Validators = {
-  add: parseReq({ user: User.isComplete }),
-  update: parseReq({ user: User.isComplete }),
+const reqValidators = {
+  add: parseReq({ user: UserModel.isComplete }),
+  update: parseReq({ user: UserModel.isComplete }),
   delete: parseReq({ id: transform(Number, isNumber) }),
 } as const;
 
@@ -38,7 +38,7 @@ async function getAll(_: IReq, res: IRes) {
  * @route POST /api/users/add
  */
 async function add(req: IReq, res: IRes) {
-  const { user } = Validators.add(req.body);
+  const { user } = reqValidators.add(req.body);
   await UserService.addOne(user);
   res.status(HttpStatusCodes.CREATED).end();
 }
@@ -49,7 +49,7 @@ async function add(req: IReq, res: IRes) {
  * @route PUT /api/users/update
  */
 async function update(req: IReq, res: IRes) {
-  const { user } = Validators.update(req.body);
+  const { user } = reqValidators.update(req.body);
   await UserService.updateOne(user);
   res.status(HttpStatusCodes.OK).end();
 }
@@ -60,7 +60,7 @@ async function update(req: IReq, res: IRes) {
  * @route DELETE /api/users/delete/:id
  */
 async function __delete__(req: IReq, res: IRes) {
-  const { id } = Validators.delete(req.params);
+  const { id } = reqValidators.delete(req.params);
   await UserService.delete(id);
   res.status(HttpStatusCodes.OK).end();
 }

package/lib/project-files/src/routes/apiRouter.ts

@@ -10,7 +10,7 @@ import UserRoutes from './UserRoutes';
 
 const apiRouter = Router();
 
-// ----------------------- Add UserRouter ---------------------------------- //
+// ----------------------- Add UserRouter --------------------------------- //
 
 const userRouter = Router();
 
@@ -22,7 +22,7 @@ userRouter.delete(Paths.Users.Delete, UserRoutes.delete);
 apiRouter.use(Paths.Users._, userRouter);
 
 /******************************************************************************
-                                Export default
+                                Export
 ******************************************************************************/
 
 export default apiRouter;

package/lib/project-files/src/services/UserService.ts

@@ -1,6 +1,6 @@
 import HttpStatusCodes from '@src/common/constants/HttpStatusCodes';
 import { RouteError } from '@src/common/utils/route-errors';
-import { IUser } from '@src/models/User';
+import { User } from '@src/models/UserModel';
 import UserRepo from '@src/repos/UserRepo';
 
 /******************************************************************************
@@ -18,21 +18,21 @@ const Errors = {
 /**
  * Get all users.
  */
-function getAll(): Promise<IUser[]> {
+function getAll(): Promise<User[]> {
   return UserRepo.getAll();
 }
 
 /**
  * Add one user.
  */
-function addOne(user: IUser): Promise<void> {
+function addOne(user: User): Promise<void> {
   return UserRepo.add(user);
 }
 
 /**
  * Update one user.
  */
-async function updateOne(user: IUser): Promise<void> {
+async function updateOne(user: User): Promise<void> {
   const persists = await UserRepo.persists(user.id);
   if (!persists) {
     throw new RouteError(HttpStatusCodes.NOT_FOUND, Errors.USER_NOT_FOUND);
@@ -43,7 +43,7 @@ async function updateOne(user: IUser): Promise<void> {
 /**
  * Delete a user by their id.
  */
-async function __delete__(id: number): Promise<void> {
+async function deleteOne(id: number): Promise<void> {
   const persists = await UserRepo.persists(id);
   if (!persists) {
     throw new RouteError(HttpStatusCodes.NOT_FOUND, Errors.USER_NOT_FOUND);
@@ -60,5 +60,5 @@ export default {
   getAll,
   addOne,
   updateOne,
-  delete: __delete__,
+  delete: deleteOne,
 } as const;

package/lib/project-files/tests/common/comparators.ts

@@ -1,10 +1,10 @@
-import { IUser } from '@src/models/User';
+import { User } from '@src/models/UserModel';
 
 /******************************************************************************
                                 Types
 ******************************************************************************/
 
-type TUserArray = IUser[] | readonly IUser[];
+type UserArray = User[] | readonly User[];
 
 /******************************************************************************
                                 Functions
@@ -14,7 +14,7 @@ type TUserArray = IUser[] | readonly IUser[];
  * Compare to user arrays. Order does not matter and this assumes the email
  * field is unique
  */
-export function compareUserArrays(a: TUserArray, b: TUserArray): boolean {
+export function compareUserArrays(a: UserArray, b: UserArray): boolean {
   if (a.length !== b.length) return false;
   const aSorted = sortByEmail(a),
     bSorted = sortByEmail(b);
@@ -31,7 +31,7 @@ export function compareUserArrays(a: TUserArray, b: TUserArray): boolean {
 /**
  * Sort user array by email.
  */
-function sortByEmail(arr: TUserArray): IUser[] {
+function sortByEmail(arr: UserArray): User[] {
   return [...arr].sort((x, y) => {
     return x.email.localeCompare(y.email);
   });

package/lib/project-files/tests/common/error-utils.ts

@@ -5,7 +5,7 @@ import { ParseError, parseJson } from 'jet-validators/utils';
                                 Types
 ******************************************************************************/
 
-interface IValidationError {
+type ValidationError = {
   message: string;
   errors: ParseError[];
 }
@@ -17,9 +17,9 @@ interface IValidationError {
 /**
  * JSON parse a validation error.
  */
-export function parseValidationError(arg: unknown): IValidationError {
+export function parseValidationError(arg: unknown): ValidationError {
   if (!isString(arg)) {
     throw new Error('Not a string');
   }
-  return parseJson<IValidationError>(arg);
+  return parseJson<ValidationError>(arg);
 }

package/lib/project-files/tests/common/supertest-types.ts

@@ -6,10 +6,10 @@ import { Response } from 'supertest';
 
 // Use generics to add properties to 'body'
 export interface IRes<T = object> extends Omit<Response, 'body'> {
-  body: T & { error?: string | IErrorObject };
+  body: T & { error?: string | ErrorObject };
 }
 
-interface IErrorObject {
+interface ErrorObject {
   message: string;
   [key: string]: unknown;
 }

package/lib/project-files/tests/users.test.ts

@@ -1,7 +1,7 @@
 import HttpStatusCodes from '@src/common/constants/HttpStatusCodes';
 import { JetPaths as Paths } from '@src/common/constants/Paths';
 import { ValidationError } from '@src/common/utils/route-errors';
-import User, { IUser } from '@src/models/User';
+import UserModel, { User } from '@src/models/UserModel';
 import UserRepo from '@src/repos/UserRepo';
 
 import { agent } from './support/agent';
@@ -15,9 +15,9 @@ import { compareUserArrays } from './common/comparators';
 ******************************************************************************/
 
 const DUMMY_USERS = [
-  User.new({ name: 'Sean Maxwell', email: 'sean.maxwell@gmail.com' }),
-  User.new({ name: 'John Smith', email: 'john.smith@gmail.com' }),
-  User.new({ name: 'Gordan Freeman', email: 'gordan.freeman@gmail.com' }),
+  UserModel.new({ name: 'Sean Maxwell', email: 'sean.maxwell@gmail.com' }),
+  UserModel.new({ name: 'John Smith', email: 'john.smith@gmail.com' }),
+  UserModel.new({ name: 'Gordan Freeman', email: 'gordan.freeman@gmail.com' }),
 ] as const;
 
 const { BAD_REQUEST, CREATED, OK, NOT_FOUND } = HttpStatusCodes;
@@ -30,7 +30,7 @@ const { BAD_REQUEST, CREATED, OK, NOT_FOUND } = HttpStatusCodes;
 ******************************************************************************/
 
 describe('UserRouter', () => {
-  let dbUsers: IUser[] = [];
+  let dbUsers: User[] = [];
 
   beforeEach(async () => {
     await UserRepo.deleteAllUsers();
@@ -42,7 +42,7 @@ describe('UserRouter', () => {
       'should return a JSON object with all the users and a status code of ' +
         `"${OK}" if the request was successful.`,
       async () => {
-        const res: IRes<{ users: IUser[] }> = await agent.get(Paths.Users.Get);
+        const res: IRes<{ users: User[] }> = await agent.get(Paths.Users.Get);
         expect(res.status).toBe(OK);
         expect(compareUserArrays(res.body.users, DUMMY_USERS)).toBeTruthy();
       },
@@ -54,7 +54,7 @@ describe('UserRouter', () => {
       `should return a status code of "${CREATED}" if the request was ` +
         'successful.',
       async () => {
-        const user = User.new({ name: 'a', email: 'a@a.com' }),
+        const user = UserModel.new({ name: 'a', email: 'a@a.com' }),
           res = await agent.post(Paths.Users.Add).send({ user });
         expect(res.status).toBe(CREATED);
       },
@@ -87,7 +87,7 @@ describe('UserRouter', () => {
       'should return a JSON object with an error message and a status code ' +
         `of "${BAD_REQUEST}" if id is the wrong data type`,
       async () => {
-        const user = User.new();
+        const user = UserModel.new();
         user.id = '5' as unknown as number;
         const res: IRes = await agent.put(Paths.Users.Update).send({ user });
         expect(res.status).toBe(BAD_REQUEST);
@@ -102,7 +102,7 @@ describe('UserRouter', () => {
         `"${UserService.Errors.USER_NOT_FOUND}" and a status code of ` +
         `"${NOT_FOUND}" if the id was not found.`,
       async () => {
-        const user = User.new({ id: 4, name: 'a', email: 'a@a.com' }),
+        const user = UserModel.new({ id: 4, name: 'a', email: 'a@a.com' }),
           res: IRes = await agent.put(Paths.Users.Update).send({ user });
         expect(res.status).toBe(NOT_FOUND);
         expect(res.body.error).toBe(UserService.Errors.USER_NOT_FOUND);

package/lib/project-files/tsconfig.json

@@ -16,12 +16,11 @@
   },
   "ts-node": {
     "swc": true,
-    "require": ["tsconfig-paths/register", "./config.ts"]
+    "require": ["tsconfig-paths/register", "dotenv/config"],
   },
   "include": [
     "src/**/*.ts",
     "tests/**/*.ts",
-    "config.ts",
     "scripts",
     "eslint.config.ts",
     "vitest.config.mts"

package/lib/project-files/tsconfig.prod.json

@@ -5,7 +5,7 @@
     "lib": ["ES2020"],
     "strict": true,
     "baseUrl": "./",
-    "outDir": "temp",
+    "outDir": "dist",
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
@@ -16,7 +16,7 @@
     "sourceMap": false,
     "removeComments": true
   },
-  "include": ["src/**/*.ts", "config.ts"],
+  "include": ["src/**/*.ts"],
   "exclude": [
     "tests",
     "src/public/",

package/lib/project-files/vitest.config.mts

@@ -5,8 +5,11 @@ const config = defineConfig({
   test: {
     globals: true,
     environment: 'node',
-    setupFiles: ['config.ts', './tests/support/agent.ts'],
+    setupFiles: ['dotenv/config', './tests/support/agent.ts'],
     isolate: true,
+    env: {
+      DOTENV_CONFIG_PATH: 'config/.env.test',
+    },
   },
   resolve: {
     alias: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-generator-typescript",
-  "version": "2.7.12",
+  "version": "2.7.15",
   "description": "Generate new Express applications similar to express-generate which but sets it up to use TypeScript instead",
   "scripts": {
     "express-generator-typescript": "node bin/cli.js",

package/lib/project-files/config.ts

@@ -1,20 +0,0 @@
-import dotenv from 'dotenv';
-import moduleAlias from 'module-alias';
-import path from 'path';
-
-// Check the env
-// eslint-disable-next-line no-process-env
-const NODE_ENV = process.env.NODE_ENV ?? 'development';
-
-// Configure "dotenv"
-const result2 = dotenv.config({
-  path: path.join(__dirname, `./config/.env.${NODE_ENV}`),
-});
-if (result2.error) {
-  throw result2.error;
-}
-
-// Configure moduleAlias
-if (__filename.endsWith('js')) {
-  moduleAlias.addAlias('@src', __dirname + '/dist');
-}

package/lib/project-files/scripts/build.ts

@@ -1,23 +0,0 @@
-import logger from 'jet-logger';
-
-import { copy, copyFilesRec, exec, remove } from './common/utils';
-
-/******************************************************************************
-                                  Run
-******************************************************************************/
-
-(async () => {
-  // Remove current build
-    await remove('./dist/');
-    await exec('npm run lint', '../');
-    await exec('tsc --project tsconfig.prod.json', '../');
-    // Copy
-    await copyFilesRec('./src', './dist', ['.ts']);
-    await copy('./temp/config.js', './config.js');
-    await copy('./temp/src', './dist');
-    await remove('./temp/');
-})().catch((err) => {
-    logger.err(err);
-    process.exit(1);
-})
-

package/lib/project-files/scripts/common/utils.ts

@@ -1,93 +0,0 @@
-import childProcess from 'child_process';
-import fs from 'fs-extra';
-import logger from 'jet-logger';
-import path from 'path';
-
-/******************************************************************************
-                                Functions
-*******************************************************************************
-
-/**
- * Copy file.
- */
-export function copy(src: string, dest: string): Promise<void> {
-  return new Promise((res, rej) => {
-    return fs.copy(src, dest, (err) => {
-      return !!err ? rej(err) : res();
-    });
-  });
-}
-
-/**
- * Remove file
- */
-export function remove(loc: string): Promise<void> {
-  return new Promise((res, rej) => {
-    return fs.remove(loc, (err) => {
-      return !!err ? rej(err) : res();
-    });
-  });
-}
-
-/**
- * Run command-line command.
- */
-export function exec(cmd: string, loc = './'): Promise<string> {
-  // Setup directory
-  const callingDir = path.dirname(require.main?.filename ?? './'),
-    cwd = path.join(callingDir, loc);
-  // Wrap in promise
-  return new Promise((res, rej) =>
-    childProcess.exec(cmd, { cwd }, (err, stdout, stderr) => {
-      if (!!stdout) {
-        logger.info(stdout);
-      }
-      if (!!stderr) {
-        logger.err(stderr);
-      }
-      if (!!err) {
-        return rej(err);
-      } else if (!!stderr) {
-        return rej(new Error(stderr));
-      } else {
-        return res(stdout);
-      }
-    }),
-  );
-}
-
-/**
- * Recursively search for a folder for all files and copy them to the new
- * destination keeping their paths relative to the "src" param.
- *
- * Example:
- *  If file "./src/foo/bar.txt" exists then:
- *  copyFilesRec('./src', './dest') => ["./dest/foo/bar.txt"]
- *
- * @param excludeExt Exlude a list of file extensions.
- */
-export async function copyFilesRec(
-  src: string,
-  dest: string,
-  excludeExt?: string[],
-): Promise<void> {
-  const copyReqs: Promise<void>[] = [];
-  try {
-    const entries = await fs.readdir(src, { withFileTypes: true });
-    for (const entry of entries) {
-      const currPath = src + '/' + entry.name,
-        currDest = dest + '/' + entry.name,
-        ext = path.extname(entry.name);
-      if (entry.isFile() && !excludeExt?.includes(ext)) {
-        const req = fs.copy(currPath, currDest);
-        copyReqs.push(req);
-      } else if (entry.isDirectory()) {
-        const req = copyFilesRec(currPath, currDest, excludeExt);
-        copyReqs.push(req);
-      }
-    }
-  } catch (error) {
-    logger.err(`Error searching in ${src}: ` + String(error));
-  }
-  await Promise.all(copyReqs);
-}

package/lib/project-files/src/models/common/IModel.ts

@@ -1,4 +0,0 @@
-export interface IModel {
-  id: number;
-  created: Date;
-}