@qooxdoo/framework 7.9.1 → 8.0.0-beta.1

package/source/class/qx/tool/{cli → compiler/cli}/commands/Config.js

@@ -16,30 +16,26 @@
      * Henner Kollmann (Henner.Kollmann@gmx.de, @hkollmann)
 
 ************************************************************************ */
+const columnify = require("columnify");
 /**
  * Handles persistent configuration
  */
 
-qx.Class.define("qx.tool.cli.commands.Config", {
-  extend: qx.tool.cli.commands.Command,
-
+qx.Class.define("qx.tool.compiler.cli.commands.Config", {
+  extend: qx.tool.compiler.cli.Command,
   statics: {
-    getYargsCommand() {
-      return {
-        command: "config <command> [options]",
-        desc: "handles persistent configuration",
-        builder(yargs) {
-          qx.tool.cli.Cli.addYargsCommands(
-            yargs,
-            ["List", "Set", "Get", "Delete"],
-
-            "qx.tool.cli.commands.config"
-          );
-
-          return yargs.demandCommand().showHelpOnFail().help();
-        },
-        handler() {}
-      };
+    /**
+     * Creates the CLI command
+     */
+    async createCliCommand(clazz = this) {
+      let cmd = await qx.tool.compiler.cli.Command.createCliCommand(clazz);
+      cmd.set({
+        name: "config",
+        description: "gets/sets persistent configuration"
+      });
+      cmd.setRun(null);
+      await qx.tool.compiler.cli.Command.addSubcommands(cmd, qx.tool.compiler.cli.commands.config);
+      return cmd;
     },
 
     KNOWN_VALUES: {
@@ -76,8 +72,14 @@ qx.Class.define("qx.tool.cli.commands.Config", {
   },
 
   members: {
+    /*
+     * @Override
+     */
+    async process() {
+    },
+
     _describe(key) {
-      var data = qx.tool.cli.commands.Config.KNOWN_VALUES[key];
+      var data = qx.tool.compiler.cli.commands.Config.KNOWN_VALUES[key];
       return data && data.desc;
     },
 

package/source/class/qx/tool/{cli → compiler/cli}/commands/Create.js

@@ -31,60 +31,83 @@ const inquirer = require("inquirer");
  *
  * Issues: automatic determination of qooxdoo path doesn't work yet.
  */
-qx.Class.define("qx.tool.cli.commands.Create", {
-  extend: qx.tool.cli.commands.Command,
+qx.Class.define("qx.tool.compiler.cli.commands.Create", {
+  extend: qx.tool.compiler.cli.Command,
   statics: {
-    getYargsCommand() {
-      return {
-        command: "create <application namespace> [options]",
-        describe: "create a new qooxdoo project",
-        builder: {
-          type: {
-            alias: "t",
-            describe:
-              "Type of the application to create. Must be one of " +
-              this.getSkeletonNames().join(", "),
-            nargs: 1,
-            requiresArg: true,
-            type: "string"
-          },
-
-          out: {
-            alias: "o",
-            describe: "Output directory for the application content."
-          },
-
-          namespace: {
-            alias: "s",
-            describe: "Top-level namespace."
-          },
-
-          name: {
-            alias: "n",
-            describe: "Name of application/library (defaults to namespace)."
-          },
-
-          theme: {
-            describe: "The name of the theme to be used.",
-            default: "indigo"
-          },
-
-          icontheme: {
-            describe: "The name of the icon theme to be used.",
-            default: "Tango"
-          },
-
-          noninteractive: {
-            alias: "I",
-            describe: "Do not prompt for missing values"
-          },
-
-          verbose: {
-            alias: "v",
-            describe: "Verbose logging"
-          }
-        }
-      };
+    async createCliCommand(clazz = this) {
+      let cmd = await qx.tool.compiler.cli.Command.createCliCommand(clazz);
+      cmd.set({
+        name: "create",
+        description: "create a new qooxdoo project"
+      });
+
+      cmd.addArgument(
+        new qx.tool.cli.Argument("namespace").set({
+          description: "application namespace",
+          required: true,
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("type").set({
+          shortCode: "t",
+          description: "Type of the application to create. Must be one of " +
+            this.getSkeletonNames().join(", "),
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("out").set({
+          shortCode: "o",
+          description: "Output directory for the application content.",
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("namespace").set({
+          shortCode: "s",
+          description: "Top-level namespace.",
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("name").set({
+          shortCode: "n",
+          description: "Name of application/library (defaults to namespace).",
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("theme").set({
+          description: "The name of the theme to be used.",
+          type: "string",
+          value: "indigo"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("icontheme").set({
+          description: "The name of the icon theme to be used.",
+          type: "string",
+          value: "Tango"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("noninteractive").set({
+          shortCode: "I",
+          description: "Do not prompt for missing values",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      return cmd;
     },
     /**
      * Returns the names of the skeleton directories in the template folder
@@ -151,7 +174,7 @@ qx.Class.define("qx.tool.cli.commands.Create", {
         let deflt = typeof v.default === "function" ? v.default() : v.default;
 
         // we have a final value that doesn't need to be asked for / confirmed.
-        if (v.value !== undefined) {
+        if (v.value != null) {
           values[var_name] =
             typeof v.value === "function" ? v.value.call(values) : v.value;
           continue;

package/source/class/qx/tool/{cli → compiler/cli}/commands/Deploy.js

@@ -26,60 +26,54 @@ const path = require("upath");
  *
  * - adding a listener for the "afterDeploy" event fired on the command
  * instance  in the `load()` method of the class extending {@link
- * qx.tool.cli.api.LibraryApi} or {@link qx.tool.cli.api.CompilerApi}.
+ * qx.tool.compiler.cli.api.LibraryApi} or {@link qx.tool.compiler.cli.api.CompilerApi}.
  *
  * - or by implementing a `afterDeploy()` method in the class
- * extending {@link qx.tool.cli.api.CompilerApi}
+ * extending {@link qx.tool.compiler.cli.api.CompilerApi}
  *
  * The event and/or method is called with a {@link qx.event.type.Data}
  * containing an object with the properties described below.
  *
  */
-qx.Class.define("qx.tool.cli.commands.Deploy", {
-  extend: qx.tool.cli.commands.Compile,
+qx.Class.define("qx.tool.compiler.cli.commands.Deploy", {
+  extend: qx.tool.compiler.cli.commands.Compile,
   statics: {
-    YARGS_BUILDER: {
-      out: {
-        describe: "Output directory for the deployment",
-        alias: "o"
-      },
-
-      "app-name": {
-        describe:
-          "The name of the application to deploy (default is all apps), can be comma separated list",
-        nargs: 1,
-        type: "string"
-      },
+    async createCliCommand(clazz = this) {
+      let cmd = await qx.tool.compiler.cli.commands.Compile.createCliCommand(clazz);
+      cmd.set({
+        name: "deploy",
+        description: "deploys qooxdoo application(s)"
+      });
 
-      "source-maps": {
-        describe: "Enable source maps",
-        type: "boolean",
-        default: false,
-        alias: "m"
-      }
-    },
+      // Remove flags that deploy doesn't use
+      cmd.removeFlag("watch");
+      cmd.removeFlag("watch-debug");
+      cmd.removeFlag("write-library-info");
+      cmd.removeFlag("download");
+      cmd.removeFlag("update-po-files");
+      cmd.removeFlag("save-unminified");
+      cmd.removeFlag("bundling");
+      cmd.removeFlag("minify");
+
+      // Add deploy-specific flags
+      cmd.addFlag(
+        new qx.tool.cli.Flag("out").set({
+          shortCode: "o",
+          description: "Output directory for the deployment",
+          type: "string"
+        })
+      );
 
-    getYargsCommand() {
-      return {
-        command: "deploy [options]",
-        describe: "deploys qooxdoo application(s)",
-        builder: (() => {
-          let res = Object.assign(
-            {},
-            qx.tool.cli.commands.Compile.YARGS_BUILDER,
-            qx.tool.cli.commands.Deploy.YARGS_BUILDER
-          );
+      cmd.addFlag(
+        new qx.tool.cli.Flag("source-maps").set({
+          shortCode: "m",
+          description: "Enable source maps",
+          type: "boolean",
+          value: false
+        })
+      );
 
-          delete res.watch;
-          delete res["write-library-info"];
-          delete res.download;
-          delete res["update-po-files"];
-          delete res["save-unminified"];
-          delete res.bundling;
-          delete res.minify;
-          return res;
-        })()
-      };
+      return cmd;
     }
   },
 
@@ -102,12 +96,10 @@ qx.Class.define("qx.tool.cli.commands.Deploy", {
     /*
      * @Override
      */
-    processArgs(argv) {
-      super.processArgs(argv);
-      if (!argv.clean) {
-        qx.tool.compiler.Console.print("qx.tool.cli.deploy.notClean");
+    async process() {
+      if (!this.argv.clean) {
+        qx.tool.compiler.Console.print("qx.tool.compiler.cli.deploy.notClean");
       }
-
       let compileArgv = {
         writeLibraryInfo: false,
         download: false,
@@ -119,20 +111,13 @@ qx.Class.define("qx.tool.cli.commands.Deploy", {
         deploying: true
       };
 
-      qx.lang.Object.mergeWith(argv, compileArgv);
-    },
-
-    /*
-     * @Override
-     */
-    async process() {
+      qx.lang.Object.mergeWith(this.argv, compileArgv);
       await super.process();
-
       let argv = this.argv;
       let appNames = null;
       if (argv.appName) {
         appNames = {};
-        argv.appName.split(",").forEach(appName => (appNames[appName] = true));
+        String(argv.appName).split(",").forEach(appName => (appNames[appName] = true));
       }
 
       if (argv.clean) {
@@ -183,7 +168,7 @@ qx.Class.define("qx.tool.cli.commands.Deploy", {
                   target.getDeployDir());
               if (!deployDir) {
                 qx.tool.compiler.Console.print(
-                  "qx.tool.cli.deploy.deployDirNotSpecified",
+                  "qx.tool.compiler.cli.deploy.deployDirNotSpecified",
                   target.getType()
                 );
 
@@ -283,7 +268,7 @@ qx.Class.define("qx.tool.cli.commands.Deploy", {
   defer(statics) {
     qx.tool.compiler.Console.addMessageIds(
       {
-        "qx.tool.cli.deploy.deployDirNotSpecified":
+        "qx.tool.compiler.cli.deploy.deployDirNotSpecified":
           "No deploy dir for target <%1> configured! Use --out parameter or deployPath target property in compile.json."
       },
 
@@ -292,7 +277,7 @@ qx.Class.define("qx.tool.cli.commands.Deploy", {
 
     qx.tool.compiler.Console.addMessageIds(
       {
-        "qx.tool.cli.deploy.notClean":
+        "qx.tool.compiler.cli.deploy.notClean":
           "Incremental build compilation - this is faster but may preserve old artifacts, it is recommended to use --clean command line option"
       },
 

package/source/class/qx/tool/{cli → compiler/cli}/commands/Es6ify.js

@@ -23,53 +23,69 @@ const ignore = require("ignore");
 /**
  * Migrates code to ES6 (partially)
  */
-qx.Class.define("qx.tool.cli.commands.Es6ify", {
-  extend: qx.tool.cli.commands.Command,
+qx.Class.define("qx.tool.compiler.cli.commands.Es6ify", {
+  extend: qx.tool.compiler.cli.Command,
   statics: {
-    getYargsCommand() {
-      return {
-        command: "es6ify [files...]",
-        describe: "help migrate code to ES6",
-        builder: {
-          verbose: {
-            alias: "v",
-            describe: "Verbose logging"
-          },
-
-          gitPreCommit: {
-            describe: "When used as a Git pre-commit hook"
-          },
-
-          overwrite: {
-            type: "boolean",
-            default: true,
-            describe: "Overwrite source files"
-          },
-
-          exclude: {
-            type: "array",
-            describe: "Paths to exclude"
-          },
-
-          arrowFunctions: {
-            choices: ["never", "always", "careful", "aggressive"],
-            default: "careful"
-          },
-
-          singleLineBlocks: {
-            type: "boolean",
-            default: false,
-            describe:
-              "Force braces around single line bodies for if, for, while, and do while"
-          }
-        }
-      };
+    async createCliCommand(clazz = this) {
+      let cmd = await qx.tool.compiler.cli.Command.createCliCommand(clazz);
+      cmd.set({
+        name: "es6ify",
+        description: "help migrate code to ES6"
+      });
+
+      cmd.addArgument(
+        new qx.tool.cli.Argument("files").set({
+          description: "files to process",
+          array: true,
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("gitPreCommit").set({
+          description: "When used as a Git pre-commit hook",
+          type: "boolean"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("overwrite").set({
+          description: "Overwrite source files",
+          type: "boolean",
+          value: true
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("exclude").set({
+          description: "Paths to exclude",
+          array: true,
+          type: "string"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("arrowFunctions").set({
+          description: "Arrow function conversion mode",
+          type: ["never", "always", "careful", "aggressive"],
+          value: "careful"
+        })
+      );
+
+      cmd.addFlag(
+        new qx.tool.cli.Flag("singleLineBlocks").set({
+          description: "Force braces around single line bodies for if, for, while, and do while",
+          type: "boolean",
+          value: false
+        })
+      );
+
+      return cmd;
     }
   },
 
   members: {
     async process() {
-      await super.process();
       const ignoreFileName = ".prettierignore";
       const ig = ignore();
       try {

package/source/class/qx/tool/{cli → compiler/cli}/commands/ExportGlyphs.js

@@ -24,15 +24,34 @@ const tmp = require("tmp");
 /**
  * Exports font ligatures as a map
  */
-qx.Class.define("qx.tool.cli.commands.ExportGlyphs", {
-  extend: qx.tool.cli.commands.Command,
+qx.Class.define("qx.tool.compiler.cli.commands.ExportGlyphs", {
+  extend: qx.tool.compiler.cli.Command,
 
   statics: {
-    getYargsCommand() {
-      return {
-        command: "export-glyphs font-file glyph-file",
-        describe: "export font glyphs & ligatures"
-      };
+    async createCliCommand(clazz = this) {
+      let cmd = await qx.tool.compiler.cli.Command.createCliCommand(clazz);
+      cmd.set({
+        name: "export-glyphs",
+        description: "export font glyphs & ligatures"
+      });
+
+      cmd.addArgument(
+        new qx.tool.cli.Argument("fontFile").set({
+          description: "Font file to process",
+          required: true,
+          type: "string"
+        })
+      );
+
+      cmd.addArgument(
+        new qx.tool.cli.Argument("glyphFile").set({
+          description: "Output glyph file",
+          required: true,
+          type: "string"
+        })
+      );
+
+      return cmd;
     }
   },