express-generator-typescript 2.4.19 → 2.4.23

package/bin/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * Create new express-generator-typescript project.

package/lib/express-generator-typescript.js

@@ -1,9 +1,3 @@
-/**
- * Create new express-generator-typescript project.
- *
- * created by Sean Maxwell, 5/31/2019
- */
-
 const path = require('path'),
   editJsonFile = require('edit-json-file'),
   childProcess = require('child_process'),
@@ -14,20 +8,19 @@ const path = require('path'),
 // **** Variables **** //
 
 // Project folder paths
-const PROJECT_FOLDER_PATH = './project-files';
+const PROJECT_FOLDER_PATH = './project-files',
   PROJECT_FOLDER_PATH_AUTH = './project-files-auth';
 
 // Project-folder dependencies
 const DEPENDENCIES = 'express dotenv morgan cookie-parser jet-logger ' +
   'module-alias express-async-errors helmet jsonfile inserturlparams ' + 
-  'jet-paths moment',
+  'jet-paths moment ',
   DEPENDENCIES_AUTH = ' bcrypt jsonwebtoken',
   DEV_DEPENDENCIES = 'ts-node typescript nodemon find jasmine supertest ' +
     '@types/node @types/express @types/jasmine @types/find @types/morgan  ' +
     '@types/cookie-parser @types/supertest fs-extra tsconfig-paths ' +
-    '@types/jsonfile @typescript-eslint/eslint-plugin eslint ' +
-    '@typescript-eslint/parser @types/fs-extra eslint-plugin-node ' + 
-    'ts-command-line-args',
+    '@types/jsonfile @types/fs-extra ' +
+    'eslint @eslint/js @types/eslint__js typescript-eslint eslint-plugin-n @stylistic/eslint-plugin-ts',
   DEV_DEPENDENCIES_AUTH = ' @types/bcrypt @types/jsonwebtoken';
 
 // "ncp" options
