🆙 update: fix squeezer

Author: kazupon

src/squeezer.ts

@@ -9,25 +9,29 @@ const debug = Debug('vue-i18n-locale-message:squeezer')
 export default function sqeeze (basePath: string, files: SFCFileInfo[]): LocaleMessages {
   const descriptors = reflectSFCDescriptor(basePath, files)
 
-  const messages: LocaleMessages = {}
-  descriptors.forEach(descriptor => {
+  return descriptors.reduce((messages, descriptor) => {
     const blockMessages = squeezeFromI18nBlock(descriptor.customBlocks)
     const locales = Object.keys(blockMessages)
-    const collects: LocaleMessages = locales.reduce((messages, locale) => {
-      const ret = descriptor.hierarchy.reduce((messages, key) => {
-        return Object.assign({}, { [key]: messages })
-      }, blockMessages[locale])
-      return Object.assign(messages, { [locale]: ret })
-    }, {})
-    debug('collects', collects)
-
-    locales.forEach(locale => {
-      messages[locale] = messages[locale] || {}
-      messages[locale] = Object.assign(messages[locale], collects[locale])
-    })
-  })
-
-  return messages
+    return locales.reduce((messages, locale) => {
+      if (!messages[locale]) {
+        messages[locale] = {}
+      }
+      const localeMessages = messages[locale]
+      const localeBlockMessages = blockMessages[locale]
+      let target: any = localeMessages
+      const hierarchy = descriptor.hierarchy.concat()
+      while (hierarchy.length >= 0) {
+        const key = hierarchy.shift()
+        if (!key) { break }
+        if (!target[key]) {
+          target[key] = {}
+        }
+        target = target[key]
+      }
+      Object.assign(target, localeBlockMessages)
+      return messages
+    }, messages)
+  }, {} as LocaleMessages)
 }
 
 function squeezeFromI18nBlock (blocks: SFCBlock[]): LocaleMessages {

test/__snapshots__/squeezer.test.ts.snap

@@ -6,15 +6,13 @@ Object {
     "App": Object {
       "title": "Application",
     },
-    "Modal": Object {
-      "components": Object {
+    "components": Object {
+      "Modal": Object {
         "cancel": "Cancel",
         "ok": "OK",
       },
-    },
-    "RankingTable": Object {
       "nest": Object {
-        "components": Object {
+        "RankingTable": Object {
           "headers": Object {
             "name": "Name",
             "rank": "Rank",
@@ -28,37 +26,37 @@ Object {
     "App": Object {
       "title": "アプリケーション",
     },
-    "Login": Object {
-      "pages": Object {
+    "components": Object {
+      "Modal": Object {
+        "cancel": "キャンセル",
+        "ok": "OK",
+      },
+    },
+    "pages": Object {
+      "Login": Object {
         "button": "ログイン",
         "confirm": "パスワードの確認入力",
         "id": "ユーザーID",
         "passowrd": "パスワード",
       },
     },
-    "Modal": Object {
-      "components": Object {
-        "cancel": "キャンセル",
-        "ok": "OK",
-      },
-    },
   },
 }
 `;
 
 exports[`json5 1`] = `
 Object {
   "en": Object {
-    "Modal": Object {
-      "components": Object {
+    "components": Object {
+      "Modal": Object {
         "cancel": "Cancel",
         "ok": "OK",
       },
     },
   },
   "ja": Object {
-    "Modal": Object {
-      "components": Object {
+    "components": Object {
+      "Modal": Object {
         "cancel": "キャンセル",
         "ok": "OK",
       },
@@ -70,16 +68,16 @@ Object {
 exports[`yaml 1`] = `
 Object {
   "en": Object {
-    "Modal": Object {
-      "components": Object {
+    "components": Object {
+      "Modal": Object {
         "cancel": "Cancel",
         "ok": "OK",
       },
     },
   },
   "ja": Object {
-    "Modal": Object {
-      "components": Object {
+    "components": Object {
+      "Modal": Object {
         "cancel": "キャンセル",
         "ok": "OK",
       },