express-generator-typescript 2.7.12 → 2.7.14

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/models/User.ts

@@ -16,10 +16,20 @@ const GetDefaults = (): IUser => ({
   created: new Date(),
 });
 
+const schema: Schema<IUser> = {
+  id: isUnsignedInteger,
+  name: isString,
+  email: isString,
+  created: transformIsDate,
+};
+
 /******************************************************************************
                                   Types
 ******************************************************************************/
 
+/**
+ * @entity users
+ */
 export interface IUser extends IModel {
   name: string;
   email: string;
@@ -29,12 +39,6 @@ export interface IUser extends IModel {
                                   Setup
 ******************************************************************************/
 
-const schema: Schema<IUser> = {
-  id: isUnsignedInteger,
-  name: isString,
-  email: isString,
-  created: transformIsDate,
-};
 
 // Set the "parseUser" function
 const parseUser = parseObject<IUser>(schema);

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

@@ -1,4 +1,4 @@
 export interface IModel {
-  id: number;
-  created: Date;
+  id: number; // @PK
+  created: Date | string; // @audit
 }

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

@@ -85,10 +85,9 @@ async function __delete__(id: number): Promise<void> {
 // **** Unit-Tests Only **** //
 
 /**
+ * @testOnly
+ * 
  * Delete every user record.
- *
- * @internal
- * Test-only helper. Do not use in production code.
  */
 async function deleteAllUsers(): Promise<void> {
   const db = await orm.openDb();
@@ -97,11 +96,10 @@ 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[],

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":743599328040,"name":"Bill","email":"sean.maxwell@gmail.com","created":"2026-01-22T02:53:04.104Z"},{"id":366376663219,"name":"John Smith","email":"john.smith@gmail.com","created":"2026-01-22T02:53:04.104Z"},{"id":223776680823,"name":"Gordan Freeman","email":"gordan.freeman@gmail.com","created":"2026-01-22T02:53:04.104Z"}]}

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

@@ -4,7 +4,7 @@ import { IUser } from '@src/models/User';
                                 Types
 ******************************************************************************/
 
-type TUserArray = IUser[] | readonly IUser[];
+type UserArray = IUser[] | readonly IUser[];
 
 /******************************************************************************
                                 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): IUser[] {
   return [...arr].sort((x, y) => {
     return x.email.localeCompare(y.email);
   });

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.14",
   "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);
-}