qcobjects-cli 2.3.33 → 2.3.44

package/.gitlab-ci.yml

@@ -0,0 +1,15 @@
+image: node:latest
+
+stages:
+  - deploy
+
+deploy:
+  stage: deploy
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^v\d+\.\d+\.\d+.*$/
+      changes:
+        - package.json
+  script:
+    - echo "registry=https://registry.npmjs.org/:_authToken=${NPM_TOKEN}">.npmrc
+    - npm ci
+    - npm publish

package/VERSION

@@ -1 +1 @@
-2.3.33
+2.3.44

package/org.quickcorp.qcobjects.cli.js

@@ -180,11 +180,13 @@ Package("org.quickcorp.qcobjects.cli",[
         var _dirnames = function (pathname){
           fs.readdir(pathname,{withFileTypes:true},function (err,files){
             var _pathnames = [];
-            files.filter((f)=>{return f.isDirectory();}).map((d)=>{
+            if (typeof files !== "undefined"){
+              files.filter((f)=>{return f.isDirectory();}).map((d)=>{
                 _pathnames.push(pathname+"/"+d.name);
                 callback(pathname+"/"+d.name);
                 _dirnames(pathname+"/"+d.name);
               });
+            }
             _main_pathnames = _main_pathnames.concat(_pathnames);
           });
           return _main_pathnames;
@@ -227,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);
 
@@ -244,119 +247,222 @@ Package("org.quickcorp.qcobjects.cli",[
           rl.close();
           let giturl = answer;
 
-          let createAppCommandCustom = "echo \
-{ \
-      \"name\": \""+appName.toLowerCase()+"\", \
-      \"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", \
-      "dependencies": { \
-              "${options.createCustom}": "latest", \
-              "qcobjects": "latest" \
-      } \
-} > package.json`;
-
-
-          let createAppCommandPWA = "echo \
-{ \
-      \"name\": \""+appName.toLowerCase()+"\", \
-      \"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\", \
-      \"dependencies\": { \
-              \"qcobjectsnewapp\": \"latest\", \
-              \"qcobjects\": \"latest\" \
-      } \
-} > package.json";
-
-          let createAppCommandAMP = "echo \
-{ \
-      \"name\": \""+appName.toLowerCase()+"\", \
-      \"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\", \
-      \"dependencies\": { \
-              \"qcobjects-ecommerce-amp\": \"latest\", \
-              \"qcobjects\": \"latest\" \
-      } \
-} > package.json";
-
-          let createAppCommandPHP = `echo \
-{ \
-      "name": "${appName.toLowerCase()}", \
-      "repository": {\
-          "type": "git",\
-          "url": "${giturl}"\
-      },\
-      "description": "Awesome PHP application that will help you achieve your dreams.",\
-      "main": "js/init.js",\
-      "license": "LGPL-3.0-or-later",\
-      "devDependencies": {\
-        "jasmine": "latest",\
-        "qcobjects-cli": "latest"\
-      },\
-      "dependencies": {\
-        "qcobjectsnewphp": "latest",\
-        "qcobjects": "latest",\
-        "qcobjects-sdk": "latest"\
-      }\
-} > package.json`;
+          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.",
+      "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": "^${version.qcobjects}",
+        "qcobjects-sdk": "^${version.sdk}"
+      },
+      "devDependencies": {
+        "eslint": "^8.2.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()}",
+      "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": "^${version.qcobjects}",
+        "qcobjects-sdk": "^${version.sdk}"
+      },
+      "devDependencies": {
+        "eslint": "^8.2.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()}",
+      "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": "^${version.qcobjects}",
+        "qcobjects-sdk": "^${version.sdk}"
+      },
+      "devDependencies": {
+        "eslint": "^8.2.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()}",
+      "version": "0.0.1",
+      "repository": {
+          "type": "git",
+          "url": "${giturl}"
+      },
+      "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"
+      },
+      "dependencies": {
+        "qcobjectsnewphp": "latest",
+        "qcobjects": "^${version.qcobjects}",
+        "qcobjects-sdk": "^${version.sdk}"
+      },
+      "devDependencies": {
+        "eslint": "^8.2.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;
           let appTemplateName;
+          let _package_json_content;
 
           if (options.createAmp){
             appTemplateName = "qcobjects-ecommerce-amp";
-            createAppCommand = createAppCommandAMP;
+            _package_json_content = createAppCommandAMP;
           } else if (options.createPwa){
             appTemplateName = "qcobjectsnewapp";
-            createAppCommand = createAppCommandPWA;
+            _package_json_content = createAppCommandPWA;
           } else if (options.createPhp){
             appTemplateName = "qcobjectsnewphp";
-            createAppCommand = createAppCommandPHP;
+            _package_json_content = createAppCommandPHP;
           } else if (options.createCustom){
             appTemplateName = options.createCustom;
-            createAppCommand = createAppCommandCustom;
+            _package_json_content = createAppCommandCustom;
           } else {
             appTemplateName = "qcobjectsnewapp";
-            createAppCommand = createAppCommandPWA;
+            _package_json_content = createAppCommandPWA;
           }
           CONFIG.set("qcobjectsnewapp_path",CONFIG.get("node_modules_path")+"/"+appTemplateName);
-          if (!process.platform.toLowerCase().startsWith("win")){
-            createAppCommand = createAppCommand.replace(/(")/g, String.fromCharCode(92)+"\"");
-          }
+/*          if (!process.platform.toLowerCase().startsWith("win")){
+            _package_json_content = _package_json_content.replace(/(")/g, String.fromCharCode(92)+"\"");
+          }*/
+          createAppCommand = "npm init -y";
+          let _package_json_file = path.resolve(CONFIG.get("projectPath"),"./package.json");
+          logger.debug("_package_json_file: "+_package_json_file);
           logger.debug(createAppCommand);
+
           exec(createAppCommand, (err, stdout, stderr) => {
-            exec("npm cache verify && npm i --save-dev ", (err, stdout, stderr) => {
-              Promise.resolve(switchCommander.copyTemplate()).then(()=>{
-                logger.info("Good! Your application is getting done. You can play with QCObjects now!");
-                logger.info("In about five seconds your server will start...");
-                exec("qcobjects-createcert",(err,stdout,stderr)=>{
-                  logger.info("Test certificates generated");
-                  exec("npm uninstall "+appTemplateName+" --save && npm cache verify",(err,stdout,stderr)=>{
-                    switchCommander.generateServiceWorker(appName);
+            if (err) {
+              logger.warn(err);
+              process.exit(1);
+              return;
+            }
+            fs.writeFile(_package_json_file, _package_json_content, err => {
+              if (err) {
+                logger.warn(err);
+                process.exit(1);
+                return;
+              }
+
+              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!");
+                  logger.info("In about five seconds your server will start...");
+                  exec("qcobjects-createcert",(err,stdout,stderr)=>{
+                    logger.info("Test certificates generated");
+
+                    exec("npm uninstall "+appTemplateName+" --save && npm cache verify",(err,stdout,stderr)=>{
+                      switchCommander.generateServiceWorker(appName);
+                    });
+
+                  }).stdout.on("data", function(data) {
+                      console.log(data);
                   });
-                }).stdout.on("data", function(data) {
-                    console.log(data);
                 });
+              }).stdout.on("data", function(data) {
+                  console.log(data);
               });
-            }).stdout.on("data", function(data) {
-                console.log(data);
+
             });
+
           }).stdout.on("data", function(data) {
-              console.log(data);
+              console.log("App generation started...");
           });
 
         });
@@ -375,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,55 @@ 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 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)=>require(`${findPackageNodePath(p)}/${p}/package.json`).keywords.includes("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)=>require(`${findPackageNodePath(p)}/${p}/package.json`).keywords.includes("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)=>require(`${findPackageNodePath(p)}/${p}/package.json`).keywords.includes("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

@@ -101,7 +101,7 @@ Package("org.quickcorp.qcobjects.main.http.gae.server",[
       let server = microservice.server;
       let request = microservice.request;
       this.cors();
-      server.on("data", (data) => {
+      microservice.req.on("data", (data) => {
         // data from POST, GET
         var requestMethod = request.method.toLowerCase();
         var supportedMethods = {"post":microservice.post,
@@ -146,8 +146,12 @@ Package("org.quickcorp.qcobjects.main.http.gae.server",[
     done: function(){
       var microservice = this;
       var stream = microservice.stream;
-//      stream.respond(microservice.headers);
-      stream.writeHead(200, {"Content-Type": "text/plain"});
+      try {
+        stream.writeHead(200, microservice.headers);
+      } catch (e){
+        logger.debug("Something went wront while sending headers in http...");
+        logger.debug(e.toString());
+      }
       if (microservice.body != null){
         microservice.finishWithBody.call(microservice,stream);
       }
@@ -191,7 +195,7 @@ Package("org.quickcorp.qcobjects.main.http.gae.server",[
           "content-type": mime.getType(fileName),
           "cache-control": CONFIG.get("cacheControl", "max-age=31536000")
         };
-        console.log("closing file", fileName);
+        logger.debug("closing file " + fileName);
         fs.closeSync(fd);
         stream.setHeader("content-length", headers["content-length"]);
         stream.setHeader("last-modified", headers["last-modified"]);
@@ -318,7 +322,7 @@ Package("org.quickcorp.qcobjects.main.http.gae.server",[
     _new_:function (){
       let oHTTPServer = this;
       const welcometo = "Welcome to \n";
-      const instructions = "QCObjects GAE HTTPServer \n";
+      const instructions = "QCObjects Legacy HTTPServer \n";
       const logo = " .d88888b.  .d8888b.  .d88888b. 888       d8b                888            \r\nd88P\" \"Y88bd88P  Y88bd88P\" \"Y88b888       Y8P                888            \r\n888     888888    888888     888888                          888            \r\n888     888888       888     88888888b.  8888 .d88b.  .d8888b888888.d8888b  \r\n888     888888       888     888888 \"88b \"888d8P  Y8bd88P\"   888   88K      \r\n888 Y8b 888888    888888     888888  888  88888888888888     888   \"Y8888b. \r\nY88b.Y8b88PY88b  d88PY88b. .d88P888 d88P  888Y8b.    Y88b.   Y88b.      X88 \r\n \"Y888888\"  \"Y8888P\"  \"Y88888P\" 88888P\"   888 \"Y8888  \"Y8888P \"Y888 88888P' \r\n       Y8b                                888                               \r\n                                         d88P                               \r\n                                       888P\"   ";
       console.log(welcometo);
       console.log(logo);
@@ -329,9 +333,11 @@ Package("org.quickcorp.qcobjects.main.http.gae.server",[
 
       const http = require("http");
 
-      this.server = http.createServer((req, res) => {});
+      oHTTPServer.server = http.createServer((req, res) => {
 
-      var server = this.server;
+      });
+
+      var server = oHTTPServer.server;
 
       server.on("error", (err) => console.error(err));
 
@@ -398,6 +404,7 @@ Package("org.quickcorp.qcobjects.main.http.gae.server",[
                 routeParams:selectedRouteParams,
                 server:server,
                 stream:res,
+                req:req,
                 request:request
               });
             });

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

@@ -101,7 +101,7 @@ Package("org.quickcorp.qcobjects.main.http.server",[
       let server = microservice.server;
       let request = microservice.request;
       this.cors();
-      server.on("data", (data) => {
+      microservice.req.on("data", (data) => {
         // data from POST, GET
         var requestMethod = request.method.toLowerCase();
         var supportedMethods = {"post":microservice.post,
@@ -333,9 +333,11 @@ Package("org.quickcorp.qcobjects.main.http.server",[
 
       const http = require("http");
 
-      this.server = http.createServer((req, res) => {});
+      oHTTPServer.server = http.createServer((req, res) => {
 
-      var server = this.server;
+      });
+
+      var server = oHTTPServer.server;
 
       server.on("error", (err) => console.error(err));
 
@@ -402,6 +404,7 @@ Package("org.quickcorp.qcobjects.main.http.server",[
                 routeParams:selectedRouteParams,
                 server:server,
                 stream:res,
+                req:req,
                 request:request
               });
             });

package/package.json

@@ -1,20 +1,27 @@
 {
   "name": "qcobjects-cli",
-  "version": "2.3.33",
+  "version": "2.3.44",
   "description": "qcobjects cli command line tool",
   "main": "qcobjects-cli.js",
   "scripts": {
     "sync": "git add . && git commit -am ",
     "test": "npx eslint **/*.js --fix && $(npm bin)/jasmine",
     "preversion": "npm i --upgrade && npm test",
-    "postversion": "git push && git push --tags && npm publish"
+    "postversion": "git push && git push --tags"
   },
   "dependencies": {
     "commander": "^2.20.3",
     "mime": "^2.4.7",
-    "qcobjects": "latest",
+    "qcobjects": "^2.3.66-lts",
     "qcobjects-sdk": "latest",
-    "yaml": "^1.8.0"
+    "yaml": "^1.10.2"
+  },
+  "devDependencies": {
+    "eslint": "^8.2.0",
+    "eslint-config-qcobjects": "^0.0.13",
+    "jasmine": "^3.7.0",
+    "qcobjects": "^2.3.66-lts",
+    "qcobjects-cli": "latest"
   },
   "repository": {
     "type": "file",
@@ -54,10 +61,5 @@
     "qcobjects-gae-server": "./qcobjects-gae-http-server.js",
     "qcobjects-http-server": "./qcobjects-http-server.js",
     "qcobjects-collab": "./qcobjects-collab.js"
-  },
-  "devDependencies": {
-    "eslint": "^6.8.0",
-    "eslint-config-qcobjects": "0.0.6",
-    "jasmine": "^3.7.0"
   }
 }

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,