Set up build-time code for TypeScript development

.eslintignore

@@ -1 +1,21 @@
-/blueprints/*/files/**/*.js
+# unconventional js
+/blueprint-files/
+/test-fixtures/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+/js/
+
+# dependencies
+/bower_components/
+/tests/dummy/lib/*/node_modules/
+
+# misc
+/coverage/
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.eslintrc.js

@@ -10,18 +10,24 @@ module.exports = {
     browser: true,
   },
   rules: {},
+  settings: {
+    node: {
+      // Honor both extensions when enforcing e.g. `node/no-missing-require`
+      tryExtensions: ['.js', '.ts'],
+    },
+  },
   overrides: [
     // node files
     {
       files: [
         'ember-cli-build.js',
         'index.js',
+        'register-ts-node.js',
         'testem.js',
         'blueprints/*/index.js',
         'config/**/*.js',
         'tests/dummy/config/**/*.js',
-        'lib/**/*.js',
-        'node-tests/**/*.js',
+        'ts/**/*.js',
       ],
       excludedFiles: ['app/**', 'addon/**', 'tests/dummy/app/**'],
       parserOptions: {
@@ -41,22 +47,33 @@ module.exports = {
 
     // test files
     {
-      files: ['tests/**/*.js'],
-      excludedFiles: ['tests/dummy/**/*.js'],
+      files: ['tests/**/*.{js,ts}'],
+      excludedFiles: ['tests/dummy/**/*.{js,ts}'],
       env: {
         embertest: true,
       },
     },
 
     // node test files
     {
-      files: ['node-tests/**/*.js'],
+      files: ['ts/tests/**/*.{js,ts}'],
       env: {
         mocha: true,
       },
       rules: {
         'node/no-unpublished-require': 'off',
       },
     },
+
+    // all TypeScript files
+    {
+      files: ['**/*.ts'],
+      parser: 'typescript-eslint-parser',
+      rules: {
+        // These are covered by tsc
+        'no-undef': 'off',
+        'no-unused-var': 'off'
+      }
+    }
   ],
 };

.gitignore

@@ -3,6 +3,7 @@
 # compiled output
 /dist
 /tmp
+/js
 
 # dependencies
 /node_modules

.npmignore

@@ -3,6 +3,10 @@
 /dist
 /tests
 /tmp
+/test-fixtures
+/ts
+/js/tests
+
 **/.gitkeep
 .bowerrc
 .editorconfig

.travis.yml

@@ -36,6 +36,8 @@ install:
 
 script:
   - test $MD_ONLY && echo "Skipped!" || yarn lint:js
+  # Typecheck and compile the addon, then nuke the TS source so we're testing the code we would publish
+  - test $MD_ONLY && echo "Skipped!" || yarn ci:prepare
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
   - test $MD_ONLY && echo "Skipped!" || yarn ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

appveyor.yml

@@ -27,6 +27,8 @@ cache:
 test_script:
   # Output useful info for debugging.
   - yarn versions
+  # Typecheck and compile the addon, then nuke the TS source so we're testing the code we would publish
+  - cmd: yarn ci:prepare
   - cmd: yarn ember try:one defaults
 
 # Don't actually build.

config/ember-try.js

