express-generator-typescript 2.4.11 → 2.4.14

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

@@ -2,7 +2,7 @@ import HttpStatusCodes from '@src/common/HttpStatusCodes';
 
 import UserService from '@src/services/UserService';
 import { IUser } from '@src/models/User';
-import { IReq, IRes } from './types/express/misc';
+import { IReq, IRes } from './common/types';
 
 
 // **** Functions **** //

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

@@ -0,0 +1,20 @@
+/* eslint-disable max-len */
+/**
+ * Shared types for routes.
+ */
+
+import { Response, Request } from 'express';
+
+
+// **** Express **** //
+
+type TPathParams = Record<string, string>;
+
+export interface IReq<T = void> extends Request<TPathParams, void, T, TPathParams> {
+  body: T;
+}
+
+export interface IRes extends Response {
+  locals: Record<string, unknown>;
+}
+

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

@@ -2,7 +2,7 @@ import HttpStatusCodes from '@src/common/HttpStatusCodes';
 import SessionUtil from '@src/util/SessionUtil';
 import AuthService from '@src/services/AuthService';
 
-import { IReq, IRes } from './types/express/misc';
+import { IReq, IRes } from './common/types';
 
 
 // **** Types **** //

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

@@ -2,7 +2,7 @@ import HttpStatusCodes from '@src/common/HttpStatusCodes';
 
 import UserService from '@src/services/UserService';
 import { IUser } from '@src/models/User';
-import { IReq, IRes } from './types/express/misc';
+import { IReq, IRes } from './common/types';
 
 
 // **** Functions **** //

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

@@ -0,0 +1,49 @@
+// import * as e from 'express';
+// import { Query } from 'express-serve-static-core';
+
+// import { ISessionUser } from '@src/models/User';
+
+
+// // **** 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;
+//   };
+// }
+
+
+/* eslint-disable max-len */
+/**
+ * Shared types for routes.
+ */
+
+import { Response, Request } from 'express';
+import { ISessionUser } from '@src/models/User';
+
+
+// **** Express **** //
+
+type TPathParams = Record<string, string>;
+
+export interface IReq<T = void> extends Request<TPathParams, void, T, TPathParams> {
+  body: T;
+}
+
+interface ILocals {
+  sessionUser: ISessionUser;
+}
+
+// I know since its a type I should use 'TRes' instead of 'IRes' but I'm
+// leaving it as this cause it looks better alongside 'IReq'
+export type IRes = Response<unknown, ILocals>;
+

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

@@ -2,33 +2,29 @@
  * Middleware to verify user logged in and is an an admin.
  */
 
-import { Request, Response, NextFunction } from 'express';
+import { NextFunction } from 'express';
 import { JwtPayload } from 'jsonwebtoken';
 
 import HttpStatusCodes from '@src/common/HttpStatusCodes';
-
 import SessionUtil from '@src/util/SessionUtil';
 import { ISessionUser, UserRoles } from '@src/models/User';
 
+import { IReq, IRes } from '../common/types';
+
 
 // **** Variables **** //
 
 const USER_UNAUTHORIZED_ERR = 'User not authorized to perform this action';
 
-
-// **** Types **** //
-
 type TSessionData = ISessionUser & JwtPayload;
 
 
-// **** Functions **** //
-
 /**
  * See note at beginning of file.
  */
 async function adminMw(
-  req: Request,
-  res: Response,
+  req: IReq,
+  res: IRes,
   next: NextFunction,
 ) {
   // Get session data

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-generator-typescript",
-  "version": "2.4.11",
+  "version": "2.4.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/src/routes/types/express/index.d.ts

@@ -1,11 +0,0 @@
-import 'express';
-
-
-// **** Declaration Merging **** //
-
-declare module 'express' {
-
-  export interface Request {
-    signedCookies: Record<string, string>;
-  }
-}

package/lib/project-files/src/routes/types/express/misc.ts

@@ -1,12 +0,0 @@
-import * as e from 'express';
-
-
-// **** Express **** //
-
-export interface IReq<T = void> extends e.Request {
-  body: T;
-}
-
-export interface IRes extends e.Response {
-  locals: Record<string, unknown>;
-}

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

@@ -1,14 +0,0 @@
-import * as e from 'express';
-import { Query } from 'express-serve-static-core';
-
-
-// **** 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;
-}

package/lib/project-files-auth/src/routes/types/express/index.d.ts

@@ -1,11 +0,0 @@
-import 'express';
-
-
-// **** Declaration Merging **** //
-
-declare module 'express' {
-
-  export interface Request {
-    signedCookies: Record<string, string>;
-  }
-}

package/lib/project-files-auth/src/routes/types/express/misc.ts

@@ -1,16 +0,0 @@
-import * as e from 'express';
-
-import { ISessionUser } from '@src/models/User';
-
-
-// **** Express **** //
-
-export interface IReq<T = void> extends e.Request {
-  body: T;
-}
-
-export interface IRes extends e.Response {
-  locals: {
-    sessionUser?: ISessionUser;
-  };
-}

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

@@ -1,22 +0,0 @@
-import * as e from 'express';
-import { Query } from 'express-serve-static-core';
-
-import { ISessionUser } from '@src/models/User';
-
-
-// **** 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;
-  };
-}