qcobjects-cli 2.4.35 → 2.4.39

package/VERSION

@@ -1 +1 @@
-2.4.35
+2.4.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qcobjects-cli",
-  "version": "2.4.35",
+  "version": "2.4.39",
   "description": "qcobjects cli command line tool",
   "main": "src/index.cjs",
   "module": "src/index.mjs",
@@ -35,7 +35,7 @@
     "@typescript-eslint/parser": "^5.58.0",
     "eslint": "^8.38.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-config-qcobjects": "^0.0.26",
+    "eslint-config-qcobjects": "^0.0.27",
     "eslint-config-qcobjects-typescript": "^2.4.5",
     "eslint-config-semistandard": "^17.0.0",
     "eslint-config-standard": "^17.0.0",

package/src/backend/com.qcobjects.backend.microservice.static.js

@@ -47,7 +47,7 @@ Package("com.qcobjects.backend.microservice.static", [
 
       const microservice = this;
       const stream = microservice.stream;
-      const fileName = `${process.cwd()}/${microservice.fileName}`;
+      const fileName = (!microservice.fileName.startsWith("/"))?(`${process.cwd()}/${microservice.fileName}`):(microservice.fileName);
 
       const sendFileHTTP2 = function(stream, fileName) {
         // read and send file content in the stream

package/src/org.quickcorp.qcobjects.cli.js

@@ -133,7 +133,18 @@ Package("org.quickcorp.qcobjects.cli",[
             .then(()=>{
 
               exec("npm uninstall "+appTemplateName+" --save && npm cache verify",(err,stdout,stderr)=>{
-                switchCommander.generateServiceWorker(appName);
+                if (err) {
+                  throw Error (err.message);
+                  process.exit(1);
+                  return;
+                }
+
+                /*
+                switchCommander.generateServiceWorker(appName)
+                .then(()=>{
+                  execSync("npm install --save-dev qcobjects-cli ");
+                });
+                */
                 execSync("npm install --save-dev qcobjects-cli ");
               });
         
@@ -272,42 +283,45 @@ Package("org.quickcorp.qcobjects.cli",[
     }
 
     generateServiceWorker(appName){
-      var filelist = ["/"].concat(this.fileListRecursive("./"));
-      filelist = filelist.filter(function (fl){return fl !== "sw.js" && (!fl.startsWith("node_modules/")); });
-      filelist = filelist.filter(fname => !fname.endsWith(".pem"));
-      filelist = filelist.filter(fname => !fname.endsWith(".sh"));
-      filelist = filelist.filter(fname => !(new RegExp("^package(.*).json$")).test(fname));
-      filelist = filelist.filter(fname => !fname.startsWith("."));
-      var fileListString = "\n\t\""+filelist.join("\",\n\t\"")+"\"";
-      var component = New(Component, {
-        templateURI: "sw.js",
-        basePath:templatePwaPath,
-        name:"sw",
-        cached:false,
-        tplsource: "default",
-        data: {
-          appName: appName,
-          appVersion: "0.0.1",
-          filelist: fileListString
-        },
-        done ({request, component}) {
-          fs.writeFile("./sw.js", component.parsedAssignmentText, err => {
-            logger.info("Service Worker Generated");
-            console.log("");
-            console.log("Now simply put:");
-            console.log("CONFIG.set('serviceWorkerURI','/sw.js');");
-            console.log(" In your init.js file ");
-            console.log("");
-            console.log("To start your app in a local server ");
-            console.log("Execute the command: ");
-            console.log("> qcobjects launch <appname>");
-            console.log("");
-            process.exit(0);
-          });
-          return Promise.resolve({request, component});
-        }
-      });
-      return component;
+      return new Promise( (resolve, reject) => {
+        var filelist = ["/"].concat(this.fileListRecursive("./"));
+        filelist = filelist.filter(function (fl){return fl !== "sw.js" && (!fl.startsWith("node_modules/")); });
+        filelist = filelist.filter(fname => !fname.endsWith(".pem"));
+        filelist = filelist.filter(fname => !fname.endsWith(".sh"));
+        filelist = filelist.filter(fname => !(new RegExp("^package(.*).json$")).test(fname));
+        filelist = filelist.filter(fname => !fname.startsWith("."));
+        var fileListString = "\n\t\""+filelist.join("\",\n\t\"")+"\"";
+        var component = New(Component, {
+          templateURI: "sw.js",
+          basePath:templatePwaPath,
+          name:"sw",
+          cached:false,
+          tplsource: "default",
+          data: {
+            appName: appName,
+            appVersion: "1.0.0",
+            filelist: fileListString
+          },
+          done ({request, component}) {
+            return new Promise ((resolve, reject)=> {
+              fs.writeFile("./sw.js", component.parsedAssignmentText, err => {
+                logger.info("Service Worker Generated");
+                console.log("");
+                console.log("Now simply put:");
+                console.log("CONFIG.set('serviceWorkerURI','/sw.js');");
+                console.log(" In your init.js file ");
+                console.log("");
+                console.log("To start your app in a local server ");
+                console.log("Execute the command: ");
+                console.log("> qcobjects launch <appname>");
+                console.log("");
+              });
+              resolve({request, component});  
+            });
+          }
+        });
+  
+      } );
     }
 
     copyTemplate(source, dest){

package/src/org.quickcorp.qcobjects.defaultsettings.js

@@ -132,6 +132,8 @@ try {
   const path = require("path");
   const projectPath = CONFIG.get("projectPath", `${process.cwd()}/`);
   const loadDefaultRoutes = async () => {
+    const sdkPath = path.resolve(findPackageNodePath("qcobjects-sdk"), "qcobjects-sdk");
+    const qcobjectsPath = path.resolve(findPackageNodePath("qcobjects"), "qcobjects");
     let backend = CONFIG.get("backend");
     if (typeof backend === "undefined") {
       backend = {};
@@ -144,7 +146,7 @@ try {
         "description": "Redirection of QCObjects.js",
         "path": "^/QCObjects.js$",
         "microservice": "com.qcobjects.backend.microservice.static",
-        "redirect_to": "./node_modules/qcobjects/QCObjects.js",
+        "redirect_to": path.resolve(qcobjectsPath,"src","QCObjects.js"),
         "responseHeaders": {},
         "cors": {
           "allow_origins": "*"
@@ -155,7 +157,7 @@ try {
         "description": "Redirection of QCObjects SDK",
         "path": "^/js/packages/QCObjects-SDK.js$",
         "microservice": "com.qcobjects.backend.microservice.static",
-        "redirect_to": "./node_modules/qcobjects-sdk/QCObjects-SDK.js",
+        "redirect_to": path.resolve(sdkPath, "src/QCObjects-SDK.js"),
         "responseHeaders": {},
         "cors": {
           "allow_origins": "*"
@@ -166,7 +168,7 @@ try {
         "description": "Redirection of QCObjects SDK",
         "path": "^/qcobjects-sdk/(.*)$",
         "microservice": "com.qcobjects.backend.microservice.static",
-        "redirect_to": "./node_modules/qcobjects-sdk/$1",
+        "redirect_to": path.resolve(sdkPath, "src/$1"),
         "responseHeaders": {},
         "cors": {
           "allow_origins": "*"
@@ -176,7 +178,6 @@ try {
     ]);
     CONFIG.set("backend", backend);
 
-    return;
   };
   await loadDefaultRoutes();
 })().then(() => logger.info("Default routes loaded"));