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

package/builder.es6

@@ -1,6 +1,5 @@
 class Builder extends nodefony.Service {
-
-  constructor(cli, cmd, args) {
+  constructor (cli, cmd, args) {
     super("BUILDER", cli.container, cli.notificationsCenter);
     this.cli = cli;
     this.twig = twig;
@@ -11,7 +10,7 @@ class Builder extends nodefony.Service {
     this.force = false;
     this.twigOptions = {
       views: process.cwd(),
-      'twig options': {
+      "twig options": {
         async: false,
         cache: false
       }
@@ -19,62 +18,55 @@ class Builder extends nodefony.Service {
     this.response = nodefony.extend(true, {}, this.cli.response);
   }
 
-  setLocation(location) {
+  setLocation (location) {
     if (location instanceof nodefony.fileClass) {
       return this.location = location.path;
     }
     return this.location = path.resolve(location);
   }
 
-  setEnv(env) {
+  setEnv (env) {
     process.env.NODE_ENV = env || "development";
   }
 
-  async run(interactive) {
+  async run (interactive) {
     if (interactive) {
       this.interactive = interactive;
       return this.interaction()
         .then((response) => {
-          //this.log(this.response, "WARNING")
+          // this.log(this.response, "WARNING")
           nodefony.extend(true, this.response, response);
-          //this.log(this.response)
+          // this.log(this.response)
           nodefony.extend(true, this.cli.response, this.response);
-          //this.log(this.cli.response,"CRITIC")
+          // this.log(this.cli.response,"CRITIC")
           return this.generate(response, this.force)
-            .then((response) => {
-              return {
-                response: response,
-                builder: this
-              };
-            })
-            .catch(e => {
+            .then((response) => ({
+              response,
+              builder: this
+            }))
+            .catch((e) => {
               throw e;
             });
         })
-        .catch(e => {
-          throw e;
-        });
-    } else {
-      return this.generate(null, this.force)
-        .then((response) => {
-          return {
-            response: response,
-            builder: this
-          };
-        })
-        .catch(e => {
+        .catch((e) => {
           throw e;
         });
     }
+    return this.generate(null, this.force)
+      .then((response) => ({
+        response,
+        builder: this
+      }))
+      .catch((e) => {
+        throw e;
+      });
   }
 
-  interaction() {
-    return new Promise(resolve => {
-      return resolve(this.cli.response);
-    });
+  interaction () {
+    return new Promise((resolve) => resolve(this.cli.response));
   }
 
-  generate(response, force = false) {
+  generate (response, force = false) {
     return new Promise((resolve, reject) => {
       try {
         if (this.createBuilder) {
@@ -88,7 +80,7 @@ class Builder extends nodefony.Service {
     });
   }
 
-  buildFront(response, Path) {
+  buildFront (response, Path) {
     this.Front = null;
     switch (response.front) {
     case "vue":
@@ -97,13 +89,13 @@ class Builder extends nodefony.Service {
     case "react":
       this.Front = new nodefony.builders.react(this.cli, this.cmd, this.args, response);
       break;
-    case 'electron':
+    case "electron":
       this.Front = null;
       break;
-    case 'api':
+    case "api":
       this.Front = null;
       break;
-    case 'sandbox':
+    case "sandbox":
     default:
       this.Front = new nodefony.builders.sandbox(this.cli, this.cmd, this.args, response);
       break;
@@ -112,12 +104,12 @@ class Builder extends nodefony.Service {
     return this.Front;
   }
 
-  async removeInteractivePath(file) {
+  async removeInteractivePath (file) {
     return this.cli.prompt([{
-        type: 'confirm',
-        name: 'remove',
-        message: `Do You Want Remove : ${file}?`,
-        default: false
+      type: "confirm",
+      name: "remove",
+      message: `Do You Want Remove : ${file}?`,
+      default: false
     }])
       .then((response) => {
         if (response.remove) {
@@ -133,12 +125,13 @@ class Builder extends nodefony.Service {
         } else {
           return response;
         }
-      }).catch(e => {
+      })
+      .catch((e) => {
         throw e;
       });
   }
 
-  buildSkeleton(skeleton, parse = true, obj = {}, callback = null) {
+  buildSkeleton (skeleton, parse = true, obj = {}, callback = null) {
     let skelete = null;
     if (!callback) {
       return new Promise((resolve, reject) => {
@@ -159,7 +152,7 @@ class Builder extends nodefony.Service {
               });
             } else {
               fs.readFile(skelete.path, {
-                encoding: 'utf8'
+                encoding: "utf8"
               }, (error, result) => {
                 if (error) {
                   return reject(error);
@@ -168,7 +161,7 @@ class Builder extends nodefony.Service {
               });
             }
           } else {
-            let error = new Error(" skeleton must be file !!! : " + skelete.path);
+            const error = new Error(` skeleton must be file !!! : ${skelete.path}`);
             return reject(error);
           }
         } catch (e) {
@@ -188,11 +181,11 @@ class Builder extends nodefony.Service {
           this.twig.renderFile(skelete.path, obj, callback);
         } else {
           callback(null, fs.readFileSync(skelete.path, {
-            encoding: 'utf8'
+            encoding: "utf8"
           }));
         }
       } else {
-        throw new Error(" skeleton must be file !!! : " + skelete.path);
+        throw new Error(` skeleton must be file !!! : ${skelete.path}`);
       }
     } catch (e) {
       this.log(e, "ERROR");
@@ -200,7 +193,7 @@ class Builder extends nodefony.Service {
     return skelete;
   }
 
-  build(obj, parent, force) {
+  build (obj, parent, force) {
     let child = null;
     try {
       if (!(parent instanceof nodefony.fileClass)) {
@@ -220,8 +213,8 @@ class Builder extends nodefony.Service {
         break;
       case "object":
         let name = null;
-        for (let ele in obj) {
-          let value = obj[ele];
+        for (const ele in obj) {
+          const value = obj[ele];
           switch (ele) {
           case "name":
             name = value;
@@ -230,12 +223,12 @@ class Builder extends nodefony.Service {
             switch (value) {
             case "directory":
               try {
-                let directory = path.resolve(parent.path, name);
+                const directory = path.resolve(parent.path, name);
                 child = this.cli.createDirectory(directory, 0o755, (ele) => {
                   if (force) {
-                    this.log("Force Create Directory :" + ele.name);
+                    this.log(`Force Create Directory :${ele.name}`);
                   } else {
-                    this.log("Create Directory :" + ele.name);
+                    this.log(`Create Directory :${ele.name}`);
                   }
                   if (obj.chmod) {
                     this.cli.chmod(obj.chmod, directory);
@@ -248,9 +241,9 @@ class Builder extends nodefony.Service {
               break;
             case "file":
               try {
-                let file = path.resolve(parent.path, name);
+                const file = path.resolve(parent.path, name);
                 this.createFile(file, obj.skeleton, obj.parse, obj.params, (ele) => {
-                  this.log("Create File      :" + ele.name);
+                  this.log(`Create File      :${ele.name}`);
                 });
                 if (obj.chmod) {
                   this.cli.chmod(obj.chmod, file);
@@ -263,11 +256,11 @@ class Builder extends nodefony.Service {
             case "symlink":
               try {
                 if (force) {
-                  this.cli.ln('-sf', path.resolve(parent.path, obj.params.source), path.resolve(parent.path, obj.params.dest));
+                  this.cli.ln("-sf", path.resolve(parent.path, obj.params.source), path.resolve(parent.path, obj.params.dest));
                 } else {
-                  this.cli.ln('-s', path.resolve(parent.path, obj.params.source), path.resolve(parent.path, obj.params.dest));
+                  this.cli.ln("-s", path.resolve(parent.path, obj.params.source), path.resolve(parent.path, obj.params.dest));
                 }
-                this.log("Create symbolic link :" + obj.name);
+                this.log(`Create symbolic link :${obj.name}`);
               } catch (e) {
                 this.log(e, "ERROR");
                 throw e;
@@ -275,13 +268,13 @@ class Builder extends nodefony.Service {
               break;
             case "copy":
               try {
-                let file = path.resolve(parent.path, name);
+                const file = path.resolve(parent.path, name);
                 if (obj.params && obj.params.recurse) {
                   this.cli.cp("-R", obj.path, file);
                 } else {
                   this.cli.cp("-f", obj.path, file);
                 }
-                this.log("Copy             :" + obj.name);
+                this.log(`Copy             :${obj.name}`);
                 if (obj.chmod) {
                   this.cli.chmod(obj.chmod, file);
                 }
@@ -313,7 +306,7 @@ class Builder extends nodefony.Service {
     return child;
   }
 
-  createFile(myPath, skeleton, parse = true, params = {}, callback = null) {
+  createFile (myPath, skeleton, parse = true, params = {}, callback = null) {
     if (!callback) {
       return new Promise((resolve, reject) => {
         if (skeleton) {
@@ -328,20 +321,17 @@ class Builder extends nodefony.Service {
                 return resolve(new nodefony.fileClass(myPath));
               });
             })
-            .catch((e) => {
-              return reject(e);
-            });
-        } else {
-          let data = " ";
-          fs.writeFile(myPath, data, {
-            mode: params.mode || "644"
-          }, (err) => {
-            if (err) {
-              return reject(err);
-            }
-            return resolve(new nodefony.fileClass(myPath));
-          });
+            .catch((e) => reject(e));
         }
+        const data = " ";
+        fs.writeFile(myPath, data, {
+          mode: params.mode || "644"
+        }, (err) => {
+          if (err) {
+            return reject(err);
+          }
+          return resolve(new nodefony.fileClass(myPath));
+        });
       });
     }
     if (skeleton) {
@@ -360,7 +350,7 @@ class Builder extends nodefony.Service {
         }
       });
     } else {
-      let data = " ";
+      const data = " ";
       try {
         fs.writeFileSync(myPath, data, {
           mode: params.mode || "644"

package/cli/builder/bundles/bundle.js

@@ -1,16 +1,15 @@
 const regBundleName = /^(\w+)-bundle[\.js]{0,3}$|^(\w+)[Bb]undle[\.js]{0,3}$/;
 
 class generateBundle extends nodefony.Builder {
-
-  constructor(cli, cmd, args) {
+  constructor (cli, cmd, args) {
     super(cli, cmd, args);
     this.name = null;
     this.location = null;
     this.pathSkeleton = path.resolve(__dirname, "skeletons");
     if (this.cmd === "generate:bundles" || this.cmd === "create:bundles") {
       if (args && args[0]) {
-        //this.name = args[0];
-        //this.cli.response.name = args[0];
+        // this.name = args[0];
+        // this.cli.response.name = args[0];
         if (args[1]) {
           this.setLocation(args[1]);
           this.checkPath(args[0], args[1]);
@@ -47,39 +46,33 @@ class generateBundle extends nodefony.Builder {
     this.setEnv();
   }
 
-  generate(response) {
+  generate (response) {
     return super.generate(response)
-      .then(() => {
-        return this.buildFront(this.response, this.path)
-          .run(this.cli.interactive)
-          .then((bundle) => {
-            return this.install()
-              .then(() => {
-                return bundle.response;
-              })
-              .catch((e) => {
-                throw e;
-              });
-          })
+      .then(() => this.buildFront(this.response, this.path)
+        .run(this.cli.interactive)
+        .then((bundle) => this.install()
+          .then(() => bundle.response)
           .catch((e) => {
             throw e;
-          });
-      });
+          }))
+        .catch((e) => {
+          throw e;
+        }));
   }
 
-  async interaction() {
+  async interaction () {
     this.cli.reset();
     await this.cli.showAsciify("Generate Bundle");
-    let prompt = [{
-      type: 'input',
-      name: 'name',
+    const prompt = [{
+      type: "input",
+      name: "name",
       default: this.name || "",
-      message: 'Enter Bundle Name',
+      message: "Enter Bundle Name",
       validate: (value) => {
         if (value && value !== "nodefony") {
-          let res = this.checkExist(value);
+          const res = this.checkExist(value);
           if (res) {
-            return "Bundle already exist " + value;
+            return `Bundle already exist ${value}`;
           }
           this.name = value;
           return true;
@@ -87,23 +80,23 @@ class generateBundle extends nodefony.Builder {
         return `${value} Unauthorised Please enter a valid Bundle name`;
       }
     }, {
-      type: 'input',
-      name: 'location',
+      type: "input",
+      name: "location",
       default: this.location,
-      message: 'Enter Bundle Path',
+      message: "Enter Bundle Path",
       validate: (value) => {
         if (value) {
           this.checkPath(this.name, value);
           return true;
         }
-        return 'Please enter a valid Bundle Path';
+        return "Please enter a valid Bundle Path";
       }
     }, {
-      type: 'list',
-      name: 'front',
+      type: "list",
+      name: "front",
       default: 0,
       pageSize: 10,
-      //choices: ["Sandbox (without Front framwork)", "Vue.js", "React"],
+      // choices: ["Sandbox (without Front framwork)", "Vue.js", "React"],
       choices: [{
         name: "Sandbox (without Front framwork)"
       }, {
@@ -114,7 +107,7 @@ class generateBundle extends nodefony.Builder {
         name: "Api",
         disabled: true
       }],
-      message: 'Choose Bundle Type (Mapping Front Framework in Bundle) :',
+      message: "Choose Bundle Type (Mapping Front Framework in Bundle) :",
       filter: (value) => {
         let front = null;
         switch (value) {
@@ -125,10 +118,10 @@ class generateBundle extends nodefony.Builder {
           front = "vue";
           break;
         case "React":
-          front = 'react';
+          front = "react";
           break;
         case "Api":
-          front = 'api';
+          front = "api";
           break;
         default:
           front = value;
@@ -146,36 +139,38 @@ class generateBundle extends nodefony.Builder {
               if (myresponse.remove) {
                 return response;
               }
-              let error = new Error(`${this.path} Already exist`);
+              const error = new Error(`${this.path} Already exist`);
               error.code = 0;
               throw error;
-            }).catch((e) => {
+            })
+            .catch((e) => {
               throw e;
             });
         }
         return response;
-      }).catch(e => {
+      })
+      .catch((e) => {
         throw e;
       });
   }
 
-  getBundle(name) {
-    let bundle = this.checkExist(name);
+  getBundle (name) {
+    const bundle = this.checkExist(name);
     if (!bundle) {
-      throw new Error("bundle " + name + " don't exist ");
+      throw new Error(`bundle ${name} don't exist `);
     }
     this.setPath(null, bundle);
     return bundle;
   }
 
-  checkExist(name) {
+  checkExist (name) {
     if (this.cli.kernel) {
-      let bundle = this.cli.kernel.getBundle(name);
+      const bundle = this.cli.kernel.getBundle(name);
       if (bundle) {
         return bundle;
       }
       try {
-        let bundleName = this.cli.kernel.getBundleName(name);
+        const bundleName = this.cli.kernel.getBundleName(name);
         if (bundleName) {
           return this.cli.kernel.getBundle(bundleName);
         }
@@ -187,13 +182,13 @@ class generateBundle extends nodefony.Builder {
     return null;
   }
 
-  setPath(Path, bundle) {
+  setPath (Path, bundle) {
     if (bundle) {
       this.name = bundle.bundleName;
       this.shortName = bundle.name;
       this.location = bundle.location;
       this.bundlePath = bundle.path;
-      this.bundleFile = path.resolve(this.bundlePath, this.shortName + "Bundle.js");
+      this.bundleFile = path.resolve(this.bundlePath, `${this.shortName}Bundle.js`);
     } else {
       if (Path instanceof nodefony.fileClass) {
         this.location = Path.path;
@@ -204,7 +199,7 @@ class generateBundle extends nodefony.Builder {
         this.location = Path;
       }
       this.bundlePath = path.resolve(this.location, this.name);
-      this.bundleFile = path.resolve(this.bundlePath, this.shortName + "Bundle.js");
+      this.bundleFile = path.resolve(this.bundlePath, `${this.shortName}Bundle.js`);
     }
     nodefony.extend(this.response, {
       bundleName: this.name,
@@ -214,16 +209,16 @@ class generateBundle extends nodefony.Builder {
     });
   }
 
-  checkPath(name, Path) {
+  checkPath (name, Path) {
     if (!name) {
       if (!this.name) {
         throw new Error("No bundle name");
       }
       name = this.name;
     }
-    let bundle = this.checkExist(name);
+    const bundle = this.checkExist(name);
     if (bundle) {
-      throw new Error("Bundle already exist " + name);
+      throw new Error(`Bundle already exist ${name}`);
     }
     this.shortName = name;
     let res = regBundleName.exec(name);
@@ -231,12 +226,12 @@ class generateBundle extends nodefony.Builder {
       this.shortName = res[1];
       this.name = name;
     } else {
-      this.name = name + "-bundle";
+      this.name = `${name}-bundle`;
       res = regBundleName.exec(this.name);
       if (res) {
         this.shortName = res[1];
       } else {
-        throw new Error("Bad bundle name :" + this.name);
+        throw new Error(`Bad bundle name :${this.name}`);
       }
     }
     try {
@@ -247,7 +242,7 @@ class generateBundle extends nodefony.Builder {
     }
   }
 
-  createBuilder() {
+  createBuilder () {
     try {
       return {
         name: this.name,
@@ -259,7 +254,7 @@ class generateBundle extends nodefony.Builder {
     }
   }
 
-  install() {
+  install () {
     try {
       let json = null;
       let configPath = null;
@@ -291,11 +286,11 @@ class generateBundle extends nodefony.Builder {
         json.system.bundles[this.name] = `file:${this.bundlePath}`;
       }
       fs.writeFileSync(configPath, yaml.dump(json), {
-        encoding: 'utf8'
+        encoding: "utf8"
       });
 
       try {
-        let file = new nodefony.fileClass(this.bundleFile);
+        const file = new nodefony.fileClass(this.bundleFile);
         if (this.cli.kernel) {
           this.cli.kernel.loadBundle(file);
         }
@@ -311,23 +306,22 @@ class generateBundle extends nodefony.Builder {
     }
   }
 
-  static controller(cli) {
-    let controller = require(path.resolve(__dirname, "controller.js"));
+  static controller (cli) {
+    const controller = require(path.resolve(__dirname, "controller.js"));
     return new controller(cli);
   }
 
-  static service() {
+  static service () {
 
   }
 
-  static entity() {
+  static entity () {
 
   }
 
-  static command() {
+  static command () {
 
   }
-
 }
 
 nodefony.builders.bundle = generateBundle;