nodefony 6.5.7 → 6.10.0

package/cli/builder/skeletons/config/nodefony/mongoose-bundle.js

@@ -3,6 +3,7 @@
  *
  *       @see MONGO BUNDLE config for more options
  *       @more options https://mongoosejs.com/docs/connections.html
+ *              https://mongoosejs.com/docs/api.html#mongoose_Mongoose-createConnection
  *
  *       By default nodefony create connector name nodefony
  *       for manage Sessions / Users
@@ -17,12 +18,7 @@ module.exports = {
         dbname: "nodefony",
         settings: {
           user: "",
-          pass: "",
-          authSource: "admin",
-          reconnectTries: 100,
-          reconnectInterval: 5000,
-          autoReconnect: true,
-          poolSize: 5
+          pass: ""
         }
       }
     }

package/cli/builder/skeletons/config/nodefony/redis-bundle.js

@@ -1,7 +1,8 @@
 /**
  *    OVERRIDE REDIS BUNDLE SETTINGS
  *
- *   All Options :                https://github.com/NodeRedis/node_redis
+ *   All Options :                https://github.com/redis/node-redis
+ *          https://github.com/redis/node-redis/blob/master/docs/client-configuration.md
  *
  *   Add clients connections
  *   connections :{
@@ -20,20 +21,24 @@ module.exports = {
   redis: {
     debug: true,
     globalOptions: {
-      host: "localhost",
-      port: 6379,
-      family: "IPv4",
-      disable_resubscribing: false,
-      tls: null,
-      no_ready_check: false,
-      socket_keepalive: false,
-      return_buffers: false,
-      retry_unfulfilled_commands: true
+      socket:{
+        host: "localhost",
+        port: 6379,
+        family: "IPv4"
+      },
+      //username:"nodefony",
+      //password:"nodefony",
     },
     connections: {
       main: {
         name: "main"
       }
+      /*publish: {
+        name: "publish"
+      },
+      subscribe: {
+        name: "subscribe"
+      },*/
     }
   }
-};
+};

package/cli/builder/skeletons/config/webpack/webpack.prod.config.js

@@ -1,5 +1,4 @@
 // WEBPACK PROD CONFIGURATION
-const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 
 module.exports = {
@@ -17,14 +16,5 @@ module.exports = {
       })
     ]
   },
-  plugins: [
-    new OptimizeCssAssetsPlugin({
-      cssProcessorOptions: {
-        discardComments: {
-          removeAll: true
-        }
-      },
-      canPrint: true
-    })
-  ]
+  plugins: []
 };

package/cli/builder/skeletons/config/webpack.config.js

@@ -12,16 +12,16 @@ const {InjectManifest} = require('workbox-webpack-plugin');
 // Default context <bundle base directory>
 //const context = path.resolve(__dirname, "..", "Resources", "public");
 const public = path.resolve(__dirname, "..", "Resources", "public", "assets");
-const package = require(path.resolve("package.json"));
+const bundlePackage = require(path.resolve("package.json"));
 {% else %}
 // Default context <bundle base directory>
 //const context = path.resolve(__dirname, "..", "public");
 const public = path.resolve(__dirname, "..", "public", "assets");
-const package = require(path.resolve("package.json"));
+const bundlePackage = require(path.resolve("package.json"));
 {% endif %}
 
 const bundleConfig = require(path.resolve(__dirname, "config.js"));
-const bundleName = package.name;
+const bundleName = bundlePackage.name;
 const publicPath = "/{{bundleName}}/assets/";
 
 let wpconfig = null;
@@ -142,7 +142,7 @@ module.exports = merge(wpconfig, {
 {% endif %}
   ],
   devServer: {
-    inline: true,
-    hot: false
+    hot: false, // false || true || "only"
+    progress:false
   }
 });

package/cli/builder/skeletons/package.json

