handle array bundling consistently

systemjs · Aug 30, 2016 · dc7e502 · dc7e502
1 parent fede396
commit dc7e502
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/lib/arithmetic.js b/lib/arithmetic.js
@@ -224,6 +224,23 @@ exports.traceExpression = function(builder, expression, traceOpts) {
   if (!expression)
     throw new Error('A module expression must be provided to trace.');
 
+  if (expression instanceof Array) {
+    var tree = {};
+    return Promise.all(expression.map(function(moduleName) {
+      return builder.loader.normalize(moduleName)
+      .then(function(normalized) {
+        var canonical = builder.getCanonicalName(normalized);
+        return builder.tracer.getLoadRecord(canonical, traceOpts)
+        .then(function(load) {
+          tree[canonical] = load;
+        });
+      });
+    }))
+    .then(function() {
+      return tree;
+    });
+  }
+
   return Promise
     .resolve(expandAndCanonicalizeExpression(builder, expression))
     .then(function processExpandedOperations(expandedOperations) {
@@ -249,7 +266,7 @@ exports.traceExpression = function(builder, expression, traceOpts) {
   });
 };
 
-function expandAndCanonicalizeExpression(builder, expression){
+function expandAndCanonicalizeExpression(builder, expression) {
   var operations = parseExpression(expression);
   var expandPromise = Promise.resolve(1);
   var expandedOperations = [];

diff --git a/lib/builder.js b/lib/builder.js
@@ -656,10 +656,7 @@ Builder.prototype.bundle = function(expressionOrTree, outFile, opts) {
 
   return Promise.resolve()
   .then(function() {
-    if (expressionOrTree instanceof Array)
-      expressionOrTree = '[' + expressionOrTree.join('] + [') + ']';
-
-    if (typeof expressionOrTree != 'string')
+    if (typeof expressionOrTree != 'string' && !(expressionOrTree instanceof Array))
       return expressionOrTree;
 
     return setExternals(self, traceOpts.externals)
@@ -733,10 +730,7 @@ Builder.prototype.buildStatic = function(expressionOrTree, outFile, opts) {
 
   return Promise.resolve()
   .then(function() {
-    if (expressionOrTree instanceof Array)
-      expressionOrTree = '[' + expressionOrTree.join('] + [') + ']';
-
-    if (typeof expressionOrTree != 'string')
+    if (typeof expressionOrTree != 'string' && !(expressionOrTree instanceof Array))
       return expressionOrTree;
 
     return setExternals(self, traceOpts.externals)