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

package/cli/builder/microService/skeletons/package.json

@@ -39,37 +39,38 @@
     "microservice"
   ],
   "dependencies": {
-    "ejs": "3.1.7",
+    "ejs": "3.1.9",
     "env-cmd": "^10.1.0",
     "hello_world": "./src/n-api",
-    "markdown-it": "13.0.0",
+    "markdown-it": "13.0.1",
     "nodefony": "^{{version}}",
     "nodefony-client": "6.0.2",
-    "pm2": "5.2.0",
+    "pm2": "5.3.0",
     "pm2-logrotate": "^2.7.0",
     "serve-static": "1.15.0",
-    "socket.io": "4.4.1",
-    "socket.io-client": "4.4.1"
+    "socket.io": "4.7.1",
+    "socket.io-client": "4.7.1"
   },
   "devDependencies": {
-    "@babel/cli": "7.17.6",
-    "@babel/core": "7.17.9",
-    "@babel/preset-env": "7.16.11",
-    "@babel/register": "7.17.7",
-    "@mapbox/node-pre-gyp": "1.0.9",
-    "babel-loader": "8.2.5",
-    "chai": "4.3.6",
-    "html-loader": "3.1.0",
+    "@babel/cli": "7.22.9",
+    "@babel/core": "7.22.9",
+    "@babel/preset-env": "7.22.9",
+    "@babel/register": "7.22.5",
+    "@mapbox/node-pre-gyp": "1.0.11",
+    "babel-loader": "9.1.3",
+    "chai": "4.3.7",
+    "html-loader": "4.2.0",
     "html-webpack-plugin": "^5.5.0",
-    "mini-css-extract-plugin": "2.6.0",
-    "mocha": "9.2.2",
-    "node-gyp": "9.0.0",
-    "open": "8.4.0",
-    "sass-loader": "12.6.0",
-    "terser-webpack-plugin": "5.3.1",
-    "webpack": "5.72.0",
-    "webpack-cli": "4.9.2",
+    "mini-css-extract-plugin": "2.7.6",
+    "mocha": "10.2.0",
+    "node-gyp": "9.4.0",
+    "open": "9.1.0",
+    "sass": "1.64.2",
+    "sass-loader": "13.3.2",
+    "terser-webpack-plugin": "5.3.9",
+    "webpack": "5.88.2",
+    "webpack-cli": "5.1.4",
     "webpack-merge": "^5.8.0"
   },
   "license": "ISC"
-}
+}

package/cli/builder/project/project.js

