@qooxdoo/framework 7.1.1 → 7.2.0

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

@@ -58,29 +58,21 @@ qx.Class.define("qx.test.util.DynamicScriptLoader", {
 
       var l1Ready = false;
       var l2Ready = false;
-      l1.addListenerOnce(
-        "ready",
-        function () {
-          l1Ready = true;
-          this.resume(function () {
-            this.assertTrue(l1Ready && l2Ready);
-            this.assertEquals(
-              qx.test.DYNAMICSCRIPTTEST.second.third,
-              "dynamically loaded"
-            );
-          }, this);
-        },
-        this
-      );
+      l1.addListenerOnce("ready", () => {
+        l1Ready = true;
+        this.resume(function () {
+          this.assertTrue(l1Ready && l2Ready);
+          this.assertEquals(
+            qx.test.DYNAMICSCRIPTTEST.second.third,
+            "dynamically loaded"
+          );
+        }, this);
+      });
 
-      l2.addListenerOnce(
-        "ready",
-        function () {
-          l2Ready = true;
-          this.assertTrue(!l1Ready && l2Ready);
-        },
-        this
-      );
+      l2.addListenerOnce("ready", () => {
+        l2Ready = true;
+        this.assertTrue(!l1Ready && l2Ready);
+      });
 
       l1.start();
       l2.start();
@@ -100,13 +92,9 @@ qx.Class.define("qx.test.util.DynamicScriptLoader", {
           noEvent = false;
         }
       });
-      loader.addListenerOnce(
-        "ready",
-        function () {
-          this.assertTrue(noEvent);
-        },
-        this
-      );
+      loader.addListenerOnce("ready", () => {
+        this.assertTrue(noEvent);
+      });
 
       loader.start();
     },
@@ -115,19 +103,12 @@ qx.Class.define("qx.test.util.DynamicScriptLoader", {
         "qx/test/dynamicscriptloader/xyc.js"
       ]);
 
-      loader.addListenerOnce(
-        "failed",
-        function (e) {
-          var data = e.getData();
-          this.resume(function () {
-            this.assertEquals(
-              data.script,
-              "qx/test/dynamicscriptloader/xyc.js"
-            );
-          }, this);
-        },
-        this
-      );
+      loader.addListenerOnce("failed", e => {
+        var data = e.getData();
+        this.resume(function () {
+          this.assertEquals(data.script, "qx/test/dynamicscriptloader/xyc.js");
+        }, this);
+      });
 
       loader.start();
       this.wait();

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

