👕 more more refactoring

Author: kazupon

src/index.ts

@@ -1,9 +1,7 @@
-import reflectSFCDescriptor from './reflector'
 import squeeze from './squeezer'
 import infuse from './infuser'
 
 export {
-  reflectSFCDescriptor,
   squeeze,
   infuse
 }

src/reflector.ts

@@ -1,18 +1,20 @@
-import { SFCDescriptor, SFCBlock } from 'vue-template-compiler'
-import { LocaleMessages } from '../types'
-import { parseContent } from './utils'
+import { SFCBlock } from 'vue-template-compiler'
+import { LocaleMessages, SFCFileInfo } from '../types'
+
+import { reflectSFCDescriptor, parseContent } from './utils'
 
 import { debug as Debug } from 'debug'
 const debug = Debug('vue-i18n-locale-message:squeezer')
 
-export default function sqeeze (meta: SFCDescriptor[]): LocaleMessages {
-  const messages: LocaleMessages = {}
+export default function sqeeze (basePath: string, files: SFCFileInfo[]): LocaleMessages {
+  const descriptors = reflectSFCDescriptor(basePath, files)
 
-  meta.forEach(target => {
-    const blockMessages = squeezeFromI18nBlock(target.customBlocks)
+  const messages: LocaleMessages = {}
+  descriptors.forEach(descriptor => {
+    const blockMessages = squeezeFromI18nBlock(descriptor.customBlocks)
     const locales = Object.keys(blockMessages)
     const collects: LocaleMessages = locales.reduce((messages, locale) => {
-      const ret = target.hierarchy.reduce((messages, key) => {
+      const ret = descriptor.hierarchy.reduce((messages, key) => {
         return Object.assign({}, { [key]: messages })
       }, blockMessages[locale])
       return Object.assign(messages, { [locale]: ret })

src/squeezer.ts

@@ -1,6 +1,48 @@
+import { SFCDescriptor } from 'vue-template-compiler'
+import { SFCFileInfo } from '../types'
+import { VueTemplateCompiler } from '@vue/component-compiler-utils/dist/types'
+
+import { parse } from '@vue/component-compiler-utils'
+import * as compiler from 'vue-template-compiler'
+import path from 'path'
 import JSON5 from 'json5'
 import yaml from 'js-yaml'
 
+import { debug as Debug } from 'debug'
+const debug = Debug('vue-i18n-locale-message:utils')
+
+export function reflectSFCDescriptor (basePath: string, components: SFCFileInfo[]): SFCDescriptor[] {
+  return components.map(target => {
+    const { template, script, styles, customBlocks } = parse({
+      source: target.content,
+      filename: target.path,
+      compiler: compiler as VueTemplateCompiler
+    }) as SFCDescriptor
+    return {
+      ...parsePath(basePath, target.path),
+      raw: target.content,
+      customBlocks,
+      template,
+      script,
+      styles
+    }
+  })
+}
+
+function parsePath (basePath: string, targetPath: string) {
+  const { dir, name } = path.parse(targetPath)
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const [_, target] = dir.split(basePath)
+  const parsedTargetPath = target.split(path.sep)
+  parsedTargetPath.shift()
+  debug(`parsePath: contentPath = ${targetPath}, component = ${name}, messageHierarchy = ${parsedTargetPath}`)
+  return {
+    contentPath: targetPath,
+    component: name,
+    hierarchy: [...parsedTargetPath, name]
+  }
+}
+
 export function parseContent (content: string, lang: string): any {
   switch (lang) {
     case 'yaml':

src/utils.ts

@@ -13,8 +13,7 @@ export default {}
   "en": { "title": "Application" },
   "ja": { "title": "アプリケーション" }
 }
-</i18n>
-  `
+</i18n>`
 }, {
   path: '/path/to/project1/src/components/Modal.vue',
   content: `<template>
@@ -37,8 +36,7 @@ export default {}
   "ok": "OK",
   "cancel": "キャンセル"
 }
-</i18n>
-  `
+</i18n>`
 }, {
   path: '/path/to/project1/src/components/nest/RankingTable.vue',
   content: `<template>
@@ -57,8 +55,7 @@ export default {}
     "score": "Score"
   }
 }
-</i18n>
-  `
+</i18n>`
 }, {
   path: '/path/to/project1/src/pages/Login.vue',
   content: `<template>
@@ -78,6 +75,5 @@ export default {}
     "button": "ログイン"
   }
 }
-</i18n>
-`
+</i18n>`
 }]

test/fixtures/meta.ts renamed to test/fixtures/file/json.ts

@@ -0,0 +1,25 @@
+export default [{
+  path: '/path/to/project1/src/components/Modal.vue',
+  content: `<template>
+  <p>template</p>
+</template>
+
+<script>
+export default {}
+</script>
+
+<i18n lang="json5" locale="en">
+{
+  // modal contents
+  "ok": "OK",
+  cancel: "Cancel"
+}
+</i18n>
+
+<i18n locale="ja">
+{
+  "ok": "OK",
+  "cancel": "キャンセル"
+}
+</i18n>`
+}]

test/fixtures/file/json5.ts

@@ -0,0 +1,20 @@
+export default [{
+  path: '/path/to/project1/src/components/Modal.vue',
+  content: `<template>
+  <p>template</p>
+</template>
+
+<script>
+export default {}
+</script>
+
+<i18n lang="yaml" locale="en">
+  ok: OK
+  cancel: Cancel
+</i18n>
+
+<i18n lang="yml" locale="ja">
+  ok: OK
+  cancel: キャンセル
+</i18n>`
+}]