@qooxdoo/framework 7.0.0-beta.8 → 7.0.0-beta.9

package/npm-shrinkwrap.json

@@ -531,11 +531,18 @@
       }
     },
     "@babel/plugin-syntax-jsx": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz",
-      "integrity": "sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz",
+      "integrity": "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "version": "7.16.7",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+          "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="
+        }
       }
     },
     "@babel/plugin-syntax-logical-assignment-operators": {
@@ -5151,9 +5158,9 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
     },
     "node-fetch": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
-      "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "requires": {
         "whatwg-url": "^5.0.0"
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qooxdoo/framework",
-  "version": "7.0.0-beta.8",
+  "version": "7.0.0-beta.9",
   "description": "The JS Framework for Coders",
   "author": "The qooxdoo project",
   "keywords": [
@@ -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",
@@ -96,7 +97,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/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,180 @@ 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();
+
     }
-  }
+
+
+   }
 });

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
         }

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

@@ -1828,10 +1828,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 +1836,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(