@qooxdoo/framework 7.0.0-beta → 7.0.0-beta.4

package/source/class/qx/test/ui/form/ComboBox.js

@@ -87,48 +87,6 @@ qx.Class.define("qx.test.ui.form.ComboBox",
       this.flush();
     },
 
-    testFocusTextOnClose: function() {
-      var combobox = this.__createComboBox();
-      this.getRoot().add(combobox);
-      this.flush();
-
-      // Open list popup
-      combobox.open();
-      this.flush();
-
-      // Select item
-      var list = combobox.getChildControl("list");
-      var item = list.findItem("Item 0");
-      list.setSelection([item]);
-      this.flush();
-
-      // Asssert focus on close
-      this.spy(combobox, "tabFocus");
-      combobox.close();
-      this.assertCalled(combobox.tabFocus);
-
-      this.getRoot().removeAll();
-      combobox.dispose();
-    },
-
-    testNotFocusTextOnCloseWhenInvisibleBefore: function() {
-      var combobox = this.__createComboBox();
-      this.getRoot().add(combobox);
-      this.flush();
-
-      // Enter value
-      combobox.setValue("Item 0");
-      this.flush();
-
-      // Assert not focus on close
-      this.spy(combobox, "tabFocus");
-      combobox.close();
-      this.assertNotCalled(combobox.tabFocus);
-
-      this.getRoot().removeAll();
-      combobox.dispose();
-    },
-
     __createComboBox : function(initValue)
     {
       var comboBox = new qx.ui.form.ComboBox();

package/source/class/qx/test/ui/virtual/performance/AbstractLayerTest.js

@@ -130,7 +130,9 @@ qx.Class.define("qx.test.ui.virtual.performance.AbstractLayerTest",
 
     profile : function(name, fcn, context, count)
     {
-      if (window.console && window.console.profile) console.profile(name + "; " + this.classname);
+      if (window.console && window.console.profile) {
+        console.profile(name + "; " + this.classname);
+      }
 
       var times = [];
       for (var i=0,l=count; i<l; i++)
@@ -148,7 +150,9 @@ qx.Class.define("qx.test.ui.virtual.performance.AbstractLayerTest",
       //this.warn(";" + name + "; avg(" + avg + "ms); " + times.join("ms; ") + "ms;");
       this.warn(";" + name + ";avg:" + avg + ";" + times.join(";"));
 
-      if (window.console && window.console.profile) console.profileEnd(name + " " + this.classname);
+      if (window.console && window.console.profile) {
+        console.profileEnd(name + " " + this.classname);
+      }
     }
   }
 

package/source/class/qx/theme/manager/Font.js

@@ -127,6 +127,17 @@ qx.Class.define("qx.theme.manager.Font",
 
         return cache[value] = fo.set(theme.fonts[value]);
       }
+      if (qx.core.Environment.get("qx.debug")) {
+        if (theme) {
+          if (!this.__warnedMissingFonts) {
+            this.__warnedMissingFonts = {};
+          }
+          if (!this.__warnedMissingFonts[value]) {
+            this.__warnedMissingFonts[value] = true;
+            this.debug(`Cannot resolve a font named ${value} - available fonts are ${Object.keys(theme.fonts).join(", ")}`);
+          }
+        }
+      }
 
       return value;
     },

package/source/class/qx/theme/tangible/Appearance.js

@@ -242,6 +242,16 @@ qx.Theme.define("qx.theme.tangible.Appearance", {
         };
       }
     },
+    "material-button/icon": {
+      alias: "atom/label",
+
+      style: function(states) {
+        return {
+          textColor: states.disabled ?
+            "text-disabled-on-primary" : "text-on-primary"
+        };
+      }
+    },
 
     "button-frame": {
       alias: "atom",

package/source/class/qx/theme/tangible/Decoration.js

@@ -101,6 +101,12 @@ qx.Theme.define("qx.theme.tangible.Decoration",
           transitionDuration: "0.1s"
         }
       },
