fix: te fallback to root (#1613)

intlify · Oct 27, 2023 · d85b11a · d85b11a
1 parent 605df05
commit d85b11a
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 5 deletions.
diff --git a/packages/core-base/src/runtime.ts b/packages/core-base/src/runtime.ts
@@ -38,7 +38,11 @@ export type FallbackLocale =
   | { [locale in string]: Locale[] }
   | false
 
-export type CoreMissingType = 'translate' | 'datetime format' | 'number format'
+export type CoreMissingType =
+  | 'translate'
+  | 'datetime format'
+  | 'number format'
+  | 'translate exists'
 
 export type MessageType<T = string> = T extends string
   ? string

diff --git a/packages/vue-i18n-core/src/composer.ts b/packages/vue-i18n-core/src/composer.ts
@@ -1763,6 +1763,7 @@ export interface ComposerInternal {
 type ComposerWarnType = CoreMissingType
 
 const NOOP_RETURN_ARRAY = () => []
+const NOOP_RETURN_FALSE = () => false
 
 let composerID = 0
 
@@ -2173,7 +2174,12 @@ export function createComposer(options: any = {}, VueI18nLegacy?: any): any {
         _context.fallbackContext = undefined
       }
     }
-    if (isNumber(ret) && ret === NOT_REOSLVED) {
+    if (
+      (warnType !== 'translate exists' && // for not `te` (e.g `t`)
+        isNumber(ret) &&
+        ret === NOT_REOSLVED) ||
+      (warnType === 'translate exists' && !ret) // for `te`
+    ) {
       const [key, arg2] = argumentParser()
       if (
         __DEV__ &&
@@ -2341,6 +2347,30 @@ export function createComposer(options: any = {}, VueI18nLegacy?: any): any {
 
   // te
   function te(key: Path, locale?: Locale): boolean {
+    return wrapWithDeps<{}, boolean>(
+      () => {
+        if (!key) {
+          return false
+        }
+        const targetLocale = isString(locale) ? locale : _locale.value
+        const message = getLocaleMessage(targetLocale)
+        const resolved = _context.messageResolver(message, key)
+        return (
+          isMessageAST(resolved) ||
+          isMessageFunction(resolved) ||
+          isString(resolved)
+        )
+      },
+      () => [key],
+      'translate exists',
+      root => {
+        console.log('root ... te')
+        return Reflect.apply(root.te, root, [key, locale])
+      },
+      NOOP_RETURN_FALSE,
+      val => isBoolean(val)
+    )
+    /*
     if (!key) {
       return false
     }
@@ -2352,6 +2382,7 @@ export function createComposer(options: any = {}, VueI18nLegacy?: any): any {
       isMessageFunction(resolved) ||
       isString(resolved)
     )
+    */
   }
 
   function resolveMessages(key: Path): LocaleMessageValue<Message> | null {

diff --git a/packages/vue-i18n-core/test/composer.test.ts b/packages/vue-i18n-core/test/composer.test.ts
@@ -1299,6 +1299,16 @@ describe('tm', () => {
 })
 
 test('te', async () => {
+  const __root = createComposer({
+    locale: 'en',
+    messages: {
+      en: {
+        message: {
+          fallback: 'fallback'
+        }
+      }
+    }
+  })
   const { te } = createComposer({
     locale: 'en',
     messages: {
@@ -1307,12 +1317,14 @@ test('te', async () => {
           hello: 'Hello!'
         }
       }
-    }
+    },
+    __root
   })
 
   expect(te('message.hello')).toEqual(true)
-  expect(te('message.hallo')).toEqual(false)
-  expect(te('message.hallo', 'ja' as any)).toEqual(false)
+  expect(te('message.fallback')).toEqual(true) // fallback
+  expect(te('message.hallo')).toEqual(false) // missing for 'en' and 'ja'
+  expect(te('message.hallo', 'ja' as any)).toEqual(false) // missing for 'ja'
 
   expect(te(null as any)).toEqual(false)
   expect(te(undefined as any)).toEqual(false)