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

package/cli/install/install.js

@@ -1,51 +1,36 @@
 module.exports = class installProject extends nodefony.Builder {
-
-  constructor(cli) {
+  constructor (cli) {
     super(cli);
   }
 
-  log(pci, severity, msgid, msg) {
+  log (pci, severity, msgid, msg) {
     if (!msgid) {
       msgid = "INSTALLER";
     }
     return super.log(pci, severity, msgid, msg);
   }
 
-  async install(cwd = path.resolve(".")) {
-    return new Promise((resolve, reject) => {
-      return this.installFramework(cwd)
-        .then(() => {
-          return this.cli.packageManager.call(this.cli, ["install"], cwd)
-            .then(() => {
-              if (false && nodefony.isCore && process.platform !== "win32") {
-                return this.npmLink(path.resolve("."), path.resolve("src", "nodefony"))
-                  .catch((e) => {
-                    return reject(e);
-                  });
-              } else {
-                return cwd;
-              }
-            })
-            .then(() => {
-              this.cli.parseNodefonyCommand("install", [cwd]);
-              return resolve(cwd);
-            })
-            .catch((e) => {
-              return reject(e);
-            });
-        });
-    });
+  install (cwd = path.resolve("."), args = [], interactive = false) {
+    return this.installFramework(cwd)
+      .then(() => this.cli.packageManager(["install"], cwd))
+      .then(async () => {
+        await this.cli.parseNodefonyCommand("install", [cwd, args, interactive]);
+        return cwd;
+      })
+      .catch((e) => {
+        throw e;
+      });
   }
 
-  async build(cwd = path.resolve(".")) {
+  async build (cwd = path.resolve("."), args = [], interactive = false) {
     await this.generateCertificates(cwd);
     return cwd;
   }
 
-  rebuild(cwd = path.resolve(".")) {
+  rebuild (cwd = path.resolve("."), args = [], interactive = false) {
     let cmd = null;
     switch (nodefony.packageManager) {
-    case 'yarn':
+    case "yarn":
       cmd = ["install", "--force"];
       break;
     default:
@@ -55,16 +40,15 @@ module.exports = class installProject extends nodefony.Builder {
       this.cli.rm("-rf", path.resolve(cwd, "node_modules"));
       this.cli.rm("-rf", path.resolve(cwd, "yarn.lock"));
       this.cli.rm("-rf", path.resolve(cwd, "package-lock.json"));
+      this.cli.rm("-rf", path.resolve(cwd, "ppnpm-lock.yaml"));
     } catch (e) {
       throw e;
     }
-    return this.cli.packageManager.call(this.cli, cmd, cwd, "development")
-      .then(() => {
-        return cwd;
-      });
+    return this.cli.packageManager(cmd, cwd, "production")
+      .then(() => cwd);
   }
 
-  async npmLink(cwd = path.resolve("."), argv = []) {
+  npmLink (cwd = path.resolve("."), argv = []) {
     return new Promise((resolve, reject) => {
       let tab = ["link"];
       if (argv) {
@@ -72,14 +56,14 @@ module.exports = class installProject extends nodefony.Builder {
       }
       let cmd = null;
       try {
-        this.log("npm link " + argv);
+        this.log(`npm link ${argv}`);
         cmd = this.cli.spawn("npm", tab, {
-          cwd: cwd,
+          cwd,
           shell: true,
           stdio: "inherit"
         }, (code) => {
           if (code === 1) {
-            return reject(new Error("nmp link error : " + code));
+            return reject(new Error(`nmp link error : ${code}`));
           }
           return resolve(cwd);
         });
@@ -90,23 +74,23 @@ module.exports = class installProject extends nodefony.Builder {
     });
   }
 
-  async generateCertificates(cwd = path.resolve(".")) {
+  generateCertificates (cwd = path.resolve(".")) {
     return new Promise((resolve, reject) => {
       try {
-        let directory = path.resolve(cwd, "config", "certificates");
+        const directory = path.resolve(cwd, "config", "certificates");
         this.log(`Clean certificates in : ${directory}`);
         this.cli.rm("-rf", directory);
         this.checkDirectoryExist(directory);
         this.log(`Generate openssl certificates in : ${directory}`);
         let cmd = null;
         cmd = this.cli.spawn("bash", [path.resolve(cwd, "bin", "generateCertificates.sh")], {
-        //cmd = this.cli.spawn(path.resolve(cwd, "bin", "generateCertificates.sh"), [], {
-          cwd: cwd,
+        // cmd = this.cli.spawn(path.resolve(cwd, "bin", "generateCertificates.sh"), [], {
+          cwd,
           shell: true,
           stdio: "inherit"
         }, (code) => {
           if (code !== 0) {
-            return reject(new Error("generateCertificates error : " + code));
+            return reject(new Error(`generateCertificates error : ${code}`));
           }
           return resolve(cwd);
         });
@@ -116,19 +100,19 @@ module.exports = class installProject extends nodefony.Builder {
     });
   }
 
-  async installFramework(cwd = path.resolve(".")) {
+  installFramework (cwd = path.resolve(".")) {
     return new Promise((resolve, reject) => {
       this.log("Create Framework directories");
       try {
-        let tmp = path.resolve(cwd, "tmp");
+        const tmp = path.resolve(cwd, "tmp");
         this.checkDirectoryExist(tmp);
-        let upload = path.resolve(cwd, "tmp", "upload");
+        const upload = path.resolve(cwd, "tmp", "upload");
         this.checkDirectoryExist(upload);
-        let bin = path.resolve(cwd, "bin");
+        const bin = path.resolve(cwd, "bin");
         this.checkDirectoryExist(bin);
-        let databases = path.resolve(cwd, "app", "Resources", "databases");
+        const databases = path.resolve(cwd, "app", "Resources", "databases");
         this.checkDirectoryExist(databases);
-        let web = path.resolve(cwd, "web");
+        const web = path.resolve(cwd, "web");
         this.checkDirectoryExist(web);
         let js = path.resolve(cwd, "web", "js");
         this.checkDirectoryExist(js);
@@ -138,7 +122,7 @@ module.exports = class installProject extends nodefony.Builder {
         this.checkDirectoryExist(images);
         let fonts = path.resolve(cwd, "web", "fonts");
         this.checkDirectoryExist(fonts);
-        let assets = path.resolve(cwd, "web", "assets");
+        const assets = path.resolve(cwd, "web", "assets");
         this.checkDirectoryExist(assets);
         js = path.resolve(cwd, "web", "assets", "js");
         this.checkDirectoryExist(js);
@@ -155,7 +139,7 @@ module.exports = class installProject extends nodefony.Builder {
     });
   }
 
-  checkDirectoryExist(directory) {
+  checkDirectoryExist (directory) {
     if (!this.cli.exists(directory)) {
       try {
         this.cli.mkdir(directory);
@@ -166,7 +150,7 @@ module.exports = class installProject extends nodefony.Builder {
     }
   }
 
-  removeDirectory(directory, recurse) {
+  removeDirectory (directory, recurse) {
     if (this.cli.exists(directory)) {
       try {
         if (recurse) {
@@ -181,19 +165,22 @@ module.exports = class installProject extends nodefony.Builder {
     }
   }
 
-  async clear(cwd = path.resolve(".")) {
+  async clear (cwd = path.resolve(".")) {
     return new Promise((resolve, reject) => {
       try {
-        let web = path.resolve(cwd, "web");
+        const web = path.resolve(cwd, "web");
         this.removeDirectory(web, true);
-        let modules = path.resolve(cwd, "node_modules");
+        const modules = path.resolve(cwd, "node_modules");
         this.removeDirectory(modules, true);
-        let tmp = path.resolve(cwd, "tmp");
+        const tmp = path.resolve(cwd, "tmp");
         this.removeDirectory(tmp, true);
-        let npmLock = path.resolve(cwd, "package-lock.json");
+        const npmLock = path.resolve(cwd, "package-lock.json");
         this.removeDirectory(npmLock);
-        let yarnLock = path.resolve(cwd, "yarn.lock");
+        const yarnLock = path.resolve(cwd, "yarn.lock");
         this.removeDirectory(yarnLock);
+        const pnpmLock = path.resolve(cwd, "pnpm-lock.yaml");
+        this.removeDirectory(pnpmLock);
+
         return resolve(this.installFramework(cwd));
       } catch (e) {
         return reject(e);

package/cli/sequelize/sequelize.js

@@ -1,18 +1,17 @@
 module.exports = class sequlizeBuilder extends nodefony.Builder {
-
-  constructor(cli) {
+  constructor (cli) {
     super(cli);
     this.choices = [];
-    this.choices.push(`Create Database`);
-    this.choices.push(`Synchronize`);
-    this.choices.push(`Migrate`);
-    this.choices.push(`Migrations Pending`);
-    this.choices.push(`Migrations Executed`);
+    this.choices.push("Create Database");
+    this.choices.push("Synchronize");
+    this.choices.push("Migrate");
+    this.choices.push("Migrations Pending");
+    this.choices.push("Migrations Executed");
     this.choices.push(this.cli.getSeparator());
     this.choices.push("Quit");
   }
 
-  log(pci, severity, msgid, msg) {
+  log (pci, severity, msgid, msg) {
     try {
       if (!msgid) {
         msgid = "Sequelize";
@@ -23,49 +22,49 @@ module.exports = class sequlizeBuilder extends nodefony.Builder {
     }
   }
 
-  interaction() {
+  interaction () {
     return this.cli.prompt([{
-        type: 'list',
-        name: 'command',
-        message: ' Nodefony CLI : ',
-        default: 0,
-        pageSize: this.choices.length,
-        choices: this.choices,
-        filter: (val) => {
-          switch (val) {
-          case "Create Database":
-            return "create";
-          case "Synchronize":
-            return "sync";
-          case "Migrate":
-            return "migrate";
-          case "Migrations Pending":
-            return "migrateP";
-          case "Migrations Executed":
-            return "migrateE";
-          case "Delete PM2 Production Project":
-            return "delete";
-          case "Quit":
-            return "quit";
-          default:
-            console.log("\n");
-            this.log(`command not found : ${val}`, "ERROR");
-            this.cli.terminate(1);
-          }
+      type: "list",
+      name: "command",
+      message: " Nodefony CLI : ",
+      default: 0,
+      pageSize: this.choices.length,
+      choices: this.choices,
+      filter: (val) => {
+        switch (val) {
+        case "Create Database":
+          return "create";
+        case "Synchronize":
+          return "sync";
+        case "Migrate":
+          return "migrate";
+        case "Migrations Pending":
+          return "migrateP";
+        case "Migrations Executed":
+          return "migrateE";
+        case "Delete PM2 Production Project":
+          return "delete";
+        case "Quit":
+          return "quit";
+        default:
+          console.log("\n");
+          this.log(`command not found : ${val}`, "ERROR");
+          this.cli.terminate(1);
         }
-      }])
+      }
+    }])
       .then((response) => {
         this.start(response);
         return response;
       });
   }
 
-  start(response) {
+  start (response) {
     switch (response.command) {
     case "create":
       return this.cli.setCommand("sequelize:create:database");
     case "sync":
-      return this.cli.setCommand("sequelize:sync");
+      return this.sync();
     case "migrate":
       return this.cli.setCommand("sequelize:migrate:up");
     case "migrateP":
@@ -80,4 +79,16 @@ module.exports = class sequlizeBuilder extends nodefony.Builder {
     }
   }
 
+  sync () {
+    return this.cli.prompt([{
+      type: "list",
+      name: "sync",
+      message: "Synchronize type",
+      default: 0,
+      pageSize: 3,
+      choices: ["sync", "alter", "force"],
+      filter: (value) => value
+    }])
+      .then((response) => this.cli.setCommand("sequelize:sync", [response.sync]));
+  }
 };