express-generator-typescript 2.4.22 → 2.4.25

package/lib/{project-files-auth/eslint.config.js → project-files/eslint.config.mjs}

@@ -1,17 +1,21 @@
-/* eslint-disable */
-// @ts-nocheck
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import stylisticTs from '@stylistic/eslint-plugin-ts';
+import nodePlugin from 'eslint-plugin-n';
 
-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(
+export default tseslint.config(
   eslint.configs.recommended,
   nodePlugin.configs['flat/recommended-script'],
   ...tseslint.configs.strictTypeChecked,
   ...tseslint.configs.stylisticTypeChecked,
+  { 
+    ignores: [
+      '**/node_modules/*',
+      '**/*.mjs',
+      '**/*.js',
+    ],
+  },
   {
     languageOptions: {
       parserOptions: {
@@ -25,9 +29,8 @@ module.exports = tseslint.config(
       '@stylistic/ts': stylisticTs,
     }
   },
+  { files: ['**/*.ts'] },
   {
-    files: ['**/*.ts'],
-    ignores: ['**/*.js'],
     rules: {
       '@typescript-eslint/explicit-member-accessibility': 'warn',
       '@typescript-eslint/no-misused-promises': 0,
@@ -51,5 +54,5 @@ module.exports = tseslint.config(
       'n/no-missing-import': 0,
       'n/no-unpublished-import': 0
     },
-  }
+  },
 )

package/lib/project-files/package.json

@@ -5,8 +5,8 @@
     "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 ./src/**/*.ts",
-    "lint:tests": "npx eslint ./spec/**/*.ts",
+    "lint": "npx eslint ./src",
+    "lint:tests": "npx eslint ./spec",
     "start": "NODE_ENV=production node -r ./preload.js ./dist",
     "test": "NODE_ENV=test npx ts-node ./spec",
     "test:hot": "nodemon --exec \"npm run test\" --watch ./src --watch ./spec -e ts"

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/server.ts

@@ -42,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

@@ -79,7 +79,6 @@
     "src/**/*.ts",
     "spec/**/*.ts",
     "scripts",
-    "eslint.config.js",
     "preload.js"
   ],
   "exclude": [

package/lib/{project-files/eslint.config.js → project-files-auth/eslint.config.mjs}

@@ -1,17 +1,21 @@
-/* eslint-disable */
-// @ts-nocheck
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import stylisticTs from '@stylistic/eslint-plugin-ts';
+import nodePlugin from 'eslint-plugin-n';
 
-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(
+export default tseslint.config(
   eslint.configs.recommended,
   nodePlugin.configs['flat/recommended-script'],
   ...tseslint.configs.strictTypeChecked,
   ...tseslint.configs.stylisticTypeChecked,
+  { 
+    ignores: [
+      '**/node_modules/*',
+      '**/*.mjs',
+      '**/*.js',
+    ],
+  },
   {
     languageOptions: {
       parserOptions: {
@@ -25,9 +29,8 @@ module.exports = tseslint.config(
       '@stylistic/ts': stylisticTs,
     }
   },
+  { files: ['**/*.ts'] },
   {
-    files: ['**/*.ts'],
-    ignores: ['**/*.js'],
     rules: {
       '@typescript-eslint/explicit-member-accessibility': 'warn',
       '@typescript-eslint/no-misused-promises': 0,
@@ -51,5 +54,5 @@ module.exports = tseslint.config(
       'n/no-missing-import': 0,
       'n/no-unpublished-import': 0
     },
-  }
-)
+  },
+)

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

@@ -5,8 +5,8 @@
     "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 ./src/**/*.ts",
-    "lint:tests": "npx eslint ./spec/**/*.ts",
+    "lint": "npx eslint ./src",
+    "lint:tests": "npx eslint ./spec",
     "start": "NODE_ENV=production node -r ./preload.js ./dist",
     "test": "NODE_ENV=test npx ts-node ./spec",
     "test:hot": "nodemon --exec \"npm run test\" --watch ./src --watch ./spec -e ts"

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/middleware/adminMw.ts

@@ -1,7 +1,3 @@
-/**
- * Middleware to verify user logged in and is an an admin.
- */
-
 import { NextFunction } from 'express';
 import { JwtPayload } from 'jsonwebtoken';
 
@@ -38,9 +34,10 @@ async function adminMw(
     return next();
   // Return an unauth error if user is not an admin
   } else {
-    return res
+    res
       .status(HttpStatusCodes.UNAUTHORIZED)
       .json({ error: USER_UNAUTHORIZED_ERR });
+    return;
   }
 }
 

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

@@ -79,7 +79,6 @@
     "src/**/*.ts",
     "spec/**/*.ts",
     "scripts",
-    "eslint.config.js",
     "preload.js"
   ],
   "exclude": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-generator-typescript",
-  "version": "2.4.22",
+  "version": "2.4.25",
   "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",