@qooxdoo/framework 7.9.2 → 8.0.0-beta.1

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

@@ -14,14 +14,16 @@
    Authors:
      * John Spackman (john.spackman@zenesis.com, @johnspackman)
      * Christian Boulanger (info@bibliograph.org, @cboulanger)
+   
 
 ************************************************************************ */
-
+/**
+ *  @asset(qx/tool/website/*)
+ */
 const fs = qx.tool.utils.Promisify.fs;
 const process = require("process");
 const path = require("upath");
 
-const rimraf = require("rimraf");
 const dot = require("dot");
 require("jstransformer-dot");
 const metalsmith = require("metalsmith");
@@ -29,13 +31,6 @@ const layouts = require("@metalsmith/layouts");
 const markdown = require("@metalsmith/markdown");
 //const filenames = require("metalsmith-filenames");
 //var permalinks = require("metalsmith-permalinks");
-/**
- * @external(qx/tool/loadsass.js)
- * @ignore(loadSass)
- */
-/* global loadSass */
-const sass = loadSass();
-const chokidar = require("chokidar");
 
 // config
 dot.templateSettings.strip = false;
@@ -50,14 +45,11 @@ qx.Class.define("qx.tool.utils.Website", {
   construct(options = {}) {
     qx.core.Object.apply(this, arguments);
     const self = qx.tool.utils.Website;
-    let p = qx.util.ResourceManager.getInstance().toUri(
-      "qx/tool/website/.gitignore"
-    );
-
+    let p = qx.util.ResourceManager.getInstance().toUri("qx/tool/website/.gitignore");
     p = path.dirname(p);
-    this.initSourceDir(p);
-    this.initTargetDir(path.join(p, "build"));
-    this.initAppsNamespace(self.APP_NAMESPACE);
+    this.setSourceDir(p);
+    this.setTargetDir(path.join(p, "build"));
+    this.setAppsNamespace(self.APP_NAMESPACE);
 
     for (let key of Object.getOwnPropertyNames(options)) {
       this.set(key, options[key]);
@@ -67,162 +59,18 @@ qx.Class.define("qx.tool.utils.Website", {
   properties: {
     appsNamespace: {
       check: "String",
-      deferredInit: true
     },
 
     sourceDir: {
       check: "String",
-      deferredInit: true
     },
 
     targetDir: {
       check: "String",
-      deferredInit: true
     }
   },
 
   members: {
-    /** @type {chokidar} watcher */
-    __watcher: null,
-
-    /** @type {Boolean} whether the watcher is ready yet */
-    __watcherReady: false,
-
-    /** @type {Integer} setTimeout timer ID for debouncing builds */
-    __rebuildTimer: null,
-
-    /** @type {Boolean} Whether the build is currently taking place */
-    __rebuilding: false,
-
-    /** @type {Boolean} Whether a rebuild is needed ASAP */
-    __needsRebuild: false,
-
-    /**
-     * Starts the watcher for files in the source directory and compiles as needed
-     */
-    async startWatcher() {
-      await this.stopWatcher();
-      let sourceDir = await qx.tool.utils.files.Utils.correctCase(
-        this.getSourceDir()
-      );
-
-      this._watcher = chokidar.watch([sourceDir], {});
-      this._watcher.on("change", filename =>
-        this.__onFileChange("change", filename)
-      );
-
-      this._watcher.on("add", filename => this.__onFileChange("add", filename));
-      this._watcher.on("unlink", filename =>
-        this.__onFileChange("unlink", filename)
-      );
-
-      this._watcher.on("ready", async () => {
-        await this.triggerRebuild(true);
-        this.__watcherReady = true;
-      });
-      this._watcher.on("error", err => {
-        qx.tool.compiler.Console.print(
-          err.code == "ENOSPC"
-            ? "qx.tool.cli.watch.enospcError"
-            : "qx.tool.cli.watch.watchError",
-          err
-        );
-      });
-    },
-
-    /**
-     * Stops the watcher, if its running
-     */
-    async stopWatcher() {
-      if (this._watcher) {
-        await this._watcher.stop();
-        this._watcher = null;
-        this.__watcherReady = false;
-      }
-    },
-
-    /**
-     * Whether the watcher is running
-     *
-     * @return {Boolean} true if its running
-     */
-    isWatching() {
-      return Boolean(this._watcher);
-    },
-
-    /**
-     * Waits for the rebuild process to complete, if it is running
-     */
-    async waitForRebuildComplete() {
-      if (this.__rebuildPromise) {
-        await this.__rebuildPromise;
-      }
-    },
-
-    /**
-     * Rebuilds everything needed for the website
-     */
-    async rebuildAll() {
-      await this.generateSite();
-      await this.compileScss();
-    },
-
-    /**
-     * Event handler for changes to the source files
-     *
-     * @param type {String} type of change, one of "change", "add", "unlink"
-     * @param filename {String} the file that changed
-     */
-    __onFileChange(type, filename) {
-      if (this.__watcherReady) {
-        if (
-          !filename.toLowerCase().startsWith(this.getTargetDir().toLowerCase())
-        ) {
-          this.triggerRebuild(false);
-        }
-      }
-    },
-
-    /**
-     * Triggers a rebuild of the website, asynchronously.  Unless immediate is true,
-     * the rebuild will only happen after a short delay; but each time this is called,
-     * the delay is restarted.  This is to allow multiple files to be changed without
-     * swamping the processor with compilations.
-     *
-     * @param immediate {Boolean?} if true, rebuild starts ASAP
-     */
-    triggerRebuild(immediate) {
-      if (this.__rebuilding) {
-        this.__needsRebuild = true;
-        return;
-      }
-
-      let rebuilderImpl = async () => {
-        await this.rebuildAll();
-
-        if (this.__needsRebuild) {
-          this.__needsRebuild = false;
-          await rebuilderImpl();
-        }
-      };
-
-      let rebuilder = async () => {
-        this.__rebuilding = true;
-        try {
-          this.__rebuildPromise = rebuilderImpl();
-          await this.__rebuildPromise;
-          this.__rebuildPromise = null;
-        } finally {
-          this.__rebuilding = false;
-        }
-      };
-
-      if (this.__rebuildTimer) {
-        clearTimeout(this.__rebuildTimer);
-        this.__rebuildTimer = null;
-      }
-      this.__rebuildTimer = setTimeout(rebuilder, immediate ? 1 : 250);
-    },
 
     /**
      * Metalsmith Plugin that collates a list of pages that are to be included in the site navigation
@@ -336,7 +184,7 @@ qx.Class.define("qx.tool.utils.Website", {
             lang: "en",
             partials: {}
           })
-          .source(path.join(this.getSourceDir(), "src"))
+          .source("src")
           .destination(this.getTargetDir())
           .clean(true)
           .use(this.loadPartials.bind(this))
@@ -355,67 +203,6 @@ qx.Class.define("qx.tool.utils.Website", {
             }
           });
       });
-    },
-
-    /**
-     * Compiles SCSS into CSS
-     *
-     * @returns {Promise}
-     */
-    async compileScss() {
-      let result = await new Promise((resolve, reject) => {
-        sass.render(
-          {
-            file: path.join(this.getSourceDir(), "sass", "qooxdoo.scss"),
-            outFile: path.join(this.getTargetDir(), "qooxdoo.css")
-          },
-
-          function (err, result) {
-            if (err) {
-              reject(err);
-            } else {
-              resolve(result);
-            }
-          }
-        );
-      });
-      await fs.writeFileAsync(
-        path.join(this.getTargetDir(), "qooxdoo.css"),
-        result.css,
-        "utf8"
-      );
-    },
-
-    /**
-     * Build the development tool apps (APIViewer, Playground, Widgetbrowser, Demobrowser)
-     * @return {Promise<void>}
-     */
-    async buildDevtools() {
-      const namespace = this.getAppsNamespace();
-      process.chdir(this.getTargetDir());
-      let apps_path = path.join(this.getTargetDir(), namespace);
-      if (await fs.existsAsync(apps_path)) {
-        rimraf.sync(apps_path);
-      }
-      const opts = {
-        noninteractive: true,
-        namespace,
-        theme: "indigo",
-        icontheme: "Tango"
-      };
-
-      await new qx.tool.cli.commands.Create(opts).process();
-      process.chdir(apps_path);
-      for (let name of [
-        "apiviewer",
-        "widgetbrowser",
-        "playground",
-        "demobrowser"
-      ]) {
-        await new qx.tool.cli.commands.package.Install({}).install(
-          "qooxdoo/qxl." + name
-        );
-      }
     }
   }
 });

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

@@ -0,0 +1,47 @@
+const yauzlPromise = require("yauzl-promise");
+const { pipeline } = require("stream/promises");
+const fs = require("fs");
+const path = require("path");
+
+qx.Class.define("qx.tool.utils.Zip", {
+  extend: qx.core.Object,
+
+  statics: {
+    /**
+     * Unzips a .zip file into a directory.
+     *
+     * If `filenameFn` is provided then it is used to get the filename to output to; if it returns null, then
+     * the file will be skipped.  `targetDircetory` will be ignored if `filenameFn` is provided.
+     *
+     * @param {String} filename name of the .zip file
+     * @param {String?} targetDirectory the directory to unzip into, created if it does not exist
+     * @param {Function?} filenameFn used to get the filename to output to
+     */
+    async unzip(filename, targetDirectory, filenameFn) {
+      let zip = await yauzlPromise.open(filename);
+      try {
+        for await (const entry of zip) {
+          if (!entry.filename.endsWith("/")) {
+            let filename = null;
+            if (filenameFn) {
+              filename = filenameFn(entry.filename);
+              if (!filename) {
+                continue;
+              }
+            } else {
+              filename = path.join(targetDirectory, entry.filename);
+            }
+
+            let dirname = path.dirname(filename);
+            await fs.promises.mkdir(dirname, { recursive: true });
+            let writeStream = fs.createWriteStream(filename);
+            let readStream = await entry.openReadStream();
+            await pipeline(readStream, writeStream);
+          }
+        }
+      } finally {
+        await zip.close();
+      }
+    }
+  }
+});

package/source/class/qx/tool/utils/files/Utils.js

@@ -22,7 +22,7 @@
 
 const fs = require("fs");
 const path = require("path");
-const rimraf = require("rimraf");
+const { rimraf } = require("rimraf");
 
 const { promisify } = require("util");
 const stat = promisify(fs.stat);
@@ -235,16 +235,8 @@ qx.Class.define("qx.tool.utils.files.Utils", {
      * @param name {String} file or dir to delete
      * @async
      */
-    deleteRecursive(name) {
-      return new Promise((resolve, reject) => {
-        rimraf(name, err => {
-          if (err) {
-            reject(err);
-          } else {
-            resolve();
-          }
-        });
-      });
+    async deleteRecursive(name) {
+      return rimraf(name);
     },
 
     /**

package/source/class/qx/tool/utils/json/Tokenizer.js

@@ -59,6 +59,11 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
   },
 
   members: {
+    input : undefined,
+    settings : undefined,
+    tokens : undefined,
+    tokenIndex : undefined,
+
     token() {
       if (this.tokens === null) {
         throw new Error("No tokens to return (have you called tokenize?)");

package/source/class/qx/ui/basic/Atom.js

@@ -134,13 +134,13 @@ qx.Class.define("qx.ui.basic.Atom", {
      * Configure the visibility of the sub elements/widgets.
      * Possible values: both, label, icon
      */
-    show: {
+    showFeatures: {
       init: "both",
       check: ["both", "label", "icon"],
       themeable: true,
       inheritable: true,
-      apply: "_applyShow",
-      event: "changeShow"
+      apply: "_applyShowFeatures",
+      event: "changeShowFeatures"
     },
 
     /**
@@ -199,7 +199,7 @@ qx.Class.define("qx.ui.basic.Atom", {
           control.setRich(this.getRich());
           control.setSelectable(this.getSelectable());
           this._add(control);
-          if (this.getLabel() == null || this.getShow() === "icon") {
+          if (this.getLabel() == null || this.getSafe("showFeatures") === "icon") {
             control.exclude();
           }
           break;
@@ -208,7 +208,7 @@ qx.Class.define("qx.ui.basic.Atom", {
           control = new qx.ui.basic.Image(this.getIcon());
           control.setAnonymous(true);
           this._addAt(control, 0);
-          if (this.getIcon() == null || this.getShow() === "label") {
+          if (this.getIcon() == null || this.getSafe("showFeatures") === "label") {
             control.exclude();
           }
           break;
@@ -230,7 +230,7 @@ qx.Class.define("qx.ui.basic.Atom", {
      * Updates the visibility of the label
      */
     _handleLabel() {
-      if (this.getLabel() == null || this.getShow() === "icon") {
+      if (this.getLabel() == null || this.getSafe("showFeatures") === "icon") {
         this._excludeChildControl("label");
       } else {
         this._showChildControl("label");
@@ -241,7 +241,7 @@ qx.Class.define("qx.ui.basic.Atom", {
      * Updates the visibility of the icon
      */
     _handleIcon() {
-      if (this.getIcon() == null || this.getShow() === "label") {
+      if (this.getIcon() == null || this.getSafe("showFeatures") === "label") {
         this._excludeChildControl("icon");
       } else {
         this._showChildControl("icon");
@@ -277,7 +277,7 @@ qx.Class.define("qx.ui.basic.Atom", {
     },
 
     // property apply
-    _applyShow(value, old) {
+    _applyShowFeatures(value, old) {
       this._handleLabel();
       this._handleIcon();
     },

package/source/class/qx/ui/core/Blocker.js

@@ -132,6 +132,7 @@ qx.Class.define("qx.ui.core.Blocker", {
   members: {
     __blocker: null,
     __blockerCount: 0,
+    __blockingContent: false,
 
     __activeElements: null,
     __focusElements: null,
@@ -186,11 +187,17 @@ qx.Class.define("qx.ui.core.Blocker", {
      * @param bounds {Map} Map with the new width, height, left and top values
      */
     _updateBlockerBounds(bounds) {
+      // When blocking content, the blocker is a child of the widget itself,
+      // so it should be positioned at 0,0 relative to the widget.
+      // Otherwise, it's positioned relative to the layout parent.
+      var left = this.__blockingContent ? 0 : bounds.left;
+      var top = this.__blockingContent ? 0 : bounds.top;
+
       this.getBlockerElement().setStyles({
         width: bounds.width + "px",
         height: bounds.height + "px",
-        left: bounds.left + "px",
-        top: bounds.top + "px"
+        left: left + "px",
+        top: top + "px"
       });
     },
 
@@ -244,7 +251,7 @@ qx.Class.define("qx.ui.core.Blocker", {
       );
 
       var focusedWidget = qx.ui.core.Widget.getWidgetByElement(
-        focusHandler.getFocus()
+        focusHandler.getFocusedElement()
       );
 
       this.__activeElements.push(activeWidget);
@@ -338,7 +345,7 @@ qx.Class.define("qx.ui.core.Blocker", {
         if (!this.__appearListener) {
           this.__appearListener = this._widget.addListenerOnce(
             "appear",
-            this._block.bind(this, zIndex)
+            this._block.bind(this, zIndex, blockContent)
           );
         }
         return;
@@ -358,6 +365,9 @@ qx.Class.define("qx.ui.core.Blocker", {
 
       this.__blockerCount++;
       if (this.__blockerCount < 2) {
+        // Track if we're blocking content (blocker is child of widget)
+        this.__blockingContent = blockContent === true;
+
         this._backupActiveWidget();
 
         var bounds = this._widget.getBounds();
@@ -442,6 +452,9 @@ qx.Class.define("qx.ui.core.Blocker", {
       blocker.removeListener("keyup", this.__stopTabEvent, this);
       blocker.exclude();
 
+      // Reset blocking content state
+      this.__blockingContent = false;
+
       this.fireEvent("unblocked", qx.event.type.Event);
     },
 

package/source/class/qx/ui/core/DragDropCursor.js

@@ -61,7 +61,8 @@ qx.Class.define("qx.ui.core.DragDropCursor", {
     action: {
       check: ["alias", "copy", "move"],
       apply: "_applyAction",
-      nullable: true
+      nullable: true,
+      autoApply: false
     }
   },
 

package/source/class/qx/ui/core/EventHandler.js

@@ -128,7 +128,7 @@ qx.Class.define("qx.ui.core.EventHandler", {
      MEMBERS
   *****************************************************************************
   */
-  /* eslint-disable @qooxdoo/qx/no-refs-in-members */
+
   members: {
     __manager: null,
 
@@ -256,7 +256,6 @@ qx.Class.define("qx.ui.core.EventHandler", {
           type,
           !capture
         );
-
         if (otherListeners) {
           listeners = listeners.concat(otherListeners);
         }
@@ -270,7 +269,6 @@ qx.Class.define("qx.ui.core.EventHandler", {
       var widgetEvent = qx.event.Pool.getInstance().getObject(
         domEvent.constructor
       );
-
       domEvent.clone(widgetEvent);
 
       widgetEvent.setTarget(widgetTarget);
@@ -291,28 +289,22 @@ qx.Class.define("qx.ui.core.EventHandler", {
       }
 
       // Dispatch it on all listeners
-      var tracker = {};
-      qx.event.Utils.then(tracker, function () {
-        return qx.event.Utils.series(listeners, function (listener) {
-          var context = listener.context || currentWidget;
-          return listener.handler.call(context, widgetEvent);
-        });
-      });
+      for (var i = 0, l = listeners.length; i < l; i++) {
+        var context = listeners[i].context || currentWidget;
+        listeners[i].handler.call(context, widgetEvent);
+      }
 
       // Synchronize propagation stopped/prevent default property
-      qx.event.Utils.then(tracker, function () {
-        if (widgetEvent.getPropagationStopped()) {
-          domEvent.stopPropagation();
-        }
+      if (widgetEvent.getPropagationStopped()) {
+        domEvent.stopPropagation();
+      }
 
-        if (widgetEvent.getDefaultPrevented()) {
-          domEvent.preventDefault();
-        }
-      });
+      if (widgetEvent.getDefaultPrevented()) {
+        domEvent.preventDefault();
+      }
 
-      return qx.event.Utils.then(tracker, function () {
-        qx.event.Pool.getInstance().poolObject(widgetEvent);
-      });
+      // Release the event instance to the event pool
+      qx.event.Pool.getInstance().poolObject(widgetEvent);
     },
 
     // interface implementation

package/source/class/qx/ui/core/LayoutItem.js

@@ -30,11 +30,7 @@ qx.Class.define("qx.ui.core.LayoutItem", {
 
     // dynamic theme switch
     if (qx.core.Environment.get("qx.dyntheme")) {
-      this.__changeThemeLayoutItemListenerId = qx.theme.manager.Meta.getInstance().addListener(
-        "changeTheme",
-        this._onChangeTheme,
-        this
-      );
+      this.__changeThemeLayoutItemListenerId = qx.theme.manager.Meta.getInstance().addListener("changeTheme", this._onChangeTheme, this);
     }
   },
 
@@ -298,11 +294,8 @@ qx.Class.define("qx.ui.core.LayoutItem", {
         for (var name in props) {
           var desc = props[name];
           // only themeable properties not having a user value
-          if (desc.themeable) {
-            var userValue = qx.util.PropertyUtil.getUserValue(this, name);
-            if (userValue == null) {
-              qx.util.PropertyUtil.resetThemed(this, name);
-            }
+          if (desc instanceof qx.core.property.Property && desc.isThemeable() && !desc.isUserValue(this)) {
+            desc.resetThemed(this);
           }
         }
       },
@@ -387,8 +380,7 @@ qx.Class.define("qx.ui.core.LayoutItem", {
       }
 
       if (qx.core.Environment.get("qx.debug")) {
-        var msg =
-          "Something went wrong with the layout of " + this.toString() + "!";
+        var msg = "Something went wrong with the layout of " + this.toString() + "!";
         this.assertInteger(left, "Wrong 'left' argument. " + msg);
         this.assertInteger(top, "Wrong 'top' argument. " + msg);
         this.assertInteger(width, "Wrong 'width' argument. " + msg);
@@ -447,10 +439,7 @@ qx.Class.define("qx.ui.core.LayoutItem", {
       if (this.getHeight() == null && this._hasHeightForWidth()) {
         var flowHeight = this._getHeightForWidth(width);
 
-        if (
-          flowHeight != null &&
-          flowHeight !== this.__computedHeightForWidth
-        ) {
+        if (flowHeight != null && flowHeight !== this.__computedHeightForWidth) {
           // This variable is used in the next computation of the size hint
           this.__computedHeightForWidth = flowHeight;
 
@@ -545,11 +534,7 @@ qx.Class.define("qx.ui.core.LayoutItem", {
       hint = this.__sizeHint = this._computeSizeHint();
 
       // Respect height for width
-      if (
-        this._hasHeightForWidth() &&
-        this.__computedHeightForWidth &&
-        this.getHeight() == null
-      ) {
+      if (this._hasHeightForWidth() && this.__computedHeightForWidth && this.getHeight() == null) {
         hint.height = this.__computedHeightForWidth;
       }
 
@@ -934,16 +919,8 @@ qx.Class.define("qx.ui.core.LayoutItem", {
   destruct() {
     // remove dynamic theme listener
     if (qx.core.Environment.get("qx.dyntheme") && this.__changeThemeLayoutItemListenerId) {
-      qx.theme.manager.Meta.getInstance().removeListenerById(
-        this.__changeThemeLayoutItemListenerId
-      );
+      qx.theme.manager.Meta.getInstance().removeListenerById(this.__changeThemeLayoutItemListenerId);
     }
-    this.$$parent =
-      this.$$subparent =
-      this.__layoutProperties =
-      this.__computedLayout =
-      this.__userBounds =
-      this.__sizeHint =
-        null;
+    this.$$parent = this.$$subparent = this.__layoutProperties = this.__computedLayout = this.__userBounds = this.__sizeHint = null;
   }
 });