restrict bindings to declarative modules only

Author: guybedford

lib/loader.js

@@ -264,14 +264,16 @@ function logloads(loads) {
 
         if (instantiateResult === undefined) {
           load.address = load.address || 'anon' + ++anonCnt;
-          load.kind = 'declarative';
+
+          // NB instead of load.kind, use load.isDeclarative
+          load.isDeclarative = true;
           // parse sets load.declare, load.depsList
           loader.loaderObj.parse(load);
         }
         else if (typeof instantiateResult == 'object') {
           load.depsList = instantiateResult.deps || [];
           load.execute = instantiateResult.execute;
-          load.kind = 'dynamic';
+          load.isDeclarative = false;
         }
         else
           throw TypeError('Invalid instantiate return value');
@@ -473,7 +475,7 @@ function logloads(loads) {
         var loads = [].concat(linkSet.loads);
         for (var i = 0, l = loads.length; i < l; i++) {
           var load = loads[i];
-          load.module = load.kind == 'dynamic' ? {
+          load.module = !load.isDeclarative ? {
             module: _newModule({})
           } : {
             name: load.name,
@@ -538,7 +540,7 @@ function logloads(loads) {
           address: load.address,
           metadata: load.metadata,
           source: load.source,
-          kind: load.kind
+          kind: load.isDeclarative ? 'declarative' : 'dynamic'
         };
       }
       // if not anonymous, add to the module table
@@ -586,7 +588,7 @@ function logloads(loads) {
 
             // if it is a group transition, the index of the dependency has gone up
             // otherwise it is the same as the parent
-            var loadDepGroupIndex = load.groupIndex + (loadDep.kind != load.kind);
+            var loadDepGroupIndex = load.groupIndex + (loadDep.isDeclarative != load.isDeclarative);
 
             // the group index of an entry is always the maximum
             if (loadDep.groupIndex === undefined || loadDep.groupIndex < loadDepGroupIndex) {
@@ -631,7 +633,7 @@ function logloads(loads) {
       buildLinkageGroups(startingLoad, linkSet.loads, groups, loader);
 
       // determine the kind of the bottom group
-      var curGroupDeclarative = (startingLoad.kind == 'declarative') == groups.length % 2;
+      var curGroupDeclarative = startingLoad.isDeclarative == groups.length % 2;
 
       // run through the groups from bottom to top
       for (var i = groups.length - 1; i >= 0; i--) {
@@ -670,8 +672,7 @@ function logloads(loads) {
         name: name,
         dependencies: [],
         module: new Module(), // start from an empty module and extend
-        importers: [],
-        evaluated: false
+        importers: []
       });
     }
 
@@ -703,33 +704,40 @@ function logloads(loads) {
       });
 
       // setup our setters and execution function
-      load.module.setters = registryEntry.setters;
-      load.module.execute = registryEntry.execute;
+      module.setters = registryEntry.setters;
+      module.execute = registryEntry.execute;
 
       // now link all the module dependencies
       // amending the depMap as we go
       for (var i = 0, l = load.dependencies.length; i < l; i++) {
         var depName = load.dependencies[i].value;
-        var depModule = getOrCreateModuleRecord(depName);
-
-        depModule.importers.push(module);
-        module.dependencies.push(depModule);
-
-        // if not already a module in the registry, try and link it now
-        if (!loader.modules[depName]) {
+        var depModule = loader.modules[depName];
 
+        // if dependency not already in the module registry
+        // then try and link it now
+        if (!depModule) {
           // get the dependency load record
           for (var j = 0; j < loads.length; j++) {
             if (loads[j].name != depName)
               continue;
 
             // only link if already not already started linking (stops at circular / dynamic)
-            if (!loads[j].module)
+            if (!loads[j].module) {
               linkDeclarativeModule(loads[j], loads, loader);
+              depModule = loads[j].module;
+            }
+            // if circular, create the module record
+            else {
+              depModule = getOrCreateModuleRecord(depName);
+            }
           }
         }
 
-        console.assert(depModule, 'Dependency module not found!');
+        // only declarative modules have dynamic bindings
+        if (depModule.importers) {
+          depModule.importers.push(module);
+          module.dependencies.push(depModule);
+        }
 
         // run the setter for this dependency
         if (module.setters[i])
@@ -1041,7 +1049,7 @@ function logloads(loads) {
 
         var depsList;
 
-        load.kind = 'declarative';
+        load.isDeclarative = true;
 
         var compiler = new traceur.Compiler();
         var options = System.traceurOptions || {};