@qooxdoo/framework 7.3.2 → 7.4.0

package/lib/resource/qx/tool/cli/templates/template_vars.js

@@ -107,12 +107,6 @@ module.exports = function (argv, data) {
         return "^" + data.qooxdoo_version;
       }
     },
-    "compiler_range": {
-      "description": "the semver range of qooxdoo compiler versions that are compatible with this application",
-      "default": function () {
-        return "^" + qx.tool.config.Utils.getCompilerVersion();
-      }
-    },
     "theme": {
       "description": "the theme of the application",
       "default": argv.theme

package/lib/resource/qx/tool/schema/compile-1-0-0.json

@@ -47,6 +47,12 @@
         }
       }
     },
+    "localModules": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
     "applications": {
       "type":"array",
       "description": "Each entry describes an application to be compiled.",
@@ -174,10 +180,7 @@
             "$ref": "#/properties/parts"
           },
           "localModules": {
-            "type": "object",
-            "additionalProperties": {
-              "type": "string"
-            }
+            "$ref": "#/properties/localModules"
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qooxdoo/framework",
-  "version": "7.3.2",
+  "version": "7.4.0",
   "description": "The JS Framework for Coders",
   "author": "The qooxdoo project",
   "keywords": [
@@ -44,6 +44,7 @@
   "files": [
     "LICENSE",
     "addGitHook",
+    "bin/tools/utils.js",
     "CHANGELOG.md",
     "README.md",
     "Manifest.json",

package/source/class/qx/test/bom/media/MediaTestCase.js

@@ -189,7 +189,7 @@ qx.Class.define("qx.test.bom.media.MediaTestCase", {
     "test Play Event"() {
       if (navigator.plugins.length == 0) {
         this.skip(
-          "Headless browser HTML5 audio/video play event test disabled on headless browsers"
+          "HTML5 audio/video play event test disabled on headless browsers"
         );
       }
       // Disabled on travis because of events not being fired reliable

package/source/class/qx/test/io/transport/Websocket.js

@@ -24,7 +24,7 @@ qx.Class.define("qx.test.io.transport.Websocket", {
   extend: qx.dev.unit.TestCase,
 
   statics: {
-    TEST_ENDPOINT: "echo.websocket.events"
+    TEST_ENDPOINT: "socketsbay.com/wss/v2/2/demo/"
   },
 
   members: {

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

@@ -111,7 +111,11 @@ qx.Class.define("qx.test.ui.form.Form", {
         },
         function (e) {
           self.assertEquals("affe", e.getData(), "Wrong data in the event.");
-          self.assertEquals("", e.getOldData(), "Wrong old data in the event.");
+          self.assertEquals(
+            null,
+            e.getOldData(),
+            "Wrong old data in the event."
+          );
         },
         "Change event not fired!"
       );

package/source/class/qx/test/util/DeferredCall.js

@@ -21,6 +21,10 @@ qx.Class.define("qx.test.util.DeferredCall", {
 
   members: {
     testGlobalErrorHandling() {
+      if (navigator.plugins.length == 0) {
+        this.skip("test disabled on headless browsers");
+      }
+
       var fail = function () {
         throw new Error("fail");
       };

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

@@ -518,7 +518,8 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
           parsedArgs.environment[key] = value;
         });
       }
-      config.targetType = parsedArgs.target || config.defaultTarget || "source";
+
+      let targetType = this._compilerApi.getCommand().getTargetType();
 
       if (!config.locales) {
         config.locales = [];
@@ -536,7 +537,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
       // one and assign it to the target.
       if (config.targets) {
         const target = config.targets.find(
-          target => target.type === config.targetType
+          target => target.type === targetType
         );
 
         target.environment = target.environment || {};

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

@@ -170,6 +170,13 @@ qx.Class.define("qx.tool.cli.Watch", {
         if (dir && !dirs.includes(dir)) {
           dirs.push(dir);
         }
+        let localModules = application.getLocalModules();
+        for (let requireName in localModules) {
+          let dir = localModules[requireName];
+          if (dir && !dirs.includes(dir)) {
+            dirs.push(dir);
+          }
+        }
       });
       if (this.isDebug()) {
         qx.tool.compiler.Console.debug(
@@ -291,15 +298,22 @@ qx.Class.define("qx.tool.cli.Watch", {
               data.dependsOn = {};
               var deps = data.application.getDependencies();
               deps.forEach(function (classname) {
-                var info = db.classInfo[classname];
-                var lib = analyser.findLibrary(info.libraryName);
-                var parts = [lib.getRootDir(), lib.getSourcePath()].concat(
+                let info = db.classInfo[classname];
+                let lib = analyser.findLibrary(info.libraryName);
+                let parts = [lib.getRootDir(), lib.getSourcePath()].concat(
                   classname.split(".")
                 );
 
-                var filename = path.resolve.apply(path, parts) + ".js";
+                let filename = path.resolve.apply(path, parts) + ".js";
                 data.dependsOn[filename] = true;
               });
+
+              let localModules = data.application.getLocalModules();
+              for (let requireName in localModules) {
+                let filename = path.resolve(localModules[requireName]);
+                data.dependsOn[filename] = true;
+              }
+
               var filename = path.resolve(data.application.getLoaderTemplate());
               promises.push(
                 qx.tool.utils.files.Utils.correctCase(filename).then(

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

@@ -173,6 +173,14 @@ qx.Class.define("qx.tool.cli.commands.Command", {
       } catch (e) {
         throw new qx.tool.utils.Utils.UserError(e.message);
       }
-    }
+    },
+
+    /**
+     * Returns the calculated target type
+     * @returns {String}
+     */
+    getTargetType() {
+      return this.argv.target || this.getCompilerApi().getConfiguration().defaultTarget || "source";
+    },
   }
 });

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

@@ -344,7 +344,6 @@ qx.Class.define("qx.tool.cli.commands.Compile", {
   members: {
     __gauge: null,
     __makers: null,
-    __config: null,
     __libraries: null,
     __outputDirWasCreated: false,
 
@@ -532,13 +531,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
      * @return {Boolean} true if all makers succeeded
      */
     async _loadConfigAndStartMaking() {
-      var config = (this.__config =
-        await qx.tool.cli.Cli.getInstance().getParsedArgs());
-      if (!config) {
-        throw new qx.tool.utils.Utils.UserError(
-          "Error: Cannot find any configuration"
-        );
-      }
+      var config = this.getCompilerApi().getConfiguration();
       var makers = (this.__makers = await this.createMakersFromConfig(config));
       if (!makers || !makers.length) {
         throw new qx.tool.utils.Utils.UserError(
@@ -750,7 +743,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
       let targetConfigs = [];
       let defaultTargetConfig = null;
       data.targets.forEach(targetConfig => {
-        if (targetConfig.type === data.targetType) {
+        if (targetConfig.type === this.getTargetType()) {
           if (
             !targetConfig["application-names"] &&
             !targetConfig["application-types"]
@@ -1231,8 +1224,13 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           if (appConfig.description) {
             app.setDescription(appConfig.description);
           }
-
-          if (appConfig.localModules) {
+          appConfig.localModules = appConfig.localModules || {};
+          qx.lang.Object.mergeWith(
+            appConfig.localModules,
+            data.localModules || {},
+            false
+          );
+          if (!qx.lang.Object.isEmpty(appConfig.localModules)) {
             app.setLocalModules(appConfig.localModules);
           }
 
@@ -1578,13 +1576,6 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
       });
     },
 
-    /**
-     * Returns the configuration object being compiled
-     */
-    _getConfig() {
-      return this.__config;
-    },
-
     /**
      * Returns a list of libraries which are used
      *

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

@@ -65,7 +65,7 @@ qx.Class.define("qx.tool.cli.commands.Run", {
       this.argv["machine-readable"] = false;
       this.argv["feedback"] = false;
       await super.process();
-      let config = this._getConfig();
+      let config = this.getCompilerApi().getConfiguration();
       if (!config.run) {
         qx.tool.compiler.Console.print("qx.tool.cli.run.noRunConfig");
         process.exit(-1);

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

@@ -155,7 +155,7 @@ qx.Class.define("qx.tool.cli.commands.Serve", {
       if (this.__showStartpage === undefined || this.__showStartpage === null) {
         this.__showStartpage = defaultMaker === null;
       }
-      var config = this._getConfig();
+      let config = this.getCompilerApi().getConfiguration();
       const app = express();
       app.use((req, res, next) => {
         res.set({

package/source/class/qx/tool/compiler/makers/AppMaker.js

@@ -195,17 +195,28 @@ qx.Class.define("qx.tool.compiler.makers.AppMaker", {
       //  will be no dependencies so we just compile anyway, but `qx compile --watch` will call it
       //  multiple times
       let compiledClasses = this.getRecentlyCompiledClasses(true);
-      var appsThisTime = this.__applications.filter(app => {
+      let db = analyser.getDatabase();
+
+      var appsThisTime = await this.__applications.filter(async app => {
         let loadDeps = app.getDependencies();
         if (!loadDeps || !loadDeps.length) {
           return true;
         }
-        return loadDeps.some(name => Boolean(compiledClasses[name]));
+        let res = loadDeps.some(name => Boolean(compiledClasses[name]));
+        let localModules = app.getLocalModules();
+        for (let requireName in localModules) {
+          let stat = await qx.tool.utils.files.Utils.safeStat(
+            localModules[requireName]
+          );
+          res ||=
+            stat.mtime.getTime() >
+            (db?.modulesInfo?.localModules[requireName] || 0);
+        }
+        return res;
       });
 
       let allAppInfos = [];
 
-      let db = analyser.getDatabase();
       for (let i = 0; i < appsThisTime.length; i++) {
         let application = appsThisTime[i];
         if (application.getType() != "browser" && !compileEnv["qx.headless"]) {

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

@@ -20,8 +20,7 @@
  *
  * ************************************************************************/
 
-const fs = qx.tool.utils.Promisify.fs;
-const path = require("upath");
+const hash = require("object-hash");
 
 /**
  *
@@ -31,66 +30,114 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
 
   construct(appMeta) {
     super(appMeta, `${appMeta.getApplicationRoot()}commonjs-browserify.js`);
-    this.__appMeta = appMeta;
+    this.__commonjsModules = [];
+    this.__references = {};
     this.setNeedsWriteToDisk(true);
   },
 
   members: {
-    __appMeta: null,
+    __commonjsModules: null,
+    __references: null,
 
-    /**
-     * @Override
-     */
-    async writeSourceCodeToStream(ws) {
-      let hasCommonjsModules = false;
+    __getCommonjsModules() {
       let commonjsModules = new Set();
       let references = {};
+      const db = this.getAppMeta().getAnalyser().getDatabase();
       const localModules =
-        this.__appMeta.getApplication().getLocalModules() || {};
-      const db = this.__appMeta.getAnalyser().getDatabase();
-
-      // Only include discovered `require()`d Node modules if the
-      // target application type is browser.
-      if (
-        this.__appMeta.getEnvironmentValue("qx.compiler.applicationType") ==
-        "browser"
-      ) {
-        // Get a Set of unique `require`d CommonJS module names from classes needed by the application
-        let classnames = this.__appMeta.getApplication().getDependencies();
-        for (let className of classnames) {
-          let classInfo = db.classInfo[className];
-          if (classInfo.commonjsModules) {
-            Object.keys(classInfo.commonjsModules).forEach(moduleName => {
-              // Ignore this found `require()` if its a local modules
-              if (moduleName in localModules) {
-                return;
-              }
-
+        this.getAppMeta().getApplication().getLocalModules() || {};
+      // Get a Set of unique `require`d CommonJS module names from
+      // all classes
+      for (let className in db.classInfo) {
+        let classInfo = db.classInfo[className];
+        if (classInfo.commonjsModules) {
+          Object.keys(classInfo.commonjsModules).forEach(moduleName => {
+            // Ignore this found `require()` if its a local modules
+            if (!(moduleName in localModules)) {
               // Add this module name to the set of module names
               commonjsModules.add(moduleName);
+            }
+            // Add the list of references from which this module was require()d
+            if (!references[moduleName]) {
+              references[moduleName] = new Set();
+            }
+            references[moduleName].add([
+              ...classInfo.commonjsModules[moduleName]
+            ]);
+          });
+        }
+      }
+      return { commonjsModules: [...commonjsModules], references: references };
+    },
 
-              // Add the list of references from which this module was require()d
-              if (!references[moduleName]) {
-                references[moduleName] = new Set();
-              }
-              references[moduleName].add([
-                ...classInfo.commonjsModules[moduleName]
-              ]);
-
-              // There is at least one module
-              hasCommonjsModules = true;
-            });
-          }
+    /**
+     * @Override
+     */
+    async writeToDisk() {
+      const localModules = this.getAppMeta().getApplication().getLocalModules();
+      let db = this.getAppMeta().getAnalyser().getDatabase();
+      const { commonjsModules, references } = this.__getCommonjsModules();
+
+      let modules = [];
+      let modulesInfo = {};
+      let doIt = !!!(await qx.tool.utils.files.Utils.safeStat(
+        this.getFilename()
+      ));
+
+      // Include any dynamically determined `require()`d modules
+      if (commonjsModules.length > 0) {
+        modules.push(commonjsModules);
+      }
+      // Include any local modules specified for the application
+      // in compile.json
+      if (localModules) {
+        modulesInfo.localModules = {};
+        for (let requireName in localModules) {
+          modules.push(requireName);
+          let stat = await qx.tool.utils.files.Utils.safeStat(
+            localModules[requireName]
+          );
+
+          modulesInfo.localModules[requireName] = stat.mtime.getTime();
+          doIt ||=
+            modulesInfo.localModules[requireName] >
+            (db?.modulesInfo?.localModules[requireName] || 0);
         }
       }
+      modulesInfo.modulesHash = hash(modules);
+      doIt ||= modulesInfo.modulesHash !== (db?.modulesInfo?.modulesHash || "");
+      if (doIt) {
+        db.modulesInfo = modulesInfo;
+        await this.getAppMeta().getAnalyser().saveDatabase();
+        this.__commonjsModules = commonjsModules;
+        this.__references = references;
+      }
+      this.setNeedsWriteToDisk(doIt);
+      return super.writeToDisk();
+    },
 
+    /**
+     * @Override
+     */
+    async writeSourceCodeToStream(ws) {
       // If there are any CommonJS modules required to be bundled, or
       // any local modules specified for the application in
       // compile.json, browserify them
-      if (hasCommonjsModules || localModules) {
-        await this.__browserify(commonjsModules, references, localModules, ws);
+      if (
+        this.getAppMeta().getEnvironmentValue("qx.compiler.applicationType") ==
+        "browser"
+      ) {
+        const localModules = this.getAppMeta()
+          .getApplication()
+          .getLocalModules();
+        if (this.__commonjsModules || localModules) {
+          await this.__browserify(
+            this.__commonjsModules,
+            this.__references,
+            localModules,
+            ws
+          );
+        }
       }
-
       await new Promise(resolve => {
         ws.write("\n", resolve);
       });
@@ -106,10 +153,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
       // Make them equivalent.
       builtins.process = builtins._process;
 
-      // Convert the Set of CommonJS module names to an array
-      commonjsModules = [...commonjsModules];
-
-      return new Promise(resolve => {
+      return new Promise(async resolve => {
         let b = browserify([], {
           builtins: builtins,
           ignoreMissing: true,
@@ -119,22 +163,17 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
 
         b._mdeps.on("missing", (id, parent) => {
           let message = [];
-
           message.push(`ERROR: could not locate require()d module: "${id}"`);
-          if (references[id]) {
-            message.push("  required from:");
-
-            try {
-              [...references[id]].forEach(refs => {
-                refs.forEach(ref => {
-                  message.push(`    ${ref}`);
-                });
+          message.push("  required from:");
+          try {
+            [...references[id]].forEach(refs => {
+              refs.forEach(ref => {
+                message.push(`    ${ref}`);
               });
-            } catch (e) {
-              message.push(`    <compile.json:application.localModules'>`);
-            }
+            });
+          } catch (e) {
+            message.push(`    <compile.json:application.localModules'>`);
           }
-
           qx.tool.compiler.Console.error(message.join("\n"));
         });
 
@@ -150,7 +189,6 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
             b.require(localModules[requireName], { expose: requireName });
           }
         }
-
         // Ensure ES6 local modules are converted to CommonJS format
         b.transform(babelify, {
           presets: [preset],

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

@@ -21,7 +21,10 @@ const async = require("async");
 const { promisify } = require("util");
 const child_process = require("child_process");
 const psTree = require("ps-tree");
-
+/**
+ * @ignore(process)
+ */
+/* global process */
 /**
  * Utility methods
  */

package/source/class/qx/ui/form/MForm.js

@@ -52,7 +52,7 @@ qx.Mixin.define("qx.ui.form.MForm", {
     },
 
     /**
-     * Message which is shown in an invalid tooltip.
+     * Message which will be shown in an tooltip if the widget is invalid.
      */
     invalidMessage: {
       init: null,
@@ -62,7 +62,7 @@ qx.Mixin.define("qx.ui.form.MForm", {
     },
 
     /**
-     * Message which is shown in an invalid tooltip if the {@link #required} is
+     * Message which will be shown in an invalid tooltip if the {@link #required} is
      * set to true.
      */
     requiredInvalidMessage: {

package/source/class/qx/ui/form/validation/Manager.js

@@ -71,7 +71,7 @@ qx.Class.define("qx.ui.form.validation.Manager", {
     },
 
     /**
-     * The invalid message should store the message why the form validation
+     * The invalid message stores the message why the form validation
      * failed. It will be added to the array returned by
      * {@link #getInvalidMessages}.
      */
@@ -483,8 +483,13 @@ qx.Class.define("qx.ui.form.validation.Manager", {
             }
 
             let msg = item.getInvalidMessage();
-            if (!msg && qx.core.Environment.get("qx.ui.form.validation.Manager.allowDefaultInvalidMessage")) {
-              msg = "Invalid field";
+            if (
+              msg &&
+              qx.core.Environment.get(
+                "qx.ui.form.validation.Manager.allowDefaultInvalidMessage"
+              )
+            ) {
+              msg = qx.locale.Manager.tr("Invalid field");
             } else if (qx.core.Environment.get("qx.debug")) {
               this.assertTrue(msg != null && msg.length > 0);
             }
@@ -538,8 +543,13 @@ qx.Class.define("qx.ui.form.validation.Manager", {
         var formItem = this.__formItems[i].item;
         if (!formItem.getValid()) {
           let msg = formItem.getInvalidMessage();
-          if (!msg && qx.core.Environment.get("qx.ui.form.validation.Manager.allowDefaultInvalidMessage")) {
-            msg = "Invalid field";
+          if (
+            !msg &&
+            qx.core.Environment.get(
+              "qx.ui.form.validation.Manager.allowDefaultInvalidMessage"
+            )
+          ) {
+            msg = qx.locale.Manager.tr("Invalid field");
           } else if (qx.core.Environment.get("qx.debug")) {
             this.assertTrue(msg !== null && msg.length > 0);
           }
@@ -550,12 +560,9 @@ qx.Class.define("qx.ui.form.validation.Manager", {
       // add the forms fail message
       if (!this.isValid()) {
         let msg = this.getInvalidMessage();
-        if (!msg && qx.core.Environment.get("qx.ui.form.validation.Manager.allowDefaultInvalidMessage")) {
-          msg = "Invalid field";
-        } else if (qx.core.Environment.get("qx.debug")) {
-          this.assertTrue(msg !== null && msg.length > 0);
+        if (msg != "") {
+          messages.push(msg);
         }
-        messages.push(msg);
       }
 
       return messages;
@@ -665,7 +672,7 @@ qx.Class.define("qx.ui.form.validation.Manager", {
   },
 
   environment: {
-    // Whether to assume a default "Invalid Field" message for invalid fields; if false, an 
+    // Whether to assume a default "Invalid Field" message for invalid fields; if false, an
     //  exception will be raised if invalid fields do not have an `invalidMessage`
     "qx.ui.form.validation.Manager.allowDefaultInvalidMessage": true
   }

package/source/class/qxWeb.js

@@ -37,7 +37,6 @@
  *
  * @group (Core)
  *
- * @asset(qx/iconfont/MaterialIcons/*)
  */
 qx.Bootstrap.define("qxWeb", {
   extend: qx.type.BaseArray,

package/source/resource/qx/tool/cli/templates/template_vars.js

@@ -107,12 +107,6 @@ module.exports = function (argv, data) {
         return "^" + data.qooxdoo_version;
       }
     },
-    "compiler_range": {
-      "description": "the semver range of qooxdoo compiler versions that are compatible with this application",
-      "default": function () {
-        return "^" + qx.tool.config.Utils.getCompilerVersion();
-      }
-    },
     "theme": {
       "description": "the theme of the application",
       "default": argv.theme

package/source/resource/qx/tool/schema/compile-1-0-0.json

@@ -47,6 +47,12 @@
         }
       }
     },
+    "localModules": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
     "applications": {
       "type":"array",
       "description": "Each entry describes an application to be compiled.",
@@ -174,10 +180,7 @@
             "$ref": "#/properties/parts"
           },
           "localModules": {
-            "type": "object",
-            "additionalProperties": {
-              "type": "string"
-            }
+            "$ref": "#/properties/localModules"
           }
         }
       }