@qooxdoo/framework 7.4.2 → 7.5.1

package/source/class/qx/tool/cli/Watch.js

@@ -13,6 +13,7 @@
 
    Authors:
      * John Spackman (john.spackman@zenesis.com, @johnspackman)
+     * Henner Kollmann (Henner.Kollmann@gmx.de, @hkollmann)
 
 ************************************************************************ */
 
@@ -102,11 +103,9 @@ qx.Class.define("qx.tool.cli.Watch", {
         }
         config._process = null;
       }
-
       console.log(
         "Starting application: " + config._cmd + " " + config._args.join(" ")
       );
-
       config._processPromise = new qx.Promise((resolve, reject) => {
         let child = (config._process = require("child_process").spawn(
           config._cmd,
@@ -221,32 +220,34 @@ qx.Class.define("qx.tool.cli.Watch", {
             `DEBUG: confirmed=${JSON.stringify(confirmed, 2)}`
           );
         }
-
-        var watcher = (this._watcher = chokidar.watch(confirmed, {
-          //ignored: /(^|[\/\\])\../
-        }));
-        watcher.on("change", filename =>
-          this.__onFileChange("change", filename)
-        );
-
-        watcher.on("add", filename => this.__onFileChange("add", filename));
-        watcher.on("unlink", filename =>
-          this.__onFileChange("unlink", filename)
-        );
-
-        watcher.on("ready", () => {
-          this.__watcherReady = true;
-          this.__make();
-        });
-        watcher.on("error", err => {
-          qx.tool.compiler.Console.print(
-            err.code == "ENOSPC"
-              ? "qx.tool.cli.watch.enospcError"
-              : "qx.tool.cli.watch.watchError",
-            err
+        this.__make().then(() => {
+          var watcher = (this._watcher = chokidar.watch(confirmed, {
+            //ignored: /(^|[\/\\])\../
+          }));
+          watcher.on("change", filename =>
+            this.__onFileChange("change", filename)
+          );
+          watcher.on("add", filename => this.__onFileChange("add", filename));
+          watcher.on("unlink", filename =>
+            this.__onFileChange("unlink", filename)
           );
+          watcher.on("ready", () => {
+            qx.tool.compiler.Console.log(`Start watching ...`);
+            this.__watcherReady = true;
+          });
+          watcher.on("error", err => {
+            qx.tool.compiler.Console.print(
+              err.code == "ENOSPC"
+                ? "qx.tool.cli.watch.enospcError"
+                : "qx.tool.cli.watch.watchError",
+              err
+            );
+          });
         });
       });
+      process.on("beforeExit", this.__onStop.bind(this));
+      process.on("exit", this.__onStop.bind(this));
+      return this.__runningPromise;
     },
 
     async stop() {
@@ -350,8 +351,8 @@ qx.Class.define("qx.tool.cli.Watch", {
           }
           return null;
         });
-
-      return (this.__making = runIt());
+      this.__making = runIt();
+      return this.__making;
     },
 
     __scheduleMake() {

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

@@ -685,7 +685,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           );
 
           watch.setConfigFilenames(arr);
-          return await watch.start();
+          return watch.start();
         })
       );
     },
@@ -1230,6 +1230,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
             data.localModules || {},
             false
           );
+
           if (!qx.lang.Object.isEmpty(appConfig.localModules)) {
             app.setLocalModules(appConfig.localModules);
           }

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

@@ -113,7 +113,7 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
         helperFilePath = path.dirname(helperFilePath);
       }
 
