Update tsconfig.json on in-repo-addon generate/destroy

Author: jamescdavis

blueprints/ember-cli-typescript/index.js

@@ -2,6 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const updatePathsForAddon = require('../../lib/utilities/update-paths-for-addon');
 
 const APP_DECLARATIONS = `
 import Ember from 'ember';
@@ -62,10 +63,7 @@ module.exports = {
         }
 
         for (let addon of inRepoAddons) {
-          let addonName = path.basename(addon);
-          paths[addonName] = [`${addon}/addon`];
-          paths[`${addonName}/*`] = [`${addon}/addon/*`];
-          paths[`${appName}/*`].push(`${addon}/app/*`);
+          updatePathsForAddon(paths, path.basename(addon), appName);
         }
 
         paths['*'] = ['types/*'];

blueprints/in-repo-addon/index.js

@@ -5,6 +5,7 @@ const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const Blueprint = require('ember-cli/lib/models/blueprint'); // eslint-disable-line node/no-unpublished-require
 const stringifyAndNormalize = require('ember-cli/lib/utilities/stringify-and-normalize'); // eslint-disable-line node/no-unpublished-require
+const updatePathsForAddon = require('../../lib/utilities/update-paths-for-addon');
 
 module.exports = {
   description: 'The blueprint for addon in repo ember-cli addons.',
@@ -21,10 +22,12 @@ module.exports = {
 
   afterInstall(options) {
     this._generatePackageJson(options, true);
+    this._updateTsconfigJson(options, true);
   },
 
   afterUninstall(options) {
     this._generatePackageJson(options, false);
+    this._updateTsconfigJson(options, false);
   },
 
   _generatePackageJson(options, isInstall) {
@@ -55,6 +58,32 @@ module.exports = {
     this._writeFileSync(packagePath, stringifyAndNormalize(contents));
   },
 
+  _updateTsconfigJson(options, isInstall) {
+    const tsconfigPath = path.join(this.project.root, 'tsconfig.json');
+    const addonName = stringUtil.dasherize(options.entity.name);
+    const appName = this.project.isEmberCLIAddon() ? 'dummy' : this.project.name();
+    const addonPath = ['lib', addonName].join('/');
+    let contents = this._readJsonSync(tsconfigPath);
+    contents['compilerOptions'] = contents['compilerOptions'] || {};
+    contents['include'] = contents['include'] || [];
+    let paths = contents['compilerOptions']['paths'];
+
+    if (isInstall) {
+      updatePathsForAddon(paths, addonName, appName);
+      if (contents['include'].indexOf(addonPath) === -1) {
+        contents['include'].push(addonPath);
+      }
+    } else {
+      updatePathsForAddon(paths, addonName, appName, { removePaths: true });
+      let addonPathIndex = contents['include'].indexOf(addonPath);
+      if (addonPathIndex > -1) {
+        contents['include'].splice(addonPathIndex, 1);
+      }
+    }
+
+    this._writeFileSync(tsconfigPath, stringifyAndNormalize(contents));
+  },
+
   _readJsonSync(path) {
     return fs.readJsonSync(path);
   },

lib/utilities/update-paths-for-addon.js

@@ -0,0 +1,38 @@
+'use strict';
+
+module.exports = function(paths, addonName, appName, options) {
+  options = options || {};
+  const addonNameStar = [addonName, '*'].join('/');
+  const addonPath = [options.isLinked ? 'node_modules' : 'lib', addonName].join('/');
+  const addonAddonPath = [addonPath, 'addon'].join('/');
+  const addonAppPath = [addonPath, 'app'].join('/');
+  const appNameStar = [appName, '*'].join('/');
+  let appStarPaths;
+  paths = paths || {};
+  appStarPaths = paths[appNameStar] = paths[appNameStar] || [];
+
+  if (options.removePaths) {
+    if (paths.hasOwnProperty(addonName)) {
+      delete paths[addonName];
+    }
+    if (paths.hasOwnProperty(addonNameStar)) {
+      delete paths[addonNameStar]
+    }
+    let addonAppPathIndex = appStarPaths.indexOf([addonAppPath, '*'].join('/'));
+    if (addonAppPathIndex > -1) {
+      appStarPaths.splice(addonAppPathIndex, 1);
+      paths[appNameStar] = appStarPaths;
+    }
+  } else {
+    if (!paths.hasOwnProperty(addonName)) {
+      paths[addonName] = [ addonAddonPath ];
+    }
+    if (!paths.hasOwnProperty(addonNameStar)) {
+      paths[addonNameStar] = [ [addonAddonPath, '*'].join('/') ];
+    }
+    if (appStarPaths.indexOf(addonAppPath) === -1) {
+      appStarPaths.push([addonAppPath, '*'].join('/'));
+      paths[appNameStar] = appStarPaths;
+    }
+  }
+}

node-tests/blueprints/in-repo-addon-test.js

@@ -17,8 +17,16 @@ describe('Acceptance: ember generate and destroy in-repo-addon', function() {
 
   it('in-repo-addon fooBar', function() {
     let args = ['in-repo-addon', 'fooBar'];
+    let name, nameStar;
 
     return emberNew()
+      .then(function() {
+        name = fs.readJsonSync('package.json')['name'];
+        nameStar = [name, '*'].join('/');
+      })
+      .then(function() {
+        return emberGenerate(['ember-cli-typescript']);
+      })
       .then(function() {
         expect(fs.readJsonSync('package.json')['ember-addon']).to.be.undefined;
       })
@@ -41,6 +49,12 @@ describe('Acceptance: ember generate and destroy in-repo-addon', function() {
             "lib/foo-bar",
           ],
         });
+
+        const tsconfigJson = fs.readJsonSync('tsconfig.json');
+        expect(tsconfigJson['compilerOptions']['paths']['foo-bar']).to.have.all.members(['lib/foo-bar/addon']);
+        expect(tsconfigJson['compilerOptions']['paths']['foo-bar/*']).to.have.all.members(['lib/foo-bar/addon/*']);
+        expect(tsconfigJson['compilerOptions']['paths'][nameStar]).to.include.members(['lib/foo-bar/app/*']);
+        expect(tsconfigJson['include']).to.include.members(['lib/foo-bar']);
       })
       .then(function() {
         return emberDestroy(args);
@@ -50,6 +64,12 @@ describe('Acceptance: ember generate and destroy in-repo-addon', function() {
         expect(file('lib/foo-bar/index.js')).to.not.exist;
 
         expect(fs.readJsonSync('package.json')['ember-addon']['paths']).to.be.undefined;
+
+        const tsconfigJson = fs.readJsonSync('tsconfig.json');
+        expect(tsconfigJson['compilerOptions']['paths']['foo-bar']).to.be.undefined;
+        expect(tsconfigJson['compilerOptions']['paths']['foo-bar/*']).to.be.undefined;
+        expect(tsconfigJson['compilerOptions']['paths'][nameStar]).to.not.include.members(['lib/foo-bar/app/*']);
+        expect(tsconfigJson['include']).to.not.include.members(['lib/foo-bar']);
       });
   });
 });
@@ -64,6 +84,8 @@ describe('Unit: in-repo-addon blueprint', function() {
     blueprint = require('../../blueprints/in-repo-addon');
     blueprint.project = {
       root: 'test-project-root',
+      isEmberCLIAddon: function() { return false; },
+      name: function() { return 'foo-bar'; },
     };
 
     options = {