From 9135a59a350bc1efd46be217daccbab5b3754ca3 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Fri, 14 Apr 2017 01:35:39 +0900
Subject: [PATCH] :zap: improvement: change to method from computed property

Closes #141
---
 src/extend.js  | 18 +++++++++++++++++
 src/index.js   | 19 +++++++++++++++++-
 src/install.js |  2 ++
 src/mixin.js   | 53 ++++++++++----------------------------------------
 4 files changed, 48 insertions(+), 44 deletions(-)
 create mode 100644 src/extend.js

diff --git a/src/extend.js b/src/extend.js
new file mode 100644
index 000000000..750b6a165
--- /dev/null
+++ b/src/extend.js
@@ -0,0 +1,18 @@
+/* @flow */
+
+export default function extend (Vue: any): void {
+  Vue.prototype.$t = function (key: Path, ...values: any): TranslateResult {
+    const i18n = this.$i18n
+    return i18n._t(key, i18n.locale, i18n.messages, this, ...values)
+  }
+
+  Vue.prototype.$tc = function (key: Path, choice?: number, ...values: any): TranslateResult {
+    const i18n = this.$i18n
+    return i18n._tc(key, i18n.locale, i18n.messages, this, choice, ...values)
+  }
+
+  Vue.prototype.$te = function (key: Path, locale?: Locale): boolean {
+    const i18n = this.$i18n
+    return i18n._te(key, i18n.locale, i18n.messages, [locale])
+  }
+}
diff --git a/src/index.js b/src/index.js
index 8e3728ad8..ea7c5661b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -19,6 +19,7 @@ export default class VueI18n {
   _missing: ?MissingHandler
   _exist: Function
   _watcher: any
+  _i18nWatcher: Function
   _silentTranslationWarn: boolean
 
   constructor (options: I18nOptions = {}) {
@@ -54,11 +55,27 @@ export default class VueI18n {
     Vue.config.silent = silent
   }
 
-  watchLocale (): any {
+  watchI18nData (fn: Function): Function {
+    this._i18nWatcher = this._vm.$watch('$data', () => {
+      fn && fn()
+    }, { deep: true })
+    return this._i18nWatcher
+  }
+
+  unwatchI18nData (): boolean {
+    if (this._i18nWatcher) {
+      this._i18nWatcher()
+      delete this._i18nWatcher
+    }
+    return true
+  }
+
+  watchLocale (fn: Function): ?Function {
     if (!this._sync || !this._root) { return null }
     const target: any = this._vm
     this._watcher = this._root.vm.$watch('locale', (val) => {
       target.$set(target, 'locale', val)
+      fn && fn()
     }, { immediate: true })
     return this._watcher
   }
diff --git a/src/install.js b/src/install.js
index 335ee2ebe..8ee04a6ee 100644
--- a/src/install.js
+++ b/src/install.js
@@ -1,4 +1,5 @@
 import { warn } from './util'
+import extend from './extend'
 import mixin from './mixin'
 
 export let Vue
@@ -22,6 +23,7 @@ export function install (_Vue) {
     get () { return this._i18n }
   })
 
+  extend(Vue)
   Vue.mixin(mixin)
 
   // use object-based merge strategy
diff --git a/src/mixin.js b/src/mixin.js
index 63c86f646..9ca1185a2 100644
--- a/src/mixin.js
+++ b/src/mixin.js
@@ -3,44 +3,6 @@
 import VueI18n from './index'
 import { isPlainObject, warn } from './util'
 
-const $t = (vm: any): Function => {
-  // add dependency tracking !!
-  const locale: Locale = vm.$i18n.locale
-  /* eslint-disable no-unused-vars */
-  const fallback: Locale = vm.$i18n.fallbackLocal
-  /* eslint-enable no-unused-vars */
-  const messages: LocaleMessages = vm.$i18n.vm.messages
-  return (key: string, ...values: any): TranslateResult => {
-    return vm.$i18n._t(key, locale, messages, vm, ...values)
-  }
-}
-const $tc = (vm: any): Function => {
-  // add dependency tracking !!
-  const locale: Locale = vm.$i18n.locale
-  /* eslint-disable no-unused-vars */
-  const fallback: Locale = vm.$i18n.fallbackLocal
-  /* eslint-enable no-unused-vars */
-  const messages: LocaleMessages = vm.$i18n.vm.messages
-  return (key: string, choice?: number, ...values: any): TranslateResult => {
-    return vm.$i18n._tc(key, locale, messages, vm, choice, ...values)
-  }
-}
-const $te = (vm: any): Function => {
-  // add dependency tracking !!
-  const _locale: Locale = vm.$i18n.locale
-  const messages: LocaleMessages = vm.$i18n.vm.messages
-  return (key: string, locale?: Locale): boolean => {
-    return vm.$i18n._te(key, _locale, messages, [locale])
-  }
-}
-
-function defineComputed (vm: any, options: any): void {
-  options.computed = options.computed || {}
-  options.computed.$t = () => $t(vm)
-  options.computed.$tc = () => $tc(vm)
-  options.computed.$te = () => $te(vm)
-}
-
 export default {
   beforeCreate (): void {
     const options: any = this.$options
@@ -49,7 +11,7 @@ export default {
     if (options.i18n) {
       if (options.i18n instanceof VueI18n) {
         this._i18n = options.i18n
-        defineComputed(this, options)
+        this._i18nWatcher = this._i18n.watchI18nData(() => this.$forceUpdate())
       } else if (isPlainObject(options.i18n)) {
         // component local i18n
         if (this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n) {
@@ -69,10 +31,10 @@ export default {
         }
 
         this._i18n = new VueI18n(options.i18n)
-        defineComputed(this, options)
+        this._i18nWatcher = this._i18n.watchI18nData(() => this.$forceUpdate())
 
         if (options.i18n.sync === undefined || !!options.i18n.sync) {
-          this._localeWatcher = this.$i18n.watchLocale()
+          this._localeWatcher = this.$i18n.watchLocale(() => this.$forceUpdate())
         }
       } else {
         if (process.env.NODE_ENV !== 'production') {
@@ -82,15 +44,20 @@ export default {
     } else if (this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n) {
       // root i18n
       this._i18n = this.$root.$i18n
-      defineComputed(this, options)
+      this._i18nWatcher = this._i18n.watchI18nData(() => this.$forceUpdate())
     }
   },
 
   beforeDestroy (): void {
     if (!this._i18n) { return }
 
+    if (this._i18nWatcher) {
+      this._i18n.unwatchI18nData()
+      delete this._i18nWatcher
+    }
+
     if (this._localeWatcher) {
-      this.$i18n.unwatchLocale()
+      this._i18n.unwatchLocale()
       delete this._localeWatcher
     }