Add support for translations in actual addons

Author: robinborst95

.gitignore

@@ -36,6 +36,9 @@ build/Release
 node_modules/
 jspm_packages/
 
+# Include node modules used in tests
+!fixtures/**/node_modules
+
 # TypeScript v1 declaration files
 typings/
 

__snapshots__/test.js.snap

@@ -44,6 +44,20 @@ exports[`Test Fixtures emblem 1`] = `
 
 exports[`Test Fixtures emblem 2`] = `Map {}`;
 
+exports[`Test Fixtures external-addon-translations 1`] = `
+"[1/4] 🔍  Finding JS and HBS files...
+[2/4] 🔍  Searching for translations keys in JS and HBS files...
+[3/4] ⚙️   Checking for unused translations...
+[4/4] ⚙️   Checking for missing translations...
+
+ 👏  No unused translations were found!
+
+ 👏  No missing translations were found!
+"
+`;
+
+exports[`Test Fixtures external-addon-translations 2`] = `Map {}`;
+
 exports[`Test Fixtures in-repo-translations 1`] = `
 "[1/4] 🔍  Finding JS and HBS files...
 [2/4] 🔍  Searching for translations keys in JS and HBS files...

fixtures/external-addon-translations/app/controllers/application.js

@@ -0,0 +1,7 @@
+import Controller from '@ember/controller';
+
+export default class ApplicationController extends Controller {
+  get foo() {
+    return this.intl.t('js-translation');
+  }
+}

fixtures/external-addon-translations/app/templates/application.hbs

@@ -0,0 +1,3 @@
+{{t "hbs-translation"}}
+{{t "external-addon.used-by-app-translation"}}
+{{t "company.scoped-addon.used-by-app-translation"}}

fixtures/external-addon-translations/node_modules/@company/scoped-addon/templates/application.hbs

@@ -0,0 +1,2 @@
+hbs-translation: HBS!
+js-translation: JS!

fixtures/external-addon-translations/node_modules/@company/scoped-addon/translations/en.yaml

@@ -37,12 +37,15 @@ async function run(rootDir, options = {}) {
 
   log(`${step(3)} ⚙️   Checking for unused translations...`);
 
-  let translationFiles = await findTranslationFiles(rootDir);
-  let existingTranslationKeys = await analyzeTranslationFiles(rootDir, translationFiles);
+  let ownTranslationFiles = await findOwnTranslationFiles(rootDir);
+  let addonTranslationFiles = await findAddonTranslationFiles(rootDir);
+  let existingOwnTranslationKeys = await analyzeTranslationFiles(rootDir, ownTranslationFiles);
+  let existingAddonTranslationKeys = await analyzeTranslationFiles(rootDir, addonTranslationFiles);
+  let existingTranslationKeys = mergeMaps(existingOwnTranslationKeys, existingAddonTranslationKeys);
   let whitelist = config.whitelist || [];
 
   let unusedTranslations = findDifferenceInTranslations(
-    existingTranslationKeys,
+    existingOwnTranslationKeys,
     usedTranslationKeys,
     whitelist
   );
@@ -82,7 +85,7 @@ async function run(rootDir, options = {}) {
   let totalErrors = missingTranslations.size + unusedTranslations.size;
 
   if (shouldFix) {
-    removeUnusedTranslations(writeToFile, rootDir, translationFiles, unusedTranslations);
+    removeUnusedTranslations(writeToFile, rootDir, ownTranslationFiles, unusedTranslations);
     log();
     log(' 👏 All unused translations were removed');
   }
@@ -113,8 +116,15 @@ async function findInRepoFiles(cwd) {
   return globby(joinPaths(inRepoFolders, ['**/*.js', '**/*.hbs', '**/*.emblem']), { cwd });
 }
 
-async function findTranslationFiles(cwd) {
-  let inputFolders = ['', ...findInRepoPaths(cwd)];
+async function findOwnTranslationFiles(cwd) {
+  return findTranslationFiles(cwd, ['', ...findInRepoPaths(cwd)]);
+}
+
+async function findAddonTranslationFiles(cwd) {
+  return findTranslationFiles(cwd, ['node_modules/*', 'node_modules/@*/*']);
+}
+
+async function findTranslationFiles(cwd, inputFolders) {
   let translationPaths = joinPaths(inputFolders, ['translations']);
 
   return globby(joinPaths(translationPaths, ['**/*.json', '**/*.yaml', '**/*.yml']), {
@@ -388,4 +398,19 @@ function getNestedAttribute(parent, keys) {
   return attribute;
 }
 
+function mergeMaps(mapA, mapB) {
+  let resultMap = new Map([...mapA]);
+
+  for (let [key, bFiles] of mapB) {
+    if (!resultMap.has(key)) {
+      resultMap.set(key, bFiles);
+    } else {
+      let aFiles = resultMap.get(key);
+      resultMap.set(key, new Set([...aFiles, ...bFiles]));
+    }
+  }
+
+  return resultMap;
+}
+
 module.exports = { run, generateFileList };