nodefony 7.0.0-beta.8 → 7.0.0

package/cli/builder/bundles/controller.js

@@ -1,8 +1,7 @@
 const regController = /^(.*)Controller$/;
 
 class generateController extends nodefony.Builder {
-
-  constructor(cli, options = {}) {
+  constructor (cli, options = {}) {
     super(cli, cli.cmd, cli.args);
     this.directory = "controller";
     this.bundle = this.kernel.getBundle("app");
@@ -13,65 +12,62 @@ class generateController extends nodefony.Builder {
       directory: this.directory,
       bundle: this.bundle.name,
       controllerName: "defaultController",
-      shortName:"default"
+      shortName: "default"
     }, options);
-
   }
 
-  interaction( ) {
+  interaction () {
     return this.cli.prompt([{
-        type: 'input',
-        name: 'controllerName',
-        default: (response) => {
-          if (response.bundle === "Quit") {
-            return Promise.reject("Quit");
-          }
-          return `${this.bundle.name}Controller`;
-        },
-        message: `Enter Controller Name : `,
-        validate: (value, response) => {
-          if (value) {
-            try {
-              this.checkName( value, response);
-            } catch (e) {
-              return e.message;
-            }
-            return true;
+      type: "input",
+      name: "controllerName",
+      default: (response) => {
+        if (response.bundle === "Quit") {
+          return Promise.reject("Quit");
+        }
+        return `${this.bundle.name}Controller`;
+      },
+      message: "Enter Controller Name : ",
+      validate: (value, response) => {
+        if (value) {
+          try {
+            this.checkName(value, response);
+          } catch (e) {
+            return e.message;
           }
-          return `${value} Unauthorised Please enter a valid Controller name`;
+          return true;
         }
+        return `${value} Unauthorised Please enter a valid Controller name`;
+      }
     }]);
   }
 
-  setBundle(bundle){
-    this.bundle = bundle ;
-    this.response.bundle = bundle.name ;
-    //console.log(this.response)
-    //console.log(this.bundle.bundleName)
-    this.response.bundleName = this.bundle.bundleName ;
+  setBundle (bundle) {
+    this.bundle = bundle;
+    this.response.bundle = bundle.name;
+    // console.log(this.response)
+    // console.log(this.bundle.bundleName)
+    this.response.bundleName = this.bundle.bundleName;
     this.setLocation(path.resolve(bundle.path, "controller"));
   }
 
-  createBuilder() {
+  createBuilder () {
     this.buildFront(this.response, this.bundle.path);
     return this.Front.generateController(this.response.directory);
   }
 
-  checkName(name, response) {
-    let res = regController.exec(name);
+  checkName (name, response) {
+    const res = regController.exec(name);
     this.shortName = null;
     if (res) {
       this.name = name;
       this.shortName = res[1];
-      response.name = this.shortName ;
-      response.shortName = this.shortName ;
-      response.directory = this.shortName ;
+      response.name = this.shortName;
+      response.shortName = this.shortName;
+      response.directory = this.shortName;
     } else {
-      throw new Error("Bad controller name : " + name);
+      throw new Error(`Bad controller name : ${name}`);
     }
   }
-
-
 }
 
 module.exports = generateController;

package/cli/builder/bundles/users-bundle/Command/fixtureTask.js

@@ -1,15 +1,16 @@
 class fixtureTask extends nodefony.Task {
-
-  constructor(name, command) {
+  constructor (name, command) {
     super(name, command);
     this.bundle = command.bundle;
   }
 
-  showHelp() {
-    this.setHelp("users:fixtures:default",
+  showHelp () {
+    this.setHelp(
+      "users:fixtures:default",
       "Generate admin, anonymous and 3 common users `nodefony  users:fixtures:default` "
     );
-    this.setHelp("users:fixtures:random nb",
+    this.setHelp(
+      "users:fixtures:random nb",
       "Generate ramdom users with faker `nodefony users:fixtures:random 10` "
     );
   }
@@ -19,30 +20,28 @@ class fixtureTask extends nodefony.Task {
       const fixtures = this.bundle.getFixture("users");
       if (fixtures) {
         this.log(`LOAD FIXTURES users : ${args}`, "INFO");
-        let inst = new fixtures(this.container);
+        const inst = new fixtures(this.container);
         return await inst.run(args);
       }
-      throw new Error(`users fixtures not found `);
-
+      throw new Error("users fixtures not found ");
     } catch (e) {
       throw e;
     }
   }
 
-  async random(args = null) {
+  async random (args = null) {
     try {
       const fixtures = this.bundle.getFixture("users");
       if (fixtures) {
         this.log(`RANDOM FIXTURES users : ${args}`, "INFO");
-        let inst = new fixtures(this.container);
+        const inst = new fixtures(this.container);
         return await inst.run(args);
       }
-      throw new Error(`users fixtures not found `);
+      throw new Error("users fixtures not found ");
     } catch (e) {
       throw e;
     }
   }
-
 }
 
 module.exports = fixtureTask;

package/cli/builder/bundles/users-bundle/Command/usersCommand.js

@@ -1,26 +1,29 @@
 const fixtureTask = require(path.resolve(__dirname, "fixtureTask.js"));
 
 class usersCommand extends nodefony.Command {
-  constructor(cli, bundle) {
+  constructor (cli, bundle) {
     super("users", cli, bundle);
     this.usersService = this.get("users");
     this.setTask("fixtures", fixtureTask);
   }
 
-  showHelp() {
-    this.setHelp("users:show [user]",
+  showHelp () {
+    this.setHelp(
+      "users:show [user]",
       "nodefony users:show admin"
     );
-    this.setHelp("users:find [--json] username",
+    this.setHelp(
+      "users:find [--json] username",
       "nodefony --json users:find admin"
     );
-    this.setHelp("users:findAll [--json]",
+    this.setHelp(
+      "users:findAll [--json]",
       "nodefony --json users:findAll"
     );
     super.showHelp();
   }
 
-  async show(username) {
+  async show (username) {
     let obj = null;
     if (username) {
       obj = await this.find(username);
@@ -29,43 +32,40 @@ class usersCommand extends nodefony.Command {
     }
   }
 
-  find(username) {
+  find (username) {
     return this.usersService.findOne(username)
       .then((res) => {
         if (this.cli.commander.opts().json) {
           return process.stdout.write(`${JSON.stringify(res)}\n`);
-        } else {
-          return this.display(res);
         }
-      }).catch(e => {
+        return this.display(res);
+      })
+      .catch((e) => {
         if (this.cli.commander.opts().json) {
           return process.stdout.write(`${JSON.stringify({})}\n`);
-        } else {
-          throw e;
         }
+        throw e;
       });
   }
 
-  findAll() {
+  findAll () {
     return this.usersService.find()
       .then((res) => {
         if (this.cli.commander.opts().json) {
           return process.stdout.write(`${JSON.stringify(res.rows)}\n`);
-        } else {
-          return this.display(res.rows);
         }
+        return this.display(res.rows);
       })
-      .catch(e => {
+      .catch((e) => {
         if (this.cli.commander.opts().json) {
           return process.stdout.write(`${JSON.stringify({})}\n`);
-        } else {
-          throw e;
         }
+        throw e;
       });
   }
 
-  display(obj) {
-    this.cli.logger("START TABLE : " + this.cli.getEmoji("clapper"));
+  display (obj) {
+    this.cli.logger(`START TABLE : ${this.cli.getEmoji("clapper")}`);
     const type = nodefony.typeOf(obj);
     if (type === "object" || type === null) {
       if (!obj) {
@@ -74,7 +74,7 @@ class usersCommand extends nodefony.Command {
         obj = [obj];
       }
     }
-    let options = {
+    const options = {
       head: [
         "username",
         "First Name",
@@ -85,7 +85,7 @@ class usersCommand extends nodefony.Command {
         "Enabled"
       ]
     };
-    let table = this.cli.displayTable([], options);
+    const table = this.cli.displayTable([], options);
     for (let i = 0; i < obj.length; i++) {
       const user = obj[i];
       table.push([
@@ -99,8 +99,7 @@ class usersCommand extends nodefony.Command {
       ]);
     }
     console.log(table.toString());
-    this.cli.logger("END TABLE : " + this.cli.getEmoji("checkered_flag"));
+    this.cli.logger(`END TABLE : ${this.cli.getEmoji("checkered_flag")}`);
   }
-
 }
 module.exports = usersCommand;

package/cli/builder/bundles/users-bundle/Entity/mongoose/userEntity.js

@@ -5,29 +5,18 @@
  *
  *
  */
-//const Mongoose = require('mongoose');
-const Schema = require('mongoose').Schema;
-const mongoosePaginate = require('mongoose-paginate-v2');
-const validator = require('validator');
+// const Mongoose = require('mongoose');
+const {Schema} = require("mongoose");
+const mongoosePaginate = require("mongoose-paginate-v2");
+const validator = require("validator");
 
 class userEntity extends nodefony.Entity {
-
-  constructor(bundle) {
-    /*
-     *   @param bundle instance
-     *   @param Entity name
-     *   @param orm name
-     *   @param connection name
-     */
+  constructor (bundle) {
     super(bundle, "user", "mongoose", "nodefony");
-    this.once("onConnect", (name, db) => {
-      this.model = this.registerModel(db);
-      this.orm.setEntity(this);
-    });
   }
 
-  getSchema() {
-    //const encodePassword = this.encode.bind(this);
+  getSchema () {
+    // const encodePassword = this.encode.bind(this);
     return {
       username: {
         type: String,
@@ -65,7 +54,7 @@ class userEntity extends nodefony.Entity {
         type: String,
         unique: true,
         required: true,
-        validate: [validator.isEmail, 'invalid email {VALUE}'],
+        validate: [validator.isEmail, "invalid email {VALUE}"],
         createIndexes: {
           unique: true
         }
@@ -78,7 +67,7 @@ class userEntity extends nodefony.Entity {
             if (value === "") {
               return true;
             }
-            return validator.matches(value, /[^\w]|_|-|.|'/g);
+            return validator.matches(value, /[^\w]|_|-|.|'/gu);
           },
           message: "name allow alphanumeric characters {VALUE}"
         }
@@ -91,7 +80,7 @@ class userEntity extends nodefony.Entity {
             if (value === "") {
               return true;
             }
-            return validator.matches(value, /[^\w]|_|-|.|'/g);
+            return validator.matches(value, /[^\w]|_|-|.|'/gu);
           },
           message: "surname allow alphanumeric characters {VALUE}"
         }
@@ -117,8 +106,8 @@ class userEntity extends nodefony.Entity {
     };
   }
 
-  validPassword(value) {
-    let valid = validator.isLength(value, {
+  validPassword (value) {
+    const valid = validator.isLength(value, {
       min: 4,
       max: undefined
     });
@@ -128,46 +117,46 @@ class userEntity extends nodefony.Entity {
     return value;
   }
 
-  registerModel(db) {
-    let mySchema = new Schema(this.getSchema(), {
+  registerModel (db) {
+    const mySchema = new Schema(this.getSchema(), {
       timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
+        createdAt: "createdAt",
+        updatedAt: "updatedAt"
       }
     });
     mySchema.plugin(mongoosePaginate);
-    let entity = this;
-    mySchema.pre('save', function (next) {
-      if (!this.isModified('password')) {
+    const entity = this;
+    mySchema.pre("save", function (next) {
+      if (!this.isModified("password")) {
         return next();
       }
       entity.logger("hash password ", "DEBUG");
       entity.validPassword(this.password);
       return entity.encode(this.password)
-        .then(hash => {
+        .then((hash) => {
           entity.logger(hash, "DEBUG");
           this.password = hash;
           return hash;
         })
-        .catch(err => {
+        .catch((err) => {
           entity.logger(err, "ERROR");
           throw err;
         });
     });
-    mySchema.pre('updateOne', function (next) {
-      //const data = this.getUpdate();
-      let password = this.get("password");
+    mySchema.pre("updateOne", function (next) {
+      // const data = this.getUpdate();
+      const password = this.get("password");
       if (!password) {
         return next();
       }
       entity.logger("update password hash", "DEBUG");
       entity.validPassword(password);
       return entity.encode(password)
-        .then(hash => {
+        .then((hash) => {
           entity.logger(hash, "DEBUG");
           this._update.password = hash;
         })
-        .catch(err => {
+        .catch((err) => {
           entity.logger(err, "ERROR");
           throw err;
         });
@@ -176,4 +165,4 @@ class userEntity extends nodefony.Entity {
   }
 }
 
-module.exports = userEntity;
+module.exports = userEntity;

package/cli/builder/bundles/users-bundle/Entity/sequelize/userEntity.js

@@ -2,8 +2,9 @@ const {
   Sequelize,
   DataTypes,
   Model
-} = nodefony.Sequelize; //require("sequelize");
-const validator = require('validator');
+} = nodefony.Sequelize; // require("sequelize");
+const validator = require("validator");
+
 /*
  *
  *
@@ -12,8 +13,8 @@ const validator = require('validator');
  *
  */
 class userEntity extends nodefony.Entity {
+  constructor (bundle) {
 
-  constructor(bundle) {
     /*
      *   @param bundle instance
      *   @param Entity name
@@ -21,7 +22,8 @@ class userEntity extends nodefony.Entity {
      *   @param connection name
      */
     super(bundle, "user", "sequelize", "nodefony");
-    /*this.orm.on("onOrmReady", ( orm ) => {
+
+    /* this.orm.on("onOrmReady", ( orm ) => {
         let session = this.orm.getEntity("session");
         if (session) {
           this.model.hasMany(session, {
@@ -35,7 +37,8 @@ class userEntity extends nodefony.Entity {
       });*/
   }
 
-  getSchema() {
+  // eslint-disable-next-line max-lines-per-function
+  getSchema () {
     return {
       username: {
         type: DataTypes.STRING(126),
@@ -45,9 +48,10 @@ class userEntity extends nodefony.Entity {
         validate: {
           is: {
             args: /^[\w-_.]+$/,
-            msg: `username allow alphanumeric and ( _ | - | . ) characters`
+            msg: "username allow alphanumeric and ( _ | - | . ) characters"
           }
-          /*notIn: {
+
+          /* notIn: {
             args: [['admin', 'root']],
             msg: `username don't allow (admin , root) login name`
           }*/
@@ -55,13 +59,14 @@ class userEntity extends nodefony.Entity {
       },
       password: {
         type: DataTypes.STRING(256),
-        allowNull: false,
-        validate: {
+        allowNull: false
+
+        /* validate: {
           min: {
             args: [[4]],
-            msg: `password  allow 4 characters min  `
+            msg: "password  allow 4 characters min  "
           }
-        }
+        }*/
       },
       "2fa": {
         type: DataTypes.BOOLEAN,
@@ -86,7 +91,7 @@ class userEntity extends nodefony.Entity {
       },
       email: {
         type: DataTypes.STRING,
-        //primaryKey: true,
+        // primaryKey: true,
         unique: true,
         allowNull: false,
         validate: {
@@ -101,7 +106,7 @@ class userEntity extends nodefony.Entity {
         validate: {
           is: {
             args: /^[\w-_.]*$/,
-            msg: `name allow alphanumeric characters`
+            msg: "name allow alphanumeric characters"
           }
         }
       },
@@ -111,7 +116,7 @@ class userEntity extends nodefony.Entity {
         validate: {
           is: {
             args: /^[\w-_.]*$/,
-            msg: `surname allow alphanumeric characters`
+            msg: "surname allow alphanumeric characters"
           }
         }
       },
@@ -122,9 +127,9 @@ class userEntity extends nodefony.Entity {
       roles: {
         type: DataTypes.JSON,
         defaultValue: ["ROLE_USER"],
-        get(key) {
+        get (key) {
           let val = this.getDataValue(key);
-          if (typeof (val) === "string") {
+          if (typeof val === "string") {
             val = JSON.parse(val);
           }
           return val;
@@ -145,8 +150,8 @@ class userEntity extends nodefony.Entity {
     };
   }
 
-  validPassword(value) {
-    let valid = validator.isLength(value, {
+  validPassword (value) {
+    const valid = validator.isLength(value, {
       min: 4,
       max: undefined
     });
@@ -156,17 +161,22 @@ class userEntity extends nodefony.Entity {
     return value;
   }
 
-  registerModel(db) {
+  registerModel (db) {
     class MyModel extends Model {
-      hasRole(name){
-        for (let role in this.roles) {
+      static associate (models) {
+        // define association here
+      }
+
+      hasRole (name) {
+        for (const role in this.roles) {
           if (this.roles[role] === name) {
             return true;
           }
         }
         return false;
       }
-      isGranted(role){
+
+      isGranted (role) {
         return this.hasRole(role);
       }
     }
@@ -175,12 +185,13 @@ class userEntity extends nodefony.Entity {
       modelName: this.name,
       hooks: {
         beforeCreate: (user) => {
+          console.log("beforeCreate", user);
           this.validPassword(user.password);
           return this.encode(user.password)
-            .then(hash => {
+            .then((hash) => {
               user.password = hash;
             })
-            .catch(err => {
+            .catch((err) => {
               this.logger(err, "ERROR");
               throw err;
             });
@@ -189,10 +200,10 @@ class userEntity extends nodefony.Entity {
           if ("password" in userUpate.attributes) {
             this.validPassword(userUpate.attributes.password);
             return this.encode(userUpate.attributes.password)
-              .then(hash => {
+              .then((hash) => {
                 userUpate.attributes.password = hash;
               })
-              .catch(err => {
+              .catch((err) => {
                 this.logger(err, "ERROR");
                 throw err;
               });
@@ -200,19 +211,19 @@ class userEntity extends nodefony.Entity {
         }
       },
       freezeTableName: true,
-      //add indexes
+      // add indexes
       indexes: [{
         unique: true,
-        fields: ['email']
+        fields: ["email"]
       }]
       // add custom validations
-      //validate: {}
+      // validate: {}
     });
     return MyModel;
   }
 
-  logger(pci /*, sequelize*/ ) {
-    const msgid = "Entity " + this.name;
+  logger (pci /* , sequelize*/) {
+    const msgid = `Entity ${this.name}`;
     return super.logger(pci, "DEBUG", msgid);
   }
 }