@@ -18,37 +18,42 @@
   "repository": {},
   "dependencies": {
 {% if addons.workbox %}
-    "workbox-webpack-plugin": "^6.1.5",
+    "workbox-webpack-plugin": "^6.4.2",
 {% endif %}
 {% if addons.bootstrap %}
-    "@popperjs/core": "^2.9.2",
-    "bootstrap": "^5.0.2",
+    "@popperjs/core": "^2.11.0",
+    "bootstrap": "^5.1.3",
     "jquery": "^3.6.0",
     "font-awesome": "^4.7.0",
 {% endif %}
 {% if addons.webpack %}
-    "@babel/core": "^7.14.8",
-    "@babel/preset-env": "^7.14.8",
-    "babel-loader": "^8.2.2",
-    "clean-webpack-plugin": "^4.0.0-alpha.0",
+    "@babel/core": "^7.16.7",
+    "@babel/preset-env": "^7.16.7",
+    "babel-loader": "^8.2.3",
+    "clean-webpack-plugin": "^4.0.0",
     "css-hot-loader": "^1.4.4",
-    "css-loader": "^6.2.0",
-    "expose-loader": "^3.0.0",
-    "html-webpack-plugin": "^5.3.2",
-    "imports-loader": "^3.0.0",
-    "mini-css-extract-plugin": "^2.1.0",
-    "node-sass": "^6.0.1",
-    "optimize-css-assets-webpack-plugin": "^6.0.1",
-    "sass-loader": "^12.1.0",
-    "style-loader": "^3.2.1",
-    "terser-webpack-plugin": "^5.1.4",
-    "webpack": "^5.45.1",
+    "css-loader": "^6.5.1",
+    "expose-loader": "^3.1.0",
+    "favicons": "^6.2.2",
+    "favicons-webpack-plugin": "^5.0.2",
+    "html-webpack-plugin": "^5.5.0",
+    "imports-loader": "^3.1.1",
+    "mini-css-extract-plugin": "^2.4.5",
+    "node-sass": "^7.0.1",
+    "sass-loader": "^12.4.0",
+    "sitemap-webpack-plugin": "^1.1.1",
+    "style-loader": "^3.3.1",
+    "terser-webpack-plugin": "^5.3.0",
+    "webpack": "^5.65.0",
     "webpack-merge": "^5.8.0"
 {% endif %}
   },
   "devDependencies": {
-    "@mapbox/node-pre-gyp": "^1.0.5",
-    "node-gyp": "^8.1.0"
+{% if addons.webpack %}
+    "webpack-dev-server": "^4.7.2",
+{% endif %}
+    "@mapbox/node-pre-gyp": "^1.0.8",
+    "node-gyp": "^8.4.1"
   },
   "license": "",
   "readmeFilename": "README.md",

package/cli/builder/vue/skeletons/vue.config.js