@@ -1,11 +1,10 @@
 class generateProject extends nodefony.Builder {
-
-  constructor(cli, cmd, args) {
+  constructor (cli, cmd, args) {
     super(cli, cmd, args);
     this.name = null;
     this.pathSkeleton = path.resolve(__dirname, "skeletons");
     this.bundleUsersPath = path.resolve(nodefony.path, "cli", "builder", "bundles", "users-bundle");
-    //this.bundlePath = path.resolve(nodefony.path, "cli", "builder", "bundles", "users-bundle");
+    // this.bundlePath = path.resolve(nodefony.path, "cli", "builder", "bundles", "users-bundle");
     if (this.cmd === "create:project" || this.cmd === "create") {
       if (args && args[0]) {
         this.name = args[0];
@@ -32,7 +31,7 @@ class generateProject extends nodefony.Builder {
       version: nodefony.version,
       year: new Date().getFullYear(),
       orm: "sequelize",
-      npm: 'npm',
+      npm: "npm",
       addons: {
         annotations: true,
         users: true
@@ -45,7 +44,7 @@ class generateProject extends nodefony.Builder {
     this.setEnv();
   }
 
-  generate(response) {
+  generate (response) {
     return super.generate(response, true)
       .then(() => {
         if (!this.buildFront) {
@@ -72,190 +71,187 @@ class generateProject extends nodefony.Builder {
       });
   }
 
-  generateUserBundle() {
+  generateUserBundle () {
     return new Promise((resolve, reject) => {
-      this.log('Copy users-bundle in src/bundles', "INFO", "USERS-BUNDLE");
+      this.log("Copy users-bundle in src/bundles", "INFO", "USERS-BUNDLE");
       try {
-        let mypath = path.resolve(this.path, "src", "bundles");
-        this.cli.cp('-Rf', this.bundleUsersPath, mypath);
+        const mypath = path.resolve(this.path, "src", "bundles");
+        this.cli.cp("-Rf", this.bundleUsersPath, mypath);
         return this.cli.packageManager.call(this.cli, ["install"], path.resolve(mypath, "users-bundle"))
-          .then((res) => {
-            return resolve(res);
-          });
+          .then((res) => resolve(res));
       } catch (e) {
         return reject(e);
       }
     });
   }
 
-  async interaction() {
-    let promtOptions = [{
-        type: 'input',
-        name: 'name',
-        default: this.response.name,
-        message: 'Enter Nodefony Project Name',
-        validate: (value) => {
-          if (value && value !== "nodefony") {
-            this.name = value;
-            nodefony.projectName = value;
-            return true;
-          }
-          return `${value} Unauthorised Please enter a valid project name`;
-        }
-      }, {
-        type: 'input',
-        name: 'description',
-        message: 'Enter short description',
-        default: "Project Description",
-        validate: (value) => {
-          if (!value) {
-            this.cli.response.description = `${this.response.description} ${this.name}`;
-          }
+  async interaction () {
+    const promtOptions = [{
+      type: "input",
+      name: "name",
+      default: this.response.name,
+      message: "Enter Nodefony Project Name",
+      validate: (value) => {
+        if (value && value !== "nodefony") {
+          this.name = value;
+          nodefony.projectName = value;
           return true;
-        },
-        filter: (value) => {
-          if (!value) {
-            return this.response.description;
-          }
-          if (value === "Project Description") {
-            return this.response.description;
-          }
-          return value;
         }
-      }, {
-        type: 'list',
-        name: 'front',
-        default: 0,
-        pageSize: 5,
-        choices: [{
-          name: "Sandbox (without Front framwork)"
-        }, {
-          name: "Vue.js"
-        }, {
-          name: "React"
-        }, {
-          name: "Electron",
-          disabled: true
-        }],
-        message: 'Choose Project Application Type (Mapping Front Framework in App) :',
-        filter: (value) => {
-          let front = null;
-          switch (value) {
-          case "Sandbox (without Front framwork)":
-            front = "sandbox";
-            break;
-          case "Vue.js":
-            front = "vue";
-            break;
-          case "React":
-            front = 'react';
-            break;
-          case "Electron":
-            front = 'electron';
-            break;
-          default:
-            front = value;
-          }
-          return front;
-        }
-      }, {
-        type: 'input',
-        name: 'path',
-        default: this.location,
-        message: 'Project Path',
-        validate: (value) => {
-          let myPath = null;
-          try {
-            myPath = new nodefony.fileClass(path.resolve(value));
-          } catch (e) {
-            return e.message;
-          }
-          let res = nodefony.isNodefonyTrunk(myPath.path);
-          if (res) {
-            return "You can't install project in nodefony Trunk project !";
-          }
-          if (value) {
-            this.location = value;
-            return true;
-          }
-          return 'Please enter a valid project Path';
+        return `${value} Unauthorised Please enter a valid project name`;
+      }
+    }, {
+      type: "input",
+      name: "description",
+      message: "Enter short description",
+      default: "Project Description",
+      validate: (value) => {
+        if (!value) {
+          this.cli.response.description = `${this.response.description} ${this.name}`;
         }
-      }, {
-        type: 'input',
-        name: 'authorFullName',
-        default: this.response.authorFullName,
-        message: 'Please Enter Author Full Name',
-        filter: (value) => {
-          if (!value) {
-            this.response.authorName = this.response.authorFullName;
-            return this.response.authorFullName;
-          }
-          return value;
+        return true;
+      },
+      filter: (value) => {
+        if (!value) {
+          return this.response.description;
         }
-      }, {
-        type: 'input',
-        name: 'authorMail',
-        default: this.response.authorMail,
-        message: 'Please Enter Email Author ',
-        filter: (value) => {
-          if (!value) {
-            return this.response.authorMail;
-          }
-          return value;
+        if (value === "Project Description") {
+          return this.response.description;
         }
+        return value;
+      }
+    }, {
+      type: "list",
+      name: "front",
+      default: 0,
+      pageSize: 5,
+      choices: [{
+        name: "Sandbox (without Front framwork)"
       }, {
-        type: 'input',
-        name: 'domain',
-        default: this.response.domain,
-        message: 'Enter Server Domain :',
-      }, {
-        type: 'input',
-        name: 'portHttp',
-        default: this.response.portHttp,
-        message: 'Enter server Domain http Port  :',
-      }, {
-        type: 'input',
-        name: 'portHttps',
-        default: this.response.portHttps,
-        message: 'Enter Server Secure Domain https Port  :',
+        name: "Vue.js"
       }, {
-        type: 'list',
-        name: 'orm',
-        default: 0,
-        pageSize: 2,
-        choices: ["sequelize", "mongoose"],
-        message: 'Choose default ORM  (Mapping Objet Relationnel) :'
+        name: "React"
       }, {
-        type: 'list',
-        name: 'packageManager',
-        message: 'Choose a default Package Manager : ',
-        default: 0,
-        pageSize: 2,
-        choices: ["npm", "yarn"],
-        filter: (value) => {
-          if (this.cli[value]) {
-            this.cli.packageManager = this.cli[value];
-          } else {
-            throw new Error(`Package Manager ${value} not available ! `);
-          }
-          return value;
+        name: "Electron",
+        disabled: true
+      }],
+      message: "Choose Project Application Type (Mapping Front Framework in App) :",
+      filter: (value) => {
+        let front = null;
+        switch (value) {
+        case "Sandbox (without Front framwork)":
+          front = "sandbox";
+          break;
+        case "Vue.js":
+          front = "vue";
+          break;
+        case "React":
+          front = "react";
+          break;
+        case "Electron":
+          front = "electron";
+          break;
+        default:
+          front = value;
         }
-      }, {
-        type: 'checkbox',
-        message: 'Select addons project',
-        name: 'addons',
-        pageSize: 10,
-        choices: [{
-          name: 'Users Management',
-          message: "Bootstrap only",
-          checked: this.response.addons.users,
-          disabled: (this.cli.response.command === "bundle")
-        }],
-        filter: (value) => {
-          return value;
+        return front;
+      }
+    }, {
+      type: "input",
+      name: "path",
+      default: this.location,
+      message: "Project Path",
+      validate: (value) => {
+        let myPath = null;
+        try {
+          myPath = new nodefony.fileClass(path.resolve(value));
+        } catch (e) {
+          return e.message;
+        }
+        const res = nodefony.isNodefonyTrunk(myPath.path);
+        if (res) {
+          return "You can't install project in nodefony Trunk project !";
+        }
+        if (value) {
+          this.location = value;
+          return true;
+        }
+        return "Please enter a valid project Path";
+      }
+    }, {
+      type: "input",
+      name: "authorFullName",
+      default: this.response.authorFullName,
+      message: "Please Enter Author Full Name",
+      filter: (value) => {
+        if (!value) {
+          this.response.authorName = this.response.authorFullName;
+          return this.response.authorFullName;
         }
+        return value;
       }
-      /*, {
+    }, {
+      type: "input",
+      name: "authorMail",
+      default: this.response.authorMail,
+      message: "Please Enter Email Author ",
+      filter: (value) => {
+        if (!value) {
+          return this.response.authorMail;
+        }
+        return value;
+      }
+    }, {
+      type: "input",
+      name: "domain",
+      default: this.response.domain,
+      message: "Enter Server Domain :"
+    }, {
+      type: "input",
+      name: "portHttp",
+      default: this.response.portHttp,
+      message: "Enter server Domain http Port  :"
+    }, {
+      type: "input",
+      name: "portHttps",
+      default: this.response.portHttps,
+      message: "Enter Server Secure Domain https Port  :"
+    }, {
+      type: "list",
+      name: "orm",
+      default: 0,
+      pageSize: 2,
+      choices: ["sequelize", "mongoose"],
+      message: "Choose default ORM  (Mapping Objet Relationnel) :"
+    }, {
+      type: "list",
+      name: "packageManager",
+      message: "Choose a default Package Manager : ",
+      default: 0,
+      pageSize: 2,
+      choices: ["npm", "yarn", "pnpm"],
+      filter: (value) => {
+        if (this.cli[value]) {
+          this.cli.packageManager = this.cli[value];
+        } else {
+          throw new Error(`Package Manager ${value} not available ! `);
+        }
+        return value;
+      }
+    }, {
+      type: "checkbox",
+      message: "Select addons project",
+      name: "addons",
+      pageSize: 10,
+      choices: [{
+        name: "Users Management",
+        message: "Bootstrap only",
+        checked: this.response.addons.users,
+        disabled: this.cli.response.command === "bundle"
+      }],
+      filter: (value) => value
+    }
+
+      /* , {
               type: 'confirm',
               name: 'bundle',
               message: 'Do You Want Generate Bundle?',
@@ -264,7 +260,7 @@ class generateProject extends nodefony.Builder {
     ];
     return this.cli.prompt(promtOptions)
       .then((response) => {
-        let addons = {
+        const addons = {
           users: false
         };
         if (response.addons.length) {
@@ -285,20 +281,29 @@ class generateProject 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;
       });
   }
 
-  createBuilder(response) {
+  getPadDate () {
+    // return new Date().toISOString().split('.')[0].replace(/[^\d]/gi, '')
+    return new Date().toISOString()
+      .replace(/\.\d{3}Z$/, "")
+      .replace(/\W/g, ".");
+  }
+
+  createBuilder (response) {
     try {
       return {
         name: this.response.name,
@@ -306,7 +311,7 @@ class generateProject extends nodefony.Builder {
         childs: [{
           name: "package.json",
           type: "file",
-          skeleton: path.resolve(this.pathSkeleton, "package.json.skeleton"),
+          skeleton: path.resolve(this.pathSkeleton, "package.json.twig"),
           params: this.response
         }, {
           name: ".gitignore",
@@ -314,14 +319,14 @@ class generateProject extends nodefony.Builder {
           skeleton: path.resolve(this.pathSkeleton, "gitignore.skeleton"),
           params: this.response
         }, {
-          name: ".jshintrc",
+          name: ".eslintrc.js",
           type: "file",
-          skeleton: path.resolve(this.pathSkeleton, "jshintrc.skeleton"),
+          skeleton: path.resolve(this.pathSkeleton, "eslintrc.js.skeleton"),
           params: this.response
         }, {
-          name: ".jshintignore",
+          name: ".eslintignore",
           type: "file",
-          skeleton: path.resolve(this.pathSkeleton, "jshintignore.skeleton"),
+          skeleton: path.resolve(this.pathSkeleton, "eslintignore.skeleton"),
           params: this.response
         }, {
           name: ".editorconfig",
@@ -338,14 +343,44 @@ class generateProject extends nodefony.Builder {
           name: "migrations",
           type: "directory",
           childs: [{
-            name: "nodefony",
+            name: "sequelize",
             type: "directory",
             childs: [{
-              name: "00_migration.js.example",
+              name: `${this.getPadDate()}-migrate-entity.js.example`,
               type: "file",
               skeleton: path.resolve(this.pathSkeleton, "migrations", "migrations.skeleton.js"),
               params: this.response
+            }, {
+              name: "nodefony",
+              type: "directory",
+              childs: [{
+                name: "2022.12.25T17.37.37.entity-user.js",
+                skeleton: path.resolve(this.pathSkeleton, "migrations", "2022.12.25T17.37.37.entity-user.js"),
+                type: "file",
+                params: this.response
+              }, {
+                name: "2022.12.25T17.37.38.entity-session.js",
+                skeleton: path.resolve(this.pathSkeleton, "migrations", "2022.12.25T17.37.38.entity-session.js"),
+                type: "file",
+                params: this.response
+              }, {
+                name: "2022.12.25T17.37.39.entity-requests.js",
+                skeleton: path.resolve(this.pathSkeleton, "migrations", "2022.12.25T17.37.39.entity-requests.js"),
+                type: "file",
+                params: this.response
+              }, {
+                name: "2022.12.25T17.37.40.entity-jwts.js",
+                skeleton: path.resolve(this.pathSkeleton, "migrations", "2022.12.25T17.37.40.entity-jwts.js"),
+                type: "file",
+                params: this.response
+              }]
             }]
+          }, {
+            name: "mongoose",
+            type: "directory"
+          }, {
+            name: "seedeers",
+            type: "directory"
           }]
         }, {
           name: "config",
@@ -395,6 +430,18 @@ class generateProject extends nodefony.Builder {
             chmod: 755,
             skeleton: path.resolve(this.pathSkeleton, "bin", "generateCertificates.sh.skeleton"),
             params: this.response
+          }, {
+            name: "dev-deploy.sh",
+            type: "file",
+            chmod: 755,
+            skeleton: path.resolve(this.pathSkeleton, "bin", "dev-deploy.sh"),
+            params: this.response
+          }, {
+            name: "prod-deploy.sh",
+            type: "file",
+            chmod: 755,
+            skeleton: path.resolve(this.pathSkeleton, "bin", "prod-deploy.sh"),
+            params: this.response
           }]
         }, {
           name: "src",