Update to use latest version of typescript

leebyron · leebyron · commit 001597188ffb · 2016-01-05T20:50:02.000-08:00
This updates the jest preprocessor to work with the new typescript compiler, allowing us to support the newer typescript features like "this' return types.

The new typescript version found a legitimate error in a test file, which is also fixed in this rev
diff --git a/__tests__/zip.ts b/__tests__/zip.ts
@@ -58,7 +58,7 @@ describe('zip', () => {
     it('can zip to create immutable collections', () => {
       expect(
         I.Seq.of(1,2,3).zipWith(
-          () => I.List(arguments),
+          function () { return I.List(arguments); },
           I.Seq.of(4,5,6),
           I.Seq.of(7,8,9)
         ).toJS()
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
     "rollup": "0.24.0",
     "run-sequence": "1.1.5",
     "through2": "2.0.0",
-    "typescript": "~1.4.1",
+    "typescript": "1.7.5",
     "uglify-js": "2.6.1",
     "vinyl-buffer": "1.0.0",
     "vinyl-source-stream": "1.1.0"
diff --git a/resources/jestPreprocessor.js b/resources/jestPreprocessor.js
@@ -34,22 +34,31 @@ function compileTypeScript(filePath) {
 
   var host = typescript.createCompilerHost(options);
   var program = typescript.createProgram([filePath], options, host);
-  var checker = typescript.createTypeChecker(program, /*fullTypeCheck*/ true);
-  var result = checker.emitFiles();
-
-  program.getDiagnostics()
-    .concat(checker.getDiagnostics())
-    .concat(result.diagnostics)
-    .forEach(function(diagnostic) {
-      var lineChar = diagnostic.file.getLineAndCharacterFromPosition(diagnostic.start);
-      console.error('%s %d:%d %s', diagnostic.file.filename, lineChar.line, lineChar.character, diagnostic.messageText);
-    });
-
-  if (result.emitResultStatus !== typescript.EmitReturnStatus.Succeeded) {
-    throw new Error('Compiling ' + filePath + ' failed');
+
+  var diagnostics = program.getSyntacticDiagnostics();
+
+  if (diagnostics.length === 0) {
+    diagnostics = program.getGlobalDiagnostics();
+  }
+
+  if (diagnostics.length === 0) {
+    diagnostics = program.getSemanticDiagnostics();
+  }
+
+  if (diagnostics.length === 0) {
+    var emitOutput = program.emit();
+    diagnostics = emitOutput.diagnostics;
+  }
+
+  if (diagnostics.length === 0) {
+    return fs.readFileSync(outputPath, {encoding: 'utf8'});
   }
 
-  return fs.readFileSync(outputPath, {encoding: 'utf8'});
+  diagnostics.forEach(function(diagnostic) {
+    var loc = typescript.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
+    console.error('%s %d:%d %s', diagnostic.file.fileName, loc.line, loc.character, diagnostic.messageText);
+  });
+  throw new Error('Compiling ' + filePath + ' failed');
 }
 
 function withLocalImmutable(filePath, jsSrc) {
