Merge pull request #45 from emberwatch/latest-b-c-ts

Update to (beta of) latest broccoli-typescript-compiler

Author: chriskrycho

blueprints/ember-cli-typescript/files/tsconfig.json

@@ -1,18 +1,21 @@
 {
   "compilerOptions": {
-    "target": "ES6",
+    "target": "es2017",
     "allowJs": true,
     "moduleResolution": "node",
     "noEmitOnError": false,
     "noEmit": true,
+    "sourceMap": true,
     "baseUrl": ".",
     "paths": {
       "<%= dasherizedPackageName %>/tests/*": ["tests/*"],
       "<%= dasherizedPackageName %>/*": ["app/*"]
     }
   },
-  "include": [
-    "app/**/*",
-    "tests/**/*"
+  "exclude": [
+    "tmp",
+    "dist",
+    "node_modules",
+    "bower_components"
   ]
 }

blueprints/ember-cli-typescript/index.js

@@ -1,16 +1,18 @@
-var path = require('path');
+/* eslint-env node */
+
+const path = require('path');
 
 module.exports = {
   description: 'Initialize files needed for typescript compilation',
 
-  files: function() {
+  files() {
     return [
       path.join(this.path, 'files', 'tsconfig.json'),
-      path.join(this.path, 'files', 'app', 'config', 'environment.d.ts')
+      path.join(this.path, 'files', 'app', 'config', 'environment.d.ts'),
     ];
   },
 
-  mapFile: function() {
+  mapFile() {
     const result = this._super.mapFile.apply(this, arguments);
 
     const tsconfigPattern = `${path.sep}tsconfig.json`;
@@ -24,15 +26,16 @@ module.exports = {
     }
   },
 
-  normalizeEntityName: function() {
+  normalizeEntityName() {
     // Entity name is optional right now, creating this hook avoids an error.
   },
 
-  afterInstall: function() {
+  afterInstall() {
     return this.addPackagesToProject([
-      { name: 'typescript', target: '^2.1' },
-      { name: '@types/ember', target: '^2.7.41' },
-      { name: '@types/rsvp', target: '^3.3.0' }
+      { name: 'typescript', target: '^2.4.2' },
+      { name: '@types/ember', target: '^2.7.43' },
+      { name: '@types/rsvp', target: '^3.3.0' },
+      { name: '@types/ember-testing-helpers' },
     ]);
-  }
-}
+  },
+};

index.js

@@ -1,13 +1,9 @@
 /* eslint-env node */
 
-'use strict';
-var path      = require('path');
-var process = require('process');
-
 let TsPreprocessor;
 try {
   TsPreprocessor = require('./lib/typescript-preprocessor');
-} catch ( ex ) {
+} catch (ex) {
   // Do nothing; we just won't have the plugin available. This means that if you
   // somehow end up in a state where it doesn't load, the preprocessor *will*
   // fail, but this is necessary because the preprocessor depends on packages
@@ -17,30 +13,23 @@ try {
 module.exports = {
   name: 'ember-cli-typescript',
 
-
-  included: function(app) {
-    this._super.included.apply(this, arguments);
-    this.app = app;
-
-  },
-
-  blueprintsPath: function() {
-    return path.join(__dirname, 'blueprints');
-  },
-
-  setupPreprocessorRegistry: function(type, registry) {
+  setupPreprocessorRegistry(type, registry) {
     if (!TsPreprocessor) {
-      console.log("Note: TypeScript preprocessor not available -- some dependencies not installed. (If this is during installation of the add-on, this is as expected. If it is while building, serving, or testing the application, this is an error.)");
+      this.ui.write(
+        'Note: TypeScript preprocessor not available -- some dependencies not installed. ' +
+          '(If this is during installation of the add-on, this is as expected. If it is ' +
+          'while building, serving, or testing the application, this is an error.)'
+      );
       return;
     }
 
     try {
-      var plugin = new TsPreprocessor({includeExtensions: ['.ts','.js']});
-      registry.add('js', plugin);
-    } catch ( ex ) {
-      console.log( "Missing or invalid tsconfig.json, please fix or run `ember generate ember-cli-typescript`." );
-      console.log( '  ' + ex.toString());
+      registry.add('js', new TsPreprocessor());
+    } catch (ex) {
+      this.ui.write(
+        'Missing or invalid tsconfig.json, please fix or run `ember generate ember-cli-typescript`.'
+      );
+      this.ui.write('  ' + ex.toString());
     }
-  }
-
+  },
 };

lib/typescript-preprocessor.js

@@ -1,102 +1,59 @@
+/* eslint-env node */
 const fs = require('fs');
 const path = require('path');
 
 const debug = require('debug')('ember-cli-typescript');
-const find = require('broccoli-stew').find;
-const Funnel = require("broccoli-funnel");
-const MergeTrees = require("broccoli-merge-trees");
-const ts = require('typescript');
+const funnel = require('broccoli-funnel');
+const mergeTrees = require('broccoli-merge-trees');
 const tsc = require('broccoli-typescript-compiler').typescript;
-const UnwatchedDir = require('broccoli-source').UnwatchedDir;
 
-function readConfig(configFile) {
-  const result = ts.readConfigFile(configFile, ts.sys.readFile);
-  if (result.error) {
-    const message = ts.flattenDiagnosticMessageText(result.error.messageText, "\n");
-    throw new Error(message);
-  }
-  return result.config;
-}
-
-/**
- * Return the paths which contain type information.
- */
-function typePaths(config) {
-  const base = ["node_modules/@types"];
-
-  const cfgPaths = (config.compilerOptions && config.compilerOptions.paths) || {};
+const BroccoliDebug = require('broccoli-debug');
 
-  const toTypePaths = paths => (splitPaths, key) => {
-    // paths may end in a `/*`; keep everything before it
-    const upToSlashStar = path => path.split("/\*")[0];
-
-    // only store unique paths
-    const notAlreadyStoredIn = storedPaths => path => !storedPaths.includes(path);
-
-    const newPaths = paths[key]
-      .map(upToSlashStar)
-      .filter(notAlreadyStoredIn(splitPaths));
-
-    return splitPaths.concat(newPaths);
-  };
-
-  const out = Object.keys(cfgPaths).reduce(toTypePaths(cfgPaths), base);
-  debug("type paths", out);
-  return out;
-}
+let tag = 0;
 
 class TypeScriptPreprocessor {
   constructor(options) {
-    debug('creating new instance with options ', options);
     this.name = 'ember-cli-typescript';
-    this.ext = 'ts';
-    this.options = JSON.parse(JSON.stringify(options));
+    this._tag = tag++;
+
+    // Update the config for how Broccoli handles the file system: no need for
+    // includes, always emit, and let Broccoli manage any outDir.
+    this.config = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'tsconfig.json')));
+    this.config.compilerOptions.noEmit = false;
+    delete this.config.compilerOptions.outDir;
+    delete this.config.include;
   }
 
   toTree(inputNode, inputPath, outputPath) {
-    const tsconfig = readConfig(path.join(".", "tsconfig.json"));
-
-    // The `include` setting is meant for the IDE integration; broccoli manages
-    // manages its own input files.
-    tsconfig.include = ["**/*.ts"];
-
-    // tsc needs to emit files on the broccoli pipeline, but not in the default
-    // config. Otherwise its compiled `.js` files may be created inadvertently.
-    tsconfig.compilerOptions.noEmit = false;
-    delete tsconfig.compilerOptions.outDir;
-
-    // Create a funnel with the type files used by the typescript compiler.
-    // These will change infrequently (read: usually not at all) so grab each as
-    // an *unwatched* directory, and return it at the proper location.
-    const typeTrees = typePaths(tsconfig).map((typePath) => {
-      const typeTree = new UnwatchedDir(typePath);
-      return new Funnel(typeTree, { destDir: typePath });
-    });
-
-    const types = new MergeTrees(typeTrees);
-
-    // Passthrough all the javascript files existing in the source/test folders.
-    const passthrough = new Funnel(inputNode, {
-      exclude: ["**/*.ts"],
-      annotation: "TypeScript passthrough"
+    const js = funnel(inputNode, {
+      exclude: ['**/*.ts'],
+      annotation: 'JS files',
     });
 
-    // Files to run through the typescript compiler.
-    const filter = new MergeTrees([
-      types,
-      new Funnel(inputNode, {
-        include: ["**/*.ts"],
-        annotation: "TypeScript input"
-      })
-    ]);
+    const debugTree = BroccoliDebug.buildDebugCallback('ember-cli-typescript');
+
+    const uncompiledTs = debugTree(
+      funnel(inputNode, {
+        include: ['**/*.ts'],
+        annotation: 'uncompiled TS files',
+      }),
+      `${this._tag}`
+    );
+
+    const ts = debugTree(
+      tsc(uncompiledTs, {
+        throwOnError: !this.config.compilerOptions.noEmitOnError,
+        annotation: 'Compiled TS files',
+        include: ['**/*'],
+        tsconfig: this.config,
+      }),
+      `${this._tag}`
+    );
 
     // Put everything together.
-    return new MergeTrees([
-      passthrough,
-      tsc(filter, { tsconfig })
-    ], {
+    return mergeTrees([js, ts], {
       overwrite: true,
-      annotation: "TypeScript passthrough + ouput"
+      annotation: 'merged JS & compiled TS',
     });
   }
 }

package.json

@@ -1,14 +1,15 @@
 {
   "name": "ember-cli-typescript",
-  "version": "0.4.0",
+  "version": "1.0.0-beta.1",
   "description": "Allow ember apps to use typescript files.",
   "keywords": [
     "ember-addon",
     "typescript"
   ],
   "license": "MIT",
-  "author": "Marius Seritan",
+  "author": "Chris Krycho <[email protected]> (http://www.chriskrycho.com)",
   "contributors": [
+    "Marius Seritan",
     "David Gardiner",
     "Philip Bjorge"
   ],
@@ -27,17 +28,18 @@
     "test": "ember try:each"
   },
   "dependencies": {
+    "broccoli-debug": "^0.6.3",
     "broccoli-funnel": "^1.0.6",
     "broccoli-merge-trees": "^1.1.4",
     "broccoli-plugin": "^1.2.1",
     "broccoli-source": "^1.1.0",
     "broccoli-stew": "^1.4.0",
-    "broccoli-typescript-compiler": "^1.0.1",
+    "broccoli-typescript-compiler": "^2.0.0",
     "debug": "^2.2.0",
     "ember-cli-babel": "^6.3.0"
   },
   "devDependencies": {
-    "@types/ember": "^2.7.34",
+    "@types/ember": "^2.7.43",
     "broccoli-asset-rev": "^2.4.5",
     "ember-cli": "^2.13.3",
     "ember-cli-app-version": "^2.0.0",
@@ -57,11 +59,10 @@
     "ember-resolver": "^4.0.0",
     "ember-source": "~2.13.3",
     "loader.js": "^4.2.3",
-    "typescript": "^2.4.1"
+    "typescript": "^2.4.2"
   },
   "peerDependencies": {
-    "@types/ember": "^2.7.34",
-    "typescript": "^2.4.1"
+    "typescript": "^2.4.2"
   },
   "engines": {
     "node": "^4.5 || 6.* || >= 7.*"

tsconfig.json

@@ -8,6 +8,6 @@
     "paths": {}
   },
   "include": [
-    "app/**/*"
+    "**/*"
   ]
 }