nodefony 7.0.0-beta.2 → 7.0.0-beta.21

package/kernel/kernelWatcher.es6

@@ -8,15 +8,15 @@ const defaultWatcherSettings = {
   followSymlinks: true,
   alwaysStat: false,
   depth: 50,
-  //usePolling: true,
-  //interval: 500,
-  //binaryInterval: 300,
+  // usePolling: true,
+  // interval: 500,
+  // binaryInterval: 300,
   awaitWriteFinish: true,
   atomic: true // or a custom 'atomicity delay', in milliseconds (default 100)
 };
 
 class Watcher extends nodefony.Watcher {
-  constructor(Path, settings, bundle) {
+  constructor (Path, settings, bundle) {
     super(Path, nodefony.extend(true, {}, defaultWatcherSettings, settings), bundle.container);
     if (bundle) {
       this.bundle = bundle;
@@ -26,32 +26,32 @@ class Watcher extends nodefony.Watcher {
     this.webpackService = this.get("webpack");
   }
 
-  log(payload, severity, msgid, msg) {
+  log (payload, severity, msgid, msg) {
     if (severity === "ERROR") {
       console.trace(payload);
     }
     if (typeof payload === "string") {
       let txt = "\x1b[36m";
       if (this.bundle) {
-        txt += "BUNDLE " + this.bundle.name + "\x1b[0m ";
+        txt += `BUNDLE ${this.bundle.name}\x1b[0m `;
       }
       txt += payload;
-      msgid = "\x1b[36mWATCHER EVENT " + msgid + "\x1b[0m";
+      msgid = `\x1b[36mWATCHER EVENT ${msgid}\x1b[0m`;
       payload = txt;
     }
     return super.log(payload, severity, msgid, msg);
   }
 
-  setSockjsServer(server) {
+  setSockjsServer (server) {
     this.sockjs = server;
   }
 
-  listenWatcherController() {
-    this.on('all', (event, Path) => {
-      let basename = path.basename(Path);
+  listenWatcherController () {
+    this.on("all", (event, Path) => {
+      const basename = path.basename(Path);
       let res = null;
       let name = null;
-      let file = this.cwd + "/" + Path;
+      const file = `${this.cwd}/${Path}`;
       switch (event) {
       case "addDir":
         this.log(Path, "WARNING", event);
@@ -61,7 +61,7 @@ class Watcher extends nodefony.Watcher {
         this.log(Path, "INFO", event);
         try {
           switch (true) {
-            // controller
+          // controller
           case this.bundle.regController.test(basename):
             res = this.bundle.regController.exec(basename);
             if (res) {
@@ -98,7 +98,7 @@ class Watcher extends nodefony.Watcher {
           res = this.bundle.regController.exec(basename);
           name = res[1];
           if (this.bundle.controllers[name]) {
-            this.log("REMOVE CONTROLLER : " + Path, "INFO", event);
+            this.log(`REMOVE CONTROLLER : ${Path}`, "INFO", event);
             delete this.bundle.controllers[name];
             this.bundle.controllers[name] = null;
           }
@@ -110,8 +110,8 @@ class Watcher extends nodefony.Watcher {
     });
   }
 
-  listenWatcherView() {
-    this.on('all', async (event, Path) => {
+  listenWatcherView () {
+    this.on("all", async (event, Path) => {
       let file = null;
       switch (event) {
       case "addDir":
@@ -120,14 +120,14 @@ class Watcher extends nodefony.Watcher {
       case "add":
       case "change":
         this.log(Path, "INFO", event);
-        file = this.cwd + "/" + Path;
+        file = `${this.cwd}/${Path}`;
         try {
-          let fileClass = new nodefony.fileClass(file);
-          let ele = await this.bundle.recompileTemplate(fileClass);
+          const fileClass = new nodefony.fileClass(file);
+          const ele = await this.bundle.recompileTemplate(fileClass);
           if (ele.basename === ".") {
-            this.log("RECOMPILE Template : '" + this.bundle.name + "Bundle:" + "" + ":" + ele.name + "'", "INFO", event);
+            this.log(`${String(`RECOMPILE Template : '${this.bundle.name}Bundle:`)}:${ele.name}'`, "INFO", event);
           } else {
-            this.log("RECOMPILE Template : '" + this.bundle.name + "Bundle:" + ele.basename + ":" + ele.name + "'", "INFO", event);
+            this.log(`RECOMPILE Template : '${this.bundle.name}Bundle:${ele.basename}:${ele.name}'`, "INFO", event);
           }
           if (this.sockjs) {
             switch (this.bundle.settings.type) {
@@ -137,7 +137,6 @@ class Watcher extends nodefony.Watcher {
             default:
               this.sockjs.sendWatcher("change", file);
             }
-
           }
         } catch (e) {
           this.log(e, "ERROR", event);
@@ -157,23 +156,21 @@ class Watcher extends nodefony.Watcher {
         break;
       case "unlink":
         this.log(Path, "INFO", event);
-        file = this.cwd + "/" + Path;
-        let parse = path.parse(file);
-        if (parse.ext === "." + this.bundle.serviceTemplate.extention) {
-          let name = parse.name;
-          let directory = path.basename(parse.dir);
+        file = `${this.cwd}/${Path}`;
+        const parse = path.parse(file);
+        if (parse.ext === `.${this.bundle.serviceTemplate.extention}`) {
+          const {name} = parse;
+          const directory = path.basename(parse.dir);
           if (directory !== "views") {
             if (this.bundle.views[directory]) {
               if (this.bundle.views[directory][name]) {
                 delete this.bundle.views[directory][name];
-                this.log("REMOVE TEMPLATE : " + file, "INFO", event);
+                this.log(`REMOVE TEMPLATE : ${file}`, "INFO", event);
               }
             }
-          } else {
-            if (this.bundle.views["."][name]) {
-              delete this.bundle.views["."][name];
-              this.log("REMOVE TEMPLATE : " + file, "INFO", event);
-            }
+          } else if (this.bundle.views["."][name]) {
+            delete this.bundle.views["."][name];
+            this.log(`REMOVE TEMPLATE : ${file}`, "INFO", event);
           }
         }
         break;
@@ -182,8 +179,8 @@ class Watcher extends nodefony.Watcher {
     });
   }
 
-  listenWatcherI18n() {
-    this.on('all', (event, Path) => {
+  listenWatcherI18n () {
+    this.on("all", (event, Path) => {
       let file = null;
       switch (event) {
       case "addDir":
@@ -192,13 +189,13 @@ class Watcher extends nodefony.Watcher {
       case "add":
       case "change":
         this.log(Path, "INFO", event);
-        file = this.cwd + "/" + Path;
+        file = `${this.cwd}/${Path}`;
         try {
           const fileClass = new nodefony.fileClass(file);
           fileClass.matchName(this.bundle.regI18nFile);
-          let domain = fileClass.match[1];
-          let Locale = fileClass.match[2];
-          //console.log(`${file} : ${domain} : ${Locale}`)
+          const domain = fileClass.match[1];
+          const Locale = fileClass.match[2];
+          // console.log(`${file} : ${domain} : ${Locale}`)
           this.bundle.translation.reader(fileClass.path, this.bundle, Locale, domain);
           if (this.sockjs) {
             this.sockjs.sendWatcher("change", file);
@@ -225,20 +222,21 @@ class Watcher extends nodefony.Watcher {
       }
     });
   }
-  listenWatcherConfig() {
-    this.on('all', (event, Path) => {
+
+  listenWatcherConfig () {
+    this.on("all", (event, Path) => {
       let file = null;
       switch (event) {
       case "addDir":
-        this.log(Path, "INFO", event);
+        this.log(`Add dir ${Path}`, "INFO", event);
         break;
       case "add":
       case "change":
-        this.log(Path, "INFO", event);
-        let basename = path.basename(Path);
+        this.log(`${Path}`, "INFO", event);
+        const basename = path.basename(Path);
         let name = null;
         let res = null;
-        file = this.cwd + "/" + Path;
+        file = `${this.cwd}/${Path}`;
         switch (true) {
         case this.bundle.regRoutingFile.test(basename):
           res = this.bundle.regRoutingFile.exec(basename);
@@ -260,7 +258,7 @@ class Watcher extends nodefony.Watcher {
           }
           break;
         case this.bundle.regWebpackCongig.test(basename):
-          let myPath = path.resolve(this.bundle.path, Path);
+          const myPath = path.resolve(this.bundle.path, Path);
           delete require.cache[myPath];
           if (!this.bundle.webpackConfigFile) {
             return;
@@ -282,7 +280,17 @@ class Watcher extends nodefony.Watcher {
                 });
             });
           }
-
+          break;
+        case (/config\.(js|yml|xml)/).test(basename):
+          this.kernel.readConfigFile.call(this.bundle, this.bundle.name, `${this.bundle.path}/${Path}`, (config) => {
+            if (config) {
+              this.setParameters(`bundles.${this.bundle.name}`, config);
+              this.bundle.settings = config;
+            }
+            if (this.sockjs) {
+              this.sockjs.sendWatcher("change", file);
+            }
+          });
           break;
         default:
           try {
@@ -309,7 +317,8 @@ class Watcher extends nodefony.Watcher {
         break;
       case "unlink":
         this.log(Path, "INFO", event);
-        /*file = this.cwd + "/" + Path ;
+
+        /* file = this.cwd + "/" + Path ;
           try{
           const fileClass = new nodefony.fileClass(file);
           this.router.removeRoutes(fileClass.path);
@@ -320,8 +329,9 @@ class Watcher extends nodefony.Watcher {
       }
     });
   }
-  listenWatcherServices() {
-    this.on('all', async (event, Path) => {
+
+  listenWatcherServices () {
+    this.on("all", async (event, Path) => {
       switch (event) {
       case "addDir":
         this.log(Path, "INFO", event);
@@ -334,12 +344,12 @@ class Watcher extends nodefony.Watcher {
       case "change":
         try {
           this.log(Path, "INFO", event);
-          let file = this.cwd + "/" + Path;
-          let basename = path.basename(file);
+          const file = `${this.cwd}/${Path}`;
+          const basename = path.basename(file);
           switch (true) {
-            // service
+          // service
           case this.bundle.regService.test(basename):
-            let File = new nodefony.fileClass(file);
+            const File = new nodefony.fileClass(file);
             await this.bundle.reloadWatcherService(File, file, true);
             break;
           default:

package/kernel/orm/entity.es6

@@ -1,7 +1,6 @@
-module.exports = nodefony.register("Entity", function () {
-
+module.exports = nodefony.register("Entity", () => {
   class Entity extends nodefony.Service {
-    constructor(bundle, name, orm, connectionName) {
+    constructor (bundle, name, orm, connectionName) {
       super(name, bundle.container);
       this.bundle = bundle;
       this.orm = this.get(orm);
@@ -9,9 +8,9 @@ module.exports = nodefony.register("Entity", function () {
       this.model = null;
       this.encoder = null;
       if (!this.orm) {
-        throw new Error(this.name + " entity can't be registered  ORM not found : " + orm);
+        throw new Error(`${this.name} entity can't be registered  ORM not found : ${orm}`);
       }
-      this.orm.on('onConnect', (connectionName, db) => {
+      this.orm.on("onConnect", (connectionName, db) => {
         if (connectionName === this.connectionName) {
           this.db = db;
           this.model = this.registerModel(this.db);
@@ -20,25 +19,25 @@ module.exports = nodefony.register("Entity", function () {
       });
     }
 
-    logger(pci, severity, msgid, msg) {
+    logger (pci, severity, msgid, msg) {
       if (!msgid) {
-        msgid = "Entity " + this.name;
+        msgid = `Entity ${this.name}`;
       }
       return super.logger(pci, severity, msgid, msg);
     }
 
-    setEncoder(encoder) {
+    setEncoder (encoder) {
       if (encoder instanceof nodefony.Encoder) {
         return this.encoder = encoder;
       }
       throw new Error(`setEncoder : Entity ${this.name} encoder must be an instance of nodefony.Encoder`);
     }
 
-    getEncoder() {
+    getEncoder () {
       return this.encoder;
     }
 
-    hasEncoder() {
+    hasEncoder () {
       if (this.encoder instanceof nodefony.Encoder) {
         return true;
       }
@@ -48,13 +47,12 @@ module.exports = nodefony.register("Entity", function () {
       throw new Error(`setEncoder : Entity ${this.name} encoder must be an instance of nodefony.Encoder`);
     }
 
-    async encode(value) {
+    async encode (value) {
       if (this.hasEncoder()) {
         return await this.encoder.encodePassword.apply(this.encoder, arguments);
       }
       return value;
     }
-
   }
 
   return Entity;

package/kernel/orm/orm.es6

@@ -1,116 +1,136 @@
-const connectionMonitor = function ( /*name, db*/ ) {
-  this.connectionNotification++;
-  if (Object.keys(this.settings.connectors).length === this.connectionNotification) {
-    process.nextTick(() => {
-      if (this.kernel.type !== "CONSOLE") {
-        this.log('onOrmReady', "INFO", `EVENTS ${this.name} ORM`);
-      }
-        //this.log('onOrmReady', "INFO", `EVENTS ${this.name} ORM`);
-      this.fire('onOrmReady', this);
-      this.ready = true;
-    });
-  }
-};
 
 class Orm extends nodefony.Service {
-
-  constructor(name, container /*, kernel, autoLoader*/ ) {
-    super(name, container);
-    if ((this.kernel.debug === false && this.debug === true) || this.debug === undefined) {
+  constructor (name, container /* , kernel, autoLoader*/) {
+    super(name, container, null, {
+      events: {
+        nbListeners: 100
+      }
+    });
+    if (this.kernel.debug === false && this.debug === true || this.debug === undefined) {
       this.debug = this.kernel.debug;
     }
     this.entities = {};
     this.connections = {};
     this.connectionNotification = 0;
     this.ready = false;
+    this.prependOnceListener("onOrmReady", async () => {
+      if (this.bundle.booted) {
+        return await this.bundle.emitAsync("onReady", this.bundle)
+          .then(() => {
+            this.bundle.ready = true;
+          })
+          .catch((e) => {
+            throw e;
+          });
+      }
+      this.bundle.ready = true;
+    });
+  }
+
+  boot () {
+    this.on("onConnect", async (connection) => this.ormReady(connection));
+    this.on("onErrorConnection", async (connection, error) => this.ormReady(connection, error));
   }
 
-  boot() {
-    this.on("onConnect", connectionMonitor.bind(this));
-    this.on("onErrorConnection", connectionMonitor.bind(this));
+  ormReady (connection, error = null) {
+    const nbConnectors = Object.keys(this.settings.connectors).length;
+    this.connectionNotification++;
+    if (error) {
+      this.log(error, "ERROR");
+    }
+    if (nbConnectors === this.connectionNotification) {
+      process.nextTick(async () => await this.emitAsync("onOrmReady", this)
+        .then(() => {
+          if (this.kernel.type !== "CONSOLE") {
+            this.log("onOrmReady", "INFO", `EVENTS ${this.name} ORM`);
+          }
+          this.connectionNotification = 0;
+          this.ready = true;
+        })
+        .catch((e) => {
+          this.log(e, "ERROR");
+        }));
+    }
   }
 
-  log(pci, severity, msgid, msg) {
+  log (pci, severity, msgid, msg) {
     if (!msgid) {
-      msgid = this.kernel.cli.clc.magenta(this.name + " ");
+      msgid = this.kernel.cli.clc.magenta(`${this.name} `);
     }
     return super.log(pci, severity, msgid, msg);
   }
 
-  getConnection(name) {
+  getConnection (name) {
     if (this.connections[name]) {
       return this.connections[name].db;
     }
     return null;
   }
 
-  getConnections(name) {
+  getConnections (name) {
     if (name) {
       return this.getConnection(name);
     }
     return this.connections;
   }
 
-  getEntity(name) {
+  getEntity (name) {
     if (name) {
       if (name in this.entities) {
         return this.entities[name].model;
       }
       return null;
-    } else {
-      return this.entities;
     }
+    return this.entities;
   }
 
-  getNodefonyEntity(name) {
+  getNodefonyEntity (name) {
     if (name) {
       if (name in this.entities) {
         return this.entities[name];
       }
       return null;
-    } else {
-      return this.entities;
     }
+    return this.entities;
   }
 
-  getEntityTable(severity = "DEBUG") {
-    let options = {
+  getEntityTable (severity = "DEBUG") {
+    const options = {
       head: [
-          "NAME ENTITY",
-          "BUNDLE",
-          "CONNECTION"
-        ]
+        "NAME ENTITY",
+        "BUNDLE",
+        "CONNECTION"
+      ]
     };
-    let table = this.kernel.cli.displayTable(null, options);
-    for (let entity in this.entities) {
-      let tab = ["", "", ""];
+    const table = this.kernel.cli.displayTable(null, options);
+    for (const entity in this.entities) {
+      const tab = ["", "", ""];
       tab[0] = this.entities[entity].name;
       tab[1] = this.entities[entity].bundle.name;
       tab[2] = this.entities[entity].connectionName;
       table.push(tab);
     }
-    let res = table.toString();
-    this.log("ORM ENTITY LIST  : \n" + res, severity);
+    const res = table.toString();
+    this.log(`ORM ENTITY LIST  : \n${res}`, severity);
     return res;
-
   }
 
-  setEntity(entity) {
+  setEntity (entity) {
     if (!entity) {
-      throw new Error(this.name + " setEntity : entity  is null ");
+      throw new Error(`${this.name} setEntity : entity  is null `);
     }
     if (!(entity instanceof nodefony.Entity)) {
-      throw new Error(this.name + " setEntity  : not instance of nodefony.Entity");
+      throw new Error(`${this.name} setEntity  : not instance of nodefony.Entity`);
     }
     if (this.entities[entity.name]) {
-      throw new Error(this.name + " setEntity  : Entity Already exist " + entity.name);
+      throw new Error(`${this.name} setEntity  : Entity Already exist ${entity.name}`);
     }
     if (!entity.model) {
-      throw new Error(this.name + " setEntity  : Bundle : " + entity.bundle.name + " Model is undefined in Entity : " + entity.name);
+      throw new Error(`${this.name} setEntity  : Bundle : ${entity.bundle.name} Model is undefined in Entity : ${entity.name}`);
     }
     this.entities[entity.name] = entity;
     if (this.kernel.type === "SERVER") {
-      this.log(" REGISTER ENTITY : " + entity.name + " PROVIDE BUNDLE : " + entity.bundle.name, "INFO");
+      this.log(` REGISTER ENTITY : ${entity.name} PROVIDE BUNDLE : ${entity.bundle.name}`, "INFO");
     }
   }
 }