@qooxdoo/framework 8.0.0-beta.1 → 8.0.0-beta.3

package/lib/resource/qx/tool/compiler/cli/templates/class/default.tmpl.js

@@ -12,9 +12,8 @@ qx.Class.define("${classname}",
   /**
    * Constructor
    */
-  construct : function() {
-    // If you want to call the parent constructor, use
-    // this.base(arguments);
+  construct() {
+    super();
   },
 
   /**
@@ -62,7 +61,7 @@ qx.Class.define("${classname}",
      * @param {number} bar The bar parameter
      * @return The result of the method.
      */
-    myMethod : function(foo, bar) {
+    myMethod(foo, bar) {
       //
     },
 
@@ -72,7 +71,7 @@ qx.Class.define("${classname}",
      * @param {string} value new value
      * @param {string} old the old value
      */
-    _applyFoo : function(value, old) {
+    _applyFoo(value, old) {
       //
     }
 
@@ -81,7 +80,7 @@ qx.Class.define("${classname}",
   /**
    * Use for disposing objects created by class instances
    */
-  destruct : function() {
+  destruct() {
     //
-  }  
+  }
 });

package/lib/resource/qx/tool/compiler/cli/templates/class/singleton.tmpl.js

@@ -14,9 +14,8 @@ qx.Class.define("${classname}",
   /**
    * Create a the singleton
    */
-  construct : function() {
-    // If you want to call the parent constructor, use
-    // this.base(arguments);
+  construct() {
+    super();
   },
 
   /**
@@ -55,15 +54,15 @@ qx.Class.define("${classname}",
      * @param {Number} bar The bar parameter
      * @return {void} The result of the method.
      */
-    myMethod : function(foo, bar)
+    myMethod(foo, bar)
     {
       //
     },
 
     /** Applies the foo property */
-    _applyFoo : function(value, old)
+    _applyFoo(value, old)
     {
       //
-    } 
+    }
   }
 });

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

@@ -320,7 +320,7 @@
           },
           "browserifyOptions": {
             "type": "object",
-            "description": "Options given to browserify. For details see here: <https://github.com/browserify/browserify#usage>. They can be overridden per target."
+            "description": "Options passed to esbuild when bundling CommonJS modules. See https://esbuild.github.io/api/ for available options. They can be overridden per target. Browserify-specific options (noParse, ignoreMissing, insertGlobals, detectGlobals, builtins) are not supported and will be ignored with a warning."
           },
           "parts": {
             "$ref": "#/properties/parts"
@@ -465,9 +465,13 @@
     "browserify": {
       "type": "object",
       "properties": {
+        "polyfillNode": {
+          "type": "boolean",
+          "description": "Whether to include the esbuild-plugin-polyfill-node plugin, which provides browser shims for Node.js built-ins (process, buffer, etc.). Defaults to true. Set to false if your packages do not use Node.js built-ins and you want a smaller bundle."
+        },
         "options": {
           "type": "object",
-          "description": "Options given to browserify. For details see here: <https://github.com/browserify/browserify#usage>. They can be overridden per target."
+          "description": "Options passed to esbuild when bundling CommonJS modules. See https://esbuild.github.io/api/ for available options. They can be overridden per target. Browserify-specific options (noParse, ignoreMissing, insertGlobals, detectGlobals, builtins) are not supported and will be ignored with a warning."
         }
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qooxdoo/framework",
-  "version": "8.0.0-beta.1",
+  "version": "8.0.0-beta.3",
   "description": "The JS Framework for Coders",
   "author": "The qooxdoo project",
   "keywords": [
@@ -78,9 +78,7 @@
     "ajv": "^8.12.0",
     "app-module-path": "^2.2.0",
     "async": "^2.6.3",
-    "babelify": "^10.0.0",
     "better-ajv-errors": "^1.2.0",
-    "browserify": "^17.0.1",
     "chokidar": "^3.5.3",
     "cli-progress": "^3.12.0",
     "columnify": "^1.6.0",
@@ -88,32 +86,32 @@
     "core-js-bundle": "^3.33.1",
     "dot": "^1.1.3",
     "es6-promise-pool": "^2.5.0",
+    "esbuild": "^0.27.3",
+    "esbuild-plugin-polyfill-node": "^0.3.0",
     "eslint": "^9.15.0",
     "eslint-formatter-codeframe": "^7.32.1",
     "eslint-plugin-jsdoc": "^50.5.0",
     "express": "^5.1.0",
     "fontkit": "^2.0.2",
     "get-value": "^3.0.1",
-    "glob": "^11.0.3",
+    "glob": "^13.0.6",
     "image-size": "^0.8.3",
-    "inquirer": "^7.3.3",
+    "inquirer": "^13.2.5",
     "jsdoctypeparser": "^9.0.0",
     "json-stable-stringify": "^1.0.2",
     "jstransformer-dot": "^0.1.2",
     "metalsmith": "^2.6.1",
-    "node-fetch": "^3.3.2",
     "object-hash": "^2.1.1",
     "prettier": "^2.5.1",
     "ps-tree": "^1.2.0",
     "regenerator-runtime": "^0.14.1",
-    "replace-in-file": "^8.3.0",
-    "rimraf": "^6.0.1",
+    "replace-in-file": "^8.4.0",
+    "rimraf": "^6.1.3",
     "sass": "1.69.4",
     "semver": "^7.5.4",
     "set-value": "^4.1.0",
     "showdown": "^1.9.1",
     "source-map-js": "^1.0.2",
-    "tap-colorize": "^1.2.0",
     "terser": "^5.22.0",
     "tmp": "^0.2.5",
     "unset-value": "^1.0.0",
@@ -123,9 +121,9 @@
     "yauzl-promise": "^4.0.0"
   },
   "devDependencies": {
+    "baseline-browser-mapping": "^2.10.0",
     "dirsum": "^0.1.1",
     "source-map-support": "^0.5.21",
-    "tape": "^5.9.0",
     "tree-kill": "^1.2.2"
   },
   "engine": "node >= 20",

package/source/class/qx/Class.js

@@ -75,7 +75,6 @@ qx.Bootstrap.define("qx.Class", {
       event: ["string", "object"], // String or null
       check: null, // Array, String, Function
       transform: null, // String, Function
-      async: "boolean", // Boolean
       deferredInit: "boolean", // Boolean
       validate: ["string", "function"], // String, Function
       isEqual: ["string", "function"], // String, Function
@@ -679,14 +678,14 @@ qx.Bootstrap.define("qx.Class", {
                 continue;
               }
               let def = property.getDefinition();
-              let excluded = property.getClass().classname && excludeAutoApply.find(match => property.getClass().classname.match(match));
+              let modernFeatures = def && (def.autoApply || def.initFunction);
+              let excluded = property.getClass().classname ? excludeAutoApply.find(match => property.getClass().classname.match(match)) : !modernFeatures;
               if (
                 !property.isPseudoProperty() &&
                 def.autoApply !== false &&
-                property.getClass().classname &&
                 property.hasInitValue() &&
                 !property.getPropertyState(this).initMethodCalled &&
-                ((initDuringConstruct === true && !excluded) || def.autoApply || def.initFunction)
+                ((initDuringConstruct === true && !excluded) || modernFeatures)
               ) {
                 property.init(this);
               }
@@ -803,10 +802,18 @@ qx.Bootstrap.define("qx.Class", {
      * @param members {Map}
      *   The map of members to attach
      *
+     * @param events {Map?}
+     *   The map of events declared by the mixin (used for member validation)
+     *
      * @param patch {Boolean ? false}
      *   Enable patching
+     *
+     * @param mixin {qx.Mixin?}
+     *   The mixin being applied, if any. Used to store per-mixin-per-class base
+     *   method references so that super calls resolve correctly when the same
+     *   mixin is included in multiple classes.
      */
-    addMembers(clazz, members, events, patch) {
+    addMembers(clazz, members, events, patch, mixin) {
       let proto = clazz.prototype;
       let classOwnMembers = {}; // Track class members to restore after mixin addition
 
@@ -906,6 +913,18 @@ qx.Bootstrap.define("qx.Class", {
               member.self = clazz;
             }
             member.base = clazz.prototype[key];
+            // Fix: per-mixin-per-class storage to prevent clobbering when the same mixin
+            // is included/patched into multiple classes, or when multiple mixins override
+            // the same method in the same class.
+            if (mixin) {
+              if (!clazz.$mixinBases) {
+                clazz.$mixinBases = new Map();
+              }
+              if (!clazz.$mixinBases.has(mixin)) {
+                clazz.$mixinBases.set(mixin, {});
+              }
+              clazz.$mixinBases.get(mixin)[key] = clazz.prototype[key];
+            }
           }
 
           // Create the storage for this member
@@ -1127,7 +1146,7 @@ qx.Bootstrap.define("qx.Class", {
 
         // Attach members
         if (entry.$$members) {
-          qx.Class.addMembers(clazz, entry.$$members, entry.$$events, patch);
+          qx.Class.addMembers(clazz, entry.$$members, entry.$$events, patch, entry);
         }
 
         // Attach properties
@@ -1875,7 +1894,7 @@ qx.Bootstrap.define("qx.Class", {
      */
     isPropertyInitialized(object, name) {
       let property = object.constructor.prototype.$$allProperties[name];
-      return !!(property && property.isInitialized(object));
+      return !!(property && property.hasLocalValue(object));
     },
 
     /**

package/source/class/qx/Mixin.js

@@ -348,7 +348,7 @@ qx.Bootstrap.define("qx.Mixin", {
           //  implementation is the first mixin's method
           for (var i = mixedInIndex - 1; i > -1; i--) {
             var peerMixin = mixedInAt.$$flatIncludes[i];
-            if (peerMixin.$$members[methodName]) {
+            if (peerMixin.$$members && peerMixin.$$members[methodName]) {
               fn = peerMixin.$$members[methodName];
               break;
             }
@@ -356,12 +356,21 @@ qx.Bootstrap.define("qx.Mixin", {
 
           // Try looking in the class itself
           if (!fn && mixedInAt.prototype[methodName]) {
-            fn = mixedInAt.prototype[methodName];
-            for (let i = 0; i < mixedInAt.$$flatIncludes.length; i++) {
-              if (!mixedInAt.$$flatIncludes[i].$$members[methodName]) {
-                continue;
+            // Use per-mixin-per-class storage to avoid clobbering when the same mixin
+            // is included in multiple classes or when multiple mixins override the same method
+            if (mixedInAt.$mixinBases && mixedInAt.$mixinBases.has(mixin)) {
+              fn = mixedInAt.$mixinBases.get(mixin)[methodName] ?? null;
+            }
+            if (!fn) {
+              // Fallback: traverse .base chain (works for patch=true since each patch
+              // creates a unique wrapper function with its own .base property)
+              fn = mixedInAt.prototype[methodName];
+              for (let i = 0; i < mixedInAt.$$flatIncludes.length; i++) {
+                if (!mixedInAt.$$flatIncludes[i].$$members || !mixedInAt.$$flatIncludes[i].$$members[methodName]) {
+                  continue;
+                }
+                fn = fn.base;
               }
-              fn = fn.base;
             }
           }
 

package/source/class/qx/core/BaseInit.js

@@ -71,25 +71,26 @@ qx.Class.define("qx.core.BaseInit", {
       var clazz = qx.Class.getByName(app);
 
       if (clazz) {
-        (async () => {
-          this.__application = new clazz();
-          var start = new Date();
-          await this.__application.main();
+        this.__application = new clazz();
+        let mainResult = this.__application.main();
+
+        const cb = () => {
           if (qx.core.Environment.get("qx.debug.startupTimings")) {
-            qx.log.Logger.debug(
-              this,
-              "Main runtime: " + (new Date() - start) + "ms"
-            );
+            qx.log.Logger.debug(this, "Main runtime: " + (new Date() - start) + "ms");
           }
           var start = new Date();
           this.__application.finalize();
           if (qx.core.Environment.get("qx.debug.startupTimings")) {
-            qx.log.Logger.debug(
-              this,
-              "Finalize runtime: " + (new Date() - start) + "ms"
-            );
+            qx.log.Logger.debug(this, "Finalize runtime: " + (new Date() - start) + "ms");
           }
-        })();
+        };
+
+        //We cannot use await here because this code may be called in engines which don't support async, such as Rhino
+        if (qx.lang.Type.isPromise(mainResult)) {
+          mainResult.then(cb);
+        } else {
+          cb(mainResult);
+        }        
         qx.event.handler.Application.onAppInstanceInitialized();
       } else {
         qx.log.Logger.warn("Missing application class: " + app);

package/source/class/qx/core/MObjectId.js

@@ -399,6 +399,22 @@ qx.Mixin.define("qx.core.MObjectId", {
      */
     getOwnedQxObjects() {
       return this.__ownedQxObjects ? Object.values(this.__ownedQxObjects) : [];
+    },
+
+    /**
+     * @param {string}
+     * @returns {boolean} Whether this object has an owned object with the given ID that has been created
+     */
+    hasOwnedQxObject(id) {
+      return !!(this.__ownedQxObjects && this.__ownedQxObjects[id]);
+    },
+
+    /**
+     * 
+     * @returns {Object} An object mapping IDs to owned objects. Do not modify this object directly.
+     */
+    getAllQxObjectsById() {
+      return this.__ownedQxObjects ?? {};
     }
   }
 });