complete package conditionals upgrade

systemjs · May 14, 2016 · 61c5e21 · 61c5e21
1 parent 88b4b28
commit 61c5e21
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 19 deletions.
diff --git a/lib/trace.js b/lib/trace.js
@@ -10,6 +10,8 @@ var Promise = require('bluebird');
 var getPackage = require('./utils').getPackage;
 var getPackageConfigPath = require('./utils').getPackageConfigPath;
 var isPackageConfig = require('./utils').isPackageConfig;
+var parseCondition = require('./utils').parseCondition;
+var serializeCondition = require('./utils').serializeCondition;
 
 module.exports = Trace;
 
@@ -135,7 +137,7 @@ Trace.prototype.getLoadRecord = function(canonical, excludeURLs, parentStack) {
     // boolean conditional
     var booleanIndex = canonical.lastIndexOf('#?');
     if (booleanIndex != -1) {
-      var condition = canonical.substr(booleanIndex + 2)
+      var condition = canonical.substr(booleanIndex + 2);
       if (condition.indexOf('|') == -1)
         condition += '|default';
       return {
@@ -261,23 +263,22 @@ Trace.prototype.getLoadRecord = function(canonical, excludeURLs, parentStack) {
       })
       .then(function(fallback) {
         // environment trace
-        return loader.normalize(pkg.map['@env'] || '@system-env')
-        .then(function(normalizedCondition) {
-          var conditionModule = getCanonicalName(loader, normalizedCondition);
-
-          return Promise.all(Object.keys(envMap).map(function(envCondition) {
-            var mapping = envMap[envCondition];
-            var negate = envCondition[0] == '~';
-
-            return toPackagePath(mapping, false)
-            .then(function(normalizedMapping) {
-              return {
-                condition: (negate ? '~' : '') + conditionModule + '|' + (negate ? envCondition.substr(1) : envCondition),
-                branch: getCanonicalName(loader, normalizedMapping)
-              };
-            });
-          }));
-        })
+        return Promise.all(Object.keys(envMap).map(function(envCondition) {
+          var mapping = envMap[envCondition];
+          var conditionObj = parseCondition(envCondition);
+
+          return loader.normalize(conditionObj.module, normalizedPkgName)
+          .then(function(conditionModule) {
+            conditionObj.module = getCanonicalName(loader, conditionModule);
+            return toPackagePath(mapping, false);
+          })
+          .then(function(normalizedMapping) {
+            return {
+              condition: serializeCondition(conditionObj),
+              branch: getCanonicalName(loader, normalizedMapping)
+            };
+          });
+        }))
         .then(function(envs) {
           return {
             name: canonical,

diff --git a/lib/utils.js b/lib/utils.js
@@ -327,4 +327,44 @@ function normalizePath(loader, path, skipExtension) {
   return normalized;
 }
 
+var sysConditions = ['browser', 'node', 'dev', 'production', 'default'];
+
+exports.parseCondition = parseCondition;
+function parseCondition(condition) {
+  var conditionExport, conditionModule, negation;
+
+  var negation = condition[0] == '~';
+  var conditionExportIndex = condition.lastIndexOf('|');
+  if (conditionExportIndex != -1) {
+    conditionExport = condition.substr(conditionExportIndex + 1);
+    conditionModule = condition.substr(negation, conditionExportIndex - negation);
+
+    if (negation)
+      warn.call(this, 'Condition negation form "' + condition + '" is deprecated for "' + conditionModule + '|~' + conditionExport + '"');
+
+    if (conditionExport[0] == '~') {
+      negation = true;
+      conditionExport = conditionExport.substr(1);
+    }
+  }
+  else {
+    conditionExport = 'default';
+    conditionModule = condition.substr(negation);
+    if (sysConditions.indexOf(conditionModule) != -1) {
+      conditionExport = conditionModule;
+      conditionModule = '@system-env';
+    }
+  }
+
+  return {
+    module: conditionModule,
+    prop: conditionExport,
+    negate: negation
+  };
+}
+
+exports.serializeCondition = serializeCondition;
+function serializeCondition(conditionObj) {
+  return conditionObj.module + '|' + (conditionObj.negate ? '~' : '') + conditionObj.prop;
+}
 
diff --git a/test/conditional-builds.js b/test/conditional-builds.js
@@ -20,7 +20,7 @@ suite('Conditional Builds', function() {
   });
 
   test('Boolean conditional', function() {
-    return builder.trace('interpolated-1.js#?|browser')
+    return builder.trace('interpolated-1.js#?browser')
     .then(function(tree) {
       assert.deepEqual(Object.keys(tree).sort(), ['interpolated-1.js#?@system-env|browser', 'interpolated-1.js', 'interpolate-1-dep.js'].sort());
     });