@qooxdoo/framework 7.0.0-beta.6 → 7.0.0

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

@@ -21,20 +21,20 @@
  * ************************************************************************/
 
 /**
- * ApplicationMeta collects all the data about an application being compiled by a target, 
- * in a form easily navigated and well documented.  
- * 
- * It provides an abstraction where the target can choose to restructure and reorganise the 
- * output as it progresses - for example, a target may start by assembling a number of 
- * javascript files, and then bundle them together, effectively replacing several files 
- * with just one intermediate file; the target can then replace the intermediate file with 
+ * ApplicationMeta collects all the data about an application being compiled by a target,
+ * in a form easily navigated and well documented.
+ *
+ * It provides an abstraction where the target can choose to restructure and reorganise the
+ * output as it progresses - for example, a target may start by assembling a number of
+ * javascript files, and then bundle them together, effectively replacing several files
+ * with just one intermediate file; the target can then replace the intermediate file with
  * a minified file etc.
  */
 qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
   extend: qx.core.Object,
-  
+
   construct(target, application) {
-    this.base(arguments);
+    super();
     this.__target = target;
     this.__application = application;
     this.__libraries = [];
@@ -42,23 +42,24 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
       urisBefore: [],
       cssBefore: []
     };
+
     this.__preBootCode = [];
     this.__resources = {};
     this.__packages = [];
     this.__parts = [];
     this.__partsLookup = {};
   },
