@qooxdoo/framework 7.0.0-beta.8 → 7.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qooxdoo/framework",
-  "version": "7.0.0-beta.8",
+  "version": "7.1.0",
   "description": "The JS Framework for Coders",
   "author": "The qooxdoo project",
   "keywords": [
@@ -36,7 +36,7 @@
   "scripts": {
     "devtools": "node source/resource/qx/tool/bin/build-devtools",
     "website": "node source/resource/qx/tool/bin/build-website",
-    "pretest": "node bootstrap-compiler --target build",
+    "pretest": "node ./bootstrap-compiler",
     "test": "node ./bin/build/qx test --colorize=false --quiet",
     "prepack": "node ./bootstrap/qx deploy --clean"
   },
@@ -57,6 +57,7 @@
     "@babel/parser": "^7.12.11",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
     "@babel/plugin-proposal-optional-chaining": "^7.12.7",
+    "@babel/plugin-syntax-jsx": "^7.16.7",
     "@babel/plugin-transform-block-scoping": "^7.12.12",
     "@babel/plugin-transform-react-jsx": "^7.12.12",
     "@babel/preset-env": "^7.12.11",
@@ -73,6 +74,7 @@
     "app-module-path": "^2.2.0",
     "async": "^2.6.3",
     "better-ajv-errors": "^1.1.1",
+    "browserify": "^17.0.0",
     "chokidar": "^3.5.1",
     "cldr": "^7.1.1",
     "columnify": "^1.5.4",
@@ -96,7 +98,7 @@
     "metalsmith": "^2.3.0",
     "metalsmith-layouts": "^2.3.1",
     "metalsmith-markdown": "^1.3.0",
-    "node-fetch": "^2.6.0",
+    "node-fetch": "^2.6.7",
     "object-hash": "^2.1.1",
     "prettier": "^2.5.1",
     "ps-tree": "^1.2.0",

package/source/class/qx/Class.js

@@ -1649,34 +1649,6 @@ qx.Bootstrap.define("qx.Class", {
       }
     },
 
-    /**
-     * Wraps a member function of a mixin, which is included using "patch". This
-     * allows "base" calls in the mixin member function.
-     *
-     * @param member {Function} The mixin method to wrap
-     * @param base {Function} The overwritten method
-     * @return {Function} the wrapped mixin member
-     */
-    __mixinMemberWrapper(member, base) {
-      if (qx.core.Environment.get("qx.compiler")) {
-        throw new Error(
-          "This function should not be used except with code compiled by the generator (ie python toolchain)"
-        );
-      } else {
-        if (base) {
-          return function () {
-            var oldBase = member.base;
-            member.base = base;
-            var retval = member.apply(this, arguments);
-            member.base = oldBase;
-            return retval;
-          };
-        } else {
-          return member;
-        }
-      }
-    },
-
     /**
      * Add a single interface to a class
      *

package/source/class/qx/Mixin.js

@@ -370,6 +370,12 @@ qx.Bootstrap.define("qx.Mixin", {
           // Try looking in the class itself
           if (!fn && mixedInAt.prototype[methodName]) {
             fn = mixedInAt.prototype[methodName].base;
+            // if fn.self is set fn is an overloaded mixin method from
+            // another mixin. In this case fn.base contains the original
+            // class method.
+            if (fn && fn.self) {
+              fn = fn.base;
+            }
           }
           // Try looking in the superclass
           if (!fn && mixedInAt.superclass) {

package/source/class/qx/data/Array.js

@@ -1017,7 +1017,7 @@ qx.Class.define("qx.data.Array", {
      *   <li><code>index</code>: the index of the current item</li>
      *   <li><code>array</code>: The native array instance, NOT the data array instance.</li>
      * @param self {var?undefined} The context of the callback.
-     * @return {Boolean} <code>true</code>, if any element passed the test function.
+     * @return {var | undefined} The found item.
      */
     find(callback, self) {
       return this.__array.find(callback, self);

package/source/class/qx/test/Mixin.js

@@ -402,6 +402,211 @@ qx.Class.define("qx.test.Mixin", {
       this.assertTrue(objBaseIncluded instanceof qx.test.testclasses.RootClass);
       this.assertTrue(objBaseBoth instanceof qx.test.testclasses.RootClass);
       this.assertTrue(objPatched instanceof qx.test.testclasses.RootClass);
+    },
+
+    testPatchDouble() {
+
+      qx.Class.define("qx.Patch_1", {
+        extend: qx.core.Object,
+
+        members: {
+          sayJuhu() {
+            return "Juhu 1";
+          }
+        }
+      });
+
+      qx.Class.define("qx.Patch_2", {
+        extend: qx.core.Object,
+
+        members: {
+          sayJuhu() {
+            return "Juhu 2";
+          }
+        }
+      });
+
+
+      qx.Mixin.define("qx.MPatch", {
+        members: {
+          sayJuhu() {
+            return super.sayJuhu() + " Mixin";
+          },
+        }
+      });
+      qx.Class.patch(qx.Patch_1, qx.MPatch);
+      qx.Class.patch(qx.Patch_2, qx.MPatch);
+
+      var o = new qx.Patch_1();
+      this.assertEquals("Juhu 1 Mixin", o.sayJuhu());
+      o.dispose();
+
+      var o = new qx.Patch_2();
+      this.assertEquals("Juhu 2 Mixin", o.sayJuhu());
+      o.dispose();
+
+    },
+
+    testPatchOverwrittenDerived() {
+      qx.Class.define("qx.Patch", {
+        extend: qx.core.Object,
+        members: {
+          sayJuhu() {
+            return "Juhu";
+          }
+        }
+      });
+
+      qx.Class.define("qx.PatchDerived", {
+        extend: qx.Patch,
+        members: {
+          sayJuhu() {
+            return super.sayJuhu() + " Derived";
+          }
+        }
+      });
+
+      qx.Mixin.define("qx.MPatch", {
+        members: {
+          sayJuhu() {
+            return super.sayJuhu() + " Mixin";
+          },
+        }
+      });
+      qx.Class.patch(qx.PatchDerived, qx.MPatch);
+
+      var o = new qx.PatchDerived();
+      this.assertEquals("Juhu Derived Mixin", o.sayJuhu());
+      o.dispose();
+    },
+
+    testPatchOverwrittenDerivedInBaseClass() {
+
+      qx.Mixin.define("qx.MPatch", {
+        members: {
+          sayJuhu() {
+            return super.sayJuhu() + " Mixin";
+          },
+        }
+      });
+
+      qx.Class.define("qx.Patch", {
+        extend: qx.core.Object,
+        members: {
+          sayJuhu() {
+            return "Juhu";
+          }
+        }
+      });
+
+      qx.Class.define("qx.PatchDerived", {
+        extend: qx.Patch,
+        members: {
+          sayJuhu() {
+            return super.sayJuhu() + " Derived";
+          }
+        }
+      });
+
+      qx.Class.patch(qx.Patch, qx.MPatch);
+
+      var o = new qx.Patch();
+      this.assertEquals("Juhu Mixin", o.sayJuhu());
+      o.dispose();
+
+      var o = new qx.PatchDerived();
+      this.assertEquals("Juhu Mixin Derived", o.sayJuhu());
+      o.dispose();
+
+    },
+
+    testPatchMultiOverwrittenDerived() {
+      qx.Class.define("qx.A", {
+        extend: qx.core.Object,
+        members: {
+          sayJuhu() {
+            return "A";
+          }
+        }
+      });
+      qx.Class.define("qx.B", {
+        extend: qx.A,
+        members: {
+          sayJuhu() {
+            return super() + " B";
+          }
+        }
+      });
+      qx.Class.define("qx.C", {
+        extend: qx.B,
+        members: {
+          sayJuhu() {
+            return super() + " C";
+          }
+        }
+      });
+      qx.Mixin.define("qx.MA", {
+        members: {
+          sayJuhu() {
+            return super.sayJuhu() + " MA";
+          },
+        }
+      });
+      qx.Mixin.define("qx.MB", {
+        members: {
+          sayJuhu() {
+            return super.sayJuhu() + " MB";
+          },
+        }
+      });
+      qx.Mixin.define("qx.MC", {
+        members: {
+          sayJuhu() {
+            return super.sayJuhu() + " MC";
+          },
+        }
+      });
+      qx.Class.patch(qx.A, qx.MA);
+      qx.Class.patch(qx.B, qx.MB);
+      qx.Class.patch(qx.C, qx.MC);
+
+      var o = new qx.C();
+      this.assertEquals("A MA B MB C MC", o.sayJuhu());
+      o.dispose();
+
+    },
+
+    testDoubleMixin() {
+      qx.Class.define("qx.D", {
+        extend: qx.core.Object,
+        members: {
+          sayJuhu() {
+            return "Double";
+          }
+        }
+      });
+      qx.Mixin.define("qx.MDA", {
+        members: {
+          sayJuhu() {
+            return super.sayJuhu() + " MA";
+          },
+        }
+      });
+      qx.Mixin.define("qx.MDB", {
+        members: {
+          sayJuhu() {
+            return super.sayJuhu() + " MB";
+          },
+        }
+      });
+      qx.Class.patch(qx.D, qx.MDA);
+      qx.Class.patch(qx.D, qx.MDB);
+
+      var o = new qx.D();
+      this.assertEquals("Double MA MB", o.sayJuhu());
+      o.dispose();
+
     }
-  }
+
+   }
 });

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