@@ -60,12 +53,11 @@ async function expressGenTs(destination, useYarn, withAuth) {
 function copyProjectFiles(destination, withAuth) {
   const folder = (withAuth ? PROJECT_FOLDER_PATH_AUTH : PROJECT_FOLDER_PATH),
     source = path.join(__dirname, folder);
-  return new Promise((res, rej) => {
-    ncp.limit = 16;
+  return /** @type {Promise<void>} */(new Promise((res, rej) => {
     return ncp(source, destination, ncpOpts, (err) => {
       return (!!err ? rej(err) : res());
     });
-  });
+  }));
 }
 
 /**
@@ -84,13 +76,13 @@ function updatePackageJson(destination) {
  * Because npm does not allow .gitignore to be published.
  */
 function renameGitigoreFile(destination) {
-  return new Promise((res, rej) => 
+  return /** @type {Promise<void>} */(new Promise((res, rej) => 
     fs.rename(
       (destination + '/gitignore'),
       (destination + '/.gitignore'),
       (err => !!err ? rej(err) : res()),
     )
-  );
+  ));
 }
 
 /**

package/lib/project-files/README.md

@@ -13,7 +13,7 @@ Run the server in development mode.
 
 Run all unit-tests.
 
-### `npm test -- --testFile="name of test file" (i.e. --testFile=Users).`
+### `npm test -- "name of test file" (i.e. users).`
 
 Run a single unit-test.
 

package/lib/project-files/eslint.config.js

@@ -0,0 +1,55 @@
+/* eslint-disable */
+// @ts-nocheck
+
+const eslint = require('@eslint/js');
+const tseslint = require('typescript-eslint');
+const stylisticTs = require('@stylistic/eslint-plugin-ts');
+const nodePlugin = require('eslint-plugin-n');
+
+
+module.exports = tseslint.config(
+  eslint.configs.recommended,
+  nodePlugin.configs['flat/recommended-script'],
+  ...tseslint.configs.strictTypeChecked,
+  ...tseslint.configs.stylisticTypeChecked,
+  {
+    languageOptions: {
+      parserOptions: {
+        project: './tsconfig.json',
+        warnOnUnsupportedTypeScriptVersion: false,
+      },
+    },
+  },
+  {
+    plugins: {
+      '@stylistic/ts': stylisticTs,
+    }
+  },
+  {
+    files: ['**/*.ts'],
+    ignores: ['**/*.js'],
+    rules: {
+      '@typescript-eslint/explicit-member-accessibility': 'warn',
+      '@typescript-eslint/no-misused-promises': 0,
+      '@typescript-eslint/no-floating-promises': 0,
+      '@typescript-eslint/no-confusing-void-expression': 0,
+      '@typescript-eslint/no-unnecessary-condition': 0,
+      '@typescript-eslint/restrict-template-expressions': [ 'error', { allowNumber: true }],
+      'max-len': [
+        'warn',
+        {
+          'code': 80
+        }
+      ],
+      '@stylistic/ts/semi': ['warn'],
+      'comma-dangle': ['warn', 'always-multiline'],
+      'no-console': 1,
+      'no-extra-boolean-cast': 0,
+      'indent': ['warn', 2],
+      'quotes': ['warn', 'single'],
+      'n/no-process-env': 1,
+      'n/no-missing-import': 0,
+      'n/no-unpublished-import': 0
+    },
+  }
+)

package/lib/project-files/package.json

@@ -2,20 +2,19 @@
   "name": "express-typescript-example",
   "version": "0.0.0",
   "scripts": {
-    "build": "ts-node ./scripts/build.ts",
-    "dev": "NODE_ENV=development ts-node ./src",
+    "build": "npx ts-node ./scripts/build.ts",
+    "dev": "NODE_ENV=development npx ts-node ./src",
     "dev:hot": "nodemon --exec \"npm run dev\" --watch ./src -e ts",
-    "lint": "npx eslint --ext .ts src/",
-    "lint:tests": "npx eslint --ext .ts spec/",
+    "lint": "npx eslint ./src/**/*.ts",
+    "lint:tests": "npx eslint ./spec/**/*.ts",
     "start": "NODE_ENV=production node -r ./preload.js ./dist",
-    "test": "NODE_ENV=test ts-node ./spec",
+    "test": "NODE_ENV=test npx ts-node ./spec",
     "test:hot": "nodemon --exec \"npm run test\" --watch ./src --watch ./spec -e ts"
   },
   "engines": {
-    "node": ">=8.10.0"
+    "node": ">=16.0.0"
   },
   "dependencies": {
-    "bcrypt": "^5.0.1",
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.0.2",
     "express": "^4.18.1",
@@ -25,35 +24,33 @@
     "jet-logger": "^1.3.1",
     "jet-paths": "^1.0.5",
     "jsonfile": "^6.1.0",
-    "jsonwebtoken": "^8.5.1",
     "module-alias": "^2.2.2",
     "moment": "^2.30.1",
     "morgan": "^1.10.0"
   },
   "devDependencies": {
-    "@types/bcrypt": "^5.0.0",
+    "@eslint/js": "^9.11.1",
+    "@stylistic/eslint-plugin-ts": "^2.8.0",
     "@types/cookie-parser": "^1.4.3",
+    "@types/eslint__js": "^8.42.3",
     "@types/express": "^4.17.13",
     "@types/find": "^0.2.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jasmine": "^4.3.0",
     "@types/jsonfile": "^6.1.0",
-    "@types/jsonwebtoken": "^8.5.9",
     "@types/morgan": "^1.9.3",
     "@types/node": "^18.7.14",
     "@types/supertest": "^6.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.36.1",
-    "@typescript-eslint/parser": "^5.36.1",
-    "eslint": "^8.23.0",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint": "^9.11.1",
+    "eslint-plugin-n": "^17.10.3",
     "find": "^0.3.0",
     "fs-extra": "^10.1.0",
     "jasmine": "^4.3.0",
     "nodemon": "^2.0.19",
     "supertest": "^6.3.4",
-    "ts-command-line-args": "^2.4.2",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.1.0",
-    "typescript": "^4.8.2"
+    "typescript": "^5.6.2",
+    "typescript-eslint": "^8.8.0"
   }
 }

package/lib/project-files/preload.js

@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 const dotenv = require('dotenv');
 const path = require('path');
 const moduleAlias = require('module-alias');
