express-generator-typescript 2.2.1 → 2.2.3

package/lib/project-files/package.json

@@ -21,14 +21,7 @@
     "exec": "./node_modules/.bin/ts-node --files -r tsconfig-paths/register ./src"
   },
   "_moduleAliases": {
-    "@services": "dist/services",
-    "@repos": "dist/repos",
-    "@models": "dist/models",
-    "@configurations": "dist/configurations",
-    "@declarations": "dist/declarations",
-    "@server": "dist/server",
-    "@routes": "dist/routes",
-    "@util": "dist/util"
+    "@src": "dist"
   },
   "engines": {
     "node": ">=8.10.0"

package/lib/project-files/spec/support/login-agent.ts

@@ -1,8 +1,8 @@
 import { SuperTest, Test, Response } from 'supertest';
 
-import User, { UserRoles } from '@models/User';
-import userRepo from '@repos/user-repo';
-import pwdUtil from '@util/pwd-util';
+import User, { UserRoles } from '@src/models/User';
+import userRepo from '@src/repos/user-repo';
+import pwdUtil from '@src/util/pwd-util';
 
 
 // **** Variables **** //

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

@@ -1,14 +1,14 @@
 import supertest, { SuperTest, Test, Response } from 'supertest';
 import logger from 'jet-logger';
 
-import app from '@server';
-import authRoutes from '@routes/auth-routes';
-import userRepo from '@repos/user-repo';
-import pwdUtil from '@util/pwd-util';
-import EnvVars from '@configurations/EnvVars';
-import HttpStatusCodes from '@configurations/HttpStatusCodes';
-import User, { UserRoles } from '@models/User';
-import { errors as authServiceErrs } from '@services/auth-service';
+import app from '@src/server';
+import authRoutes from '@src/routes/auth-routes';
+import userRepo from '@src/repos/user-repo';
+import pwdUtil from '@src/util/pwd-util';
+import EnvVars from '@src/configurations/EnvVars';
+import HttpStatusCodes from '@src/configurations/HttpStatusCodes';
+import User, { UserRoles } from '@src/models/User';
+import { errors as authServiceErrs } from '@src/services/auth-service';
 
 
 // **** Variables **** //

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

@@ -2,14 +2,14 @@ import supertest from 'supertest';
 import { SuperTest, Test, Response } from 'supertest';
 import logger from 'jet-logger';
 
-import app from '@server';
-import userRepo from '@repos/user-repo';
-import User, { IUser } from '@models/User';
-import userRoutes from '@routes/user-routes';
-import HttpStatusCodes from '@configurations/HttpStatusCodes';
+import app from '@src/server';
+import userRepo from '@src/repos/user-repo';
+import User, { IUser } from '@src/models/User';
+import userRoutes from '@src/routes/user-routes';
+import HttpStatusCodes from '@src/configurations/HttpStatusCodes';
 import loginAgent from '../support/login-agent';
-import { paramInvalidErr } from '@routes/middlware/validate';
-import { userNotFoundErr } from '@services/user-service';
+import { paramInvalidErr } from '@src/routes/middlware/validate';
+import { userNotFoundErr } from '@src/services/user-service';
 
 
 // **** Variables **** //

package/lib/project-files/spec/types/supertest/index.d.ts

@@ -1,4 +1,4 @@
-import { IUser } from '@models/User';
+import { IUser } from '@src/models/User';
 import 'supertest';
 
 

package/lib/project-files/src/declarations/classes.ts

@@ -1,4 +1,4 @@
-import HttpStatusCodes from '@configurations/HttpStatusCodes';
+import HttpStatusCodes from '@src/configurations/HttpStatusCodes';
 
 
 /**

package/lib/project-files/src/declarations/functions.ts

@@ -1,7 +1,17 @@
-
 /**
  * Get a random number between 1 and 1,000,000,000,000
  */
 export function getRandomInt(): number {
   return Math.floor(Math.random() * 1_000_000_000_000);
 }
+
+/**
+ * Wait for a certain number of milliseconds.
+ */
+export function tick(milliseconds: number): Promise<void> {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve();
+    }, milliseconds);
+  });
+}

