Fixes files in src: dest: style.

Author: nycdotnet

Gruntfile.js

@@ -178,14 +178,20 @@ module.exports = function (grunt) {
             },
             files_testFilesUsedWithDestAsAJSFile: {
                 test: true,
-                files: [{ src: ['test/multifile/a/**/*.ts'], dest: 'test/multifile/files_testFilesUsedWithDestAsAJSFile/testDest.js' }],
+                files: [
+                    { src: ['test/multifile/a/**/*.ts'],
+                      dest: 'test/multifile/files_testFilesUsedWithDestAsAJSFile/testDest.js' }
+                ],
                 options: {
                     fast: 'never'
                 }
             },
             files_testFilesUsedWithDestAsAFolder: {
                 test: true,
-                files: [{ src: ['test/multifile/a/**/*.ts'], dest: 'test/multifile/files_testFilesUsedWithDestAsAJSFile' }],
+                files: [
+                    { src: ['test/multifile/a/**/*.ts'],
+                      dest: 'test/multifile/files_testFilesUsedWithDestAsAJSFolder' }
+                ],
                 options: {
                     fast: 'never'
                 }
@@ -198,6 +204,7 @@ module.exports = function (grunt) {
                 }
             },
             files_testWarnIfFilesHasDestArray: {
+                // TODO: This test is currently broken.  grunt-ts does not warn.
                 test: true,
                 files: [{ src: ['test/multifile/a/**/*.ts'], dest: ['test/multifile/a', 'test/multifile/b'] }],
                 options: {

README.md

@@ -968,6 +968,17 @@ The easiest/fastest way to work on grunt-ts is to modify `tasksToTest` toward th
 
 Without using `tasksToTest` while working on grunt-ts, the old grunt-ts remains in memory for successive tasks on the same run.  This means you might have to run your grunt commands twice; once to compile grunt-ts and once to see how the new grunt-ts works with your code.
 
+### Quickstart for debugging Grunt plugins with Node Inspector
+
+Install [Node Inspector](https://github.com/node-inspector/node-inspector) via npm:
+
+`npm install -g node-inspector`
+
+Example command-line to debug a grunt-ts task on Windows:
+
+`node-debug --debug-brk %appdata%\npm\node_modules\grunt-cli\bin\grunt ts:files_testFilesUsedWithDestAsAJSFile`
+
+Set breakpoints in the Chrome dev tools, or use `debugger;` where needed.
 
 ### Additional commands
 Update the current `grunt-ts` to be the last known good version (dogfood). Commit message should be `Update LKG`.

tasks/modules/compile.js

@@ -160,7 +160,12 @@ function compileAllFiles(targetFiles, target, task, targetName, outFile) {
     }
     // Target options:
     if (outFile) {
-        args.push('--out', outFile);
+        if (utils.isJavaScriptFile(outFile)) {
+            args.push('--out', outFile);
+        }
+        else {
+            args.push('--outDir', outFile);
+        }
     }
     else if (target.out) {
         args.push('--out', target.out);
@@ -177,13 +182,18 @@ function compileAllFiles(targetFiles, target, task, targetName, outFile) {
         }
         else {
             if (target.dest === 'src') {
-                console.warn(('WARNING: Destination for target "' + targetName + '" is "src", which is the default.  If you have' + ' forgotten to specify a "dest" parameter, please add it.  If this is correct, you may wish' + ' to change the "dest" parameter to "src/" or just ignore this warning.').magenta);
+                console.warn(('WARNING: Destination for target "' + targetName + '" is "src", which is the default.  If you have' +
+                    ' forgotten to specify a "dest" parameter, please add it.  If this is correct, you may wish' +
+                    ' to change the "dest" parameter to "src/" or just ignore this warning.').magenta);
             }
             if (Array.isArray(target.dest)) {
                 if (target.dest.length === 0) {
                 }
                 else if (target.dest.length > 0) {
-                    console.warn((('WARNING: "dest" for target "' + targetName + '" is an array.  This is not supported by the' + ' TypeScript compiler or grunt-ts.' + ((target.dest.length > 1) ? '  Only the first "dest" will be used.  The' + ' remaining items will be truncated.' : ''))).magenta);
+                    console.warn((('WARNING: "dest" for target "' + targetName + '" is an array.  This is not supported by the' +
+                        ' TypeScript compiler or grunt-ts.' +
+                        ((target.dest.length > 1) ? '  Only the first "dest" will be used.  The' +
+                            ' remaining items will be truncated.' : ''))).magenta);
                     args.push('--outDir', target.dest[0]);
                 }
             }
@@ -236,4 +246,3 @@ function compileAllFiles(targetFiles, target, task, targetName, outFile) {
     });
 }
 exports.compileAllFiles = compileAllFiles;
-//# sourceMappingURL=compile.js.map

tasks/modules/compile.ts

@@ -7,7 +7,7 @@ import _ = require('lodash');
 import utils = require('./utils');
 import cache = require('./cacheUtils');
 
-var Promise: typeof Promise = require('es6-promise').Promise;
+var Promise = require('es6-promise').Promise;
 export var grunt: IGrunt = require('grunt');
 
 export interface ICompileResult {
@@ -201,7 +201,11 @@ export function compileAllFiles(targetFiles: string[],
 
     // Target options:
     if (outFile) {
-      args.push('--out', outFile);
+      if (utils.isJavaScriptFile(outFile)) {
+        args.push('--out', outFile);
+      } else {
+        args.push('--outDir', outFile);
+      }
     } else if (target.out) {
         args.push('--out', target.out);
     }

tasks/modules/utils.js

@@ -80,7 +80,7 @@ export function isJavaScriptFile(filePath: string): boolean {
     return false;
 }
 
-/** function for formatting strings 
+/** function for formatting strings
  * ('{0} says {1}','la','ba' ) => 'la says ba'
  */
 export function format(str: string, ...args: any[]) {
@@ -136,7 +136,7 @@ export function getTempFile(prefix?: string, dir: string = '', extension = '.tmp
  * Get all files from a directory and all its subdirectories.
  * @param {String} dirPath A path to a directory
  * @param {RegExp|Function} exclude Defines which files should be excluded.
-     Can be a RegExp (whole filepath is tested) or a Function which will get the filepath 
+     Can be a RegExp (whole filepath is tested) or a Function which will get the filepath
      as an argument and should return true (exclude file) or false (do not exclude).
  * @returns {Array} An array of files
  */
@@ -147,8 +147,8 @@ export function getFiles(dirPath, exclude?: (filename: string) => boolean): stri
 /**
  * Get all directories from a directory and all its subdirectories.
  * @param {String} dirPath A path to a directory
- * @param {RegExp|Function} exclude Defines which directories should be excluded. 
-    Can be a RegExp (whole dirpath is tested) or a Function which will get the dirpath 
+ * @param {RegExp|Function} exclude Defines which directories should be excluded.
+    Can be a RegExp (whole dirpath is tested) or a Function which will get the dirpath
     as an argument and should return true (exclude dir) or false (do not exclude).
  * @returns {Array} An array of directories
  */
@@ -159,8 +159,8 @@ export function getDirs(dirPath, exclude?: (filename: string) => boolean): strin
 /**
  * Get all files or directories from a directory and all its subdirectories.
  * @param {String} dirPath A path to a directory
- * @param {RegExp|Function} exclude Defines which files or directories should be excluded. 
-    Can be a RegExp (whole path is tested) or a Function which will get the path 
+ * @param {RegExp|Function} exclude Defines which files or directories should be excluded.
+    Can be a RegExp (whole path is tested) or a Function which will get the path
     as an argument and should return true (exclude) or false (do not exclude).
  * @param {Boolean} getFiles Whether to get files (true) or directories (false).
  * @returns {Array} An array of files or directories
@@ -252,3 +252,13 @@ export function firstElementWithValue<T>(elements: T[], defaultResult: T = null)
     });
     return result;
 }
+
+export function getOrGetFirst(getFrom: string | string[]) : string {
+  if (_.isArray(getFrom)) {
+    if (getFrom.length > 0) {
+        return getFrom[0];
+    }
+    return '';
+  }
+  return <string>getFrom;
+}

tasks/modules/utils.ts

@@ -317,21 +317,22 @@ function pluginFn(grunt: IGrunt) {
                     var targetout = target.out;
                     if (!targetout) {
                         if (target.dest) {
-                            if (Array.isArray(target.dest)) {
-                                if ((<string[]><any>target.dest).length > 0) {
-                                    // A dest array is meaningless in TypeScript, so just take
-                                    // the first one.
-                                    targetout = (<string[]><any>target.dest)[0];
-                                }
-                            } else if (utils.isJavaScriptFile(target.dest)) {
-                                targetout = target.dest;
-                            }
+                          // A dest array is meaningless in TypeScript, so just take
+                          // the first one.
+                          targetout = utils.getOrGetFirst(target.dest);
                         }
                         else if (target.files) {
                             var filesKeys = _.keys(target.files);
                             if (filesKeys.length > filesCompilationIndex &&
                               utils.isJavaScriptFile(filesKeys[filesCompilationIndex])) {
                               targetout = filesKeys[filesCompilationIndex];
+                            } else if (filesKeys.length > filesCompilationIndex &&
+                              target.files[filesKeys[filesCompilationIndex]].dest) {
+                                targetout = utils.getOrGetFirst(
+                                  // A dest array is meaningless in TypeScript, so just take
+                                  // the first one.
+                                  target.files[filesKeys[filesCompilationIndex]].dest
+                                );
                             }
                         }
                     }