remove js extension adding, simplify System

Author: guybedford

src/loader.js

@@ -100,35 +100,6 @@ function logloads(loads) {
     }
   }
 } */
-  var Promise = __global.Promise || require('when/es6-shim/Promise');
-  if (__global.console)
-    console.assert = console.assert || function() {};
-
-  // IE8 support
-  var indexOf = Array.prototype.indexOf || function(item) {
-    for (var i = 0, thisLen = this.length; i < thisLen; i++) {
-      if (this[i] === item) {
-        return i;
-      }
-    }
-    return -1;
-  };
-  
-  var defineProperty;
-  (function () {
-    try {
-      if (!!Object.defineProperty({}, 'a', {}))
-        defineProperty = Object.defineProperty;
-    }
-    catch (e) {
-      defineProperty = function(obj, prop, opt) {
-        try {
-          obj[prop] = opt.value || opt.get.call(obj);
-        }
-        catch(e) {}
-      }
-    }
-  })();
 
   // 15.2.3 - Runtime Semantics: Loader State
 
@@ -612,9 +583,6 @@ function logloads(loads) {
 
   // 26.3.1.1
   function Loader(options) {
-    if (typeof options != 'object')
-      throw new TypeError('Options must be an object');
-
     if (options.normalize)
       this.normalize = options.normalize;
     if (options.locate)
@@ -787,7 +755,6 @@ function logloads(loads) {
     },
     // 26.3.3.18.3
     fetch: function(load) {
-      throw new TypeError('Fetch not implemented');
     },
     // 26.3.3.18.4
     translate: function(load) {
@@ -799,12 +766,3 @@ function logloads(loads) {
   };
 
   var _newModule = Loader.prototype.newModule;
-
-  if (typeof exports === 'object')
-    module.exports = Loader;
-
-  __global.Reflect = __global.Reflect || {};
-  __global.Reflect.Loader = __global.Reflect.Loader || Loader;
-  __global.Reflect.global = __global.Reflect.global || __global;
-  __global.LoaderPolyfill = Loader;
-

src/module-tag.js

@@ -32,8 +32,4 @@
       document.addEventListener('DOMContentLoaded', completed, false);
       window.addEventListener('load', completed, false);
     }
-
-    // run the data-init function on the script tag
-    if (curScript.getAttribute('data-init'))
-      window[curScript.getAttribute('data-init')]();
   }

src/polyfill-wrapper-end.js

@@ -1,3 +1,17 @@
+  // -- exporting --
+
+  if (typeof exports === 'object')
+    module.exports = Loader;
+
+  __global.Reflect = __global.Reflect || {};
+  __global.Reflect.Loader = __global.Reflect.Loader || Loader;
+  __global.Reflect.global = __global.Reflect.global || __global;
+  __global.LoaderPolyfill = Loader;
+
+  if (typeof exports === 'object')
+    module.exports = System;
+
+  __global.System = System;
 
 })();
 

src/polyfill-wrapper-start.js

