express-generator-typescript 2.3.4 → 2.3.6

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

@@ -79,7 +79,7 @@ describe('UserRouter', () => {
         .end((_: Error, res: Response) => {
           expect(res.status).toBe(OK);
           for (let i = 0; i < res.body.users.length; i++) {
-            const user = new User(res.body.users[i]);
+            const user = User.from(res.body.users[i]);
             expect(user).toEqual(DummyGetAllUsers[i]);
           }
           done();

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

@@ -37,35 +37,40 @@ class User implements IUser {
   public role?: UserRoles;
   public pwdHash?: string;
 
+  /**
+   * Constructor()
+   */
   constructor(
-    nameOrObj: string | object,
+    name?: string,
     email?: string,
     role?: UserRoles,
     pwdHash?: string,
-    id?: number,
+    id?: number, // id last cause usually set by db
   ) {
-    if (typeof nameOrObj === 'string') {
-      this.name = nameOrObj;
-      this.email = (email ?? '');
-      this.role = (role ?? UserRoles.Standard);
-      this.pwdHash = (pwdHash ?? '');
-      this.id = (id ?? -1);
-    } else if (User.IsUserObj(nameOrObj)) {
-      const o = nameOrObj as IUser;
-      this.name = o.name;
-      this.email = (o.email ?? '');
-      this.role = (o.role ?? UserRoles.Standard);
-      this.pwdHash = (o.pwdHash ?? '');
-      this.id = (o.id ?? -1);
-    } else {
+    this.name = (name ?? '');
+    this.email = (email ?? '');
+    this.role = (role ?? UserRoles.Standard);
+    this.pwdHash = (pwdHash ?? '');
+    this.id = (id ?? -1);
+  }
+
+  /**
+   * Get user instance from object.
+   */
+  public static from(param: object): User {
+    // Check is user
+    if (!User.isUser(param)) {
       throw new Error(INVALID_CONSTRUCTOR_PARAM);
     }
+    // Get user instance
+    const p = param as IUser;
+    return new User(p.name, p.email, p.role, p.pwdHash, p.id);
   }
 
   /**
    * Is this an object which contains all the user keys.
    */
-  public static IsUserObj(this: void, arg: unknown): boolean {
+  public static isUser(this: void, arg: unknown): boolean {
     return (
       !!arg &&
       typeof arg === 'object' &&

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

@@ -48,14 +48,14 @@ userRouter.get(
 // Add one user
 userRouter.post(
   Paths.Users.Add,
-  validate(['user', User.IsUserObj]),
+  validate(['user', User.isUser]),
   UserRoutes.add,
 );
 
 // Update one user
 userRouter.put(
   Paths.Users.Update,
-  validate(['user', User.IsUserObj]),
+  validate(['user', User.isUser]),
   UserRoutes.update,
 );
 

package/package.json

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