package/lib/project-files/src/declarations/types.ts

@@ -1,27 +1,5 @@
-import * as e from 'express';
-import { Query } from 'express-serve-static-core';
-
-import { ISessionUser } from '@routes/middlware/adminMw';
-
-
-// **** Misc **** //
+/**
+ * Place types shared throughout the application here.
+ */
 
 export type TAll = string | number | boolean | null | object;
-
-
-// **** Express **** //
-
-export interface IReq<T = void> extends e.Request {
-  body: T;
-}
-
-export interface IReqQuery<T extends Query, U = void> extends e.Request {
-  query: T;
-  body: U;
-}
-
-export interface IRes extends e.Response {
-  locals: {
-    sessionUser: ISessionUser;
-  };
-}

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

@@ -1,7 +1,7 @@
 import './pre-start'; // Must be the first import
 import logger from 'jet-logger';
 
-import EnvVars from '@configurations/EnvVars';
+import EnvVars from '@src/configurations/EnvVars';
 import server from './server';
 
 

package/lib/project-files/src/models/User.ts

@@ -1,4 +1,4 @@
-import { TAll } from '@declarations/types';
+import { TAll } from '@src/declarations/types';
 
 
 // **** Variables **** //

package/lib/project-files/src/repos/mock-orm.ts

@@ -2,7 +2,7 @@
 
 import jsonfile from 'jsonfile';
 
-import { IUser } from '@models/User';
+import { IUser } from '@src/models/User';
 
 
 // **** Variables **** //

package/lib/project-files/src/repos/user-repo.ts

@@ -1,5 +1,5 @@
-import { IUser } from '@models/User';
-import { getRandomInt } from '@declarations/functions';
+import { IUser } from '@src/models/User';
+import { getRandomInt } from '@src/declarations/functions';
 import orm from './mock-orm';
 
 

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

@@ -2,7 +2,7 @@ import { Router } from 'express';
 
 import adminMw from './middlware/adminMw';
 import validate from './middlware/validate';
-import User from '@models/User';
+import User from '@src/models/User';
 import authRoutes from './auth-routes';
 import userRoutes from './user-routes';
 

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

@@ -1,8 +1,8 @@
-import HttpStatusCodes from '@configurations/HttpStatusCodes';
+import HttpStatusCodes from '@src/configurations/HttpStatusCodes';
 
-import authService from '@services/auth-service';
-import EnvVars from '@configurations/EnvVars';
-import { IReq, IRes } from '@declarations/types';
+import authService from '@src/services/auth-service';
+import EnvVars from '@src/configurations/EnvVars';
+import { IReq, IRes } from './shared/types';
 
 
 // **** Types **** //

package/lib/project-files/src/routes/middlware/adminMw.ts

@@ -5,10 +5,10 @@
 import { Request, Response, NextFunction } from 'express';
 import { JwtPayload } from 'jsonwebtoken';
 
-import HttpStatusCodes from '@configurations/HttpStatusCodes';
-import EnvVars from '@configurations/EnvVars';
-import jwtUtil from '@util/jwt-util';
-import { IUser, UserRoles } from '@models/User';
+import HttpStatusCodes from '@src/configurations/HttpStatusCodes';
+import EnvVars from '@src/configurations/EnvVars';
+import jwtUtil from '@src/util/jwt-util';
+import { IUser, UserRoles } from '@src/models/User';
 
 
 // **** Variables **** //

package/lib/project-files/src/routes/middlware/validate.ts

@@ -36,8 +36,8 @@
 
 import { Request, Response, NextFunction, RequestHandler } from 'express';
 
-import HttpStatusCodes from '@configurations/HttpStatusCodes';
-import { TAll } from '@declarations/types';
+import HttpStatusCodes from '@src/configurations/HttpStatusCodes';
+import { TAll } from '@src/declarations/types';
 
 
 // **** Variables **** //

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

