Merge pull request #172 from typed-ember/programmatic-compilation

Invoke tsc programmatically

Author: chriskrycho

appveyor.yml

@@ -18,10 +18,10 @@ install:
   - rename C:\Python27 Python27hidden
   # Typical npm stuff.
   - md C:\nc
-  - yarn --ignore-optional
+  - yarn
 
 cache:
- - "%LOCALAPPDATA%\\Yarn"
+#  - "%LOCALAPPDATA%\\Yarn"
 
 # Post-install test scripts.
 test_script:

ember-cli-build.js

@@ -4,7 +4,9 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
   let app = new EmberAddon(defaults, {
-    // Add options here
+    babel: {
+      sourceMaps: 'inline'
+    }
   });
 
   /*

lib/commands/precompile.js

@@ -2,12 +2,12 @@
 'use strict';
 
 const tmpdir = require('../utilities/tmpdir');
+const execa = require('execa');
 const fs = require('fs-extra');
 const path = require('path');
 const walkSync = require('walk-sync');
 const mkdirp = require('mkdirp');
 const Command = require('ember-cli/lib/models/command'); // eslint-disable-line node/no-unpublished-require
-const compile = require('../utilities/compile');
 
 const PRECOMPILE_MANIFEST = 'tmp/.ts-precompile-manifest';
 
@@ -26,13 +26,20 @@ module.exports = Command.extend({
 
     // prettier-ignore
     let flags = [
+      '--outDir', outDir,
+      '--rootDir', project.root,
+      '--allowJs', 'false',
+      '--noEmit', 'false',
       '--declaration',
       '--sourceMap', 'false',
       '--inlineSourceMap', 'false',
       '--inlineSources', 'false',
     ];
 
-    return compile({ project, outDir, flags }).then(() => {
+    // Ensure the output directory is created even if no files are generated
+    mkdirp.sync(outDir);
+
+    return execa('tsc', flags).then(() => {
       let output = [];
       for (let declSource of walkSync(outDir, { globs: ['**/*.d.ts'] })) {
         if (this._shouldCopy(declSource)) {

lib/incremental-typescript-compiler.js

@@ -11,6 +11,7 @@ const path = require('path');
 const fs = require('fs');
 const resolve = require('resolve');
 const compile = require('./utilities/compile');
+const ts = require('typescript');
 
 const debugCompiler = require('debug')('ember-cli-typescript:compiler');
 const debugAutoresolve = require('debug')('ember-cli-typescript:autoresolve');
@@ -29,7 +30,7 @@ module.exports = class IncrementalTypescriptCompiler {
     this.project = project;
     this.addons = this._discoverAddons(project, []);
     this.maxBuildCount = 1;
-    this.autoresolveThreshold = 500;
+    this.autoresolveThreshold = 250;
 
     this._buildDeferred = RSVP.defer();
     this._isSynced = false;
@@ -106,43 +107,41 @@ module.exports = class IncrementalTypescriptCompiler {
 
     let project = this.project;
     let outDir = this.outDir();
-    let flags = ['--watch'];
-    let tsc = compile({ project, outDir, flags });
-
-    tsc.stdout.on('data', data => {
-      let text = data
-        .toString()
-        .trim()
-        // tsc screen-clearing:
-        .replace(/\u001bc/g, ''); // eslint-disable-line no-control-regex
-
-      if (text) {
-        this.project.ui.writeLine(text);
-      }
 
-      if (data.indexOf('Starting incremental compilation') !== -1) {
-        debugCompiler('tsc detected a file change');
-        this.willRebuild();
-        clearTimeout(this._pendingAutoresolve);
-      }
+    compile(project, { outDir, watch: true }, {
+      reportWatchStatus: (diagnostic) => {
+        let text = diagnostic.messageText;
 
-      if (data.indexOf('Compilation complete') !== -1) {
-        debugCompiler('rebuild completed');
+        if (text.indexOf('Starting incremental compilation') !== -1) {
+          debugCompiler('tsc detected a file change');
+          this.willRebuild();
+          clearTimeout(this._pendingAutoresolve);
+        }
 
-        this.didSync();
+        if (text.indexOf('Compilation complete') !== -1) {
+          debugCompiler('rebuild completed');
 
-        if (this._didAutoresolve) {
-          this._touchRebuildTrigger();
-          this.maxBuildCount++;
-        }
+          this.didSync();
 
-        clearTimeout(this._pendingAutoresolve);
-        this._didAutoresolve = false;
-      }
-    });
+          if (this._didAutoresolve) {
+            this._touchRebuildTrigger();
+            this.maxBuildCount++;
+          }
 
-    tsc.stderr.on('data', data => {
-      this.project.ui.writeError(data.toString().trim());
+          clearTimeout(this._pendingAutoresolve);
+          this._didAutoresolve = false;
+        }
+      },
+
+      reportDiagnostic: (diagnostic) => {
+        if (diagnostic.category !== 2) {
+          this.project.ui.write(ts.formatDiagnostic(diagnostic, {
+            getCanonicalFileName: path => path,
+            getCurrentDirectory: ts.sys.getCurrentDirectory,
+            getNewLine: () => ts.sys.newLine,
+          }));
+        }
+      }
     });
   }
 

lib/utilities/compile.js

@@ -1,21 +1,65 @@
 /* eslint-env node */
 'use strict';
 
-const execa = require('execa');
 const mkdirp = require('mkdirp');
+const ts = require('typescript');
+const chokidar = require('chokidar');
+const fs = require('fs-extra');
 
-module.exports = function compile(options) {
+module.exports = function compile(project, tsOptions, callbacks) {
   // Ensure the output directory is created even if no files are generated
-  mkdirp.sync(options.outDir);
-
-  // argument sequence here is meaningful; don't apply prettier.
-  // prettier-ignore
-  let args = [
-    '--outDir', options.outDir,
-    '--rootDir', options.project.root,
-    '--allowJs', 'false',
-    '--noEmit', 'false'
-  ];
-
-  return execa('tsc', args.concat(options.flags));
+  mkdirp.sync(tsOptions.outDir);
+
+  let fullOptions = Object.assign({
+    rootDir: project.root,
+    allowJs: false,
+    noEmit: false
+  }, tsOptions);
+
+  let configPath = ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json');
+  let createProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram;
+  let host = ts.createWatchCompilerHost(
+    configPath,
+    fullOptions,
+    buildWatchHooks(ts.sys),
+    createProgram,
+    callbacks.reportDiagnostic,
+    callbacks.reportWatchStatus
+  );
+
+  return ts.createWatchProgram(host);
 };
+
+function buildWatchHooks(sys) {
+  let watchedFiles = new Map();
+
+  return Object.assign({}, sys, {
+    watchFile(file, callback) {
+      watchedFiles.set(file, callback);
+
+      return {
+        close() {
+          watchedFiles.delete(file);
+        }
+      };
+    },
+
+    watchDirectory(dir, callback) {
+      if (!fs.existsSync(dir)) return;
+
+      let ignored = /\/(\..*?|dist|node_modules|tmp)\//;
+      let watcher = chokidar.watch(dir, { ignored });
+
+      watcher.on('all', (type, path) => {
+        path = path.replace(/\\/g, '/'); // Normalize Windows
+        if (type === 'add') {
+          callback(path);
+        } else if (watchedFiles.has(path)) {
+          watchedFiles.get(path)(path, type === 'change' ? 1 : 2);
+        }
+      });
+
+      return watcher;
+    }
+  });
+}

package.json

@@ -36,6 +36,7 @@
     "broccoli-plugin": "^1.2.1",
     "broccoli-stew": "^1.4.0",
     "chalk": "^2.3.0",
+    "chokidar": "^2.0.3",
     "debug": "^3.1.0",
     "ember-cli": "*",
     "ember-cli-get-component-path-option": "^1.0.0",

tests/dummy/app/controllers/application.ts

@@ -3,4 +3,5 @@ import Ember from 'ember';
 export default Ember.Controller.extend({
   // Just a very roundabout way of using some ES6 features
   value: ((test = 'Test') => `${test} ${'Value'}`)(),
+  foo: 'hello'
 });

tests/dummy/app/helpers/typed-help.ts

@@ -1,3 +1,4 @@
+import Ember from 'ember';
 import { helper } from '@ember/component/helper';
 
 export function typedHelp(/*params, hash*/) {

tsconfig.json

@@ -4,6 +4,8 @@
     "allowJs": false,
     "moduleResolution": "node",
     "noEmitOnError": true,
+    "inlineSourceMap": true,
+    "inlineSources": true,
     "baseUrl": ".",
     "paths": {
       "dummy/tests/*": ["tests/*"],