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

package/cli/builder/project/skeletons/migrations/2022.12.25T17.37.39.entity-requests.js

@@ -0,0 +1,115 @@
+'use strict';
+const {
+  Sequelize,
+  DataTypes,
+  Model
+} = require('sequelize');
+
+class Migrate extends nodefony.Service {
+  constructor(kernel) {
+    super("Migrate", kernel.container);
+    this.entityName = "requests"
+  }
+
+  async up({
+    name,
+    context: queryInterface
+  }) {
+    let descriptions = null
+    try {
+      descriptions = await queryInterface.describeTable(this.entityName)
+    } catch (e) {
+      this.log(`Migrate file : ${name}`)
+    }
+    const exist = await queryInterface.tableExists(this.entityName)
+    if (exist) {
+      this.log(`Entity ${this.entityName} already exist`);
+      return descriptions
+    }
+    let transaction = null
+    try {
+      transaction = await queryInterface.sequelize.transaction();
+      let res = await queryInterface.createTable(this.entityName, {
+        id: {
+          type: DataTypes.INTEGER,
+          primaryKey: true,
+          autoIncrement: true
+        },
+        remoteAddress: {
+          type: DataTypes.STRING
+        },
+        userAgent: {
+          type: DataTypes.STRING
+        },
+        url: {
+          type: DataTypes.TEXT
+        },
+        route: {
+          type: DataTypes.STRING
+        },
+        method: {
+          type: DataTypes.STRING
+        },
+        state: {
+          type: DataTypes.STRING
+        },
+        protocol: {
+          type: DataTypes.STRING
+        },
+        scheme: {
+          type: DataTypes.STRING
+        },
+        time: {
+          type: DataTypes.FLOAT
+        },
+        data: {
+          type: DataTypes.TEXT
+        },
+        createdAt: {
+          allowNull: false,
+          type: DataTypes.DATE
+        },
+        updatedAt: {
+          allowNull: false,
+          type: DataTypes.DATE
+        },
+        username: {
+          type: DataTypes.STRING(126),
+          references: {
+            model: 'user',
+            key: 'username'
+          },
+          onUpdate: "CASCADE",
+          onDelete: "CASCADE",
+        }
+      }, {
+        transaction
+      });
+      return await transaction.commit();
+    } catch (e) {
+      if (transaction && !transaction.finished) {
+        this.log(e, "ERROR")
+        this.log(`Rollback transaction on table ${this.entityName}`);
+        await transaction.rollback();
+      }
+      this.log("Rollback Transaction already finished", "WARNING")
+      throw e
+    }
+  }
+
+  async down({
+    name,
+    context: queryInterface,
+    context: sequelize
+  }) {
+    try {
+      const descriptions = await queryInterface.describeTable(this.entityName)
+      return await queryInterface.dropTable(this.entityName);
+    } catch (e) {
+      this.log(`Entity ${this.entityName} not exist`, "WARNING")
+      throw e
+    }
+  }
+}
+
+module.exports = new Migrate(kernel);

package/cli/builder/project/skeletons/migrations/2022.12.25T17.37.40.entity-jwts.js

