Fix additional issue in #251

nycdotnet · nycdotnet · commit e5503e16716e · 2015-06-03T22:14:22.000-04:00
As reported by @seanmailander
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -103,6 +103,24 @@ module.exports = function (grunt) {
                 src: ['test/simple/ts/zoo.ts'],
                 outDir: 'test/simple/js/',
             },
+            out_with_spaces: {
+                test: true,
+                options: {
+                    fast: 'never',
+                    sourcemap: false
+                },
+                src: ['test/simple/ts/zoo.ts'],
+                out: 'test/out with spaces/out with spaces.js'
+            },
+            outDir_with_spaces: {
+                test: true,
+                options: {
+                    fast: 'never',
+                    sourcemap: false
+                },
+                src: ['test/simple/ts/zoo.ts'],
+                outDir: 'test/out with spaces'
+            },
             multifiletest: {
                 test: true,
                 files: [{ src: ['test/multifile/a/**/*.ts'], dest: 'test/multifile/a/out.js' },
diff --git a/tasks/modules/compile.js b/tasks/modules/compile.js
diff --git a/tasks/modules/compile.ts b/tasks/modules/compile.ts
@@ -156,7 +156,10 @@ export function compileAllFiles(targetFiles: string[],
     }
 
     // Quote the files to compile. Needed for command line parsing by tsc
-    files = _.map(files, (item) => '"' + path.resolve(item) + '"');
+    files = _.map(files, (item) => `"${path.resolve(item)}"`);
+    if (outFile) {
+      outFile = `"${path.resolve(outFile)}"`;
+    }
 
     var args: string[] = files.slice(0);
 
@@ -199,23 +202,30 @@ export function compileAllFiles(targetFiles: string[],
     	}
     }
 
+    var theOutDir : string = null;
+    if (target.outDir) {
+        if (target.out) {
+            console.warn('WARNING: Option "out" and "outDir" should not be used together'.magenta);
+        }
+
+        theOutDir = `"${path.resolve(target.outDir)}"`;
+        args.push('--outDir', theOutDir);
+    }
+
     // Target options:
     if (outFile) {
       if (utils.isJavaScriptFile(outFile)) {
         args.push('--out', outFile);
       } else {
-        args.push('--outDir', outFile);
+        if (!theOutDir) {
+          args.push('--outDir', outFile);
+        }
       }
     } else if (target.out) {
         args.push('--out', target.out);
     }
 
-    if (target.outDir) {
-        if (target.out) {
-            console.warn('WARNING: Option "out" and "outDir" should not be used together'.magenta);
-        }
-        args.push('--outDir', target.outDir);
-    }
+
 
     if (target.dest && (!target.out) && (!target.outDir)) {
         if (utils.isJavaScriptFile(target.dest)) {
diff --git a/tasks/modules/utils.js b/tasks/modules/utils.js
diff --git a/tasks/modules/utils.ts b/tasks/modules/utils.ts
@@ -73,9 +73,21 @@ export function endsWith(str: string, suffix: string): boolean {
     return str.indexOf(suffix, str.length - suffix.length) !== -1;
 }
 
+export function stripQuotesIfQuoted(possiblyQuotedString: string) {
+    if (!possiblyQuotedString.length || possiblyQuotedString.length < 2) {
+      return possiblyQuotedString;
+    }
+    if (possiblyQuotedString.charAt(0) === '"' &&
+       possiblyQuotedString.charAt(possiblyQuotedString.length - 1) === '"') {
+         return possiblyQuotedString.substr(1, possiblyQuotedString.length - 2);
+    }
+    return possiblyQuotedString;
+}
+
 export function isJavaScriptFile(filePath: string): boolean {
     if (filePath.toLowerCase) {
-        return this.endsWith(filePath.toLowerCase(), '.js');
+        var normalizedFile = path.resolve(stripQuotesIfQuoted(filePath)).toLowerCase();
+        return endsWith(normalizedFile, '.js');
     }
     return false;
 }
diff --git a/test/expected/out with spaces/out with spaces.js b/test/expected/out with spaces/out with spaces.js
@@ -0,0 +1,41 @@
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Animal = (function () {
+    function Animal(name) {
+        this.name = name;
+    }
+    Animal.prototype.move = function (meters) {
+        alert(this.name + " moved " + meters + "m.");
+    };
+    return Animal;
+})();
+var Snake = (function (_super) {
+    __extends(Snake, _super);
+    function Snake(name) {
+        _super.call(this, name);
+    }
+    Snake.prototype.move = function () {
+        alert("Slithering...");
+        _super.prototype.move.call(this, 5);
+    };
+    return Snake;
+})(Animal);
+var Horse = (function (_super) {
+    __extends(Horse, _super);
+    function Horse(name) {
+        _super.call(this, name);
+    }
+    Horse.prototype.move = function () {
+        alert("Galloping...");
+        _super.prototype.move.call(this, 45);
+    };
+    return Horse;
+})(Animal);
+var sam = new Snake("Sammy the Python");
+var tom = new Horse("Tommy the Palomino");
+sam.move();
+tom.move(34);
diff --git a/test/expected/out with spaces/zoo.js b/test/expected/out with spaces/zoo.js
@@ -0,0 +1,41 @@
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Animal = (function () {
+    function Animal(name) {
+        this.name = name;
+    }
+    Animal.prototype.move = function (meters) {
+        alert(this.name + " moved " + meters + "m.");
+    };
+    return Animal;
+})();
+var Snake = (function (_super) {
+    __extends(Snake, _super);
+    function Snake(name) {
+        _super.call(this, name);
+    }
+    Snake.prototype.move = function () {
+        alert("Slithering...");
+        _super.prototype.move.call(this, 5);
+    };
+    return Snake;
+})(Animal);
+var Horse = (function (_super) {
+    __extends(Horse, _super);
+    function Horse(name) {
+        _super.call(this, name);
+    }
+    Horse.prototype.move = function () {
+        alert("Galloping...");
+        _super.prototype.move.call(this, 45);
+    };
+    return Horse;
+})(Animal);
+var sam = new Snake("Sammy the Python");
+var tom = new Horse("Tommy the Palomino");
+sam.move();
+tom.move(34);
diff --git a/test/test.js b/test/test.js
diff --git a/test/test.ts b/test/test.ts
@@ -129,5 +129,9 @@ export var typescript = {
     files_ArrayFormatFolder: function (test) {
         testDirectory(test, 'multifile/files_testFilesUsedWithDestAsAJSFolder');
         test.done();
+    },
+    out_and_outdir_with_spaces: function (test) {
+        testDirectory(test, 'out with spaces');
+        test.done();
     }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -58,14 +58,12 @@
         "./test/amdloader/ts/app/deep/classb.ts",
         "./test/amdloader/ts/app/deep/classc.ts",
         "./test/amdloader/ts/app/deep/deeper/classd.ts",
-        "./test/amdloader/ts/app/partials/templates.a.html.ts",
         "./test/amdloader/ts/app/reference.ts",
         "./test/amdloader/ts/test/classt.ts",
         "./test/amdloader/ts/test/deep/classu.ts",
         "./test/amdloader/ts/test/deep/classv.ts",
         "./test/amdloader/ts/test/deep/deeper/classw.ts",
         "./test/amdloader/ts/test/extendedAppCode.ts",
-        "./test/amdloader/ts/test/partials/templates.b.html.ts",
         "./test/amdloader/ts/test/reference.ts",
         "./test/amdloader/ts/test/test.ts",
         "./test/amdtest/a.ts",
@@ -97,17 +95,13 @@
         "./test/html/reference.ts",
         "./test/html/src/bar.ts",
         "./test/html/src/foo.ts",
-        "./test/html/src/test.tpl.html.ts",
         "./test/htmlOutDir/reference.ts",
         "./test/htmlOutDir/src/bar.ts",
         "./test/htmlOutDir/src/foo.ts",
-        "./test/htmlOutDir/src/test.tpl.html.ts",
         "./test/htmlOutDirFlat/reference.ts",
         "./test/htmlOutDirFlat/src/bar.ts",
         "./test/htmlOutDirFlat/src/foo.ts",
-        "./test/htmlOutDirFlat/src/test.tpl.html.ts",
         "./test/htmlTemplate/reference.ts",
-        "./test/htmlTemplate/src/advanced.$$template.name.tpl.html.ts",
         "./test/htmlTemplate/src/foo.ts",
         "./test/multifile/a/a.ts",
         "./test/multifile/a/b.ts",
@@ -132,7 +126,6 @@
         "./test/simple/js/zoo.d.ts",
         "./test/simple/ts/zoo.ts",
         "./test/sourceroot/src/a.ts",
-        "./test/sourceroot/src/nested/b.html.ts",
         "./test/sourceroot/src/nested/b.ts",
         "./test/sourceroot/src/reference.ts",
         "./test/suppressImplicitAnyIndexErrors/test_suppressImplicitAnyIndexError.ts",

Original file line number	Diff line number	Diff line change
`@@ -129,5 +129,9 @@ export var typescript = {`
`129`	`129`	`files_ArrayFormatFolder: function (test) {`
`130`	`130`	`testDirectory(test, 'multifile/files_testFilesUsedWithDestAsAJSFolder');`
`131`	`131`	`test.done();`
	`132`	`+ },`
	`133`	`+ out_and_outdir_with_spaces: function (test) {`
	`134`	`+ testDirectory(test, 'out with spaces');`
	`135`	`+ test.done();`
`132`	`136`	`}`
`133`	`137`	`}`