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

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

@@ -16,7 +16,6 @@
 
 ************************************************************************ */
 
-
 const fs = require("fs");
 const path = require("upath");
 const chokidar = require("chokidar");
@@ -24,33 +23,34 @@ const chokidar = require("chokidar");
 qx.Class.define("qx.tool.cli.Watch", {
   extend: qx.core.Object,
 
-  construct: function(maker) {
-    this.base(arguments);
+  construct(maker) {
+    super();
     this.__maker = maker;
     this.__stats = {
       classesCompiled: 0
     };
+
     this.__debounceChanges = {};
     this.__configFilenames = [];
     this.__runWhenWatching = {};
 
     maker.addListener("writtenApplication", this._onWrittenApplication, this);
   },
-  
+
   properties: {
     debug: {
       init: false,
       check: "Boolean"
     }
   },
-  
+
   events: {
-    "making": "qx.event.type.Event",
-    "remaking": "qx.event.type.Event",
-    "made": "qx.event.type.Event",
-    "configChanged": "qx.event.type.Event"
+    making: "qx.event.type.Event",
+    remaking: "qx.event.type.Event",
+    made: "qx.event.type.Event",
+    configChanged: "qx.event.type.Event"
   },
-  
+
   members: {
     __runningPromise: null,
     __applications: null,
@@ -67,7 +67,7 @@ qx.Class.define("qx.tool.cli.Watch", {
 
     /** @type{Map<String,Object>} list of runWhenWatching configurations, indexed by app name */
     __runWhenWatching: null,
-    
+
     async setConfigFilenames(arr) {
       if (!arr) {
         this.__configFilenames = [];
@@ -103,20 +103,29 @@ qx.Class.define("qx.tool.cli.Watch", {
         config._process = null;
       }
 
-      console.log("Starting application: " + config._cmd + " " + config._args.join(" "));
+      console.log(
+        "Starting application: " + config._cmd + " " + config._args.join(" ")
+      );
+
       config._processPromise = new qx.Promise((resolve, reject) => {
-        let child = config._process = require("child_process").spawn(config._cmd, config._args);
+        let child = (config._process = require("child_process").spawn(
+          config._cmd,
+          config._args
+        ));
+
         child.stdout.setEncoding("utf8");
         child.stdout.on("data", data => console.log(data));
         child.stderr.setEncoding("utf8");
         child.stderr.on("data", data => console.log(data));
-  
-        child.on("close", function(code) {
+
+        child.on("close", function (code) {
           console.log("Application has terminated");
           config._process = null;
           resolve();
-        });        
-        child.on("error", err => console.error("Application has failed: " + err));
+        });
+        child.on("error", err =>
+          console.error("Application has failed: " + err)
+        );
       });
     },
 
@@ -129,14 +138,19 @@ qx.Class.define("qx.tool.cli.Watch", {
       }
       this.__runningPromise = qx.tool.utils.Utils.newExternalPromise();
 
-      var dirs = [ ];
+      var dirs = [];
       var analyser = this.__maker.getAnalyser();
-      analyser.addListener("compiledClass", function() {
-        this.__stats.classesCompiled++;
-      }, this);
+      analyser.addListener(
+        "compiledClass",
+        function () {
+          this.__stats.classesCompiled++;
+        },
+        this
+      );
+
       dirs.push(qx.tool.config.Compile.config.fileName);
       dirs.push("compile.js");
-      analyser.getLibraries().forEach(function(lib) {
+      analyser.getLibraries().forEach(function (lib) {
         let dir = path.join(lib.getRootDir(), lib.getSourcePath());
         dirs.push(dir);
         dir = path.join(lib.getRootDir(), lib.getResourcePath());
@@ -144,13 +158,14 @@ qx.Class.define("qx.tool.cli.Watch", {
         dir = path.join(lib.getRootDir(), lib.getThemePath());
         dirs.push(dir);
       });
-      var applications = this.__applications = [];
-      this.__maker.getApplications().forEach(function(application) {
+      var applications = (this.__applications = []);
+      this.__maker.getApplications().forEach(function (application) {
         var data = {
           application: application,
           dependsOn: {},
           outOfDate: false
         };
+
         applications.push(data);
         let dir = application.getBootPath();
         if (dir && !dirs.includes(dir)) {
@@ -158,46 +173,72 @@ qx.Class.define("qx.tool.cli.Watch", {
         }
       });
       if (this.isDebug()) {
-        qx.tool.compiler.Console.debug(`DEBUG: applications=${JSON.stringify(applications.map(d => d.application.getName()), 2)}`);
-        qx.tool.compiler.Console.debug(`DEBUG: dirs=${JSON.stringify(dirs, 2)}`);
+        qx.tool.compiler.Console.debug(
+          `DEBUG: applications=${JSON.stringify(
+            applications.map(d => d.application.getName()),
+            2
+          )}`
+        );
+
+        qx.tool.compiler.Console.debug(
+          `DEBUG: dirs=${JSON.stringify(dirs, 2)}`
+        );
       }
       var confirmed = [];
-      Promise.all(dirs.map(dir => new Promise((resolve, reject) => {
-        dir = path.resolve(dir);
-        fs.stat(dir, function(err) {
-          if (err) {
-            if (err.code == "ENOENT") {
-              resolve();
-            } else {
-              reject(err);
-            }
-            return;
-          }
-
-          // On case insensitive (but case preserving) filing systems, qx.tool.utils.files.Utils.correctCase
-          // is needed corrects because chokidar needs the correct case in order to detect changes.
-          qx.tool.utils.files.Utils.correctCase(dir).then(dir => {
-            confirmed.push(dir);
-            resolve();
-          });
-        });
-      }))).then(() => {
+      Promise.all(
+        dirs.map(
+          dir =>
+            new Promise((resolve, reject) => {
+              dir = path.resolve(dir);
+              fs.stat(dir, function (err) {
+                if (err) {
+                  if (err.code == "ENOENT") {
+                    resolve();
+                  } else {
+                    reject(err);
+                  }
+                  return;
+                }
+
+                // On case insensitive (but case preserving) filing systems, qx.tool.utils.files.Utils.correctCase
+                // is needed corrects because chokidar needs the correct case in order to detect changes.
+                qx.tool.utils.files.Utils.correctCase(dir).then(dir => {
+                  confirmed.push(dir);
+                  resolve();
+                });
+              });
+            })
+        )
+      ).then(() => {
         if (this.isDebug()) {
-          qx.tool.compiler.Console.debug(`DEBUG: confirmed=${JSON.stringify(confirmed, 2)}`);
+          qx.tool.compiler.Console.debug(
+            `DEBUG: confirmed=${JSON.stringify(confirmed, 2)}`
+          );
         }
-        
-        var watcher = this._watcher = chokidar.watch(confirmed, {
+
+        var watcher = (this._watcher = chokidar.watch(confirmed, {
           //ignored: /(^|[\/\\])\../
-        });
-        watcher.on("change", filename => this.__onFileChange("change", filename));
+        }));
+        watcher.on("change", filename =>
+          this.__onFileChange("change", filename)
+        );
+
         watcher.on("add", filename => this.__onFileChange("add", filename));
-        watcher.on("unlink", filename => this.__onFileChange("unlink", filename));
+        watcher.on("unlink", filename =>
+          this.__onFileChange("unlink", filename)
+        );
+
         watcher.on("ready", () => {
           this.__watcherReady = true;
           this.__make();
         });
         watcher.on("error", err => {
-          qx.tool.compiler.Console.print(err.code == "ENOSPC" ? "qx.tool.cli.watch.enospcError" : "qx.tool.cli.watch.watchError", err);
+          qx.tool.compiler.Console.print(
+            err.code == "ENOSPC"
+              ? "qx.tool.cli.watch.enospcError"
+              : "qx.tool.cli.watch.watchError",
+            err
+          );
         });
       });
     },
@@ -226,16 +267,17 @@ qx.Class.define("qx.tool.cli.Watch", {
         t.__stats.classesCompiled = 0;
         t.__outOfDate = false;
 
-        return t.__maker.make()
+        return t.__maker
+          .make()
           .then(() => {
             if (t.__stopping) {
               Console.print("qx.tool.cli.watch.makeStopping");
               return null;
             }
-            
+
             if (t.__outOfDate) {
               return new qx.Promise(resolve => {
-                setImmediate(function() {
+                setImmediate(function () {
                   Console.print("qx.tool.cli.watch.restartingMake");
                   t.fireEvent("remaking");
                   make().then(resolve);
@@ -249,20 +291,31 @@ qx.Class.define("qx.tool.cli.Watch", {
             t.__applications.forEach(data => {
               data.dependsOn = {};
               var deps = data.application.getDependencies();
-              deps.forEach(function(classname) {
+              deps.forEach(function (classname) {
                 var info = db.classInfo[classname];
                 var lib = analyser.findLibrary(info.libraryName);
-                var parts = [ lib.getRootDir(), lib.getSourcePath() ].concat(classname.split("."));
+                var parts = [lib.getRootDir(), lib.getSourcePath()].concat(
+                  classname.split(".")
+                );
+
                 var filename = path.resolve.apply(path, parts) + ".js";
                 data.dependsOn[filename] = true;
               });
               var filename = path.resolve(data.application.getLoaderTemplate());
-              promises.push(qx.tool.utils.files.Utils.correctCase(filename)
-                .then(filename => data.dependsOn[filename] = true));
+              promises.push(
+                qx.tool.utils.files.Utils.correctCase(filename).then(
+                  filename => (data.dependsOn[filename] = true)
+                )
+              );
             });
             return Promise.all(promises).then(() => {
               var endTime = new Date().getTime();
-              Console.print("qx.tool.cli.watch.compiledClasses", t.__stats.classesCompiled, qx.tool.utils.Utils.formatTime(endTime - startTime));
+              Console.print(
+                "qx.tool.cli.watch.compiledClasses",
+                t.__stats.classesCompiled,
+                qx.tool.utils.Utils.formatTime(endTime - startTime)
+              );
+
               t.fireEvent("made");
             });
           })
@@ -275,9 +328,9 @@ qx.Class.define("qx.tool.cli.Watch", {
             t.fireEvent("made");
           });
       }
-      
-      const runIt = () => make()
-        .then(() => {
+
+      const runIt = () =>
+        make().then(() => {
           if (this.__makeNeedsRestart) {
             delete this.__makeNeedsRestart;
             return runIt();
@@ -285,7 +338,7 @@ qx.Class.define("qx.tool.cli.Watch", {
           return null;
         });
 
-      return this.__making = runIt();
+      return (this.__making = runIt());
     },
 
     __scheduleMake() {
@@ -310,7 +363,7 @@ qx.Class.define("qx.tool.cli.Watch", {
 
       const handleFileChange = async () => {
         var outOfDate = false;
-        
+
         if (this.__configFilenames.find(str => str == filename)) {
           if (this.isDebug()) {
             Console.debug(`DEBUG: onFileChange: configChanged`);
@@ -318,7 +371,7 @@ qx.Class.define("qx.tool.cli.Watch", {
           this.fireEvent("configChanged");
           return;
         }
-  
+
         let outOfDateApps = {};
         this.__applications.forEach(data => {
           if (data.dependsOn[filename]) {
@@ -338,27 +391,34 @@ qx.Class.define("qx.tool.cli.Watch", {
         let outOfDateAppNames = Object.keys(outOfDateApps);
         if (this.isDebug()) {
           if (outOfDateAppNames.length) {
-            Console.debug(`DEBUG: onFileChange: ${filename} impacted applications: ${JSON.stringify(outOfDateAppNames, 2)}`);
+            Console.debug(
+              `DEBUG: onFileChange: ${filename} impacted applications: ${JSON.stringify(
+                outOfDateAppNames,
+                2
+              )}`
+            );
           }
         }
-        
+
         let analyser = this.__maker.getAnalyser();
         let fName = "";
-        let isResource = analyser.getLibraries()
-          .some(lib => {
-            var dir = path.resolve(path.join(lib.getRootDir(), lib.getResourcePath()));
-            if (filename.startsWith(dir)) {
-              fName = path.relative(dir, filename);
-              return true;
-            }
-            dir = path.resolve(path.join(lib.getRootDir(), lib.getThemePath()));
-            if (filename.startsWith(dir)) {
-              fName = path.relative(dir, filename);
-              return true;
-            }
-            return false;
-          });
-        
+        let isResource = analyser.getLibraries().some(lib => {
+          var dir = path.resolve(
+            path.join(lib.getRootDir(), lib.getResourcePath())
+          );
+
+          if (filename.startsWith(dir)) {
+            fName = path.relative(dir, filename);
+            return true;
+          }
+          dir = path.resolve(path.join(lib.getRootDir(), lib.getThemePath()));
+          if (filename.startsWith(dir)) {
+            fName = path.relative(dir, filename);
+            return true;
+          }
+          return false;
+        });
+
         if (isResource) {
           let rm = analyser.getResourceManager();
           let target = this.__maker.getTarget();
@@ -374,22 +434,22 @@ qx.Class.define("qx.tool.cli.Watch", {
             }
           }
         }
-  
+
         if (outOfDate) {
           this.__outOfDate = true;
           this.__scheduleMake();
         }
       };
-      
-      const runIt = dbc => handleFileChange()
-        .then(() => {
+
+      const runIt = dbc =>
+        handleFileChange().then(() => {
           if (dbc.restart) {
             delete dbc.restart;
             return runIt(dbc);
           }
           return null;
         });
-      
+
       let dbc = this.__debounceChanges[filename];
       if (!dbc) {
         dbc = this.__debounceChanges[filename] = {
@@ -400,7 +460,9 @@ qx.Class.define("qx.tool.cli.Watch", {
       dbc.types[type] = true;
       if (dbc.promise) {
         if (this.isDebug()) {
-          Console.debug(`DEBUG: onFileChange: seen '${filename}', but restarting promise`);
+          Console.debug(
+            `DEBUG: onFileChange: seen '${filename}', but restarting promise`
+          );
         }
         dbc.restart = 1;
         return dbc.promise;
@@ -409,33 +471,43 @@ qx.Class.define("qx.tool.cli.Watch", {
         clearTimeout(dbc.timerId);
         dbc.timerId = null;
       }
-      
+
       if (this.isDebug()) {
         Console.debug(`DEBUG: onFileChange: seen '${filename}', queuing`);
       }
       dbc.timerId = setTimeout(() => {
-        dbc.promise = runIt(dbc)
-          .then(() => delete this.__debounceChanges[filename]);
+        dbc.promise = runIt(dbc).then(
+          () => delete this.__debounceChanges[filename]
+        );
       }, 150);
       return null;
     },
 
-    __onStop: function() {
+    __onStop() {
       this.__runningPromise.resolve();
     }
   },
 
-  defer: function() {
+  defer() {
     qx.tool.compiler.Console.addMessageIds({
       "qx.tool.cli.watch.makingApplications": ">>> Making the applications...",
-      "qx.tool.cli.watch.restartingMake" : ">>> Code changed during make, restarting...",
-      "qx.tool.cli.watch.makeStopping" : ">>> Not restarting make because make is stopping...",
+      "qx.tool.cli.watch.restartingMake":
+        ">>> Code changed during make, restarting...",
+      "qx.tool.cli.watch.makeStopping":
+        ">>> Not restarting make because make is stopping...",
       "qx.tool.cli.watch.compiledClasses": ">>> Compiled %1 classes in %2"
     });
-    qx.tool.compiler.Console.addMessageIds({
-      "qx.tool.cli.watch.compileFailed": ">>> Fatal error during compile: %1",
-      "qx.tool.cli.watch.enospcError": ">>> ENOSPC error occured - try increasing fs.inotify.max_user_watches",
-      "qx.tool.cli.watch.watchError": ">>> Error occured while watching files - file modifications may not be detected; error: %1"
-    }, "error");
+
+    qx.tool.compiler.Console.addMessageIds(
+      {
+        "qx.tool.cli.watch.compileFailed": ">>> Fatal error during compile: %1",
+        "qx.tool.cli.watch.enospcError":
+          ">>> ENOSPC error occured - try increasing fs.inotify.max_user_watches",
+        "qx.tool.cli.watch.watchError":
+          ">>> Error occured while watching files - file modifications may not be detected; error: %1"
+      },
+
+      "error"
+    );
   }
 });

package/source/class/qx/tool/cli/api/AbstractApi.js

@@ -20,25 +20,26 @@
  *
  * *********************************************************************** */
 const path = require("path");
-const fs = require("fs");      
+const fs = require("fs");
 
 /**
  * Base class for the compiler API classes
  */
 qx.Class.define("qx.tool.cli.api.AbstractApi", {
   extend: qx.core.Object,
-  
+
   properties: {
     rootDir: {
       check: "String",
       nullable: false
     },
+
     /** Configuration data for the compiler */
     configuration: {
       init: {}
     }
   },
-  
+
   members: {
     /**
      * Loads the configuration
@@ -48,28 +49,28 @@ qx.Class.define("qx.tool.cli.api.AbstractApi", {
     async load() {
       return this.getConfiguration();
     },
-    
+
     /**
      * Called by the compiler API during initialisation - this is an ideal
      * place to install additional commands, because a command has not yet
-     * been selected 
+     * been selected
      */
     async initialize() {
       // Nothing
     },
 
     /**
-     * 
+     *
      * helper to load an npm module. Check if it can be loaded before
      * If not install the module with 'npm install --no-save --no-package-lock' to the current library
-     * 
+     *
      * @param module {String} module to check
      */
-    require: function(module) {
+    require(module) {
       let mod = path.join(process.cwd(), "node_modules");
       if (!fs.existsSync(mod)) {
         fs.mkdirSync(mod);
-      }        
+      }
       mod = path.join(mod, module);
       let exists = fs.existsSync(mod);
       if (!exists) {
@@ -78,20 +79,18 @@ qx.Class.define("qx.tool.cli.api.AbstractApi", {
       return require(mod);
     },
     /**
-      * 
-      * install an npm module with 'npm install --no-save --no-package-lock' to the current library
-      * 
-      * @param module {String} module to load
-      */
-    loadNpmModule: function(module) {
-      const {execSync} = require("child_process");
+     *
+     * install an npm module with 'npm install --no-save --no-package-lock' to the current library
+     *
+     * @param module {String} module to load
+     */
+    loadNpmModule(module) {
+      const { execSync } = require("child_process");
       let s = `npm install --no-save --no-package-lock ${module}`;
       qx.tool.compiler.Console.info(s);
       execSync(s, {
         stdio: "inherit"
       });
     }
-  
-
   }
 });

package/source/class/qx/tool/cli/api/CompilerApi.js

@@ -25,17 +25,21 @@ const fs = qx.tool.utils.Promisify.fs;
 
 /**
  * Provides an API for the compiler
- * 
+ *
  */
 qx.Class.define("qx.tool.cli.api.CompilerApi", {
   extend: qx.tool.cli.api.AbstractApi,
 
-  construct: function () {
-    this.base(arguments);
+  construct() {
+    super();
     this.__libraryApis = {};
-    this.addListener("changeCommand", function () {
-      this.afterCommandLoaded(this.getCommand());
-    }, this);
+    this.addListener(
+      "changeCommand",
+      function () {
+        this.afterCommandLoaded(this.getCommand());
+      },
+      this
+    );
   },
 
   properties: {
@@ -75,7 +79,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * called after deployment happens
-     * 
+     *
      * @param data {Object}  contains deployment infos with the following properties:
      *           targetDir  : {String}  The target dir of the build
      *           deployDir  : {String}  The output dir for the deployment
@@ -89,17 +93,30 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * Loads the configuration data
-     * 
+     *
      * @overridden
      */
     async load() {
-      let compileJsonPath = path.join(this.getRootDir(), this.getConfigFilename());
+      let compileJsonPath = path.join(
+        this.getRootDir(),
+        this.getConfigFilename()
+      );
+
       let config = {};
       if (await fs.existsAsync(compileJsonPath)) {
         config = await qx.tool.utils.Json.loadJsonAsync(compileJsonPath);
       }
       this.setConfiguration(config);
-      return this.base(arguments);
+      return super.load();
+    },
+
+    /**
+     * runs after the whole process is finished
+     * @param cmd {qx.tool.cli.commands.Command} current command
+     * @param res {boolean} result of the just finished process
+     */
+    async afterProcessFinished(cmd, res) {
+      // Nothing
     },
 
     /**
@@ -113,7 +130,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * Adds a library configuration
-     * 
+     *
      * @param libraryApi {LibraryApi} the configuration for the library
      */
     addLibraryApi(libraryApi) {
@@ -123,7 +140,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * Returns an array of library configurations
-     * 
+     *
      * @return {LibraryApi[]}
      */
     getLibraryApis() {