@@ -86,7 +86,10 @@ qx.Class.define("qx.tool.cli.api.AbstractApi", {
      */
     loadNpmModule(module) {
       const { execSync } = require("child_process");
-      let s = `npm install --no-save --no-package-lock ${module}`;
+      // 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-package-lock ${module}`;
       qx.tool.compiler.Console.info(s);
       execSync(s, {
         stdio: "inherit"

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

@@ -915,6 +915,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
        */
       let targetOutputPaths = {};
       let makers = [];
+
       targetConfigs.forEach(targetConfig => {
         if (!targetConfig.appConfigs) {
           qx.tool.compiler.Console.print(

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

@@ -112,13 +112,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 = {
-        plugins: ["@babel/plugin-syntax-jsx"],
-
+        cwd: helperFilePath,
+        plugins: [
+          "@babel/plugin-syntax-jsx"
+        ],
         parserOpts: {
           allowSuperOutsideMethod: true
         }
@@ -156,13 +157,23 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
         }
         if (report.errorCount > 0 || report.warningCount > 0) {
           let outputFormat = this.argv.format || "codeframe";
-
-          // If there are too many errors, the pretty formatter is appallingly slow
-          if (report.errorCount + report.warningCount > 150) {
-            outputFormat = "compact";
-          }
           const formatter = await linter.loadFormatter(outputFormat);
           const s = formatter.format(report);
+          // 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 (!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(
+                `Total errors and warnings exceed ${maxDefaultFormatErrorCount}, the report may take some time to generate.`
+              );
+            }
+          }
           if (this.argv.outputFile) {
             if (this.argv.verbose) {
               qx.tool.compiler.Console.info(

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

@@ -223,6 +223,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
     };
 
     this.__externals = [];
+    this.__commonjsModules = {};
 
     this.__taskQueueDrains = [];
     this.__taskQueue = async.queue(function (task, cb) {
@@ -281,6 +282,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
     __privates: null,
     __blockedPrivates: null,
     __externals: null,
+    __commonjsModules: null,
 
     _onTaskQueueDrain() {
       var cbs = this.__taskQueueDrain;
@@ -496,6 +498,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
       delete dbClassInfo.translations;
       delete dbClassInfo.markers;
       delete dbClassInfo.fatalCompileError;
+      delete dbClassInfo.commonjsModules;
       for (var key in this.__dbClassInfo) {
         dbClassInfo[key] = this.__dbClassInfo[key];
       }
@@ -667,6 +670,14 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
         dbClassInfo.fatalCompileError = true;
       }
 
+      // CommonJS modules
+      if (Object.keys(this.__commonjsModules).length > 0) {
+        dbClassInfo.commonjsModules = {};
+        for (let moduleName in this.__commonjsModules) {
+          dbClassInfo.commonjsModules[moduleName] = [ ...this.__commonjsModules[moduleName] ];
+        }
+      }
+
       return dbClassInfo;
     },
 
@@ -1648,6 +1659,52 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
               }
             }
 
+            // Are we looking at the Identifier `require`, and is it a
+            // function call (identified by having
+            // `path.node.arguments`? If so, we'll add the discovered
+            // module to the list of modules that must be browserified
+            // if the application is destined for the browser.
+            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")) {
+
+              // See if this is a reference to global `require` or
+              // something in the scope chain
+              for (scope = t.__scope; scope; scope = scope.parent) {
+                if (scope.vars["require"]) {
+                  // It's in the scope chain. Ignore it.
+                  break;
+                }
+              }
+              // Did we reach top level without finding it in a local 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)) {
+                  if (typeof arg.value != "string") {
+                    log.error(
+                      `${t.__className}: ` +
+                        "Only literal string arguments to require() are supported: " +
+                        arg.value
+                    );
+                  } 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);
+
+                    // Don't show "unresolved" error for `require` since the
+                    // browserified code defines it as a global
+                    t.addIgnore("require");
+                  }
+                }
+              }
+            }
+
             if (
               types.isMemberExpression(path.node.callee) ||
               (es6ClassDeclarations == 0 &&
@@ -1828,10 +1885,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
                       types.stringLiteral(t.__classMeta.functionName)
                     ]
                   );
-
                   expr = types.memberExpression(expr, types.identifier("call"));
-                  //expr = expandMemberExpression("qx.Mixin.baseClassMethod(this.constructor, " + t.__classMeta.className + ", \"" + t.__classMeta.functionName + "\").call");
-                  //expr = expandMemberExpression(t.__classMeta.className + ".$$members." + t.__classMeta.functionName + ".base.call");
                 } else if (t.__classMeta.functionName == "$$constructor") {
                   expr = expandMemberExpression(
                     t.__classMeta.superClass + ".constructor.call"
@@ -1839,9 +1893,10 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
                 } else if (t.__classMeta.className) {
                   expr = expandMemberExpression(
                     t.__classMeta.className +
-                      ".prototype." +
+                    ".superclass" +
+                    ".prototype." +
                       t.__classMeta.functionName +
-                      ".base.call"
+                      ".call"
                   );
                 } else {
                   expr = expandMemberExpression(
@@ -2508,6 +2563,19 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
       }
     },
 
+    /**
+     * Adds a CommonJS module to be browserified
+     *
+     * @param name {String} name of the module
+     */
+    addCommonjsModule(moduleName, className, linenum) {
+      if (! this.__commonjsModules[moduleName]) {
+        this.__commonjsModules[moduleName] = new Set();
+      }
+
+      this.__commonjsModules[moduleName].add(`${className}:${linenum}`);
+    },
+
     /**
      * Adds an ignored symbol
      * @param name {String} name of the symbol

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

@@ -0,0 +1,27 @@
+/* ************************************************************************
+ *
+ *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
+ *    toolchain
+ *
+ *    https://github.com/qooxdoo/qooxdoo-compiler
+ *
+ *    Copyright:
+ *      3033 Derrell Lipman
+ *
+ *    License:
+ *      MIT: https://opensource.org/licenses/MIT
+ *
+ *      This software is provided under the same licensing terms as Qooxdoo,
+ *      please see the LICENSE file in the Qooxdoo project's top-level directory
+ *      for details.
+ *
+ *    Authors:
+ *      * Derrell Lipman (@derrell)
+ *
+ * ************************************************************************/
+
+qx.Class.define("qx.tool.compiler.TargetError",
+{
+//  extend : qx.type.BaseError
+  extend : Error
+});

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

@@ -432,6 +432,12 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
         new qx.tool.compiler.targets.meta.PolyfillJs(appMeta)
       );
 
+      // Add browserified CommonJS modules, if any
+      if (appMeta.getEnvironmentValue("qx.compiler.applicationType") == "browser") {
+        bootPackage.addJavascriptMeta(
+          new qx.tool.compiler.targets.meta.Browserify(appMeta));
+      }
+
       /*
        * Assemble the Parts
        */

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

@@ -26,7 +26,7 @@ const sourceMap = require("source-map");
 
 /**
  * An AbstractJavascriptMeta provides an abstraction of some source code, and might be
- * compromised of a number of input files which are merged together as required.
+ * comprised of a number of input files which are merged together as required.
  *
  * This object could represent a file which already exists on disk (eg a transpiled
  * source file), or something that is generated on the fly (such as a index.js), or