@@ -18,3 +20,4 @@ if (result2.error) {
 if (NODE_ENV === 'production') {
   moduleAlias.addAlias('@src', __dirname + '/dist');
 }
+

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

@@ -1,7 +1,3 @@
-/**
- * Remove old files, copy front-end ones.
- */
-
 import fs from 'fs-extra';
 import logger from 'jet-logger';
 import childProcess from 'child_process';
@@ -14,13 +10,14 @@ import childProcess from 'child_process';
   try {
     // Remove current build
     await remove('./dist/');
-    await exec('npx eslint --ext .ts src/', './');
+    await exec('npm run lint', './');
     await exec('tsc --build tsconfig.prod.json', './');
     // Copy
     await copy('./src/public', './dist/public');
     await copy('./src/views', './dist/views');
   } catch (err) {
     logger.err(err);
+    // eslint-disable-next-line n/no-process-exit
     process.exit(1);
   }
 })();
@@ -30,7 +27,7 @@ import childProcess from 'child_process';
  */
 function remove(loc: string): Promise<void> {
   return new Promise((res, rej) => {
-    return fs.remove(loc, (err) => {
+    return fs.remove(loc, err => {
       return (!!err ? rej(err) : res());
     });
   });
@@ -41,7 +38,7 @@ function remove(loc: string): Promise<void> {
  */
 function copy(src: string, dest: string): Promise<void> {
   return new Promise((res, rej) => {
-    return fs.copy(src, dest, (err) => {
+    return fs.copy(src, dest, err => {
       return (!!err ? rej(err) : res());
     });
   });

package/lib/project-files/spec/index.ts

@@ -1,19 +1,9 @@
 import find from 'find';
 import Jasmine from 'jasmine';
-import { parse } from 'ts-command-line-args';
 import logger from 'jet-logger';
+import { argv } from 'process';
 
 
-// Setup command line options. 
-const args = parse<{
-  testFile: string;
-}>({
-  testFile: {
-    type: String,
-    defaultValue: '',
-  },
-});
-
 // Init Jasmine
 const jasmine = new Jasmine();
 jasmine.exitOnCompletion = false;
@@ -30,8 +20,8 @@ jasmine.loadConfig({
 
 // Run all or a single unit-test
 let execResp: Promise<jasmine.JasmineDoneInfo> | undefined;
-if (args.testFile) {
-  const testFile = args.testFile;
+if (!!argv[2]) {
+  const testFile = argv[2];
   find.file(testFile + '.spec.ts', './spec', (files: string[]) => {
     if (files.length === 1) {
       jasmine.execute([files[0]]);

package/lib/project-files/spec/types/misc.ts

@@ -1,18 +1,12 @@
 import { Response } from 'supertest';
-
 import { IUser } from '@src/models/User';
 
 
 // Misc
 export type TReqBody = Record<string, unknown>;
-export type TRes = Omit<Response, 'body'> & { body: TBody };
+export type TRes = Omit<Response, 'body'> & { body: {
+  error?: string;
+  user?: IUser
+  users?: IUser[]
+}};
 export type TApiCb = (res: TRes) => void;
-
-
-// Response Body: Add things to the body here over time to prevent 
-// typescript errors.
-type TBody = {
-  [key: string]: unknown;
-  user?: IUser;
-  users?: IUser[];
-}

package/lib/project-files/src/common/EnvVars.ts

@@ -1,8 +1,4 @@
-/**
- * Environments variables declared here.
- */
-
-/* eslint-disable node/no-process-env */
+/* eslint-disable n/no-process-env */
 
 
 export default {

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

@@ -1 +1 @@
-{"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"},{"id":81065793658,"name":"d","email":"a","created":"2024-10-04T00:29:08.847Z"}]}

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

@@ -13,7 +13,7 @@ import check from './common/check';
  */
 async function getAll(_: IReq, res: IRes) {
   const users = await UserService.getAll();
-  return res.status(HttpStatusCodes.OK).json({ users });
+  res.status(HttpStatusCodes.OK).json({ users });
 }
 
 /**
@@ -22,7 +22,7 @@ async function getAll(_: IReq, res: IRes) {
 async function add(req: IReq, res: IRes) {
   const user = check.isValid(req.body, 'user', User.isUser);
   await UserService.addOne(user);
-  return res.status(HttpStatusCodes.CREATED).end();
+  res.status(HttpStatusCodes.CREATED).end();
 }
 
 /**
@@ -31,7 +31,7 @@ async function add(req: IReq, res: IRes) {
 async function update(req: IReq, res: IRes) {
   const user = check.isValid(req.body, 'user', User.isUser);
   await UserService.updateOne(user);
-  return res.status(HttpStatusCodes.OK).end();
+  res.status(HttpStatusCodes.OK).end();
 }
 
 /**
@@ -40,7 +40,7 @@ async function update(req: IReq, res: IRes) {
 async function delete_(req: IReq, res: IRes) {
   const id = check.isNum(req.params, 'id');
   await UserService.delete(id);
-  return res.status(HttpStatusCodes.OK).end();
+  res.status(HttpStatusCodes.OK).end();
 }
 
 

package/lib/project-files/src/routes/common/check.ts

@@ -8,10 +8,10 @@ type TReqObj = Record<string, unknown>;
  * Check that param/s is a string
  */
 function isStr(reqObj: TReqObj, params: string): string;
-function isStr(reqObj: TReqObj, params: ReadonlyArray<string>): string[];
+function isStr(reqObj: TReqObj, params: readonly string[]): string[];
 function isStr(
   reqObj: TReqObj,
-  params: string | ReadonlyArray<string>,
+  params: string | readonly string[],
 ): string | string[] {
   return _checkWrapper(reqObj, params, _checkStr);
 }
@@ -31,10 +31,10 @@ function _checkStr(val: unknown): string | undefined {
  * Check that param/s is a number.
  */
 function isNum(reqObj: TReqObj, params: string): number;
-function isNum(reqObj: TReqObj, params: ReadonlyArray<string>): number[];
+function isNum(reqObj: TReqObj, params: readonly string[]): number[];
 function isNum(
   reqObj: TReqObj,
-  params: string | ReadonlyArray<string>,
+  params: string | readonly string[],
 ): number | number[] {
   return _checkWrapper(reqObj, params, _checkNum);
 }
@@ -55,10 +55,10 @@ function _checkNum(val: unknown): number | undefined {
  * Check that param/s is a number
  */
 function isBool(reqObj: TReqObj, params: string): boolean;
-function isBool(reqObj: TReqObj, params: ReadonlyArray<string>): boolean[];
+function isBool(reqObj: TReqObj, params: readonly string[]): boolean[];
 function isBool(
   reqObj: TReqObj,
-  params: string | ReadonlyArray<string>,
+  params: string | readonly string[],
 ): boolean | boolean[] {
   return _checkWrapper(reqObj, params, _checkBool);
 }
@@ -107,7 +107,7 @@ function isValid<T>(
  */
 function _checkWrapper<T>(
   reqObj: TReqObj,
-  params: string | ReadonlyArray<string>,
+  params: string | readonly string[],
   checkFn: (val: unknown) => T | undefined,
 ): T | T[] {
   // If is array

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

@@ -1,16 +1,8 @@
-/* eslint-disable max-len */
-/**
- * Shared types for routes.
- */
-
 import { Response, Request } from 'express';
 
 
 // **** Express **** //
 
 type TObj = Record<string, unknown>;
-
 export type IReq = Request<TObj, void, TObj, TObj>;
-
 export type IRes = Response<unknown, TObj>
-

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

@@ -1,7 +1,3 @@
-/**
- * Setup express server.
- */
-
 import cookieParser from 'cookie-parser';
 import morgan from 'morgan';
 import path from 'path';
@@ -46,21 +42,16 @@ if (EnvVars.NodeEnv === NodeEnvs.Production.valueOf()) {
 app.use(Paths.Base, BaseRouter);
 
 // Add error handler
-app.use((
-  err: Error,
-  _: Request,
-  res: Response,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  next: NextFunction,
-) => {
+app.use((err: Error, _: Request, res: Response, next: NextFunction) => {
   if (EnvVars.NodeEnv !== NodeEnvs.Test.valueOf()) {
     logger.err(err, true);
   }
   let status = HttpStatusCodes.BAD_REQUEST;
   if (err instanceof RouteError) {
     status = err.status;
+    res.status(status).json({ error: err.message });
   }
-  return res.status(status).json({ error: err.message });
+  return next(err);
 });
 
 

package/lib/project-files/tsconfig.json

@@ -78,9 +78,11 @@
   "include": [
     "src/**/*.ts",
     "spec/**/*.ts",
-    "scripts"
+    "scripts",
+    "eslint.config.js",
+    "preload.js"
   ],
   "exclude": [
-    "src/public/"
+    "src/public/*"
   ]
 }

package/lib/project-files-auth/README.md

@@ -13,7 +13,7 @@ Run the server in development mode.
 
 Run all unit-tests.
 
-### `npm test -- --testFile="name of test file" (i.e. --testFile=Users).`
+### `npm test -- "name of test file" (i.e. Users).`
 
 Run a single unit-test.
 

package/lib/project-files-auth/eslint.config.js

@@ -0,0 +1,55 @@
+/* eslint-disable */
+// @ts-nocheck
+
+const eslint = require('@eslint/js');
+const tseslint = require('typescript-eslint');
+const stylisticTs = require('@stylistic/eslint-plugin-ts');
+const nodePlugin = require('eslint-plugin-n');
+
+
+module.exports = tseslint.config(
+  eslint.configs.recommended,
+  nodePlugin.configs['flat/recommended-script'],
+  ...tseslint.configs.strictTypeChecked,
+  ...tseslint.configs.stylisticTypeChecked,
+  {
+    languageOptions: {
+      parserOptions: {
+        project: './tsconfig.json',
+        warnOnUnsupportedTypeScriptVersion: false,
+      },
+    },
+  },
+  {
+    plugins: {
+      '@stylistic/ts': stylisticTs,
+    }
+  },
+  {
+    files: ['**/*.ts'],
+    ignores: ['**/*.js'],
+    rules: {
+      '@typescript-eslint/explicit-member-accessibility': 'warn',
+      '@typescript-eslint/no-misused-promises': 0,
+      '@typescript-eslint/no-floating-promises': 0,
+      '@typescript-eslint/no-confusing-void-expression': 0,
+      '@typescript-eslint/no-unnecessary-condition': 0,
+      '@typescript-eslint/restrict-template-expressions': [ 'error', { allowNumber: true }],
+      'max-len': [
+        'warn',
+        {
+          'code': 80
+        }
+      ],
+      '@stylistic/ts/semi': ['warn'],
+      'comma-dangle': ['warn', 'always-multiline'],
+      'no-console': 1,
+      'no-extra-boolean-cast': 0,
+      'indent': ['warn', 2],
+      'quotes': ['warn', 'single'],
+      'n/no-process-env': 1,
+      'n/no-missing-import': 0,
+      'n/no-unpublished-import': 0
+    },
+  }
+)

package/lib/project-files-auth/package.json

@@ -2,17 +2,17 @@
   "name": "express-typescript-example",
   "version": "0.0.0",
   "scripts": {
-    "build": "ts-node ./scripts/build.ts",
-    "dev": "NODE_ENV=development ts-node ./src",
+    "build": "npx ts-node ./scripts/build.ts",
+    "dev": "NODE_ENV=development npx ts-node ./src",
     "dev:hot": "nodemon --exec \"npm run dev\" --watch ./src -e ts",
-    "lint": "npx eslint --ext .ts src/",
-    "lint:tests": "npx eslint --ext .ts spec/",
+    "lint": "npx eslint ./src/**/*.ts",
+    "lint:tests": "npx eslint ./spec/**/*.ts",
     "start": "NODE_ENV=production node -r ./preload.js ./dist",
-    "test": "NODE_ENV=test ts-node ./spec",
+    "test": "NODE_ENV=test npx ts-node ./spec",
     "test:hot": "nodemon --exec \"npm run test\" --watch ./src --watch ./spec -e ts"
   },
   "engines": {
-    "node": ">=8.10.0"
+    "node": ">=16.0.0"
   },
   "dependencies": {
     "bcrypt": "^5.0.1",
@@ -32,7 +32,10 @@
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.0",
+    "@eslint/js": "^9.11.1",
+    "@stylistic/eslint-plugin-ts": "^2.8.0",
     "@types/cookie-parser": "^1.4.3",
+    "@types/eslint__js": "^8.42.3",
     "@types/express": "^4.17.13",
     "@types/find": "^0.2.1",
     "@types/fs-extra": "^9.0.13",
@@ -42,18 +45,16 @@
     "@types/morgan": "^1.9.3",
     "@types/node": "^18.7.14",
     "@types/supertest": "^6.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.36.1",
-    "@typescript-eslint/parser": "^5.36.1",
-    "eslint": "^8.23.0",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint": "^9.11.1",
+    "eslint-plugin-n": "^17.10.3",
     "find": "^0.3.0",
     "fs-extra": "^10.1.0",
     "jasmine": "^4.3.0",
     "nodemon": "^2.0.19",
     "supertest": "^6.3.4",
-    "ts-command-line-args": "^2.4.2",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.1.0",
-    "typescript": "^4.8.2"
+    "typescript": "^5.6.2",
+    "typescript-eslint": "^8.8.0"
   }
 }

package/lib/project-files-auth/preload.js

@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 const dotenv = require('dotenv');
 const path = require('path');
 const moduleAlias = require('module-alias');
@@ -18,3 +20,4 @@ if (result2.error) {
 if (NODE_ENV === 'production') {
   moduleAlias.addAlias('@src', __dirname + '/dist');
 }
+

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

@@ -1,7 +1,3 @@
-/**
- * Remove old files, copy front-end ones.
- */
-
 import fs from 'fs-extra';
 import logger from 'jet-logger';
 import childProcess from 'child_process';
@@ -14,13 +10,14 @@ import childProcess from 'child_process';
   try {
     // Remove current build
     await remove('./dist/');
-    await exec('npx eslint --ext .ts src/', './');
+    await exec('npm run lint', './');
     await exec('tsc --build tsconfig.prod.json', './');
     // Copy
     await copy('./src/public', './dist/public');
     await copy('./src/views', './dist/views');
   } catch (err) {
     logger.err(err);
+    // eslint-disable-next-line n/no-process-exit
     process.exit(1);
   }
 })();
@@ -30,7 +27,7 @@ import childProcess from 'child_process';
  */
 function remove(loc: string): Promise<void> {
   return new Promise((res, rej) => {
-    return fs.remove(loc, (err) => {
+    return fs.remove(loc, err => {
       return (!!err ? rej(err) : res());
     });
   });
@@ -41,7 +38,7 @@ function remove(loc: string): Promise<void> {
  */
 function copy(src: string, dest: string): Promise<void> {
   return new Promise((res, rej) => {
-    return fs.copy(src, dest, (err) => {
+    return fs.copy(src, dest, err => {
       return (!!err ? rej(err) : res());
     });
   });

package/lib/project-files-auth/spec/index.ts

@@ -1,19 +1,9 @@
 import find from 'find';
 import Jasmine from 'jasmine';
-import { parse } from 'ts-command-line-args';
 import logger from 'jet-logger';
+import { argv } from 'process';
 
 
-// Setup command line options. 
-const args = parse<{
-  testFile: string;
-}>({
-  testFile: {
-    type: String,
-    defaultValue: '',
-  },
-});
-
 // Init Jasmine
 const jasmine = new Jasmine();
 jasmine.exitOnCompletion = false;
@@ -30,8 +20,8 @@ jasmine.loadConfig({
 
 // Run all or a single unit-test
 let execResp: Promise<jasmine.JasmineDoneInfo> | undefined;
-if (args.testFile) {
-  const testFile = args.testFile;
+if (!!argv[2]) {
+  const testFile = argv[2];
   find.file(testFile + '.spec.ts', './spec', (files: string[]) => {
     if (files.length === 1) {
       jasmine.execute([files[0]]);

package/lib/project-files-auth/spec/types/misc.ts

@@ -1,18 +1,12 @@
 import { Response } from 'supertest';
-
 import { IUser } from '@src/models/User';
 
 
 // Misc
 export type TReqBody = Record<string, unknown>;
-export type TRes = Omit<Response, 'body'> & { body: TBody };
+export type TRes = Omit<Response, 'body'> & { body: {
+  error?: string;
+  user?: IUser
+  users?: IUser[]
+}};
 export type TApiCb = (res: TRes) => void;
-
-
-// Response Body: Add things to the body here over time to prevent 
-// typescript errors.
-type TBody = {
-  [key: string]: unknown;
-  user?: IUser;
-  users?: IUser[];
-}

package/lib/project-files-auth/src/common/EnvVars.ts

@@ -1,8 +1,4 @@
-/**
- * Environments variables declared here.
- */
-
-/* eslint-disable node/no-process-env */
+/* eslint-disable n/no-process-env */
 
 
 export default {

package/lib/project-files-auth/src/routes/AuthRoutes.ts

@@ -22,7 +22,7 @@ async function login(req: IReq, res: IRes) {
     role: user.role,
   });
   // Return
-  return res.status(HttpStatusCodes.OK).end();
+  res.status(HttpStatusCodes.OK).end();
 }
 
 /**
@@ -30,7 +30,7 @@ async function login(req: IReq, res: IRes) {
  */
 function logout(_: IReq, res: IRes) {
   SessionUtil.clearCookie(res);
-  return res.status(HttpStatusCodes.OK).end();
+  res.status(HttpStatusCodes.OK).end();
 }
 
 

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

@@ -14,7 +14,7 @@ import check from './common/check';
  */
 async function getAll(_: IReq, res: IRes) {
   const users = await UserService.getAll();
-  return res.status(HttpStatusCodes.OK).json({ users });
+  res.status(HttpStatusCodes.OK).json({ users });
 }
 
 /**
@@ -23,7 +23,7 @@ async function getAll(_: IReq, res: IRes) {
 async function add(req: IReq, res: IRes) {
   const user = check.isValid(req.body, 'user', User.isUser);
   await UserService.addOne(user);
-  return res.status(HttpStatusCodes.CREATED).end();
+  res.status(HttpStatusCodes.CREATED).end();
 }
 
 /**
@@ -32,7 +32,7 @@ async function add(req: IReq, res: IRes) {
 async function update(req: IReq, res: IRes) {
   const user = check.isValid(req.body, 'user', User.isUser);
   await UserService.updateOne(user);
-  return res.status(HttpStatusCodes.OK).end();
+  res.status(HttpStatusCodes.OK).end();
 }
 
 /**
@@ -41,7 +41,7 @@ async function update(req: IReq, res: IRes) {
 async function delete_(req: IReq, res: IRes) {
   const id = check.isNum(req.params, 'id');
   await UserService.delete(id);
-  return res.status(HttpStatusCodes.OK).end();
+  res.status(HttpStatusCodes.OK).end();
 }
 
 

package/lib/project-files-auth/src/routes/common/check.ts

@@ -8,10 +8,10 @@ type TReqObj = Record<string, unknown>;
  * Check that param/s is a string
  */
 function isStr(reqObj: TReqObj, params: string): string;
-function isStr(reqObj: TReqObj, params: ReadonlyArray<string>): string[];
+function isStr(reqObj: TReqObj, params: readonly string[]): string[];
 function isStr(
   reqObj: TReqObj,
-  params: string | ReadonlyArray<string>,
+  params: string | readonly string[],
 ): string | string[] {
   return _checkWrapper(reqObj, params, _checkStr);
 }
@@ -31,10 +31,10 @@ function _checkStr(val: unknown): string | undefined {
  * Check that param/s is a number.
  */
 function isNum(reqObj: TReqObj, params: string): number;
-function isNum(reqObj: TReqObj, params: ReadonlyArray<string>): number[];
+function isNum(reqObj: TReqObj, params: readonly string[]): number[];
 function isNum(
   reqObj: TReqObj,
-  params: string | ReadonlyArray<string>,
+  params: string | readonly string[],
 ): number | number[] {
   return _checkWrapper(reqObj, params, _checkNum);
 }
@@ -55,10 +55,10 @@ function _checkNum(val: unknown): number | undefined {
  * Check that param/s is a number
  */
 function isBool(reqObj: TReqObj, params: string): boolean;
-function isBool(reqObj: TReqObj, params: ReadonlyArray<string>): boolean[];
+function isBool(reqObj: TReqObj, params: readonly string[]): boolean[];
 function isBool(
   reqObj: TReqObj,
-  params: string | ReadonlyArray<string>,
+  params: string | readonly string[],
 ): boolean | boolean[] {
   return _checkWrapper(reqObj, params, _checkBool);
 }
@@ -107,7 +107,7 @@ function isValid<T>(
  */
 function _checkWrapper<T>(
   reqObj: TReqObj,
-  params: string | ReadonlyArray<string>,
+  params: string | readonly string[],
   checkFn: (val: unknown) => T | undefined,
 ): T | T[] {
   // If is array

package/lib/project-files-auth/src/server.ts

@@ -47,21 +47,16 @@ if (EnvVars.NodeEnv === NodeEnvs.Production.valueOf()) {
 app.use(Paths.Base, BaseRouter);
 
 // Add error handler
-app.use((
-  err: Error,
-  _: Request,
-  res: Response,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  next: NextFunction,
-) => {
+app.use((err: Error, _: Request, res: Response, next: NextFunction) => {
   if (EnvVars.NodeEnv !== NodeEnvs.Test.valueOf()) {
     logger.err(err, true);
   }
   let status = HttpStatusCodes.BAD_REQUEST;
   if (err instanceof RouteError) {
     status = err.status;
+    res.status(status).json({ error: err.message });
   }
-  return res.status(status).json({ error: err.message });
+  return next(err);
 });
 
 

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

@@ -78,9 +78,11 @@
   "include": [
     "src/**/*.ts",
     "spec/**/*.ts",
-    "scripts"
+    "scripts",
+    "eslint.config.js",
+    "preload.js"
   ],
   "exclude": [
-    "src/public/"
+    "src/public/*"
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-generator-typescript",
-  "version": "2.4.19",
+  "version": "2.4.23",
   "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/.eslintignore

@@ -1,2 +0,0 @@
-src/public/
-preload.js

package/lib/project-files/.eslintrc.json

@@ -1,44 +0,0 @@
-{
-  "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "@typescript-eslint"
-  ],
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:@typescript-eslint/recommended-requiring-type-checking",
-    "plugin:node/recommended"
-  ],
-  "parserOptions": {
-    "project": "./tsconfig.json"
-  },
-  "rules": {
-    "@typescript-eslint/explicit-member-accessibility": "warn",
-    "@typescript-eslint/no-misused-promises": 0,
-    "@typescript-eslint/no-floating-promises": 0,
-    "max-len": [
-      "warn",
-      {
-        "code": 80
-      }
-    ],
-    "comma-dangle": ["warn", "always-multiline"],
-    "no-console": 1,
-    "no-extra-boolean-cast": 0,
-    "semi": 1,
-    "indent": ["warn", 2],
-    "quotes": ["warn", "single"],
-    "node/no-process-env": 1,
-    "node/no-unsupported-features/es-syntax": [
-      "error",
-      { "ignores" : ["modules"] }
-    ],
-    "node/no-missing-import": 0,
-    "node/no-unpublished-import": 0
-  },
-  "settings": {
-    "node": {
-      "tryExtensions": [".js", ".json", ".node", ".ts"]
-    }
-  }
-}

package/lib/project-files-auth/.eslintignore

@@ -1,2 +0,0 @@
-src/public/
-preload.js

package/lib/project-files-auth/.eslintrc.json

@@ -1,44 +0,0 @@
-{
-  "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "@typescript-eslint"
-  ],
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:@typescript-eslint/recommended-requiring-type-checking",
-    "plugin:node/recommended"
-  ],
-  "parserOptions": {
-    "project": "./tsconfig.json"
-  },
-  "rules": {
-    "@typescript-eslint/explicit-member-accessibility": "warn",
-    "@typescript-eslint/no-misused-promises": 0,
-    "@typescript-eslint/no-floating-promises": 0,
-    "max-len": [
-      "warn",
-      {
-        "code": 80
-      }
-    ],
-    "comma-dangle": ["warn", "always-multiline"],
-    "no-console": 1,
-    "no-extra-boolean-cast": 0,
-    "semi": 1,
-    "indent": ["warn", 2],
-    "quotes": ["warn", "single"],
-    "node/no-process-env": 1,
-    "node/no-unsupported-features/es-syntax": [
-      "error",
-      { "ignores" : ["modules"] }
-    ],
-    "node/no-missing-import": 0,
-    "node/no-unpublished-import": 0
-  },
-  "settings": {
-    "node": {
-      "tryExtensions": [".js", ".json", ".node", ".ts"]
-    }
-  }
-}