Moved callback implementation, added test

Author: markdegrootnl

src/index.ts

@@ -158,13 +158,7 @@ export class I18n {
    * Loads the language.
    */
   load(): void {
-    const lang = this.getActiveLanguage()
-    if (isServer) {
-      this.loadLanguage(lang)
-      this.options.onLoad(lang)
-    } else {
-      this.loadLanguageAsync(lang).then(this.options.onLoad)
-    }
+    this[isServer ? 'loadLanguage' : 'loadLanguageAsync'](this.getActiveLanguage())
   }
 
   /**
@@ -312,6 +306,7 @@ export class I18n {
       }
     }
 
+    this.options.onLoad(lang)
     return lang
   }
 

test/class.test.ts

@@ -68,3 +68,19 @@ it('allows resetting all data', async () => {
     expect(i18n.getActiveLanguage()).toBe('en')
     expect(i18n.trans('Welcome!')).toBe('Welcome!')
 })
+
+it('calls onLoad when loaded', async () => {
+    const onLoadFunction = jest.fn()
+
+    const i18n = new I18n({
+        lang: 'pt',
+        resolve: lang => import(`./fixtures/lang/${lang}.json`),
+        onLoad: onLoadFunction
+    })
+
+    await i18n.loadLanguageAsync('en')
+
+    expect(onLoadFunction).toHaveBeenCalledTimes(2)
+    expect(onLoadFunction).toHaveBeenCalledWith('en')
+    expect(onLoadFunction).toHaveBeenCalledWith('pt')
+})