@@ -1,6 +1,6 @@
 module.exports = {
   useYarn: true,
-  command: 'ember test && yarn nodetest',
+  command: 'yarn ci:test',
   scenarios: [
     {
       name: 'defaults',

index.js

@@ -1,101 +1,15 @@
-// @ts-check
 'use strict';
 
-const IncrementalTypescriptCompiler = require('./lib/incremental-typescript-compiler');
-const Funnel = require('broccoli-funnel');
-const MergeTrees = require('broccoli-merge-trees');
-const stew = require('broccoli-stew');
+const fs = require('fs');
 
-module.exports = {
-  name: 'ember-cli-typescript',
+// If transpiled output is present, always default to loading that first.
+// Otherwise, register ts-node if necessary and load from source.
+if (fs.existsSync(`${__dirname}/js/addon.js`)) {
+  // eslint-disable-next-line node/no-missing-require
+  module.exports = require('./js/addon');
+} else {
+  require('./register-ts-node');
 
-  included(includer) {
-    this._super.included.apply(this, arguments);
-
-    if (includer === this.app) {
-      this.compiler = new IncrementalTypescriptCompiler(this.app, this.project);
-      this.compiler.launch();
-    }
-  },
-
-  includedCommands() {
-    // If we're a direct dependency of the app, we cheat and add our instance of the blueprints
-    // addon to the project, as only top-level addons contribute blueprints. We need to be careful
-    // with the timing of when we do this, as it has to happen after addon initialization is
-    // complete, but before blueprint paths are resolved.
-    // This won't be necessary in 2.x if we shift to adding the blueprints addon as a host
-    // dependency on install.
-    if (this.project.addons.includes(this)) {
-      this.project.addons.push(this.addons.find(addon => addon.name === 'ember-cli-typescript-blueprints'));
-    }
-
-    if (this.project.isEmberCLIAddon()) {
-      return {
-        'ts:precompile': require('./lib/commands/precompile'),
-        'ts:clean': require('./lib/commands/clean'),
-      };
-    }
-  },
-
-  shouldIncludeChildAddon(addon) {
-    // For testing, we have dummy in-repo addons set up, but e-c-ts doesn't depend on them;
-    // its dummy app does. Otherwise we'd have a circular dependency.
-    return !['in-repo-a', 'in-repo-b', 'in-repo-c'].includes(addon.name);
-  },
-
-  setupPreprocessorRegistry(type, registry) {
-    if (type !== 'parent') {
-      return;
-    }
-
-    registry.add('js', {
-      name: 'ember-cli-typescript',
-      ext: 'ts',
-      toTree: (original, inputPath, outputPath) => {
-        if (!this.compiler || inputPath !== '/') {
-          return original;
-        }
-
-        let ts = new Funnel(this.compiler.treeForHost(), { destDir: outputPath });
-        return new MergeTrees([original, ts], { overwrite: true });
-      },
-    });
-  },
-
-  treeForApp() {
-    if (this.compiler) {
-      let tree = this.compiler.treeForApp();
-      return this._super.treeForApp.call(this, tree);
-    }
-  },
-
-  // We manually invoke Babel for treeForAddon and treeForAddonTestSupport
-  // rather than calling _super because we're returning content on behalf of addons that aren't
-  // ember-cli-typescript, and the _super impl would namespace all the files under our own name.
-  treeForAddon() {
-    if (this.compiler) {
-      let babel = this.project.addons.find(addon => addon.name === 'ember-cli-babel');
-      let tree = this.compiler.treeForAddons();
-      return babel.transpileTree(tree);
-    }
-  },
-
-  treeForTestSupport() {
-    let trees = [];
-    if (this.compiler) {
-      trees.push(this.compiler.treeForTests());
-      trees.push(this.compiler.treeForTestSupport());
-    }
-    return this._super.treeForTestSupport.call(this,
-      stew.mv(new MergeTrees(trees), 'test-support/*', '/')
-    );
-  },
-
-  treeForAddonTestSupport() {
-    if (this.compiler) {
-      let babel = this.project.addons.find(addon => addon.name === 'ember-cli-babel');
-      let tree = this.compiler.treeForAddonTestSupport();
-      return babel.transpileTree(tree);
-    }
-  },
-};
+  // eslint-disable-next-line node/no-unpublished-require
+  module.exports = require('./ts/addon');
+}

package.json

@@ -24,11 +24,15 @@
   "homepage": "https://github.com/typed-ember/ember-cli-typescript",
   "scripts": {
     "build": "ember build",
-    "lint:js": "eslint ./*.js addon addon-test-support app blueprints config lib server test-support tests",
+    "lint:js": "eslint --ext js,ts .",
     "start": "ember serve",
     "test": "ember test",
-    "nodetest": "mocha node-tests --recursive",
-    "test:all": "ember try:each"
+    "ci:prepare": "yarn prepublishOnly && rimraf ts",
+    "ci:test": "ember test && mocha --recursive js/tests",
+    "test:node": "mocha -r register-ts-node 'ts/tests/**/*.{ts,js}'",
+    "test:all": "ember try:each",
+    "prepublishOnly": "yarn tsc --project ts --noEmit false",
+    "postpublish": "rimraf js"
   },
   "dependencies": {
     "broccoli-funnel": "^2.0.1",
@@ -87,8 +91,11 @@
     "loader.js": "^4.2.3",
     "mktemp": "^0.4.0",
     "mocha": "^5.0.0",
+    "rimraf": "^2.6.2",
     "testdouble": "^3.5.0",
-    "typescript": "^2.7.2"
+    "ts-node": "^7.0.1",
+    "typescript": "^2.7.2",
+    "typescript-eslint-parser": "^15.0.0"
   },
   "resolutions": {
     "@types/ember": "2.8.13"

register-ts-node.js

@@ -0,0 +1,9 @@
+'use strict';
+
+// eslint-disable-next-line node/no-deprecated-api
+if (!require.extensions['.ts']) {
+  // eslint-disable-next-line node/no-unpublished-require
+  require('ts-node').register({
+    project: `${__dirname}/ts/tsconfig.json`
+  });
+}

tests/dummy/app/controllers/application.ts

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default 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,4 +1,3 @@
-import Ember from 'ember';
 import { helper } from '@ember/component/helper';
 
 export function typedHelp(/*params, hash*/) {