promises update, spec fixes, 0.7.0 prep

Author: guybedford

Gruntfile.js

@@ -21,16 +21,15 @@ module.exports = function (grunt) {
     concat: {
       dist: {
         src: [
-          'node_modules/es6-promise/dist/promise-1.0.0.js',
-          'lib/module.js',
+          // 'node_modules/rsvp/dist/rsvp.js',
+          'node_modules/when/es6-shim/Promise.js',
           'lib/loader.js',
           'lib/system.js'
         ],
         dest: 'dist/<%= pkg.name %>.js'
       },
       polyfillOnly: {
         src: [
-          'lib/module.js',
           'lib/loader.js',
           'lib/system.js'
         ],

LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Guy Bedford, Luke Hoban, Addy Osmani
+Copyright (c) 2013-2014 Guy Bedford, Luke Hoban, Addy Osmani
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

README.md

@@ -2,28 +2,28 @@
 
 Dynamically loads ES6 modules in NodeJS and current browsers.
 
-* Implemented exactly to the April 27 2014 ES6 specification draft.
+* Implemented exactly to the May 22 2014 ES6 specification draft.
 * Provides an asynchronous loader (`System.import`) to [dynamically load ES6 modules](#basic-use).
 * Uses [Traceur](https://github.com/google/traceur-compiler) for compiling ES6 modules and syntax into ES5 in the browser with source map support.
 * Fully supports [ES6 circular references and bindings](#circular-references--bindings).
 * Polyfills ES6 Promises in the browser with a bundled [es6-promise](https://github.com/jakearchibald/es6-promise) implementation.
 * [Compatible with NodeJS](#nodejs-usage) allowing for server-side module loading and tracing extensions.
 * Supports ES6 module loading in IE9+, and dynamic module formats in IE8+.
-* The complete combined polyfill comes to 7KB minified and gzipped, making it suitable for production use, provided that modules are [built into ES5 making them independent of Traceur](#moving-to-production).
+* The complete combined polyfill comes to 8.7KB minified and gzipped, making it suitable for production use, provided that modules are [built into ES5 making them independent of Traceur](#moving-to-production).
 
 For an overview of build workflows, [see the production guide](#moving-to-production).
 
 See the [demo folder](https://github.com/ModuleLoader/es6-module-loader/blob/master/demo/index.html) in this repo for a working example demonstrating both module loading the module tag in the browser.
 
 For an example of a universal module loader based on this polyfill for loading AMD, CommonJS and globals, see [SystemJS](https://github.com/systemjs/systemjs).
 
-_The current version is tested against **[Traceur 0.0.42](https://github.com/google/traceur-compiler/tree/0.0.42)**._
+_The current version is tested against **[Traceur 0.0.45](https://github.com/google/traceur-compiler/tree/0.0.45)**._
 
 _Note the ES6 module specification is still in draft, and subject to change._
 
 ### Basic Use
 
-Download both [es6-module-loader.js](https://raw.githubusercontent.com/ModuleLoader/es6-module-loader/v0.6.0/dist/es6-module-loader.js) and [traceur.js](https://raw.githubusercontent.com/google/traceur-compiler/traceur@0.0.42/bin/traceur.js) into the same folder.
+Download both [es6-module-loader.js](https://raw.githubusercontent.com/ModuleLoader/es6-module-loader/v0.7.0/dist/es6-module-loader.js) and [traceur.js](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.45/traceur.js) into the same folder.
 
 If using ES6 syntax (optional), include `traceur.js` in the page first then include `es6-module-loader.js`:
 
@@ -181,7 +181,7 @@ A basic example of using this extension with a build would be the following:
     traceur --out app-build.js app/app.js --modules=instantiate
   ```
 
-2. If using additional ES6 features apart from modules syntax, load `traceur-runtime.js` (included in the `bin` folder when installing Traceur through Bower or npm). Then include `es6-module-loader.js` and then apply the register extension before doing the import or loading the bundle as a script:
+2. If using additional ES6 features apart from modules syntax, load [`traceur-runtime.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.45/traceur-runtime.js) (also included in the `bin` folder when installing Traceur through Bower or npm). Then include `es6-module-loader.js` and then apply the register extension before doing the import or loading the bundle as a script:
 
   ```html
     <script src="traceur-runtime.js"></script>
@@ -208,6 +208,9 @@ A basic example of using this extension with a build would be the following:
     </script>
   ```
 
+* Note that `app-build.js` must be at the base-level for this to work.
+* Also, the name we import, `app/app` must be the same name given to Traceur's compiler.
+
 #### Building into separate files
 
 We can also build separate files with:
@@ -224,7 +227,7 @@ With the above, we can load from the separate files identical to loading ES6.
   npm install es6-module-loader
 ```
 
-For use in NodeJS, the `Module`, `LoaderPolyfill` and `System` globals are provided as exports:
+For use in NodeJS, the `Loader` and `System` globals are provided as exports:
 
 index.js:
 ```javascript

bower.json

@@ -1,12 +1,11 @@
 {
   "name": "es6-module-loader",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "An ES6 Module Loader polyfill based on the latest spec.",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "main": "dist/es6-module-loader-sans-promises.js",
   "dependencies": {
-    "es6-promise": "^1.0",
-    "traceur": "0.0.41"
+    "traceur": "0.0.45"
   },
   "keywords": [
     "es6",

dist/es6-module-loader-sans-promises.js

@@ -105,7 +105,7 @@ function logloads(loads) {
 
 (function (__global) {
   (function() {
-    var Promise = __global.Promise || require('es6-promise').Promise;
+    var Promise = __global.Promise || require('when/es6-shim/Promise');
 
     var traceur;
 
@@ -566,7 +566,8 @@ function logloads(loads) {
         link(linkSet);
       }
       catch(exc) {
-        return linkSetFailed(linkSet, exc);
+        linkSetFailed(linkSet, exc);
+        return true;
       }
     }
 
@@ -593,10 +594,10 @@ function logloads(loads) {
         for (var i = 0; i < loads.length; i++) {
           var load = loads[i];
           load.module = load.kind == 'dynamic' ? {
-            module: Module({})
+            module: _newModule({})
           } : {
             name: load.name,
-            module: Module({}),
+            module: _newModule({}),
             evaluated: true
           };
           load.status = 'linked';
@@ -606,7 +607,10 @@ function logloads(loads) {
       }
       /***/
 
-      doLink(linkSet);
+      var abrupt = doLink(linkSet);
+
+      if (abrupt)
+        return;
 
       console.assert(linkSet.loads.length == 0, 'loads cleared');
 
@@ -762,7 +766,7 @@ function logloads(loads) {
           // 15.2.5.6 LinkDynamicModules adjusted
           else {
             var module = load.execute();
-            if (!module || !(module instanceof ModuleConstructor))
+            if (!module || !(module instanceof Module))
               throw new TypeError('Execution must define a Module instance');
             load.module = {
               module: module
@@ -864,6 +868,7 @@ function logloads(loads) {
     // 15.2.6.1
     function evaluateLoadedModule(loader, load) {
       console.assert(load.status == 'linked', 'is linked ' + load.name);
+
       ensureEvaluated(load.module, [], loader);
       return load.module.module;
     }
@@ -877,6 +882,19 @@ function logloads(loads) {
      *
      */
 
+    // execution errors don't propogate in the pipeline
+    // see https://bugs.ecmascript.org/show_bug.cgi?id=2993
+    function doExecute(module) {
+      try {
+        module.execute.call(__global);
+      }
+      catch(e) {
+        setTimeout(function() {
+          throw e;
+        });
+      }
+    }
+
     // 15.2.6.2 EnsureEvaluated adjusted
     function ensureEvaluated(module, seen, loader) {
       if (module.evaluated || !module.dependencies)
@@ -896,8 +914,8 @@ function logloads(loads) {
         return;
 
       module.evaluated = true;
-      module.execute.call(__global);
-      module.module = Module(module.exports);
+      doExecute(module);
+      module.module = _newModule(module.exports);
       delete module.execute;
     }
 
@@ -935,7 +953,7 @@ function logloads(loads) {
       // 26.3.3.13 realm not implemented
     }
 
-    function ModuleConstructor() {}
+    function Module() {}
 
     // importPromises adds ability to import a module twice without error - https://bugs.ecmascript.org/show_bug.cgi?id=2601
     var importPromises = {};
@@ -995,7 +1013,7 @@ function logloads(loads) {
 
           if (loader.modules[name]) {
             ensureEvaluated(loader.modules[name], [], loader._loader);
-            return Promise.resolve(loader.modules[name].module);
+            return loader.modules[name].module;
           }
 
           return importPromises[name] || createImportPromise(name, 
@@ -1034,8 +1052,8 @@ function logloads(loads) {
           throw new TypeError('Expected object');
 
         // we do this to be able to tell if a module is a module privately in ES5
-        // by doing m instanceof ModuleConstructor
-        var m = new ModuleConstructor();
+        // by doing m instanceof Module
+        var m = new Module();
 
         for (var key in obj) {
           (function (key) {
@@ -1056,7 +1074,7 @@ function logloads(loads) {
       },
       // 26.3.3.14
       set: function(name, module) {
-        if (!(module instanceof ModuleConstructor))
+        if (!(module instanceof Module))
           throw new TypeError('Set must be a module');
         this._loader.modules[name] = {
           module: module
@@ -1087,15 +1105,14 @@ function logloads(loads) {
       }
     };
 
-    var Module = Loader.prototype.newModule;
+    var _newModule = Loader.prototype.newModule;
 
     if (typeof exports === 'object')
       module.exports = Loader;
 
     __global.Reflect = __global.Reflect || {};
     __global.Reflect.Loader = __global.Reflect.Loader || Loader;
     __global.LoaderPolyfill = Loader;
-    __global.Module = Module;
 
   })();