1 files changed, 168 insertions, 45 deletions

diff --git a/node_modules/montage/require/require.js b/node_modules/montage/require/require.js
index aad6cef7..4ea8a46d 100755
--- a/node_modules/montage/require/require.js
+++ b/node_modules/montage/require/require.js
@@ -35,7 +35,8 @@
 
     var globalEval = eval; // reassigning causes eval to not use lexical scope.
 
-    // Non-CommonJS speced extensions should be marked with an "// EXTENSION" comment.
+    // Non-CommonJS speced extensions should be marked with an "// EXTENSION"
+    // comment.
 
     Require.makeRequire = function (config) {
         var require;
@@ -52,7 +53,8 @@
         config.makeCompiler = config.makeCompiler || Require.makeCompiler;
         config.compile = config.compile || config.makeCompiler(config);
 
-        // Modules: { exports, id, location, directory, factory, dependencies, dependees, text, type }
+        // Modules: { exports, id, location, directory, factory, dependencies,
+        // dependees, text, type }
         var modules = config.modules = config.modules || {};
 
         // produces an entry in the module state table, which gets built
@@ -103,7 +105,9 @@
             .then(function () {
                 // compile and analyze dependencies
                 config.compile(module);
-                var dependencies = module.dependencies = module.dependencies || [];
+                var dependencies =
+                    module.dependencies =
+                        module.dependencies || [];
                 if (module.redirect !== void 0) {
                     dependencies.push(module.redirect);
                 }
@@ -136,7 +140,8 @@
             })
         }
 
-        // Initializes a module by executing the factory function with a new module "exports" object.
+        // Initializes a module by executing the factory function with a new
+        // module "exports" object.
         function getExports(topId, viaId) {
             var module = getModule(topId);
 
@@ -157,7 +162,10 @@
 
             // do not initialize modules that do not define a factory function
             if (module.factory === void 0) {
-                throw new Error("Can't require module " + JSON.stringify(topId) + " via " + JSON.stringify(viaId));
+                throw new Error(
+                    "Can't require module " + JSON.stringify(topId) +
+                    " via " + JSON.stringify(viaId)
+                );
             }
 
             module.directory = URL.resolve(module.location, "."); // EXTENSION
@@ -211,11 +219,14 @@
             if (internal) {
                 return null;
             } else {
-                throw new Error("Can't identify " + id2 + " from " + require2.location);
+                throw new Error(
+                    "Can't identify " + id2 + " from " + require2.location
+                );
             }
         }
 
-        // Creates a unique require function for each module that encapsulates that module's id for resolving relative module IDs against.
+        // Creates a unique require function for each module that encapsulates
+        // that module's id for resolving relative module IDs against.
         function makeRequire(viaId) {
 
             // Main synchronously executing "require()" function
@@ -224,7 +235,8 @@
                 return getExports(topId, viaId);
             };
 
-            // Asynchronous "require.async()" which ensures async executation (even with synchronous loaders)
+            // Asynchronous "require.async()" which ensures async executation
+            // (even with synchronous loaders)
             require.async = function(id, callback) {
                 var topId = resolve(id, viaId);
                 return deepLoad(topId, viaId)
@@ -248,7 +260,19 @@
 
             require.load = load;
             require.deepLoad = deepLoad;
-            require.loadPackage = config.loadPackage;
+
+            require.loadPackage = function (dependency, givenConfig) {
+                if (givenConfig) { // explicit configuration, fresh environment
+                    return Require.loadPackage(dependency, givenConfig);
+                } else { // inherited environment
+                    return config.loadPackage(dependency, config);
+                }
+            };
+
+            require.injectPackageDescription = function (location, description) {
+                Require.injectPackageDescription(location, description, config);
+            };
+
             require.identify = identify;
             require.inject = inject;
             require.progress = Require.progress;
@@ -272,34 +296,55 @@
         initializedModules: []
     };
 
+    Require.injectPackageDescription = function (location, description, config) {
+        var descriptions = config.descriptions = config.descriptions || {};
+        descriptions[location] = Promise.call(function () {
+            return description;
+        });
+    };
+
+    Require.loadPackageDescription = function (location, config) {
+        var descriptions = config.descriptions = config.descriptions || {};
+        if (descriptions[location] === void 0) {
+            var jsonPath = URL.resolve(location, 'package.json');
+            descriptions[location] = Require.read(jsonPath)
+            .then(function (json) {
+                try {
+                    return JSON.parse(json);
+                } catch (exception) {
+                    throw new SyntaxError(
+                        "in " + JSON.stringify(jsonPath) + ": " +
+                        exception.message
+                    );
+                }
+            });
+        }
+        return descriptions[location];
+    };
+
     Require.loadPackage = function (location, config) {
         location = URL.resolve(location, ".");
         config = config || {};
         var loadingPackages = config.loadingPackages = config.loadingPackages || {};
         var loadedPackages = config.packages = {};
+        var registry = config.registry = config.registry || Object.create(null);
 
         config.getPackage = function (dependency) {
-            dependency = Dependency(dependency);
-            // TODO handle other kinds of dependency
+            dependency = normalizeDependency(dependency, config);
             var location = dependency.location;
             if (!loadedPackages[location])
-                throw new Error("Dependency is not loaded: " + JSON.stringify(location));
+                throw new Error(
+                    "Dependency is not loaded: " + JSON.stringify(location)
+                );
             return loadedPackages[location];
         };
 
-        config.loadPackage = function (dependency) {
-            dependency = Dependency(dependency);
-            // TODO handle other kinds of dependency
-            var location = URL.resolve(dependency.location, ".");
+        config.loadPackage = function (dependency, viaConfig) {
+            dependency = normalizeDependency(dependency, viaConfig);
+            var location = dependency.location;
             if (!loadingPackages[location]) {
-                var jsonPath = URL.resolve(location, 'package.json');
-                loadingPackages[location] = Require.read(jsonPath)
-                .then(function (json) {
-                    try {
-                        var packageDescription = JSON.parse(json);
-                    } catch (exception) {
-                        throw new SyntaxError("in " + JSON.stringify(jsonPath) + ": " + exception.message);
-                    }
+                loadingPackages[location] = Require.loadPackageDescription(location, config)
+                .then(function (packageDescription) {
                     var subconfig = configurePackage(
                         location,
                         packageDescription,
@@ -324,9 +369,67 @@
         return pkg;
     };
 
-    function Dependency(dependency) {
+    function normalizeDependency(dependency, config, name) {
+        config = config || {};
         if (typeof dependency === "string") {
-            dependency = {"location": dependency};
+            if (dependency.indexOf("@") >= 0) {
+                var parts = dependency.split("@");
+                dependency = {
+                    name: parts[0] || name,
+                    version: parts[1]
+                };
+            } else {
+                dependency = {
+                    location: dependency
+                };
+            }
+        }
+        // if the named dependency has already been found at another
+        // location, refer to the same eventual instance
+        if (
+            dependency.name !== void 0 &&