@qooxdoo/framework 7.0.0-beta.1 → 7.0.0-beta.10

package/source/class/qx/tool/utils/Utils.js

@@ -18,7 +18,7 @@
 const path = require("upath");
 const fs = require("fs");
 const async = require("async");
-const {promisify} = require("util");
+const { promisify } = require("util");
 const child_process = require("child_process");
 const psTree = require("ps-tree");
 
@@ -35,7 +35,7 @@ qx.Class.define("qx.tool.utils.Utils", {
      *
      * @returns {Promise} a promise
      */
-    newExternalPromise: function () {
+    newExternalPromise() {
       var resolve;
       var reject;
       var promise = new Promise((resolve_, reject_) => {
@@ -47,8 +47,7 @@ qx.Class.define("qx.tool.utils.Utils", {
       return promise;
     },
 
-
-    promisifyThis: function promisifyThis(fn, self, ...args) {
+    promisifyThis(fn, self, ...args) {
       return new Promise((resolve, reject) => {
         args = args.slice();
         args.push(function (err, result) {
@@ -95,17 +94,18 @@ qx.Class.define("qx.tool.utils.Utils", {
 
       var result = "";
       if (hours) {
-        result += ((hours > 9) ? hours : "0" + hours) + "h ";
+        result += (hours > 9 ? hours : "0" + hours) + "h ";
       }
       if (hours || minutes) {
-        result += ((minutes > 9) ? minutes : "0" + minutes) + "m ";
+        result += (minutes > 9 ? minutes : "0" + minutes) + "m ";
       }
       if (seconds > 9 || (!hours && !minutes)) {
         result += seconds;
       } else if (hours || minutes) {
         result += "0" + seconds;
       }
-      result += "." + ((millisec > 99) ? "" : millisec > 9 ? "0" : "00") + millisec + "s";
+      result +=
+        "." + (millisec > 99 ? "" : millisec > 9 ? "0" : "00") + millisec + "s";
       return result;
     },
 
@@ -114,7 +114,7 @@ qx.Class.define("qx.tool.utils.Utils", {
      * @param dir
      * @param cb
      */
-    mkpath: function mkpath(dir, cb) {
+    mkpath(dir, cb) {
       dir = path.normalize(dir);
       var segs = dir.split(path.sep);
       var made = "";
@@ -141,21 +141,30 @@ qx.Class.define("qx.tool.utils.Utils", {
               } else if (stat.isDirectory()) {
                 cb(null);
               } else {
-                cb(new Error("Cannot create " + made + " (in " + dir + ") because it exists and is not a directory", "ENOENT"));
+                cb(
+                  new Error(
+                    "Cannot create " +
+                      made +
+                      " (in " +
+                      dir +
+                      ") because it exists and is not a directory",
+                    "ENOENT"
+                  )
+                );
               }
             });
           });
         },
         function (err) {
           cb(err);
-        });
+        }
+      );
     },
 
-
     /**
      * Creates the parent directory of a filename, if it does not already exist
      */
-    mkParentPath: function mkParentPath(dir, cb) {
+    mkParentPath(dir, cb) {
       var segs = dir.split(/[\\\/]/);
       segs.pop();
       if (!segs.length) {
@@ -165,8 +174,6 @@ qx.Class.define("qx.tool.utils.Utils", {
       return this.mkpath(dir, cb);
     },
 
-
-
     /**
      * Creates the parent directory of a filename, if it does not already exist
      *
@@ -174,7 +181,7 @@ qx.Class.define("qx.tool.utils.Utils", {
      *
      * @return {Promise?} the value
      */
-    makeParentDir: function (filename) {
+    makeParentDir(filename) {
       const mkParentPath = promisify(this.mkParentPath).bind(this);
       return mkParentPath(filename);
     },
@@ -186,7 +193,7 @@ qx.Class.define("qx.tool.utils.Utils", {
      *
      * @return {Promise?} the value
      */
-    makeDirs: function (filename) {
+    makeDirs(filename) {
       const mkpath = promisify(this.mkpath);
       return mkpath(filename);
     },
@@ -208,16 +215,16 @@ qx.Class.define("qx.tool.utils.Utils", {
     ToStringWriteStream: null,
 
     /*  Function to test if an object is a plain object, i.e. is constructed
-    **  by the built-in Object constructor and inherits directly from Object.prototype
-    **  or null. Some built-in objects pass the test, e.g. Math which is a plain object
-    **  and some host or exotic objects may pass also.
-    **
-    **  @param {} obj - value to test
-    **  @returns {Boolean} true if passes tests, false otherwise
-    *
-    * @see https://stackoverflow.com/a/5878101/2979698
-    */
-    isPlainObject: function (obj) {
+     **  by the built-in Object constructor and inherits directly from Object.prototype
+     **  or null. Some built-in objects pass the test, e.g. Math which is a plain object
+     **  and some host or exotic objects may pass also.
+     **
+     **  @param {} obj - value to test
+     **  @returns {Boolean} true if passes tests, false otherwise
+     *
+     * @see https://stackoverflow.com/a/5878101/2979698
+     */
+    isPlainObject(obj) {
       // Basic check for Type object that's not null
       if (typeof obj == "object" && obj !== null) {
         // If Object.getPrototypeOf supported, use it
@@ -244,9 +251,7 @@ qx.Class.define("qx.tool.utils.Utils", {
      * @return {{exitCode: Number, output: String, error: *, messages: *}}
      */
     async runCommand(cwd, ...args) {
-      let options = {
-
-      };
+      let options = {};
 
       if (typeof cwd == "object") {
         options = cwd;
@@ -287,12 +292,14 @@ qx.Class.define("qx.tool.utils.Utils", {
           shell: true,
           env: env
         });
+
         let result = {
           exitCode: null,
           output: "",
           error: "",
           messages: null
         };
+
         proc.stdout.on("data", data => {
           data = data.toString().trim();
           options.log(data);
@@ -322,7 +329,7 @@ qx.Class.define("qx.tool.utils.Utils", {
      * @return {Promise<Number>} A promise that resolves with the exit code
      */
     run(cmd, args) {
-      let opts = {env: process.env};
+      let opts = { env: process.env };
       return new Promise((resolve, reject) => {
         let exe = child_process.spawn(cmd, args, opts);
         // suppress all output unless in verbose mode
@@ -334,7 +341,9 @@ qx.Class.define("qx.tool.utils.Utils", {
         });
         exe.on("close", code => {
           if (code !== 0) {
-            let message = `Error executing '${cmd} ${args.join(" ")}'. Use --verbose to see what went wrong.`;
+            let message = `Error executing '${cmd} ${args.join(
+              " "
+            )}'. Use --verbose to see what went wrong.`;
             reject(new qx.tool.utils.Utils.UserError(message));
           } else {
             resolve(0);
@@ -366,8 +375,8 @@ qx.Class.define("qx.tool.utils.Utils", {
 
     /**
      * Parses a command line and separates them out into an array that can be given to `child_process.spawn` etc
-     * 
-     * @param {String} cmd 
+     *
+     * @param {String} cmd
      * @returns {String[]}
      */
     parseCommand(str) {
@@ -384,7 +393,7 @@ qx.Class.define("qx.tool.utils.Utils", {
           }
           continue;
         }
-        if (c == "\"" || c == "\'") {
+        if (c == '"' || c == "'") {
           inQuote = c;
           if (!inArg) {
             inArg = true;
@@ -414,22 +423,22 @@ qx.Class.define("qx.tool.utils.Utils", {
 
     /**
      * Quotes special characters in the argument array, ensuring that they are safe to pass to the command line
-     * 
-     * @param {String[]} cmd 
+     *
+     * @param {String[]} cmd
      * @returns {String[]}
      */
     quoteCommand(cmd) {
-      const SPECIALS = "&*?;# \"";
+      const SPECIALS = '&*?;# "';
       cmd = cmd.map(arg => {
         let c = arg[0];
-        if ((c == '\'' || c == '\"') && c == arg[arg.length-1]) {
+        if ((c == "'" || c == '"') && c == arg[arg.length - 1]) {
           return arg;
         }
-        if (arg.indexOf('\'') > -1) {
-          if (arg.indexOf('\"') > -1) {
+        if (arg.indexOf("'") > -1) {
+          if (arg.indexOf('"') > -1) {
             return "$'" + arg.replace(/'/g, "\\'") + "'";
           }
-          return '\"' + arg + '\"';
+          return '"' + arg + '"';
         }
         for (let i = 0; i < SPECIALS.length; i++) {
           if (arg.indexOf(SPECIALS[i]) > -1) {
@@ -438,13 +447,13 @@ qx.Class.define("qx.tool.utils.Utils", {
         }
         return arg;
       });
-      return cmd;      
+      return cmd;
     },
-    
+
     /**
      * Reformats a command line
-     * 
-     * @param {String} cmd 
+     *
+     * @param {String} cmd
      * @returns {String}
      */
     formatCommand(cmd) {
@@ -453,13 +462,13 @@ qx.Class.define("qx.tool.utils.Utils", {
 
     /**
      * Kills a process tree
-     * 
+     *
      * @param {Number} parentId parent process ID to kill
      */
     async killTree(parentId) {
       await new qx.Promise((resolve, reject) => {
         psTree(parentId, function (err, children) {
-          if (err) { 
+          if (err) {
             reject(err);
             return;
           }
@@ -485,7 +494,10 @@ qx.Class.define("qx.tool.utils.Utils", {
      * @return {String}
      */
     getTemplateDir() {
-      let dir = qx.util.ResourceManager.getInstance().toUri("qx/tool/cli/templates/template_vars.js");
+      let dir = qx.util.ResourceManager.getInstance().toUri(
+        "qx/tool/cli/templates/template_vars.js"
+      );
+
       dir = path.dirname(dir);
       return dir;
     },
@@ -530,6 +542,7 @@ qx.Class.define("qx.tool.utils.Utils", {
         return this.__lineNumber;
       }
     }
+
     statics.LineCountingTransform = LineCountingTransform;
 
     class StripSourceMapTransform extends Transform {
@@ -561,6 +574,7 @@ qx.Class.define("qx.tool.utils.Utils", {
         callback();
       }
     }
+
     statics.StripSourceMapTransform = StripSourceMapTransform;
 
     class ToStringWriteStream extends Writable {
@@ -583,6 +597,7 @@ qx.Class.define("qx.tool.utils.Utils", {
         return this.__value;
       }
     }
+
     statics.ToStringWriteStream = ToStringWriteStream;
   }
 });

package/source/class/qx/tool/utils/Values.js

@@ -20,10 +20,7 @@
  *
  * *********************************************************************** */
 
-
-
 qx.Class.define("qx.tool.utils.Values", {
-
   statics: {
     /**
      * Performs a binary search on the host array.
@@ -34,14 +31,14 @@ qx.Class.define("qx.tool.utils.Values", {
      * @param {*} searchElement The item to search for within the array.
      * @return {Number} The index of the element which defaults to -1 when not found.
      */
-    binaryIndexOf: function(array, searchElement) {
+    binaryIndexOf(array, searchElement) {
       var minIndex = 0;
       var maxIndex = array.length - 1;
       var currentIndex;
       var currentElement;
 
       while (minIndex <= maxIndex) {
-        currentIndex = (minIndex + maxIndex) / 2 | 0;
+        currentIndex = ((minIndex + maxIndex) / 2) | 0;
         currentElement = array[currentIndex];
 
         if (currentElement < searchElement) {
@@ -56,14 +53,14 @@ qx.Class.define("qx.tool.utils.Values", {
       return -1;
     },
 
-    binaryStartsWith: function(array, searchElement) {
+    binaryStartsWith(array, searchElement) {
       var minIndex = 0;
       var maxIndex = array.length - 1;
       var currentIndex;
       var currentElement;
 
       while (minIndex <= maxIndex) {
-        currentIndex = (minIndex + maxIndex) / 2 | 0;
+        currentIndex = ((minIndex + maxIndex) / 2) | 0;
         currentElement = array[currentIndex];
 
         if (currentElement.startsWith(searchElement)) {

package/source/class/qx/tool/utils/Website.js

@@ -47,10 +47,13 @@ qx.Class.define("qx.tool.utils.Website", {
     APP_NAMESPACE: "apps"
   },
 
-  construct: function(options={}) {
+  construct(options = {}) {
     qx.core.Object.apply(this, arguments);
     const self = qx.tool.utils.Website;
-    let p = qx.util.ResourceManager.getInstance().toUri("qx/tool/website/.gitignore");
+    let p = qx.util.ResourceManager.getInstance().toUri(
+      "qx/tool/website/.gitignore"
+    );
+
     p = path.dirname(p);
     this.initSourceDir(p);
     this.initTargetDir(path.join(p, "build"));
@@ -99,17 +102,31 @@ qx.Class.define("qx.tool.utils.Website", {
      */
     async startWatcher() {
       await this.stopWatcher();
-      let sourceDir = await qx.tool.utils.files.Utils.correctCase(this.getSourceDir());
-      this._watcher = chokidar.watch([ sourceDir ], {});
-      this._watcher.on("change", filename => this.__onFileChange("change", filename));
+      let sourceDir = await qx.tool.utils.files.Utils.correctCase(
+        this.getSourceDir()
+      );
+
+      this._watcher = chokidar.watch([sourceDir], {});
+      this._watcher.on("change", filename =>
+        this.__onFileChange("change", filename)
+      );
+
       this._watcher.on("add", filename => this.__onFileChange("add", filename));
-      this._watcher.on("unlink", filename => this.__onFileChange("unlink", filename));
+      this._watcher.on("unlink", filename =>
+        this.__onFileChange("unlink", filename)
+      );
+
       this._watcher.on("ready", async () => {
         await this.triggerRebuild(true);
         this.__watcherReady = true;
       });
       this._watcher.on("error", err => {
-        qx.tool.compiler.Console.print(err.code == "ENOSPC" ? "qx.tool.cli.watch.enospcError" : "qx.tool.cli.watch.watchError", err);
+        qx.tool.compiler.Console.print(
+          err.code == "ENOSPC"
+            ? "qx.tool.cli.watch.enospcError"
+            : "qx.tool.cli.watch.watchError",
+          err
+        );
       });
     },
 
@@ -158,7 +175,9 @@ qx.Class.define("qx.tool.utils.Website", {
      */
     __onFileChange(type, filename) {
       if (this.__watcherReady) {
-        if (!filename.toLowerCase().startsWith(this.getTargetDir().toLowerCase())) {
+        if (
+          !filename.toLowerCase().startsWith(this.getTargetDir().toLowerCase())
+        ) {
           this.triggerRebuild(false);
         }
       }
@@ -220,7 +239,9 @@ qx.Class.define("qx.tool.utils.Website", {
       var pages = [];
       var order = {};
       if (metadata.site.pages) {
-        metadata.site.pages.forEach((url, index) => typeof url == "string" ? order[url] = index : null);
+        metadata.site.pages.forEach((url, index) =>
+          typeof url == "string" ? (order[url] = index) : null
+        );
       }
       var unorderedPages = [];
 
@@ -229,6 +250,7 @@ qx.Class.define("qx.tool.utils.Website", {
           url: url,
           title: title
         };
+
         var index = order[url];
         if (index !== undefined) {
           pages[index] = page;
@@ -269,12 +291,19 @@ qx.Class.define("qx.tool.utils.Website", {
         if (unused) {
           // this is simply to avoid linting errors until https://github.com/qooxdoo/qooxdoo/issues/461 is fixed
         }
-        let data = await fs.readFileAsync(path.join(partialsDir, filename), "utf8");
+        let data = await fs.readFileAsync(
+          path.join(partialsDir, filename),
+          "utf8"
+        );
+
         let fn;
         try {
           fn = dot.template(data);
         } catch (err) {
-          qx.tool.compiler.Console.log("Failed to load partial " + filename + ": " + err);
+          qx.tool.compiler.Console.log(
+            "Failed to load partial " + filename + ": " + err
+          );
+
           continue;
         }
         fn.name = filename;
@@ -295,12 +324,13 @@ qx.Class.define("qx.tool.utils.Website", {
           .metadata({
             site: {
               title: "Qooxdoo Application Server",
-              description: "Mini website used by \"qx serve\"",
+              description: 'Mini website used by "qx serve"',
               email: "info@qooxdoo.org",
               twitter_username: "qooxdoo",
               github_username: "qooxdoo",
               pages: ["/", "/about/"]
             },
+
             baseurl: "",
             url: "",
             lang: "en",
@@ -312,9 +342,11 @@ qx.Class.define("qx.tool.utils.Website", {
           .use(this.loadPartials.bind(this))
           .use(markdown())
           .use(this.getPages.bind(this))
-          .use(layouts({
-            engine: "dot"
-          }))
+          .use(
+            layouts({
+              engine: "dot"
+            })
+          )
           .build(function (err) {
             if (err) {
               reject(err);
@@ -332,18 +364,26 @@ qx.Class.define("qx.tool.utils.Website", {
      */
     async compileScss() {
       let result = await new Promise((resolve, reject) => {
-        sass.render({
-          file: path.join(this.getSourceDir(), "sass", "qooxdoo.scss"),
-          outFile: path.join(this.getTargetDir(), "qooxdoo.css")
-        }, function (err, result) {
-          if (err) {
-            reject(err);
-          } else {
-            resolve(result);
+        sass.render(
+          {
+            file: path.join(this.getSourceDir(), "sass", "qooxdoo.scss"),
+            outFile: path.join(this.getTargetDir(), "qooxdoo.css")
+          },
+
+          function (err, result) {
+            if (err) {
+              reject(err);
+            } else {
+              resolve(result);
+            }
           }
-        });
+        );
       });
-      await fs.writeFileAsync(path.join(this.getTargetDir(), "qooxdoo.css"), result.css, "utf8");
+      await fs.writeFileAsync(
+        path.join(this.getTargetDir(), "qooxdoo.css"),
+        result.css,
+        "utf8"
+      );
     },
 
     /**
@@ -357,11 +397,24 @@ qx.Class.define("qx.tool.utils.Website", {
       if (await fs.existsAsync(apps_path)) {
         rimraf.sync(apps_path);
       }
-      const opts = { noninteractive: true, namespace, theme: "indigo", icontheme: "Tango"};
-      await (new qx.tool.cli.commands.Create(opts)).process();
+      const opts = {
+        noninteractive: true,
+        namespace,
+        theme: "indigo",
+        icontheme: "Tango"
+      };
+
+      await new qx.tool.cli.commands.Create(opts).process();
       process.chdir(apps_path);
-      for (let name of ["apiviewer", "widgetbrowser", "playground", "demobrowser"]) {
-        await (new qx.tool.cli.commands.package.Install({})).install("qooxdoo/qxl." + name);
+      for (let name of [
+        "apiviewer",
+        "widgetbrowser",
+        "playground",
+        "demobrowser"
+      ]) {
+        await new qx.tool.cli.commands.package.Install({}).install(
+          "qooxdoo/qxl." + name
+        );
       }
     }
   }

package/source/class/qx/tool/utils/files/FindFiles.js

@@ -23,12 +23,11 @@
 var fs = require("fs");
 var async = require("async");
 
-
 qx.Class.define("qx.tool.utils.files.FindFiles", {
   extend: qx.core.Object,
 
-  construct: function(root) {
-    this.base(arguments);
+  construct(root) {
+    super();
     this.__root = root;
   },
 
@@ -43,45 +42,51 @@ qx.Class.define("qx.tool.utils.files.FindFiles", {
   members: {
     __root: null,
 
-    scan: function(notify, cb) {
-      cb = cb||function() {};
+    scan(notify, cb) {
+      cb = cb || function () {};
 
       var t = this;
 
       function scanImpl(path, cb) {
-        async.waterfall([
-          function(cb) {
-            fs.readdir(path, cb);
-          },
+        async.waterfall(
+          [
+            function (cb) {
+              fs.readdir(path, cb);
+            },
+
+            function (files, cb) {
+              async.forEach(
+                files,
+                function (file, cb) {
+                  fs.stat(path + "/" + file, function (err, stat) {
+                    if (err) {
+                      cb(err);
+                      return;
+                    }
+                    if (stat.isDirectory()) {
+                      scanImpl(path + "/" + file, cb);
+                      return;
+                    }
+                    if (stat.isFile()) {
+                      t._onFindFile(path + "/" + file, notify, cb);
+                      return;
+                    }
+                    cb();
+                  });
+                },
+                cb
+              );
+            }
+          ],
 
-          function(files, cb) {
-            async.forEach(files,
-              function(file, cb) {
-                fs.stat(path + "/" + file, function(err, stat) {
-                  if (err) {
-                    cb(err);
-                    return;
-                  }
-                  if (stat.isDirectory()) {
-                    scanImpl(path + "/" + file, cb);
-                    return;
-                  }
-                  if (stat.isFile()) {
-                    t._onFindFile(path + "/" + file, notify, cb);
-                    return;
-                  }
-                  cb();
-                });
-              },
-              cb);
-          }],
-        cb);
+          cb
+        );
       }
 
       scanImpl(this.__root, cb);
     },
 
-    _onFindFile: function(file, notify, cb) {
+    _onFindFile(file, notify, cb) {
       var re = this.getMatchFiles();
       if (re && !re.test(file)) {
         return;
@@ -89,5 +94,4 @@ qx.Class.define("qx.tool.utils.files.FindFiles", {
       notify(file, cb);
     }
   }
-
 });