global build public/private scoping

Author: guybedford

src/declarative.js

@@ -281,4 +281,5 @@
 
     module.execute = undefined;
     return err;
-  }
+  }
+})();

src/dynamic-only.js

@@ -27,4 +27,6 @@
 
   function evaluateLoadedModule(loader, load) {
     return load.module.module;
-  }
+  }
+
+})();

src/loader.js

@@ -18,6 +18,39 @@
 *********************************************************************************************
 */
 
+function Module() {}
+function Loader(options) {
+  if (options.normalize)
+    this.normalize = options.normalize;
+  if (options.locate)
+    this.locate = options.locate;
+  if (options.fetch)
+    this.fetch = options.fetch;
+  if (options.translate)
+    this.translate = options.translate;
+  if (options.instantiate)
+    this.instantiate = options.instantiate;
+
+  this._loader = {
+    loaderObj: this,
+    loads: [],
+    modules: {},
+    importPromises: {},
+    moduleRecords: {}
+  };
+
+  // 26.3.3.6
+  defineProperty(this, 'global', {
+    get: function() {
+      return __global;
+    }
+  });
+
+  // 26.3.3.13 realm not implemented
+}
+
+(function() {
+  
 // Some Helpers
 
 // logs a linkset snapshot for debugging
@@ -576,37 +609,7 @@ function logloads(loads) {
   // 26.3 Loader
 
   // 26.3.1.1
-  function Loader(options) {
-    if (options.normalize)
-      this.normalize = options.normalize;
-    if (options.locate)
-      this.locate = options.locate;
-    if (options.fetch)
-      this.fetch = options.fetch;
-    if (options.translate)
-      this.translate = options.translate;
-    if (options.instantiate)
-      this.instantiate = options.instantiate;
-
-    this._loader = {
-      loaderObj: this,
-      loads: [],
-      modules: {},
-      importPromises: {},
-      moduleRecords: {}
-    };
-
-    // 26.3.3.6
-    defineProperty(this, 'global', {
-      get: function() {
-        return __global;
-      }
-    });
-
-    // 26.3.3.13 realm not implemented
-  }
-
-  function Module() {}
+  // defined at top
 
   // importPromises adds ability to import a module twice without error - https://bugs.ecmascript.org/show_bug.cgi?id=2601
   function createImportPromise(loader, name, promise) {

src/module-tag.js

@@ -1,3 +1,4 @@
+(function() {
   // <script type="module"> support
   // allow a data-init function callback once loaded
   if (isBrowser && typeof document.getElementsByTagName != 'undefined') {
@@ -32,4 +33,5 @@
       document.addEventListener('DOMContentLoaded', completed, false);
       window.addEventListener('load', completed, false);
     }
-  }
+  }
+})();

src/system.js

@@ -10,6 +10,43 @@
 *********************************************************************************************
 */
 
+var System;
+
+function SystemLoader(options) {
+  Loader.call(this, options || {});
+
+  var baseURL;
+  // Set default baseURL and paths
+  if (isWorker) {
+    baseURL = __global.location.href;
+  }
+  else if (typeof document != 'undefined') {
+    baseURL = document.baseURI;
+
+    if (!baseURL) {
+      var bases = document.getElementsByTagName('base');
+      baseURL = bases[0] && bases[0].href || window.location.href;
+    }
+
+    // sanitize out the hash and querystring
+    // removes the username and password, which could be adjusted
+    baseURL = new URL(baseURL);
+    baseURL = baseURL.origin + baseURL.pathname.substr(0, baseURL.pathname.lastIndexOf('/') + 1);
+  }
+  else if (typeof process != 'undefined' && process.cwd) {
+    baseURL = 'file://' + (isWindows ? '/' : '') + process.cwd() + '/';
+    if (isWindows)
+      baseURL = baseURL.replace(/\\/g, '/');
+  }
+  else {
+    throw new TypeError('No environment baseURL');
+  }
+
+  this.baseURL = baseURL;
+  this.paths = {};
+}
+
+(function() {
   var fetchTextFromURL;
   if (typeof XMLHttpRequest != 'undefined') {
     fetchTextFromURL = function(url, fulfill, reject) {
@@ -82,40 +119,6 @@
     throw new TypeError('No environment fetch API available.');
   }
 
-  var SystemLoader = function(options) {
-    Loader.call(this, options || {});
-
-    var baseURL;
-    // Set default baseURL and paths
-    if (isWorker) {
-      baseURL = __global.location.href;
-    }
-    else if (typeof document != 'undefined') {
-      baseURL = document.baseURI;
-
-      if (!baseURL) {
-        var bases = document.getElementsByTagName('base');
-        baseURL = bases[0] && bases[0].href || window.location.href;
-      }
-
-      // sanitize out the hash and querystring
-      // removes the username and password, which could be adjusted
-      baseURL = new URL(baseURL);
-      baseURL = baseURL.origin + baseURL.pathname.substr(0, baseURL.pathname.lastIndexOf('/') + 1);
-    }
-    else if (typeof process != 'undefined' && process.cwd) {
-      baseURL = 'file://' + (isWindows ? '/' : '') + process.cwd() + '/';
-      if (isWindows)
-        baseURL = baseURL.replace(/\\/g, '/');
-    }
-    else {
-      throw new TypeError('No environment baseURL');
-    }
-
-    this.baseURL = baseURL;
-    this.paths = {};
-  };
-
   // inline Object.create-style class extension
   function LoaderProto() {}
   LoaderProto.prototype = Loader.prototype;
@@ -213,4 +216,4 @@
     });
   };
 
-  var System = new SystemLoader();
+})();

src/transpiler.js

@@ -1,7 +1,8 @@
 /*
  * Traceur and Babel transpile hook for Loader
  */
-
+var transpile = (function() {
+  
   function getTranspilerModule(loader, globalName) {
     return loader.newModule({ 'default': __global[globalName], __useDefault: true });
   }
@@ -96,4 +97,7 @@
       options.blacklist = ['react'];
 
     return babel.transform(load.source, options).code;
-  }
+  }
+
+  return transpile;
+})();

src/wrapper-end.js

@@ -8,6 +8,9 @@
   __global.Reflect.global = __global.Reflect.global || __global;
   __global.LoaderPolyfill = Loader;
 
+  if (!System)
+    System = new SystemLoader();
+
   if (typeof exports === 'object')
     module.exports = System;