Modernize legacy module mapping service

Author: sivakumar-kailasam

app/routes/application.js

@@ -6,13 +6,13 @@ import getCompactVersion from 'ember-api-docs/utils/get-compact-version';
 
 export default Route.extend({
   headData: service(),
-  legacyModuleMappings: service(),
 
   title(tokens) {
     let [version, entity] = tokens;
     if (!entity) {
       entity = 'Ember';
     }
+
     if (version) {
       const compactVersion = getCompactVersion(version);
       const title = `${[entity, compactVersion].join(' - ')} - Ember API Documentation`;
@@ -21,10 +21,9 @@ export default Route.extend({
     }
     return '';
   },
+
   async afterModel() {
     set(this, 'headData.cdnDomain', ENV.API_HOST);
-    await this.legacyModuleMappings.initMappings();
     return this._super(...arguments);
   }
-
 });

app/services/legacy-module-mappings.js

@@ -1,99 +1,82 @@
-import fetch from 'fetch';
 import Service from '@ember/service';
+import rfcMappings from 'ember-rfc176-data';
+import { computed } from '@ember/object';
 
-const LOCALNAME_CONVERSIONS = {
+const LOCAL_NAME_CONVERSIONS = {
   Object: 'EmberObject',
   Array: 'EmberArray',
   Error: 'EmberError'
 };
 
 export default Service.extend({
-
-  async initMappings() {
+  mappings: computed(function() {
     try {
-      let response = await this.fetch();
-      let mappings = await response.json();
-      let newMappings = this.buildMappings(mappings);
-      this.set('mappings', newMappings);
+      return rfcMappings.map(item => {
+        let newItem = Object.assign({}, item);
+        if (LOCAL_NAME_CONVERSIONS[newItem.localName]) {
+          newItem.localName = LOCAL_NAME_CONVERSIONS[newItem.localName];
+        }
+        return newItem;
+      });
     } catch (e) {
-      this.set('mappings', []);
+      return [];
     }
-  },
-
-  buildMappings(mappings) {
-    return mappings.map(item => {
-      let newItem = Object.assign({}, item);
-      if (LOCALNAME_CONVERSIONS[newItem.localName]) {
-        newItem.localName = LOCALNAME_CONVERSIONS[newItem.localName];
-      }
-      return newItem;
-    });
-  },
-
-  fetch() {
-    return fetch('/assets/mappings.json');
-  },
+  }),
 
   getModule(name, documentedModule) {
     if (!this.mappings) {
       return '';
     }
-    let matches = this.mappings.filter(element => element.localName === name);
-    return matches.length > 0 ? matches[0].module : documentedModule;
+
+    let match = this.mappings.find(element => element.localName === name);
+    return match ? match.module : documentedModule;
   },
 
   getNewClassFromOld(oldClassName, mappings) {
-    let matches = mappings.filter(element => element.global === oldClassName);
-    if (matches.length > 0) {
-      if (matches[0].localName) {
+    let match = mappings.find(element => element.global === oldClassName);
+
+    if (match) {
+      if (match.localName) {
         return {
           itemType: 'class',
-          newModule: matches[0].module,
-          newName: matches[0].localName
-        }
+          newModule: match.module,
+          newName: match.localName
+        };
       } else {
         return {
           itemType: 'function',
-          newModule: matches[0].module,
-          newName: matches[0].export
-        }
+          newModule: match.module,
+          newName: match.export
+        };
       }
-
     } else {
       return {
         itemType: 'class',
         newName: oldClassName
-      }
+      };
     }
   },
 
   getNewModuleFromOld(oldModuleName, mappings) {
-    let matches = mappings.filter(element => element.module === oldModuleName);
-    if (matches.length > 0) {
-      return {
-        module: matches[0].replacement.module
-      };
-    } else {
-      return {
-        module: oldModuleName
-      };
-    }
+    let match = mappings.find(element => element.module === oldModuleName);
+    return { module: match ? match.replacement.module : oldModuleName };
   },
 
-
-  hasFunctionMapping(name, module) {
+  hasFunctionMapping(name, moduleName) {
     if (!this.mappings) {
       return false;
     }
-    let filtered = this.mappings.filter(element => element.export === name && element.module === module);
-    return filtered.length > 0;
+
+    return Boolean(
+      this.mappings.find(element => element.export === name && element.module === moduleName)
+    );
   },
 
   hasClassMapping(name) {
     if (!this.mappings) {
       return false;
     }
-    return this.mappings.filter(element => element.localName === name).length > 0;
-  }
 
+    return Boolean(this.mappings.find(element => element.localName === name));
+  }
 });

ember-cli-build.js

@@ -1,8 +1,6 @@
 'use strict';
 
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');
-const Funnel = require('broccoli-funnel');
-const mergeTrees  = require('broccoli-merge-trees');
 
 module.exports = function(defaults) {
   let app = new EmberApp(defaults, {
@@ -11,10 +9,7 @@ module.exports = function(defaults) {
       generateAssetMap: true
     },
     sassOptions: {
-      includePaths: [
-        'app/styles',
-        'node_modules/normalize.css'
-      ]
+      includePaths: ['app/styles', 'node_modules/normalize.css']
     },
     autoprefixer: {
       overrideBrowsersList: ['default']
@@ -23,20 +18,15 @@ module.exports = function(defaults) {
       only: ['join', 'map-by']
     },
     'asset-cache': {
-      version: '4', //Might have to change this with the app build,
+      version: '4' //Might have to change this with the app build,
     },
     svgJar: {
       sourceDirs: ['public/assets/images']
     },
     'ember-cli-babel': {
-      includePolyfill: true,
-    },
+      includePolyfill: true
+    }
   });
 
-  let mappingsTree = new Funnel('node_modules/ember-rfc176-data/', {
-    srcDir: '/',
-    include: ['mappings.json'],
-    destDir: '/assets/'
-  });
-  return mergeTrees([app.toTree(), mappingsTree]);
+  return app.toTree();
 };

package.json

@@ -23,7 +23,7 @@
   "dependencies": {
     "bourbon": "5.1.0",
     "ember-cli-browserstack": "^1.0.1",
-    "ember-rfc176-data": "^0.3.5",
+    "ember-rfc176-data": "^0.3.12",
     "express-sslify": "^1.2.0",
     "lodash.groupby": "^4.6.0",
     "lodash.last": "^3.0.0",
@@ -40,8 +40,6 @@
     "@ember/optional-features": "^0.6.3",
     "algoliasearch": "^3.32.1",
     "broccoli-asset-rev": "^3.0.0",
-    "broccoli-funnel": "^2.0.1",
-    "broccoli-merge-trees": "^2.0.0",
     "ember-a11y-testing": "^0.5.4",
     "ember-anchor": "~0.2.0",
     "ember-auto-import": "^1.2.21",