@qooxdoo/framework 7.0.0-beta.9 → 7.1.1

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

@@ -0,0 +1,185 @@
+/* ************************************************************************
+ *
+ *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
+ *    toolchain
+ *
+ *    https://github.com/qooxdoo/qooxdoo-compiler
+ *
+ *    Copyright:
+ *      2022 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)
+ *
+ * ************************************************************************/
+
+const fs = qx.tool.utils.Promisify.fs;
+const path = require("upath");
+
+/**
+ *
+ */
+qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
+  extend: qx.tool.compiler.targets.meta.AbstractJavascriptMeta,
+
+  construct(appMeta) {
+    super(appMeta, `${appMeta.getApplicationRoot()}commonjs-browserify.js`);
+    this.__appMeta = appMeta;
+    this.setNeedsWriteToDisk(true);
+  },
+
+  members: {
+    __appMeta : null,
+
+    /**
+     * @Override
+     */
+    async writeSourceCodeToStream(ws) {
+      let hasCommonjsModules = false;
+      let commonjsModules = new Set();
+      let references = {};
+      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
+        // 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;
+              });
+          }
+        }
+      }
+
+      // 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
+        );
+      }
+
+      await new Promise(resolve => {
+        ws.write("\n", resolve);
+      });
+    },
+
+    async __browserify(commonjsModules, references, localModules, ws) {
+      const babelify = require("babelify");
+      const preset = require("@babel/preset-env");
+      const browserify = require("browserify");
+      const builtins = require("browserify/lib/builtins.js");
+
+      // For some reason, `process` is not require()able, but `_process` is.
+      // Make them equivalent.
+      builtins.process = builtins._process;
+
+      // 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}`);
+                  });
+              });
+            } catch(e) {
+              message.push(`    <compile.json:application.localModules'>`);
+            }
+
+            qx.tool.compiler.Console.error(message.join("\n"));
+          });
+
+          // 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
+          });
+          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);
+          });
+        });
+    },
+
+    /**
+     * @Override
+     */
+    async getSourceMap() {
+      return null;
+    }
+  }
+});

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

@@ -96,22 +96,8 @@ qx.Class.define("qx.tool.compiler.targets.meta.Uglify", {
         });
         return ss.toString();
       })();
-      await qx.tool.utils.files.Utils.safeUnlink(outJsFilename + ".unminified");
-      await qx.tool.utils.files.Utils.safeRename(
-        outJsFilename,
-        outJsFilename + ".unminified"
-      );
 
       let inSourceMap = await this.__jsMeta.getSourceMap();
