experimental: fix devtools-if (#450)

* experimental: fix devtools-if * fix: unit tests
intlify · Apr 10, 2021 · 57cdea8 · 57cdea8
1 parent 78c823d
commit 57cdea8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/packages/core-base/src/devtools.ts b/packages/core-base/src/devtools.ts
@@ -22,7 +22,7 @@ export function initI18nDevTools(
 ): void {
   // TODO: queue if devtools is undefined
   devtools &&
-    devtools.emit(IntlifyDevToolsHooks.I18N_INIT, {
+    devtools.emit(IntlifyDevToolsHooks.I18nInit, {
       timestamp: Date.now(),
       i18n,
       version,
@@ -31,7 +31,7 @@ export function initI18nDevTools(
 }
 
 export const translateDevTools = /* #__PURE__*/ createDevToolsHook(
-  IntlifyDevToolsHooks.FUNCTION_TRANSLATE
+  IntlifyDevToolsHooks.FunctionTranslate
 )
 
 function createDevToolsHook(hook: IntlifyDevToolsHooks) {

diff --git a/packages/core-base/test/devtools.test.ts b/packages/core-base/test/devtools.test.ts
@@ -23,7 +23,7 @@ afterEach(() => {
 
 test('initI18nDevTools', () => {
   const fn = jest.fn()
-  devtools!.on(IntlifyDevToolsHooks.I18N_INIT, fn)
+  devtools!.on(IntlifyDevToolsHooks.I18nInit, fn)
 
   const meta = { framework: 'Vue' }
   const ctx = createCoreContext({
@@ -46,7 +46,7 @@ test('initI18nDevTools', () => {
 describe('translateDevTools', () => {
   test('basic', () => {
     const fn = jest.fn()
-    devtools!.on(IntlifyDevToolsHooks.FUNCTION_TRANSLATE, fn)
+    devtools!.on(IntlifyDevToolsHooks.FunctionTranslate, fn)
 
     const meta = { __INTLIFY_META__: 'xxx', framework: 'Vue' }
     const HELLO = 'Hello {name}!'
@@ -73,7 +73,7 @@ describe('translateDevTools', () => {
 
   test('fallback', () => {
     const fn = jest.fn()
-    devtools!.on(IntlifyDevToolsHooks.FUNCTION_TRANSLATE, fn)
+    devtools!.on(IntlifyDevToolsHooks.FunctionTranslate, fn)
 
     const HELLO = 'やあ　{name}！'
     const ctx = createCoreContext({

diff --git a/packages/devtools-if/src/index.ts b/packages/devtools-if/src/index.ts
@@ -7,22 +7,24 @@ export interface IntlifyRecord {
   types: Record<string, string | Symbol> // TODO
 }
 
-export const enum IntlifyDevToolsHooks {
-  I18N_INIT = 'i18n:init',
-  FUNCTION_TRANSLATE = 'function:translate'
-}
+export const IntlifyDevToolsHooks = {
+  I18nInit: 'i18n:init',
+  FunctionTranslate: 'function:translate'
+} as const
 
 export type AdditionalPayloads = {
   meta?: Record<string, unknown>
 }
 
+export type IntlifyDevToolsHooks = typeof IntlifyDevToolsHooks[keyof typeof IntlifyDevToolsHooks]
+
 export type IntlifyDevToolsHookPayloads = {
-  [IntlifyDevToolsHooks.I18N_INIT]: {
+  [IntlifyDevToolsHooks.I18nInit]: {
     timestamp: number
     i18n: unknown // TODO:
     version: string
   } & AdditionalPayloads
-  [IntlifyDevToolsHooks.FUNCTION_TRANSLATE]: {
+  [IntlifyDevToolsHooks.FunctionTranslate]: {
     timestamp: number
     message: string | number
     key: string
@@ -32,8 +34,8 @@ export type IntlifyDevToolsHookPayloads = {
 }
 
 export type IntlifyDevToolsEmitterHooks = {
-  [IntlifyDevToolsHooks.I18N_INIT]: IntlifyDevToolsHookPayloads[IntlifyDevToolsHooks.I18N_INIT]
-  [IntlifyDevToolsHooks.FUNCTION_TRANSLATE]: IntlifyDevToolsHookPayloads[IntlifyDevToolsHooks.FUNCTION_TRANSLATE]
+  [IntlifyDevToolsHooks.I18nInit]: IntlifyDevToolsHookPayloads[typeof IntlifyDevToolsHooks.I18nInit]
+  [IntlifyDevToolsHooks.FunctionTranslate]: IntlifyDevToolsHookPayloads[typeof IntlifyDevToolsHooks.FunctionTranslate]
 }
 
 export type IntlifyDevToolsEmitter = Emittable<IntlifyDevToolsEmitterHooks>
diff --git a/packages/vue-i18n/test/i18n.test.ts b/packages/vue-i18n/test/i18n.test.ts
@@ -867,8 +867,8 @@ test('Intlify devtools hooking', () => {
 
   const fnI18nInit = jest.fn()
   const fnTranslate = jest.fn()
-  emitter.on(IntlifyDevToolsHooks.I18N_INIT, fnI18nInit)
-  emitter.on(IntlifyDevToolsHooks.FUNCTION_TRANSLATE, fnTranslate)
+  emitter.on(IntlifyDevToolsHooks.I18nInit, fnI18nInit)
+  emitter.on(IntlifyDevToolsHooks.FunctionTranslate, fnTranslate)
 
   const i18n = createI18n({
     locale: 'en',