@@ -1,2 +1,35 @@
 (function(__global) {
-  (function() {
+  (function() {
+
+    var isWorker = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope;
+    var isBrowser = typeof window != 'undefined' && !isWorker;
+    var isWindows = typeof process != 'undefined' && !!process.platform.match(/^win/);
+
+    if (__global.console)
+      console.assert = console.assert || function() {};
+
+    // IE8 support
+    var indexOf = Array.prototype.indexOf || function(item) {
+      for (var i = 0, thisLen = this.length; i < thisLen; i++) {
+        if (this[i] === item) {
+          return i;
+        }
+      }
+      return -1;
+    };
+    
+    var defineProperty;
+    (function () {
+      try {
+        if (!!Object.defineProperty({}, 'a', {}))
+          defineProperty = Object.defineProperty;
+      }
+      catch (e) {
+        defineProperty = function(obj, prop, opt) {
+          try {
+            obj[prop] = opt.value || opt.get.call(obj);
+          }
+          catch(e) {}
+        }
+      }
+    })();

src/system.js

@@ -10,11 +10,6 @@
 *********************************************************************************************
 */
 
-  var isWorker = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope;
-  var isBrowser = typeof window != 'undefined' && !isWorker;
-  var isWindows = typeof process != 'undefined' && !!process.platform.match(/^win/);
-  var Promise = __global.Promise || require('when/es6-shim/Promise');
-
   var fetchTextFromURL;
   if (typeof XMLHttpRequest != 'undefined') {
     fetchTextFromURL = function(url, fulfill, reject) {
@@ -63,24 +58,25 @@
         }, 0);
 
       xhr.send(null);
-    }
+    };
   }
   else if (typeof require != 'undefined') {
     var fs;
     fetchTextFromURL = function(url, fulfill, reject) {
-      if (url.substr(0, 5) != 'file:')
-        throw 'Only file URLs of the form file: allowed running in Node.';
+      if (url.substr(0, 8) != 'file:///')
+        throw 'Only file URLs of the form file:/// allowed running in Node.';
       fs = fs || require('fs');
-      url = url.substr(5);
       if (isWindows)
-        url = url.replace(/\//g, '\\');
+        url = url.replace(/\//g, '\\').substr(8);
+      else
+        url = url.substr(7);
       return fs.readFile(url, function(err, data) {
         if (err)
           return reject(err);
         else
           fulfill(data + '');
       });
-    }
+    };
   }
   else {
     throw new TypeError('No environment fetch API available.');
@@ -95,32 +91,27 @@
       this.baseURL = href.substring(0, href.lastIndexOf('/') + 1);
     }
     else if (typeof process != 'undefined' && process.cwd) {
-      this.baseURL = 'file:' + process.cwd() + '/';
+      this.baseURL = 'file://' + (isWindows ? '/' : '') + process.cwd() + '/';
       if (isWindows)
         this.baseURL = this.baseURL.replace(/\\/g, '/');
     }
     else {
       throw new TypeError('No environment baseURL');
     }
-    this.paths = { '*': '*.js' };
+    this.paths = {};
   };
 
   // inline Object.create-style class extension
   function LoaderProto() {}
   LoaderProto.prototype = Loader.prototype;
   SystemLoader.prototype = new LoaderProto();
 
-  SystemLoader.prototype.global = isBrowser ? window : (isWorker ? self : __global);
-
   SystemLoader.prototype.normalize = function(name, parentName, parentAddress) {
     if (typeof name != 'string')
       throw new TypeError('Module name must be a string');
 
     var segments = name.split('/');
 
-    if (segments.length == 0)
-      throw new TypeError('No module name provided');
-
     // current segment
     var i = 0;
     // is the module name relative
@@ -129,27 +120,17 @@
     var dotdots = 0;
     if (segments[0] == '.') {
       i++;
-      if (i == segments.length)
-        throw new TypeError('Illegal module name "' + name + '"');
       rel = true;
     }
     else {
       while (segments[i] == '..') {
         i++;
-        if (i == segments.length)
-          throw new TypeError('Illegal module name "' + name + '"');
       }
       if (i)
         rel = true;
       dotdots = i;
     }
 
-    for (var j = i; j < segments.length; j++) {
-      var segment = segments[j];
-      if (segment == '' || segment == '.' || segment == '..')
-        throw new TypeError('Illegal module name "' + name + '"');
-    }
-
     if (!rel)
       return name;
 
@@ -162,7 +143,9 @@
     normalizedParts = normalizedParts.concat(segments.splice(i, segments.length - i));
 
     return normalizedParts.join('/');
-  }
+  };
+
+  var baseURLCache = {};
 
   SystemLoader.prototype.locate = function(load) {
     var name = load.name;
@@ -195,7 +178,7 @@
       }
     }
 
-    var outPath = this.paths[pathMatch];
+    var outPath = this.paths[pathMatch] || name;
     if (wildcard)
       outPath = outPath.replace('*', wildcard);
 
@@ -206,22 +189,13 @@
     if (isBrowser)
       outPath = outPath.replace(/#/g, '%23');
 
-    return toAbsoluteURL(this.baseURL, outPath);
-  }
+    return new URLUtils(outPath, baseURLCache[this.baseURL] = baseURLCache[this.baseURL] || new URLUtils(this.baseURL)).href;
+  };
 
   SystemLoader.prototype.fetch = function(load) {
-    var self = this;
     return new Promise(function(resolve, reject) {
-      fetchTextFromURL(toAbsoluteURL(self.baseURL, load.address), function(source) {
-        resolve(source);
-      }, reject);
+      fetchTextFromURL(load.address, resolve, reject);
     });
-  }
+  };
 
   var System = new SystemLoader();
-
-  // note we have to export before runing "init" below
-  if (typeof exports === 'object')
-    module.exports = System;
-
-  __global.System = System;