-      await qx.tool.utils.files.Utils.safeUnlink(
-        outJsFilename + ".unminified.map"
-      );
-
-      await qx.tool.utils.files.Utils.safeRename(
-        outJsFilename + ".map",
-        outJsFilename + ".unminified.map"
-      );
-
       this.fireDataEvent("minifyingApplication", {
         application: application,
         filename: baseJsFilename
@@ -138,18 +124,11 @@ qx.Class.define("qx.tool.compiler.targets.meta.Uglify", {
         throw new Error("UglifyJS failed to minimise: " + (err.message || err));
       }
       await fs.writeFileAsync(outJsFilename, result.code, { encoding: "utf8" });
-      if (!this._appMeta.getTarget().isSaveUnminified()) {
-        await qx.tool.utils.files.Utils.safeUnlink(
-          outJsFilename + ".unminified"
-        );
-
-        await qx.tool.utils.files.Utils.safeUnlink(
-          outJsFilename + ".unminified.map"
-        );
+      await fs.writeFileAsync(outJsFilename + ".map", result.map, { encoding: "utf8"  });
+      if (this._appMeta.getTarget().isSaveUnminified()) {
+        await fs.writeFileAsync(outJsFilename + ".unminified", inSourceCode, { encoding: "utf8" });
+        await fs.writeFileAsync(outJsFilename + ".unminified.map", JSON.stringify(inSourceMap, null, 2), { encoding: "utf8" });
       }
-      await fs.writeFileAsync(outJsFilename + ".map", result.map, {
-        encoding: "utf8"
-      });
 
       this.fireDataEvent("minifiedApplication", {
         application: application,

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

@@ -23,7 +23,7 @@
  * *********************************************************************** */
 
 const Ajv = require("ajv");
-const betterAjvErrors = require("better-ajv-errors");
+const betterAjvErrors = require("better-ajv-errors").default;
 const fs = qx.tool.utils.Promisify.fs;
 
 qx.Class.define("qx.tool.utils.Json", {

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

@@ -210,7 +210,10 @@ qx.Class.define("qx.ui.form.AbstractSelectBox", {
      * Hides the list popup.
      */
     close() {
-      this.getChildControl("popup").hide();
+      var popup = this.getChildControl("popup", true);
+      if (popup && popup.isVisible()) {
+        popup.hide();
+      }
     },
 
     /**

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

@@ -312,7 +312,10 @@ qx.Class.define("qx.ui.form.DateField", {
      * Hides the date chooser popup.
      */
     close() {
-      this.getChildControl("popup").hide();
+      var popup = this.getChildControl("popup", true);
+      if (popup && popup.isVisible()) {
+        popup.hide();
+      }
     },
 
     /**

package/source/class/qx/ui/progressive/renderer/table/Row.js

@@ -284,7 +284,8 @@ qx.Class.define("qx.ui.progressive.renderer.table.Row", {
           element: element,
           dataIndex: i,
           cellData: data[i],
-          height: height
+          height: height,
+          rowRenderer: this     // useful, e.g., for getting default row height
         };
 
         // Render this cell

package/source/class/qx/ui/progressive/renderer/table/cell/Boolean.js

@@ -28,13 +28,13 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Boolean", {
   construct() {
     super();
 
-    this.__resolveImages();
+    this._resolveImages();
 
     // dynamic theme switch
     if (qx.core.Environment.get("qx.dyntheme")) {
       qx.theme.manager.Meta.getInstance().addListener(
         "changeTheme",
-        this.__resolveImages,
+        this._resolveImages,
         this
       );
     }
@@ -53,19 +53,13 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Boolean", {
   },
 
   members: {
-    __iconUrlTrue: null,
-    __iconUrlFalse: null,
-    __numericAllowed: null,
-    __conditions: null,
-    __defaultTextAlign: null,
-    __defaultColor: null,
-    __defaultFontStyle: null,
-    __defaultFontWeight: null,
+    _iconUrlTrue: null,
+    _iconUrlFalse: null,
 
     /**
      * Resolve the boolean images using the alias and resource manager.
      */
-    __resolveImages() {
+    _resolveImages() {
       var aliasManager = qx.util.AliasManager.getInstance();
       var resourceManager = qx.util.ResourceManager.getInstance();
       var boolTrueImg = aliasManager.resolve(
@@ -76,25 +70,29 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Boolean", {
         "decoration/table/boolean-false.png"
       );
 
-      this.__iconUrlTrue = resourceManager.toUri(boolTrueImg);
-      this.__iconUrlFalse = resourceManager.toUri(boolFalseImg);
+      this._iconUrlTrue = resourceManager.toUri(boolTrueImg);
+      this._iconUrlFalse = resourceManager.toUri(boolFalseImg);
     },
 
-    // overridden
-    _identifyImage(cellInfo) {
-      var imageData = {
+    _getDefaultImageData(cellInfo) {
+      return {
         imageWidth: 11,
         imageHeight: 11
       };
+    },
+
+    // overridden
+    _identifyImage(cellInfo) {
+      var imageData = this._getDefaultImageData(cellInfo);
 
       switch (cellInfo.cellData) {
         case true:
-          imageData.url = this.__iconUrlTrue;
+          imageData.url = this._iconUrlTrue;
           imageData.extras = "celldata='1' ";
           break;
 
         case false:
-          imageData.url = this.__iconUrlFalse;
+          imageData.url = this._iconUrlFalse;
           imageData.extras = "celldata='0' ";
           break;
 
@@ -115,7 +113,7 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Boolean", {
 
         if (
           qx.core.Environment.get("css.alphaimageloaderneeded") &&
-          /\.png$/i.test(this.__iconUrlTrue)
+          /\.png$/i.test(this._iconUrlTrue)
         ) {
           imageData.extras +=
             "  this.src='" +
@@ -124,18 +122,18 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Boolean", {
             "  var loader = 'DXImageTransform.Microsoft.AlphaImageLoader'; " +
             "  var filters = this.filters.item(loader); " +
             "  filters.src='" +
-            this.__iconUrlTrue +
+            this._iconUrlTrue +
             "'; " +
             "  filters.sizingMethod = 'scale'; ";
         } else {
-          imageData.extras += "  this.src='" + this.__iconUrlTrue + "'; ";
+          imageData.extras += "  this.src='" + this._iconUrlTrue + "'; ";
         }
 
         imageData.extras += "  node.nodeValue='1'; " + "} " + "else " + "{";
 
         if (
           qx.core.Environment.get("css.alphaimageloaderneeded") &&
-          /\.png$/i.test(this.__iconUrlFalse)
+          /\.png$/i.test(this._iconUrlFalse)
         ) {
           imageData.extras +=
             "  this.src='" +
@@ -144,11 +142,11 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Boolean", {
             "  var loader = 'DXImageTransform.Microsoft.AlphaImageLoader'; " +
             "  var filters = this.filters.item(loader); " +
             "  filters.src='" +
-            this.__iconUrlFalse +
+            this._iconUrlFalse +
             "'; " +
             "  filters.sizingMethod = 'scale'; ";
         } else {
-          imageData.extras += "  this.src='" + this.__iconUrlFalse + "'; ";
+          imageData.extras += "  this.src='" + this._iconUrlFalse + "'; ";
         }
 
         imageData.extras += "  node.nodeValue='0'; " + "}";
@@ -176,13 +174,13 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Boolean", {
   },
 
   destruct() {
-    this.__iconUrlTrue = this.__iconUrlFalse = null;
+    this._iconUrlTrue = this._iconUrlFalse = null;
 
     // remove dynamic theme listener
     if (qx.core.Environment.get("qx.dyntheme")) {
       qx.theme.manager.Meta.getInstance().removeListener(
         "changeTheme",
-        this.__resolveImages,
+        this._resolveImages,
         this
       );
     }

package/source/class/qx/ui/progressive/renderer/table/cell/Icon.js

@@ -21,6 +21,8 @@
 
 /**
  * Abstract Icon cell renderer.
+ *
+ * @asset(qx/static/blank.gif)
  */
 qx.Class.define("qx.ui.progressive.renderer.table.cell.Icon", {
   type: "abstract",
@@ -34,14 +36,14 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Icon", {
     var resourceManager = qx.util.ResourceManager.getInstance();
     var blankImg = aliasManager.resolve("qx/static/blank.gif");
 
-    this.__imageBlank = resourceManager.toUri(blankImg);
+    this._imageBlank = resourceManager.toUri(blankImg);
   },
 
   members: {
     /**
      * A blank image for use as a spacer in place of another image
      */
-    __imageBlank: null,
+    _imageBlank: null,
 
     /**
      * Retrieve the URI for a blank image
@@ -50,7 +52,7 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Icon", {
      *   The URI of the blank image.
      */
     getBlankImage() {
-      return this.__imageBlank;
+      return this._imageBlank;
     },
 
     /**
@@ -118,7 +120,7 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Icon", {
     // overridden
     _getContentHtml(cellInfo) {
       var html = [];
-      var imageData = this.__getImageData(cellInfo);
+      var imageData = this._getImageData(cellInfo);
 
       // Start the image tag
       html.push("<img ");
@@ -130,7 +132,7 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Icon", {
       ) {
         html.push(
           'src="',
-          this.__imageBlank,
+          this._imageBlank,
           '" style="filter:',
           "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='",
           imageData.url,
@@ -192,7 +194,7 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Icon", {
      * @return {Map}
      *   See {@link #_identifyImage}
      */
-    __getImageData(cellInfo) {
+    _getImageData(cellInfo) {
       // Query the subclass about image and tooltip
       var imageData = this._identifyImage(cellInfo);
 
@@ -206,7 +208,7 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Icon", {
 
       // If subclass gave null as url, replace with url to empty image
       if (imageData.url == null) {
-        imageData.url = this.__imageBlank;
+        imageData.url = this._imageBlank;
       }
 
       return imageData;

package/source/class/qx/ui/progressive/renderer/table/cell/Image.js

@@ -34,31 +34,34 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Image", {
   construct(width, height) {
     super();
 
-    if (width === undefined) {
-      this.__imageWidth = width;
+    if (width !== undefined) {
+      this._imageWidth = width;
     } else {
-      this.__imageWidth = 16;
+      this._imageWidth = 16;
     }
 
-    if (height === undefined) {
-      this.__imageHeight = height;
+    if (height !== undefined) {
+      this._imageHeight = height;
     } else {
-      this.__imageHeight = 16;
+      this._imageHeight = 16;
     }
   },
 
   members: {
-    __imageWidth: null,
-    __imageHeight: null,
+    _imageWidth: null,
+    _imageHeight: null,
 
-    // overridden
-    _identifyImage(cellInfo) {
-      var imageData = {
-        imageWidth: this.__imageWidth,
-        imageHeight: this.__imageHeight
+    _getDefaultImageData(cellInfo) {
+      return {
+        imageWidth: this._imageWidth,
+        imageHeight: this._imageHeight
       };
+    },
 
+    // overridden
+    _identifyImage(cellInfo) {
       var height;
+      var imageData = this._getDefaultImageData(cellInfo);
 
       // String data is the unresolved url for the image.
       // Object data is a map containing the url, tooltip, and a height

package/source/class/qx/ui/table/Table.js

@@ -2193,7 +2193,6 @@ qx.Class.define("qx.ui.table.Table", {
       );
     }
 
-    this._cleanUpMetaColumns(0);
     this.getTableColumnModel().dispose();
     this._disposeObjects(
       "__selectionManager",

package/source/class/qx/ui/table/model/Abstract.js

@@ -66,11 +66,22 @@ qx.Class.define("qx.ui.table.model.Abstract", {
     this.__columnIndexMap = {};
   },
 
+  statics: {
+    /**
+     * Member to control if a table should throw an error when you try to change the
+     * data model data whilst there is an incomplete edit. It could possibly break
+     * current implementations so only introduce the change from QX v8.
+     * Ref: https://github.com/qooxdoo/qooxdoo/pull/10377#discussion_r818697343
+     */
+    THROW_ON_MODEL_CHANGE_DURING_EDIT: parseInt(qx.core.Environment.get("qx.version"), 10) >= 8
+  },
+
   members: {
     __columnIdArr: null,
     __columnNameArr: null,
     __columnIndexMap: null,
     __internalChange: null,
+    __table: null,
 
     /**
      * Initialize the table model <--> table interaction. The table model is
@@ -84,7 +95,17 @@ qx.Class.define("qx.ui.table.model.Abstract", {
      *   The table to which this model is attached
      */
     init(table) {
-      // default implementation has nothing to do
+      // store a reference back to the table
+      this.__table = table;
+    },
+
+    /**
+     *
+     *
+     * @returns table {qx.ui.table.Table}
+     */
+    getTable() {
+      return this.__table;
     },
 
     /**
@@ -292,6 +313,15 @@ qx.Class.define("qx.ui.table.model.Abstract", {
       }
 
       this.setColumnNamesByIndex(columnNameArr);
+    },
+
+    _checkEditing() {
+      if (!qx.ui.table.model.Abstract.THROW_ON_MODEL_CHANGE_DURING_EDIT) {
+        return;
+      }
+      if (this.getTable() && this.getTable().isEditing()) {
+        throw new Error("A cell is currently being edited. Commit or cancel the edit before setting the table data");
+      }
     }
   },
 

package/source/class/qx/ui/table/model/Remote.js

@@ -548,6 +548,7 @@ qx.Class.define("qx.ui.table.model.Remote", {
      * @param rowIndex {Integer} the index of the row to remove.
      */
     removeRow(rowIndex) {
+      this._checkEditing();
       if (this.getClearCacheOnRemove()) {
         this.clearCache();
 

package/source/class/qx/ui/table/model/Simple.js

@@ -531,6 +531,7 @@ qx.Class.define("qx.ui.table.model.Simple", {
      * @param clearSorting {Boolean ? true} Whether to clear the sort state.
      */
     setData(rowArr, clearSorting) {
+      this._checkEditing();
       this._rowArr = rowArr;
 
       // Inform the listeners
@@ -650,6 +651,7 @@ qx.Class.define("qx.ui.table.model.Simple", {
      * @param clearSorting {Boolean ? true} Whether to clear the sort state.
      */
     setRows(rowArr, startIndex, clearSorting) {
+      this._checkEditing();
       if (startIndex == null) {
         startIndex = 0;
       }
@@ -708,9 +710,14 @@ qx.Class.define("qx.ui.table.model.Simple", {
      * @param clearSorting {Boolean ? true} Whether to clear the sort state.
      */
     removeRows(startIndex, howMany, clearSorting) {
-      this._rowArr.splice(startIndex, howMany);
-
-      // Inform the listeners
+      this._checkEditing();
+      // In the case of `removeRows`, specifically, we must create the
+      // listeners' event data before actually removing the rows from
+      // the row data, so that the `lastRow` calculation is correct.
+      // If we do the delete operation first, as is done in other
+      // methods, the final rows of the table can escape being
+      // updated, thus leaving hanging old data on the rendered table.
+      // This reordering (deleting after creating event data) fixes #10365.
       var data = {
         firstRow: startIndex,
         lastRow: this._rowArr.length - 1,
@@ -720,7 +727,11 @@ qx.Class.define("qx.ui.table.model.Simple", {
         removeCount: howMany
       };
 
+      this._rowArr.splice(startIndex, howMany);
+
+      // Inform the listeners
       this.fireDataEvent("dataChanged", data);
+
       if (clearSorting !== false) {
         this.clearSorting();
       }

package/source/class/qx/ui/table/pane/Pane.js

@@ -632,7 +632,9 @@ qx.Class.define("qx.ui.table.pane.Pane", {
       var offset = row - firstRow;
       var rowElem = tableChildNodes[offset];
 
-      if (row > modelRowCount || typeof rowElem == "undefined") {
+      // `row` can be too big if rows were deleted. In that case, we
+      // can't update the current single row
+      if (row >= modelRowCount || typeof rowElem == "undefined") {
         this._updateAllRows();
         return;
       }