@@ -0,0 +1,97 @@
+'use strict';
+const {
+  Sequelize,
+  DataTypes,
+  Model
+} = require('sequelize');
+
+class Migrate extends nodefony.Service {
+  constructor(kernel) {
+    super("Migrate", kernel.container);
+    this.entityName = "jwts"
+  }
+
+  async up({
+    name,
+    context: queryInterface
+  }) {
+    let descriptions = null
+    try {
+      descriptions = await queryInterface.describeTable(this.entityName)
+    } catch (e) {
+      this.log(`Migrate file : ${name}`)
+    }
+    const exist = await queryInterface.tableExists(this.entityName)
+    if (exist) {
+      this.log(`Entity ${this.entityName} already exist`);
+      return descriptions
+    }
+    let transaction = null
+    try {
+      transaction = await queryInterface.sequelize.transaction();
+      let res = await queryInterface.createTable(this.entityName, {
+        id: {
+          type: DataTypes.INTEGER,
+          autoIncrement: true,
+          primaryKey: true
+        },
+        refreshToken: {
+          type: DataTypes.TEXT,
+          allowNull: false
+        },
+        token: {
+          type: DataTypes.TEXT,
+        },
+        active: {
+          type: DataTypes.BOOLEAN,
+          defaultValue: true
+        },
+        createdAt: {
+          allowNull: false,
+          type: DataTypes.DATE
+        },
+        updatedAt: {
+          allowNull: false,
+          type: DataTypes.DATE
+        },
+        username: {
+          type: DataTypes.STRING(126),
+          references: {
+            model: 'user',
+            key: 'username'
+          },
+          onUpdate: "CASCADE",
+          onDelete: "CASCADE",
+        },
+      }, {
+        transaction
+      });
+      return await transaction.commit();
+    } catch (e) {
+      if (transaction && !transaction.finished) {
+        this.log(e, "ERROR")
+        this.log(`Rollback transaction on table ${this.entityName}`);
+        await transaction.rollback();
+      }
+      this.log("Rollback Transaction already finished", "WARNING")
+      throw e
+    }
+    //`username` VARCHAR(126) REFERENCES `user` (`username`) ON DELETE CASCADE ON UPDATE CASCADE);
+  }
+
+  async down({
+    name,
+    context: queryInterface,
+    context: sequelize
+  }) {
+    try {
+      const descriptions = await queryInterface.describeTable(this.entityName)
+      return await queryInterface.dropTable(this.entityName);
+    } catch (e) {
+      this.log(`Entity ${this.entityName} not exist`, "WARNING")
+      throw e
+    }
+  }
+}
+
+module.exports = new Migrate(kernel);

package/cli/builder/project/skeletons/migrations/migrations.skeleton.js

@@ -1,5 +1,3 @@
-// migrations/00_initial.js
-
 const {
   Sequelize
 } = require('sequelize');

package/cli/builder/project/skeletons/package.json.twig

@@ -0,0 +1,70 @@
+{
+  "name": "{{name}}",
+  "version": "1.0.0",
+  "description": "{{description}}",
+  "main": "nodefony",
+  "scripts": {
+    "nodefony": "nodefony",
+    "pm2": "pm2",
+    "start": "nodefony start",
+    "dev": "nodefony dev",
+    "build": "nodefony build",
+    "rebuild": "nodefony rebuild",
+    "stop": "nodefony stop",
+    "prod": "nodefony prod",
+    "kill": "nodefony kill",
+    "test": "nodefony test",
+    "help": "nodefony -h",
+    "changelog": "conventional-changelog -p conventionalcommits -i CHANGELOG.md -s -r 0",
+    "dev-deploy": "bash bin/dev-deploy.sh",
+    "prod-deploy": "bash bin/prod-deploy.sh",
+    "lint": "eslint ."
+  },
+  "private": true,
+  "keywords": [
+    "Node.js",
+    "nodefony"
+  ],
+  "repository": {},
+  "bugs": {},
+  "license": "{{licence}}",
+  "os": [
+    "darwin",
+    "linux",
+    "freebsd",
+    "win32"
+  ],
+  "engines": {
+    "node": ">=12"
+  },
+  "dependencies": {
+    "graphql": "16.8.1",
+    "mongoose": "7.6.1",
+    "nodefony": "{{version}}",
+    "pm2": "5.3.0",
+    "pm2-logrotate": "^2.7.0",
+    "sequelize": "6.33.0",
+    "webpack": "5.88.2",
+    "webpack-dev-server": "4.15.1"
+  },
+  "devDependencies": {
+    "@babel/core": "7.23.0",
+    "@babel/eslint-parser": "7.22.15",
+    "@mapbox/node-pre-gyp": "1.0.11",
+    "conventional-changelog-cli": "4.1.0",
+    "eslint": "8.51.0",
+    "eslint-config-standard": "17.1.0",
+    "eslint-plugin-html": "7.1.0",
+    "eslint-plugin-import": "2.28.1",
+    "eslint-plugin-markdown": "3.0.1",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-vue": "9.17.0",
+    "markdown-eslint-parser": "1.2.1",
+    "node-gyp": "9.4.0",
+    "vue-eslint-parser": "9.3.2"
+  },
+  "author": "{{authorFullName}} <{{authorMail}}>",
+  "readmeFilename": "README.md",
+  "contributors": [{}]
+}

