fix conditionalResolutions conditions restriction

lib/builder.js

@@ -16,7 +16,6 @@ var writeOutputs = require('./output').writeOutputs;
 var rollupTree = require('./rollup').rollupTree;
 
 var traceExpression = require('./arithmetic').traceExpression;
-var traceConditionalEnv = require('./arithmetic').traceConditionalEnv;
 
 var Trace = require('./trace');
 
@@ -32,7 +31,7 @@ var getFormatHint = require('./utils').getFormatHint;
 // new Builder({cfg})
 // new Builder(baseURL, {cfg})
 // new Builder(baseURL, 'cfg-file.js')
-// 
+//
 // baseURL is ignored in cfg when given
 // cfg is saved and used by reset
 function Builder(baseURL, cfg) {
@@ -86,7 +85,7 @@ Builder.prototype.invalidate = function(invalidationModuleName) {
     if (invalidationWildcardIndex == -1)
       return false;
 
-    return moduleName.substr(0, invalidationWildcardIndex) == wildcardLHS 
+    return moduleName.substr(0, invalidationWildcardIndex) == wildcardLHS
         && moduleName.substr(moduleName.length - wildcardRHS.length) == wildcardRHS;
   }
 
@@ -165,7 +164,7 @@ Builder.prototype.reset = function(baseLoader) {
     loaderConfig.call(this, lCfg);
     loader.configHash = generateConfigHash(loader);
   };
-  
+
   this.getCanonicalName = getCanonicalName.bind(null, this.loader);
   this.loader.getCanonicalName = this.loader.pluginLoader.getCanonicalName = this.getCanonicalName;
 
@@ -195,7 +194,7 @@ Builder.prototype.reset = function(baseLoader) {
   loader.fetch = function(load) {
     if (builder.fetch)
       return Promise.resolve(builder.fetch.call(this, load, cachedFetch.bind(this)));
-    else  
+    else
       return cachedFetch.call(this, load);
   };
 
@@ -287,7 +286,7 @@ function executeConfigFile(saveForReset, ignoreBaseURL, configPath, source) {
 
   // make everything in global available to config file code
   // only substitute local copy of System
-  // and prevent that code from adding anything to the real global 
+  // and prevent that code from adding anything to the real global
   var context = Object.create(global);
   context.SystemJS = context.System = configLoader;
   context.global = context;
@@ -454,7 +453,7 @@ function processCompileOpts(options, defaults) {
   options = options || {};
   if ('sfxFormat' in options) {
     console.warn('SystemJS Builder "sfxFormat" is deprecated and has been renamed to "format".');
-    options.format = options.sfxFormat; 
+    options.format = options.sfxFormat;
   }
   if ('sfxEncoding' in options) {
     console.warn('SystemJS Builder "sfxEncoding" is deprecated and has been renamed to "encodeNames".');
@@ -492,7 +491,7 @@ function processCompileOpts(options, defaults) {
     globalDeps: {},
     globalName: null,
     exportDefault: false,
-    // conditionalResolutions: {}, 
+    // conditionalResolutions: {},
     // can add a special object here that matches condition predicates to direct module names to use for sfx
 
     // set to true to build in "format amd" style sfx hints for SystemJS loading
@@ -585,7 +584,7 @@ Builder.prototype.compile = function(moduleNameOrLoad, outFile, opts) {
 function processOutputOpts(options, defaults) {
   var opts = {
     outFile: undefined,
-    
+
     minify: false,
     uglify: undefined,
     mangle: true,
@@ -755,7 +754,7 @@ Builder.prototype.buildStatic = function(expressionOrTree, outFile, opts) {
   // override the fetch function if given
   if (opts && opts.fetch)
     this.fetch = opts.fetch;
-  
+
   return Promise.resolve()
   .then(function() {
     return canonicalizeConditions(self.loader, traceOpts);
@@ -810,7 +809,7 @@ Builder.prototype.buildStatic = function(expressionOrTree, outFile, opts) {
         output.assetList = compiled.assetList;
         output.modules = compiled.modules;
         output.tree = tree;
-        return output;        
+        return output;
       });
     });
   });

lib/trace.js

@@ -43,7 +43,7 @@ Trace.prototype.traceModule = function(moduleName, traceOpts) {
   return Promise.resolve(loader.normalize(moduleName))
   .then(function(normalized) {
     return traceCanonical(getCanonicalName(loader, normalized), traceOpts);
-  });  
+  });
 };
 
 // given a module, return the conditional environment variation space
@@ -440,7 +440,7 @@ Trace.prototype.getLoadRecord = function(canonical, traceOpts, parentStack) {
           .then(function(pluginNormalized) {
             load.plugin = getCanonicalName(loader, pluginNormalized);
 
-            if (load.metadata.loaderModule && 
+            if (load.metadata.loaderModule &&
                 (load.metadata.loaderModule.build === false || Object.keys(load.metadata.loaderModule).length == 0))
               load.runtimePlugin = true;
 
@@ -458,8 +458,8 @@ Trace.prototype.getLoadRecord = function(canonical, traceOpts, parentStack) {
           return load;
 
         curHook = 'fetch';
-        
-        
+
+
         return loader
           .fetch({ name: normalized, metadata: load.metadata, address: address })
 
@@ -488,7 +488,7 @@ Trace.prototype.getLoadRecord = function(canonical, traceOpts, parentStack) {
                 return source;
               })
               // dont let a missing source map fail the entire build
-              .catch(function() { 
+              .catch(function() {
                 return source;
               });
             }
@@ -597,7 +597,7 @@ Trace.prototype.getLoadRecord = function(canonical, traceOpts, parentStack) {
  * Returns the full trace tree of a module
  *
  * - conditionalEnv represents the conditional tracing environment module values to impose on the trace
- * - 
+ * -
  *
  * conditionalEnv provides canonical condition tracing rules of the form:
  *
@@ -803,7 +803,7 @@ Trace.prototype.inlineConditions = function(tree, loader, traceOpts) {
         name: '@system-env',
         path: null,
         metadata: {
-          format: 'json' 
+          format: 'json'
         },
         deps: [],
         depMap: {},
@@ -842,14 +842,17 @@ Trace.getConditionalResolutions = function(conditional, conditionalEnv, inlineCo
     if (inlineConditionals[condition])
       return inlineConditionals[condition][0] === value;
 
+    if (conditionalEnv[condition] && conditionalEnv[condition].indexOf(value) === -1)
+      return false;
+
     conditionalEnvVariations[condition] = conditionalEnvVariations[condition] || [];
     if (conditionalEnvVariations[condition].indexOf(value) === -1)
       conditionalEnvVariations[condition].push(value);
 
     if (conditionModules.indexOf(conditionModule) == -1)
       conditionModules.push(conditionModule);
 
-    return conditionalEnv[condition] ? conditionalEnv[condition].indexOf(value) !== -1 : true;
+    return true;
   }
 
   // whether or not to include condition branch given our conditionalEnv