Updating file.expandMapping to return a more explicit array of file objects.

* Instead of {dest1: src1, dest2: src2, …} it returns [{dest: dest1, src: src1}, {dest: dest2, src: src2}, …] which is the format the files object is normalized to inside multi tasks

Author: cowboy

lib/grunt/file.js

@@ -172,7 +172,7 @@ file.expandMapping = function(patterns, destBase, options) {
       return path.join(destBase, destPath);
     }
   });
-  var files = {};
+  var files = [];
   // Find all files matching pattern, using passed-in options.
   file.expand(options, patterns).forEach(function(src) {
     // Flatten if specified.
@@ -185,7 +185,10 @@ file.expandMapping = function(patterns, destBase, options) {
     dest = dest.replace(pathSeparatorRe, '/');
     src = src.replace(pathSeparatorRe, '/');
     // Map correct src path to dest path.
-    files[dest] = src;
+    files.push({
+      src: src,
+      dest: dest,
+    });
   });
   return files;
 };

test/grunt/file_test.js

@@ -243,11 +243,11 @@ exports['file.expandMapping'] = {
     test.expect(2);
 
     var actual = grunt.file.expandMapping(['expand/**/*.txt'], 'dest');
-    var expected = {
-      'dest/expand/deep/deep.txt': 'expand/deep/deep.txt',
-      'dest/expand/deep/deeper/deeper.txt': 'expand/deep/deeper/deeper.txt',
-      'dest/expand/deep/deeper/deepest/deepest.txt': 'expand/deep/deeper/deepest/deepest.txt',
-    };
+    var expected = [
+      {dest: 'dest/expand/deep/deep.txt', src: 'expand/deep/deep.txt'},
+      {dest: 'dest/expand/deep/deeper/deeper.txt', src: 'expand/deep/deeper/deeper.txt'},
+      {dest: 'dest/expand/deep/deeper/deepest/deepest.txt', src: 'expand/deep/deeper/deepest/deepest.txt'},
+    ];
     test.deepEqual(actual, expected, 'basic src-dest options');
 
     actual = grunt.file.expandMapping(['expand/**/*.txt'], 'dest/');
@@ -258,22 +258,22 @@ exports['file.expandMapping'] = {
   'flatten': function(test) {
     test.expect(1);
     var actual = grunt.file.expandMapping(['expand/**/*.txt'], 'dest', {flatten: true});
-    var expected = {
-      'dest/deep.txt': 'expand/deep/deep.txt',
-      'dest/deeper.txt': 'expand/deep/deeper/deeper.txt',
-      'dest/deepest.txt': 'expand/deep/deeper/deepest/deepest.txt',
-    };
+    var expected = [
+      {dest: 'dest/deep.txt', src: 'expand/deep/deep.txt'},
+      {dest: 'dest/deeper.txt', src: 'expand/deep/deeper/deeper.txt'},
+      {dest: 'dest/deepest.txt', src: 'expand/deep/deeper/deepest/deepest.txt'},
+    ];
     test.deepEqual(actual, expected, 'dest paths should be flattened pre-destBase+destPath join');
     test.done();
   },
   'cwd': function(test) {
     test.expect(1);
     var actual = grunt.file.expandMapping(['**/*.txt'], 'dest', {cwd: 'expand'});
-    var expected = {
-      'dest/deep/deep.txt': 'expand/deep/deep.txt',
-      'dest/deep/deeper/deeper.txt': 'expand/deep/deeper/deeper.txt',
-      'dest/deep/deeper/deepest/deepest.txt': 'expand/deep/deeper/deepest/deepest.txt',
-    };
+    var expected = [
+      {dest: 'dest/deep/deep.txt', src: 'expand/deep/deep.txt'},
+      {dest: 'dest/deep/deeper/deeper.txt', src: 'expand/deep/deeper/deeper.txt'},
+      {dest: 'dest/deep/deeper/deepest/deepest.txt', src: 'expand/deep/deeper/deepest/deepest.txt'},
+    ];
     test.deepEqual(actual, expected, 'cwd should be stripped from front of destPath, pre-destBase+destPath join');
     test.done();
   },
@@ -286,11 +286,11 @@ exports['file.expandMapping'] = {
         return path.join(destBase, options.cwd, 'o-m-g', destPath);
       }
     });
-    var expected = {
-      'dest/expand/o-m-g/deep.txt': 'expand/deep/deep.txt',
-      'dest/expand/o-m-g/deeper.txt': 'expand/deep/deeper/deeper.txt',
-      'dest/expand/o-m-g/deepest.txt': 'expand/deep/deeper/deepest/deepest.txt',
-    };
+    var expected = [
+      {dest: 'dest/expand/o-m-g/deep.txt', src: 'expand/deep/deep.txt'},
+      {dest: 'dest/expand/o-m-g/deeper.txt', src: 'expand/deep/deeper/deeper.txt'},
+      {dest: 'dest/expand/o-m-g/deepest.txt', src: 'expand/deep/deeper/deepest/deepest.txt'},
+    ];
     test.deepEqual(actual, expected, 'custom rename function should be used to build dest, post-flatten');
     test.done();
   },