express-generator-typescript 2.0.0 → 2.0.1

package/README.md

@@ -13,7 +13,6 @@ Creates a new express application similar to the _express-generator_ module. Exc
 application is configured to use TypeScript instead of plain JavaScript. 
 
 
-
 ## Why express-generator-typescript?
 
 NodeJS is great for the rapid development of web-projects, but is often neglected because of the lack of
@@ -97,7 +96,7 @@ In previous version of __express-generator-typescript__ you could disregard auth
 command line options. But maintaining two separate project folders which contained and didn't contain 
 authentication started to get messy.
 
-- Remove following modules from `package.json`:
+- Remove the following modules from `package.json`:
   - `jsonwebtoken`
   - `@types/jsonwebtoken`
   - `bcrypt`
@@ -157,7 +156,6 @@ To be able to debug in VSCODE on windows I also had to install the `node-gyp` mo
 Happy web deving :)
 
 
-
 ## License
 
 [MIT](LICENSE)

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

@@ -22,6 +22,7 @@
     "no-console": 1,
     "no-extra-boolean-cast": 0,
     "semi": 1,
+    "indent": ["warn", 2],
     "@typescript-eslint/no-misused-promises": 0,
     "@typescript-eslint/no-floating-promises": 0,
     "node/no-process-env": 1,

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

@@ -1,5 +1,5 @@
 import bcrypt from 'bcrypt';
-import { SuperTest, Test } from 'supertest';
+import { SuperTest, Test, Response } from 'supertest';
 
 import User, { UserRoles } from '@models/user-model';
 import userRepo from '@repos/user-repo';
@@ -19,9 +19,6 @@ const creds = {
 
 /**
  * Login a user.
- * 
- * @param beforeAgent 
- * @param done 
  */
 function login(beforeAgent: SuperTest<Test>, done: (arg: string) => void) {
   // Setup dummy data
@@ -34,17 +31,18 @@ function login(beforeAgent: SuperTest<Test>, done: (arg: string) => void) {
     .post('/api/auth/login')
     .type('form')
     .send(creds)
-    .end((err: Error, res: any) => {
+    .end((err: Error, res: Response) => {
       if (err) {
         throw err;
       }
-      done(res.headers['set-cookie']);
+      const cookie = res.headers['set-cookie'][0];
+      return done(cookie);
     });
-};
+}
 
 
 // **** Export default **** //
 
 export default {
-    login,
+  login,
 } as const;

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

@@ -90,7 +90,7 @@ describe('user-router', () => {
 
     const callApi = () => 
       agent.get(getUsersPath)
-      .set('Cookie', jwtCookie);
+        .set('Cookie', jwtCookie);
 
     // Get all users
     it(msgs.getUsersSuccess, (done) => {

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

@@ -5,10 +5,10 @@ import 'supertest';
 declare module 'supertest' {
 
   export interface Response  {
-    headers: Record<string, string | string[]>;
+    headers: Record<string, string[]>;
     body: {
       error: string;
-      users: IUser[]
+      users: IUser[];
     };
   }
 }

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

@@ -36,6 +36,6 @@ function saveDb(db: IDb): Promise<void> {
 // **** Export default **** //
 
 export default {
-    openDb,
-    saveDb,
+  openDb,
+  saveDb,
 } as const;

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

@@ -79,10 +79,10 @@ async function _delete(id: number): Promise<void> {
 // **** Export default **** //
 
 export default {
-    getOne,
-    persists,
-    getAll,
-    add,
-    update,
-    delete: _delete,
+  getOne,
+  persists,
+  getAll,
+  add,
+  update,
+  delete: _delete,
 } as const;

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

@@ -17,9 +17,10 @@ interface ILoginReq {
 
 // **** Variables **** //
 
-// Misc
-const router = Router(),
-  { OK } = StatusCodes;
+const router = Router();
+
+// Status codes
+const { OK } = StatusCodes;
 
 // Paths
 export const p = {

package/lib/project-files/src/util/jwt-util.ts

@@ -6,7 +6,7 @@ import envVars from '../shared/env-vars';
 
 // Errors
 const errors = {
-    validation: 'JSON-web-token validation failed.',
+  validation: 'JSON-web-token validation failed.',
 } as const;
 
 // Options

package/package.json

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