@@ -32,15 +32,15 @@ module.exports = {
   configureWebpack: {
     devtool: process.env.NODE_ENV === "development" ? "source-map" : "",
     output:{
-      hotUpdateChunkFilename: 'hot/hot-update.js',
-      hotUpdateMainFilename: 'hot/hot-update.json'
+      hotUpdateChunkFilename:'hot/[id].[hash].hot-update.js',
+      hotUpdateMainFilename: 'hot/[hash].hot-update.json'
     },
     plugins: [
       new CleanWebpackPlugin({
         cleanOnceBeforeBuildPatterns: [`${outputDir}/hot/*.hot-update.*`],
         dry: false,
-        verbose: false,
-        initialClean: false,
+        verbose: true,
+        initialClean: true,
         cleanStaleWebpackAssets:true,
         protectWebpackAssets:true,
         cleanAfterEveryBuildPatterns:[],

package/cli/builder/vue/vueBuilder.js

@@ -80,7 +80,7 @@ class Vue extends nodefony.builders.sandbox {
         return this.checkTypeScript()
           .then(async () => {
             let packages = ["clean-webpack-plugin"];
-            let packagesDev = ["@vue/cli"];
+            let packagesDev = ["@vue/cli","webpack-dev-server@3.11.2"];
             await this.addPackage(packages, false);
             await this.addPackage(packagesDev, true);
             if(this.response.addons.vuetify){

package/cli/install/install.js

@@ -99,7 +99,8 @@ module.exports = class installProject extends nodefony.Builder {
         this.checkDirectoryExist(directory);
         this.log(`Generate openssl certificates in : ${directory}`);
         let cmd = null;
-        cmd = this.cli.spawn(path.resolve(cwd, "bin", "generateCertificates.sh"), [], {
+        cmd = this.cli.spawn("bash", [path.resolve(cwd, "bin", "generateCertificates.sh")], {
+        //cmd = this.cli.spawn(path.resolve(cwd, "bin", "generateCertificates.sh"), [], {
           cwd: cwd,
           shell: true,
           stdio: "inherit"

package/cli.es6

@@ -1,4 +1,4 @@
-const Table = require('cli-table');
+const Table = require('cli-table3');
 const asciify = require('asciify');
 //const inquirer = require('inquirer');
 //const commander = require('commander');
@@ -440,25 +440,19 @@ class CLI extends nodefony.Service {
     return false;
   }
 
-  displayTable(datas, options, syslog) {
+  displayTable(datas, options= defaultTableCli, syslog=null) {
+    if( !datas || ! datas.length){
+      return new Table(nodefony.extend({}, defaultTableCli, options ));
+    }
     let table = null;
     try {
-      table = new Table(options || defaultTableCli);
+      table = new Table(nodefony.extend({}, defaultTableCli, options ));
       if (datas) {
         for (let i = 0; i < datas.length; i++) {
           table.push(datas[i]);
         }
         if (syslog) {
           syslog.log(`\n${table.toString()}`);
-          /*if (syslog.logger) {
-            syslog.logger(table.toString());
-          } else {
-            if (syslog.log) {
-              syslog.log(table.toString());
-            } else {
-              this.log(`\n${table.toString()}`);
-            }
-          }*/
         } else {
           console.log(table.toString());
         }

package/error.es6

@@ -263,7 +263,8 @@ class nodefonyError extends Error {
         if (message.message) {
           this.message = message.message;
         } else {
-          this.message = JSON.stringify(message);
+          //this.message = JSON.stringify(message);
+          this.message = util.inspect(message,{depth:0});
         }
       } catch (e) {
         this.error = e;

package/kernel/api/graphqlApi.es6

@@ -9,23 +9,33 @@ class graphqlApi extends JsonApi {
 
   constructor(config = {}, context = null) {
     let schema = null;
-    if (config.schema){
+    if (config.schema) {
       schema = config.schema;
       delete config.schema;
     }
     super(config, context);
     this.json.operationName = null;
     this.setResultName(config.resultName || "data");
-    if ( schema ){
+    if (schema) {
       this.setSchema(schema);
     }
   }
 
-  async query(query, variables = null, operationName = null) {
+  async query(query, variables = null, operationName = null, fieldResolver = null, typeResolver = null) {
     const controller = this.get("controller");
     this.json.operationName = operationName;
     try {
-      let res = await nodefony.graphql.graphql(this.schema, query, controller, this, variables, operationName);
+      const conf = {
+        schema: this.schema,
+        source: query,
+        rootValue: controller,
+        contextValue: this,
+        variableValues: variables,
+        operationName: operationName,
+        fieldResolver: fieldResolver,
+        typeResolver: typeResolver
+      }
+      let res = await nodefony.graphql.graphql(conf);
       if (res.errors && res.errors.length) {
         throw res.errors;
       }
@@ -40,9 +50,9 @@ class graphqlApi extends JsonApi {
     return this.schema;
   }
 
-  setSchema(schema){
-    this.schema = schema ;
-    return this.schema ;
+  setSchema(schema) {
+    this.schema = schema;
+    return this.schema;
   }
 }
 

package/kernel/bundle.es6

@@ -501,7 +501,7 @@ class Bundle extends nodefony.Service {
     let config = false;
     let services = false;
     //let entities = false;
-    let regJs = new RegExp(".*\.js$|.*\.es6$|.*\.es7$");
+    let regJs = new RegExp(".*\.js$|.*\.es6$|.*\.es7$|.*\.mjs$");
     try {
       switch (typeof this.settings.watch) {
       case "object":

package/kernel/cliKernel.es6

@@ -1,5 +1,5 @@
 const simpleGit = require('simple-git');
-const npm = require("npm");
+//const npm = require("npm");
 
 const charsTable = {
   'top': '',
@@ -585,7 +585,7 @@ class cliKernel extends nodefony.cli {
   assetInstall() {
     return new Promise((resolve, reject) => {
       try {
-        let table = this.displayTable(null, {
+        let table = this.displayTable([], {
           head: [
             "BUNDLES",
             "DESTINATION PATH",

package/kernel/controllers/controller.es6

@@ -92,6 +92,10 @@ class Controller extends nodefony.Service {
 
   startSession(sessionContext) {
     let sessionService = this.get("sessions");
+    // is subRequest
+    if (this.context.parent){
+      return this.getSession()
+    }
     if (!this.context.requestEnded) {
       return this.sessionAutoStart = sessionService.setAutoStart(sessionContext);
     } else {

package/kernel/kernel.es6

@@ -285,7 +285,7 @@ class Kernel extends nodefony.Service {
   }
 
   displayCommand(commands) {
-    let table = this.cli.displayTable(null, {
+    let table = this.cli.displayTable([], {
       head: [
           "BUNDLES",
           "COMMAND NAME"

package/kernel/reader.es6

@@ -57,6 +57,7 @@ const load = function (name, pathFile) {
       break;
     case ".js":
     case ".es6":
+    case ".mjs":
     case ".es7":
       Array.prototype.unshift.call(arguments, file);
       switch (true) {

package/kernel/security/secureArea.es6

@@ -203,7 +203,9 @@ module.exports = nodefony.register("SecuredArea", function () {
                   if (context.user && context.user.lang) {
                     context.session.set("lang", context.user.lang);
                   } else {
-                    context.session.set("lang", context.translation.defaultLocale);
+                    if( ! context.session.get("lang") ){
+                      context.session.set("lang", context.translation.defaultLocale);
+                    }
                   }
                 }
                 return resolve(context);

package/nodefony.es6

@@ -763,7 +763,7 @@ class Nodefony {
   tablePm2(cli, apps) {
     //console.log(apps)
     let table = null;
-    table = cli.displayTable(null, {
+    table = cli.displayTable([], {
       head: [
         cli.clc.blue("App name"),
         cli.clc.blue("id"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodefony",
-  "version": "6.5.7",
+  "version": "6.10.0",
   "main": "autoloader.es6",
   "description": "Nodefony Framework Core",
   "contributors": [],
@@ -32,64 +32,63 @@
     "nodefony": "bin/nodefony"
   },
   "dependencies": {
-    "@babel/core": "^7.14.8",
-    "@babel/parser": "^7.14.8",
-    "@babel/preset-env": "^7.14.8",
-    "@nodefony/documentation-bundle": "^6.5.7",
-    "@nodefony/elastic-bundle": "^6.5.7",
-    "@nodefony/framework-bundle": "^6.5.7",
-    "@nodefony/http-bundle": "^6.5.7",
-    "@nodefony/mail-bundle": "^6.5.7",
-    "@nodefony/mongo-bundle": "^6.5.7",
-    "@nodefony/mongoose-bundle": "^6.5.7",
-    "@nodefony/monitoring-bundle": "^6.5.7",
-    "@nodefony/realtime-bundle": "^6.5.7",
-    "@nodefony/redis-bundle": "^6.5.7",
-    "@nodefony/security-bundle": "^6.5.7",
-    "@nodefony/sequelize-bundle": "^6.5.7",
-    "@nodefony/unittests-bundle": "^6.5.7",
-    "@vue/cli": "^4.5.13",
-    "@vue/cli-service-global": "^4.5.13",
+    "@babel/core": "^7.16.7",
+    "@babel/parser": "^7.16.7",
+    "@babel/preset-env": "^7.16.7",
+    "@nodefony/documentation-bundle": "^6.10.0",
+    "@nodefony/elastic-bundle": "^6.10.0",
+    "@nodefony/framework-bundle": "^6.10.0",
+    "@nodefony/http-bundle": "^6.10.0",
+    "@nodefony/mail-bundle": "^6.10.0",
+    "@nodefony/mongoose-bundle": "^6.10.0",
+    "@nodefony/monitoring-bundle": "^6.10.0",
+    "@nodefony/realtime-bundle": "^6.10.0",
+    "@nodefony/redis-bundle": "^6.10.0",
+    "@nodefony/security-bundle": "^6.10.0",
+    "@nodefony/sequelize-bundle": "^6.10.0",
+    "@nodefony/unittests-bundle": "^6.10.0",
+    "@vue/cli": "^4.5.15",
+    "@vue/cli-service-global": "^4.5.15",
     "asciify": "^1.3.5",
     "bluebird": "^3.7.2",
     "chai": "^4.3.4",
     "chokidar": "^3.5.2",
-    "cli-color": "^2.0.0",
-    "cli-table": "^0.3.6",
+    "cli-color": "^2.0.1",
+    "cli-table3": "^0.6.0",
     "clui": "^0.3.6",
-    "commander": "^8.0.0",
-    "core-js": "^3.15.2",
-    "create-react-app": "^4.0.3",
-    "graphql": "^15.5.1",
-    "inquirer": "^8.1.2",
+    "commander": "^8.3.0",
+    "core-js": "^3.20.1",
+    "create-react-app": "^5.0.0",
+    "graphql": "^16.2.0",
+    "inquirer": "^8.2.0",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "lodash.isregexp": "^4.0.1",
-    "markdown-it": "^12.1.0",
-    "mime": "^2.5.2",
+    "markdown-it": "^12.3.0",
+    "mime": "^3.0.0",
     "moment": "^2.29.1",
     "node-cron": "^3.0.0",
-    "node-emoji": "^1.10.0",
-    "npm": "^7.20.0",
-    "pm2": "^5.1.0",
+    "node-emoji": "^1.11.0",
+    "npm": "^8.3.0",
+    "pm2": "^5.1.2",
     "promise": "^8.1.0",
     "request": "^2.88.2",
-    "semver": "^7.3.4",
+    "semver": "^7.3.5",
     "shelljs": "^0.8.4",
     "shortid": "^2.2.16",
-    "simple-git": "^2.41.1",
+    "simple-git": "^2.48.0",
     "spdx": "^0.5.2",
+    "terser-webpack-plugin": "^5.3.0",
     "twig": "^1.15.4",
     "uuid": "^8.3.2",
+    "webpack": "^5.65.0",
     "xml2js": "^0.4.23",
-    "yarn": "^1.22.10"
+    "yarn": "^1.22.17"
   },
   "devDependencies": {
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^8.2.3",
     "babel-polyfill": "^6.26.0",
-    "terser-webpack-plugin": "^5.1.4",
-    "webpack": "^5.45.1",
-    "webpack-cli": "^4.7.2",
+    "webpack-cli": "^4.9.1",
     "webpack-merge": "^5.8.0"
   },
   "repository": {

package/cli/builder/bundles/users-bundle/Resources/views/index.html.twig

@@ -1,19 +0,0 @@
-{% extends './base.html.twig' %}
-
-{% set error = getFlashBag("error") %}
-{% set info = getFlashBag("info") %}
-
-{% block body %}
-
-<div class="hello">
-
-  <img class=displayed src=/framework-bundle/images/nodefony-logo.png>
-  <h1>{{ name }}</h1>
-  <h2>{{ description }}</h2>
-  <img class="displayed"  style=" width:10%; height:10%" src="/framework-bundle/images/nodejs/nodejs-new-pantone-black.png">
-  <img class="displayed"  style=" width:10%; height:10%" src="/framework-bundle/images/bootstrap.png">
-  <img class="displayed" style=" width:15%; height:15%" src="/framework-bundle/images/webpack/webpack.svg">
-
-</div>
-
-{% endblock %}