@qooxdoo/framework 7.9.1 → 8.0.0-beta.1

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

@@ -24,7 +24,7 @@ const chokidar = require("chokidar");
 /**
  * @ignore(setImmediate)
  */
-qx.Class.define("qx.tool.cli.Watch", {
+qx.Class.define("qx.tool.compiler.cli.Watch", {
   extend: qx.core.Object,
 
   construct(maker) {
@@ -42,7 +42,7 @@ qx.Class.define("qx.tool.cli.Watch", {
   },
 
   properties: {
-    debug: {
+    debugging: {
       init: false,
       check: "Boolean"
     }
@@ -66,6 +66,8 @@ qx.Class.define("qx.tool.cli.Watch", {
   },
 
   members: {
+    _watcher: undefined,
+
     __runningPromise: null,
     __applications: null,
     __watcherReady: false,
@@ -119,6 +121,7 @@ qx.Class.define("qx.tool.cli.Watch", {
       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,
@@ -142,7 +145,7 @@ qx.Class.define("qx.tool.cli.Watch", {
     },
 
     start() {
-      if (this.isDebug()) {
+      if (this.isDebugging()) {
         qx.tool.compiler.Console.debug("DEBUG: Starting watch");
       }
       if (this.__runningPromise) {
@@ -190,7 +193,7 @@ qx.Class.define("qx.tool.cli.Watch", {
           }
         }
       });
-      if (this.isDebug()) {
+      if (this.isDebugging()) {
         qx.tool.compiler.Console.debug(
           `DEBUG: applications=${JSON.stringify(
             applications.map(d => d.application.getName()),
@@ -228,7 +231,7 @@ qx.Class.define("qx.tool.cli.Watch", {
             })
         )
       ).then(() => {
-        if (this.isDebug()) {
+        if (this.isDebugging()) {
           qx.tool.compiler.Console.debug(
             `DEBUG: confirmed=${JSON.stringify(confirmed, 2)}`
           );
@@ -240,10 +243,12 @@ qx.Class.define("qx.tool.cli.Watch", {
           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("ready", () => {
             qx.tool.compiler.Console.log(`Start watching ...`);
             this.__watcherReady = true;
@@ -251,8 +256,8 @@ qx.Class.define("qx.tool.cli.Watch", {
           watcher.on("error", err => {
             qx.tool.compiler.Console.print(
               err.code == "ENOSPC"
-                ? "qx.tool.cli.watch.enospcError"
-                : "qx.tool.cli.watch.watchError",
+                ? "qx.tool.compiler.cli.watch.enospcError"
+                : "qx.tool.compiler.cli.watch.watchError",
               err
             );
           });
@@ -281,7 +286,7 @@ qx.Class.define("qx.tool.cli.Watch", {
       var Console = qx.tool.compiler.Console;
 
       function make() {
-        Console.print("qx.tool.cli.watch.makingApplications");
+        Console.print("qx.tool.compiler.cli.watch.makingApplications");
         t.__madeApplications = null;
         var startTime = new Date().getTime();
         t.__stats.classesCompiled = 0;
@@ -291,14 +296,14 @@ qx.Class.define("qx.tool.cli.Watch", {
           .make()
           .then(() => {
             if (t.__stopping) {
-              Console.print("qx.tool.cli.watch.makeStopping");
+              Console.print("qx.tool.compiler.cli.watch.makeStopping");
               return null;
             }
 
             if (t.__outOfDate) {
               return new qx.Promise(resolve => {
                 setImmediate(function () {
-                  Console.print("qx.tool.cli.watch.restartingMake");
+                  Console.print("qx.tool.compiler.cli.watch.restartingMake");
                   t.fireEvent("remaking");
                   make().then(resolve);
                 });
@@ -338,7 +343,7 @@ qx.Class.define("qx.tool.cli.Watch", {
             return Promise.all(promises).then(() => {
               var endTime = new Date().getTime();
               Console.print(
-                "qx.tool.cli.watch.compiledClasses",
+                "qx.tool.compiler.cli.watch.compiledClasses",
                 t.__stats.classesCompiled,
                 qx.tool.utils.Utils.formatTime(endTime - startTime)
               );
@@ -350,7 +355,7 @@ qx.Class.define("qx.tool.cli.Watch", {
             t.__making = null;
           })
           .catch(err => {
-            Console.print("qx.tool.cli.watch.compileFailed", err);
+            Console.print("qx.tool.compiler.cli.watch.compileFailed", err);
             t.__making = null;
             t.fireEvent("made");
           });
@@ -392,7 +397,7 @@ qx.Class.define("qx.tool.cli.Watch", {
         var outOfDate = false;
 
         if (this.__configFilenames.find(str => str == filename)) {
-          if (this.isDebug()) {
+          if (this.isDebugging()) {
             Console.debug(`DEBUG: onFileChange: configChanged`);
           }
           this.fireEvent("configChanged");
@@ -416,7 +421,7 @@ qx.Class.define("qx.tool.cli.Watch", {
           }
         });
         let outOfDateAppNames = Object.keys(outOfDateApps);
-        if (this.isDebug()) {
+        if (this.isDebugging()) {
           if (outOfDateAppNames.length) {
             Console.debug(
               `DEBUG: onFileChange: ${filename} impacted applications: ${JSON.stringify(
@@ -469,7 +474,7 @@ qx.Class.define("qx.tool.cli.Watch", {
         if (fileType == "resource" || fileType == "theme") {
           let rm = analyser.getResourceManager();
           let target = this.__maker.getTarget();
-          if (this.isDebug()) {
+          if (this.isDebugging()) {
             Console.debug(`DEBUG: onFileChange: ${filename} is a resource`);
           }
           let asset = rm.getAsset(fName, type != "unlink");
@@ -482,6 +487,26 @@ qx.Class.define("qx.tool.cli.Watch", {
           }
         }
 
+        // Fix for Issue #10407: Source files (especially new ones) may not be in the dependency
+        // graph yet. For new files, we need to rescan the library to discover them, and for all
+        // source file changes we need to trigger a rebuild. This ensures that the compiler will
+        // detect and warn about unresolved symbols in newly added or modified files when running
+        // in watch mode.
+        if (fileType == "source" && type !== "unlink") {
+          if (this.isDebugging()) {
+            Console.debug(`DEBUG: onFileChange: ${filename} is a source file (${type}), triggering rebuild`);
+          }
+
+          // For newly added files, rescan the library to discover the new class
+          if (type == "add" && fileLibrary) {
+            if (this.isDebugging()) {
+              Console.debug(`DEBUG: onFileChange: rescanning library ${fileLibrary.getNamespace()} for new file`);
+            }
+          }
+
+          outOfDate = true;
+        }
+
         if (outOfDate) {
           this.__outOfDate = true;
           this.__scheduleMake();
@@ -506,7 +531,7 @@ qx.Class.define("qx.tool.cli.Watch", {
 
       dbc.types[type] = true;
       if (dbc.promise) {
-        if (this.isDebug()) {
+        if (this.isDebugging()) {
           Console.debug(
             `DEBUG: onFileChange: seen '${filename}', but restarting promise`
           );
@@ -519,7 +544,7 @@ qx.Class.define("qx.tool.cli.Watch", {
         dbc.timerId = null;
       }
 
-      if (this.isDebug()) {
+      if (this.isDebugging()) {
         Console.debug(`DEBUG: onFileChange: seen '${filename}', queuing`);
       }
       dbc.timerId = setTimeout(() => {
@@ -537,20 +562,20 @@ qx.Class.define("qx.tool.cli.Watch", {
 
   defer() {
     qx.tool.compiler.Console.addMessageIds({
-      "qx.tool.cli.watch.makingApplications": ">>> Making the applications...",
-      "qx.tool.cli.watch.restartingMake":
+      "qx.tool.compiler.cli.watch.makingApplications": ">>> Making the applications...",
+      "qx.tool.compiler.cli.watch.restartingMake":
         ">>> Code changed during make, restarting...",
-      "qx.tool.cli.watch.makeStopping":
+      "qx.tool.compiler.cli.watch.makeStopping":
         ">>> Not restarting make because make is stopping...",
-      "qx.tool.cli.watch.compiledClasses": ">>> Compiled %1 classes in %2"
+      "qx.tool.compiler.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":
+        "qx.tool.compiler.cli.watch.compileFailed": ">>> Fatal error during compile: %1",
+        "qx.tool.compiler.cli.watch.enospcError":
           ">>> ENOSPC error occured - try increasing fs.inotify.max_user_watches",
-        "qx.tool.cli.watch.watchError":
+        "qx.tool.compiler.cli.watch.watchError":
           ">>> Error occured while watching files - file modifications may not be detected; error: %1"
       },
 

package/source/class/qx/tool/compiler/cli/__init__.js

@@ -0,0 +1,3 @@
+/**
+ * doc is missing
+ */

package/source/class/qx/tool/{cli → compiler/cli}/api/AbstractApi.js

@@ -25,7 +25,7 @@ const fs = require("fs");
 /**
  * Base class for the compiler API classes
  */
-qx.Class.define("qx.tool.cli.api.AbstractApi", {
+qx.Class.define("qx.tool.compiler.cli.api.AbstractApi", {
   extend: qx.core.Object,
 
   properties: {
@@ -50,19 +50,10 @@ qx.Class.define("qx.tool.cli.api.AbstractApi", {
       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
-     */
-    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
+     * If not install the module with 'npm install --no-package-lock' to the current library
      *
      * @param module {String} module to check
      */

package/source/class/qx/tool/{cli → compiler/cli}/api/CompilerApi.js

@@ -27,8 +27,8 @@ 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,
+qx.Class.define("qx.tool.compiler.cli.api.CompilerApi", {
+  extend: qx.tool.compiler.cli.api.AbstractApi,
 
   construct() {
     super();
@@ -50,17 +50,19 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
     command: {
       init: null,
       nullable: true,
-      check: "qx.tool.cli.commands.Command",
-      event: "changeCommand"
+      check: "qx.tool.compiler.cli.Command",
+      event: "changeCommand",
+      async: true
     }
   },
 
   members: {
+    __compileJsonExists: true,
     __libraryApis: null,
 
     /**
      * Called after the command is loaded
-     * @param cmd {qx.tool.cli.commands.Command} current command
+     * @param cmd {qx.tool.compiler.cli.Command} current command
      */
     afterCommandLoaded(cmd) {
       // Nothing
@@ -68,7 +70,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * Register compiler tests
-     * @param cmd {qx.tool.cli.commands.Command} current command
+     * @param cmd {qx.tool.compiler.cli.Command} current command
      */
     async beforeTests(cmd) {
       // Nothing
@@ -91,7 +93,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
     /**
      * Loads the configuration data
      *
-     * @overridden
+     * @Override
      */
     async load() {
       let compileJsonPath = path.join(
@@ -104,19 +106,18 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
         config = await qx.tool.utils.Json.loadJsonAsync(compileJsonPath);
       } else {
         this.__compileJsonExists = false;
-        
       }
       this.setConfiguration(config);
       return super.load();
     },
 
-    compileJsonExists(){
+    compileJsonExists() {
       return this.__compileJsonExists;
     },
 
     /**
      * runs after the whole process is finished
-     * @param cmd {qx.tool.cli.commands.Command} current command
+     * @param cmd {qx.tool.compiler.cli.Command} current command
      * @param res {boolean} result of the just finished process
      */
     async afterProcessFinished(cmd, res) {

package/source/class/qx/tool/{cli → compiler/cli}/api/LibraryApi.js

@@ -22,22 +22,31 @@
 /**
  * Provides an API for an individual library
  */
-qx.Class.define("qx.tool.cli.api.LibraryApi", {
-  extend: qx.tool.cli.api.AbstractApi,
+qx.Class.define("qx.tool.compiler.cli.api.LibraryApi", {
+  extend: qx.tool.compiler.cli.api.AbstractApi,
 
   properties: {
     /** The Compiler API */
     compilerApi: {
       nullable: false,
-      check: "qx.tool.cli.api.CompilerApi"
+      check: "qx.tool.compiler.cli.api.CompilerApi"
     }
   },
 
   members: {
+    /**
+     * Called by the compiler API during initialisation - this is an ideal
+     * place to install additional commands, because a command has not yet
+     * been selected
+     */
+    initialize(cmd) {
+      // Nothing
+    },
+
     /**
      * Called to load any library-specific configuration and update the compilerConfig
      *
-     * @overridden
+     * @Override
      */
     async load() {
       return super.load();

package/source/class/qx/tool/{cli → compiler/cli}/api/Test.js

@@ -14,7 +14,7 @@
 /**
  * This is used to add an test case for qx test
  */
-qx.Class.define("qx.tool.cli.api.Test", {
+qx.Class.define("qx.tool.compiler.cli.api.Test", {
   extend: qx.core.Object,
   construct(name, testFunction) {
     super();

package/source/class/qx/tool/compiler/cli/commands/Add.js

@@ -0,0 +1,49 @@
+/* ************************************************************************
+
+   qooxdoo - the new era of web development
+
+   http://qooxdoo.org
+
+   Copyright:
+     2017 Christian Boulanger
+
+   License:
+     MIT: https://opensource.org/licenses/MIT
+     See the LICENSE file in the project's top-level directory for details.
+
+   Authors:
+     * Christian Boulanger (info@bibliograph.org, @cboulanger)
+     * Henner Kollmann (Henner.Kollmann@gmx.de, @hkollmann)
+
+************************************************************************ */
+/**
+ * Adds scripts, classes, etc. to the projects
+ *
+ * @use(qx.tool.compiler.cli.commands.add)
+ */
+qx.Class.define("qx.tool.compiler.cli.commands.Add", {
+  extend: qx.tool.compiler.cli.Command,
+
+  statics: {
+    async createCliCommand(clazz = this) {
+      let cmd = await qx.tool.compiler.cli.Command.createCliCommand(clazz);
+      cmd.set({
+        name: "add",
+        description:
+          "adds new elements to an existing qooxdoo application/library."
+      });
+      cmd.setRun(null);
+      await qx.tool.compiler.cli.Command.addSubcommands(cmd, qx.tool.compiler.cli.commands.add);
+      return cmd;
+    }
+  },
+
+  members: {
+    /*
+     * @Override
+     */
+    async process() {
+    }
+
+  }
+});

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

@@ -20,25 +20,21 @@
 const fs = require("fs");
 const process = require("process");
 const path = require("upath");
-const rimraf = require("rimraf");
 
 /**
  * Cleans generated and cache files
  */
-qx.Class.define("qx.tool.cli.commands.Clean", {
-  extend: qx.tool.cli.commands.Command,
+qx.Class.define("qx.tool.compiler.cli.commands.Clean", {
+  extend: qx.tool.compiler.cli.Command,
   statics: {
-    getYargsCommand() {
-      return {
-        command: "clean",
-        describe: "cleans generated files and caches.",
-        builder: {
-          verbose: {
-            alias: "v",
-            describe: "Verbose logging"
-          }
-        }
-      };
+    async createCliCommand(clazz = this) {
+      let cmd = await qx.tool.compiler.cli.Command.createCliCommand(clazz);
+      cmd.set({
+        name: "clean",
+        description: "cleans generated files and caches."
+      });
+
+      return cmd;
     }
   },
 
@@ -47,7 +43,6 @@ qx.Class.define("qx.tool.cli.commands.Clean", {
      * Deletes all generated and cache files
      */
     async process() {
-      super.process();
       let compileConfig = await qx.tool.config.Compile.getInstance().load();
       for (let target of compileConfig.getValue("targets")) {
         await this.__removePath(path.join(process.cwd(), target.outputPath));
@@ -56,7 +51,7 @@ qx.Class.define("qx.tool.cli.commands.Clean", {
         }
       }
       await this.__removePath(
-        path.join(process.cwd(), qx.tool.cli.commands.Package.cache_dir)
+        path.join(process.cwd(), qx.tool.compiler.cli.commands.Package.cache_dir)
       );
 
       // check if we have to migrate files
@@ -68,15 +63,7 @@ qx.Class.define("qx.tool.cli.commands.Clean", {
         if (this.argv.verbose) {
           qx.tool.compiler.Console.info(`Removing ${pathToRemove}...`);
         }
-        await new Promise((resolve, reject) => {
-          rimraf(pathToRemove, {}, err => {
-            if (err) {
-              reject(err);
-            } else {
-              resolve();
-            }
-          });
-        });
+        await qx.tool.utils.files.Utils.deleteRecursive(pathToRemove);
       }
     }
   }