-  
+
   properties: {
     /** The environment for the build */
     environment: {
       // Any object
     },
-    
+
     /**
      * Whether to add timestamps to all URLs (cache busting)
      */
-     addTimestampsToUrls: {
+    addTimestampsToUrls: {
       init: true,
       check: "Boolean"
     },
@@ -66,51 +67,50 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
     appLibrary: {
       check: "qx.tool.compiler.app.Library"
     },
-    
+
     bootMetaJs: {
       check: "qx.tool.compiler.targets.meta.AbstractJavascriptMeta"
     },
-    
+
     sourceUri: {
       check: "String"
     },
-    
+
     resourceUri: {
       check: "String"
     }
   },
-  
+
   members: {
     /** {qx.tool.compiler.targets.Target} the target */
     __target: null,
-    
+
     /** {qx.tool.compiler.app.Application} the application */
     __application: null,
-    
+
     /** {qx.tool.compiler.app.Libary[]} the libraries */
     __libraries: null,
-    
+
     /** {Map} uris and CSS to load */
     __preload: null,
-    
+
     /** {String[]} code to run before boot */
     __preBootCode: null,
-    
+
     /** {Map} list of resource paths, indexed by resource id */
     __resources: null,
-    
+
     /** {Package[]} list of packages */
     __packages: null,
-    
+
     /** {Part[]} list of parts */
     __parts: null,
-    
-    
+
     /**
      * Sets an environment variable
      *
      * @param key {String} the name of the variable
-     * @param value {Object} the value 
+     * @param value {Object} the value
      */
     setEnvironmentValue(key, value) {
       let env = this.getEnvironment();
@@ -120,7 +120,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
         env[key] = value;
       }
     },
-    
+
     /**
      * Returns an environment value
      *
@@ -139,16 +139,16 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
       }
       return value;
     },
-    
+
     /**
      * Returns the application
      *
-     * @return {qx.tool.compiler.app.Application} 
+     * @return {qx.tool.compiler.app.Application}
      */
     getApplication() {
       return this.__application;
     },
-    
+
     /**
      * Returns the target
      *
@@ -157,7 +157,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
     getTarget() {
       return this.__target;
     },
-    
+
     /**
      * Returns the application root
      *
@@ -166,7 +166,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
     getApplicationRoot() {
       return this.__target.getApplicationRoot(this.__application);
     },
-    
+
     /**
      * Returns the Analyser
      *
@@ -175,14 +175,16 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
     getAnalyser() {
       return this.__application.getAnalyser();
     },
-    
+
     /**
      * Syncs all assets into the output directory
      */
     async syncAssets() {
       for (let i = 0; i < this.__packages.length; i++) {
         let pkg = this.__packages[i];
-        await qx.tool.utils.Promisify.poolEachOf(pkg.getAssets(), 10, asset => asset.sync(this.__target));
+        await qx.tool.utils.Promisify.poolEachOf(pkg.getAssets(), 10, asset =>
+          asset.sync(this.__target)
+        );
       }
     },
 
@@ -194,17 +196,19 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
     addLibrary(library) {
       this.__libraries.push(library);
     },
-    
+
     /**
      * Returns the library that contains the application class
      *
      * @return {qx.tool.compiler.app.Library}
      */
     getAppLibrary() {
-      let appLibrary = this.__application.getAnalyser().getLibraryFromClassname(this.__application.getClassName());
+      let appLibrary = this.__application
+        .getAnalyser()
+        .getLibraryFromClassname(this.__application.getClassName());
       return appLibrary;
     },
-    
+
     /**
      * Returns the list of libraries
      *
@@ -213,7 +217,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
     getLibraries() {
       return this.__libraries;
     },
-    
+
     /**
      * Adds an external resource (JS or CSS) to be loaded which is a http[s] URL
      *
@@ -223,7 +227,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
     addExternal(type, uri) {
       this.__preload[type].push("__external__:" + uri);
     },
-    
+
     /**
      * Adds an external resource (JS or CSS) to be loaded, which is a resource path
      *
@@ -233,16 +237,16 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
     addPreload(type, uri) {
       this.__preload[type].push(uri);
     },
-    
+
     /**
      * Returns the list of preloads, which is a map by type
-     * 
+     *
      * @return {Map}
      */
     getPreloads() {
       return this.__preload;
     },
-    
+
     /**
      * Adds code to be run before the boot code is run
      *
@@ -251,7 +255,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
     addPreBootCode(code) {
       this.__preBootCode.push(code);
     },
-    
+
     /**
      * Returns the code to be run before the boot code
      *
@@ -260,62 +264,71 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
     getPreBootCode() {
       return this.__preBootCode.join("\n");
     },
-    
+
     /**
      * Creates a new Part and adds it
-     * 
+     *
      * @param name {String} identifier
      * @return {Part}
      */
     createPart(name) {
-      let part = new qx.tool.compiler.targets.meta.Part(this.getTarget(), name, this.__parts.length);
+      let part = new qx.tool.compiler.targets.meta.Part(
+        this.getTarget(),
+        name,
+        this.__parts.length
+      );
+
       this.__parts.push(part);
       this.__partsLookup[name] = part;
       return part;
     },
-    
+
     /**
      * Returns a list of all parts
-     * 
+     *
      * @return {Part[]}
      */
     getParts() {
       return this.__parts;
     },
-    
+
     /**
      * Returns a part with a given name
-     * 
+     *
      * @param name {String} the name to look for
      */
     getPart(name) {
-      return this.__partsLookup[name]||null;
+      return this.__partsLookup[name] || null;
     },
-    
+
     /**
      * Returns a list of all packages
-     * 
+     *
      * @return {Package[]}
      */
     getPackages() {
       return this.__packages;
     },
-    
+
     /**
      * Creates a package and adds it
-     * 
+     *
      * @return {Package}
      */
     createPackage() {
-      let pkg = new qx.tool.compiler.targets.meta.Package(this, this.__packages.length);
+      let pkg = new qx.tool.compiler.targets.meta.Package(
+        this,
+        this.__packages.length
+      );
+
       this.__packages.push(pkg);
       return pkg;
     },
-    
+
     /**
      * Gets a package for specific locale, creating a part with the name set to the localeId
      * if there isn't one already.  Used for when i18nAsParts == true
-     * 
+     *
      * @param localeId {String} the locale to look for
      * @return {Package}
      */
@@ -328,20 +341,20 @@ qx.Class.define("qx.tool.compiler.targets.meta.ApplicationMeta", {
       let pkg = part.getDefaultPackage();
       return pkg;
     },
-    
+
     /**
      * Adds a resource
-     * 
+     *
      * @param key {String} the resource identifier
      * @param path {String} the path to the resource
      */
     addResource(key, path) {
       this.__resources[key] = path;
     },
-    
+
     /**
      * Returns all of the resources
-     * 
+     *
      * @return {Map}
      */
     getResources() {

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

@@ -20,29 +20,28 @@
  *
  * ************************************************************************/
 
-
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
 
 /**
- * Represents a "index.js" that is generated as part of a compile 
+ * Represents a "index.js" that is generated as part of a compile
  */
 qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
   extend: qx.tool.compiler.targets.meta.AbstractJavascriptMeta,
-  
+
   construct(appMeta) {
-    this.base(arguments, appMeta, `${appMeta.getApplicationRoot()}index.js`);
+    super(appMeta, `${appMeta.getApplicationRoot()}index.js`);
     this.__embeddedJs = [];
     this.__embeddedJsLookup = {};
   },
-  
+
   properties: {
     needsWriteToDisk: {
       init: true,
       refine: true
     }
   },
-  
+
   members: {
     __embeddedJs: null,
     __sourceMapOffsets: null,
@@ -50,7 +49,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
     /**
      * Adds Javascript which is to be added to the end of the index.js, just before the app
      * is finalised
-     * 
+     *
      * @param jsMeta {AbstractJavascriptMeta} the jaavscript to add
      */
     addEmbeddedJs(jsMeta) {
@@ -59,7 +58,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
         this.__embeddedJsLookup[jsMeta.toHashCode()] = jsMeta;
       }
     },
-    
+
     /*
      * @Override
      */
@@ -78,13 +77,13 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
           if (uri.startsWith("__external__:")) {
             return true;
           }
-          
+
           inlines.push(uri);
           return false;
         });
         for (let i = 0; i < inlines.length; i++) {
           let uri = inlines[i];
-          
+
           let filename = path.join(target.getOutputDir(), "resources", uri);
           try {
             var data = await fs.readFileAsync(filename, { encoding: "utf-8" });
@@ -92,20 +91,22 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
             ws.write("\n");
           } catch (ex) {
             if (ex.code != "ENOENT") {
-              throw ex; 
+              throw ex;
             }
           }
         }
       }
