@qooxdoo/framework 7.0.0-beta → 7.0.0-beta.4

package/source/class/qx/tool/compiler/targets/meta/ApplicationMeta.js

@@ -1,3 +1,25 @@
+/* ************************************************************************
+ *
+ *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
+ *    toolchain
+ *
+ *    https://github.com/qooxdoo/qooxdoo-compiler
+ *
+ *    Copyright:
+ *      2011-2021 Zenesis Limited, http://www.zenesis.com
+ *
+ *    License:
+ *      MIT: https://opensource.org/licenses/MIT
+ *
+ *      This software is provided under the same licensing terms as Qooxdoo,
+ *      please see the LICENSE file in the Qooxdoo project's top-level directory
+ *      for details.
+ *
+ *    Authors:
+ *      * John Spackman (john.spackman@zenesis.com, @johnspackman)
+ *
+ * ************************************************************************/
+
 /**
  * ApplicationMeta collects all the data about an application being compiled by a target, 
  * in a form easily navigated and well documented.  
@@ -33,6 +55,14 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
       // Any object
     },
     
+    /**
+     * Whether to add timestamps to all URLs (cache busting)
+     */
+     addTimestampsToUrls: {
+      init: true,
+      check: "Boolean"
+    },
+
     appLibrary: {
       check: "qx.tool.compiler.app.Library"
     },

package/source/class/qx/tool/compiler/targets/meta/BootJs.js

@@ -1,3 +1,25 @@
+/* ************************************************************************
+ *
+ *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
+ *    toolchain
+ *
+ *    https://github.com/qooxdoo/qooxdoo-compiler
+ *
+ *    Copyright:
+ *      2011-2021 Zenesis Limited, http://www.zenesis.com
+ *
+ *    License:
+ *      MIT: https://opensource.org/licenses/MIT
+ *
+ *      This software is provided under the same licensing terms as Qooxdoo,
+ *      please see the LICENSE file in the Qooxdoo project's top-level directory
+ *      for details.
+ *
+ *    Authors:
+ *      * John Spackman (john.spackman@zenesis.com, @johnspackman)
+ *
+ * ************************************************************************/
+
 
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");

package/source/class/qx/tool/compiler/targets/meta/Javascript.js

@@ -1,3 +1,25 @@
+/* ************************************************************************
+ *
+ *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
+ *    toolchain
+ *
+ *    https://github.com/qooxdoo/qooxdoo-compiler
+ *
+ *    Copyright:
+ *      2011-2021 Zenesis Limited, http://www.zenesis.com
+ *
+ *    License:
+ *      MIT: https://opensource.org/licenses/MIT
+ *
+ *      This software is provided under the same licensing terms as Qooxdoo,
+ *      please see the LICENSE file in the Qooxdoo project's top-level directory
+ *      for details.
+ *
+ *    Authors:
+ *      * John Spackman (john.spackman@zenesis.com, @johnspackman)
+ *
+ * ************************************************************************/
+
 const fs = qx.tool.utils.Promisify.fs;
 
 /**

package/source/class/qx/tool/compiler/targets/meta/Package.js

@@ -1,4 +1,27 @@
+/* ************************************************************************
+ *
+ *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
+ *    toolchain
+ *
+ *    https://github.com/qooxdoo/qooxdoo-compiler
+ *
+ *    Copyright:
+ *      2011-2021 Zenesis Limited, http://www.zenesis.com
+ *
+ *    License:
+ *      MIT: https://opensource.org/licenses/MIT
+ *
+ *      This software is provided under the same licensing terms as Qooxdoo,
+ *      please see the LICENSE file in the Qooxdoo project's top-level directory
+ *      for details.
+ *
+ *    Authors:
+ *      * John Spackman (john.spackman@zenesis.com, @johnspackman)
+ *
+ * ************************************************************************/
+
 const path = require("upath");
