@qooxdoo/framework 7.0.0-beta.5 → 7.0.0-beta.9

package/source/class/qx/tool/cli/commands/Serve.js

@@ -29,7 +29,6 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
   extend: qx.tool.cli.commands.Compile,
 
   statics: {
-
     YARGS_BUILDER: {
       "listen-port": {
         alias: "p",
@@ -37,35 +36,43 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
         type: "number",
         default: 8080
       },
+
       "show-startpage": {
         alias: "S",
-        describe: "Show the startpage with the list of applications and additional information",
+        describe:
+          "Show the startpage with the list of applications and additional information",
         type: "boolean",
         default: null
       },
+
       "rebuild-startpage": {
         alias: "R",
-        describe: "Rebuild the startpage with the list of applications and additional information",
+        describe:
+          "Rebuild the startpage with the list of applications and additional information",
         type: "boolean",
         default: false
       }
     },
 
-    getYargsCommand: function() {
+    getYargsCommand() {
       return {
-        command   : "serve",
-        describe  : "runs a webserver to run the current application with continuous compilation, using compile.json",
-        builder   : (() => {
-          let res = Object.assign({},
+        command: "serve",
+        describe:
+          "runs a webserver to run the current application with continuous compilation, using compile.json",
+        builder: (() => {
+          let res = Object.assign(
+            {},
             qx.tool.cli.commands.Compile.YARGS_BUILDER,
             qx.tool.cli.commands.Serve.YARGS_BUILDER
           );
+
           delete res.watch;
           return res;
         })()
       };
     }
   },
+
   events: {
     /**
      * Fired before server start
@@ -75,11 +82,11 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
      *   application: the used express server instance
      *   outputdir: the qooxdoo app output dir
      */
-    "beforeStart": "qx.event.type.Data",
+    beforeStart: "qx.event.type.Data",
     /**
      * Fired when server is started
-    */
-    "afterStart": "qx.event.type.Event"
+     */
+    afterStart: "qx.event.type.Event"
   },
 
   members: {
@@ -89,15 +96,15 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
     /*
      * @Override
      */
-    process: async function() {
+    async process() {
       this.argv.watch = true;
       this.argv["machine-readable"] = false;
       this.argv["feedback"] = false;
-      await this.base(arguments);
+      await super.process();
 
       // build website if it hasn't been built yet.
-      const website = this._website = new qx.tool.utils.Website();
-      if (!await fs.existsAsync(website.getTargetDir())) {
+      const website = (this._website = new qx.tool.utils.Website());
+      if (!(await fs.existsAsync(website.getTargetDir()))) {
         qx.tool.compiler.Console.info(">>> Building startpage...");
         await this._website.rebuildAll();
       } else if (this.argv.rebuildStartpage) {
@@ -112,15 +119,18 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
      * returns the showStartpage flag
      *
      */
-    showStartpage: function() {
+    showStartpage() {
       return this.__showStartpage;
     },
 
     /**
      * Runs the web server
      */
-    runWebServer: async function() {
-      let makers = this.getMakers().filter(maker => maker.getApplications().some(app => app.getStandalone()));
+    async runWebServer() {
+      let makers = this.getMakers().filter(maker =>
+        maker.getApplications().some(app => app.getStandalone())
+      );
+
       let apps = [];
       let defaultMaker = null;
       let firstMaker = null;
@@ -131,37 +141,40 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
             if (firstMaker === null) {
               firstMaker = maker;
             }
-            if ((defaultMaker === null) && app.getWriteIndexHtmlToRoot()) {
+            if (defaultMaker === null && app.getWriteIndexHtmlToRoot()) {
               defaultMaker = maker;
             }
           }
         });
       });
-      if (!defaultMaker && (apps.length === 1)) {
+      if (!defaultMaker && apps.length === 1) {
         defaultMaker = firstMaker;
       }
 
       this.__showStartpage = this.argv.showStartpage;
-      if ((this.__showStartpage === undefined) || (this.__showStartpage === null)) {
+      if (this.__showStartpage === undefined || this.__showStartpage === null) {
         this.__showStartpage = defaultMaker === null;
       }
       var config = this._getConfig();
       const app = express();
       app.use((req, res, next) => {
-          res.set({
-              "Access-Control-Allow-Origin": "*",
-              "Access-Control-Allow-Headers": "Origin, X-Requested-With, Content-Type, Accept",
-              "Access-Control-Allow-Methods": "GET, POST, PATCH, DELETE, OPTIONS",
-              "Content-Security-Policy": "default-src *  data: blob: filesystem: about: ws: wss: 'unsafe-inline' 'unsafe-eval'; script-src * data: blob: 'unsafe-inline' 'unsafe-eval'; connect-src * data: blob: 'unsafe-inline'; img-src * data: blob: 'unsafe-inline'; frame-src * data: blob: ; style-src * data: blob: 'unsafe-inline'; font-src * data: blob: 'unsafe-inline';"
-          })
-          next();
+        res.set({
+          "Access-Control-Allow-Origin": "*",
+          "Access-Control-Allow-Headers":
+            "Origin, X-Requested-With, Content-Type, Accept",
+          "Access-Control-Allow-Methods": "GET, POST, PATCH, DELETE, OPTIONS",
+          "Content-Security-Policy":
+            "default-src *  data: blob: filesystem: about: ws: wss: 'unsafe-inline' 'unsafe-eval'; script-src * data: blob: 'unsafe-inline' 'unsafe-eval'; connect-src * data: blob: 'unsafe-inline'; img-src * data: blob: 'unsafe-inline'; frame-src * data: blob: ; style-src * data: blob: 'unsafe-inline'; font-src * data: blob: 'unsafe-inline';"
+        });
+
+        next();
       });
       const website = new qx.tool.utils.Website();
       if (!this.__showStartpage) {
         app.use("/", express.static(defaultMaker.getTarget().getOutputDir()));
       } else {
         let s = await qx.tool.config.Utils.getQxPath();
-        if (!await fs.existsAsync(path.join(s, "docs"))) {
+        if (!(await fs.existsAsync(path.join(s, "docs")))) {
           s = path.dirname(s);
         }
         app.use("/docs", express.static(path.join(s, "docs")));
@@ -177,7 +190,9 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
               type: target.getType(),
               outputDir: out
             },
-            apps: maker.getApplications()
+
+            apps: maker
+              .getApplications()
               .filter(app => app.getStandalone())
               .map(app => ({
                 isBrowser: app.isBrowserApp(),
@@ -202,30 +217,40 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
           application: app,
           outputdir: defaultMaker.getTarget().getOutputDir()
         });
+
         server.on("error", e => {
           if (e.code === "EADDRINUSE") {
-            qx.tool.compiler.Console.print("qx.tool.cli.serve.webAddrInUse", config.serve.listenPort);
+            qx.tool.compiler.Console.print(
+              "qx.tool.cli.serve.webAddrInUse",
+              config.serve.listenPort
+            );
+
             process.exit(-1);
           } else {
-            qx.tool.compiler.Console.log("Error when starting web server: " + e);
+            qx.tool.compiler.Console.log(
+              "Error when starting web server: " + e
+            );
           }
         });
         server.listen(config.serve.listenPort, () => {
-          qx.tool.compiler.Console.print("qx.tool.cli.serve.webStarted", "http://localhost:" + config.serve.listenPort);
+          qx.tool.compiler.Console.print(
+            "qx.tool.cli.serve.webStarted",
+            "http://localhost:" + config.serve.listenPort
+          );
+
           this.fireEvent("afterStart");
         });
       });
     },
 
     __showStartpage: null
-
-
   },
 
-  defer: function(statics) {
+  defer(statics) {
     qx.tool.compiler.Console.addMessageIds({
       "qx.tool.cli.serve.webStarted": "Web server started, please browse to %1",
-      "qx.tool.cli.serve.webAddrInUse": "Web server cannot start because port %1 is already in use"
+      "qx.tool.cli.serve.webAddrInUse":
+        "Web server cannot start because port %1 is already in use"
     });
   }
 });

package/source/class/qx/tool/cli/commands/Test.js

@@ -39,7 +39,6 @@ qx.Class.define("qx.tool.cli.commands.Test", {
   extend: qx.tool.cli.commands.Serve,
 
   statics: {
-
     /**
      * The name of the file containing the compile config for the testrunner
      * defaults to "compile-test.json"
@@ -52,6 +51,7 @@ qx.Class.define("qx.tool.cli.commands.Test", {
         default: false,
         type: "boolean"
       },
+
       "disable-webserver": {
         describe: "Disables the start of the webserver",
         default: false,
@@ -59,16 +59,18 @@ qx.Class.define("qx.tool.cli.commands.Test", {
       }
     },
 
-    getYargsCommand: function () {
+    getYargsCommand() {
       return {
         command: "test",
         describe: "run test for current project",
         builder: (() => {
-          let res = Object.assign({},
+          let res = Object.assign(
+            {},
             qx.tool.cli.commands.Compile.YARGS_BUILDER,
             qx.tool.cli.commands.Serve.YARGS_BUILDER,
             qx.tool.cli.commands.Test.YARGS_BUILDER
           );
+
           delete res.watch;
           delete res["machine-readable"];
           delete res["feedback"];
@@ -87,15 +89,16 @@ qx.Class.define("qx.tool.cli.commands.Test", {
      * The event data is the command instance:
      *  cmd: {qx.tool.cli.commands.Test}
      */
-    "runTests": "qx.event.type.Data"
+    runTests: "qx.event.type.Data"
   },
+
   construct(argv) {
-    this.base(arguments, argv);
+    super(argv);
     this.__tests = [];
     this.addListener("changeExitCode", evt => {
       let exitCode = evt.getData();
       // overwrite error code only in case of errors
-      if ((exitCode !== 0) && argv.failFast) {
+      if (exitCode !== 0 && argv.failFast) {
         process.exit(exitCode);
       }
     });
@@ -124,7 +127,6 @@ qx.Class.define("qx.tool.cli.commands.Test", {
   },
 
   members: {
-
     /**
      * @var {Array}
      */
@@ -134,7 +136,7 @@ qx.Class.define("qx.tool.cli.commands.Test", {
      * add a test object and listens for the change of exitCode property
      * @param {qx.tool.cli.api.Test} test
      */
-    addTest: function (test) {
+    addTest(test) {
       qx.core.Assert.assertInstance(test, qx.tool.cli.api.Test);
       test.addListenerOnce("changeExitCode", evt => {
         let exitCode = evt.getData();
@@ -144,7 +146,9 @@ qx.Class.define("qx.tool.cli.commands.Test", {
             qx.tool.compiler.Console.info(`Test '${test.getName()}' passed.`);
           }
         } else if (test.getName()) {
-          qx.tool.compiler.Console.error(`Test '${test.getName()}' failed with exit code ${exitCode}.`);
+          qx.tool.compiler.Console.error(
+            `Test '${test.getName()}' failed with exit code ${exitCode}.`
+          );
         }
         // overwrite error code only in case of errors
         if (exitCode !== 0) {
@@ -158,22 +162,32 @@ qx.Class.define("qx.tool.cli.commands.Test", {
     /**
      * @Override
      */
-    process: async function () {
+    async process() {
       this.argv.watch = false;
       this.argv["machine-readable"] = false;
       this.argv["feedback"] = false;
       this.argv["show-startpage"] = false;
       // check for special test compiler config
-      if (!this.argv.configFile && fs.existsSync(path.join(process.cwd(), qx.tool.cli.commands.Test.CONFIG_FILENAME))) {
+      if (
+        !this.argv.configFile &&
+        fs.existsSync(
+          path.join(process.cwd(), qx.tool.cli.commands.Test.CONFIG_FILENAME)
+        )
+      ) {
         this.argv.configFile = qx.tool.cli.commands.Test.CONFIG_FILENAME;
       }
       this.addListener("making", () => {
-        if (!this.hasListener("runTests") && (this.__tests.length === 0) &&
-          (!this.getCompilerApi() || typeof this.getCompilerApi().beforeTests != "function")) {
+        if (
+          !this.hasListener("runTests") &&
+          this.__tests.length === 0 &&
+          (!this.getCompilerApi() ||
+            typeof this.getCompilerApi().beforeTests != "function")
+        ) {
           qx.tool.compiler.Console.error(
             `No tests are registered! You need to either register tests, or install a testrunner.
              See documentation at https://qooxdoo.org/docs/#/development/testing/`
           );
+
           process.exit(-1);
         }
       });
@@ -181,19 +195,23 @@ qx.Class.define("qx.tool.cli.commands.Test", {
       this.addListener("afterStart", async () => {
         qx.tool.compiler.Console.info(`Running unit tests`);
         await this.fireDataEventAsync("runTests", this);
-        if (this.getCompilerApi() && typeof this.getCompilerApi().beforeTests == "function") {
+        if (
+          this.getCompilerApi() &&
+          typeof this.getCompilerApi().beforeTests == "function"
+        ) {
           await this.getCompilerApi().beforeTests(this);
         }
         for (let test of this.__tests) {
           qx.tool.compiler.Console.info(`Running ${test.getName()}`);
           await test.execute();
         }
-        process.exit(this.getExitCode());
+        // for bash exitcode is not allowed to be more then 255!
+        process.exit(Math.min(255, this.getExitCode()));
       });
 
       if (this.__needsServer()) {
         // start server
-        await this.base(arguments);
+        await super.process();
       } else {
         // compile only
         await qx.tool.cli.commands.Compile.prototype.process.call(this);
@@ -202,8 +220,12 @@ qx.Class.define("qx.tool.cli.commands.Test", {
       }
     },
 
-    __needsServer: function () {
-      return !this.argv.disableWebserver && (this.getNeedsServer() || this.__tests.some(test => test.getNeedsServer()));
+    __needsServer() {
+      return (
+        !this.argv.disableWebserver &&
+        (this.getNeedsServer() ||
+          this.__tests.some(test => test.getNeedsServer()))
+      );
     }
   }
 });

package/source/class/qx/tool/cli/commands/add/Class.js

@@ -40,27 +40,32 @@ const path = require("upath");
  *
  */
 qx.Class.define("qx.tool.cli.commands.add.Class", {
-  extend:qx.tool.cli.commands.Command,
+  extend: qx.tool.cli.commands.Command,
   statics: {
-    getYargsCommand: function() {
+    getYargsCommand() {
       return {
         command: "class <classname> [options]",
-        describe: "adds a new class file to the current project, based on a template.",
+        describe:
+          "adds a new class file to the current project, based on a template.",
         builder: {
-          "type":{
-            alias : "t",
+          type: {
+            alias: "t",
             describe: "the type of the class (optional).",
-            default : "default"
+            default: "default"
           },
-          "extend":{
-            alias : "e",
+
+          extend: {
+            alias: "e",
             describe: "the base class of the new class"
           },
-          "import":{
-            describe: "import the template to the `templates/class` folder of the current project, where it can be customized"
+
+          import: {
+            describe:
+              "import the template to the `templates/class` folder of the current project, where it can be customized"
           },
-          "force":{
-            alias : "f",
+
+          force: {
+            alias: "f",
             describe: "overwrite an existing file"
           }
         }
@@ -69,7 +74,7 @@ qx.Class.define("qx.tool.cli.commands.add.Class", {
   },
 
   members: {
-    process: async function() {
+    async process() {
       let argv = this.argv;
 
       // read Manifest.json
@@ -85,13 +90,15 @@ qx.Class.define("qx.tool.cli.commands.add.Class", {
       values.extend = argv.extend ? argv.extend : "qx.core.Object";
 
       // @todo ask interactively for copyright holder, create a setting in Manifest.json
-      values.copyright = (new Date()).getFullYear();
+      values.copyright = new Date().getFullYear();
 
       // check top-level namespace
       let class_namespaces = argv.classname.split(/\./);
       let manifest_namepaces = values.namespace.split(/\./);
       if (class_namespaces[0] !== manifest_namepaces[0]) {
-        throw new qx.tool.utils.Utils.UserError(`Invalid top namespace '${class_namespaces[0]}'. Must be '${manifest_namepaces[0]}'.`);
+        throw new qx.tool.utils.Utils.UserError(
+          `Invalid top namespace '${class_namespaces[0]}'. Must be '${manifest_namepaces[0]}'.`
+        );
       }
 
       // get path to the template file
@@ -113,7 +120,9 @@ qx.Class.define("qx.tool.cli.commands.add.Class", {
         }
       }
       if (!found) {
-        throw new qx.tool.utils.Utils.UserError(`Template ${template_name} does not exist.`);
+        throw new qx.tool.utils.Utils.UserError(
+          `Template ${template_name} does not exist.`
+        );
       }
       let template = await fs.readFileAsync(template_path, "utf-8");
 
@@ -124,7 +133,11 @@ qx.Class.define("qx.tool.cli.commands.add.Class", {
         header_template = fs.readFileSync(header_template_path, "utf-8");
       } catch (e) {
         // if none exists, use header template in the same folder as the template itself
-        header_template_path = path.join(path.dirname(template_path), "header.tmpl.js");
+        header_template_path = path.join(
+          path.dirname(template_path),
+          "header.tmpl.js"
+        );
+
         try {
           header_template = fs.readFileSync(header_template_path, "utf-8");
         } catch (e) {}
@@ -133,7 +146,10 @@ qx.Class.define("qx.tool.cli.commands.add.Class", {
         // replace template vars in header
         if (header_template_path.includes(".tmpl.js")) {
           for (let var_name in values) {
-            header_template = header_template.replace(new RegExp(`\\$\{${var_name}\}`, "g"), values[var_name]);
+            header_template = header_template.replace(
+              new RegExp(`\\$\{${var_name}\}`, "g"),
+              values[var_name]
+            );
           }
         }
         values.header = header_template;
@@ -142,10 +158,14 @@ qx.Class.define("qx.tool.cli.commands.add.Class", {
       // replace template vars
       let final_content = template;
       for (let var_name in values) {
-        final_content = final_content.replace(new RegExp(`\\$\{${var_name}\}`, "g"), values[var_name]);
+        final_content = final_content.replace(
+          new RegExp(`\\$\{${var_name}\}`, "g"),
+          values[var_name]
+        );
       }
       // check if file already exists
-      let relative_path = path.join("source", "class", ...class_namespaces) + ".js";
+      let relative_path =
+        path.join("source", "class", ...class_namespaces) + ".js";
       let absolute_path = path.join(process.cwd(), relative_path);
       let file_exists = false;
       try {
@@ -153,31 +173,49 @@ qx.Class.define("qx.tool.cli.commands.add.Class", {
         file_exists = true;
       } catch (e) {}
       if (file_exists && !argv.force) {
-        throw new qx.tool.utils.Utils.UserError(`Class file ${relative_path} already exists. Use --force to overwrite it`);
+        throw new qx.tool.utils.Utils.UserError(
+          `Class file ${relative_path} already exists. Use --force to overwrite it`
+        );
       }
 
-
       // write out new class file
       try {
         fs.mkdirSync(path.dirname(absolute_path), {
           recursive: true,
-          mode: 0o755});
+          mode: 0o755
+        });
+
         await fs.writeFileAsync(absolute_path, final_content, "utf-8");
       } catch (e) {
-        throw new qx.tool.utils.Utils.UserError(`Cannot write to ${absolute_path}: ${e.message}`);
+        throw new qx.tool.utils.Utils.UserError(
+          `Cannot write to ${absolute_path}: ${e.message}`
+        );
       }
 
       // import
       if (argv.import) {
-        let local_templates_path = path.join(process.cwd(), "templates", "class");
-        let local_copy_path = path.join(local_templates_path, path.basename(template_path));
+        let local_templates_path = path.join(
+          process.cwd(),
+          "templates",
+          "class"
+        );
+
+        let local_copy_path = path.join(
+          local_templates_path,
+          path.basename(template_path)
+        );
+
         try {
           fs.mkdirSync(path.dirname(local_templates_path), {
             recursive: true,
-            mode: 0o755});
+            mode: 0o755
+          });
+
           await fs.writeFileAsync(local_copy_path, template, "utf-8");
         } catch (e) {
-          throw new qx.tool.utils.Utils.UserError(`Cannot copy template to ${local_templates_path}: ${e.message}`);
+          throw new qx.tool.utils.Utils.UserError(
+            `Cannot copy template to ${local_templates_path}: ${e.message}`
+          );
         }
       }
     }