package/cli/builder/react/reactBuilder.js

@@ -1,6 +1,6 @@
 class React extends nodefony.builders.sandbox {
-  constructor(cli, cmd, args, options) {
-    super(cli, cmd, args, nodefony.extend(true, {},options,{
+  constructor (cli, cmd, args, options) {
+    super(cli, cmd, args, nodefony.extend(true, {}, options, {
       addons: {
         webpack: false,
         bootstrap: false
@@ -10,49 +10,42 @@ class React extends nodefony.builders.sandbox {
     this.cliReact = this.getCli();
   }
 
-  run() {
+  run () {
     return super.run(false);
   }
 
-  generate(response, force) {
+  generate (response, force) {
     return this.buiReact()
-      .then((dir) => {
-        return this.ejectReact(dir, this.cli.response)
-          .then(() => {
-            return super.generate(response, force)
-              .then(() => {
-                return this.response;
-              });
-          })
-          .catch((e) => {
-            throw e;
-          });
-      });
+      .then((dir) => this.ejectReact(dir, this.cli.response)
+        .then(() => super.generate(response, force)
+          .then(() => this.response))
+        .catch((e) => {
+          throw e;
+        }));
   }
 
-  builderProject() {
+  builderProject () {
     try {
       return {
         name: "app",
         type: "directory",
         childs: [{
-            name: "appKernel.js",
-            type: "file",
-            skeleton: path.resolve(this.globalSkeleton, "app", "appKernel.js"),
-            params: this.response
-          },
-          this.generateController(),
-          this.generateConfig(false, true),
-          this.generateRessources()
-        ]
+          name: "appKernel.js",
+          type: "file",
+          skeleton: path.resolve(this.globalSkeleton, "app", "appKernel.js"),
+          params: this.response
+        },
+        this.generateController(),
+        this.generateConfig(false, true),
+        this.generateRessources()]
       };
     } catch (e) {
       throw e;
     }
   }
 
-  builderBundle() {
-    let bundle = [];
+  builderBundle () {
+    const bundle = [];
     bundle.push({
       name: `${this.response.name}Bundle.js`,
       type: "file",
@@ -72,7 +65,7 @@ class React extends nodefony.builders.sandbox {
     return bundle;
   }
 
-  buiReact() {
+  buiReact () {
     let name = null;
     let location = null;
     switch (this.cli.response.command) {
@@ -86,9 +79,9 @@ class React extends nodefony.builders.sandbox {
       break;
     }
     return new Promise((resolve, reject) => {
-      //console.log(this.bundleName)
-      let args = [name];
-      this.log("install React cli : create-react-app " + args.join(" "));
+      // console.log(this.bundleName)
+      const args = [name];
+      this.log(`install React cli : create-react-app ${args.join(" ")}`);
       let cmd = null;
       try {
         cmd = this.cli.spawn(this.cliReact, args, {
@@ -96,8 +89,8 @@ class React extends nodefony.builders.sandbox {
           stdio: "inherit"
         }, (code) => {
           if (code === 1) {
-            //.cleanTmp();
-            return reject(new Error("install React cli  create-react-app new error : " + code));
+            // .cleanTmp();
+            return reject(new Error(`install React cli  create-react-app new error : ${code}`));
           }
           if (this.cli.response.command === "project") {
             return resolve(path.resolve(this.location, name));
@@ -106,18 +99,18 @@ class React extends nodefony.builders.sandbox {
         });
       } catch (e) {
         this.log(e, "ERROR");
-        //this.cleanTmp();
+        // this.cleanTmp();
         return reject(e);
       }
     });
   }
 
-  async ejectReact(dir) {
+  async ejectReact (dir) {
     await this.stach(dir);
     let err = null;
     return new Promise(async (resolve, reject) => {
-      let args = ['run', 'eject'];
-      this.log(" eject  webpack config React : " + args.join(" "));
+      const args = ["run", "eject"];
+      this.log(` eject  webpack config React : ${args.join(" ")}`);
       try {
         return this.cli.packageManager(args, dir)
           .then(async () => {
@@ -125,12 +118,12 @@ class React extends nodefony.builders.sandbox {
             return resolve(path.resolve(this.location));
           })
           .catch(async (error) => {
-            //this.cleanTmp();
+            // this.cleanTmp();
             await this.stachPop();
-            return reject(new Error("React eject error : " + error));
+            return reject(new Error(`React eject error : ${error}`));
           });
       } catch (e) {
-        //this.cleanTmp();
+        // this.cleanTmp();
         err = e;
       }
       if (err) {
@@ -139,57 +132,59 @@ class React extends nodefony.builders.sandbox {
         return reject(err);
       }
     });
-
   }
 
-  async stach() {
+  async stach () {
     let gitP, cwd, gitS, gitC;
     try {
       cwd = path.resolve(this.response.path);
-      gitP = require('simple-git');
+      gitP = require("simple-git");
       gitS = gitP(cwd);
       gitC = gitP(this.location);
     } catch (e) {
       throw e;
     }
-    let res = await gitC.checkIsRepo();
-    if (! res){
+    const res = await gitC.checkIsRepo();
+    if (!res) {
       return Promise.resolve(this.location);
     }
     await gitC.add(path.resolve(this.location, "*"))
-    .then(() => {
-      this.log("git add ");
-      return cwd;
-    }).catch((err) => {
+      .then(() => {
+        this.log("git add ");
+        return cwd;
+      })
+      .catch((err) => {
         this.log(err, "ERROR");
-    });
+      });
     await gitC.commit(`create bundle ${this.response.bundleName}`)
-    .then(() => {
-      this.log("git commit");
-      return cwd;
-    }).catch((err) => {
+      .then(() => {
+        this.log("git commit");
+        return cwd;
+      })
+      .catch((err) => {
         this.log(err, "ERROR");
-    });
+      });
     return gitS.stash(["-u"])
       .then(() => {
         this.log("git stash");
         return cwd;
-      }).catch((err) => {
-          this.log(err, "ERROR");
+      })
+      .catch((err) => {
+        this.log(err, "ERROR");
       });
   }
 
-  async stachPop() {
+  async stachPop () {
     let gitP, cwd, git;
     try {
       cwd = path.resolve(this.response.path);
-      gitP = require('simple-git');
+      gitP = require("simple-git");
       git = gitP(cwd);
     } catch (e) {
       throw e;
     }
-    let res = await git.checkIsRepo();
-    if (! res){
+    const res = await git.checkIsRepo();
+    if (!res) {
       return Promise.resolve(this.location);
     }
     return git.stash(["pop"])
@@ -198,11 +193,11 @@ class React extends nodefony.builders.sandbox {
         return cwd;
       })
       .catch((err) => {
-          this.log(err, "ERROR");
+        this.log(err, "ERROR");
       });
   }
 
-  getCli() {
+  getCli () {
     let cliPath = null;
     try {
       cliPath = path.resolve(__dirname, "..", "..", "..", "node_modules", ".bin", "create-react-app");
@@ -224,7 +219,6 @@ class React extends nodefony.builders.sandbox {
     }
     return cliPath;
   }
-
 }
 nodefony.builders.react = React;
 module.exports = React;