+const fs = require("fs");
 
 /**
  * A Package is a collection of files and resources, used by either the boot process
@@ -241,11 +264,23 @@ qx.Class.define("qx.tool.compiler.targets.meta.Package", {
         uris: [ ]
       };
       let appRoot = this.__appMeta.getApplicationRoot();
+      const toUri = filename => {
+        if (this.__appMeta.isAddTimestampsToUrls()) {
+          let stat = fs.statSync(filename, { throwIfNoEntry: false });
+          let uri = path.relative(appRoot, filename);
+          if (stat) {
+            uri += "?" + stat.mtimeMs;
+          }
+          return uri;
+        } else {
+          return path.relative(appRoot, filename);
+        }
+      }
       if (!this.isEmbedAllJavascript()) {
-        data.uris = this.__javascriptMetas.map(js => path.relative(appRoot, js.getFilename()));
+        data.uris = this.__javascriptMetas.map(js => toUri(js.getFilename()));
       }
       if (this.isNeedsWriteToDisk()) {
-        data.uris.unshift(path.relative(appRoot, this.__javascript.getFilename()));
+        data.uris.unshift(toUri(this.__javascript.getFilename()));
       }
     },
     

package/source/class/qx/tool/compiler/targets/meta/PackageJavascript.js

@@ -1,3 +1,25 @@
+/* ************************************************************************
+ *
+ *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
+ *    toolchain
+ *
+ *    https://github.com/qooxdoo/qooxdoo-compiler
+ *
+ *    Copyright:
+ *      2011-2021 Zenesis Limited, http://www.zenesis.com
+ *
+ *    License:
+ *      MIT: https://opensource.org/licenses/MIT
+ *
+ *      This software is provided under the same licensing terms as Qooxdoo,
+ *      please see the LICENSE file in the Qooxdoo project's top-level directory
+ *      for details.
+ *
+ *    Authors:
+ *      * John Spackman (john.spackman@zenesis.com, @johnspackman)
+ *
+ * ************************************************************************/
+
 const path = require("upath");
 
 /**

package/source/class/qx/tool/compiler/targets/meta/Part.js

@@ -1,3 +1,25 @@
+/* ************************************************************************
+ *
+ *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
+ *    toolchain
+ *
+ *    https://github.com/qooxdoo/qooxdoo-compiler
+ *
+ *    Copyright:
+ *      2011-2021 Zenesis Limited, http://www.zenesis.com
+ *
+ *    License:
+ *      MIT: https://opensource.org/licenses/MIT
+ *
+ *      This software is provided under the same licensing terms as Qooxdoo,
+ *      please see the LICENSE file in the Qooxdoo project's top-level directory
+ *      for details.
+ *
+ *    Authors:
+ *      * John Spackman (john.spackman@zenesis.com, @johnspackman)
+ *
+ * ************************************************************************/
+
 
 /**
  * A Part collects together all of the javascript files required for a single

package/source/class/qx/tool/compiler/targets/meta/PolyfillJs.js

@@ -1,30 +1,52 @@
+/* ************************************************************************
+ *
+ *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
+ *    toolchain
+ *
+ *    https://github.com/qooxdoo/qooxdoo-compiler
+ *
+ *    Copyright:
+ *      2011-2021 Zenesis Limited, http://www.zenesis.com
+ *
+ *    License:
+ *      MIT: https://opensource.org/licenses/MIT
+ *
+ *      This software is provided under the same licensing terms as Qooxdoo,
+ *      please see the LICENSE file in the Qooxdoo project's top-level directory
+ *      for details.
+ *
+ *    Authors:
+ *      * John Spackman (john.spackman@zenesis.com, @johnspackman)
+ *
+ * ************************************************************************/
+
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
 
 /**
- * Represents a "polyfill.js" that is generated as part of a compile 
+ * Represents a "polyfill.js" that is generated as part of a compile
  */
 qx.Class.define("qx.tool.compiler.targets.meta.PolyfillJs", {
   extend: qx.tool.compiler.targets.meta.AbstractJavascriptMeta,
-  
+
   construct(appMeta) {
     this.base(arguments, appMeta, `${appMeta.getApplicationRoot()}polyfill.js`);
   },
-  
+
   properties: {
     needsWriteToDisk: {
       init: true,
       refine: true
     }
   },
-  
+
   members: {
-    
+
     /*
      * @Override
      */
     async writeSourceCodeToStream(ws) {
-      const srcFilename = path.join(require.resolve("@babel/polyfill"), "../../dist/polyfill.js");
+      const srcFilename = path.join(require.resolve("core-js-bundle"), "../minified.js");
       let rs = fs.createReadStream(srcFilename, "utf8");
       await new Promise((resolve, reject) => {
         rs.on("end", resolve);
@@ -32,7 +54,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.PolyfillJs", {
         rs.pipe(ws, { end: false });
       });
     },
-    
+
     /*
      * @Override
      */

package/source/class/qx/tool/compiler/targets/meta/Uglify.js

@@ -1,6 +1,28 @@
+/* ************************************************************************
+ *
+ *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
+ *    toolchain
+ *
+ *    https://github.com/qooxdoo/qooxdoo-compiler
+ *
+ *    Copyright:
+ *      2011-2021 Zenesis Limited, http://www.zenesis.com
+ *
+ *    License:
+ *      MIT: https://opensource.org/licenses/MIT
+ *
+ *      This software is provided under the same licensing terms as Qooxdoo,
+ *      please see the LICENSE file in the Qooxdoo project's top-level directory
+ *      for details.
+ *
+ *    Authors:
+ *      * John Spackman (john.spackman@zenesis.com, @johnspackman)
+ *
+ * ************************************************************************/
+
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
-const UglifyJS = require("uglify-es");
+const UglifyJS = require("uglify-js");
 
 qx.Class.define("qx.tool.compiler.targets.meta.Uglify", {
   extend: qx.tool.compiler.targets.meta.AbstractJavascriptMeta,

package/source/class/qx/tool/config/Abstract.js

@@ -332,7 +332,7 @@ qx.Class.define("qx.tool.config.Abstract", {
      */
     setValue(prop_path, value, options) {
       let originalValue = this.getValue(prop_path, options);
-      set_value(this.getData(), prop_path, value, options);
+      set_value(this.getData(), prop_path, value, {preservePaths:false});
       try {
         this.validate();
       } catch (e) {
@@ -340,7 +340,7 @@ qx.Class.define("qx.tool.config.Abstract", {
         if (originalValue === undefined) {
           unset_value(this.getData(), prop_path);
         } else {
-          set_value(this.getData(), prop_path, originalValue, options);
+          set_value(this.getData(), prop_path, originalValue, {preservePaths:false});
         }
         // throw
         throw e;
@@ -362,7 +362,7 @@ qx.Class.define("qx.tool.config.Abstract", {
         this.validate();
       } catch (e) {
         // revert value
-        set_value(this.getData(), prop_path, originalValue, options);
+        set_value(this.getData(), prop_path, originalValue, {preservePaths:false});
         // throw
         throw e;
       }

package/source/class/qx/tool/config/Utils.js

@@ -191,7 +191,7 @@ qx.Class.define("qx.tool.config.Utils", {
 
         throw new qx.tool.utils.Utils.UserError(`Path to the qx library cannot be determined.`);
       };
-  
+
       this.__qxPathPromise = getQxPathImpl();
       return await this.__qxPathPromise;
     },
@@ -217,6 +217,15 @@ qx.Class.define("qx.tool.config.Utils", {
       return qx.tool.config.Utils.getLibraryVersion(qxpath);
     },
 
+    /**
+     * returns the compiler version.
+     * The version is written during compiler compile into the enviroment
+     * @return {String}
+     */
+     getCompilerVersion() {
+      return qx.core.Environment.get("qx.compiler.version");
+    },
+
     /**
      * Returns the qooxdoo version used in the application in the current or given
      * directory. Throws if no such version can be determined

package/source/class/qx/tool/utils/IndexedArray.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/utils/Json.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2018 Zenesis Limited, http://www.zenesis.com
@@ -59,7 +59,7 @@ qx.Class.define("qx.tool.utils.Json", {
     validate(json, schema, warnOnly=false) {
       let ajv = new Ajv({
         allErrors: true,
-        jsonPointers: true
+        strict: false
       });
       if (qx.lang.Type.isArray(schema)) {
         ajv.addSchema(schema);

package/source/class/qx/tool/utils/LogManager.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/utils/Logger.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/utils/Promisify.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/utils/Utils.js

@@ -20,6 +20,7 @@ const fs = require("fs");
 const async = require("async");
 const {promisify} = require("util");
 const child_process = require("child_process");
+const psTree = require("ps-tree");
 
 /**
  * Utility methods
@@ -275,7 +276,7 @@ qx.Class.define("qx.tool.utils.Utils", {
       if (!options.log) {
         options.log = console.log;
       }
-      return new Promise((resolve, reject) => {
+      return await new Promise((resolve, reject) => {
         let env = process.env;
         if (options.env) {
           env = Object.assign({}, env);
@@ -363,6 +364,122 @@ qx.Class.define("qx.tool.utils.Utils", {
       });
     },
 
+    /**
+     * Parses a command line and separates them out into an array that can be given to `child_process.spawn` etc
+     * 
+     * @param {String} cmd 
+     * @returns {String[]}
+     */
+    parseCommand(str) {
+      let inQuote = null;
+      let inArg = false;
+      let lastC = null;
+      let start = 0;
+      let args = [];
+      for (let i = 0; i < str.length; i++) {
+        let c = str[i];
+        if (inQuote) {
+          if (c == inQuote) {
+            inQuote = null;
+          }
+          continue;
+        }
+        if (c == "\"" || c == "\'") {
+          inQuote = c;
+          if (!inArg) {
+            inArg = true;
+            start = i;
+          }
+          continue;
+        }
+        if (c == " " || c == "\t") {
+          if (inArg) {
+            let arg = str.substring(start, i);
+            args.push(arg);
+            inArg = false;
+          }
+        } else {
+          if (!inArg) {
+            inArg = true;
+            start = i;
+          }
+        }
+      }
+      if (inArg) {
+        let arg = str.substring(start);
+        args.push(arg);
+      }
+      return args;
+    },
+
+    /**
+     * Quotes special characters in the argument array, ensuring that they are safe to pass to the command line
+     * 
+     * @param {String[]} cmd 
+     * @returns {String[]}
+     */
+    quoteCommand(cmd) {
+      const SPECIALS = "&*?;# \"";
+      cmd = cmd.map(arg => {
+        let c = arg[0];
+        if ((c == '\'' || c == '\"') && c == arg[arg.length-1]) {
+          return arg;
+        }
+        if (arg.indexOf('\'') > -1) {
+          if (arg.indexOf('\"') > -1) {
+            return "$'" + arg.replace(/'/g, "\\'") + "'";
+          }
+          return '\"' + arg + '\"';
+        }
+        for (let i = 0; i < SPECIALS.length; i++) {
+          if (arg.indexOf(SPECIALS[i]) > -1) {
+            return "'" + arg + "'";
+          }
+        }
+        return arg;
+      });
+      return cmd;      
+    },
+    
+    /**
+     * Reformats a command line
+     * 
+     * @param {String} cmd 
+     * @returns {String}
+     */
+    formatCommand(cmd) {
+      return qx.tool.utils.Utils.quoteCommand(cmd).join(" ");
+    },
+
+    /**
+     * Kills a process tree
+     * 
+     * @param {Number} parentId parent process ID to kill
+     */
+    async killTree(parentId) {
+      await new qx.Promise((resolve, reject) => {
+        psTree(parentId, function (err, children) {
+          if (err) { 
+            reject(err);
+            return;
+          }
+          children.forEach(item => {
+            try {
+              process.kill(item.PID);
+            } catch (ex) {
+              // Nothing
+            }
+          });
+          try {
+            process.kill(parentId);
+          } catch (ex) {
+            // Nothing
+          }
+          resolve();
+        });
+      });
+    },
+
     /**
      * Returns the absolute path to the template directory
      * @return {String}

package/source/class/qx/tool/utils/Values.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/utils/Website.js

@@ -29,7 +29,12 @@ const layouts = require("metalsmith-layouts");
 const markdown = require("metalsmith-markdown");
 //const filenames = require("metalsmith-filenames");
 //var permalinks = require("metalsmith-permalinks");
-const sass = require("node-sass");
+/**
+ * @external(qx/tool/loadsass.js)
+ * @ignore(loadSass)
+ */
+/* global loadSass */
+const sass = loadSass();
 const chokidar = require("chokidar");
 
 // config
@@ -76,19 +81,19 @@ qx.Class.define("qx.tool.utils.Website", {
   members: {
     /** @type {chokidar} watcher */
     __watcher: null,
-    
+
     /** @type {Boolean} whether the watcher is ready yet */
     __watcherReady: false,
-    
+
     /** @type {Integer} setTimeout timer ID for debouncing builds */
     __rebuildTimer: null,
-    
+
     /** @type {Boolean} Whether the build is currently taking place */
     __rebuilding: false,
-    
+
     /** @type {Boolean} Whether a rebuild is needed ASAP */
     __needsRebuild: false,
-    
+
     /**
      * Starts the watcher for files in the source directory and compiles as needed
      */
@@ -118,10 +123,10 @@ qx.Class.define("qx.tool.utils.Website", {
         this.__watcherReady = false;
       }
     },
-    
+
     /**
      * Whether the watcher is running
-     * 
+     *
      * @return {Boolean} true if its running
      */
     isWatching() {
@@ -136,7 +141,7 @@ qx.Class.define("qx.tool.utils.Website", {
         await this.__rebuildPromise;
       }
     },
-    
+
     /**
      * Rebuilds everything needed for the website
      */
@@ -147,7 +152,7 @@ qx.Class.define("qx.tool.utils.Website", {
 
     /**
      * Event handler for changes to the source files
-     * 
+     *
      * @param type {String} type of change, one of "change", "add", "unlink"
      * @param filename {String} the file that changed
      */
@@ -158,13 +163,13 @@ qx.Class.define("qx.tool.utils.Website", {
         }
       }
     },
-    
+
     /**
      * Triggers a rebuild of the website, asynchronously.  Unless immediate is true,
      * the rebuild will only happen after a short delay; but each time this is called,
      * the delay is restarted.  This is to allow multiple files to be changed without
      * swamping the processor with compilations.
-     * 
+     *
      * @param immediate {Boolean?} if true, rebuild starts ASAP
      */
     triggerRebuild(immediate) {
@@ -172,16 +177,16 @@ qx.Class.define("qx.tool.utils.Website", {
         this.__needsRebuild = true;
         return;
       }
-      
+
       let rebuilderImpl = async () => {
         await this.rebuildAll();
-        
+
         if (this.__needsRebuild) {
           this.__needsRebuild = false;
           await rebuilderImpl();
         }
       };
-      
+
       let rebuilder = async () => {
         this.__rebuilding = true;
         try {
@@ -192,14 +197,14 @@ qx.Class.define("qx.tool.utils.Website", {
           this.__rebuilding = false;
         }
       };
-      
+
       if (this.__rebuildTimer) {
         clearTimeout(this.__rebuildTimer);
         this.__rebuildTimer = null;
       }
       this.__rebuildTimer = setTimeout(rebuilder, immediate ? 1 : 250);
     },
-    
+
     /**
      * Metalsmith Plugin that collates a list of pages that are to be included in the site navigation
      * into the metadata, along with their URLs.
@@ -262,7 +267,7 @@ qx.Class.define("qx.tool.utils.Website", {
         }
         let [unused, name, ext] = m;
         if (unused) {
-          // this is simply to avoid linting errors until https://github.com/qooxdoo/qooxdoo-compiler/issues/461 is fixed
+          // this is simply to avoid linting errors until https://github.com/qooxdoo/qooxdoo/issues/461 is fixed
         }
         let data = await fs.readFileAsync(path.join(partialsDir, filename), "utf8");
         let fn;