build: support TypeScript 2.9 RC (#105)

* ci: run with typescript@rc
* test: fix sourcemap result for microsoft/TypeScript#21777

Author: teppeis

.circleci/config.yml

@@ -59,10 +59,15 @@ jobs:
             npm install --no-save [email protected]
             npm test
       - run:
-          name: Test with TypeScript 2.7
+          name: Test with TypeScript 2.8
           command: |
             npm install --no-save typescript@latest
             npm test
+      - run:
+          name: Test with TypeScript 2.9 RC
+          command: |
+            npm install --no-save typescript@rc
+            npm test
       - save_cache:
           key: v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
           paths:

appveyor.yml

@@ -39,6 +39,8 @@ test_script:
   - npm test
   - npm install --no-save typescript@latest
   - npm test
+  - npm install --no-save typescript@rc
+  - npm test
 
 # Don't actually build.
 build: off

index.d.ts

@@ -20,11 +20,11 @@ declare namespace tss {
          * @throw {Error} A syntactic error or a semantic error (if doSemanticChecks is true)
          */
         compile(code: string, fileName?: string): string;
-        private createService();
-        private getTypeScriptBinDir();
-        private getDefaultLibFileName(options);
-        private toJavaScript(service, fileName);
-        private formatDiagnostics(diagnostics);
+        private createService;
+        private getTypeScriptBinDir;
+        private getDefaultLibFileName;
+        private toJavaScript;
+        private formatDiagnostics;
     }
 }
 export = tss;

package-lock.json

@@ -13,11 +13,13 @@
     "test": "npm run prepare && mocha"
   },
   "dependencies": {
-    "typescript": "^2.2.1"
+    "typescript": "^2.2.1 || ^2.9.0-rc"
   },
   "devDependencies": {
     "@types/node": "^6.0.111",
-    "mocha": "^5.2.0"
+    "mocha": "^5.2.0",
+    "pkg-up": "^2.0.0",
+    "semver": "^5.5.0"
   },
   "homepage": "https://github.com/teppeis/typescript-simple",
   "repository": {

package.json

@@ -2,7 +2,8 @@ var assert = require('assert');
 var fs = require('fs');
 var path = require('path');
 var eol = require('os').EOL;
-
+var semver = require('semver');
+var pkgUp = require('pkg-up');
 var ts = require('typescript');
 var tss = require('../');
 var TypeScriptSimple = tss.TypeScriptSimple;
@@ -242,13 +243,24 @@ describe('typescript-simple', function() {
             var tss = new TypeScriptSimple({jsx: ts.JsxEmit.Preserve, sourceMap: true});
             var src = 'var foo: any = <bar />;';
             var srcFile = 'foo/test.tsx';
-            var sourceMap = '{"version":3,"file":"test.jsx","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":"AAAA,IAAI,GAAG,GAAQ,CAAC,GAAG,GAAG,CAAC"}';
+            var sourceMap = {
+                "version": 3,
+                "file": "test.jsx",
+                "sourceRoot": "",
+                "sources": ["test.tsx"],
+                "names": [],
+            };
+            if (isTSVerGte('2.9.0-rc')) {
+                sourceMap.mappings = "AAAA,IAAI,GAAG,GAAQ,CAAC,GAAG,CAAC,AAAD,EAAG,CAAC";
+            } else {
+                sourceMap.mappings = "AAAA,IAAI,GAAG,GAAQ,CAAC,GAAG,GAAG,CAAC";
+            }
             var expectedPrefix = 'var foo = <bar />;' + eol + '//# sourceMappingURL=data:application/json;base64,';
             var actual = tss.compile(src, srcFile);
             var match = /(^[\s\S]*;base64,)(.*)$/.exec(actual);
             assert(match);
             assert.equal(match[1], expectedPrefix);
-            assert.deepEqual(JSON.parse(Buffer.from(match[2], 'base64').toString()), JSON.parse(sourceMap));
+            assert.deepEqual(JSON.parse(Buffer.from(match[2], 'base64').toString()), sourceMap);
         });
     });
 
@@ -281,3 +293,8 @@ describe('typescript-simple', function() {
       assert.equal(tss.compile(src), expected);
     });
 });
+
+function isTSVerGte(ver) {
+    var pkg = require(pkgUp.sync(path.dirname(require.resolve('typescript'))));
+    return semver.gte(pkg.version, ver);
+}