@@ -634,7 +634,8 @@ qx.Theme.define("qx.theme.tangible.Appearance", {
       style(states) {
         return {
           decorator: undefined,
-          padding: [2, 2]
+          padding: [2, 2],
+          backgroundColor: "surface"
         };
       }
     },
@@ -644,7 +645,10 @@ qx.Theme.define("qx.theme.tangible.Appearance", {
       alias: "selectbox",
 
       style(states) {
-        return { padding: [0, 2] };
+        return { 
+          padding: [0, 2],
+          backgroundColor: "surface"
+        };
       }
     },
 
@@ -653,7 +657,10 @@ qx.Theme.define("qx.theme.tangible.Appearance", {
       alias: "combobox",
 
       style(states) {
-        return { decorator: undefined };
+        return { 
+          decorator: undefined,
+          backgroundColor: "surface"
+         };
       }
     },
 
@@ -999,6 +1006,18 @@ qx.Theme.define("qx.theme.tangible.Appearance", {
         };
       }
     },
+    "menubar-button/icon": {
+      style(states) {
+        return {
+          textColor: states.disabled 
+            ? "text-disabled-on-surface" 
+            : ( states.pressed || states.hovered )
+            ? "text-on-primary" 
+            : "text-on-surface"
+        }
+      }
+    },
+    
 
     /*
     ---------------------------------------------------------------------------

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

@@ -140,13 +140,9 @@ qx.Class.define("qx.tool.cli.Watch", {
 
       var dirs = [];
       var analyser = this.__maker.getAnalyser();
-      analyser.addListener(
-        "compiledClass",
-        function () {
-          this.__stats.classesCompiled++;
-        },
-        this
-      );
+      analyser.addListener("compiledClass", () => {
+        this.__stats.classesCompiled++;
+      });
 
       dirs.push(qx.tool.config.Compile.config.fileName);
       dirs.push("compile.js");

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

@@ -88,7 +88,7 @@ qx.Class.define("qx.tool.cli.api.AbstractApi", {
       const { execSync } = require("child_process");
       // since npm 7 --no-save deletes the node_modules folder
       // see https://github.com/npm/cli/pull/3907
-//       let s = `npm install --no-save --no-package-lock ${module}`;
+      //       let s = `npm install --no-save --no-package-lock ${module}`;
       let s = `npm install --no-package-lock ${module}`;
       qx.tool.compiler.Console.info(s);
       execSync(s, {

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

@@ -33,13 +33,9 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
   construct() {
     super();
     this.__libraryApis = {};
-    this.addListener(
-      "changeCommand",
-      function () {
-        this.afterCommandLoaded(this.getCommand());
-      },
-      this
-    );
+    this.addListener("changeCommand", () => {
+      this.afterCommandLoaded(this.getCommand());
+    });
   },
 
   properties: {

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

@@ -359,10 +359,10 @@ qx.Class.define("qx.tool.cli.commands.Compile", {
         this.argv["feedback"] = configDb.db("qx.default.feedback", true);
       }
 
-     // Validate compile.json against the schema
-     await qx.tool.config.Compile.getInstance().load();
+      // Validate compile.json against the schema
+      await qx.tool.config.Compile.getInstance().load();
 
-     if (this.argv.verbose) {
+      if (this.argv.verbose) {
         console.log(`
 Compiler:  v${this.getCompilerVersion()} in ${require.main.filename}
 Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);

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

@@ -95,7 +95,6 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
 
   members: {
     async process() {
-
       let files = this.argv.files || [];
       if (files.length === 0) {
         files.push("source/class/**/*.js");
@@ -121,14 +120,14 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
         lintOptions.globals || {},
         await this.__addGlobals(config)
       );
+
       lintOptions.parser = "@babel/eslint-parser";
       lintOptions.parserOptions = lintOptions.parserOptions || {};
       lintOptions.parserOptions.requireConfigFile = false;
       lintOptions.parserOptions.babelOptions = {
         cwd: helperFilePath,
-        plugins: [
-          "@babel/plugin-syntax-jsx"
-        ],
+        plugins: ["@babel/plugin-syntax-jsx"],
+
         parserOpts: {
           allowSuperOutsideMethod: true
         }
@@ -164,11 +163,15 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
           // If there are too many errors, the pretty formatter is appallingly slow so if the
           // user has not specified a format, change to compact mode
           const maxDefaultFormatErrorCount = 150;
-          if (report.errorCount + report.warningCount > maxDefaultFormatErrorCount) {
+          if (
+            report.errorCount + report.warningCount >
+            maxDefaultFormatErrorCount
+          ) {
             if (!this.argv.format) {
               qx.tool.compiler.Console.info(
                 `Total errors and warnings exceed ${maxDefaultFormatErrorCount}, switching to "compact" style report`
               );
+
               outputFormat = "compact";
             } else {
               qx.tool.compiler.Console.info(

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

@@ -392,6 +392,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
                   qx.tool.compiler.ClassFile.JSX_OPTIONS
                 ]
               ],
+
               generatorOpts: {
                 compact: false
               },
@@ -674,7 +675,9 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
       if (Object.keys(this.__commonjsModules).length > 0) {
         dbClassInfo.commonjsModules = {};
         for (let moduleName in this.__commonjsModules) {
-          dbClassInfo.commonjsModules[moduleName] = [ ...this.__commonjsModules[moduleName] ];
+          dbClassInfo.commonjsModules[moduleName] = [
+            ...this.__commonjsModules[moduleName]
+          ];
         }
       }
 
@@ -1667,11 +1670,12 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
             let scope;
             let applicationTypes = t.__analyser.getApplicationTypes();
 
-            if (path.node.callee.type == "Identifier" &&
-                path.node?.callee?.name == "require" &&
-                path.node.arguments?.length == 1 &&
-                applicationTypes.includes("browser")) {
-
+            if (
+              path.node.callee.type == "Identifier" &&
+              path.node?.callee?.name == "require" &&
+              path.node.arguments?.length == 1 &&
+              applicationTypes.includes("browser")
+            ) {
               // See if this is a reference to global `require` or
               // something in the scope chain
               for (scope = t.__scope; scope; scope = scope.parent) {
@@ -1681,7 +1685,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
                 }
               }
               // Did we reach top level without finding it in a local scope?
-              if (! scope) {
+              if (!scope) {
                 // Yup. It's the global one we're looking for. Ensure the argument is valid.
                 let arg = path.node.arguments[0];
                 if (types.isLiteral(arg)) {
@@ -1694,8 +1698,13 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
                   } else {
                     qx.tool.compiler.Console.log(
                       `${t.__className}:${path.node.loc.start.line}:` +
-                        ` automatically detected \'require(${arg.value})\``);
-                    t.addCommonjsModule(arg.value, t.__className, path.node.loc.start.line);
+                        ` automatically detected \'require(${arg.value})\``
+                    );
+                    t.addCommonjsModule(
+                      arg.value,
+                      t.__className,
+                      path.node.loc.start.line
+                    );
 
                     // Don't show "unresolved" error for `require` since the
                     // browserified code defines it as a global
@@ -1885,6 +1894,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
                       types.stringLiteral(t.__classMeta.functionName)
                     ]
                   );
+
                   expr = types.memberExpression(expr, types.identifier("call"));
                 } else if (t.__classMeta.functionName == "$$constructor") {
                   expr = expandMemberExpression(
@@ -1893,8 +1903,8 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
                 } else if (t.__classMeta.className) {
                   expr = expandMemberExpression(
                     t.__classMeta.className +
-                    ".superclass" +
-                    ".prototype." +
+                      ".superclass" +
+                      ".prototype." +
                       t.__classMeta.functionName +
                       ".call"
                   );
@@ -2569,7 +2579,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
      * @param name {String} name of the module
      */
     addCommonjsModule(moduleName, className, linenum) {
-      if (! this.__commonjsModules[moduleName]) {
+      if (!this.__commonjsModules[moduleName]) {
         this.__commonjsModules[moduleName] = new Set();
       }
 

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

@@ -106,7 +106,7 @@ qx.Class.define("qx.tool.compiler.Es6ify", {
   construct(filename) {
     super();
     this.__filename = filename;
-    this.__knownApiFunctions = ["addListener","addListenerOnce"];
+    this.__knownApiFunctions = ["addListener", "addListenerOnce"];
   },
 
   properties: {
@@ -176,7 +176,9 @@ qx.Class.define("qx.tool.compiler.Es6ify", {
       while (true) {
         cycleCount++;
         if (cycleCount > 10) {
-          qx.tool.compiler.Console.warn(`Can not find a stable format for ${this.__filename}`);
+          qx.tool.compiler.Console.warn(
+            `Can not find a stable format for ${this.__filename}`
+          );
           break;
         }
         result = babelCore.transform(src, config);
@@ -285,7 +287,9 @@ qx.Class.define("qx.tool.compiler.Es6ify", {
             if (path.node.callee.type == "MemberExpression") {
               let callee = collapseMemberExpression(path.node.callee);
               if (arrowFunctions == "careful") {
-                if (!knownApiFunctions.some(fName => callee.endsWith("."+fName))) {
+                if (
+                  !knownApiFunctions.some(fName => callee.endsWith("." + fName))
+                ) {
                   return;
                 }
                 if (

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

@@ -20,8 +20,7 @@
  *
  * ************************************************************************/
 
-qx.Class.define("qx.tool.compiler.TargetError",
-{
-//  extend : qx.type.BaseError
-  extend : Error
+qx.Class.define("qx.tool.compiler.TargetError", {
+  //  extend : qx.type.BaseError
+  extend: Error
 });

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

@@ -228,9 +228,9 @@ qx.Class.define("qx.tool.compiler.app.Application", {
      * relative to the directory containing compile.json. The module may be
      * either a CommonJS module or an ES6 module.
      */
-    localModules : {
-      init : null,
-      check : "Object"
+    localModules: {
+      init: null,
+      check: "Object"
     }
   },
 

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

@@ -255,12 +255,14 @@ qx.Class.define("qx.tool.compiler.app.WebFont", {
           lookupListIndexes.forEach(index => {
             let subTable = lookupList[index].subTables[0];
             let leadingCharacters = [];
-            subTable.coverage.rangeRecords.forEach(coverage => {
-              for (let i = coverage.start; i <= coverage.end; i++) {
-                let character = font.stringsForGlyph(i)[0];
-                leadingCharacters.push(character);
-              }
-            });
+            if (subTable.coverage.rangeRecords) {
+              subTable.coverage.rangeRecords.forEach(coverage => {
+                for (let i = coverage.start; i <= coverage.end; i++) {
+                  let character = font.stringsForGlyph(i)[0];
+                  leadingCharacters.push(character);
+                }
+              });
+            }
             let ligatureSets = subTable.ligatureSets.toArray();
             ligatureSets.forEach((ligatureSet, ligatureSetIndex) => {
               let leadingCharacter = leadingCharacters[ligatureSetIndex];

package/source/class/qx/tool/compiler/targets/SourceCodeCopier.js

@@ -24,7 +24,7 @@ const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
 
 const crypto = require("crypto");
-const sourceMap = require("source-map");
+const sourceMap = require("source-map-js");
 
 /**
  * Copies multiple javascript source files into a single destination, preserving (merging)

package/source/class/qx/tool/compiler/targets/Target.js

@@ -437,7 +437,8 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       // application in compile.json, but will not bundle `require()`d
       // modules that are Node modules.
       bootPackage.addJavascriptMeta(
-        new qx.tool.compiler.targets.meta.Browserify(appMeta));
+        new qx.tool.compiler.targets.meta.Browserify(appMeta)
+      );
 
       /*
        * Assemble the Parts

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

@@ -22,7 +22,7 @@
 
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
-const sourceMap = require("source-map");
+const sourceMap = require("source-map-js");
 
 /**
  * An AbstractJavascriptMeta provides an abstraction of some source code, and might be

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

@@ -36,7 +36,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
   },
 
   members: {
-    __appMeta : null,
+    __appMeta: null,
 
     /**
      * @Override
@@ -46,39 +46,40 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
       let commonjsModules = new Set();
       let references = {};
       const localModules =
-            this.__appMeta.getApplication().getLocalModules() || {};
+        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") {
-
+      if (
+        this.__appMeta.getEnvironmentValue("qx.compiler.applicationType") ==
+        "browser"
+      ) {
         // 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) {
-                  return;
-                }
-
-                // 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] ]);
-
-                // There is at least one module
-                hasCommonjsModules = true;
-              });
+            Object.keys(classInfo.commonjsModules).forEach(moduleName => {
+              // Ignore this found `require()` if its a local modules
+              if (moduleName in localModules) {
+                return;
+              }
+
+              // 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]
+              ]);
+
+              // There is at least one module
+              hasCommonjsModules = true;
+            });
           }
         }
       }
@@ -87,12 +88,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
       // any local modules specified for the application in
       // compile.json, browserify them
       if (hasCommonjsModules || localModules) {
-        await this.__browserify(
-          commonjsModules,
-          references,
-          localModules,
-          ws
-        );
+        await this.__browserify(commonjsModules, references, localModules, ws);
       }
 
       await new Promise(resolve => {
@@ -113,66 +109,64 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
       // Convert the Set of CommonJS module names to an array
       commonjsModules = [...commonjsModules];
 
-      return new Promise(resolve =>
-        {
-          let b = browserify(
-            [],
-            {
-              builtins      : builtins,
-              ignoreMissing : true,
-              insertGlobals : true,
-              detectGlobals : true
-            });
-          b._mdeps.on("missing", (id, parent) => {
-            let message = [];
-
-            message.push(`ERROR: could not locate require()d module: "${id}"`);
-            message.push("  required from:");
-
-            try {
-              [ ...references[id] ].forEach(refs => {
-                refs.forEach(ref =>
-                  {
-                    message.push(`    ${ref}`);
-                  });
+      return new Promise(resolve => {
+        let b = browserify([], {
+          builtins: builtins,
+          ignoreMissing: true,
+          insertGlobals: true,
+          detectGlobals: true
+        });
+
+        b._mdeps.on("missing", (id, parent) => {
+          let message = [];
+
+          message.push(`ERROR: could not locate require()d module: "${id}"`);
+          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"));
+        });
 
-            qx.tool.compiler.Console.error(message.join("\n"));
-          });
+        // Include any dynamically determined `require()`d modules
+        if (commonjsModules.length > 0) {
+          b.require(commonjsModules);
+        }
 
-          // Include any dynamically determined `require()`d modules
-          if (commonjsModules.length > 0) {
-            b.require(commonjsModules);
+        // Include any local modules specified for the application
+        // in compile.json
+        if (localModules) {
+          for (let requireName in localModules) {
+            b.require(localModules[requireName], { expose: requireName });
           }
+        }
+
+        // Ensure ES6 local modules are converted to CommonJS format
+        b.transform(babelify, {
+          presets: [preset],
+          sourceMaps: false,
+          global: true
+        });
 
-          // Include any local modules specified for the application
-          // in compile.json
-          if (localModules) {
-            for (let requireName in localModules) {
-              b.require(localModules[requireName], { expose : requireName });
-            }
+        b.bundle((e, output) => {
+          if (e) {
+            // We've already handled the case of missing module. This is something else.
+            qx.tool.compiler.Console.error(`Failed: ${e}`);
+            throw e;
           }
 
-          // Ensure ES6 local modules are converted to CommonJS format
-          b.transform(babelify, {
-            presets: [preset],
-            sourceMaps: false,
-            global: true
-          });
-          b.bundle((e, output) => {
-            if (e) {
-              // We've already handled the case of missing module. This is something else.
-              qx.tool.compiler.Console.error(`Failed: ${e}`);
-              throw(e);
-            }
-
-            ws.write(output);
-            resolve(null);
-          });
+          ws.write(output);
+          resolve(null);
         });
+      });
     },
 
     /**