From 4c9ecbdf57ff3370e5d11babc6d281b027d5f77d Mon Sep 17 00:00:00 2001
From: Justin Meyer <justinbmeyer@gmail.com>
Date: Sun, 29 Jun 2014 23:20:28 -0500
Subject: [PATCH] fixes #129 and makes it possible to list require as a
 dependency

---
 dist/system-production-csp.js                 | 51 ++++++++++++++-----
 dist/system-production-csp.min.js             |  2 +-
 dist/system.js                                | 51 ++++++++++++++-----
 dist/system.min.js                            |  2 +-
 lib/extension-amd.js                          | 35 ++++++++++---
 lib/extension-cjs.js                          | 16 ++++--
 test/test.js                                  |  9 ++++
 .../amd-simplified-cjs-aliased-require1.js    |  7 +++
 .../amd-simplified-cjs-aliased-require2.js    |  8 +++
 9 files changed, 143 insertions(+), 38 deletions(-)
 create mode 100644 test/tests/amd-simplified-cjs-aliased-require1.js
 create mode 100644 test/tests/amd-simplified-cjs-aliased-require2.js

diff --git a/dist/system-production-csp.js b/dist/system-production-csp.js
index c3b0779d..3044c004 100644
--- a/dist/system-production-csp.js
+++ b/dist/system-production-csp.js
@@ -1039,13 +1039,19 @@ function cjs(loader) {
   // CJS Module Format
   // require('...') || exports[''] = ... || exports.asd = ... || module.exports = ...
   var cjsExportsRegEx = /(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/;
-  var cjsRequireRegEx = /(?:^\s*|[}{\(\);,\n=:\?\&]\s*)require\s*\(\s*("([^"]+)"|'([^']+)')\s*\)/g;
+  var cjsRequirePre = "(?:^\\s*|[}{\\(\\);,\\n=:\\?\\&]\\s*)";
+  var cjsRequirePost = "\\s*\\(\\s*(\"([^\"]+)\"|'([^']+)')\\s*\\)";
+  var cjsRequireRegEx = new RegExp(cjsRequirePre+"require"+cjsRequirePost,"g");
   var commentRegEx = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
 
-  function getCJSDeps(source) {
+  function getCJSDeps(source, requireAlias) {
     cjsExportsRegEx.lastIndex = 0;
-    cjsRequireRegEx.lastIndex = 0;
-
+    
+    // If a requireAlias is given, generate the regexp; otherwise, use the cached version.
+    var requireRegEx =  requireAlias ?
+        new RegExp(cjsRequirePre+(requireAlias)+cjsRequirePost,"g") :
+        cjsRequireRegEx;
+    requireRegEx.lastIndex = 0;
     var deps = [];
 
     // remove comments from the source first
@@ -1053,7 +1059,7 @@ function cjs(loader) {
 
     var match;
 
-    while (match = cjsRequireRegEx.exec(source))
+    while (match = requireRegEx.exec(source))
       deps.push(match[2] || match[3]);
 
     return deps;
@@ -1150,11 +1156,26 @@ function amd(loader) {
 
   var isNode = typeof module != 'undefined' && module.exports;
 
+  // Matches parenthesis
+  var parensRegExp = /\(([^)]+)/;
+  var commentRegEx = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
+  var argRegEx = /[\w\d]+/g;
+  function getRequireAlias(source, index){
+    var match = source.match(parensRegExp);
+    if(match){
+      var args = [];
+      match[1].replace(commentRegEx,"").replace(argRegEx, function(arg){
+        args.push(arg);
+      });
+      return args[index||0];
+    }
+  };
+  
+
   // AMD Module Format Detection RegEx
   // define([.., .., ..], ...)
   // define(varName); || define(function(require, exports) {}); || define({})
   var amdRegEx = /(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?\s*(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*,?\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;
-
   /*
     AMD-compatible require
     To copy RequireJS, set window.require = window.requirejs = loader.require
@@ -1229,10 +1250,7 @@ function amd(loader) {
       }
       if (!(deps instanceof Array)) {
         factory = deps;
-        // CommonJS AMD form
-        if (!loader._getCJSDeps)
-          throw "AMD extension needs CJS extension for AMD CJS support";
-        deps = ['require', 'exports', 'module'].concat(loader._getCJSDeps(factory.toString()));
+        deps = ['require','exports','module']
       }
 
       if (typeof factory != 'function')
@@ -1242,8 +1260,17 @@ function amd(loader) {
 
       // remove system dependencies
       var requireIndex, exportsIndex, moduleIndex
-      if ((requireIndex = indexOf.call(deps, 'require')) != -1)
-        deps.splice(requireIndex, 1);
+      
+      if ((requireIndex = indexOf.call(deps, 'require')) != -1) {
+      	
+      	deps.splice(requireIndex, 1);
+        // CommonJS AMD form
+        if (!loader._getCJSDeps)
+          throw "AMD extension needs CJS extension for AMD CJS support";
+        var factoryText = factory.toString();
+        deps = deps.concat(loader._getCJSDeps(factoryText, getRequireAlias(factoryText, requireIndex)));
+      }
+        
 
       if ((exportsIndex = indexOf.call(deps, 'exports')) != -1)
         deps.splice(exportsIndex, 1);
diff --git a/dist/system-production-csp.min.js b/dist/system-production-csp.min.js
index 0360472c..2dede58a 100644
--- a/dist/system-production-csp.min.js
+++ b/dist/system-production-csp.min.js
@@ -5,4 +5,4 @@
  * MIT License
  */
 
-!function(__$global){function __eval(__source,__global,__address,__sourceMap){try{__source=(__global!=__$global?"with(__global) { (function() { "+__source+" \n }).call(__global); }":__source)+"\n//# sourceURL="+__address+(__sourceMap?"\n//# sourceMappingURL="+__sourceMap:""),eval(__source)}catch(e){throw"SyntaxError"==e.name&&(e.message="Evaluating "+__address+"\n	"+e.message),System.trace&&0==System.execute&&(e="Execution error for "+__address+": "+e.stack||e),e}}__$global.upgradeSystemLoader=function(){function parseURI(e){var t=String(e).replace(/^\s+|\s+$/g,"").match(/^([^:\/?#]+:)?(\/\/(?:[^:@]*(?::[^:@]*)?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);return t?{href:t[0]||"",protocol:t[1]||"",authority:t[2]||"",host:t[3]||"",hostname:t[4]||"",port:t[5]||"",pathname:t[6]||"",search:t[7]||"",hash:t[8]||""}:null}function toAbsoluteURL(e,t){function a(e){var t=[];return e.replace(/^(\.\.?(\/|$))+/,"").replace(/\/(\.(\/|$))+/g,"/").replace(/\/\.\.$/,"/../").replace(/\/?[^\/]*/g,function(e){"/.."===e?t.pop():t.push(e)}),t.join("").replace(/^\//,"/"===e.charAt(0)?"/":"")}return t=parseURI(t||""),e=parseURI(e||""),t&&e?(t.protocol||e.protocol)+(t.protocol||t.authority?t.authority:e.authority)+a(t.protocol||t.authority||"/"===t.pathname.charAt(0)?t.pathname:t.pathname?(e.authority&&!e.pathname?"/":"")+e.pathname.slice(0,e.pathname.lastIndexOf("/")+1)+t.pathname:e.pathname)+(t.protocol||t.authority||t.pathname?t.search:t.search||e.search)+t.hash:null}function scriptLoader(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=document.getElementsByTagName("head")[0];e.onScriptLoad=function(){},e.fetch=function(a){return new Promise(function(r,n){function o(){l.readyState&&"loaded"!=l.readyState&&"complete"!=l.readyState||(s(),e.onScriptLoad(a),r(""))}function i(e){s(),n(e)}function s(){l.detachEvent?l.detachEvent("onreadystatechange",o):(l.removeEventListener("load",o,!1),l.removeEventListener("error",i,!1)),t.removeChild(l)}var l=document.createElement("script");l.async=!0,l.attachEvent&&l.attachEvent("onreadystatechange",o),l.addEventListener("load",o,!1),l.addEventListener("error",i,!1),l.src=a.address,t.appendChild(l)})},e.scriptLoader=!0}function meta(e){function t(e,t){var a=e.meta&&e.meta[t.name];if(a)for(var r in a)t.metadata[r]=t.metadata[r]||a[r]}var a=/^(\s*\/\*.*\*\/|\s*\/\/[^\n]*|\s*"[^"]+"\s*;?|\s*'[^']+'\s*;?)+/,r=/\/\*.*\*\/|\/\/[^\n]*|"[^"]+"\s*;?|'[^']+'\s*;?/g;e.meta={};var n=e.locate;e.locate=function(e){return t(this,e),n.call(this,e)};var o=e.translate;e.translate=function(e){var n=e.source.match(a);if(n)for(var i=n[0].match(r),s=0;s<i.length;s++){var l=i[s].length,d=i[s].substr(0,1);if(";"==i[s].substr(l-1,1)&&l--,'"'==d||"'"==d){var u=i[s].substr(1,i[s].length-3),f=u.substr(0,u.indexOf(" "));if(f){var c=u.substr(f.length+1,u.length-f.length-1);e.metadata[f]instanceof Array?e.metadata[f].push(c):e.metadata[f]=c}}}return t(this,e),o.call(this,e)}}function register(e){function t(e){var t=this;"@traceur"==e.name&&(f=System);var a,r=e.source.lastIndexOf("\n");-1!=r&&"//# sourceMappingURL="==e.source.substr(r+1,21)&&(a=e.source.substr(r+22,e.source.length-r-22),"undefined"!=typeof toAbsoluteURL&&(a=toAbsoluteURL(e.address,a))),__eval(e.source,t.global,e.address,a),"@traceur"==e.name&&(t.global.traceurSystem=t.global.System,t.global.System=f)}function a(e){for(var t=[],a=0;a<e.length;a++)-1==indexOf.call(t,e[a])&&t.push(e[a]);return t}function r(t,a,r,n){"string"!=typeof t&&(n=r,r=a,a=t,t=null),m=!0;var o;if("boolean"==typeof r)o={declarative:!1,deps:a,execute:n,executingRequire:r};else{if(a.length>0&&1!=r.length)throw"Invalid System.register form for "+t+". Declare function must take one argument.";o={declarative:!0,deps:a,declare:r}}if(t)e.defined[t]||(e.defined[t]=o);else if(o.declarative){if(c)throw"Multiple anonymous System.register calls in the same module file.";c=o}}function n(e){if(!e.register){e.register=r,e.defined||(e.defined={});var t=e.onScriptLoad;e.onScriptLoad=function(e){t(e),c&&(e.metadata.entry=c),(c||m)&&(e.metadata.format=e.metadata.format||"register"),m&&(e.metadata.registered=!0)}}}function o(e,t,a){if(a[e.groupIndex]=a[e.groupIndex]||[],-1==indexOf.call(a[e.groupIndex],e)){a[e.groupIndex].push(e);for(var r=0;r<e.normalizedDeps.length;r++){var n=e.normalizedDeps[r],i=t.defined[n];if(i&&!i.evaluated){var s=e.groupIndex+(i.declarative!=e.declarative);if(void 0===i.groupIndex||i.groupIndex<s){if(i.groupIndex&&(a[i.groupIndex].splice(a[i.groupIndex].indexOf(i),1),0==a[i.groupIndex].length))throw new TypeError("Mixed dependency cycle detected");i.groupIndex=s}o(i,t,a)}}}}function i(e,t){var a=t.defined[e];a.groupIndex=0;var r=[];o(a,t,r);for(var n=!!a.declarative==r.length%2,i=r.length-1;i>=0;i--){for(var l=r[i],u=0;u<l.length;u++){var f=l[u];n?s(f,t):d(f,t)}n=!n}}function s(e,t){if(!e.module){var a=[],r=e.declare.call(t.global,a);e.module=r.exports,e.exportStar=r.exportStar,e.execute=r.execute;for(var n=e.module,o=0;o<e.normalizedDeps.length;o++){var i=e.normalizedDeps[o],l=t.defined[i];l?l.module?depModule=l.module:(s(l,t),depModule=l.module):depModule=t.get(i),e.exportStar&&-1!=indexOf.call(e.exportStar,e.normalizedDeps[o])&&!function(e){for(var t in e)(function(t){Object.defineProperty(n,t,{enumerable:!0,get:function(){return e[t]},set:function(a){e[t]=a}})})(t)}(depModule),a[o]=depModule}}}function l(e,t){var a,r=t.defined[e];if(r)r.declarative?u(e,[],t):r.evaluated||d(r,t),a=r.module;else if(a=t.get(e),!a)throw"System Register: The module requested "+e+" but this was not declared as a dependency";return a?a.__useDefault?a["default"]:a:""}function d(e,t){if(!e.module){if(e.module={"default":{},__useDefault:!0},!e.executingRequire)for(var a=0;a<e.normalizedDeps.length;a++){var r=e.normalizedDeps[a],n=t.defined[r];n&&d(n,t)}var o;for(var i in t.defined)if(t.defined[i]==e){o=i;break}e.evaluated=!0;var s=e.execute.call(t.global,function(a){for(var r=0;r<e.deps.length;r++)if(e.deps[r]==a)return l(e.normalizedDeps[r],t)},e.module["default"],o);s&&(e.module["default"]=s)}}function u(e,t,a){var r=a.defined[e];if(!r.evaluated&&r.declarative){t.push(e);for(var n=0;n<r.normalizedDeps.length;n++){var o=r.normalizedDeps[n];-1==indexOf.call(t,o)&&(a.defined[o]?u(o,t,a):a.get(o))}r.evaluated||(r.evaluated=!0,r.execute.call(a.global))}}"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),"undefined"==typeof __eval&&(__eval=0||eval);var f;e.__exec=t;var c,m;n(e);var p=/System\.register/,g=e.fetch;e.fetch=function(e){var t=this;return n(t),t.defined[e.name]?(e.metadata.format="defined",""):(c=null,m=!1,g.call(t,e))};var h=e.translate;e.translate=function(e){return this.register=r,this.__exec=t,e.metadata.deps=e.metadata.deps||[],Promise.resolve(h.call(this,e)).then(function(t){return(e.metadata.init||e.metadata.exports)&&(e.metadata.format=e.metadata.format||"global"),("register"==e.metadata.format||!e.metadata.format&&e.source.match(p))&&(e.metadata.format="register"),t})};var v=e.instantiate;e.instantiate=function(e){var t,n=this;if(n.defined[e.name])t=n.defined[e.name];else if(e.metadata.entry)t=e.metadata.entry;else if(e.metadata.execute)t={declarative:!1,deps:e.metadata.deps||[],execute:e.metadata.execute,executingRequire:e.metadata.executingRequire};else if("register"==e.metadata.format){c=null,m=!1;var o=n.global.System=n.global.System||n,s=o.register;if(o.register=r,n.__exec(e),o.register=s,c&&(t=c),!m&&!e.metadata.registered)throw e.name+" detected as System.register but didn't execute."}if(!t&&"es6"!=e.metadata.format)return{deps:[],execute:function(){return n.newModule({})}};if(!t)return v.call(this,e);n.defined[e.name]=t,t.deps=a(t.deps);for(var l=[],d=0;d<t.deps.length;d++)l.push(Promise.resolve(n.normalize(t.deps[d],e.name)));return Promise.all(l).then(function(a){return t.normalizedDeps=a,t.depMap=[],{deps:t.deps,execute:function(){if(t.esmodule)return n.defined[e.name]=void 0,t.esmodule;i(e.name,n),u(e.name,[],n),n.defined[e.name]=void 0;var a=n.newModule(t.module);for(var r in n.defined)n.defined[r]&&(t.declarative&&n.defined[r].execute!=t.execute||!t.declarative&&n.defined[r].declare!=t.declare);return a}}})}}function core(e){var t=e["import"];e["import"]=function(e,a){return t.call(this,e,a).then(function(e){return e.__useDefault?e["default"]:e})},e.set("@empty",e.newModule({})),e.config=function(e){for(var t in e){var a=e[t];if("object"==typeof a){this[t]=this[t]||{};for(var r in a)this[t][r]=a[r]}else this[t]=a}};var a;if("undefined"==typeof window)a=process.cwd()+"/";else if(a=document.baseURI,!a){var r=document.getElementsByTagName("base");a=r[0]&&r[0].href||window.location.href}var n,o=e.locate;e.locate=function(e){return this.baseURL!=n&&(n=toAbsoluteURL(a,this.baseURL),"/"!=n.substr(n.length-1,1)&&(n+="/"),this.baseURL=n),Promise.resolve(o.call(this,e))};var i=/^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/,s=/(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/,l=e.translate;e.translate=function(e){var t=this;if("@traceur"==e.name)return l.call(t,e);var a;if("es6"!=e.metadata.format&&e.metadata.format||!(a=e.source.match(i))){if(("es6"==e.metadata.format||!e.metadata.format&&e.source.match(s))&&(e.metadata.format="es6",!t.global.traceur))return t["import"]("@traceur").then(function(){return l.call(t,e)})}else e.metadata.format="cjs",e.source='module.exports = require("'+(a[1]||a[2])+'");\n';return l.call(t,e)};var d=e.instantiate;e.instantiate=function(e){var t=this;return"@traceur"==e.name?(t.__exec(e),{deps:[],execute:function(){return t.newModule({})}}):d.call(t,e)}}function global(e){function t(e){if(!e.has("@@global-helpers")){var t,a,r=e.global.hasOwnProperty,n={};e.set("@@global-helpers",e.newModule({prepareGlobal:function(o,i){for(var s=0;s<i.length;s++){var l=n[i[s]];if(l)for(var d in l)e.global[d]=l[d]}t={},a=["indexedDB","sessionStorage","localStorage","clipboardData","frames"];for(var u in e.global)if(!r||e.global.hasOwnProperty(u))try{t[u]=e.global[u]}catch(f){a.push(u)}},retrieveGlobal:function(o,i,s){var l,d={};if(s){for(var u=[],f=0;f<deps.length;f++)u.push(require(deps[f]));l=s.apply(e.global,u)}if(i&&!l){var c=i.split(".")[0];l=eval.call(e.global,i),d[c]=e.global[c]}else for(var m in e.global)~a.indexOf(m)||r&&!e.global.hasOwnProperty(m)||m==e.global||t[m]==e.global[m]||(d[m]=e.global[m],l?l!==e.global[m]&&(l=void 0):l!==!1&&(l=e.global[m]));return n[o]=d,"undefined"!=typeof l?l:d}}))}}t(e);var a=e.instantiate;e.instantiate=function(e){var r=this;t(r);var n=e.metadata.exports;return e.metadata.format||(e.metadata.format="global"),"global"==e.metadata.format&&(e.metadata.execute=function(t,a,o){r.get("@@global-helpers").prepareGlobal(o,e.metadata.deps),n&&(e.source+='\nthis["'+n+'"] = '+n+";");var i=r.global.define;return r.global.define=void 0,r.global.module=void 0,r.global.exports=void 0,r.__exec(e),r.global.define=i,r.get("@@global-helpers").retrieveGlobal(o,n,e.metadata.init)}),a.call(r,e)}}function cjs(e){function t(e){a.lastIndex=0,r.lastIndex=0;for(var t,o=[],e=e.replace(n,"");t=r.exec(e);)o.push(t[2]||t[3]);return o}var a=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/,r=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*)require\s*\(\s*("([^"]+)"|'([^']+)')\s*\)/g,n=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/gm,o=function(){},i={nextTick:function(e){setTimeout(e,7)},browser:"undefined"!=typeof window,env:{},argv:[],on:o,once:o,off:o,emit:o,cwd:function(){return"/"}};e._getCJSDeps=t,e.has("@@nodeProcess")||e.set("@@nodeProcess",e.newModule({"default":i,__useDefault:!0}));var s=e.translate;e.translate=function(e){var a=this;return a.has("@@nodeProcess")||a.set("@@nodeProcess",a.newModule({"default":i,__useDefault:!0})),a._getCJSDeps||(a._getCJSDeps=t),s.call(a,e)};var l=e.instantiate;e.instantiate=function(n){return n.metadata.format||(a.lastIndex=0,r.lastIndex=0,(r.exec(n.source)||a.exec(n.source))&&(n.metadata.format="cjs")),"cjs"==n.metadata.format&&(n.metadata.deps=n.metadata.deps?n.metadata.deps.concat(t(n.source)):n.metadata.deps,n.metadata.executingRequire=!0,n.metadata.execute=function(t,a){var r=n.address.split("/");r.pop(),r=r.join("/");var o=e.global._g={global:e.global,exports:a,module:{exports:a},process:i,require:t,__filename:n.address,__dirname:r},s="";for(var l in o)s+="var "+l+" = _g."+l+";";n.source=s+"(function() { "+n.source+"\n}).call(exports)";var d=e.global.define;return e.global.define=void 0,e.__exec(n),e.global.define=d,e.global._g=void 0,o.module.exports}),l.call(this,n)}}function amd(loader){function require(e,t,a,r){var n=this;if("object"==typeof e&&!(e instanceof Array))return require.apply(null,Array.prototype.splice.call(arguments,1,arguments.length-1));if(!(e instanceof Array)){if("string"==typeof e){var o=n.get(e);return o.__useDefault?o["default"]:o}throw"Invalid require"}Promise.all(e.map(function(e){return n["import"](e,r)})).then(function(e){t.apply(null,e)},a)}function makeRequire(e,t,a){return function(r,n,o){return"string"==typeof r?t(r):require.call(a,r,n,o,{name:e})}}function createDefine(e){function t(t,a,r){if("string"!=typeof t&&(r=a,a=t,t=null),!(a instanceof Array)){if(r=a,!e._getCJSDeps)throw"AMD extension needs CJS extension for AMD CJS support";a=["require","exports","module"].concat(e._getCJSDeps(r.toString()))}"function"!=typeof r&&(r=function(e){return function(){return e}}(r));var n,o,i;-1!=(n=indexOf.call(a,"require"))&&a.splice(n,1),-1!=(o=indexOf.call(a,"exports"))&&a.splice(o,1),-1!=(i=indexOf.call(a,"module"))&&a.splice(i,1);var s={deps:a,execute:function(t,s,l){for(var d=[],u=0;u<a.length;u++)d.push(t(a[u]));var f;-1!=i&&d.splice(i,0,s,f={id:l,uri:e.baseURL+l,config:function(){return{}},exports:s}),-1!=o&&d.splice(o,0,s),-1!=n&&d.splice(n,0,makeRequire(l,t,e));var c=r.apply(e.global,d);return"undefined"==typeof c&&f&&(c=f.exports),"undefined"!=typeof c?c:void 0}};if(t)anonDefine=0!=a.length||anonDefine||defineBundle?null:s,defineBundle=!0,e.register(t,s.deps,!1,s.execute);else{if(anonDefine)throw"Multiple defines for anonymous module";anonDefine=s}}if(anonDefine=null,defineBundle=null,e.global.module=void 0,e.global.exports=void 0,!e.global.define||e.global.define.loader!=e){var a=e.onScriptLoad;e.onScriptLoad=function(e){a(e),(anonDefine||defineBundle)&&(e.metadata.format="defined"),anonDefine&&(e.metadata.deps=e.metadata.deps?e.metadata.deps.concat(anonDefine.deps):anonDefine.deps,e.metadata.execute=anonDefine.execute)},e.amdDefine=t,e.global.define=t,e.global.define.amd={},e.global.define.loader=e}}var isNode="undefined"!=typeof module&&module.exports,amdRegEx=/(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?\s*(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*,?\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;loader.require=require;var anonDefine,defineBundle;if(isNode||loader.amdDefine===!1||createDefine(loader),loader.scriptLoader){var loaderFetch=loader.fetch;loader.fetch=function(e){return loader.amdDefine!==!1&&createDefine(this),loaderFetch.call(this,e)}}var loaderInstantiate=loader.instantiate;loader.instantiate=function(load){var loader=this;if("amd"==load.metadata.format||!load.metadata.format&&load.source.match(amdRegEx)){load.metadata.format="amd",createDefine(loader);try{loader.__exec(load)}catch(e){if(loader.execute!==!1||!isNode)throw e;var match=load.source.match(amdRegEx);match&&(match[1]&&"["==match[1][0]?define(match[1].substr(match[1].length-2),eval(match[2]),function(){}):match[2]&&"["==match[2][0]?define(eval(match[2]),function(){}):define(function(){}))}if(isNode&&(loader.global.define=void 0),!anonDefine&&!defineBundle&&!isNode)throw"AMD module "+load.name+" did not define";anonDefine&&(load.metadata.deps=load.metadata.deps?load.metadata.deps.concat(anonDefine.deps):anonDefine.deps,load.metadata.execute=anonDefine.execute)}return loaderInstantiate.call(loader,load)}}function map(e){function t(e,t){return e.length<t.length?!1:e.substr(0,t.length)!=t?!1:e[t.length]&&"/"!=e[t.length]?!1:!0}function a(e){for(var t=1,a=0,r=e.length;r>a;a++)"/"===e[a]&&t++;return t}function r(e,t,a){return a+e.substr(t)}function n(e,n,o){var i,s,l,d,u=0,f=0;if(n)for(var c in o.map){var m=o.map[c];if("object"==typeof m&&t(n,c)&&(l=a(c),!(f>=l)))for(var p in m)t(e,p)&&(d=a(p),u>=d||(i=p,u=d,s=c,f=l))}if(i)return r(e,i.length,o.map[s][i]);for(var c in o.map){var m=o.map[c];if("string"==typeof m&&t(e,c)){var d=a(c);u>=d||(i=c,u=d)}}return i?r(e,i.length,o.map[i]):e}e.map=e.map||{};var o=e.normalize;e.normalize=function(e,t,a){var r=this;r.map||(r.map={});var i=!1;return"/"==e.substr(e.length-1,1)&&(i=!0,e+="#"),Promise.resolve(o.call(r,e,t,a)).then(function(e){if(e=n(e,t,r),i){var a=e.split("/");a.pop();var o=a.pop();a.push(o),a.push(o),e=a.join("/")}return e})}}function bundles(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),e.bundles=e.bundles||{};var t=e.fetch;e.fetch=function(e){var a=this;if(a.trace)return t.call(this,e);a.bundles||(a.bundles={});for(var r in a.bundles)if(-1!=indexOf.call(a.bundles[r],e.name))return Promise.resolve(a.normalize(r)).then(function(e){return a.bundles[e]=a.bundles[e]||a.bundles[r],a.meta=a.meta||{},a.meta[e]=a.meta[e]||{},a.meta[e].bundle=!0,a.load(e)}).then(function(){return""});return t.call(this,e)}}function versions(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=/^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?)?)?$/,a=function(e,t){var a,r=e.split("."),n=t.split(".");r[2]&&-1!=(a=indexOf.call(r[2],"-"))&&r.splice(2,1,r[2].substr(0,a),r[2].substr(a+1)),n[2]&&-1!=(a=indexOf.call(n[2],"-"))&&n.splice(2,1,n[2].substr(0,a),n[2].substr(a+1));for(var o=0;o<Math.max(r.length,n.length);o++){if(!r[o])return 1;if(!n[o])return-1;if(r[o]!=n[o])return parseInt(r[o])>parseInt(n[o])?1:-1}return 0};e.versions=e.versions||{};var r=e.normalize;e.normalize=function(n,o,i){e.versions||(e.versions={});var s,l,d=this.versions;if(n.indexOf("@")>0){var u=n.lastIndexOf("@"),f=n.substr(u+1,n.length-u-1).split("/");s=f[0],l=f.length,n=n.substr(0,u)+n.substr(u+s.length+1,n.length-u-s.length-1)}return Promise.resolve(r.call(this,n,o,i)).then(function(e){var r,n,o,i,u=e.indexOf("@");if(s&&(-1==u||0==u)){var f=e.split("/");f[f.length-l]+="@"+s,e=f.join("/"),u=e.indexOf("@")}if(-1==u||0==u){for(var c in d)if(i=d[c],e.substr(0,c.length)==c&&(o=e.substr(c.length,1),!o||"/"==o))return c+"@"+("string"==typeof i?i:i[i.length-1])+e.substr(c.length);return e}r=e.substr(u+1).split("/")[0];var m,p=r.length;if("^"==r.substr(0,1)&&(r=r.substr(1),m=!0),n=r.match(t),!n)return e;m&&(n[2]||(m=!1),n[3]||(n[2]>0?n[3]="0":m=!1)),m&&(n[1]>0?(n[2]||(r=n[1]+".0.0"),n[3]||(r=n[1]+".0"),m=r,n=[n[1]]):n[2]>0?(m=r,n=[0,n[2]]):(m=!1,n=[0,0,n[3]]),r=n.join("."));var g=e.substr(0,u);if(i=d[g]||[],"string"==typeof i&&(i=[i]),!n[3]||m)for(var h=i.length-1;h>=0;h--){var v=i[h];if(v.substr(0,r.length)==r&&v.substr(r.length,1).match(/^[\.\-]?$/)&&(!m||m&&-1!=a(v,m)))return g+"@"+v+e.substr(g.length+p+1)}return-1==indexOf.call(i,r)&&(i.push(r),i.sort(a),e=g+"@"+r+e.substr(g.length+p+1),n[3]&&-1!=(u=indexOf.call(i,n[1]+"."+n[2]))&&i.splice(u,1),n[2]&&-1!=(u=indexOf.call(i,n[1]))&&i.splice(u,1),d[g]=1==i.length?i[0]:i),e})}}function depCache(e){e.depCache=e.depCache||{},loaderLocate=e.locate,e.locate=function(e){var t=this;t.depCache||(t.depCache={});var a=t.depCache[e.name];if(a)for(var r=0;r<a.length;r++)t.load(a[r]);return loaderLocate.call(t,e)}}__$global.upgradeSystemLoader=void 0;var indexOf=Array.prototype.indexOf||function(e){for(var t=0,a=this.length;a>t;t++)if(this[t]===e)return t;return-1},originalSystem=__$global.System,System=__$global.System=new LoaderPolyfill(originalSystem);System.baseURL=originalSystem.baseURL,System.paths={"*":"*.js"},System.originalSystem=originalSystem,System.noConflict=function(){__$global.SystemJS=System,__$global.System=System.originalSystem},scriptLoader(System),meta(System),register(System),core(System),global(System),cjs(System),amd(System),map(System),bundles(System),versions(System),depCache(System),System.paths["@traceur"]||(System.paths["@traceur"]=__$curScript&&__$curScript.getAttribute("data-traceur-src")||(__$curScript&&__$curScript.src?__$curScript.src.substr(0,__$curScript.src.lastIndexOf("/")+1):System.baseURL+(System.baseURL.lastIndexOf("/")==System.baseURL.length-1?"":"/"))+"traceur.js")};var __$curScript;!function(e){if("undefined"!=typeof window){var t=document.getElementsByTagName("script");if(__$curScript=t[t.length-1],e.System&&e.LoaderPolyfill)e.upgradeSystemLoader();else{var a=__$curScript.src,r=a.substr(0,a.lastIndexOf("/")+1);document.write('<script type="text/javascript" src="'+r+'es6-module-loader.js" data-init="upgradeSystemLoader">'+"<"+"/script>")}}else{var n=require("es6-module-loader");e.System=n.System,e.Loader=n.Loader,e.upgradeSystemLoader(),module.exports=e.System}}(__$global)}("undefined"!=typeof window?window:global);
\ No newline at end of file
+!function(__$global){function __eval(__source,__global,__address,__sourceMap){try{__source=(__global!=__$global?"with(__global) { (function() { "+__source+" \n }).call(__global); }":__source)+"\n//# sourceURL="+__address+(__sourceMap?"\n//# sourceMappingURL="+__sourceMap:""),eval(__source)}catch(e){throw"SyntaxError"==e.name&&(e.message="Evaluating "+__address+"\n	"+e.message),System.trace&&0==System.execute&&(e="Execution error for "+__address+": "+e.stack||e),e}}__$global.upgradeSystemLoader=function(){function parseURI(e){var t=String(e).replace(/^\s+|\s+$/g,"").match(/^([^:\/?#]+:)?(\/\/(?:[^:@]*(?::[^:@]*)?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);return t?{href:t[0]||"",protocol:t[1]||"",authority:t[2]||"",host:t[3]||"",hostname:t[4]||"",port:t[5]||"",pathname:t[6]||"",search:t[7]||"",hash:t[8]||""}:null}function toAbsoluteURL(e,t){function a(e){var t=[];return e.replace(/^(\.\.?(\/|$))+/,"").replace(/\/(\.(\/|$))+/g,"/").replace(/\/\.\.$/,"/../").replace(/\/?[^\/]*/g,function(e){"/.."===e?t.pop():t.push(e)}),t.join("").replace(/^\//,"/"===e.charAt(0)?"/":"")}return t=parseURI(t||""),e=parseURI(e||""),t&&e?(t.protocol||e.protocol)+(t.protocol||t.authority?t.authority:e.authority)+a(t.protocol||t.authority||"/"===t.pathname.charAt(0)?t.pathname:t.pathname?(e.authority&&!e.pathname?"/":"")+e.pathname.slice(0,e.pathname.lastIndexOf("/")+1)+t.pathname:e.pathname)+(t.protocol||t.authority||t.pathname?t.search:t.search||e.search)+t.hash:null}function scriptLoader(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=document.getElementsByTagName("head")[0];e.onScriptLoad=function(){},e.fetch=function(a){return new Promise(function(r,n){function o(){l.readyState&&"loaded"!=l.readyState&&"complete"!=l.readyState||(s(),e.onScriptLoad(a),r(""))}function i(e){s(),n(e)}function s(){l.detachEvent?l.detachEvent("onreadystatechange",o):(l.removeEventListener("load",o,!1),l.removeEventListener("error",i,!1)),t.removeChild(l)}var l=document.createElement("script");l.async=!0,l.attachEvent&&l.attachEvent("onreadystatechange",o),l.addEventListener("load",o,!1),l.addEventListener("error",i,!1),l.src=a.address,t.appendChild(l)})},e.scriptLoader=!0}function meta(e){function t(e,t){var a=e.meta&&e.meta[t.name];if(a)for(var r in a)t.metadata[r]=t.metadata[r]||a[r]}var a=/^(\s*\/\*.*\*\/|\s*\/\/[^\n]*|\s*"[^"]+"\s*;?|\s*'[^']+'\s*;?)+/,r=/\/\*.*\*\/|\/\/[^\n]*|"[^"]+"\s*;?|'[^']+'\s*;?/g;e.meta={};var n=e.locate;e.locate=function(e){return t(this,e),n.call(this,e)};var o=e.translate;e.translate=function(e){var n=e.source.match(a);if(n)for(var i=n[0].match(r),s=0;s<i.length;s++){var l=i[s].length,d=i[s].substr(0,1);if(";"==i[s].substr(l-1,1)&&l--,'"'==d||"'"==d){var u=i[s].substr(1,i[s].length-3),c=u.substr(0,u.indexOf(" "));if(c){var f=u.substr(c.length+1,u.length-c.length-1);e.metadata[c]instanceof Array?e.metadata[c].push(f):e.metadata[c]=f}}}return t(this,e),o.call(this,e)}}function register(e){function t(e){var t=this;"@traceur"==e.name&&(c=System);var a,r=e.source.lastIndexOf("\n");-1!=r&&"//# sourceMappingURL="==e.source.substr(r+1,21)&&(a=e.source.substr(r+22,e.source.length-r-22),"undefined"!=typeof toAbsoluteURL&&(a=toAbsoluteURL(e.address,a))),__eval(e.source,t.global,e.address,a),"@traceur"==e.name&&(t.global.traceurSystem=t.global.System,t.global.System=c)}function a(e){for(var t=[],a=0;a<e.length;a++)-1==indexOf.call(t,e[a])&&t.push(e[a]);return t}function r(t,a,r,n){"string"!=typeof t&&(n=r,r=a,a=t,t=null),m=!0;var o;if("boolean"==typeof r)o={declarative:!1,deps:a,execute:n,executingRequire:r};else{if(a.length>0&&1!=r.length)throw"Invalid System.register form for "+t+". Declare function must take one argument.";o={declarative:!0,deps:a,declare:r}}if(t)e.defined[t]||(e.defined[t]=o);else if(o.declarative){if(f)throw"Multiple anonymous System.register calls in the same module file.";f=o}}function n(e){if(!e.register){e.register=r,e.defined||(e.defined={});var t=e.onScriptLoad;e.onScriptLoad=function(e){t(e),f&&(e.metadata.entry=f),(f||m)&&(e.metadata.format=e.metadata.format||"register"),m&&(e.metadata.registered=!0)}}}function o(e,t,a){if(a[e.groupIndex]=a[e.groupIndex]||[],-1==indexOf.call(a[e.groupIndex],e)){a[e.groupIndex].push(e);for(var r=0;r<e.normalizedDeps.length;r++){var n=e.normalizedDeps[r],i=t.defined[n];if(i&&!i.evaluated){var s=e.groupIndex+(i.declarative!=e.declarative);if(void 0===i.groupIndex||i.groupIndex<s){if(i.groupIndex&&(a[i.groupIndex].splice(a[i.groupIndex].indexOf(i),1),0==a[i.groupIndex].length))throw new TypeError("Mixed dependency cycle detected");i.groupIndex=s}o(i,t,a)}}}}function i(e,t){var a=t.defined[e];a.groupIndex=0;var r=[];o(a,t,r);for(var n=!!a.declarative==r.length%2,i=r.length-1;i>=0;i--){for(var l=r[i],u=0;u<l.length;u++){var c=l[u];n?s(c,t):d(c,t)}n=!n}}function s(e,t){if(!e.module){var a=[],r=e.declare.call(t.global,a);e.module=r.exports,e.exportStar=r.exportStar,e.execute=r.execute;for(var n=e.module,o=0;o<e.normalizedDeps.length;o++){var i=e.normalizedDeps[o],l=t.defined[i];l?l.module?depModule=l.module:(s(l,t),depModule=l.module):depModule=t.get(i),e.exportStar&&-1!=indexOf.call(e.exportStar,e.normalizedDeps[o])&&!function(e){for(var t in e)(function(t){Object.defineProperty(n,t,{enumerable:!0,get:function(){return e[t]},set:function(a){e[t]=a}})})(t)}(depModule),a[o]=depModule}}}function l(e,t){var a,r=t.defined[e];if(r)r.declarative?u(e,[],t):r.evaluated||d(r,t),a=r.module;else if(a=t.get(e),!a)throw"System Register: The module requested "+e+" but this was not declared as a dependency";return a?a.__useDefault?a["default"]:a:""}function d(e,t){if(!e.module){if(e.module={"default":{},__useDefault:!0},!e.executingRequire)for(var a=0;a<e.normalizedDeps.length;a++){var r=e.normalizedDeps[a],n=t.defined[r];n&&d(n,t)}var o;for(var i in t.defined)if(t.defined[i]==e){o=i;break}e.evaluated=!0;var s=e.execute.call(t.global,function(a){for(var r=0;r<e.deps.length;r++)if(e.deps[r]==a)return l(e.normalizedDeps[r],t)},e.module["default"],o);s&&(e.module["default"]=s)}}function u(e,t,a){var r=a.defined[e];if(!r.evaluated&&r.declarative){t.push(e);for(var n=0;n<r.normalizedDeps.length;n++){var o=r.normalizedDeps[n];-1==indexOf.call(t,o)&&(a.defined[o]?u(o,t,a):a.get(o))}r.evaluated||(r.evaluated=!0,r.execute.call(a.global))}}"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),"undefined"==typeof __eval&&(__eval=0||eval);var c;e.__exec=t;var f,m;n(e);var p=/System\.register/,g=e.fetch;e.fetch=function(e){var t=this;return n(t),t.defined[e.name]?(e.metadata.format="defined",""):(f=null,m=!1,g.call(t,e))};var h=e.translate;e.translate=function(e){return this.register=r,this.__exec=t,e.metadata.deps=e.metadata.deps||[],Promise.resolve(h.call(this,e)).then(function(t){return(e.metadata.init||e.metadata.exports)&&(e.metadata.format=e.metadata.format||"global"),("register"==e.metadata.format||!e.metadata.format&&e.source.match(p))&&(e.metadata.format="register"),t})};var v=e.instantiate;e.instantiate=function(e){var t,n=this;if(n.defined[e.name])t=n.defined[e.name];else if(e.metadata.entry)t=e.metadata.entry;else if(e.metadata.execute)t={declarative:!1,deps:e.metadata.deps||[],execute:e.metadata.execute,executingRequire:e.metadata.executingRequire};else if("register"==e.metadata.format){f=null,m=!1;var o=n.global.System=n.global.System||n,s=o.register;if(o.register=r,n.__exec(e),o.register=s,f&&(t=f),!m&&!e.metadata.registered)throw e.name+" detected as System.register but didn't execute."}if(!t&&"es6"!=e.metadata.format)return{deps:[],execute:function(){return n.newModule({})}};if(!t)return v.call(this,e);n.defined[e.name]=t,t.deps=a(t.deps);for(var l=[],d=0;d<t.deps.length;d++)l.push(Promise.resolve(n.normalize(t.deps[d],e.name)));return Promise.all(l).then(function(a){return t.normalizedDeps=a,t.depMap=[],{deps:t.deps,execute:function(){if(t.esmodule)return n.defined[e.name]=void 0,t.esmodule;i(e.name,n),u(e.name,[],n),n.defined[e.name]=void 0;var a=n.newModule(t.module);for(var r in n.defined)n.defined[r]&&(t.declarative&&n.defined[r].execute!=t.execute||!t.declarative&&n.defined[r].declare!=t.declare);return a}}})}}function core(e){var t=e["import"];e["import"]=function(e,a){return t.call(this,e,a).then(function(e){return e.__useDefault?e["default"]:e})},e.set("@empty",e.newModule({})),e.config=function(e){for(var t in e){var a=e[t];if("object"==typeof a){this[t]=this[t]||{};for(var r in a)this[t][r]=a[r]}else this[t]=a}};var a;if("undefined"==typeof window)a=process.cwd()+"/";else if(a=document.baseURI,!a){var r=document.getElementsByTagName("base");a=r[0]&&r[0].href||window.location.href}var n,o=e.locate;e.locate=function(e){return this.baseURL!=n&&(n=toAbsoluteURL(a,this.baseURL),"/"!=n.substr(n.length-1,1)&&(n+="/"),this.baseURL=n),Promise.resolve(o.call(this,e))};var i=/^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/,s=/(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/,l=e.translate;e.translate=function(e){var t=this;if("@traceur"==e.name)return l.call(t,e);var a;if("es6"!=e.metadata.format&&e.metadata.format||!(a=e.source.match(i))){if(("es6"==e.metadata.format||!e.metadata.format&&e.source.match(s))&&(e.metadata.format="es6",!t.global.traceur))return t["import"]("@traceur").then(function(){return l.call(t,e)})}else e.metadata.format="cjs",e.source='module.exports = require("'+(a[1]||a[2])+'");\n';return l.call(t,e)};var d=e.instantiate;e.instantiate=function(e){var t=this;return"@traceur"==e.name?(t.__exec(e),{deps:[],execute:function(){return t.newModule({})}}):d.call(t,e)}}function global(e){function t(e){if(!e.has("@@global-helpers")){var t,a,r=e.global.hasOwnProperty,n={};e.set("@@global-helpers",e.newModule({prepareGlobal:function(o,i){for(var s=0;s<i.length;s++){var l=n[i[s]];if(l)for(var d in l)e.global[d]=l[d]}t={},a=["indexedDB","sessionStorage","localStorage","clipboardData","frames"];for(var u in e.global)if(!r||e.global.hasOwnProperty(u))try{t[u]=e.global[u]}catch(c){a.push(u)}},retrieveGlobal:function(o,i,s){var l,d={};if(s){for(var u=[],c=0;c<deps.length;c++)u.push(require(deps[c]));l=s.apply(e.global,u)}if(i&&!l){var f=i.split(".")[0];l=eval.call(e.global,i),d[f]=e.global[f]}else for(var m in e.global)~a.indexOf(m)||r&&!e.global.hasOwnProperty(m)||m==e.global||t[m]==e.global[m]||(d[m]=e.global[m],l?l!==e.global[m]&&(l=void 0):l!==!1&&(l=e.global[m]));return n[o]=d,"undefined"!=typeof l?l:d}}))}}t(e);var a=e.instantiate;e.instantiate=function(e){var r=this;t(r);var n=e.metadata.exports;return e.metadata.format||(e.metadata.format="global"),"global"==e.metadata.format&&(e.metadata.execute=function(t,a,o){r.get("@@global-helpers").prepareGlobal(o,e.metadata.deps),n&&(e.source+='\nthis["'+n+'"] = '+n+";");var i=r.global.define;return r.global.define=void 0,r.global.module=void 0,r.global.exports=void 0,r.__exec(e),r.global.define=i,r.get("@@global-helpers").retrieveGlobal(o,n,e.metadata.init)}),a.call(r,e)}}function cjs(e){function t(e,t){a.lastIndex=0;var s=t?new RegExp(r+t+n,"g"):o;s.lastIndex=0;for(var l,d=[],e=e.replace(i,"");l=s.exec(e);)d.push(l[2]||l[3]);return d}var a=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/,r="(?:^\\s*|[}{\\(\\);,\\n=:\\?\\&]\\s*)",n="\\s*\\(\\s*(\"([^\"]+)\"|'([^']+)')\\s*\\)",o=new RegExp(r+"require"+n,"g"),i=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/gm,s=function(){},l={nextTick:function(e){setTimeout(e,7)},browser:"undefined"!=typeof window,env:{},argv:[],on:s,once:s,off:s,emit:s,cwd:function(){return"/"}};e._getCJSDeps=t,e.has("@@nodeProcess")||e.set("@@nodeProcess",e.newModule({"default":l,__useDefault:!0}));var d=e.translate;e.translate=function(e){var a=this;return a.has("@@nodeProcess")||a.set("@@nodeProcess",a.newModule({"default":l,__useDefault:!0})),a._getCJSDeps||(a._getCJSDeps=t),d.call(a,e)};var u=e.instantiate;e.instantiate=function(r){return r.metadata.format||(a.lastIndex=0,o.lastIndex=0,(o.exec(r.source)||a.exec(r.source))&&(r.metadata.format="cjs")),"cjs"==r.metadata.format&&(r.metadata.deps=r.metadata.deps?r.metadata.deps.concat(t(r.source)):r.metadata.deps,r.metadata.executingRequire=!0,r.metadata.execute=function(t,a){var n=r.address.split("/");n.pop(),n=n.join("/");var o=e.global._g={global:e.global,exports:a,module:{exports:a},process:l,require:t,__filename:r.address,__dirname:n},i="";for(var s in o)i+="var "+s+" = _g."+s+";";r.source=i+"(function() { "+r.source+"\n}).call(exports)";var d=e.global.define;return e.global.define=void 0,e.__exec(r),e.global.define=d,e.global._g=void 0,o.module.exports}),u.call(this,r)}}function amd(loader){function getRequireAlias(e,t){var a=e.match(parensRegExp);if(a){var r=[];return a[1].replace(commentRegEx,"").replace(argRegEx,function(e){r.push(e)}),r[t||0]}}function require(e,t,a,r){var n=this;if("object"==typeof e&&!(e instanceof Array))return require.apply(null,Array.prototype.splice.call(arguments,1,arguments.length-1));if(!(e instanceof Array)){if("string"==typeof e){var o=n.get(e);return o.__useDefault?o["default"]:o}throw"Invalid require"}Promise.all(e.map(function(e){return n["import"](e,r)})).then(function(e){t.apply(null,e)},a)}function makeRequire(e,t,a){return function(r,n,o){return"string"==typeof r?t(r):require.call(a,r,n,o,{name:e})}}function createDefine(e){function t(t,a,r){"string"!=typeof t&&(r=a,a=t,t=null),a instanceof Array||(r=a,a=["require","exports","module"]),"function"!=typeof r&&(r=function(e){return function(){return e}}(r));var n,o,i;if(-1!=(n=indexOf.call(a,"require"))){if(a.splice(n,1),!e._getCJSDeps)throw"AMD extension needs CJS extension for AMD CJS support";var s=r.toString();a=a.concat(e._getCJSDeps(s,getRequireAlias(s,n)))}-1!=(o=indexOf.call(a,"exports"))&&a.splice(o,1),-1!=(i=indexOf.call(a,"module"))&&a.splice(i,1);var l={deps:a,execute:function(t,s,l){for(var d=[],u=0;u<a.length;u++)d.push(t(a[u]));var c;-1!=i&&d.splice(i,0,s,c={id:l,uri:e.baseURL+l,config:function(){return{}},exports:s}),-1!=o&&d.splice(o,0,s),-1!=n&&d.splice(n,0,makeRequire(l,t,e));var f=r.apply(e.global,d);return"undefined"==typeof f&&c&&(f=c.exports),"undefined"!=typeof f?f:void 0}};if(t)anonDefine=0!=a.length||anonDefine||defineBundle?null:l,defineBundle=!0,e.register(t,l.deps,!1,l.execute);else{if(anonDefine)throw"Multiple defines for anonymous module";anonDefine=l}}if(anonDefine=null,defineBundle=null,e.global.module=void 0,e.global.exports=void 0,!e.global.define||e.global.define.loader!=e){var a=e.onScriptLoad;e.onScriptLoad=function(e){a(e),(anonDefine||defineBundle)&&(e.metadata.format="defined"),anonDefine&&(e.metadata.deps=e.metadata.deps?e.metadata.deps.concat(anonDefine.deps):anonDefine.deps,e.metadata.execute=anonDefine.execute)},e.amdDefine=t,e.global.define=t,e.global.define.amd={},e.global.define.loader=e}}var isNode="undefined"!=typeof module&&module.exports,parensRegExp=/\(([^)]+)/,commentRegEx=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/gm,argRegEx=/[\w\d]+/g,amdRegEx=/(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?\s*(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*,?\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;loader.require=require;var anonDefine,defineBundle;if(isNode||loader.amdDefine===!1||createDefine(loader),loader.scriptLoader){var loaderFetch=loader.fetch;loader.fetch=function(e){return loader.amdDefine!==!1&&createDefine(this),loaderFetch.call(this,e)}}var loaderInstantiate=loader.instantiate;loader.instantiate=function(load){var loader=this;if("amd"==load.metadata.format||!load.metadata.format&&load.source.match(amdRegEx)){load.metadata.format="amd",createDefine(loader);try{loader.__exec(load)}catch(e){if(loader.execute!==!1||!isNode)throw e;var match=load.source.match(amdRegEx);match&&(match[1]&&"["==match[1][0]?define(match[1].substr(match[1].length-2),eval(match[2]),function(){}):match[2]&&"["==match[2][0]?define(eval(match[2]),function(){}):define(function(){}))}if(isNode&&(loader.global.define=void 0),!anonDefine&&!defineBundle&&!isNode)throw"AMD module "+load.name+" did not define";anonDefine&&(load.metadata.deps=load.metadata.deps?load.metadata.deps.concat(anonDefine.deps):anonDefine.deps,load.metadata.execute=anonDefine.execute)}return loaderInstantiate.call(loader,load)}}function map(e){function t(e,t){return e.length<t.length?!1:e.substr(0,t.length)!=t?!1:e[t.length]&&"/"!=e[t.length]?!1:!0}function a(e){for(var t=1,a=0,r=e.length;r>a;a++)"/"===e[a]&&t++;return t}function r(e,t,a){return a+e.substr(t)}function n(e,n,o){var i,s,l,d,u=0,c=0;if(n)for(var f in o.map){var m=o.map[f];if("object"==typeof m&&t(n,f)&&(l=a(f),!(c>=l)))for(var p in m)t(e,p)&&(d=a(p),u>=d||(i=p,u=d,s=f,c=l))}if(i)return r(e,i.length,o.map[s][i]);for(var f in o.map){var m=o.map[f];if("string"==typeof m&&t(e,f)){var d=a(f);u>=d||(i=f,u=d)}}return i?r(e,i.length,o.map[i]):e}e.map=e.map||{};var o=e.normalize;e.normalize=function(e,t,a){var r=this;r.map||(r.map={});var i=!1;return"/"==e.substr(e.length-1,1)&&(i=!0,e+="#"),Promise.resolve(o.call(r,e,t,a)).then(function(e){if(e=n(e,t,r),i){var a=e.split("/");a.pop();var o=a.pop();a.push(o),a.push(o),e=a.join("/")}return e})}}function bundles(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),e.bundles=e.bundles||{};var t=e.fetch;e.fetch=function(e){var a=this;if(a.trace)return t.call(this,e);a.bundles||(a.bundles={});for(var r in a.bundles)if(-1!=indexOf.call(a.bundles[r],e.name))return Promise.resolve(a.normalize(r)).then(function(e){return a.bundles[e]=a.bundles[e]||a.bundles[r],a.meta=a.meta||{},a.meta[e]=a.meta[e]||{},a.meta[e].bundle=!0,a.load(e)}).then(function(){return""});return t.call(this,e)}}function versions(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=/^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?)?)?$/,a=function(e,t){var a,r=e.split("."),n=t.split(".");r[2]&&-1!=(a=indexOf.call(r[2],"-"))&&r.splice(2,1,r[2].substr(0,a),r[2].substr(a+1)),n[2]&&-1!=(a=indexOf.call(n[2],"-"))&&n.splice(2,1,n[2].substr(0,a),n[2].substr(a+1));for(var o=0;o<Math.max(r.length,n.length);o++){if(!r[o])return 1;if(!n[o])return-1;if(r[o]!=n[o])return parseInt(r[o])>parseInt(n[o])?1:-1}return 0};e.versions=e.versions||{};var r=e.normalize;e.normalize=function(n,o,i){e.versions||(e.versions={});var s,l,d=this.versions;if(n.indexOf("@")>0){var u=n.lastIndexOf("@"),c=n.substr(u+1,n.length-u-1).split("/");s=c[0],l=c.length,n=n.substr(0,u)+n.substr(u+s.length+1,n.length-u-s.length-1)}return Promise.resolve(r.call(this,n,o,i)).then(function(e){var r,n,o,i,u=e.indexOf("@");if(s&&(-1==u||0==u)){var c=e.split("/");c[c.length-l]+="@"+s,e=c.join("/"),u=e.indexOf("@")}if(-1==u||0==u){for(var f in d)if(i=d[f],e.substr(0,f.length)==f&&(o=e.substr(f.length,1),!o||"/"==o))return f+"@"+("string"==typeof i?i:i[i.length-1])+e.substr(f.length);return e}r=e.substr(u+1).split("/")[0];var m,p=r.length;if("^"==r.substr(0,1)&&(r=r.substr(1),m=!0),n=r.match(t),!n)return e;m&&(n[2]||(m=!1),n[3]||(n[2]>0?n[3]="0":m=!1)),m&&(n[1]>0?(n[2]||(r=n[1]+".0.0"),n[3]||(r=n[1]+".0"),m=r,n=[n[1]]):n[2]>0?(m=r,n=[0,n[2]]):(m=!1,n=[0,0,n[3]]),r=n.join("."));var g=e.substr(0,u);if(i=d[g]||[],"string"==typeof i&&(i=[i]),!n[3]||m)for(var h=i.length-1;h>=0;h--){var v=i[h];if(v.substr(0,r.length)==r&&v.substr(r.length,1).match(/^[\.\-]?$/)&&(!m||m&&-1!=a(v,m)))return g+"@"+v+e.substr(g.length+p+1)}return-1==indexOf.call(i,r)&&(i.push(r),i.sort(a),e=g+"@"+r+e.substr(g.length+p+1),n[3]&&-1!=(u=indexOf.call(i,n[1]+"."+n[2]))&&i.splice(u,1),n[2]&&-1!=(u=indexOf.call(i,n[1]))&&i.splice(u,1),d[g]=1==i.length?i[0]:i),e})}}function depCache(e){e.depCache=e.depCache||{},loaderLocate=e.locate,e.locate=function(e){var t=this;t.depCache||(t.depCache={});var a=t.depCache[e.name];if(a)for(var r=0;r<a.length;r++)t.load(a[r]);return loaderLocate.call(t,e)}}__$global.upgradeSystemLoader=void 0;var indexOf=Array.prototype.indexOf||function(e){for(var t=0,a=this.length;a>t;t++)if(this[t]===e)return t;return-1},originalSystem=__$global.System,System=__$global.System=new LoaderPolyfill(originalSystem);System.baseURL=originalSystem.baseURL,System.paths={"*":"*.js"},System.originalSystem=originalSystem,System.noConflict=function(){__$global.SystemJS=System,__$global.System=System.originalSystem},scriptLoader(System),meta(System),register(System),core(System),global(System),cjs(System),amd(System),map(System),bundles(System),versions(System),depCache(System),System.paths["@traceur"]||(System.paths["@traceur"]=__$curScript&&__$curScript.getAttribute("data-traceur-src")||(__$curScript&&__$curScript.src?__$curScript.src.substr(0,__$curScript.src.lastIndexOf("/")+1):System.baseURL+(System.baseURL.lastIndexOf("/")==System.baseURL.length-1?"":"/"))+"traceur.js")};var __$curScript;!function(e){if("undefined"!=typeof window){var t=document.getElementsByTagName("script");if(__$curScript=t[t.length-1],e.System&&e.LoaderPolyfill)e.upgradeSystemLoader();else{var a=__$curScript.src,r=a.substr(0,a.lastIndexOf("/")+1);document.write('<script type="text/javascript" src="'+r+'es6-module-loader.js" data-init="upgradeSystemLoader"></script>')}}else{var n=require("es6-module-loader");e.System=n.System,e.Loader=n.Loader,e.upgradeSystemLoader(),module.exports=e.System}}(__$global)}("undefined"!=typeof window?window:global);
\ No newline at end of file
diff --git a/dist/system.js b/dist/system.js
index b71cee5c..e12e837e 100644
--- a/dist/system.js
+++ b/dist/system.js
@@ -980,13 +980,19 @@ function cjs(loader) {
   // CJS Module Format
   // require('...') || exports[''] = ... || exports.asd = ... || module.exports = ...
   var cjsExportsRegEx = /(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/;
-  var cjsRequireRegEx = /(?:^\s*|[}{\(\);,\n=:\?\&]\s*)require\s*\(\s*("([^"]+)"|'([^']+)')\s*\)/g;
+  var cjsRequirePre = "(?:^\\s*|[}{\\(\\);,\\n=:\\?\\&]\\s*)";
+  var cjsRequirePost = "\\s*\\(\\s*(\"([^\"]+)\"|'([^']+)')\\s*\\)";
+  var cjsRequireRegEx = new RegExp(cjsRequirePre+"require"+cjsRequirePost,"g");
   var commentRegEx = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
 
-  function getCJSDeps(source) {
+  function getCJSDeps(source, requireAlias) {
     cjsExportsRegEx.lastIndex = 0;
-    cjsRequireRegEx.lastIndex = 0;
-
+    
+    // If a requireAlias is given, generate the regexp; otherwise, use the cached version.
+    var requireRegEx =  requireAlias ?
+        new RegExp(cjsRequirePre+(requireAlias)+cjsRequirePost,"g") :
+        cjsRequireRegEx;
+    requireRegEx.lastIndex = 0;
     var deps = [];
 
     // remove comments from the source first
@@ -994,7 +1000,7 @@ function cjs(loader) {
 
     var match;
 
-    while (match = cjsRequireRegEx.exec(source))
+    while (match = requireRegEx.exec(source))
       deps.push(match[2] || match[3]);
 
     return deps;
@@ -1091,11 +1097,26 @@ function amd(loader) {
 
   var isNode = typeof module != 'undefined' && module.exports;
 
+  // Matches parenthesis
+  var parensRegExp = /\(([^)]+)/;
+  var commentRegEx = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
+  var argRegEx = /[\w\d]+/g;
+  function getRequireAlias(source, index){
+    var match = source.match(parensRegExp);
+    if(match){
+      var args = [];
+      match[1].replace(commentRegEx,"").replace(argRegEx, function(arg){
+        args.push(arg);
+      });
+      return args[index||0];
+    }
+  };
+  
+
   // AMD Module Format Detection RegEx
   // define([.., .., ..], ...)
   // define(varName); || define(function(require, exports) {}); || define({})
   var amdRegEx = /(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?\s*(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*,?\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;
-
   /*
     AMD-compatible require
     To copy RequireJS, set window.require = window.requirejs = loader.require
@@ -1170,10 +1191,7 @@ function amd(loader) {
       }
       if (!(deps instanceof Array)) {
         factory = deps;
-        // CommonJS AMD form
-        if (!loader._getCJSDeps)
-          throw "AMD extension needs CJS extension for AMD CJS support";
-        deps = ['require', 'exports', 'module'].concat(loader._getCJSDeps(factory.toString()));
+        deps = ['require','exports','module']
       }
 
       if (typeof factory != 'function')
@@ -1183,8 +1201,17 @@ function amd(loader) {
 
       // remove system dependencies
       var requireIndex, exportsIndex, moduleIndex
-      if ((requireIndex = indexOf.call(deps, 'require')) != -1)
-        deps.splice(requireIndex, 1);
+      
+      if ((requireIndex = indexOf.call(deps, 'require')) != -1) {
+      	
+      	deps.splice(requireIndex, 1);
+        // CommonJS AMD form
+        if (!loader._getCJSDeps)
+          throw "AMD extension needs CJS extension for AMD CJS support";
+        var factoryText = factory.toString();
+        deps = deps.concat(loader._getCJSDeps(factoryText, getRequireAlias(factoryText, requireIndex)));
+      }
+        
 
       if ((exportsIndex = indexOf.call(deps, 'exports')) != -1)
         deps.splice(exportsIndex, 1);
diff --git a/dist/system.min.js b/dist/system.min.js
index 4c5f6f3d..479b8d0b 100644
--- a/dist/system.min.js
+++ b/dist/system.min.js
@@ -5,4 +5,4 @@
  * MIT License
  */
 
-!function(__$global){function __eval(__source,__global,__address,__sourceMap){try{__source=(__global!=__$global?"with(__global) { (function() { "+__source+" \n }).call(__global); }":__source)+"\n//# sourceURL="+__address+(__sourceMap?"\n//# sourceMappingURL="+__sourceMap:""),eval(__source)}catch(e){throw"SyntaxError"==e.name&&(e.message="Evaluating "+__address+"\n	"+e.message),System.trace&&0==System.execute&&(e="Execution error for "+__address+": "+e.stack||e),e}}__$global.upgradeSystemLoader=function(){function parseURI(e){var t=String(e).replace(/^\s+|\s+$/g,"").match(/^([^:\/?#]+:)?(\/\/(?:[^:@]*(?::[^:@]*)?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);return t?{href:t[0]||"",protocol:t[1]||"",authority:t[2]||"",host:t[3]||"",hostname:t[4]||"",port:t[5]||"",pathname:t[6]||"",search:t[7]||"",hash:t[8]||""}:null}function toAbsoluteURL(e,t){function a(e){var t=[];return e.replace(/^(\.\.?(\/|$))+/,"").replace(/\/(\.(\/|$))+/g,"/").replace(/\/\.\.$/,"/../").replace(/\/?[^\/]*/g,function(e){"/.."===e?t.pop():t.push(e)}),t.join("").replace(/^\//,"/"===e.charAt(0)?"/":"")}return t=parseURI(t||""),e=parseURI(e||""),t&&e?(t.protocol||e.protocol)+(t.protocol||t.authority?t.authority:e.authority)+a(t.protocol||t.authority||"/"===t.pathname.charAt(0)?t.pathname:t.pathname?(e.authority&&!e.pathname?"/":"")+e.pathname.slice(0,e.pathname.lastIndexOf("/")+1)+t.pathname:e.pathname)+(t.protocol||t.authority||t.pathname?t.search:t.search||e.search)+t.hash:null}function meta(e){function t(e,t){var a=e.meta&&e.meta[t.name];if(a)for(var r in a)t.metadata[r]=t.metadata[r]||a[r]}var a=/^(\s*\/\*.*\*\/|\s*\/\/[^\n]*|\s*"[^"]+"\s*;?|\s*'[^']+'\s*;?)+/,r=/\/\*.*\*\/|\/\/[^\n]*|"[^"]+"\s*;?|'[^']+'\s*;?/g;e.meta={};var n=e.locate;e.locate=function(e){return t(this,e),n.call(this,e)};var o=e.translate;e.translate=function(e){var n=e.source.match(a);if(n)for(var l=n[0].match(r),i=0;i<l.length;i++){var s=l[i].length,d=l[i].substr(0,1);if(";"==l[i].substr(s-1,1)&&s--,'"'==d||"'"==d){var u=l[i].substr(1,l[i].length-3),f=u.substr(0,u.indexOf(" "));if(f){var c=u.substr(f.length+1,u.length-f.length-1);e.metadata[f]instanceof Array?e.metadata[f].push(c):e.metadata[f]=c}}}return t(this,e),o.call(this,e)}}function register(e){function t(e){var t=this;"@traceur"==e.name&&(f=System);var a,r=e.source.lastIndexOf("\n");-1!=r&&"//# sourceMappingURL="==e.source.substr(r+1,21)&&(a=e.source.substr(r+22,e.source.length-r-22),"undefined"!=typeof toAbsoluteURL&&(a=toAbsoluteURL(e.address,a))),__eval(e.source,t.global,e.address,a),"@traceur"==e.name&&(t.global.traceurSystem=t.global.System,t.global.System=f)}function a(e){for(var t=[],a=0;a<e.length;a++)-1==indexOf.call(t,e[a])&&t.push(e[a]);return t}function r(t,a,r,n){"string"!=typeof t&&(n=r,r=a,a=t,t=null),m=!0;var o;if("boolean"==typeof r)o={declarative:!1,deps:a,execute:n,executingRequire:r};else{if(a.length>0&&1!=r.length)throw"Invalid System.register form for "+t+". Declare function must take one argument.";o={declarative:!0,deps:a,declare:r}}if(t)e.defined[t]||(e.defined[t]=o);else if(o.declarative){if(c)throw"Multiple anonymous System.register calls in the same module file.";c=o}}function n(e){if(!e.register){e.register=r,e.defined||(e.defined={});var t=e.onScriptLoad;e.onScriptLoad=function(e){t(e),c&&(e.metadata.entry=c),(c||m)&&(e.metadata.format=e.metadata.format||"register"),m&&(e.metadata.registered=!0)}}}function o(e,t,a){if(a[e.groupIndex]=a[e.groupIndex]||[],-1==indexOf.call(a[e.groupIndex],e)){a[e.groupIndex].push(e);for(var r=0;r<e.normalizedDeps.length;r++){var n=e.normalizedDeps[r],l=t.defined[n];if(l&&!l.evaluated){var i=e.groupIndex+(l.declarative!=e.declarative);if(void 0===l.groupIndex||l.groupIndex<i){if(l.groupIndex&&(a[l.groupIndex].splice(a[l.groupIndex].indexOf(l),1),0==a[l.groupIndex].length))throw new TypeError("Mixed dependency cycle detected");l.groupIndex=i}o(l,t,a)}}}}function l(e,t){var a=t.defined[e];a.groupIndex=0;var r=[];o(a,t,r);for(var n=!!a.declarative==r.length%2,l=r.length-1;l>=0;l--){for(var s=r[l],u=0;u<s.length;u++){var f=s[u];n?i(f,t):d(f,t)}n=!n}}function i(e,t){if(!e.module){var a=[],r=e.declare.call(t.global,a);e.module=r.exports,e.exportStar=r.exportStar,e.execute=r.execute;for(var n=e.module,o=0;o<e.normalizedDeps.length;o++){var l=e.normalizedDeps[o],s=t.defined[l];s?s.module?depModule=s.module:(i(s,t),depModule=s.module):depModule=t.get(l),e.exportStar&&-1!=indexOf.call(e.exportStar,e.normalizedDeps[o])&&!function(e){for(var t in e)(function(t){Object.defineProperty(n,t,{enumerable:!0,get:function(){return e[t]},set:function(a){e[t]=a}})})(t)}(depModule),a[o]=depModule}}}function s(e,t){var a,r=t.defined[e];if(r)r.declarative?u(e,[],t):r.evaluated||d(r,t),a=r.module;else if(a=t.get(e),!a)throw"System Register: The module requested "+e+" but this was not declared as a dependency";return a?a.__useDefault?a["default"]:a:""}function d(e,t){if(!e.module){if(e.module={"default":{},__useDefault:!0},!e.executingRequire)for(var a=0;a<e.normalizedDeps.length;a++){var r=e.normalizedDeps[a],n=t.defined[r];n&&d(n,t)}var o;for(var l in t.defined)if(t.defined[l]==e){o=l;break}e.evaluated=!0;var i=e.execute.call(t.global,function(a){for(var r=0;r<e.deps.length;r++)if(e.deps[r]==a)return s(e.normalizedDeps[r],t)},e.module["default"],o);i&&(e.module["default"]=i)}}function u(e,t,a){var r=a.defined[e];if(!r.evaluated&&r.declarative){t.push(e);for(var n=0;n<r.normalizedDeps.length;n++){var o=r.normalizedDeps[n];-1==indexOf.call(t,o)&&(a.defined[o]?u(o,t,a):a.get(o))}r.evaluated||(r.evaluated=!0,r.execute.call(a.global))}}"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),"undefined"==typeof __eval&&(__eval=0||eval);var f;e.__exec=t;var c,m;n(e);var p=/System\.register/,g=e.fetch;e.fetch=function(e){var t=this;return n(t),t.defined[e.name]?(e.metadata.format="defined",""):(c=null,m=!1,g.call(t,e))};var h=e.translate;e.translate=function(e){return this.register=r,this.__exec=t,e.metadata.deps=e.metadata.deps||[],Promise.resolve(h.call(this,e)).then(function(t){return(e.metadata.init||e.metadata.exports)&&(e.metadata.format=e.metadata.format||"global"),("register"==e.metadata.format||!e.metadata.format&&e.source.match(p))&&(e.metadata.format="register"),t})};var v=e.instantiate;e.instantiate=function(e){var t,n=this;if(n.defined[e.name])t=n.defined[e.name];else if(e.metadata.entry)t=e.metadata.entry;else if(e.metadata.execute)t={declarative:!1,deps:e.metadata.deps||[],execute:e.metadata.execute,executingRequire:e.metadata.executingRequire};else if("register"==e.metadata.format){c=null,m=!1;var o=n.global.System=n.global.System||n,i=o.register;if(o.register=r,n.__exec(e),o.register=i,c&&(t=c),!m&&!e.metadata.registered)throw e.name+" detected as System.register but didn't execute."}if(!t&&"es6"!=e.metadata.format)return{deps:[],execute:function(){return n.newModule({})}};if(!t)return v.call(this,e);n.defined[e.name]=t,t.deps=a(t.deps);for(var s=[],d=0;d<t.deps.length;d++)s.push(Promise.resolve(n.normalize(t.deps[d],e.name)));return Promise.all(s).then(function(a){return t.normalizedDeps=a,t.depMap=[],{deps:t.deps,execute:function(){if(t.esmodule)return n.defined[e.name]=void 0,t.esmodule;l(e.name,n),u(e.name,[],n),n.defined[e.name]=void 0;var a=n.newModule(t.module);for(var r in n.defined)n.defined[r]&&(t.declarative&&n.defined[r].execute!=t.execute||!t.declarative&&n.defined[r].declare!=t.declare);return a}}})}}function core(e){var t=e["import"];e["import"]=function(e,a){return t.call(this,e,a).then(function(e){return e.__useDefault?e["default"]:e})},e.set("@empty",e.newModule({})),e.config=function(e){for(var t in e){var a=e[t];if("object"==typeof a){this[t]=this[t]||{};for(var r in a)this[t][r]=a[r]}else this[t]=a}};var a;if("undefined"==typeof window)a=process.cwd()+"/";else if(a=document.baseURI,!a){var r=document.getElementsByTagName("base");a=r[0]&&r[0].href||window.location.href}var n,o=e.locate;e.locate=function(e){return this.baseURL!=n&&(n=toAbsoluteURL(a,this.baseURL),"/"!=n.substr(n.length-1,1)&&(n+="/"),this.baseURL=n),Promise.resolve(o.call(this,e))};var l=/^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/,i=/(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/,s=e.translate;e.translate=function(e){var t=this;if("@traceur"==e.name)return s.call(t,e);var a;if("es6"!=e.metadata.format&&e.metadata.format||!(a=e.source.match(l))){if(("es6"==e.metadata.format||!e.metadata.format&&e.source.match(i))&&(e.metadata.format="es6",!t.global.traceur))return t["import"]("@traceur").then(function(){return s.call(t,e)})}else e.metadata.format="cjs",e.source='module.exports = require("'+(a[1]||a[2])+'");\n';return s.call(t,e)};var d=e.instantiate;e.instantiate=function(e){var t=this;return"@traceur"==e.name?(t.__exec(e),{deps:[],execute:function(){return t.newModule({})}}):d.call(t,e)}}function global(e){function t(e){if(!e.has("@@global-helpers")){var t,a,r=e.global.hasOwnProperty,n={};e.set("@@global-helpers",e.newModule({prepareGlobal:function(o,l){for(var i=0;i<l.length;i++){var s=n[l[i]];if(s)for(var d in s)e.global[d]=s[d]}t={},a=["indexedDB","sessionStorage","localStorage","clipboardData","frames"];for(var u in e.global)if(!r||e.global.hasOwnProperty(u))try{t[u]=e.global[u]}catch(f){a.push(u)}},retrieveGlobal:function(o,l,i){var s,d={};if(i){for(var u=[],f=0;f<deps.length;f++)u.push(require(deps[f]));s=i.apply(e.global,u)}if(l&&!s){var c=l.split(".")[0];s=eval.call(e.global,l),d[c]=e.global[c]}else for(var m in e.global)~a.indexOf(m)||r&&!e.global.hasOwnProperty(m)||m==e.global||t[m]==e.global[m]||(d[m]=e.global[m],s?s!==e.global[m]&&(s=void 0):s!==!1&&(s=e.global[m]));return n[o]=d,"undefined"!=typeof s?s:d}}))}}t(e);var a=e.instantiate;e.instantiate=function(e){var r=this;t(r);var n=e.metadata.exports;return e.metadata.format||(e.metadata.format="global"),"global"==e.metadata.format&&(e.metadata.execute=function(t,a,o){r.get("@@global-helpers").prepareGlobal(o,e.metadata.deps),n&&(e.source+='\nthis["'+n+'"] = '+n+";");var l=r.global.define;return r.global.define=void 0,r.global.module=void 0,r.global.exports=void 0,r.__exec(e),r.global.define=l,r.get("@@global-helpers").retrieveGlobal(o,n,e.metadata.init)}),a.call(r,e)}}function cjs(e){function t(e){a.lastIndex=0,r.lastIndex=0;for(var t,o=[],e=e.replace(n,"");t=r.exec(e);)o.push(t[2]||t[3]);return o}var a=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/,r=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*)require\s*\(\s*("([^"]+)"|'([^']+)')\s*\)/g,n=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/gm,o=function(){},l={nextTick:function(e){setTimeout(e,7)},browser:"undefined"!=typeof window,env:{},argv:[],on:o,once:o,off:o,emit:o,cwd:function(){return"/"}};e._getCJSDeps=t,e.has("@@nodeProcess")||e.set("@@nodeProcess",e.newModule({"default":l,__useDefault:!0}));var i=e.translate;e.translate=function(e){var a=this;return a.has("@@nodeProcess")||a.set("@@nodeProcess",a.newModule({"default":l,__useDefault:!0})),a._getCJSDeps||(a._getCJSDeps=t),i.call(a,e)};var s=e.instantiate;e.instantiate=function(n){return n.metadata.format||(a.lastIndex=0,r.lastIndex=0,(r.exec(n.source)||a.exec(n.source))&&(n.metadata.format="cjs")),"cjs"==n.metadata.format&&(n.metadata.deps=n.metadata.deps?n.metadata.deps.concat(t(n.source)):n.metadata.deps,n.metadata.executingRequire=!0,n.metadata.execute=function(t,a){var r=n.address.split("/");r.pop(),r=r.join("/");var o=e.global._g={global:e.global,exports:a,module:{exports:a},process:l,require:t,__filename:n.address,__dirname:r},i="";for(var s in o)i+="var "+s+" = _g."+s+";";n.source=i+"(function() { "+n.source+"\n}).call(exports)";var d=e.global.define;return e.global.define=void 0,e.__exec(n),e.global.define=d,e.global._g=void 0,o.module.exports}),s.call(this,n)}}function amd(loader){function require(e,t,a,r){var n=this;if("object"==typeof e&&!(e instanceof Array))return require.apply(null,Array.prototype.splice.call(arguments,1,arguments.length-1));if(!(e instanceof Array)){if("string"==typeof e){var o=n.get(e);return o.__useDefault?o["default"]:o}throw"Invalid require"}Promise.all(e.map(function(e){return n["import"](e,r)})).then(function(e){t.apply(null,e)},a)}function makeRequire(e,t,a){return function(r,n,o){return"string"==typeof r?t(r):require.call(a,r,n,o,{name:e})}}function createDefine(e){function t(t,a,r){if("string"!=typeof t&&(r=a,a=t,t=null),!(a instanceof Array)){if(r=a,!e._getCJSDeps)throw"AMD extension needs CJS extension for AMD CJS support";a=["require","exports","module"].concat(e._getCJSDeps(r.toString()))}"function"!=typeof r&&(r=function(e){return function(){return e}}(r));var n,o,l;-1!=(n=indexOf.call(a,"require"))&&a.splice(n,1),-1!=(o=indexOf.call(a,"exports"))&&a.splice(o,1),-1!=(l=indexOf.call(a,"module"))&&a.splice(l,1);var i={deps:a,execute:function(t,i,s){for(var d=[],u=0;u<a.length;u++)d.push(t(a[u]));var f;-1!=l&&d.splice(l,0,i,f={id:s,uri:e.baseURL+s,config:function(){return{}},exports:i}),-1!=o&&d.splice(o,0,i),-1!=n&&d.splice(n,0,makeRequire(s,t,e));var c=r.apply(e.global,d);return"undefined"==typeof c&&f&&(c=f.exports),"undefined"!=typeof c?c:void 0}};if(t)anonDefine=0!=a.length||anonDefine||defineBundle?null:i,defineBundle=!0,e.register(t,i.deps,!1,i.execute);else{if(anonDefine)throw"Multiple defines for anonymous module";anonDefine=i}}if(anonDefine=null,defineBundle=null,e.global.module=void 0,e.global.exports=void 0,!e.global.define||e.global.define.loader!=e){var a=e.onScriptLoad;e.onScriptLoad=function(e){a(e),(anonDefine||defineBundle)&&(e.metadata.format="defined"),anonDefine&&(e.metadata.deps=e.metadata.deps?e.metadata.deps.concat(anonDefine.deps):anonDefine.deps,e.metadata.execute=anonDefine.execute)},e.amdDefine=t,e.global.define=t,e.global.define.amd={},e.global.define.loader=e}}var isNode="undefined"!=typeof module&&module.exports,amdRegEx=/(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?\s*(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*,?\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;loader.require=require;var anonDefine,defineBundle;if(isNode||loader.amdDefine===!1||createDefine(loader),loader.scriptLoader){var loaderFetch=loader.fetch;loader.fetch=function(e){return loader.amdDefine!==!1&&createDefine(this),loaderFetch.call(this,e)}}var loaderInstantiate=loader.instantiate;loader.instantiate=function(load){var loader=this;if("amd"==load.metadata.format||!load.metadata.format&&load.source.match(amdRegEx)){load.metadata.format="amd",createDefine(loader);try{loader.__exec(load)}catch(e){if(loader.execute!==!1||!isNode)throw e;var match=load.source.match(amdRegEx);match&&(match[1]&&"["==match[1][0]?define(match[1].substr(match[1].length-2),eval(match[2]),function(){}):match[2]&&"["==match[2][0]?define(eval(match[2]),function(){}):define(function(){}))}if(isNode&&(loader.global.define=void 0),!anonDefine&&!defineBundle&&!isNode)throw"AMD module "+load.name+" did not define";anonDefine&&(load.metadata.deps=load.metadata.deps?load.metadata.deps.concat(anonDefine.deps):anonDefine.deps,load.metadata.execute=anonDefine.execute)}return loaderInstantiate.call(loader,load)}}function map(e){function t(e,t){return e.length<t.length?!1:e.substr(0,t.length)!=t?!1:e[t.length]&&"/"!=e[t.length]?!1:!0}function a(e){for(var t=1,a=0,r=e.length;r>a;a++)"/"===e[a]&&t++;return t}function r(e,t,a){return a+e.substr(t)}function n(e,n,o){var l,i,s,d,u=0,f=0;if(n)for(var c in o.map){var m=o.map[c];if("object"==typeof m&&t(n,c)&&(s=a(c),!(f>=s)))for(var p in m)t(e,p)&&(d=a(p),u>=d||(l=p,u=d,i=c,f=s))}if(l)return r(e,l.length,o.map[i][l]);for(var c in o.map){var m=o.map[c];if("string"==typeof m&&t(e,c)){var d=a(c);u>=d||(l=c,u=d)}}return l?r(e,l.length,o.map[l]):e}e.map=e.map||{};var o=e.normalize;e.normalize=function(e,t,a){var r=this;r.map||(r.map={});var l=!1;return"/"==e.substr(e.length-1,1)&&(l=!0,e+="#"),Promise.resolve(o.call(r,e,t,a)).then(function(e){if(e=n(e,t,r),l){var a=e.split("/");a.pop();var o=a.pop();a.push(o),a.push(o),e=a.join("/")}return e})}}function plugins(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=e.normalize;e.normalize=function(e,a,r){var n,o=this;return a&&-1!=(n=a.indexOf("!"))&&(a=a.substr(0,n)),Promise.resolve(t.call(o,e,a,r)).then(function(e){var t=e.lastIndexOf("!");if(-1!=t){var n=e.substr(0,t),l=e.substr(t+1)||n.substr(n.lastIndexOf(".")+1);return new Promise(function(e){e(o.normalize(l,a,r))}).then(function(e){return l=e,o.normalize(n,a,r)}).then(function(e){return e+"!"+l})}return e})};var a=e.locate;e.locate=function(e){var t=this,r=e.name,n=r.lastIndexOf("!");if(-1!=n){var o=r.substr(n+1);e.name=r.substr(0,n);var l=t.pluginLoader||t;return l["import"](o).then(function(){var a=l.get(o);return a=a["default"]||a,a.build===!1&&t.pluginLoader&&(e.metadata.build=!1),e.metadata.plugin=a,e.metadata.pluginName=o,e.metadata.pluginArgument=e.name,a.locate?a.locate.call(t,e):Promise.resolve(t.locate(e)).then(function(e){return e.substr(0,e.length-3)})})}return a.call(this,e)};var r=e.fetch;e.fetch=function(e){var t=this;return e.metadata.build===!1?"":e.metadata.plugin&&e.metadata.plugin.fetch&&!e.metadata.pluginFetchCalled?(e.metadata.pluginFetchCalled=!0,e.metadata.plugin.fetch.call(t,e,r)):r.call(t,e)};var n=e.translate;e.translate=function(e){var t=this;return e.metadata.plugin&&e.metadata.plugin.translate?Promise.resolve(e.metadata.plugin.translate.call(t,e)).then(function(a){return a?a:n.call(t,e)}):n.call(t,e)};var o=e.instantiate;e.instantiate=function(e){var t=this;return e.metadata.plugin&&e.metadata.plugin.instantiate?Promise.resolve(e.metadata.plugin.instantiate.call(t,e)).then(function(a){return e.metadata.format="defined",e.metadata.execute=function(){return a},o.call(t,e)}):e.metadata.plugin&&e.metadata.plugin.build===!1?(e.metadata.format="defined",e.metadata.deps.push(e.metadata.pluginName),e.metadata.execute=function(){return t.newModule({})},o.call(t,e)):o.call(t,e)}}function bundles(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),e.bundles=e.bundles||{};var t=e.fetch;e.fetch=function(e){var a=this;if(a.trace)return t.call(this,e);a.bundles||(a.bundles={});for(var r in a.bundles)if(-1!=indexOf.call(a.bundles[r],e.name))return Promise.resolve(a.normalize(r)).then(function(e){return a.bundles[e]=a.bundles[e]||a.bundles[r],a.meta=a.meta||{},a.meta[e]=a.meta[e]||{},a.meta[e].bundle=!0,a.load(e)}).then(function(){return""});return t.call(this,e)}}function versions(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=/^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?)?)?$/,a=function(e,t){var a,r=e.split("."),n=t.split(".");r[2]&&-1!=(a=indexOf.call(r[2],"-"))&&r.splice(2,1,r[2].substr(0,a),r[2].substr(a+1)),n[2]&&-1!=(a=indexOf.call(n[2],"-"))&&n.splice(2,1,n[2].substr(0,a),n[2].substr(a+1));for(var o=0;o<Math.max(r.length,n.length);o++){if(!r[o])return 1;if(!n[o])return-1;if(r[o]!=n[o])return parseInt(r[o])>parseInt(n[o])?1:-1}return 0};e.versions=e.versions||{};var r=e.normalize;e.normalize=function(n,o,l){e.versions||(e.versions={});var i,s,d=this.versions;if(n.indexOf("@")>0){var u=n.lastIndexOf("@"),f=n.substr(u+1,n.length-u-1).split("/");i=f[0],s=f.length,n=n.substr(0,u)+n.substr(u+i.length+1,n.length-u-i.length-1)}return Promise.resolve(r.call(this,n,o,l)).then(function(e){var r,n,o,l,u=e.indexOf("@");if(i&&(-1==u||0==u)){var f=e.split("/");f[f.length-s]+="@"+i,e=f.join("/"),u=e.indexOf("@")}if(-1==u||0==u){for(var c in d)if(l=d[c],e.substr(0,c.length)==c&&(o=e.substr(c.length,1),!o||"/"==o))return c+"@"+("string"==typeof l?l:l[l.length-1])+e.substr(c.length);return e}r=e.substr(u+1).split("/")[0];var m,p=r.length;if("^"==r.substr(0,1)&&(r=r.substr(1),m=!0),n=r.match(t),!n)return e;m&&(n[2]||(m=!1),n[3]||(n[2]>0?n[3]="0":m=!1)),m&&(n[1]>0?(n[2]||(r=n[1]+".0.0"),n[3]||(r=n[1]+".0"),m=r,n=[n[1]]):n[2]>0?(m=r,n=[0,n[2]]):(m=!1,n=[0,0,n[3]]),r=n.join("."));var g=e.substr(0,u);if(l=d[g]||[],"string"==typeof l&&(l=[l]),!n[3]||m)for(var h=l.length-1;h>=0;h--){var v=l[h];if(v.substr(0,r.length)==r&&v.substr(r.length,1).match(/^[\.\-]?$/)&&(!m||m&&-1!=a(v,m)))return g+"@"+v+e.substr(g.length+p+1)}return-1==indexOf.call(l,r)&&(l.push(r),l.sort(a),e=g+"@"+r+e.substr(g.length+p+1),n[3]&&-1!=(u=indexOf.call(l,n[1]+"."+n[2]))&&l.splice(u,1),n[2]&&-1!=(u=indexOf.call(l,n[1]))&&l.splice(u,1),d[g]=1==l.length?l[0]:l),e})}}function depCache(e){e.depCache=e.depCache||{},loaderLocate=e.locate,e.locate=function(e){var t=this;t.depCache||(t.depCache={});var a=t.depCache[e.name];if(a)for(var r=0;r<a.length;r++)t.load(a[r]);return loaderLocate.call(t,e)}}__$global.upgradeSystemLoader=void 0;var indexOf=Array.prototype.indexOf||function(e){for(var t=0,a=this.length;a>t;t++)if(this[t]===e)return t;return-1},originalSystem=__$global.System,System=__$global.System=new LoaderPolyfill(originalSystem);System.baseURL=originalSystem.baseURL,System.paths={"*":"*.js"},System.originalSystem=originalSystem,System.noConflict=function(){__$global.SystemJS=System,__$global.System=System.originalSystem},meta(System),register(System),core(System),global(System),cjs(System),amd(System),map(System),plugins(System),bundles(System),versions(System),depCache(System),System.paths["@traceur"]||(System.paths["@traceur"]=__$curScript&&__$curScript.getAttribute("data-traceur-src")||(__$curScript&&__$curScript.src?__$curScript.src.substr(0,__$curScript.src.lastIndexOf("/")+1):System.baseURL+(System.baseURL.lastIndexOf("/")==System.baseURL.length-1?"":"/"))+"traceur.js")};var __$curScript;!function(e){if("undefined"!=typeof window){var t=document.getElementsByTagName("script");if(__$curScript=t[t.length-1],e.System&&e.LoaderPolyfill)e.upgradeSystemLoader();else{var a=__$curScript.src,r=a.substr(0,a.lastIndexOf("/")+1);document.write('<script type="text/javascript" src="'+r+'es6-module-loader.js" data-init="upgradeSystemLoader">'+"<"+"/script>")}}else{var n=require("es6-module-loader");e.System=n.System,e.Loader=n.Loader,e.upgradeSystemLoader(),module.exports=e.System}}(__$global)}("undefined"!=typeof window?window:global);
\ No newline at end of file
+!function(__$global){function __eval(__source,__global,__address,__sourceMap){try{__source=(__global!=__$global?"with(__global) { (function() { "+__source+" \n }).call(__global); }":__source)+"\n//# sourceURL="+__address+(__sourceMap?"\n//# sourceMappingURL="+__sourceMap:""),eval(__source)}catch(e){throw"SyntaxError"==e.name&&(e.message="Evaluating "+__address+"\n	"+e.message),System.trace&&0==System.execute&&(e="Execution error for "+__address+": "+e.stack||e),e}}__$global.upgradeSystemLoader=function(){function parseURI(e){var t=String(e).replace(/^\s+|\s+$/g,"").match(/^([^:\/?#]+:)?(\/\/(?:[^:@]*(?::[^:@]*)?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);return t?{href:t[0]||"",protocol:t[1]||"",authority:t[2]||"",host:t[3]||"",hostname:t[4]||"",port:t[5]||"",pathname:t[6]||"",search:t[7]||"",hash:t[8]||""}:null}function toAbsoluteURL(e,t){function a(e){var t=[];return e.replace(/^(\.\.?(\/|$))+/,"").replace(/\/(\.(\/|$))+/g,"/").replace(/\/\.\.$/,"/../").replace(/\/?[^\/]*/g,function(e){"/.."===e?t.pop():t.push(e)}),t.join("").replace(/^\//,"/"===e.charAt(0)?"/":"")}return t=parseURI(t||""),e=parseURI(e||""),t&&e?(t.protocol||e.protocol)+(t.protocol||t.authority?t.authority:e.authority)+a(t.protocol||t.authority||"/"===t.pathname.charAt(0)?t.pathname:t.pathname?(e.authority&&!e.pathname?"/":"")+e.pathname.slice(0,e.pathname.lastIndexOf("/")+1)+t.pathname:e.pathname)+(t.protocol||t.authority||t.pathname?t.search:t.search||e.search)+t.hash:null}function meta(e){function t(e,t){var a=e.meta&&e.meta[t.name];if(a)for(var r in a)t.metadata[r]=t.metadata[r]||a[r]}var a=/^(\s*\/\*.*\*\/|\s*\/\/[^\n]*|\s*"[^"]+"\s*;?|\s*'[^']+'\s*;?)+/,r=/\/\*.*\*\/|\/\/[^\n]*|"[^"]+"\s*;?|'[^']+'\s*;?/g;e.meta={};var n=e.locate;e.locate=function(e){return t(this,e),n.call(this,e)};var o=e.translate;e.translate=function(e){var n=e.source.match(a);if(n)for(var i=n[0].match(r),l=0;l<i.length;l++){var s=i[l].length,d=i[l].substr(0,1);if(";"==i[l].substr(s-1,1)&&s--,'"'==d||"'"==d){var u=i[l].substr(1,i[l].length-3),f=u.substr(0,u.indexOf(" "));if(f){var c=u.substr(f.length+1,u.length-f.length-1);e.metadata[f]instanceof Array?e.metadata[f].push(c):e.metadata[f]=c}}}return t(this,e),o.call(this,e)}}function register(e){function t(e){var t=this;"@traceur"==e.name&&(f=System);var a,r=e.source.lastIndexOf("\n");-1!=r&&"//# sourceMappingURL="==e.source.substr(r+1,21)&&(a=e.source.substr(r+22,e.source.length-r-22),"undefined"!=typeof toAbsoluteURL&&(a=toAbsoluteURL(e.address,a))),__eval(e.source,t.global,e.address,a),"@traceur"==e.name&&(t.global.traceurSystem=t.global.System,t.global.System=f)}function a(e){for(var t=[],a=0;a<e.length;a++)-1==indexOf.call(t,e[a])&&t.push(e[a]);return t}function r(t,a,r,n){"string"!=typeof t&&(n=r,r=a,a=t,t=null),m=!0;var o;if("boolean"==typeof r)o={declarative:!1,deps:a,execute:n,executingRequire:r};else{if(a.length>0&&1!=r.length)throw"Invalid System.register form for "+t+". Declare function must take one argument.";o={declarative:!0,deps:a,declare:r}}if(t)e.defined[t]||(e.defined[t]=o);else if(o.declarative){if(c)throw"Multiple anonymous System.register calls in the same module file.";c=o}}function n(e){if(!e.register){e.register=r,e.defined||(e.defined={});var t=e.onScriptLoad;e.onScriptLoad=function(e){t(e),c&&(e.metadata.entry=c),(c||m)&&(e.metadata.format=e.metadata.format||"register"),m&&(e.metadata.registered=!0)}}}function o(e,t,a){if(a[e.groupIndex]=a[e.groupIndex]||[],-1==indexOf.call(a[e.groupIndex],e)){a[e.groupIndex].push(e);for(var r=0;r<e.normalizedDeps.length;r++){var n=e.normalizedDeps[r],i=t.defined[n];if(i&&!i.evaluated){var l=e.groupIndex+(i.declarative!=e.declarative);if(void 0===i.groupIndex||i.groupIndex<l){if(i.groupIndex&&(a[i.groupIndex].splice(a[i.groupIndex].indexOf(i),1),0==a[i.groupIndex].length))throw new TypeError("Mixed dependency cycle detected");i.groupIndex=l}o(i,t,a)}}}}function i(e,t){var a=t.defined[e];a.groupIndex=0;var r=[];o(a,t,r);for(var n=!!a.declarative==r.length%2,i=r.length-1;i>=0;i--){for(var s=r[i],u=0;u<s.length;u++){var f=s[u];n?l(f,t):d(f,t)}n=!n}}function l(e,t){if(!e.module){var a=[],r=e.declare.call(t.global,a);e.module=r.exports,e.exportStar=r.exportStar,e.execute=r.execute;for(var n=e.module,o=0;o<e.normalizedDeps.length;o++){var i=e.normalizedDeps[o],s=t.defined[i];s?s.module?depModule=s.module:(l(s,t),depModule=s.module):depModule=t.get(i),e.exportStar&&-1!=indexOf.call(e.exportStar,e.normalizedDeps[o])&&!function(e){for(var t in e)(function(t){Object.defineProperty(n,t,{enumerable:!0,get:function(){return e[t]},set:function(a){e[t]=a}})})(t)}(depModule),a[o]=depModule}}}function s(e,t){var a,r=t.defined[e];if(r)r.declarative?u(e,[],t):r.evaluated||d(r,t),a=r.module;else if(a=t.get(e),!a)throw"System Register: The module requested "+e+" but this was not declared as a dependency";return a?a.__useDefault?a["default"]:a:""}function d(e,t){if(!e.module){if(e.module={"default":{},__useDefault:!0},!e.executingRequire)for(var a=0;a<e.normalizedDeps.length;a++){var r=e.normalizedDeps[a],n=t.defined[r];n&&d(n,t)}var o;for(var i in t.defined)if(t.defined[i]==e){o=i;break}e.evaluated=!0;var l=e.execute.call(t.global,function(a){for(var r=0;r<e.deps.length;r++)if(e.deps[r]==a)return s(e.normalizedDeps[r],t)},e.module["default"],o);l&&(e.module["default"]=l)}}function u(e,t,a){var r=a.defined[e];if(!r.evaluated&&r.declarative){t.push(e);for(var n=0;n<r.normalizedDeps.length;n++){var o=r.normalizedDeps[n];-1==indexOf.call(t,o)&&(a.defined[o]?u(o,t,a):a.get(o))}r.evaluated||(r.evaluated=!0,r.execute.call(a.global))}}"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),"undefined"==typeof __eval&&(__eval=0||eval);var f;e.__exec=t;var c,m;n(e);var p=/System\.register/,g=e.fetch;e.fetch=function(e){var t=this;return n(t),t.defined[e.name]?(e.metadata.format="defined",""):(c=null,m=!1,g.call(t,e))};var h=e.translate;e.translate=function(e){return this.register=r,this.__exec=t,e.metadata.deps=e.metadata.deps||[],Promise.resolve(h.call(this,e)).then(function(t){return(e.metadata.init||e.metadata.exports)&&(e.metadata.format=e.metadata.format||"global"),("register"==e.metadata.format||!e.metadata.format&&e.source.match(p))&&(e.metadata.format="register"),t})};var v=e.instantiate;e.instantiate=function(e){var t,n=this;if(n.defined[e.name])t=n.defined[e.name];else if(e.metadata.entry)t=e.metadata.entry;else if(e.metadata.execute)t={declarative:!1,deps:e.metadata.deps||[],execute:e.metadata.execute,executingRequire:e.metadata.executingRequire};else if("register"==e.metadata.format){c=null,m=!1;var o=n.global.System=n.global.System||n,l=o.register;if(o.register=r,n.__exec(e),o.register=l,c&&(t=c),!m&&!e.metadata.registered)throw e.name+" detected as System.register but didn't execute."}if(!t&&"es6"!=e.metadata.format)return{deps:[],execute:function(){return n.newModule({})}};if(!t)return v.call(this,e);n.defined[e.name]=t,t.deps=a(t.deps);for(var s=[],d=0;d<t.deps.length;d++)s.push(Promise.resolve(n.normalize(t.deps[d],e.name)));return Promise.all(s).then(function(a){return t.normalizedDeps=a,t.depMap=[],{deps:t.deps,execute:function(){if(t.esmodule)return n.defined[e.name]=void 0,t.esmodule;i(e.name,n),u(e.name,[],n),n.defined[e.name]=void 0;var a=n.newModule(t.module);for(var r in n.defined)n.defined[r]&&(t.declarative&&n.defined[r].execute!=t.execute||!t.declarative&&n.defined[r].declare!=t.declare);return a}}})}}function core(e){var t=e["import"];e["import"]=function(e,a){return t.call(this,e,a).then(function(e){return e.__useDefault?e["default"]:e})},e.set("@empty",e.newModule({})),e.config=function(e){for(var t in e){var a=e[t];if("object"==typeof a){this[t]=this[t]||{};for(var r in a)this[t][r]=a[r]}else this[t]=a}};var a;if("undefined"==typeof window)a=process.cwd()+"/";else if(a=document.baseURI,!a){var r=document.getElementsByTagName("base");a=r[0]&&r[0].href||window.location.href}var n,o=e.locate;e.locate=function(e){return this.baseURL!=n&&(n=toAbsoluteURL(a,this.baseURL),"/"!=n.substr(n.length-1,1)&&(n+="/"),this.baseURL=n),Promise.resolve(o.call(this,e))};var i=/^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/,l=/(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/,s=e.translate;e.translate=function(e){var t=this;if("@traceur"==e.name)return s.call(t,e);var a;if("es6"!=e.metadata.format&&e.metadata.format||!(a=e.source.match(i))){if(("es6"==e.metadata.format||!e.metadata.format&&e.source.match(l))&&(e.metadata.format="es6",!t.global.traceur))return t["import"]("@traceur").then(function(){return s.call(t,e)})}else e.metadata.format="cjs",e.source='module.exports = require("'+(a[1]||a[2])+'");\n';return s.call(t,e)};var d=e.instantiate;e.instantiate=function(e){var t=this;return"@traceur"==e.name?(t.__exec(e),{deps:[],execute:function(){return t.newModule({})}}):d.call(t,e)}}function global(e){function t(e){if(!e.has("@@global-helpers")){var t,a,r=e.global.hasOwnProperty,n={};e.set("@@global-helpers",e.newModule({prepareGlobal:function(o,i){for(var l=0;l<i.length;l++){var s=n[i[l]];if(s)for(var d in s)e.global[d]=s[d]}t={},a=["indexedDB","sessionStorage","localStorage","clipboardData","frames"];for(var u in e.global)if(!r||e.global.hasOwnProperty(u))try{t[u]=e.global[u]}catch(f){a.push(u)}},retrieveGlobal:function(o,i,l){var s,d={};if(l){for(var u=[],f=0;f<deps.length;f++)u.push(require(deps[f]));s=l.apply(e.global,u)}if(i&&!s){var c=i.split(".")[0];s=eval.call(e.global,i),d[c]=e.global[c]}else for(var m in e.global)~a.indexOf(m)||r&&!e.global.hasOwnProperty(m)||m==e.global||t[m]==e.global[m]||(d[m]=e.global[m],s?s!==e.global[m]&&(s=void 0):s!==!1&&(s=e.global[m]));return n[o]=d,"undefined"!=typeof s?s:d}}))}}t(e);var a=e.instantiate;e.instantiate=function(e){var r=this;t(r);var n=e.metadata.exports;return e.metadata.format||(e.metadata.format="global"),"global"==e.metadata.format&&(e.metadata.execute=function(t,a,o){r.get("@@global-helpers").prepareGlobal(o,e.metadata.deps),n&&(e.source+='\nthis["'+n+'"] = '+n+";");var i=r.global.define;return r.global.define=void 0,r.global.module=void 0,r.global.exports=void 0,r.__exec(e),r.global.define=i,r.get("@@global-helpers").retrieveGlobal(o,n,e.metadata.init)}),a.call(r,e)}}function cjs(e){function t(e,t){a.lastIndex=0;var l=t?new RegExp(r+t+n,"g"):o;l.lastIndex=0;for(var s,d=[],e=e.replace(i,"");s=l.exec(e);)d.push(s[2]||s[3]);return d}var a=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/,r="(?:^\\s*|[}{\\(\\);,\\n=:\\?\\&]\\s*)",n="\\s*\\(\\s*(\"([^\"]+)\"|'([^']+)')\\s*\\)",o=new RegExp(r+"require"+n,"g"),i=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/gm,l=function(){},s={nextTick:function(e){setTimeout(e,7)},browser:"undefined"!=typeof window,env:{},argv:[],on:l,once:l,off:l,emit:l,cwd:function(){return"/"}};e._getCJSDeps=t,e.has("@@nodeProcess")||e.set("@@nodeProcess",e.newModule({"default":s,__useDefault:!0}));var d=e.translate;e.translate=function(e){var a=this;return a.has("@@nodeProcess")||a.set("@@nodeProcess",a.newModule({"default":s,__useDefault:!0})),a._getCJSDeps||(a._getCJSDeps=t),d.call(a,e)};var u=e.instantiate;e.instantiate=function(r){return r.metadata.format||(a.lastIndex=0,o.lastIndex=0,(o.exec(r.source)||a.exec(r.source))&&(r.metadata.format="cjs")),"cjs"==r.metadata.format&&(r.metadata.deps=r.metadata.deps?r.metadata.deps.concat(t(r.source)):r.metadata.deps,r.metadata.executingRequire=!0,r.metadata.execute=function(t,a){var n=r.address.split("/");n.pop(),n=n.join("/");var o=e.global._g={global:e.global,exports:a,module:{exports:a},process:s,require:t,__filename:r.address,__dirname:n},i="";for(var l in o)i+="var "+l+" = _g."+l+";";r.source=i+"(function() { "+r.source+"\n}).call(exports)";var d=e.global.define;return e.global.define=void 0,e.__exec(r),e.global.define=d,e.global._g=void 0,o.module.exports}),u.call(this,r)}}function amd(loader){function getRequireAlias(e,t){var a=e.match(parensRegExp);if(a){var r=[];return a[1].replace(commentRegEx,"").replace(argRegEx,function(e){r.push(e)}),r[t||0]}}function require(e,t,a,r){var n=this;if("object"==typeof e&&!(e instanceof Array))return require.apply(null,Array.prototype.splice.call(arguments,1,arguments.length-1));if(!(e instanceof Array)){if("string"==typeof e){var o=n.get(e);return o.__useDefault?o["default"]:o}throw"Invalid require"}Promise.all(e.map(function(e){return n["import"](e,r)})).then(function(e){t.apply(null,e)},a)}function makeRequire(e,t,a){return function(r,n,o){return"string"==typeof r?t(r):require.call(a,r,n,o,{name:e})}}function createDefine(e){function t(t,a,r){"string"!=typeof t&&(r=a,a=t,t=null),a instanceof Array||(r=a,a=["require","exports","module"]),"function"!=typeof r&&(r=function(e){return function(){return e}}(r));var n,o,i;if(-1!=(n=indexOf.call(a,"require"))){if(a.splice(n,1),!e._getCJSDeps)throw"AMD extension needs CJS extension for AMD CJS support";var l=r.toString();a=a.concat(e._getCJSDeps(l,getRequireAlias(l,n)))}-1!=(o=indexOf.call(a,"exports"))&&a.splice(o,1),-1!=(i=indexOf.call(a,"module"))&&a.splice(i,1);var s={deps:a,execute:function(t,l,s){for(var d=[],u=0;u<a.length;u++)d.push(t(a[u]));var f;-1!=i&&d.splice(i,0,l,f={id:s,uri:e.baseURL+s,config:function(){return{}},exports:l}),-1!=o&&d.splice(o,0,l),-1!=n&&d.splice(n,0,makeRequire(s,t,e));var c=r.apply(e.global,d);return"undefined"==typeof c&&f&&(c=f.exports),"undefined"!=typeof c?c:void 0}};if(t)anonDefine=0!=a.length||anonDefine||defineBundle?null:s,defineBundle=!0,e.register(t,s.deps,!1,s.execute);else{if(anonDefine)throw"Multiple defines for anonymous module";anonDefine=s}}if(anonDefine=null,defineBundle=null,e.global.module=void 0,e.global.exports=void 0,!e.global.define||e.global.define.loader!=e){var a=e.onScriptLoad;e.onScriptLoad=function(e){a(e),(anonDefine||defineBundle)&&(e.metadata.format="defined"),anonDefine&&(e.metadata.deps=e.metadata.deps?e.metadata.deps.concat(anonDefine.deps):anonDefine.deps,e.metadata.execute=anonDefine.execute)},e.amdDefine=t,e.global.define=t,e.global.define.amd={},e.global.define.loader=e}}var isNode="undefined"!=typeof module&&module.exports,parensRegExp=/\(([^)]+)/,commentRegEx=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/gm,argRegEx=/[\w\d]+/g,amdRegEx=/(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?\s*(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*,?\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;loader.require=require;var anonDefine,defineBundle;if(isNode||loader.amdDefine===!1||createDefine(loader),loader.scriptLoader){var loaderFetch=loader.fetch;loader.fetch=function(e){return loader.amdDefine!==!1&&createDefine(this),loaderFetch.call(this,e)}}var loaderInstantiate=loader.instantiate;loader.instantiate=function(load){var loader=this;if("amd"==load.metadata.format||!load.metadata.format&&load.source.match(amdRegEx)){load.metadata.format="amd",createDefine(loader);try{loader.__exec(load)}catch(e){if(loader.execute!==!1||!isNode)throw e;var match=load.source.match(amdRegEx);match&&(match[1]&&"["==match[1][0]?define(match[1].substr(match[1].length-2),eval(match[2]),function(){}):match[2]&&"["==match[2][0]?define(eval(match[2]),function(){}):define(function(){}))}if(isNode&&(loader.global.define=void 0),!anonDefine&&!defineBundle&&!isNode)throw"AMD module "+load.name+" did not define";anonDefine&&(load.metadata.deps=load.metadata.deps?load.metadata.deps.concat(anonDefine.deps):anonDefine.deps,load.metadata.execute=anonDefine.execute)}return loaderInstantiate.call(loader,load)}}function map(e){function t(e,t){return e.length<t.length?!1:e.substr(0,t.length)!=t?!1:e[t.length]&&"/"!=e[t.length]?!1:!0}function a(e){for(var t=1,a=0,r=e.length;r>a;a++)"/"===e[a]&&t++;return t}function r(e,t,a){return a+e.substr(t)}function n(e,n,o){var i,l,s,d,u=0,f=0;if(n)for(var c in o.map){var m=o.map[c];if("object"==typeof m&&t(n,c)&&(s=a(c),!(f>=s)))for(var p in m)t(e,p)&&(d=a(p),u>=d||(i=p,u=d,l=c,f=s))}if(i)return r(e,i.length,o.map[l][i]);for(var c in o.map){var m=o.map[c];if("string"==typeof m&&t(e,c)){var d=a(c);u>=d||(i=c,u=d)}}return i?r(e,i.length,o.map[i]):e}e.map=e.map||{};var o=e.normalize;e.normalize=function(e,t,a){var r=this;r.map||(r.map={});var i=!1;return"/"==e.substr(e.length-1,1)&&(i=!0,e+="#"),Promise.resolve(o.call(r,e,t,a)).then(function(e){if(e=n(e,t,r),i){var a=e.split("/");a.pop();var o=a.pop();a.push(o),a.push(o),e=a.join("/")}return e})}}function plugins(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=e.normalize;e.normalize=function(e,a,r){var n,o=this;return a&&-1!=(n=a.indexOf("!"))&&(a=a.substr(0,n)),Promise.resolve(t.call(o,e,a,r)).then(function(e){var t=e.lastIndexOf("!");if(-1!=t){var n=e.substr(0,t),i=e.substr(t+1)||n.substr(n.lastIndexOf(".")+1);return new Promise(function(e){e(o.normalize(i,a,r))}).then(function(e){return i=e,o.normalize(n,a,r)}).then(function(e){return e+"!"+i})}return e})};var a=e.locate;e.locate=function(e){var t=this,r=e.name,n=r.lastIndexOf("!");if(-1!=n){var o=r.substr(n+1);e.name=r.substr(0,n);var i=t.pluginLoader||t;return i["import"](o).then(function(){var a=i.get(o);return a=a["default"]||a,a.build===!1&&t.pluginLoader&&(e.metadata.build=!1),e.metadata.plugin=a,e.metadata.pluginName=o,e.metadata.pluginArgument=e.name,a.locate?a.locate.call(t,e):Promise.resolve(t.locate(e)).then(function(e){return e.substr(0,e.length-3)})})}return a.call(this,e)};var r=e.fetch;e.fetch=function(e){var t=this;return e.metadata.build===!1?"":e.metadata.plugin&&e.metadata.plugin.fetch&&!e.metadata.pluginFetchCalled?(e.metadata.pluginFetchCalled=!0,e.metadata.plugin.fetch.call(t,e,r)):r.call(t,e)};var n=e.translate;e.translate=function(e){var t=this;return e.metadata.plugin&&e.metadata.plugin.translate?Promise.resolve(e.metadata.plugin.translate.call(t,e)).then(function(a){return a?a:n.call(t,e)}):n.call(t,e)};var o=e.instantiate;e.instantiate=function(e){var t=this;return e.metadata.plugin&&e.metadata.plugin.instantiate?Promise.resolve(e.metadata.plugin.instantiate.call(t,e)).then(function(a){return e.metadata.format="defined",e.metadata.execute=function(){return a},o.call(t,e)}):e.metadata.plugin&&e.metadata.plugin.build===!1?(e.metadata.format="defined",e.metadata.deps.push(e.metadata.pluginName),e.metadata.execute=function(){return t.newModule({})},o.call(t,e)):o.call(t,e)}}function bundles(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf),e.bundles=e.bundles||{};var t=e.fetch;e.fetch=function(e){var a=this;if(a.trace)return t.call(this,e);a.bundles||(a.bundles={});for(var r in a.bundles)if(-1!=indexOf.call(a.bundles[r],e.name))return Promise.resolve(a.normalize(r)).then(function(e){return a.bundles[e]=a.bundles[e]||a.bundles[r],a.meta=a.meta||{},a.meta[e]=a.meta[e]||{},a.meta[e].bundle=!0,a.load(e)}).then(function(){return""});return t.call(this,e)}}function versions(e){"undefined"==typeof indexOf&&(indexOf=Array.prototype.indexOf);var t=/^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?)?)?$/,a=function(e,t){var a,r=e.split("."),n=t.split(".");r[2]&&-1!=(a=indexOf.call(r[2],"-"))&&r.splice(2,1,r[2].substr(0,a),r[2].substr(a+1)),n[2]&&-1!=(a=indexOf.call(n[2],"-"))&&n.splice(2,1,n[2].substr(0,a),n[2].substr(a+1));for(var o=0;o<Math.max(r.length,n.length);o++){if(!r[o])return 1;if(!n[o])return-1;if(r[o]!=n[o])return parseInt(r[o])>parseInt(n[o])?1:-1}return 0};e.versions=e.versions||{};var r=e.normalize;e.normalize=function(n,o,i){e.versions||(e.versions={});var l,s,d=this.versions;if(n.indexOf("@")>0){var u=n.lastIndexOf("@"),f=n.substr(u+1,n.length-u-1).split("/");l=f[0],s=f.length,n=n.substr(0,u)+n.substr(u+l.length+1,n.length-u-l.length-1)}return Promise.resolve(r.call(this,n,o,i)).then(function(e){var r,n,o,i,u=e.indexOf("@");if(l&&(-1==u||0==u)){var f=e.split("/");f[f.length-s]+="@"+l,e=f.join("/"),u=e.indexOf("@")}if(-1==u||0==u){for(var c in d)if(i=d[c],e.substr(0,c.length)==c&&(o=e.substr(c.length,1),!o||"/"==o))return c+"@"+("string"==typeof i?i:i[i.length-1])+e.substr(c.length);return e}r=e.substr(u+1).split("/")[0];var m,p=r.length;if("^"==r.substr(0,1)&&(r=r.substr(1),m=!0),n=r.match(t),!n)return e;m&&(n[2]||(m=!1),n[3]||(n[2]>0?n[3]="0":m=!1)),m&&(n[1]>0?(n[2]||(r=n[1]+".0.0"),n[3]||(r=n[1]+".0"),m=r,n=[n[1]]):n[2]>0?(m=r,n=[0,n[2]]):(m=!1,n=[0,0,n[3]]),r=n.join("."));var g=e.substr(0,u);if(i=d[g]||[],"string"==typeof i&&(i=[i]),!n[3]||m)for(var h=i.length-1;h>=0;h--){var v=i[h];if(v.substr(0,r.length)==r&&v.substr(r.length,1).match(/^[\.\-]?$/)&&(!m||m&&-1!=a(v,m)))return g+"@"+v+e.substr(g.length+p+1)}return-1==indexOf.call(i,r)&&(i.push(r),i.sort(a),e=g+"@"+r+e.substr(g.length+p+1),n[3]&&-1!=(u=indexOf.call(i,n[1]+"."+n[2]))&&i.splice(u,1),n[2]&&-1!=(u=indexOf.call(i,n[1]))&&i.splice(u,1),d[g]=1==i.length?i[0]:i),e})}}function depCache(e){e.depCache=e.depCache||{},loaderLocate=e.locate,e.locate=function(e){var t=this;t.depCache||(t.depCache={});var a=t.depCache[e.name];if(a)for(var r=0;r<a.length;r++)t.load(a[r]);return loaderLocate.call(t,e)}}__$global.upgradeSystemLoader=void 0;var indexOf=Array.prototype.indexOf||function(e){for(var t=0,a=this.length;a>t;t++)if(this[t]===e)return t;return-1},originalSystem=__$global.System,System=__$global.System=new LoaderPolyfill(originalSystem);System.baseURL=originalSystem.baseURL,System.paths={"*":"*.js"},System.originalSystem=originalSystem,System.noConflict=function(){__$global.SystemJS=System,__$global.System=System.originalSystem},meta(System),register(System),core(System),global(System),cjs(System),amd(System),map(System),plugins(System),bundles(System),versions(System),depCache(System),System.paths["@traceur"]||(System.paths["@traceur"]=__$curScript&&__$curScript.getAttribute("data-traceur-src")||(__$curScript&&__$curScript.src?__$curScript.src.substr(0,__$curScript.src.lastIndexOf("/")+1):System.baseURL+(System.baseURL.lastIndexOf("/")==System.baseURL.length-1?"":"/"))+"traceur.js")};var __$curScript;!function(e){if("undefined"!=typeof window){var t=document.getElementsByTagName("script");if(__$curScript=t[t.length-1],e.System&&e.LoaderPolyfill)e.upgradeSystemLoader();else{var a=__$curScript.src,r=a.substr(0,a.lastIndexOf("/")+1);document.write('<script type="text/javascript" src="'+r+'es6-module-loader.js" data-init="upgradeSystemLoader"></script>')}}else{var n=require("es6-module-loader");e.System=n.System,e.Loader=n.Loader,e.upgradeSystemLoader(),module.exports=e.System}}(__$global)}("undefined"!=typeof window?window:global);
\ No newline at end of file
diff --git a/lib/extension-amd.js b/lib/extension-amd.js
index 8a730742..31aedd76 100644
--- a/lib/extension-amd.js
+++ b/lib/extension-amd.js
@@ -7,11 +7,26 @@ function amd(loader) {
 
   var isNode = typeof module != 'undefined' && module.exports;
 
+  // Matches parenthesis
+  var parensRegExp = /\(([^)]+)/;
+  var commentRegEx = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
+  var argRegEx = /[\w\d]+/g;
+  function getRequireAlias(source, index){
+    var match = source.match(parensRegExp);
+    if(match){
+      var args = [];
+      match[1].replace(commentRegEx,"").replace(argRegEx, function(arg){
+        args.push(arg);
+      });
+      return args[index||0];
+    }
+  };
+  
+
   // AMD Module Format Detection RegEx
   // define([.., .., ..], ...)
   // define(varName); || define(function(require, exports) {}); || define({})
   var amdRegEx = /(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,\s*|'[^']+'\s*,\s*)?\s*(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*,?\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/;
-
   /*
     AMD-compatible require
     To copy RequireJS, set window.require = window.requirejs = loader.require
@@ -86,10 +101,7 @@ function amd(loader) {
       }
       if (!(deps instanceof Array)) {
         factory = deps;
-        // CommonJS AMD form
-        if (!loader._getCJSDeps)
-          throw "AMD extension needs CJS extension for AMD CJS support";
-        deps = ['require', 'exports', 'module'].concat(loader._getCJSDeps(factory.toString()));
+        deps = ['require','exports','module']
       }
 
       if (typeof factory != 'function')
@@ -99,8 +111,17 @@ function amd(loader) {
 
       // remove system dependencies
       var requireIndex, exportsIndex, moduleIndex
-      if ((requireIndex = indexOf.call(deps, 'require')) != -1)
-        deps.splice(requireIndex, 1);
+      
+      if ((requireIndex = indexOf.call(deps, 'require')) != -1) {
+      	
+      	deps.splice(requireIndex, 1);
+        // CommonJS AMD form
+        if (!loader._getCJSDeps)
+          throw "AMD extension needs CJS extension for AMD CJS support";
+        var factoryText = factory.toString();
+        deps = deps.concat(loader._getCJSDeps(factoryText, getRequireAlias(factoryText, requireIndex)));
+      }
+        
 
       if ((exportsIndex = indexOf.call(deps, 'exports')) != -1)
         deps.splice(exportsIndex, 1);
diff --git a/lib/extension-cjs.js b/lib/extension-cjs.js
index 13a7cab9..4bd72572 100644
--- a/lib/extension-cjs.js
+++ b/lib/extension-cjs.js
@@ -6,13 +6,19 @@ function cjs(loader) {
   // CJS Module Format
   // require('...') || exports[''] = ... || exports.asd = ... || module.exports = ...
   var cjsExportsRegEx = /(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/;
-  var cjsRequireRegEx = /(?:^\s*|[}{\(\);,\n=:\?\&]\s*)require\s*\(\s*("([^"]+)"|'([^']+)')\s*\)/g;
+  var cjsRequirePre = "(?:^\\s*|[}{\\(\\);,\\n=:\\?\\&]\\s*)";
+  var cjsRequirePost = "\\s*\\(\\s*(\"([^\"]+)\"|'([^']+)')\\s*\\)";
+  var cjsRequireRegEx = new RegExp(cjsRequirePre+"require"+cjsRequirePost,"g");
   var commentRegEx = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
 
-  function getCJSDeps(source) {
+  function getCJSDeps(source, requireAlias) {
     cjsExportsRegEx.lastIndex = 0;
-    cjsRequireRegEx.lastIndex = 0;
-
+    
+    // If a requireAlias is given, generate the regexp; otherwise, use the cached version.
+    var requireRegEx =  requireAlias ?
+        new RegExp(cjsRequirePre+(requireAlias)+cjsRequirePost,"g") :
+        cjsRequireRegEx;
+    requireRegEx.lastIndex = 0;
     var deps = [];
 
     // remove comments from the source first
@@ -20,7 +26,7 @@ function cjs(loader) {
 
     var match;
 
-    while (match = cjsRequireRegEx.exec(source))
+    while (match = requireRegEx.exec(source))
       deps.push(match[2] || match[3]);
 
     return deps;
diff --git a/test/test.js b/test/test.js
index b6f6f4bb..30b1ca93 100644
--- a/test/test.js
+++ b/test/test.js
@@ -497,3 +497,12 @@ asyncTest('AMD -> System.register circular -> ES6', function() {
   }, err);
 });
 
+asyncTest('AMD simplified CommonJS wrapping with an aliased require', function() {
+  System['import']('tests/amd-simplified-cjs-aliased-require1').then(function(m) {
+    ok(m.require2,"got dependency from aliased require");
+    ok(m.require2.amdCJS,"got dependency from aliased require listed as a dependency");
+    start();
+  }, err);
+});
+
+console.log("here")
diff --git a/test/tests/amd-simplified-cjs-aliased-require1.js b/test/tests/amd-simplified-cjs-aliased-require1.js
new file mode 100644
index 00000000..f0deec08
--- /dev/null
+++ b/test/tests/amd-simplified-cjs-aliased-require1.js
@@ -0,0 +1,7 @@
+define(function(req){
+	var r2 = req("./amd-simplified-cjs-aliased-require2");
+	return {
+		name: "require1",
+		require2: r2
+	};
+});
diff --git a/test/tests/amd-simplified-cjs-aliased-require2.js b/test/tests/amd-simplified-cjs-aliased-require2.js
new file mode 100644
index 00000000..b1f3c161
--- /dev/null
+++ b/test/tests/amd-simplified-cjs-aliased-require2.js
@@ -0,0 +1,8 @@
+define(["./amd-dep","require"],function(amdDep, req){
+	var amdCJS = req("./amd-cjs-module");
+	return {
+		name: "require2",
+		amdCJS: amdCJS,
+		amdDep: amdDep
+	};
+});