fix: fixing and exporting mergeMessages() (#550)

Author: pedromartello

src/i18n/index.js

@@ -104,6 +104,7 @@ export {
   getMessages,
   isRtl,
   handleRtl,
+  mergeMessages,
   LOCALE_CHANGED,
   LOCALE_TOPIC,
 } from './lib';

src/i18n/lib.js

@@ -236,12 +236,15 @@ const optionsShape = {
 /**
  *
  *
- * @param {Array} [messagesArray=[]]
+ * @param {Object} newMessages
  * @returns {Object}
  * @memberof module:Internationalization
  */
-export function mergeMessages(messagesArray = []) {
-  return Array.isArray(messagesArray) ? merge({}, ...messagesArray) : {};
+export function mergeMessages(newMessages) {
+  const msgs = Array.isArray(newMessages) ? merge({}, ...newMessages) : newMessages;
+  messages = merge(messages, msgs);
+
+  return messages;
 }
 
 /**
@@ -262,7 +265,7 @@ export function configure(options) {
   loggingService = options.loggingService;
   // eslint-disable-next-line prefer-destructuring
   config = options.config;
-  messages = Array.isArray(options.messages) ? mergeMessages(options.messages) : options.messages;
+  messages = Array.isArray(options.messages) ? merge({}, ...options.messages) : options.messages;
 
   if (config.ENVIRONMENT !== 'production') {
     Object.keys(messages).forEach((key) => {

src/i18n/lib.test.js

@@ -250,16 +250,58 @@ describe('lib', () => {
 });
 
 describe('mergeMessages', () => {
+  it('should merge objects', () => {
+    configure({
+      loggingService: { logError: jest.fn() },
+      config: {
+        ENVIRONMENT: 'production',
+        LANGUAGE_PREFERENCE_COOKIE_NAME: 'yum',
+      },
+      messages: {
+        ar: { message: 'ar-hah' },
+      },
+    });
+    const result = mergeMessages({ en: { foo: 'bar' }, de: { buh: 'baz' }, jp: { gah: 'wut' } });
+    expect(result).toEqual({
+      ar: { message: 'ar-hah' },
+      en: { foo: 'bar' },
+      de: { buh: 'baz' },
+      jp: { gah: 'wut' },
+    });
+  });
+
   it('should merge objects from an array', () => {
+    configure({
+      loggingService: { logError: jest.fn() },
+      config: {
+        ENVIRONMENT: 'production',
+        LANGUAGE_PREFERENCE_COOKIE_NAME: 'yum',
+      },
+      messages: {
+        ar: { message: 'ar-hah' },
+      },
+    });
     const result = mergeMessages([{ foo: 'bar' }, { buh: 'baz' }, { gah: 'wut' }]);
     expect(result).toEqual({
+      ar: { message: 'ar-hah' },
       foo: 'bar',
       buh: 'baz',
       gah: 'wut',
     });
   });
 
   it('should merge nested objects from an array', () => {
+    configure({
+      loggingService: { logError: jest.fn() },
+      config: {
+        ENVIRONMENT: 'production',
+        LANGUAGE_PREFERENCE_COOKIE_NAME: 'yum',
+      },
+      messages: {
+        en: { init: 'initial' },
+        es: { init: 'inicial' },
+      },
+    });
     const messages = [
       {
         en: { hello: 'hello' },
@@ -274,19 +316,45 @@ describe('mergeMessages', () => {
     const result = mergeMessages(messages);
     expect(result).toEqual({
       en: {
+        init: 'initial',
         hello: 'hello',
         goodbye: 'goodbye',
       },
       es: {
+        init: 'inicial',
         hello: 'hola',
         goodbye: 'adiós',
       },
     });
   });
 
   it('should return an empty object if no messages', () => {
+    configure({
+      loggingService: { logError: jest.fn() },
+      config: {
+        ENVIRONMENT: 'production',
+        LANGUAGE_PREFERENCE_COOKIE_NAME: 'yum',
+      },
+      messages: {},
+    });
     expect(mergeMessages(undefined)).toEqual({});
     expect(mergeMessages(null)).toEqual({});
     expect(mergeMessages([])).toEqual({});
+    expect(mergeMessages({})).toEqual({});
+  });
+
+  it('should return the original object if no messages', () => {
+    configure({
+      loggingService: { logError: jest.fn() },
+      config: {
+        ENVIRONMENT: 'production',
+        LANGUAGE_PREFERENCE_COOKIE_NAME: 'yum',
+      },
+      messages: { en: { hello: 'world ' } },
+    });
+    expect(mergeMessages(undefined)).toEqual({ en: { hello: 'world ' } });
+    expect(mergeMessages(null)).toEqual({ en: { hello: 'world ' } });
+    expect(mergeMessages([])).toEqual({ en: { hello: 'world ' } });
+    expect(mergeMessages({})).toEqual({ en: { hello: 'world ' } });
   });
 });