Merge pull request #9 from charlybrown03/feature-add-locale-import

kazupon · web-flow · commit fde106fd9a49 · 2020-05-11T10:30:40.000+09:00
Feature add locale import
diff --git a/lib/generate.js b/lib/generate.js
@@ -3,6 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
 const json5_1 = __importDefault(require("json5"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const debug_1 = require("debug");
@@ -11,12 +13,14 @@ exports.VUE_OPTIONS = '__vue__options__';
 exports.VUE_I18N_OPTION = '__i18n';
 const defaultLang = 'json';
 const debug = debug_1.debug('vue-i18n-jest');
-function generate(blocks) {
+function generate(blocks, sourcePath) {
     const base = `${exports.VUE_OPTIONS}.${exports.VUE_I18N_OPTION} = []`;
     const codes = blocks.map(block => {
         if (block.type === 'i18n') {
             const lang = (block.attrs && block.attrs.lang) || defaultLang;
-            // const lang = block.attrs?lang ?? defaultLang
+            block.content = (block.attrs && block.attrs.src)
+                ? fs_1.default.readFileSync(getAbsolutePath(block, sourcePath)).toString()
+                : block.content;
             const data = convert(block.content, lang);
             const value = JSON.stringify(JSON.parse(data))
                 .replace(/\u2028/g, '\\u2028')
@@ -44,3 +48,8 @@ function convert(source, lang) {
             return source;
     }
 }
+function getAbsolutePath(block, sourcePath) {
+    if (path_1.default.isAbsolute(block.attrs.src))
+        return block.attrs.src;
+    return path_1.default.join(path_1.default.dirname(sourcePath), block.attrs.src);
+}
diff --git a/lib/transform.js b/lib/transform.js
@@ -25,7 +25,7 @@ function jestProcess(sourceText, sourcePath, config, options) {
     const { customBlocks } = vue_template_compiler_1.parseComponent(sourceText, { pad: true });
     let coding = ';\n';
     if (customBlocks) {
-        coding += generate_1.default(customBlocks);
+        coding += generate_1.default(customBlocks, sourcePath);
     }
     const retCode = code + coding;
     debug('process', retCode);
diff --git a/src/generate.ts b/src/generate.ts
@@ -1,3 +1,6 @@
+import path from 'path'
+import fs from 'fs'
+
 import JSON5 from 'json5'
 import yaml from 'js-yaml'
 import { debug as Debug } from 'debug'
@@ -12,13 +15,17 @@ const defaultLang = 'json'
 
 const debug = Debug('vue-i18n-jest')
 
-export default function generate (blocks: SFCBlock[]) {
+export default function generate (blocks: SFCBlock[], sourcePath: string) {
   const base = `${VUE_OPTIONS}.${VUE_I18N_OPTION} = []`
   const codes = blocks.map(block => {
     if (block.type === 'i18n') {
       const lang = (block.attrs && block.attrs.lang) || defaultLang
       // const lang = block.attrs?lang ?? defaultLang
-      const data = convert(block.content, lang)
+      const content = (block.attrs && block.attrs.src)
+        ? fs.readFileSync(getAbsolutePath(block, sourcePath)).toString()
+        : block.content
+
+      const data = convert(content, lang)
       const value = JSON.stringify(JSON.parse(data))
         .replace(/\u2028/g, '\\u2028')
         .replace(/\u2029/g, '\\u2029')
@@ -45,3 +52,8 @@ function convert (source: string, lang: string): string {
       return source
   }
 }
+
+function getAbsolutePath (block: SFCBlock, sourcePath: string): string {
+  if (path.isAbsolute(block.attrs.src)) return block.attrs.src
+  return path.join(path.dirname(sourcePath), block.attrs.src)
+}
diff --git a/src/transform.ts b/src/transform.ts
@@ -43,7 +43,7 @@ function jestProcess (
 
   let coding = ';\n'
   if (customBlocks) {
-    coding += generate(customBlocks)
+    coding += generate(customBlocks, sourcePath)
   }
 
   const retCode = code + coding
diff --git a/test/__snapshots__/generate.test.ts.snap b/test/__snapshots__/generate.test.ts.snap
@@ -10,12 +10,27 @@ exports[`generate: json.vue 1`] = `
 __vue__options__.__i18n.push('{\\"ja\\":{\\"hello\\":\\"こんにちは！\\"},\\"en\\":{\\"hello\\":\\"hello!\\"}}')"
 `;
 
+exports[`generate: json-locale-import.vue 1`] = `
+"__vue__options__.__i18n = []
+__vue__options__.__i18n.push('{\\"ja\\":{\\"hello\\":\\"こんにちは！\\"},\\"en\\":{\\"hello\\":\\"hello!\\"}}')"
+`;
+
 exports[`generate: json5.vue 1`] = `
 "__vue__options__.__i18n = []
 __vue__options__.__i18n.push('{\\"ja\\":{\\"hello\\":\\"こんにちは！\\"},\\"en\\":{\\"hello\\":\\"hello!\\"}}')"
 `;
 
+exports[`generate: json5-locale-import.vue 1`] = `
+"__vue__options__.__i18n = []
+__vue__options__.__i18n.push('{\\"ja\\":{\\"hello\\":\\"こんにちは！\\"},\\"en\\":{\\"hello\\":\\"hello!\\"}}')"
+`;
+
 exports[`generate: yaml.vue 1`] = `
 "__vue__options__.__i18n = []
 __vue__options__.__i18n.push('{\\"ja\\":{\\"hello\\":\\"こんにちは！\\"},\\"en\\":{\\"hello\\":\\"hello!\\"}}')"
 `;
+
+exports[`generate: yaml-locale-import.vue 1`] = `
+"__vue__options__.__i18n = []
+__vue__options__.__i18n.push('{\\"ja\\":{\\"hello\\":\\"こんにちは！\\"},\\"en\\":{\\"hello\\":\\"hello!\\"}}')"
+`;
diff --git a/test/fixtures/json-locale-import.vue b/test/fixtures/json-locale-import.vue
@@ -0,0 +1,10 @@
+<template>
+  <p>hello!</p>
+</template>
+
+<script>
+export default {
+}
+</script>
+
+<i18n src="./locale.json"></i18n>
diff --git a/test/fixtures/json5-locale-import.vue b/test/fixtures/json5-locale-import.vue
@@ -0,0 +1,10 @@
+<template>
+  <p>hello!</p>
+</template>
+
+<script>
+export default {
+}
+</script>
+
+<i18n lang="json5" src="./locale.json5"></i18n>
diff --git a/test/fixtures/locale.json b/test/fixtures/locale.json
@@ -0,0 +1,8 @@
+{
+  "ja": {
+    "hello": "こんにちは！"
+  },
+  "en": {
+    "hello": "hello!"
+  }
+}
diff --git a/test/fixtures/locale.json5 b/test/fixtures/locale.json5
@@ -0,0 +1,8 @@
+{
+  ja: {
+    hello: "こんにちは！"
+  },
+  "en": {
+    "hello": "hello!"
+  }
+}
diff --git a/test/fixtures/locale.yml b/test/fixtures/locale.yml
@@ -0,0 +1,4 @@
+ja:
+  hello: こんにちは！
+en:
+  hello: hello!
diff --git a/test/fixtures/yaml-locale-import.vue b/test/fixtures/yaml-locale-import.vue
@@ -0,0 +1,10 @@
+<template>
+  <p>hello!</p>
+</template>
+
+<script>
+export default {
+}
+</script>
+
+<i18n lang="yaml" src="./locale.yml"></i18n>
diff --git a/test/generate.test.ts b/test/generate.test.ts
@@ -3,16 +3,29 @@ import * as path from 'path'
 import { parseComponent } from 'vue-template-compiler'
 import generate from '../src/generate'
 
-const files = ['default.vue', 'json.vue', 'yaml.vue', 'json5.vue']
-const targets = files.map(file => ({
-  content: fs.readFileSync(path.resolve(__dirname, `./fixtures/${file}`)).toString(),
-  file
-}))
+const files = [
+  'default.vue',
+  'json.vue',
+  'yaml.vue',
+  'json5.vue',
+  'json-locale-import.vue',
+  'json5-locale-import.vue',
+  'yaml-locale-import.vue'
+]
+const targets = files.map(file => {
+  const sourcePath = path.resolve(__dirname, `./fixtures/${file}`)
+
+  return {
+    content: fs.readFileSync(sourcePath).toString(),
+    sourcePath,
+    file
+  }
+})
 
 test('generate', () => {
   targets.forEach(target => {
     const { customBlocks } = parseComponent(target.content, { pad: true })
-    const code = generate(customBlocks)
+    const code = generate(customBlocks, target.sourcePath)
     expect(code).toMatchSnapshot(target.file)
   })
 })

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ function jestProcess(sourceText, sourcePath, config, options) {`
`25`	`25`	`const { customBlocks } = vue_template_compiler_1.parseComponent(sourceText, { pad: true });`
`26`	`26`	`let coding = ';\n';`
`27`	`27`	`if (customBlocks) {`
`28`		`- coding += generate_1.default(customBlocks);`
	`28`	`+ coding += generate_1.default(customBlocks, sourcePath);`
`29`	`29`	`}`
`30`	`30`	`const retCode = code + coding;`
`31`	`31`	`debug('process', retCode);`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ function jestProcess (`
`43`	`43`
`44`	`44`	`let coding = ';\n'`
`45`	`45`	`if (customBlocks) {`
`46`		`- coding += generate(customBlocks)`
	`46`	`+ coding += generate(customBlocks, sourcePath)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`const retCode = code + coding`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +{
 +  "ja": {
 +    "hello": "こんにちは！"
 +  },
 +  "en": {
 +    "hello": "hello!"
 +  }
 +}