express-generator-typescript 2.0.3 → 2.0.4

package/bin/cli.js

@@ -10,26 +10,27 @@ const path = require('path');
 const expressGenTs = require('../lib/express-generator-typescript');
 
 
-(() => {
-  console.log('Setting up new Express/TypeScript project...');
-  // const opts = processOptions(process.argv.slice(2));
-  // Process options
-  let destination = 'express-gen-ts';
-  let useYarn = false;
-  const args = process.argv.slice(2);
-  let idx = -1;
-  idx = args.indexOf('--use-yarn');
-  if (idx > -1) {
-    useYarn = true;
-    args.splice(idx, 1);
-  }
-  if (args.length > 0) {
-    destination = args[0];
-  }
-  destination = path.join(process.cwd(), destination);
-  // Creating new project finished
-  expressGenTs(destination, useYarn).then(() => {
-    console.log('Project setup complete!');
-  });
-})();
- 
+// Start
+console.log('Setting up new Express/TypeScript project...');
+
+// Setup use yarn
+let useYarn = false;
+const args = process.argv.slice(2);
+let idx = -1;
+idx = args.indexOf('--use-yarn');
+if (idx > -1) {
+  useYarn = true;
+  args.splice(idx, 1);
+}
+
+// Setup destination
+let destination = 'express-gen-ts';
+if (args.length > 0) {
+  destination = args[0];
+}
+destination = path.join(process.cwd(), destination);
+
+// Creating new project finished
+expressGenTs(destination, useYarn).then(() => {
+  console.log('Project setup complete!');
+});

package/lib/cli.js

@@ -10,25 +10,27 @@ const path = require('path');
 const expressGenTs = require('../lib/express-generator-typescript');
 
 
-(() => {
-  console.log('Setting up new Express/TypeScript project...');
-  // const opts = processOptions(process.argv.slice(2));
-  // Process options
-  let destination = 'express-gen-ts';
-  let useYarn = false;
-  const args = process.argv.slice(2);
-  let idx = -1;
-  idx = args.indexOf('--use-yarn');
-  if (idx > -1) {
-    useYarn = true;
-    args.splice(idx, 1);
-  }
-  if (args.length > 0) {
-    destination = args[0];
-  }
-  destination = path.join(process.cwd(), destination);
-  // Creating new project finished
-  expressGenTs(destination, useYarn).then(() => {
-    console.log('Project setup complete!');
-  });
-})();
+// Start
+console.log('Setting up new Express/TypeScript project...');
+
+// Setup use yarn
+let useYarn = false;
+const args = process.argv.slice(2);
+let idx = -1;
+idx = args.indexOf('--use-yarn');
+if (idx > -1) {
+  useYarn = true;
+  args.splice(idx, 1);
+}
+
+// Setup destination
+let destination = 'express-gen-ts';
+if (args.length > 0) {
+  destination = args[0];
+}
+destination = path.join(process.cwd(), destination);
+
+// Creating new project finished
+expressGenTs(destination, useYarn).then(() => {
+  console.log('Project setup complete!');
+});

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

@@ -1,10 +1,10 @@
-import { Request, Response, Router } from 'express';
+import { Router } from 'express';
 import StatusCodes from 'http-status-codes';
 
 import authService from '@services/auth-service';
 import { ParamMissingError } from '@shared/errors';
 import envVars from 'src/shared/env-vars';
-import { IReq } from '@shared/types';
+import { IReq, IRes } from '@shared/types';
 
 
 // **** Types **** //
@@ -34,7 +34,7 @@ export const p = {
 /**
  * Login a user.
  */
-router.post(p.login, async (req: IReq<ILoginReq>, res: Response) => {
+router.post(p.login, async (req: IReq<ILoginReq>, res: IRes) => {
   const { email, password } = req.body;
   if (!email || !password) {
     throw new ParamMissingError();
@@ -50,7 +50,7 @@ router.post(p.login, async (req: IReq<ILoginReq>, res: Response) => {
 /**
  * Logout the user.
  */
-router.get(p.logout, (_: Request, res: Response) => {
+router.get(p.logout, (_: IReq, res: IRes) => {
   const { key, options } = envVars.cookieProps;
   res.clearCookie(key, options);
   return res.status(OK).end();

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

@@ -1,10 +1,10 @@
 import StatusCodes from 'http-status-codes';
-import { Request, Response, Router } from 'express';
+import { Router } from 'express';
 
 import userService from '@services/user-service';
 import { ParamMissingError } from '@shared/errors';
 import { IUser } from '@models/user-model';
-import { IReq } from '@shared/types';
+import { IReq, IRes } from '@shared/types';
 
 
 // **** Variables **** //
@@ -27,7 +27,7 @@ export const p = {
 /**
  * Get all users.
  */
-router.get(p.get, async (_: Request, res: Response) => {
+router.get(p.get, async (_: IReq, res: IRes) => {
   const users = await userService.getAll();
   return res.status(OK).json({ users });
 });
@@ -35,7 +35,7 @@ router.get(p.get, async (_: Request, res: Response) => {
 /**
  * Add one user.
  */
-router.post(p.add, async (req: IReq<{user: IUser}>, res: Response) => {
+router.post(p.add, async (req: IReq<{user: IUser}>, res: IRes) => {
   const { user } = req.body;
   if (!user) {
     throw new ParamMissingError();
@@ -47,7 +47,7 @@ router.post(p.add, async (req: IReq<{user: IUser}>, res: Response) => {
 /**
  * Update one user.
  */
-router.put(p.update, async (req: IReq<{user: IUser}>, res: Response) => {
+router.put(p.update, async (req: IReq<{user: IUser}>, res: IRes) => {
   const { user } = req.body;
   if (!user) {
     throw new ParamMissingError();
@@ -59,7 +59,7 @@ router.put(p.update, async (req: IReq<{user: IUser}>, res: Response) => {
 /**
  * Delete one user.
  */
-router.delete(p.delete, async (req: Request, res: Response) => {
+router.delete(p.delete, async (req: IReq, res: IRes) => {
   const { id } = req.params;
   if (!id) {
     throw new ParamMissingError();

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

@@ -1,14 +1,22 @@
 import * as e from 'express';
 import { Query } from 'express-serve-static-core';
 
+import { ISessionUser } from '@routes/middleware';
 
-// **** Generics for Request Object **** //
 
-export interface IReq<T> extends e.Request {
+// **** 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/types/express/index.d.ts

@@ -1,8 +1,5 @@
 import 'express';
 
-import { ISessionUser } from '@routes/middleware';
-
-
 
 // **** Declaration Merging **** //
 
@@ -11,10 +8,4 @@ declare module 'express' {
   export interface Request {
     signedCookies: Record<string, string>;
   }
-
-  export interface Response {
-    locals: {
-      sessionUser: ISessionUser;
-    };
-  }
 }

package/package.json

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