-      
+
       var MAP = {
         EnvSettings: appMeta.getEnvironment(),
-        Libraries: appMeta.getLibraries().map(library => library.getNamespace()),
+        Libraries: appMeta
+          .getLibraries()
+          .map(library => library.getNamespace()),
         SourceUri: appMeta.getSourceUri(),
         ResourceUri: appMeta.getResourceUri(),
         Resources: appMeta.getResources(),
-        Translations: {"C": null},
-        Locales: {"C": null},
+        Translations: { C: null },
+        Locales: { C: null },
         Parts: {},
         Packages: {},
         UrisBefore: urisBefore,
@@ -119,20 +120,30 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
         TranspiledPath: undefined,
         PreBootCode: appMeta.getPreBootCode()
       };
+
       appMeta.getParts().forEach(part => part.serializeInto(MAP.Parts));
       appMeta.getPackages().forEach(pkg => pkg.serializeInto(MAP.Packages));
 
       if (application.getType() !== "browser") {
-        MAP.TranspiledPath = path.relative(appRootDir, path.join(target.getOutputDir(), "transpiled"));
+        MAP.TranspiledPath = path.relative(
+          appRootDir,
+          path.join(target.getOutputDir(), "transpiled")
+        );
       }
 
-      appMeta.getTarget().getLocales().forEach(localeId => {
-        MAP.Translations[localeId] = null;
-        MAP.Locales[localeId] = null;
-      });
+      appMeta
+        .getTarget()
+        .getLocales()
+        .forEach(localeId => {
+          MAP.Translations[localeId] = null;
+          MAP.Locales[localeId] = null;
+        });
       this.__sourceMapOffsets = [];
 
-      data = await fs.readFileAsync(application.getLoaderTemplate(), { encoding: "utf-8" });
+      data = await fs.readFileAsync(application.getLoaderTemplate(), {
+        encoding: "utf-8"
+      });
+
       var lines = data.split("\n");
       for (let i = 0; i < lines.length; i++) {
         var line = lines[i];
@@ -140,7 +151,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
         while ((match = line.match(/\%\{([^}]+)\}/))) {
           var keyword = match[1];
           var replace = "";
-          
+
           if (keyword == "BootPart") {
             for (let j = 0; j < this.__embeddedJs.length; j++) {
               this.__sourceMapOffsets.push(ws.getLineNumber());
@@ -154,8 +165,11 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
               replace = JSON.stringify(MAP[keyword], null, 2);
             }
           }
-          
-          var newLine = line.substring(0, match.index) + replace + line.substring(match.index + keyword.length + 3);
+
+          var newLine =
+            line.substring(0, match.index) +
+            replace +
+            line.substring(match.index + keyword.length + 3);
           line = newLine;
         }
         if (line.match(/^\s*delayDefer:\s*false\b/)) {
@@ -164,19 +178,25 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
         ws.write(line + "\n");
       }
     },
-    
+
     /*
      * @Override
      */
     async getSourceMap() {
       if (this.__sourceMapOffsets === null) {
-        throw new Error(`Cannot get the source map for ${this} until the stream has been written`); 
+        throw new Error(
+          `Cannot get the source map for ${this} until the stream has been written`
+        );
       }
-      let res = await this._copySourceMap(this.__embeddedJs, this.__sourceMapOffsets);
+      let res = await this._copySourceMap(
+        this.__embeddedJs,
+        this.__sourceMapOffsets
+      );
+
       let target = this._appMeta.getTarget();
       for (let i = 0; i < res.sources.length; i++) {
-        res.sources[i] = path.relative("", res.sources[i]);
-        let mapTo = target.getPathMapping(res.sources[i]);
+        let s = path.relative("", res.sources[i]);
+        let mapTo = target.getPathMapping(s);
         res.sources[i] = mapTo ? mapTo : res.sources[i];
       }
       return res;

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

@@ -27,27 +27,26 @@ const fs = qx.tool.utils.Promisify.fs;
  */
 qx.Class.define("qx.tool.compiler.targets.meta.Javascript", {
   extend: qx.tool.compiler.targets.meta.AbstractJavascriptMeta,
-  
+
   /**
    * Constructor
-   * 
+   *
    * @param appMeta {qx.tool.compiler.targets.meta.ApplicationMeta}
    * @param filename {String} the sourcefile
    * @param originalSourceFile {String?} the URI to give to the source map
    */
   construct(appMeta, filename, originalSourceFile) {
-    this.base(arguments, appMeta, filename, originalSourceFile);
+    super(appMeta, filename, originalSourceFile);
   },
-  
+
   members: {
-    
     /*
      * @Override
      */
     compile() {
       // Nothing
     },
-    
+
     /*
      * @Override
      */
@@ -59,7 +58,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Javascript", {
         rs.pipe(ws, { end: false });
       });
     },
-    
+
     /*
      * @Override
      */