1 files changed, 86 insertions, 119 deletions

diff --git a/node_modules/montage/require/require.js b/node_modules/montage/require/require.js
index 8273b660..aad6cef7 100755
--- a/node_modules/montage/require/require.js
+++ b/node_modules/montage/require/require.js
@@ -33,45 +33,46 @@
     if (!this)
         throw new Error("Require does not work in strict mode.");
 
-    var global = this;
     var globalEval = eval; // reassigning causes eval to not use lexical scope.
 
     // Non-CommonJS speced extensions should be marked with an "// EXTENSION" comment.
 
-    // Sandbox is an instance of the loader system. Different sandboxes will have different instances of modules.
-    // Returns the root "require" function. If this root "require()" function is called the loader will be in synchronous mode.
-    // To get asynchronous loading you MUST call the root "require.async()". In async mode all subsequent calls to "require()" will
-    // be asynchronously loaded, and synchronously executed.
-    Require.Sandbox = function(config) {
+    Require.makeRequire = function (config) {
+        var require;
+
         // Configuration defaults:
         config = config || {};
         config.location = URL.resolve(config.location || Require.getLocation(), ".");
         config.lib = URL.resolve(config.location, config.lib || ".");
         config.paths = config.paths || [config.lib];
         config.mappings = config.mappings || {}; // EXTENSION
-        config.exposedConfigs = config.exposedConfigs || Require.defaultExposedConfigs;
-        config.makeLoader = config.makeLoader || Require.DefaultLoaderConstructor;
+        config.exposedConfigs = config.exposedConfigs || Require.exposedConfigs;
+        config.makeLoader = config.makeLoader || Require.makeLoader;
         config.load = config.load || config.makeLoader(config);
-        config.makeCompiler = config.makeCompiler || Require.DefaultCompilerConstructor;
+        config.makeCompiler = config.makeCompiler || Require.makeCompiler;
         config.compile = config.compile || config.makeCompiler(config);
 
-        // Sandbox state:
         // Modules: { exports, id, location, directory, factory, dependencies, dependees, text, type }
         var modules = config.modules = config.modules || {};
-        // Mapping from canonical IDs to the initial top ID used to load module
-        var locationsToIds = {};
 
+        // produces an entry in the module state table, which gets built
+        // up through loading and execution, ultimately serving as the
+        // ``module`` free variable inside the corresponding module.
         function getModule(id) {
             if (!has(modules, id)) {
                 modules[id] = {
                     id: id,
-                    display: config.location + "#" + id // EXTENSION
+                    display: config.location + "#" + id, // EXTENSION
+                    require: require,
                 };
             }
             return modules[id];
         }
-        config.module = getModule;
 
+        // for preloading modules by their id and exports, useful to
+        // prevent wasteful multiple instantiation if a module was loaded
+        // in the bootstrapping process and can be trivially injected into
+        // the system.
         function inject(id, exports) {
             var module = getModule(id)
             module.exports = exports;
@@ -83,59 +84,55 @@
         var load = memoize(function (topId, viaId) {
             var module = getModule(topId);
             return Promise.call(function () {
-                // already loaded, already instantiated, or redirection
+                // if not already loaded, already instantiated, or
+                // configured as a redirection to another module
                 if (
-                    module.factory !== void 0 ||
-                    module.exports !== void 0 ||
-                    module.redirect !== void 0
+                    module.factory === void 0 &&
+                    module.exports === void 0 &&
+                    module.redirect === void 0
                 ) {
-                    return module;
-                // load
-                } else {
+                    // load and
+                    // trace progress
                     Require.progress.requiredModules.push(module.display);
                     return Promise.call(config.load, null, topId, module)
                     .then(function () {
                         Require.progress.loadedModules.push(module.display);
-                        return module;
                     });
                 }
             })
-            .then(function (module) {
-                // analyze dependencies
+            .then(function () {
+                // compile and analyze dependencies
                 config.compile(module);
                 var dependencies = module.dependencies = module.dependencies || [];
                 if (module.redirect !== void 0) {
                     dependencies.push(module.redirect);
                 }
-                return module;
             });
         });
 
         // Load a module definition, and the definitions of its transitive
         // dependencies
-        function deepLoad(id, viaId, loading) {
+        function deepLoad(topId, viaId, loading) {
+            var module = getModule(topId);
             // this is a memo of modules already being loaded so we don’t
             // data-lock on a cycle of dependencies.
             loading = loading || {};
             // has this all happened before?  will it happen again?
-            if (has(loading, id))
+            if (has(loading, topId))
                 return; // break the cycle of violence.
-            loading[id] = true; // this has happened before
-            return load(id, viaId)
-            .then(function (module) {
+            loading[topId] = true; // this has happened before
+            return load(topId, viaId)
+            .then(function () {
                 // load the transitive dependencies using the magic of
                 // recursion.
                 return Promise.all(module.dependencies.map(function (depId) {
-                    depId = resolve(depId, id)
+                    depId = resolve(depId, topId)
                     // create dependees set, purely for debug purposes
                     var module = getModule(depId);
                     var dependees = module.dependees = module.dependees || {};
-                    dependees[id] = true;
-                    return deepLoad(depId, id, loading);
+                    dependees[topId] = true;
+                    return deepLoad(depId, topId, loading);
                 }))
-                .then(function () {
-                    return module;
-                })
             })
         }
 
@@ -169,7 +166,7 @@
             // Execute the factory function:
             var returnValue = module.factory.call(
                 // in the context of the module:
-                global, // this
+                void 0, // this (defaults to global)
                 makeRequire(topId), // require
                 module.exports, // exports
                 module // module
@@ -177,7 +174,10 @@
 
             // Modules should never have a return value.
             if (returnValue !== void 0) {
-                console.warn('require: module "'+topId+'" returned a value.');
+                console.warn(
+                    'require: module ' + JSON.stringify(topId) +
+                    ' returned a value.'
+                );
             }
 
             // Update the list of modules that are ready to use
@@ -262,7 +262,8 @@
             return require;
         }
 
-        return makeRequire("");
+        require = makeRequire("");
+        return require;
     };
 
     Require.progress = {
@@ -271,7 +272,7 @@
         initializedModules: []
     };
 
-    Require.PackageSandbox = function (location, config) {
+    Require.loadPackage = function (location, config) {
         location = URL.resolve(location, ".");
         config = config || {};
         var loadingPackages = config.loadingPackages = config.loadingPackages || {};
@@ -304,7 +305,7 @@
                         packageDescription,
                         config