@qooxdoo/framework 7.9.1 → 8.0.0-beta.1

package/source/class/qx/theme/simple/Appearance.js

@@ -34,7 +34,6 @@
  * @asset(qx/icon/${qx.icontheme}/16/actions/dialog-ok.png)
  */
 qx.Theme.define("qx.theme.simple.Appearance", {
-  include: [qx.test.MAppearance],
 
   appearances: {
     /*
@@ -172,9 +171,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
 
       style(states) {
         return {
-          icon: qx.theme.simple.Image.URLS[
-            "arrow-" + (states.vertical ? "down" : "right")
-          ]
+          icon: qx.theme.simple.Image.URLS["arrow-" + (states.vertical ? "down" : "right")]
         };
       }
     },
@@ -185,9 +182,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
 
       style(states) {
         return {
-          icon: qx.theme.simple.Image.URLS[
-            "arrow-" + (states.vertical ? "up" : "left")
-          ]
+          icon: qx.theme.simple.Image.URLS["arrow-" + (states.vertical ? "up" : "left")]
         };
       }
     },
@@ -269,19 +264,13 @@ qx.Theme.define("qx.theme.simple.Appearance", {
 
       style(states) {
         return {
-          decorator: states.first
-            ? "table-header-cell-first"
-            : "table-header-cell",
+          decorator: states.first ? "table-header-cell-first" : "table-header-cell",
           minWidth: 13,
           font: "bold",
           paddingTop: 3,
           paddingLeft: 5,
           cursor: states.disabled ? undefined : "pointer",
-          sortIcon: states.sorted
-            ? qx.theme.simple.Image.URLS[
-                "table-" + (states.sortedAscending ? "ascending" : "descending")
-              ]
-            : undefined
+          sortIcon: states.sorted ? qx.theme.simple.Image.URLS["table-" + (states.sortedAscending ? "ascending" : "descending")] : undefined
         };
       }
     },
@@ -375,9 +364,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
     "treevirtual-folder": {
       style(states) {
         return {
-          icon: states.opened
-            ? "icon/16/places/folder-open.png"
-            : "icon/16/places/folder.png",
+          icon: states.opened ? "icon/16/places/folder-open.png" : "icon/16/places/folder.png",
           opacity: states.drag ? 0.5 : undefined
         };
       }
@@ -543,10 +530,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
     "splitpane/splitter/knob": {
       style(states) {
         return {
-          source:
-            qx.theme.simple.Image.URLS[
-              "knob-" + (states.horizontal ? "horizontal" : "vertical")
-            ],
+          source: qx.theme.simple.Image.URLS["knob-" + (states.horizontal ? "horizontal" : "vertical")],
 
           padding: 2
         };
@@ -578,8 +562,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
           iconColumnWidth: 16,
           arrowColumnWidth: 4,
           padding: 1,
-          placementModeY:
-            states.submenu || states.contextmenu ? "best-fit" : "keep-align"
+          placementModeY: states.submenu || states.contextmenu ? "best-fit" : "keep-align"
         };
 
         if (states.submenu) {
@@ -614,9 +597,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
 
       style(states) {
         return {
-          icon: qx.theme.simple.Image.URLS[
-            "arrow-up" + (states.hovered ? "-invert" : "")
-          ]
+          icon: qx.theme.simple.Image.URLS["arrow-up" + (states.hovered ? "-invert" : "")]
         };
       }
     },
@@ -626,9 +607,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
 
       style(states) {
         return {
-          icon: qx.theme.simple.Image.URLS[
-            "arrow-down" + (states.hovered ? "-invert" : "")
-          ]
+          icon: qx.theme.simple.Image.URLS["arrow-down" + (states.hovered ? "-invert" : "")]
         };
       }
     },
@@ -696,10 +675,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
 
       style(states) {
         return {
-          source:
-            qx.theme.simple.Image.URLS[
-              "arrow-right" + (states.selected ? "-invert" : "")
-            ],
+          source: qx.theme.simple.Image.URLS["arrow-right" + (states.selected ? "-invert" : "")],
 
           alignY: "middle"
         };
@@ -712,11 +688,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
 
       style(states) {
         return {
-          icon: !states.checked
-            ? undefined
-            : qx.theme.simple.Image.URLS[
-                "menu-checkbox" + (states.selected ? "-invert" : "")
-              ]
+          icon: !states.checked ? undefined : qx.theme.simple.Image.URLS["menu-checkbox" + (states.selected ? "-invert" : "")]
         };
       }
     },
@@ -727,11 +699,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
 
       style(states) {
         return {
-          icon: !states.checked
-            ? undefined
-            : qx.theme.simple.Image.URLS[
-                "menu-radiobutton" + (states.selected ? "-invert" : "")
-              ]
+          icon: !states.checked ? undefined : qx.theme.simple.Image.URLS["menu-radiobutton" + (states.selected ? "-invert" : "")]
         };
       }
     },
@@ -863,9 +831,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
     cell: {
       style(states) {
         return {
-          backgroundColor: states.selected
-            ? "table-row-background-selected"
-            : "table-row-background-even",
+          backgroundColor: states.selected ? "table-row-background-selected" : "table-row-background-even",
           textColor: states.selected ? "text-selected" : "text",
           padding: [3, 6]
         };
@@ -1371,11 +1337,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
           padding: padding,
           backgroundColor: backgroundColor,
           textColor: useSelectionState ? "text-selected" : undefined,
-          decorator: states.lead
-            ? "lead-item"
-            : states.dragover
-            ? "dragover"
-            : undefined,
+          decorator: states.lead ? "lead-item" : states.dragover ? "dragover" : undefined,
           opacity: states.drag ? 0.5 : undefined
         };
       }
@@ -1635,9 +1597,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
       include: "image",
       style(states) {
         return {
-          source: states.opened
-            ? qx.theme.simple.Image.URLS["tree-minus"]
-            : qx.theme.simple.Image.URLS["tree-plus"]
+          source: states.opened ? qx.theme.simple.Image.URLS["tree-minus"] : qx.theme.simple.Image.URLS["tree-plus"]
         };
       }
     },
@@ -1653,9 +1613,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
         }
         return {
           padding: [2, 8, 2, 5],
-          icon: states.opened
-            ? "icon/16/places/folder-open.png"
-            : "icon/16/places/folder.png",
+          icon: states.opened ? "icon/16/places/folder-open.png" : "icon/16/places/folder.png",
           backgroundColor: backgroundColor,
           iconOpened: "icon/16/places/folder-open.png",
           opacity: states.drag ? 0.5 : undefined
@@ -1676,8 +1634,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
       style(states) {
         return {
           padding: [1, 2],
-          textColor:
-            states.selected && !states.disabled ? "text-selected" : undefined
+          textColor: states.selected && !states.disabled ? "text-selected" : undefined
         };
       }
     },
@@ -1717,11 +1674,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
         return {
           contentPadding: [10, 10, 10, 10],
           backgroundColor: "background",
-          decorator: states.maximized
-            ? undefined
-            : states.active
-            ? "window-active"
-            : "window"
+          decorator: states.maximized ? undefined : states.active ? "window-active" : "window"
         };
       }
     },
@@ -1733,9 +1686,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
     "window/captionbar": {
       style(states) {
         return {
-          backgroundColor: states.active
-            ? "light-background"
-            : "background-disabled",
+          backgroundColor: states.active ? "light-background" : "background-disabled",
           padding: 8,
           font: "bold",
           decorator: "window-caption"
@@ -1841,11 +1792,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
       style(states) {
         return {
           backgroundColor: "background",
-          textColor: states.disabled
-            ? "text-disabled"
-            : states.invalid
-            ? "invalid"
-            : undefined,
+          textColor: states.disabled ? "text-disabled" : states.invalid ? "invalid" : undefined,
           padding: [2, 10]
         };
       }
@@ -1866,7 +1813,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
       style(states) {
         var result = {
           width: 17,
-          show: "icon",
+          showFeatures: "icon",
           cursor: states.disabled ? undefined : "pointer"
         };
 
@@ -1911,11 +1858,11 @@ qx.Theme.define("qx.theme.simple.Appearance", {
           textColor: states.disabled
             ? "text-disabled"
             : states.weekend
-            ? "background-selected-dark"
-            : "background",
+            ? "datechooser-background-selected-dark"
+            : "datechooser-background",
           backgroundColor: states.weekend
-            ? "background"
-            : "background-selected-dark",
+            ? "datechooser-background"
+            : "datechooser-background-selected-dark",
           paddingTop: 2
         };
       }
@@ -1933,11 +1880,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
             : states.otherMonth
             ? "text-disabled"
             : undefined,
-          backgroundColor: states.disabled
-            ? undefined
-            : states.selected
-            ? "background-selected"
-            : undefined,
+          backgroundColor: states.disabled ? undefined : states.selected ? "background-selected" : undefined,
           padding: states.today ? [1, 3] : [2, 4]
         };
       }
@@ -1947,11 +1890,10 @@ qx.Theme.define("qx.theme.simple.Appearance", {
       style(states) {
         return {
           textAlign: "center",
-          textColor: "background-selected-dark",
+          textColor: "datechooser-background",
+		      backgroundColor: "datechooser-background-selected-dark",
           padding: [2, 4],
-          decorator: states.header
-            ? "datechooser-week-header"
-            : "datechooser-week"
+          decorator: states.header ? "datechooser-week-header" : "datechooser-week"
         };
       }
     },
@@ -1976,9 +1918,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
     "progressbar/progress": {
       style(states) {
         return {
-          backgroundColor: states.disabled
-            ? "background-disabled-checked"
-            : "background-selected"
+          backgroundColor: states.disabled ? "background-disabled-checked" : "background-selected"
         };
       }
     },
@@ -2324,11 +2264,7 @@ qx.Theme.define("qx.theme.simple.Appearance", {
         return {
           zIndex: states.checked ? 10 : 5,
           decorator: decorator,
-          textColor: states.disabled
-            ? "text-disabled"
-            : states.checked
-            ? null
-            : "link",
+          textColor: states.disabled ? "text-disabled" : states.checked ? null : "link",
           padding: padding,
           cursor: "pointer"
         };

package/source/class/qx/theme/simple/Decoration.js

@@ -20,7 +20,6 @@
  * The simple qooxdoo decoration theme.
  */
 qx.Theme.define("qx.theme.simple.Decoration", {
-  include: [qx.test.MDecoration],
 
   aliases: {
     decoration: "qx/decoration/Simple"

package/source/class/qx/theme/tangible/Appearance.js

@@ -1824,7 +1824,7 @@ qx.Theme.define("qx.theme.tangible.Appearance", {
       style(states) {
         var result = {
           width: 17,
-          show: "icon",
+          showFeatures: "icon",
           cursor: states.disabled ? undefined : "pointer"
         };
 

package/source/class/qx/tool/cli/AbstractCliApp.js

@@ -0,0 +1,72 @@
+/* ************************************************************************
+
+   qooxdoo - the new era of web development
+
+   http://qooxdoo.org
+
+   Copyright:
+     2019-2022 Zenesis Ltd, https://www.zenesis.com
+
+   License:
+     MIT: https://opensource.org/licenses/MIT
+     See the LICENSE file in the project's top-level directory for details.
+
+   Authors:
+     * John Spackman (john.spackman@zenesis.com, @johnspackman)
+     * Henner Kollmann (Henner.Kollmann@gmx.de, @hkollmann)
+
+************************************************************************ */
+qx.Class.define("qx.tool.cli.AbstractCliApp", {
+  type: "abstract",
+  extend: qx.application.Basic,
+
+  members: {
+    async main() {
+      let rootCmd = await this._createRoot();
+      await this._addCommands(rootCmd);
+      let cmd = null;
+      try {
+        cmd = rootCmd.parseRoot();
+      } catch (ex) {
+        console.error("ERROR:\n" + (ex.stack ?? ex.message) + "\n");
+      }
+      let errors = (cmd && cmd.getErrors()) || null;
+      if (errors) {
+        console.error("ERROR:");
+        console.error(errors.join("\n"));
+        console.error("\n");
+      }
+      let run = (cmd && cmd.getRun()) || null;
+      if (!cmd || run === null || errors || cmd.getFlag("help").getValue()) {
+        console.log((cmd || rootCmd).usage());
+        process.exit((!cmd || errors) ? 1 : 0);
+      }
+      try {
+        process.exit(await run.call(cmd, cmd) ?? 0);
+      } catch (ex) {
+        console.error("ERROR:\n" + (ex.stack ?? ex.message) + "\n");
+        process.exit(1);
+      }
+    },
+
+    /**
+     * creates the root command
+     * @returns qx.tool.cli.Command
+     *
+     */
+    async _createRoot() {
+      return new qx.tool.cli.Command("*");
+    },
+
+    /**
+     * add all the commands to the root.
+     * by sub classes.
+     *
+     * @param {qx.tool.cli.Command} rootCmd command to add sub commands.
+     *
+     */
+    _addCommands(rootCmd) {
+      throw new Error("Abstract method call");
+    }
+  }
+});

package/source/class/qx/tool/cli/AbstractValue.js

@@ -0,0 +1,186 @@
+const { assertAccessor } = require("@babel/types");
+
+/* ************************************************************************
+
+   qooxdoo - the new era of web development
+
+   http://qooxdoo.org
+
+   Copyright:
+     2019-2022 Zenesis Ltd, https://www.zenesis.com
+
+   License:
+     MIT: https://opensource.org/licenses/MIT
+     See the LICENSE file in the project's top-level directory for details.
+
+   Authors:
+     * John Spackman (john.spackman@zenesis.com, @johnspackman)
+     * Henner Kollmann (Henner.Kollmann@gmx.de, @hkollmann)
+
+************************************************************************ */
+qx.Class.define("qx.tool.cli.AbstractValue", {
+  type: "abstract",
+  extend: qx.core.Object,
+
+  construct(name) {
+    super();
+    if (this.constructor === qx.tool.cli.AbstractValue) {
+      throw new Error("The class 'qx.tool.cli.AbstractValue' is abstract! It is not possible to instantiate it.");
+    }
+    if (name) {this.setName(name);}
+  },
+
+  properties: {
+    /** Name of the flag or argument */
+    name: {
+      init: null,
+      nullable: true,
+      check: "String",
+      transform: "__transformName"
+    },
+    /** Short alternative */
+    shortCode: {
+      init: null,
+      nullable: true,
+      check: "String"
+    },
+    /** Description, used in the usage statement */
+    description: {
+      init: null,
+      nullable: true,
+      check: "String"
+    },
+
+    /** Data type  */
+    type: {
+      init: null,
+      nullable: true,
+      check: value => {
+        if (qx.core.Environment.get("qx.debug")) {
+          if (!qx.lang.Type.isArray(value)) {
+            qx.core.Assert.assertInArray(value, [
+              "string",
+              "boolean",
+              "integer",
+              "float"
+            ]);
+          }
+        }
+        return true;
+      },
+      apply: "_applyType"
+    },
+
+    /** check function */
+    check: {
+      init: null,
+      nullable: true,
+      check: "Function"
+    },
+
+    /** Whether this is an array */
+    array: {
+      init: false,
+      check: "Boolean"
+    },
+
+    /** Whether this must be provided */
+    required: {
+      init: false,
+      check: "Boolean"
+    },
+
+    /** The parsed value */
+    value: {
+      init: null,
+      nullable: true,
+      apply: "_applyValue"
+    }
+  },
+
+  members: {
+    /** @type{String[]?} list of error messages */
+    __errors: null,
+
+    _applyType(value, old) {
+    },
+
+    _applyValue(value, old) {
+      // Validate the value using the check function if available
+      let checkFn = this.getCheck();
+      if (checkFn && !checkFn(value)) {
+        throw new Error(`Invalid value: ${value}`);
+      }
+    },
+
+    /**
+     * Transform for `name`
+     */
+    __transformName(value) {
+      // Convert underscores to hyphens first, then apply camelCase
+      let normalized = value.replace(/_/g, '-');
+      return qx.lang.String.camelCase(normalized);
+    },
+
+    /**
+     * Adds an error message
+     *
+     * @param {String} msg
+     */
+    _error(msg) {
+      if (!this.__errors) {this.__errors = [];}
+      this.__errors.push(msg);
+    },
+
+    /**
+     * Returns list of error messages
+     *
+     * @return {String[]?} error messages or null if no errors
+     */
+    getErrors() {
+      return this.__errors;
+    },
+
+    /**
+     * Returns the hyphenated version of the `name` property (which is always held as camelCase)
+     *
+     * @returns {String}
+     */
+    getHyphenatedName() {
+      return qx.lang.String.hyphenate(this.getName());
+    },
+
+    /**
+     * Tests whether this matches the string (name or short code)
+     *
+     * @param {String} arg
+     * @returns {Boolean}
+     */
+    is(arg) {
+      let pos = arg.indexOf("=");
+      if (pos > -1) {arg = arg.substring(0, pos);}
+      if (arg.startsWith("--")) {
+        let tmp = qx.lang.String.camelCase(arg.substring(2));
+        return tmp == this.getName();
+      } else if (arg.startsWith("-")) {
+        return arg.substring(1) == this.getShortCode();
+      }
+
+      return false;
+    },
+
+    toString() {
+      return this.getName() || this.getDescription() || this.classname;
+    },
+
+    /**
+     * Parses the value
+     *
+     * @param {String} cmdName the command name
+     * @param {Function} fnGetMore function to get more arguments
+     */
+    parse(cmdName, fnGetMore) {
+      throw new Error(`No such implementation for ${this.classname}`);
+    }
+  }
+});