fix(prepareTemplates): uses templates with keys that are not in defaults

Author: Alexandre Stanislawski

src/lib/__tests__/utils-test.js

@@ -89,10 +89,9 @@ describe('prepareTemplateProps', function() {
     bar: 'tata'
   };
   let templatesConfig = [];
-  let transformData = function() {};
+  let transformData = function() {}; // eslint-disable-line func-style
 
-  it(
-    'should return the default templates and set useCustomCompileOptions to false when using the defaults',
+  it('should return the default templates and set useCustomCompileOptions to false when using the defaults',
     function() {
       let defaultsPrepared = utils.prepareTemplateProps({
         transformData,
@@ -108,8 +107,7 @@ describe('prepareTemplateProps', function() {
     }
   );
 
-  it(
-    'should return the missing default templates and set useCustomCompileOptions to true when for the customs',
+  it('should return the missing default templates and set useCustomCompileOptions for the custom template',
     function() {
       let templates = {foo: 'baz'};
       let defaultsPrepared = utils.prepareTemplateProps({
@@ -125,6 +123,26 @@ describe('prepareTemplateProps', function() {
       expect(defaultsPrepared.templatesConfig).toBe(templatesConfig);
     }
   );
+
+  it('should add also the templates that are not in the defaults', () => {
+    const templates = {
+      foo: 'something else',
+      baz: 'Of course!'
+    };
+
+    const preparedProps = utils.prepareTemplateProps({
+      transformData,
+      defaultTemplates,
+      templates,
+      templatesConfig
+    });
+
+
+    expect(preparedProps.transformData).toBe(transformData);
+    expect(preparedProps.useCustomCompileOptions).toEqual({foo: true, bar: false, baz: true});
+    expect(preparedProps.templates).toEqual({...defaultTemplates, ...templates});
+    expect(preparedProps.templatesConfig).toBe(templatesConfig);
+  });
 });
 
 describe('getRefinements', function() {

src/lib/utils.js

@@ -3,6 +3,8 @@ import forEach from 'lodash/collection/forEach';
 import find from 'lodash/collection/find';
 import get from 'lodash/object/get';
 import isEmpty from 'lodash/lang/isEmpty';
+import keys from 'lodash/object/keys';
+import uniq from 'lodash/array/uniq';
 
 let utils = {
   getContainerNode,
@@ -112,16 +114,17 @@ function prepareTemplateProps({
   };
 }
 
-function prepareTemplates(defaultTemplates, templates) {
-  return reduce(defaultTemplates, (config, defaultTemplate, key) => {
-    let isCustomTemplate = templates && templates[key] !== undefined && (templates[key] !== defaultTemplate);
-    if (isCustomTemplate) {
-      config.templates[key] = templates[key];
-      config.useCustomCompileOptions[key] = true;
-    } else {
-      config.templates[key] = defaultTemplate;
-      config.useCustomCompileOptions[key] = false;
-    }
+function prepareTemplates(defaultTemplates = [], templates = []) {
+  const allKeys = uniq([...(keys(defaultTemplates)), ...(keys(templates))]);
+
+  return reduce(allKeys, (config, key) => {
+    const defaultTemplate = defaultTemplates[key];
+    const customTemplate = templates[key];
+    const isCustomTemplate = customTemplate !== undefined && (customTemplate !== defaultTemplate);
+
+    config.templates[key] = isCustomTemplate ? customTemplate : defaultTemplate;
+    config.useCustomCompileOptions[key] = isCustomTemplate;
+
     return config;
   }, {templates: {}, useCustomCompileOptions: {}});
 }