-      let config = await qx.tool.cli.Cli.getInstance().getParsedArgs();
+      let config = qx.tool.cli.Cli.getInstance().getParsedArgs();
       let lintOptions = config.eslintConfig || {};
       lintOptions.extends = lintOptions.extends || ["@qooxdoo/qx/browser"];
       lintOptions.globals = Object.assign(

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

@@ -68,12 +68,12 @@ qx.Class.define("qx.tool.cli.commands.Run", {
       let config = this.getCompilerApi().getConfiguration();
       if (!config.run) {
         qx.tool.compiler.Console.print("qx.tool.cli.run.noRunConfig");
-        process.exit(-1);
+        process.exit(1);
       }
 
       if (!config.run.application) {
         qx.tool.compiler.Console.print("qx.tool.cli.run.noAppName");
-        process.exit(-1);
+        process.exit(1);
       }
 
       let maker = null;
@@ -85,14 +85,14 @@ qx.Class.define("qx.tool.cli.commands.Run", {
         if (apps.length) {
           if (maker) {
             qx.tool.compiler.Console.print("qx.tool.cli.run.tooManyMakers");
-            process.exit(-1);
+            process.exit(1);
           }
           if (apps.length != 1) {
             qx.tool.compiler.Console.print(
               "qx.tool.cli.run.tooManyApplications"
             );
 
-            process.exit(-1);
+            process.exit(1);
           }
           maker = tmp;
           app = apps[0];
@@ -100,11 +100,11 @@ qx.Class.define("qx.tool.cli.commands.Run", {
       });
       if (!app) {
         qx.tool.compiler.Console.print("qx.tool.cli.run.noAppName");
-        process.exit(-1);
+        process.exit(1);
       }
       if (app.getType() != "node") {
         qx.tool.compiler.Console.print("qx.tool.cli.run.mustBeNode");
-        process.exit(-1);
+        process.exit(1);
       }
 
       let target = maker.getTarget();
@@ -150,7 +150,6 @@ qx.Class.define("qx.tool.cli.commands.Run", {
         child.stdout.on("data", function (data) {
           console.log(data);
         });
-
         child.stderr.setEncoding("utf8");
         child.stderr.on("data", function (data) {
           console.error(data);

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

@@ -90,9 +90,6 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
   },
 
   members: {
-    /** @type {qx.tool.utils.Website} the Website instance */
-    _website: null,
-
     /*
      * @Override
      */
@@ -100,18 +97,19 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
       this.argv.watch = true;
       this.argv["machine-readable"] = false;
       this.argv["feedback"] = false;
-      await super.process();
 
       // build website if it hasn't been built yet.
-      const website = (this._website = new qx.tool.utils.Website());
+      const website = new qx.tool.utils.Website();
       if (!(await fs.existsAsync(website.getTargetDir()))) {
         qx.tool.compiler.Console.info(">>> Building startpage...");
-        await this._website.rebuildAll();
+        await website.rebuildAll();
       } else if (this.argv.rebuildStartpage) {
-        this._website.startWatcher();
+        website.startWatcher();
       }
-
-      await this.runWebServer();
+      this.addListenerOnce("made", () => {
+        this.runWebServer();
+      });
+      return super.process();
     },
 
     /**
@@ -210,36 +208,31 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
           res.send(JSON.stringify(appsData, null, 2));
         });
       }
-      this.addListenerOnce("made", e => {
-        let server = http.createServer(app);
-        this.fireDataEvent("beforeStart", {
-          server: server,
-          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
-            );
-
-            process.exit(-1);
-          } else {
-            qx.tool.compiler.Console.log(
-              "Error when starting web server: " + e
-            );
-          }
-        });
-        server.listen(config.serve.listenPort, () => {
+      let server = http.createServer(app);
+      this.fireDataEvent("beforeStart", {
+        server: server,
+        application: app,
+        outputdir: defaultMaker.getTarget().getOutputDir()
+      });
+      server.on("error", e => {
+        if (e.code === "EADDRINUSE") {
           qx.tool.compiler.Console.print(
-            "qx.tool.cli.serve.webStarted",
-            "http://localhost:" + config.serve.listenPort
+            "qx.tool.cli.serve.webAddrInUse",
+            config.serve.listenPort
           );
 
-          this.fireEvent("afterStart");
-        });
+          process.exit(1);
+        } else {
+          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
+        );
+
+        this.fireEvent("afterStart");
       });
     },
 

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

@@ -188,7 +188,7 @@ qx.Class.define("qx.tool.cli.commands.Test", {
              See documentation at https://qooxdoo.org/docs/#/development/testing/`
           );
 
-          process.exit(-1);
+          process.exit(1);
         }
       });
 
@@ -206,6 +206,7 @@ qx.Class.define("qx.tool.cli.commands.Test", {
           await test.execute();
         }
         // for bash exitcode is not allowed to be more then 255!
+        // We must exit the process here because serve runs infinite!
         process.exit(Math.min(255, this.getExitCode()));
       });
 
@@ -216,7 +217,7 @@ qx.Class.define("qx.tool.cli.commands.Test", {
         // compile only
         await qx.tool.cli.commands.Compile.prototype.process.call(this);
         // since the server is not started, manually fire the event necessary for firing the "runTests" event
-        this.fireEvent("afterStart");
+        await this.fireDataEventAsync("afterStart");
       }
     },
 

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

@@ -140,7 +140,9 @@ qx.Class.define("qx.tool.cli.commands.add.Script", {
       }
       // save
       this.debug(script_list);
-      manifestModel.setValue("externalResources.script", script_list).save();
+      await manifestModel
+        .setValue("externalResources.script", script_list)
+        .save();
     }
   }
 });

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

@@ -677,6 +677,9 @@ qx.Class.define("qx.tool.cli.commands.package.Install", {
 
         return false;
       }
+      // relaod config. We need a fresh model here because data will be verified.
+      // The original model is enriched during parsing so validate will fail.
+      compileConfigModel.setLoaded(false);
       await compileConfigModel.load();
       let app = compileConfigModel.getValue("applications").find(app => {
         if (manifestApp.name && app.name) {

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

@@ -79,6 +79,11 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
           },
 
           dryrun: {
+            type: "boolean",
+            describe: "Deprecated. Use --dry-run"
+          },
+
+          "dry-run": {
             type: "boolean",
             alias: "d",
             describe: "Show result only, do not publish to GitHub"
@@ -146,6 +151,13 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
       // init
       const argv = this.argv;
 
+      if (argv.dryrun) {
+        qx.tool.compiler.Console.info(
+          'The "--dryrun" option is deprecated. Please use "--dry-run" instead.'
+        );
+        argv.dryRun = true
+      }
+
       // qooxdoo version
       let qxVersion = await this.getQxVersion();
       if (fs.existsSync("Manifest.json")) {
@@ -377,7 +389,7 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
         manifestModel
           .setValue("requires.@qooxdoo/framework", semver_range)
           .setValue("info.version", new_version);
-        if (argv.dryrun) {
+        if (argv.dryRun) {
           if (!argv.quiet) {
             qx.tool.compiler.Console.info(
               `Dry run: Not committing ${manifestModel.getRelativeDataPath()} with the following content:`
@@ -397,7 +409,7 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
       if (await fs.existsAsync(package_json_path)) {
         let data = await qx.tool.utils.Json.loadJsonAsync(package_json_path);
         data.version = new_version;
-        if (this.argv.dryrun) {
+        if (this.argv.dryRun) {
           qx.tool.compiler.Console.info(
             "Dry run: Not changing package.json version..."
           );
@@ -414,7 +426,7 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
         argv: this.argv
       });
 
-      if (argv.dryrun) {
+      if (argv.dryRun) {
         qx.tool.compiler.Console.info(
           `Dry run: not creating tag and release '${tag}' of ${repo_name}...`
         );
@@ -540,7 +552,7 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
 
             // write index file
             const registryModel = qx.tool.config.Registry.getInstance();
-            if (argv.dryrun) {
+            if (argv.dryRun) {
               qx.tool.compiler.Console.info(
                 `Dry run: not creating index file ${registryModel.getRelativeDataPath()} with the following content:`
               );

package/source/class/qx/tool/compiler/ClassFile.js

@@ -854,7 +854,8 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
         if (sectionName === "members" || sectionName === "statics") {
           if (
             node.type == "ObjectMethod" ||
-            node.value.type === "FunctionExpression"
+            node.value.type === "FunctionExpression" ||
+            node.value.type === "MemberExpression"
           ) {
             meta.type = "function";
           } else {

package/source/class/qx/tool/compiler/app/Cldr.js

@@ -28,7 +28,9 @@ var path = require("path");
 var xml2js = require("xml2js");
 const CLDR = require("cldr");
 const { promisify } = require("util");
+const process = require("process");
 const readFile = promisify(fs.readFile);
+const readDir = promisify(fs.readdir);
 
 var log = qx.tool.utils.LogManager.createLog("cldr");
 
@@ -59,9 +61,39 @@ qx.Class.define("qx.tool.compiler.app.Cldr", {
       }
       log.debug("Loading CLDR " + cldrPath);
 
-      return readFile(path.join(cldrPath, data_path, locale + ".xml"), {
-        encoding: "utf-8"
-      })
+      const fullDir = path.join(cldrPath, data_path);
+
+      return readDir(fullDir)
+        .then(
+          names =>
+            new Promise((resolve, reject) => {
+              const searchedName = locale.toLowerCase() + ".xml";
+              const realName = names.find(
+                name => name.toLowerCase() === searchedName
+              );
+
+              if (realName) {
+                resolve(realName);
+              } else {
+                reject(
+                  new Error(
+                    'Cannot find XML file for locale "' +
+                      locale +
+                      '" in CLDR folder'
+                  )
+                );
+              }
+            })
+        )
+        .then(fileName =>
+          readFile(path.join(fullDir, fileName), {
+            encoding: "utf-8"
+          })
+        )
+        .catch(err => {
+          qx.tool.compiler.Console.error(err);
+          process.exit(1);
+        })
         .then(data =>
           qx.tool.utils.Utils.promisifyThis(parser.parseString, parser, data)
         )
@@ -564,30 +596,35 @@ qx.Class.define("qx.tool.compiler.app.Cldr", {
             });
 
             var monthContext = get("months[0].monthContext", cal);
-            find(monthContext, "type", "format", function (row) {
-              find(row.monthWidth, "type", "abbreviated", function (row) {
-                for (var i = 0; i < row.month.length; i++) {
-                  var m = row.month[i];
-                  cldr["cldr_month_format_abbreviated_" + m["$"].type] =
-                    getText(m);
-                }
-              });
-            });
-            find(monthContext, "type", "format", function (row) {
-              find(row.monthWidth, "type", "wide", function (row) {
-                for (var i = 0; i < row.month.length; i++) {
-                  var m = row.month[i];
-                  cldr["cldr_month_format_wide_" + m["$"].type] = getText(m);
-                }
-              });
-            });
-            find(monthContext, "type", "stand-alone", function (row) {
-              for (var i = 0; i < row.monthWidth[0].month.length; i++) {
-                var m = row.monthWidth[0].month[i];
-                cldr["cldr_month_stand-alone_narrow_" + m["$"].type] =
-                  getText(m);
+
+            const parseMonth = (months, cldrProperty) => {
+              if (!months) {
+                return;
               }
-            });
+              months.forEach(month => {
+                cldr[cldrProperty + "_" + month["$"].type] = getText(month);
+              });
+            };
+
+            const parseMonthContext = sectionNameInLocaleFile => {
+              find(monthContext, "type", "format", row =>
+                find(row.monthWidth, "type", sectionNameInLocaleFile, row =>
+                  parseMonth(
+                    row.month,
+                    "cldr_month_format_" + sectionNameInLocaleFile
+                  )
+                )
+              );
+            };
+
+            parseMonthContext("abbreviated");
+            parseMonthContext("wide");
+            find(monthContext, "type", "stand-alone", row =>
+              parseMonth(
+                row.monthWidth[0].month,
+                "cldr_month_stand-alone_narrow"
+              )
+            );
 
             function getTimeFormatPattern(row) {
               return row.timeFormat.pattern;

package/source/class/qx/tool/compiler/targets/meta/Browserify.js

@@ -147,7 +147,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
       });
     },
 
-    async __browserify(commonjsModules, references, localModules, ws) {
+    __browserify(commonjsModules, references, localModules, ws) {
       const babelify = require("babelify");
       const preset = require("@babel/preset-env");
       const browserify = require("browserify");
@@ -157,7 +157,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
       // Make them equivalent.
       builtins.process = builtins._process;
 
-      return new Promise(async resolve => {
+      return new Promise((resolve, reject) => {
         let b = browserify([], {
           builtins: builtins,
           ignoreMissing: true,
@@ -200,19 +200,29 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
           global: true
         });
 
-        b.bundle((e, output) => {
+        b.bundle(function (e, output) {
           if (e) {
-            // We've already handled the case of missing module. This is something else.
+            // THIS IS A HACK!
+            // In case of error dependency walker never returns from
+            // ```if (self.inputPending > 0) return setTimeout(resolve);```
+            // because inputPending is not decremented anymore.
+            // so set it to 0 here.
+            let d = b.pipeline.get("deps");
+            d.get(0).inputPending = 0;
             qx.tool.compiler.Console.error(
-              `Unable to browserify - this is probably because a module is being require()'d which is not compatible with Browserify: ${e.message}`
+              `Unable to browserify - this is probably because a module is being require()'d which is not compatible with Browserify:\n${e.message}`
             );
 
-            // Do not throw an error here, otherwise a problem in the users code will kill the watch with pages of error
-            resolve(null);
+            setTimeout(() => {
+              this.emit("end");
+            });
             return;
           }
-
-          ws.write(output);
+          // in case of end event output can not be writen.
+          // so catch the error and ignore it
+          try {
+            ws.write(output);
+          } catch (err) {}
           resolve(null);
         });
       });

package/source/class/qx/ui/basic/Image.js

@@ -634,7 +634,8 @@ qx.Class.define("qx.ui.basic.Image", {
           }
 
           // Don't transfer background image when switching from image to icon font
-          if (this.__getMode() === "font") {
+          var mode = this.__getMode();
+          if (mode === "font" || mode === "scaled") {
             delete styles.backgroundImage;
           }
 
@@ -785,7 +786,10 @@ qx.Class.define("qx.ui.basic.Image", {
       if (this.getScale()) {
         el.setStyle("fontSize", (width > height ? height : width) + "px");
       } else {
-        var source = qx.util.AliasManager.getInstance().resolve(this.getSource());
+        var source = qx.util.AliasManager.getInstance().resolve(
+          this.getSource()
+        );
+
         var sparts = source.split("/");
         var font = this.__getFont(source);
         var size = parseInt(sparts[2] || font.getSize());

package/source/class/qx/ui/command/Group.js

@@ -90,7 +90,7 @@ qx.Class.define("qx.ui.command.Group", {
      *
      * @param key {String} Key which addresses the command
      *
-     * @return {qx.ui.command.Command | null} Corresponding command instance or null
+     * @return {qx.ui.command.Command|null} Corresponding command instance or null
      */
     get(key) {
       if (qx.core.Environment.get("qx.debug")) {
@@ -134,7 +134,7 @@ qx.Class.define("qx.ui.command.Group", {
      *
      * @param key {String} Key which addresses the command
      *
-     * @return {qx.ui.command.Command | null} Corresponding command instance or null
+     * @return {qx.ui.command.Command|null} Corresponding command instance or null
      */
     remove(key) {
       if (qx.core.Environment.get("qx.debug")) {

package/source/class/qx/ui/command/GroupManager.js

@@ -81,7 +81,7 @@ qx.Class.define("qx.ui.command.GroupManager", {
      *
      * @param group {qx.ui.command.Group} Command group
      *
-     * @return {qx.ui.command.Group | null} Command group or null if group was not added before
+     * @return {qx.ui.command.Group|null} Command group or null if group was not added before
      */
     remove(group) {
       if (qx.core.Environment.get("qx.debug")) {
@@ -155,7 +155,7 @@ qx.Class.define("qx.ui.command.GroupManager", {
     /**
      * Returns active command group.
      *
-     * @return {qx.ui.command.Group | null} Active command group
+     * @return {qx.ui.command.Group|null} Active command group
      */
     getActive() {
       return this.__activeGroup;
@@ -184,7 +184,7 @@ qx.Class.define("qx.ui.command.GroupManager", {
      *
      * @param group {qx.ui.command.Group} Command group
      *
-     * @return {qx.ui.command.Group | null} Command group or null
+     * @return {qx.ui.command.Group|null} Command group or null
      */
     _getGroup(group) {
       var index = this.__groups.indexOf(group);

package/source/class/qx/ui/control/ColorSelector.js

@@ -557,7 +557,7 @@ qx.Class.define("qx.ui.control.ColorSelector", {
     /**
      * Returns the currently selected color.
      *
-     * @return {String | null} The HEX value of the color of if not color
+     * @return {String|null} The HEX value of the color of if not color
      *   is set, null.
      */
     getValue() {

package/source/class/qx/ui/core/MMultiSelectionHandling.js

@@ -327,7 +327,7 @@ qx.Mixin.define("qx.ui.core.MMultiSelectionHandling", {
     /**
      * Returns the last selection context.
      *
-     * @return {String | null} One of <code>tap</code>, <code>quick</code>,
+     * @return {String|null} One of <code>tap</code>, <code>quick</code>,
      *    <code>drag</code> or <code>key</code> or <code>null</code>.
      */
     getSelectionContext() {

package/source/class/qx/ui/core/SingleSelectionManager.js

@@ -105,7 +105,7 @@ qx.Class.define("qx.ui.core.SingleSelectionManager", {
     /**
      * Returns the current selected element.
      *
-     * @return {qx.ui.core.Widget | null} The current selected widget or
+     * @return {qx.ui.core.Widget|null} The current selected widget or
      *    <code>null</code> if the selection is empty.
      */
     getSelected() {