+      "material-button-hovered-invalid": {
+        include: "material-button-hovered",
+        style: {
+          color: "error"
+        }
+      },
       "material-button-pressed": {
         include: "material-button",
         style: {

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

@@ -239,7 +239,9 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
       this._compilerApi.setCommand(command);
       await this.__notifyLibraries();
       try {
-        return await command.process();
+        const res = await command.process();
+        await this._compilerApi.afterProcessFinished(command, res);
+        return res;
       } catch (e) {
         qx.tool.compiler.Console.error("Error: " + (e.stack || e.message));
         process.exit(1);
@@ -420,8 +422,8 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
       if (config.libraries && needLibraries) {
         let neededLibraries = config.libraries.filter(libData => !fs.existsSync(libData + "/Manifest.json"));
         if (neededLibraries.length) {
-          if (!fs.existsSync(qx.tool.config.Manifest.config.fileName)) { 
-            qx.tool.compiler.Console.error("Libraries are missing and there is no Manifest.json in the current directory so we cannot attempt to install them; the missing libraries are: \n     " + neededLibraries.join("\n     "));  
+          if (!fs.existsSync(qx.tool.config.Manifest.config.fileName)) {
+            qx.tool.compiler.Console.error("Libraries are missing and there is no Manifest.json in the current directory so we cannot attempt to install them; the missing libraries are: \n     " + neededLibraries.join("\n     "));
             process.exit(1);
           }
           qx.tool.compiler.Console.info("One or more libraries not found - trying to install them from library repository...");

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

@@ -32,6 +32,9 @@ qx.Class.define("qx.tool.cli.Watch", {
     };
     this.__debounceChanges = {};
     this.__configFilenames = [];
+    this.__runWhenWatching = {};
+
+    maker.addListener("writtenApplication", this._onWrittenApplication, this);
   },
   
   properties: {
@@ -60,6 +63,10 @@ qx.Class.define("qx.tool.cli.Watch", {
     __makeTimerId: null,
     __debounceChanges: null,
     __configFilenames: null,
+    __madeApplications: null,
+
+    /** @type{Map<String,Object>} list of runWhenWatching configurations, indexed by app name */
+    __runWhenWatching: null,
     
     async setConfigFilenames(arr) {
       if (!arr) {
@@ -69,6 +76,50 @@ qx.Class.define("qx.tool.cli.Watch", {
       }
     },
 
+    setRunWhenWatching(appName, config) {
+      this.__runWhenWatching[appName] = config;
+      let arr = qx.tool.utils.Utils.parseCommand(config.command);
+      config._cmd = arr.shift();
+      config._args = arr;
+    },
+
+    async _onWrittenApplication(evt) {
+      let appInfo = evt.getData();
+      let name = appInfo.application.getName();
+      let config = this.__runWhenWatching[name];
+      if (!config) {
+        return;
+      }
+
+      if (config._process) {
+        try {
+          await qx.tool.utils.Utils.killTree(config._process.pid);
+        } catch (ex) {
+          //Nothing
+        }
+        if (config._processPromise) {
+          await config._processPromise;
+        }
+        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, config._args);
+        child.stdout.setEncoding("utf8");
+        child.stdout.on("data", data => console.log(data));
+        child.stderr.setEncoding("utf8");
+        child.stderr.on("data", data => console.log(data));
+  
+        child.on("close", function(code) {
+          console.log("Application has terminated");
+          config._process = null;
+          resolve();
+        });        
+        child.on("error", err => console.error("Application has failed: " + err));
+      });
+    },
+
     start() {
       if (this.isDebug()) {
         qx.tool.compiler.Console.debug("DEBUG: Starting watch");
@@ -170,6 +221,7 @@ qx.Class.define("qx.tool.cli.Watch", {
 
       function make() {
         Console.print("qx.tool.cli.watch.makingApplications");
+        t.__madeApplications = null;
         var startTime = new Date().getTime();
         t.__stats.classesCompiled = 0;
         t.__outOfDate = false;

package/source/class/qx/tool/cli/api/AbstractApi.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2019 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/cli/api/CompilerApi.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2019 Zenesis Limited, http://www.zenesis.com
@@ -25,7 +25,7 @@ const fs = qx.tool.utils.Promisify.fs;
 
 /**
  * Provides an API for the compiler
- * 
+ *
  */
 qx.Class.define("qx.tool.cli.api.CompilerApi", {
   extend: qx.tool.cli.api.AbstractApi,
@@ -75,7 +75,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * called after deployment happens
-     * 
+     *
      * @param data {Object}  contains deployment infos with the following properties:
      *           targetDir  : {String}  The target dir of the build
      *           deployDir  : {String}  The output dir for the deployment
@@ -89,7 +89,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * Loads the configuration data
-     * 
+     *
      * @overridden
      */
     async load() {
@@ -102,6 +102,16 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
       return this.base(arguments);
     },
 
+    /**
+     * runs after the whole process is finished
+     * @param cmd {qx.tool.cli.commands.Command} current command
+     * @param res {boolean} result of the just finished process
+     */
+    async afterProcessFinished(cmd, res) {
+      // Nothing
+    },
+
+
     /**
      * Called after all libraries have been loaded and added to the compilation data
      */
@@ -113,7 +123,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * Adds a library configuration
-     * 
+     *
      * @param libraryApi {LibraryApi} the configuration for the library
      */
     addLibraryApi(libraryApi) {
@@ -123,7 +133,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * Returns an array of library configurations
-     * 
+     *
      * @return {LibraryApi[]}
      */
     getLibraryApis() {

package/source/class/qx/tool/cli/api/LibraryApi.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2019 Zenesis Limited, http://www.zenesis.com

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

@@ -127,6 +127,13 @@ qx.Class.define("qx.tool.cli.commands.Command", {
      */
     getQxPath: qx.tool.config.Utils.getQxPath.bind(qx.tool.config.Utils),
 
+    /**
+     *
+     * @returns @see {@link qx.tool.config.Utils#getCompilerVersion}
+     */
+    getCompilerVersion() {
+      return qx.tool.config.Utils.getCompilerVersion();
+    },
 
     /**
      * Returns the qooxdoo version, either from the `--qx-version` command line

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

@@ -326,7 +326,7 @@ qx.Class.define("qx.tool.cli.commands.Compile", {
 
       if (this.argv.verbose) {
         console.log(`
-Compiler:  v${qx.tool.compiler.Version.VERSION} in ${require.main.filename}
+Compiler:  v${this.getCompilerVersion()} in ${require.main.filename}
 Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
       }
 
@@ -530,6 +530,11 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 
         // Continuous make
         let watch = new qx.tool.cli.Watch(maker);
+        config.applications.forEach(appConfig => {
+          if (appConfig.runWhenWatching) {
+            watch.setRunWhenWatching(appConfig.name, appConfig.runWhenWatching);
+          }
+        });
         if (this.argv["watch-debug"]) {
           watch.setDebug(true);
         }
@@ -622,8 +627,9 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           allAppNames[appConfig.name] = appConfig;
         }
         if (appConfig.group) {
-          if (typeof appConfig.group == "string")
-            appConfig.group = [ appConfig.group ]; 
+          if (typeof appConfig.group == "string") {
+            appConfig.group = [ appConfig.group ];
+          }
         }
         appConfig.index = index;
         let appType = appConfig.type||"browser";
@@ -733,6 +739,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
       /*
        * There is still only one target per maker, so convert our list of targetConfigs into an array of makers
        */
+      let targetOutputPaths = {};
       let makers = [];
       targetConfigs.forEach(targetConfig => {
         if (!targetConfig.appConfigs) {
@@ -742,12 +749,14 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         let appConfigs = targetConfig.appConfigs.filter(appConfig => {
           if (argvAppGroups) {
             let groups = appConfig.group||[];
-            if (!groups.find(groupName => !!argvAppGroups[groupName]))
+            if (!groups.find(groupName => !!argvAppGroups[groupName])) {
               return false;
+            }
           }
           if (argvAppNames && appConfig.name) {
-            if (!argvAppNames[appConfig.name])
+            if (!argvAppNames[appConfig.name]) {
               return false;
+            }
           }
           return true;
         });
@@ -762,6 +771,11 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         if (!outputPath) {
           throw new qx.tool.utils.Utils.UserError("Missing output-path for target " + targetConfig.type);
         }
+        let absOutputPath = path.resolve(outputPath);
+        if (targetOutputPaths[absOutputPath]) {
+          throw new qx.tool.utils.Utils.UserError(`Multiple output targets share the same target directory ${outputPath} - each target output must be unique`);
+        }
+        targetOutputPaths[absOutputPath] = true;
 
         var maker = new qx.tool.compiler.makers.AppMaker();
         if (!this.argv["erase"]) {
@@ -781,6 +795,11 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         if (targetConfig.uri) {
           qx.tool.compiler.Console.print("qx.tool.cli.compile.deprecatedUri", "target.uri", targetConfig.uri);
         }
+        if (targetConfig.addTimestampsToUrls !== undefined) {
+          target.setAddTimestampsToUrls(targetConfig.addTimestampsToUrls);
+        } else {
+          target.setAddTimestampsToUrls(target instanceof qx.tool.compiler.targets.BuildTarget);
+        }
         if (targetConfig.writeCompileInfo || this.argv.writeCompileInfo) {
           target.setWriteCompileInfo(true);
         }
@@ -1057,15 +1076,15 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         let requires_uris = Object.getOwnPropertyNames(requires)
           .filter(uri => !libs.find(lib => lib.getLibraryInfo().name === uri));
 
-        let urisToInstall = requires_uris.filter(name => name !== "@qooxdoo/framework");
+        let urisToInstall = requires_uris.filter(name => (name !== "@qooxdoo/framework") && (name !== "@qooxdoo/compiler"));
 
         let pkg_libs = Object.getOwnPropertyNames(packages);
         if (urisToInstall.length > 0 && pkg_libs.length === 0) {
           // if we don't have package data
           if (this.argv.download) {
-            if (!fs.existsSync(qx.tool.config.Manifest.config.fileName)) { 
-              Console.error("Libraries are missing and there is no Manifest.json in the current directory so we cannot attempt to install them; the missing libraries are: \n     " + 
-                urisToInstall.join("\n     ") + "\nThe library which refers to the missing libraries is " + lib.getNamespace() + " in " + lib.getRootDir());  
+            if (!fs.existsSync(qx.tool.config.Manifest.config.fileName)) {
+              Console.error("Libraries are missing and there is no Manifest.json in the current directory so we cannot attempt to install them; the missing libraries are: \n     " +
+                urisToInstall.join("\n     ") + "\nThe library which refers to the missing libraries is " + lib.getNamespace() + " in " + lib.getRootDir());
               process.exit(1);
             }
               // but we're instructed to download the libraries

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

@@ -16,8 +16,9 @@
 
 ************************************************************************ */
 
-const CLIEngine = require("eslint").CLIEngine;
+const {ESLint} = require("eslint");
 const fs = qx.tool.utils.Promisify.fs;
+const path = require("path");
 const replaceInFile = require("replace-in-file");
 
 qx.Class.define("qx.tool.cli.commands.Lint", {
@@ -85,12 +86,21 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
 
     process: async function() {
       await this.__applyFixes();
-      let config;
-      config = await qx.tool.cli.Cli.getInstance().getParsedArgs();
+
+      let helperFilePath = require.main.path;
+      while (true) {
+        if (await fs.existsAsync(path.join(helperFilePath, "node_modules"))) {
+          break;
+        }
+        helperFilePath = path.dirname(helperFilePath);
+      }
+
+      let config = await qx.tool.cli.Cli.getInstance().getParsedArgs();
       let lintOptions = config.eslintConfig || {};
       lintOptions.extends = lintOptions.extends || ["@qooxdoo/qx/browser"];
       lintOptions.globals = Object.assign(lintOptions.globals || {}, await this.__addGlobals(config));
-      let linter = new CLIEngine({
+      let linter = new ESLint({
+        cwd: helperFilePath,
         cache: this.argv.cache || false,
         baseConfig: lintOptions,
         useEslintrc: this.argv.useEslintrc,
@@ -98,15 +108,24 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
       });
       let files = this.argv.files || [];
       if (files.length === 0) {
-        files.push("source/class/");
+        files.push("source/class/**/*.js");
+      }
+      for (let i = 0; i < files.length; i++) {
+        files[i] = path.join(process.cwd(), files[i]);
       }
-      if (this.argv.config) {
-        const fileConfig = linter.getConfigForFile(files[0]);
+      if (this.argv.printConfig) {
+        const fileConfig = await linter.calculateConfigForFile(files[0]);
         qx.tool.compiler.Console.info(JSON.stringify(fileConfig, null, "  "));
       } else {
-        let report = linter.executeOnFiles(files);
+        let report = await linter.lintFiles(files);
+        report.errorCount = 0;
+        report.warningCount =0;
+        for (const r of report) {
+           report.errorCount += r.errorCount;
+           report.warningCount += r.warningCount;
+        }
         if (this.argv.fix) {
-          CLIEngine.outputFixes(report);
+          await ESLint.outputFixes(report);
         }
         if (report.errorCount > 0 || report.warningCount > 0) {
           let outputFormat = this.argv.format || "codeframe";
@@ -115,8 +134,8 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
           if (report.errorCount + report.warningCount > 150) {
             outputFormat = "compact";
           }
-          const formatter = linter.getFormatter(outputFormat);
-          const s = formatter(report.results);
+          const formatter = await linter.loadFormatter(outputFormat);
+          const s = formatter.format(report);
           if (this.argv.outputFile) {
             if (this.argv.verbose) {
               qx.tool.compiler.Console.info(`Report to be written to ${this.argv.outputFile}`);

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

@@ -18,7 +18,6 @@
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
 const process = require("process");
-const jsonlint = require("jsonlint");
 const stringify = require("json-stable-stringify");
 
 /**
@@ -213,7 +212,7 @@ qx.Class.define("qx.tool.cli.commands.Package", {
         return this.__cache;
       }
       try {
-        this.__cache = jsonlint.parse(fs.readFileSync(this.getCachePath(), "UTF-8"));
+        this.__cache = JSON.parse(fs.readFileSync(this.getCachePath(), "UTF-8"));
       } catch (e) {
         this.__cache = {
           repos : {

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

@@ -18,7 +18,7 @@
 
 const path = require("upath");
 const process = require("process");
-const psTree = require("ps-tree");
+
 /**
  * Runs a server application
  */
@@ -97,29 +97,6 @@ qx.Class.define("qx.tool.cli.commands.Run", {
       
       let target = maker.getTarget();
       
-      function kill(parentId) {
-        return new qx.Promise((resolve, reject) => {
-          psTree(parentId, function (err, children) {
-            if (err) { 
-              reject(err);
-              return;
-            }
-            children.forEach(item => {
-              try {
-                process.kill(item.PID);
-              } catch (ex) {
-                // Nothing
-              }
-            });
-            try {
-              process.kill(parentId);
-            } catch (ex) {
-              // Nothing
-            }
-            resolve();
-          });
-        });
-      }
       
       let scriptname = path.join(target.getApplicationRoot(app), "index.js");
       let args = config.run.arguments||"";
@@ -150,7 +127,7 @@ qx.Class.define("qx.tool.cli.commands.Run", {
           }
           
           try {
-            await kill(this.__process.pid);
+            await qx.tool.utils.Utils.killTree(this.__process.pid);
           } catch (ex) {
             //Nothing
           }

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

@@ -147,6 +147,15 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
       }
       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();
+      });
       const website = new qx.tool.utils.Website();
       if (!this.__showStartpage) {
         app.use("/", express.static(defaultMaker.getTarget().getOutputDir()));