@@ -0,0 +1,22 @@
+import * as e from 'express';
+import { Query } from 'express-serve-static-core';
+
+import { ISessionUser } from '@src/routes/middlware/adminMw';
+
+
+// **** Express **** //
+
+export interface IReq<T = void> extends e.Request {
+  body: T;
+}
+
+export interface IReqQuery<T extends Query, U = void> extends e.Request {
+  query: T;
+  body: U;
+}
+
+export interface IRes extends e.Response {
+  locals: {
+    sessionUser: ISessionUser;
+  };
+}

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

@@ -1,8 +1,8 @@
-import HttpStatusCodes from '@configurations/HttpStatusCodes';
+import HttpStatusCodes from '@src/configurations/HttpStatusCodes';
 
-import userService from '@services/user-service';
-import { IUser } from '@models/User';
-import { IReq, IRes } from '@declarations/types';
+import userService from '@src/services/user-service';
+import { IUser } from '@src/models/User';
+import { IReq, IRes } from './shared/types';
 
 
 // **** Variables **** //

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

@@ -8,10 +8,10 @@ import 'express-async-errors';
 
 import BaseRouter from './routes/api';
 import logger from 'jet-logger';
-import EnvVars from '@configurations/EnvVars';
-import HttpStatusCodes from '@configurations/HttpStatusCodes';
-import { NodeEnvs } from '@declarations/enums';
-import { RouteError } from '@declarations/classes';
+import EnvVars from '@src/configurations/EnvVars';
+import HttpStatusCodes from '@src/configurations/HttpStatusCodes';
+import { NodeEnvs } from '@src/declarations/enums';
+import { RouteError } from '@src/declarations/classes';
 
 
 // **** Init express **** //

package/lib/project-files/src/services/auth-service.ts

@@ -1,8 +1,9 @@
-import userRepo from '@repos/user-repo';
-import jwtUtil from '@util/jwt-util';
-import pwdUtil from '@util/pwd-util';
-import HttpStatusCodes from '@configurations/HttpStatusCodes';
-import { RouteError } from '@declarations/classes';
+import userRepo from '@src/repos/user-repo';
+import jwtUtil from '@src/util/jwt-util';
+import pwdUtil from '@src/util/pwd-util';
+import HttpStatusCodes from '@src/configurations/HttpStatusCodes';
+import { RouteError } from '@src/declarations/classes';
+import { tick } from '@src/declarations/functions';
 
 
 // **** Variables **** //
@@ -32,6 +33,8 @@ async function getJwt(email: string, password: string): Promise<string> {
   const hash = (user.pwdHash ?? '');
   const pwdPassed = await pwdUtil.compare(password, hash);
   if (!pwdPassed) {
+    // If password failed, wait 500ms this will increase security
+    await tick(500);
     throw new RouteError(
       HttpStatusCodes.UNAUTHORIZED, 
       errors.unauth,

package/lib/project-files/src/services/user-service.ts

@@ -1,7 +1,7 @@
-import userRepo from '@repos/user-repo';
-import { IUser } from '@models/User';
-import { RouteError } from '@declarations/classes';
-import HttpStatusCodes from '@configurations/HttpStatusCodes';
+import userRepo from '@src/repos/user-repo';
+import { IUser } from '@src/models/User';
+import { RouteError } from '@src/declarations/classes';
+import HttpStatusCodes from '@src/configurations/HttpStatusCodes';
 
 
 // **** Variables **** //

package/lib/project-files/tsconfig.json

@@ -66,30 +66,9 @@
     "skipLibCheck": true,                     /* Skip type checking of declaration files. */
     "forceConsistentCasingInFileNames": true,  /* Disallow inconsistently-cased references to the same file. */
     "paths": {
-      "@repos/*": [
-        "src/repos/*"
+      "@src/*": [
+        "src/*"
       ],
-      "@models/*": [
-        "src/models/*"
-      ],
-      "@declarations/*": [
-        "src/declarations/*"
-      ],
-      "@configurations/*": [
-        "src/configurations/*"
-      ],
-      "@server": [
-        "src/server"
-      ],
-      "@services/*": [
-        "src/services/*"
-      ],
-      "@routes/*": [
-        "src/routes/*"
-      ],
-      "@util/*": [
-        "src/util/*"
-      ]
     },
     "useUnknownInCatchVariables": false
   },

package/package.json

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