qcobjects-cli 2.3.42 → 2.3.49

package/VERSION

@@ -1 +1 @@
-2.3.42
+2.3.49

package/org.quickcorp.qcobjects.cli.js

@@ -229,6 +229,7 @@ Package("org.quickcorp.qcobjects.cli",[
 
       },
       create:function (_appName, options){
+        const version = global.__get_version__();
         let switchCommander = this;
         let appName = (typeof _appName ==="undefined" || _appName === true)?("MyAppName"):(_appName);
 
@@ -246,117 +247,117 @@ Package("org.quickcorp.qcobjects.cli",[
           rl.close();
           let giturl = answer;
 
-          let createAppCommandCustom = ` 
-{ 
-      "name": "${appName.toLowerCase()}", 
+          let createAppCommandCustom = `
+{
+      "name": "${appName.toLowerCase()}",
       "version": "0.0.1",
-      "repository": { 
-        "type": "git", 
-        "url": "${giturl}" 
-      }, 
-      "description": "This is a custom NPM template app from ${options.createCustom} generated with QCObjects.", 
+      "repository": {
+        "type": "git",
+        "url": "${giturl}"
+      },
+      "description": "This is a custom NPM template app from ${options.createCustom} generated with QCObjects.",
       "main": "js/init.js",
       "license": "LGPL-3.0-or-later",
-      "scripts": { 
-        "test": "(npx eslint *.js js/*.js js/packages/*.js --fix) && (npx jasmine)", 
-        "sync": "git add . && git commit -am ", 
-        "preversion": "npm i --upgrade && npm test", 
-        "postversion": "git push && git push --tags", 
-        "coverage": "nyc --reporter=lcov --reporter=text-summary npm run test", 
-        "start": "node app.js", 
-        "build": "exit 0" 
-      }, 
-      "dependencies": { 
-        "${options.createCustom}": "latest", 
-        "qcobjects": "latest", 
-        "qcobjects-sdk": "latest"
-      }, 
-      "devDependencies": 
+      "scripts": {
+        "test": "(npx eslint *.js js/*.js js/packages/*.js --fix) && (npx jasmine)",
+        "sync": "git add . && git commit -am ",
+        "preversion": "npm i --upgrade && npm test",
+        "postversion": "git push && git push --tags",
+        "coverage": "nyc --reporter=lcov --reporter=text-summary npm run test",
+        "start": "node app.js",
+        "build": "exit 0"
+      },
+      "dependencies": {
+        "${options.createCustom}": "latest",
+        "qcobjects": "^${version.qcobjects}",
+        "qcobjects-sdk": "^${version.sdk}"
+      },
+      "devDependencies": {
         "eslint": "^8.2.0",
-        "eslint-config-qcobjects": "latest", 
-        "jasmine": "latest", 
-        "qcobjects-cli": "latest", 
-        "grunt": "^1.4.1", 
-        "grunt-contrib-jasmine": "^2.0.2", 
-        "nyc": "^15.1.0" 
-      } 
+        "eslint-config-qcobjects": "latest",
+        "jasmine": "latest",
+        "qcobjects-cli": "^${version.cli}",
+        "grunt": "^1.4.1",
+        "grunt-contrib-jasmine": "^2.0.2",
+        "nyc": "^15.1.0"
+      }
 }`;
 
-          let createAppCommandPWA = ` 
-{ 
-      "name": "${appName.toLowerCase()}", 
+          let createAppCommandPWA = `
+{
+      "name": "${appName.toLowerCase()}",
       "version": "0.0.1",
-      "repository": { 
-        "type": "git", 
-        "url": "${giturl}" 
-      }, 
-      "description": "Awesome PWA application that will help you achieve your dreams.", 
-      "main": "js/init.js", 
-      "license": "LGPL-3.0-or-later", 
-      "scripts": { 
-        "test": "(npx eslint *.js js/*.js js/packages/*.js --fix) && (npx jasmine)", 
-        "sync": "git add . && git commit -am ", 
-        "preversion": "npm i --upgrade && npm test", 
-        "postversion": "git push && git push --tags", 
-        "coverage": "nyc --reporter=lcov --reporter=text-summary npm run test", 
-        "start": "node app.js", 
-        "build": "exit 0" 
-      }, 
-      "dependencies": { 
-        "qcobjectsnewapp": "latest", 
-        "qcobjects": "latest", 
-        "qcobjects-sdk": "latest"
-      }, 
+      "repository": {
+        "type": "git",
+        "url": "${giturl}"
+      },
+      "description": "Awesome PWA application that will help you achieve your dreams.",
+      "main": "js/init.js",
+      "license": "LGPL-3.0-or-later",
+      "scripts": {
+        "test": "(npx eslint *.js js/*.js js/packages/*.js --fix) && (npx jasmine)",
+        "sync": "git add . && git commit -am ",
+        "preversion": "npm i --upgrade && npm test",
+        "postversion": "git push && git push --tags",
+        "coverage": "nyc --reporter=lcov --reporter=text-summary npm run test",
+        "start": "node app.js",
+        "build": "exit 0"
+      },
+      "dependencies": {
+        "qcobjectsnewapp": "latest",
+        "qcobjects": "^${version.qcobjects}",
+        "qcobjects-sdk": "^${version.sdk}"
+      },
       "devDependencies": {
         "eslint": "^8.2.0",
-        "eslint-config-qcobjects": "latest", 
-        "jasmine": "latest", 
-        "qcobjects-cli": "latest", 
-        "grunt": "^1.4.1", 
-        "grunt-contrib-jasmine": "^2.0.2", 
-        "nyc": "^15.1.0" 
-      } 
+        "eslint-config-qcobjects": "latest",
+        "jasmine": "latest",
+        "qcobjects-cli": "^${version.cli}",
+        "grunt": "^1.4.1",
+        "grunt-contrib-jasmine": "^2.0.2",
+        "nyc": "^15.1.0"
+      }
 }`;
 
-          let createAppCommandAMP = `echo 
-{ 
-      "name": "${appName.toLowerCase()}", 
+          let createAppCommandAMP = `echo
+{
+      "name": "${appName.toLowerCase()}",
       "version": "0.0.1",
-      "repository": { 
-        "type": "git", 
-        "url": "${giturl}" 
-      }, 
-      "description": "Awesome AMP application that will help you achieve your dreams.", 
-      "main": "js/init.js", 
-      "license": "LGPL-3.0-or-later", 
-      "scripts": { 
-        "test": "(npx eslint *.js js/*.js js/packages/*.js --fix) && (npx jasmine)", 
-        "sync": "git add . && git commit -am ", 
-        "preversion": "npm i --upgrade && npm test", 
-        "postversion": "git push && git push --tags", 
-        "coverage": "nyc --reporter=lcov --reporter=text-summary npm run test", 
-        "start": "node app.js", 
-        "build": "exit 0" 
-      }, 
-      "dependencies": { 
-        "qcobjects-ecommerce-amp": "latest", 
-        "qcobjects": "latest", 
-        "qcobjects-sdk": "latest"
-      }, 
+      "repository": {
+        "type": "git",
+        "url": "${giturl}"
+      },
+      "description": "Awesome AMP application that will help you achieve your dreams.",
+      "main": "js/init.js",
+      "license": "LGPL-3.0-or-later",
+      "scripts": {
+        "test": "(npx eslint *.js js/*.js js/packages/*.js --fix) && (npx jasmine)",
+        "sync": "git add . && git commit -am ",
+        "preversion": "npm i --upgrade && npm test",
+        "postversion": "git push && git push --tags",
+        "coverage": "nyc --reporter=lcov --reporter=text-summary npm run test",
+        "start": "node app.js",
+        "build": "exit 0"
+      },
+      "dependencies": {
+        "qcobjects-ecommerce-amp": "latest",
+        "qcobjects": "^${version.qcobjects}",
+        "qcobjects-sdk": "^${version.sdk}"
+      },
       "devDependencies": {
         "eslint": "^8.2.0",
-        "eslint-config-qcobjects": "latest", 
-        "jasmine": "latest", 
-        "qcobjects-cli": "latest", 
-        "grunt": "^1.4.1", 
-        "grunt-contrib-jasmine": "^2.0.2", 
-        "nyc": "^15.1.0" 
-      } 
+        "eslint-config-qcobjects": "latest",
+        "jasmine": "latest",
+        "qcobjects-cli": "^${version.cli}",
+        "grunt": "^1.4.1",
+        "grunt-contrib-jasmine": "^2.0.2",
+        "nyc": "^15.1.0"
+      }
 }`;
 
-          let createAppCommandPHP = ` 
-{ 
-      "name": "${appName.toLowerCase()}", 
+          let createAppCommandPHP = `
+{
+      "name": "${appName.toLowerCase()}",
       "version": "0.0.1",
       "repository": {
           "type": "git",
@@ -365,29 +366,29 @@ Package("org.quickcorp.qcobjects.cli",[
       "description": "Awesome PHP application that will help you achieve your dreams.",
       "main": "js/init.js",
       "license": "LGPL-3.0-or-later",
-      "scripts": { 
-        "test": "(npx eslint *.js js/*.js js/packages/*.js --fix) && (npx jasmine)", 
-        "sync": "git add . && git commit -am ", 
-        "preversion": "npm i --upgrade && npm test", 
-        "postversion": "git push && git push --tags", 
-        "coverage": "nyc --reporter=lcov --reporter=text-summary npm run test", 
-        "start": "node app.js", 
-        "build": "exit 0" 
-      }, 
+      "scripts": {
+        "test": "(npx eslint *.js js/*.js js/packages/*.js --fix) && (npx jasmine)",
+        "sync": "git add . && git commit -am ",
+        "preversion": "npm i --upgrade && npm test",
+        "postversion": "git push && git push --tags",
+        "coverage": "nyc --reporter=lcov --reporter=text-summary npm run test",
+        "start": "node app.js",
+        "build": "exit 0"
+      },
       "dependencies": {
         "qcobjectsnewphp": "latest",
-        "qcobjects": "latest", 
-        "qcobjects-sdk": "latest"
-      }, 
+        "qcobjects": "^${version.qcobjects}",
+        "qcobjects-sdk": "^${version.sdk}"
+      },
       "devDependencies": {
         "eslint": "^8.2.0",
-        "eslint-config-qcobjects": "latest", 
-        "jasmine": "latest", 
-        "qcobjects-cli": "latest", 
-        "grunt": "^1.4.1", 
-        "grunt-contrib-jasmine": "^2.0.2", 
-        "nyc": "^15.1.0" 
-      } 
+        "eslint-config-qcobjects": "latest",
+        "jasmine": "latest",
+        "qcobjects-cli": "^${version.cli}",
+        "grunt": "^1.4.1",
+        "grunt-contrib-jasmine": "^2.0.2",
+        "nyc": "^15.1.0"
+      }
 }`;
 
           let createAppCommand;
@@ -431,14 +432,14 @@ Package("org.quickcorp.qcobjects.cli",[
                 process.exit(1);
                 return;
               }
-  
-              exec("npm cache verify && npm i --save-dev ", (err, stdout, stderr) => {
+
+              exec("npm cache verify && npm i --save-dev --legacy-peer-deps", (err, stdout, stderr) => {
                 if (err) {
                   logger.warn(err);
                   process.exit(1);
                   return;
                 }
-  
+
                 Promise.resolve(switchCommander.copyTemplate())
                 .then(()=>{
                   logger.info("Good! Your application is getting done. You can play with QCObjects now!");
@@ -449,7 +450,7 @@ Package("org.quickcorp.qcobjects.cli",[
                     exec("npm uninstall "+appTemplateName+" --save && npm cache verify",(err,stdout,stderr)=>{
                       switchCommander.generateServiceWorker(appName);
                     });
-                    
+
                   }).stdout.on("data", function(data) {
                       console.log(data);
                   });
@@ -457,7 +458,7 @@ Package("org.quickcorp.qcobjects.cli",[
               }).stdout.on("data", function(data) {
                   console.log(data);
               });
-  
+
             });
 
           }).stdout.on("data", function(data) {
@@ -480,7 +481,7 @@ Package("org.quickcorp.qcobjects.cli",[
       if (process.argv.length>1){
 
         switchCommander.program
-          .version(global.__get_version__());
+          .version(global.__get_version_string__());
         switchCommander.program
           .command("create <appname>")
           .description("Creates an app with <appname>")

package/org.quickcorp.qcobjects.defaultsettings.js

@@ -49,7 +49,16 @@ global.__get_version__ = function (){
   const package_config = require(absolutePath+"/package.json");
   const qcobjects_pkg_config = require("qcobjects/package.json");
   const qcobjects_sdk_pkg_config = require("qcobjects-sdk/package.json");
-  return "QCObjects: v"+qcobjects_pkg_config.version+", SDK: v"+qcobjects_sdk_pkg_config.version+", CLI: v"+package_config.version;
+  return {
+    "qcobjects":qcobjects_pkg_config.version,
+    "sdk":qcobjects_sdk_pkg_config.version,
+    "cli":package_config.version
+  };
+};
+
+global.__get_version_string__ = function (){
+  const version = global.__get_version__();
+  return "QCObjects: v"+version.qcobjects+", SDK: v"+version.sdk+", CLI: v"+version.cli;
 };
 
 
@@ -118,3 +127,60 @@ try {
   logger.debug(e);
   logger.debug("Something went wrong trying to load config.json file in your project");
 }
+
+(async function (){
+  /* Auto Discover dependencies (lib, handlers, commands) */
+  const path = require("path");
+  const projectPath = CONFIG.get("projectPath", `${process.cwd()}/`);
+  const hasKeyword = (p,keyword) => {
+    const {keywords} = require(`${findPackageNodePath(p)}/${p}/package.json`);
+    return typeof keywords !== "undefined" && keywords.includes(keyword);
+  };
+
+  const loadLibs = async () => {
+    let _ret_;
+    if (CONFIG.get("autodiscover", false) || CONFIG.get("autodiscover_libs",false)){
+      _ret_ = Promise.all(Object.keys(require(`${projectPath}/package.json`).dependencies).filter((p)=>hasKeyword(p,"qcobjects-lib")).map((p)=>Import(p))).then(()=>logger.info("Libs loaded"));
+    } else {
+      _ret_ = Promise.resolve();
+      logger.debug("To load libs, set autodiscover_libs to true in your config.json");
+    }
+    return _ret_;
+  };
+  const loadHandlers = async () => {
+    let _ret_;
+    if (CONFIG.get("autodiscover", false) || CONFIG.get("autodiscover_handlers",false)){
+      _ret_ = Promise.all(Object.keys(require(`${projectPath}/package.json`).dependencies).filter((p)=>hasKeyword(p,"qcobjects-handler")).map((p)=>Import(p))).then(()=>logger.info("Handlers loaded"));
+    } else {
+      _ret_ = Promise.resolve();
+      logger.debug("To load handlers, set autodiscover_handlers to true in your config.json");
+    }
+    return _ret_;
+  };
+  const loadCommands = async () => {
+    let _ret_;
+    if (CONFIG.get("autodiscover", false) || CONFIG.get("autodiscover_commands",false)){
+      _ret_ = Promise.all(Object.keys(require(`${projectPath}/package.json`).dependencies).filter((p)=>hasKeyword(p,"qcobjects-command")).map((p)=>Import(p))).then(()=>logger.info("Commands loaded"));
+    } else {
+      _ret_ = Promise.resolve();
+      logger.debug("To load commands, set autodiscover_commands to true in your config.json");
+    }
+    return _ret_;
+  };
+  if (CONFIG.get("autodiscover", false)
+    || CONFIG.get("autodiscover_libs",false)
+    || CONFIG.get("autodiscover_handlers",false)
+    || CONFIG.get("autodiscover_commands",false)
+    ){
+    logger.info("Auto discover is enabled");
+  } else if (!CONFIG.get("autodiscover", false)) {
+    logger.info("Auto discover is disabled");
+    logger.debug("To load all dependencies, set autodiscover to true in your config.json");
+  } else {
+    logger.info("Auto discover is disabled");
+  }
+
+  await loadLibs();
+  await loadHandlers();
+  await loadCommands();
+})().then (()=>logger.info("Dependencies loaded"));

package/org.quickcorp.qcobjects.main.http.gae.server.js

@@ -291,6 +291,7 @@ Package("org.quickcorp.qcobjects.main.http.gae.server",[
     response:"",
     server:null,
     scriptname:"",
+    interceptorInstances:[],
     showIPAddress:function (){
       var _ret_ = "";
       var os = require("os");
@@ -341,6 +342,26 @@ Package("org.quickcorp.qcobjects.main.http.gae.server",[
 
       server.on("error", (err) => console.error(err));
 
+      if (global.get("backendAvailable")){
+        logger.info("Loading backend interceptors...");
+        let interceptors = CONFIG.get("backend",{}).interceptors;
+        if (typeof interceptors !== "undefined"){
+          logger.info("Backend Interceptors Available");
+          interceptors.map(interceptor=>{
+            ImportMicroservice (interceptor.microservice);
+            var interceptorClassFactory = ClassFactory(interceptor.microservice+".Interceptor");
+            var interceptorInstance = New(interceptorClassFactory,{
+              domain:CONFIG.get("domain"),
+              basePath:CONFIG.get("basePath"),
+              projectPath:CONFIG.get("projectPath"),
+              interceptor:interceptor,
+              server:server
+            });
+            http2ServerInstance.interceptorInstances.push(interceptorInstance);
+          });
+        }
+      }
+
       server.on("request", (req, res) => {
 
         let request = Object.assign(New(HTTPServerRequest),require("url").parse(req.url));

package/org.quickcorp.qcobjects.main.http.server.js

@@ -291,6 +291,7 @@ Package("org.quickcorp.qcobjects.main.http.server",[
     response:"",
     server:null,
     scriptname:"",
+    interceptorInstances:[],
     showIPAddress:function (){
       var _ret_ = "";
       var os = require("os");
@@ -341,6 +342,26 @@ Package("org.quickcorp.qcobjects.main.http.server",[
 
       server.on("error", (err) => console.error(err));
 
+      if (global.get("backendAvailable")){
+        logger.info("Loading backend interceptors...");
+        let interceptors = CONFIG.get("backend",{}).interceptors;
+        if (typeof interceptors !== "undefined"){
+          logger.info("Backend Interceptors Available");
+          interceptors.map(interceptor=>{
+            ImportMicroservice (interceptor.microservice);
+            var interceptorClassFactory = ClassFactory(interceptor.microservice+".Interceptor");
+            var interceptorInstance = New(interceptorClassFactory,{
+              domain:CONFIG.get("domain"),
+              basePath:CONFIG.get("basePath"),
+              projectPath:CONFIG.get("projectPath"),
+              interceptor:interceptor,
+              server:server
+            });
+            http2ServerInstance.interceptorInstances.push(interceptorInstance);
+          });
+        }
+      }
+
       server.on("request", (req, res) => {
 
         let request = Object.assign(New(HTTPServerRequest),require("url").parse(req.url));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qcobjects-cli",
-  "version": "2.3.42",
+  "version": "2.3.49",
   "description": "qcobjects cli command line tool",
   "main": "qcobjects-cli.js",
   "scripts": {

package/qcobjects-shell.js

@@ -85,7 +85,7 @@ readline.emitKeypressEvents(process.stdin);
 if (process.stdin.isTTY)
   process.stdin.setRawMode(true);
 
-let qcobjects_version = global.__get_version__();
+let qcobjects_version = global.__get_version_string__();
 
 const rl = readline.createInterface({
   input: process.stdin,