@qooxdoo/framework 7.0.0-beta.1 → 7.0.0-beta.10

package/source/class/qx/tool/cli/commands/Migrate.js

@@ -34,7 +34,7 @@ qx.Class.define("qx.tool.cli.commands.Migrate", {
      * Return the Yargs configuration object
      * @return {{}}
      */
-    getYargsCommand: function() {
+    getYargsCommand() {
       return {
         command: "migrate",
         describe: "migrate a library/application to a newer qooxdoo version",
@@ -42,9 +42,11 @@ qx.Class.define("qx.tool.cli.commands.Migrate", {
           "dry-run": {
             describe: "Do not apply migrations"
           },
+
           "qx-version": {
             check: argv => semver.valid(argv.qxVersion),
-            describe: "A semver string. If given, the maximum qooxdoo version for which to run migrations"
+            describe:
+              "A semver string. If given, the maximum qooxdoo version for which to run migrations"
           }
         }
       };
@@ -52,23 +54,27 @@ qx.Class.define("qx.tool.cli.commands.Migrate", {
   },
 
   members: {
-
     /**
      * Announces or applies a migration
      */
-    process: async function() {
+    async process() {
       let runner = new qx.tool.migration.Runner().set({
         dryRun: Boolean(this.argv.dryRun),
         verbose: Boolean(this.argv.verbose),
         qxVersion: this.argv.qxVersion || null
       });
-      let {applied, pending} = await runner.runMigrations();
-      qx.tool.compiler.Console.info(`Finished ${this.argv.dryRun?"checking":"running"} migrations: ${applied} migrations applied, ${pending} migrations pending.`);
+
+      let { applied, pending } = await runner.runMigrations();
+      qx.tool.compiler.Console.info(
+        `Finished ${
+          this.argv.dryRun ? "checking" : "running"
+        } migrations: ${applied} migrations applied, ${pending} migrations pending.`
+      );
     },
 
     /**
      * @override
      */
-    async checkMigrations(){}
+    async checkMigrations() {}
   }
 });

package/source/class/qx/tool/cli/commands/Package.js

@@ -18,7 +18,6 @@
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
 const process = require("process");
-const jsonlint = require("jsonlint");
 const stringify = require("json-stable-stringify");
 
 /**
@@ -44,55 +43,59 @@ qx.Class.define("qx.tool.cli.commands.Package", {
     lockfile: {
       filename: "qx-lock.json"
     },
+
     /**
      * The URL of the cached repository data
      */
-    repository_cache_url: "https://raw.githubusercontent.com/qooxdoo/package-cache/master/cache.json",
+    repository_cache_url:
+      "https://raw.githubusercontent.com/qooxdoo/package-cache/master/cache.json",
 
     /**
      * The yargs command data
      * @return {{}}
      */
-    getYargsCommand: function() {
+    getYargsCommand() {
       return {
-        command : "package <command> [options]",
-        desc : "manages qooxdoo packages",
-        builder : yargs => {
-          qx.tool.cli.Cli.addYargsCommands(yargs, [
-            "Install",
-            "List",
-            "Publish",
-            "Remove",
-            "Update",
-            "Upgrade",
-            "Migrate"
-          ], "qx.tool.cli.commands.package");
-          return yargs
-            .showHelpOnFail()
-            .help();
+        command: "package <command> [options]",
+        desc: "manages qooxdoo packages",
+        builder: yargs => {
+          qx.tool.cli.Cli.addYargsCommands(
+            yargs,
+            [
+              "Install",
+              "List",
+              "Publish",
+              "Remove",
+              "Update",
+              "Upgrade",
+              "Migrate"
+            ],
+
+            "qx.tool.cli.commands.package"
+          );
+
+          return yargs.showHelpOnFail().help();
         }
       };
     }
   },
 
   members: {
-
     /**
      * The current cache object
      */
-    __cache : null,
+    __cache: null,
 
     /**
      * @override
      */
-    async checkMigrations(){},
-
+    async checkMigrations() {},
 
     /**
      * Returns the absolute path to the lockfile.
      * @return {String}
      */
-    getLockfilePath: function() {
+    getLockfilePath() {
       return path.join(process.cwd(), qx.tool.config.Lockfile.config.fileName);
     },
 
@@ -134,10 +137,7 @@ qx.Class.define("qx.tool.cli.commands.Package", {
      * @return {Array} containing [{qx.tool.config.Manifest}, {qx.tool.config.Lockfile}, {qx.tool.config.Compile}]
      */
     async _getConfigData() {
-      return [
-        await this.getManifestModel(),
-        await this.getLockfileModel()
-      ];
+      return [await this.getManifestModel(), await this.getLockfileModel()];
     },
 
     /**
@@ -150,13 +150,17 @@ qx.Class.define("qx.tool.cli.commands.Package", {
       if (this.argv.save && manifestModel.isDirty()) {
         await manifestModel.save();
         if (this.argv.verbose) {
-          qx.tool.compiler.Console.info(`>>> Saved dependency data to ${manifestModel.getRelativeDataPath()}`);
+          qx.tool.compiler.Console.info(
+            `>>> Saved dependency data to ${manifestModel.getRelativeDataPath()}`
+          );
         }
       }
       if (lockfileModel.isDirty()) {
         await lockfileModel.save();
         if (this.argv.verbose) {
-          qx.tool.compiler.Console.info(`>>> Saved library data to ${lockfileModel.getRelativeDataPath()}`);
+          qx.tool.compiler.Console.info(
+            `>>> Saved library data to ${lockfileModel.getRelativeDataPath()}`
+          );
         }
       }
     },
@@ -171,7 +175,11 @@ qx.Class.define("qx.tool.cli.commands.Package", {
     async getInstalledLibraryTag(repo_name, library_name) {
       let library = (await this.getLockfileModel())
         .getValue("libraries")
-        .find(lib => lib.repo_name === repo_name && lib.library_name === library_name);
+        .find(
+          lib =>
+            lib.repo_name === repo_name && lib.library_name === library_name
+        );
+
       return library ? library.repo_tag : false;
     },
 
@@ -191,15 +199,18 @@ qx.Class.define("qx.tool.cli.commands.Package", {
      * Returns the absolute path to the file that persists the cache object
      * @return {String}
      */
-    getCachePath : function() {
-      return path.join(qx.tool.cli.ConfigDb.getDirectory(), this.self(arguments).package_cache_name);
+    getCachePath() {
+      return path.join(
+        qx.tool.cli.ConfigDb.getDirectory(),
+        this.self(arguments).package_cache_name
+      );
     },
 
     /**
      * Returns the URL of the package registry data on GitHub
      * @return {String}
      */
-    getRepositoryCacheUrl : function() {
+    getRepositoryCacheUrl() {
       return this.self(arguments).repository_cache_url;
     },
 
@@ -208,19 +219,22 @@ qx.Class.define("qx.tool.cli.commands.Package", {
      * @return {Object}
      * @todo use config model API for cache file
      */
-    getCache : function(readFromFile = false) {
+    getCache(readFromFile = false) {
       if (!readFromFile && this.__cache && typeof this.__cache == "object") {
         return this.__cache;
       }
       try {
-        this.__cache = jsonlint.parse(fs.readFileSync(this.getCachePath(), "UTF-8"));
+        this.__cache = JSON.parse(
+          fs.readFileSync(this.getCachePath(), "UTF-8")
+        );
       } catch (e) {
         this.__cache = {
-          repos : {
-            list : [],
-            data : {}
+          repos: {
+            list: [],
+            data: {}
           },
-          compat : {}
+
+          compat: {}
         };
       }
       return this.__cache;
@@ -231,7 +245,7 @@ qx.Class.define("qx.tool.cli.commands.Package", {
      * @param data {Object}
      * @return {void}
      */
-    setCache : function(data) {
+    setCache(data) {
       this.__cache = data;
     },
 
@@ -239,9 +253,13 @@ qx.Class.define("qx.tool.cli.commands.Package", {
      * Saves the cache to a hidden local file
      * @return {void}
      */
-    saveCache : async function() {
+    async saveCache() {
       await qx.tool.utils.Utils.makeParentDir(this.getCachePath());
-      await fs.writeFileAsync(this.getCachePath(), JSON.stringify(this.__cache, null, 2), "UTF-8");
+      await fs.writeFileAsync(
+        this.getCachePath(),
+        JSON.stringify(this.__cache, null, 2),
+        "UTF-8"
+      );
     },
 
     /**
@@ -250,13 +268,16 @@ qx.Class.define("qx.tool.cli.commands.Package", {
      * @param path {String}
      * @return {void}
      */
-    exportCache : async function(path) {
+    async exportCache(path) {
       try {
         let cache = this.__cache || this.getCache(true);
-        let data = stringify(cache, {space: 2});
+        let data = stringify(cache, { space: 2 });
         await fs.writeFileAsync(path, data, "UTF-8");
       } catch (e) {
-        qx.tool.compiler.Console.error(`Error exporting cache to ${path}:` + e.message);
+        qx.tool.compiler.Console.error(
+          `Error exporting cache to ${path}:` + e.message
+        );
+
         process.exit(1);
       }
     },
@@ -264,7 +285,7 @@ qx.Class.define("qx.tool.cli.commands.Package", {
     /**
      * Clears the cache
      */
-    clearCache : function() {
+    clearCache() {
       this.__cache = null;
       try {
         fs.unlinkSync(this.getCachePath());

package/source/class/qx/tool/cli/commands/Pkg.js

@@ -25,26 +25,29 @@ qx.Class.define("qx.tool.cli.commands.Pkg", {
      * The yargs command data
      * @return {{}}
      */
-    getYargsCommand: function() {
+    getYargsCommand() {
       return {
-        command : "pkg <command> [options]",
-        desc : "alias for 'qx package'",
-        builder : function(yargs) {
-          qx.tool.cli.Cli.addYargsCommands(yargs, [
-            "Install",
-            "List",
-            "Publish",
-            "Remove",
-            "Update",
-            "Upgrade",
-            "Migrate"
-          ], "qx.tool.cli.commands.package");
-          return yargs
-            .demandCommand()
-            .showHelpOnFail()
-            .help();
+        command: "pkg <command> [options]",
+        desc: "alias for 'qx package'",
+        builder(yargs) {
+          qx.tool.cli.Cli.addYargsCommands(
+            yargs,
+            [
+              "Install",
+              "List",
+              "Publish",
+              "Remove",
+              "Update",
+              "Upgrade",
+              "Migrate"
+            ],
+
+            "qx.tool.cli.commands.package"
+          );
+
+          return yargs.demandCommand().showHelpOnFail().help();
         },
-        handler : function(argv) {
+        handler(argv) {
           // Nothing
         }
       };

package/source/class/qx/tool/cli/commands/Run.js

@@ -26,25 +26,32 @@ qx.Class.define("qx.tool.cli.commands.Run", {
   extend: qx.tool.cli.commands.Compile,
 
   statics: {
-
     YARGS_BUILDER: {
-      "inspect": {
-        describe: "Whether to start node for debugging (ie with the --inspect argument)",
+      inspect: {
+        describe:
+          "Whether to start node for debugging (ie with the --inspect argument)",
         type: "boolean",
         default: false
       },
+
       "inspect-brk": {
-        describe: "Whether to start node for debugging and break immediately (ie with the --inspect-brk argument)",
+        describe:
+          "Whether to start node for debugging and break immediately (ie with the --inspect-brk argument)",
         type: "boolean",
         default: false
       }
     },
 
-    getYargsCommand: function() {
+    getYargsCommand() {
       return {
-        command   : "run [configFile]",
-        describe  : "runs a server application (written in node) with continuous compilation, using compile.json",
-        builder   : Object.assign({}, qx.tool.cli.commands.Compile.YARGS_BUILDER, qx.tool.cli.commands.Run.YARGS_BUILDER)
+        command: "run [configFile]",
+        describe:
+          "runs a server application (written in node) with continuous compilation, using compile.json",
+        builder: Object.assign(
+          {},
+          qx.tool.cli.commands.Compile.YARGS_BUILDER,
+          qx.tool.cli.commands.Run.YARGS_BUILDER
+        )
       };
     }
   },
@@ -53,33 +60,38 @@ qx.Class.define("qx.tool.cli.commands.Run", {
     /*
      * @Override
      */
-    process: async function() {
+    async process() {
       this.argv.watch = true;
       this.argv["machine-readable"] = false;
       this.argv["feedback"] = false;
-      await this.base(arguments);
+      await super.process();
       let config = this._getConfig();
       if (!config.run) {
         qx.tool.compiler.Console.print("qx.tool.cli.run.noRunConfig");
         process.exit(-1);
       }
-      
+
       if (!config.run.application) {
         qx.tool.compiler.Console.print("qx.tool.cli.run.noAppName");
         process.exit(-1);
       }
-      
+
       let maker = null;
       let app = null;
       this.getMakers().forEach(tmp => {
-        let apps = tmp.getApplications().filter(app => app.getName() == config.run.application);
+        let apps = tmp
+          .getApplications()
+          .filter(app => app.getName() == config.run.application);
         if (apps.length) {
           if (maker) {
             qx.tool.compiler.Console.print("qx.tool.cli.run.tooManyMakers");
             process.exit(-1);
           }
           if (apps.length != 1) {
-            qx.tool.compiler.Console.print("qx.tool.cli.run.tooManyApplications");
+            qx.tool.compiler.Console.print(
+              "qx.tool.cli.run.tooManyApplications"
+            );
+
             process.exit(-1);
           }
           maker = tmp;
@@ -94,12 +106,11 @@ qx.Class.define("qx.tool.cli.commands.Run", {
         qx.tool.compiler.Console.print("qx.tool.cli.run.mustBeNode");
         process.exit(-1);
       }
-      
+
       let target = maker.getTarget();
-      
-      
+
       let scriptname = path.join(target.getApplicationRoot(app), "index.js");
-      let args = config.run.arguments||"";
+      let args = config.run.arguments || "";
       let debug = "";
       if (this.argv["inspect-brk"]) {
         debug = " --inspect-brk";
@@ -107,25 +118,25 @@ qx.Class.define("qx.tool.cli.commands.Run", {
         debug = " --inspect";
       }
       let cmd = `node${debug} ${scriptname} ${args}`;
-      
+
       let restartNeeded = true;
       this.addListener("making", evt => {
         restartNeeded = false;
       });
-      
+
       this.addListener("writtenApplication", evt => {
         if (app === evt.getData()) {
           restartNeeded = true;
         }
       });
-      
+
       /* eslint-disable @qooxdoo/qx/no-illegal-private-usage */
       this.addListener("made", async e => {
         if (this.__process) {
           if (!restartNeeded) {
             return;
           }
-          
+
           try {
             await qx.tool.utils.Utils.killTree(this.__process.pid);
           } catch (ex) {
@@ -134,35 +145,44 @@ qx.Class.define("qx.tool.cli.commands.Run", {
           this.__process = null;
         }
         console.log("Starting application: " + cmd);
-        let child = this.__process = require("child_process").exec(cmd);
+        let child = (this.__process = require("child_process").exec(cmd));
         child.stdout.setEncoding("utf8");
-        child.stdout.on("data", function(data) {
+        child.stdout.on("data", function (data) {
           console.log(data);
         });
 
         child.stderr.setEncoding("utf8");
-        child.stderr.on("data", function(data) {
+        child.stderr.on("data", function (data) {
           console.error(data);
         });
 
-        child.on("close", function(code) {
+        child.on("close", function (code) {
           console.log("Application has terminated");
           this.__process = null;
-        });        
-        child.on("error", function(err) {
+        });
+        child.on("error", function (err) {
           console.error("Application has failed: " + err);
-        });        
+        });
       });
     }
   },
 
-  defer: function(statics) {
-    qx.tool.compiler.Console.addMessageIds({
-      "qx.tool.cli.run.noRunConfig": "Cannot run anything because the config.json does not have a `run` configuration",
-      "qx.tool.cli.run.noAppName": "Cannot run anything because the config.json does not specify a unique application name",
-      "qx.tool.cli.run.mustBeNode": "The application %1 is not a node application (only node applications are supported)",
-      "qx.tool.cli.run.tooManyMakers": "Cannot run anything because multiple targets are detected",
-      "qx.tool.cli.run.tooManyApplications": "Cannot run anything because multiple applications are detected"
-    }, "error");
+  defer(statics) {
+    qx.tool.compiler.Console.addMessageIds(
+      {
+        "qx.tool.cli.run.noRunConfig":
+          "Cannot run anything because the config.json does not have a `run` configuration",
+        "qx.tool.cli.run.noAppName":
+          "Cannot run anything because the config.json does not specify a unique application name",
+        "qx.tool.cli.run.mustBeNode":
+          "The application %1 is not a node application (only node applications are supported)",
+        "qx.tool.cli.run.tooManyMakers":
+          "Cannot run anything because multiple targets are detected",
+        "qx.tool.cli.run.tooManyApplications":
+          "Cannot run anything because multiple applications are detected"
+      },
+
+      "error"
+    );
   }
 });