⭐ new: support locale attr for i18n custom blocks

closes #11

Author: kazupon

lib/index.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var querystring_1 = require("querystring");
 var loader = function (source) {
     if (this.version && Number(this.version) >= 2) {
         try {
             this.cacheable && this.cacheable();
-            this.callback(null, "module.exports = " + generateCode(source));
+            this.callback(null, "module.exports = " + generateCode(source, querystring_1.parse(this.resourceQuery)));
         }
         catch (err) {
             this.emitError(err.message);
@@ -17,11 +18,20 @@ var loader = function (source) {
         this.callback(new Error(message));
     }
 };
-function generateCode(source) {
+function generateCode(source, query) {
+    var _a;
     var code = '';
     var value = typeof source === 'string'
         ? JSON.parse(source)
-        : source;
+        : Buffer.isBuffer(source)
+            ? JSON.parse(source.toString())
+            : null;
+    if (value === null) {
+        throw new Error('invalid source!');
+    }
+    if (query.locale && typeof query.locale === 'string') {
+        value = Object.assign({}, (_a = {}, _a[query.locale] = value, _a));
+    }
     value = JSON.stringify(value)
         .replace(/\u2028/g, '\\u2028')
         .replace(/\u2029/g, '\\u2029')

src/index.ts

@@ -1,10 +1,12 @@
 import webpack from 'webpack'
+import { ParsedUrlQuery, parse } from 'querystring'
 
 const loader: webpack.loader.Loader = function (source: string | Buffer): void {
+
   if (this.version && Number(this.version) >= 2) {
     try {
       this.cacheable && this.cacheable()
-      this.callback(null, `module.exports = ${generateCode(source)}`)
+      this.callback(null, `module.exports = ${generateCode(source, parse(this.resourceQuery))}`)
     } catch (err) {
       this.emitError(err.message)
       this.callback(err)
@@ -16,12 +18,20 @@ const loader: webpack.loader.Loader = function (source: string | Buffer): void {
   }
 }
 
-function generateCode (source: string | Buffer): string {
+function generateCode (source: string | Buffer, query: ParsedUrlQuery): string {
   let code = ''
 
   let value = typeof source === 'string'
     ? JSON.parse(source)
-    : source
+    : Buffer.isBuffer(source)
+      ? JSON.parse(source.toString())
+      : null
+  if (value === null) { throw new Error('invalid source!') }
+
+  if (query.locale && typeof query.locale === 'string') {
+    value = Object.assign({}, { [query.locale]: value })
+  }
+
   value = JSON.stringify(value)
     .replace(/\u2028/g, '\\u2028')
     .replace(/\u2029/g, '\\u2029')

test/__snapshots__/index.test.ts.snap

@@ -12,6 +12,25 @@ Array [
 ]
 `;
 
+exports[`locale attr 1`] = `
+Array [
+  "{\\"ja\\":{\\"hello\\":\\"こんにちは、世界！\\"}}",
+]
+`;
+
+exports[`locale attr and basic 1`] = `
+Array [
+  "{\\"en\\":{\\"hello\\":\\"hello world!\\"}}",
+  "{\\"ja\\":{\\"hello\\":\\"こんにちは、世界！\\"}}",
+]
+`;
+
+exports[`locale attr and import 1`] = `
+Array [
+  "{\\"en\\":{\\"hello\\":\\"hello world!\\"}}",
+]
+`;
+
 exports[`multiple 1`] = `
 Array [
   "{\\"en\\":{\\"hello\\":\\"hello world!\\"}}",

test/fixtures/locale-import.vue

@@ -0,0 +1,2 @@
+<i18n locale="en" src="./locale.json">
+</i18n>

test/fixtures/locale-mix.vue

@@ -0,0 +1,13 @@
+<i18n>
+{
+  "en": {
+    "hello": "hello world!"
+  }
+}
+</i18n>
+
+<i18n locale="ja">
+{
+  "hello": "こんにちは、世界！"
+}
+</i18n>

test/fixtures/locale.json

@@ -0,0 +1,3 @@
+{
+  "hello": "hello world!"
+}

test/fixtures/locale.vue

@@ -0,0 +1,5 @@
+<i18n locale="ja">
+{
+  "hello": "こんにちは、世界！"
+}
+</i18n>

test/index.test.ts

@@ -19,3 +19,18 @@ test('import', async () => {
   const { module } = await bundleAndRun('import.vue')
   expect(module.__i18n).toMatchSnapshot()
 })
+
+test('locale attr', async () => {
+  const { module } = await bundleAndRun('locale.vue')
+  expect(module.__i18n).toMatchSnapshot()
+})
+
+test('locale attr and basic', async () => {
+  const { module } = await bundleAndRun('locale-mix.vue')
+  expect(module.__i18n).toMatchSnapshot()
+})
+
+test('locale attr and import', async () => {
+  const { module } = await bundleAndRun('locale-import.vue')
+  expect(module.__i18n).toMatchSnapshot()
+})

yarn.lock

@@ -3887,9 +3887,9 @@ [email protected]:
   integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
 
 lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.2.1:
-  version "4.17.14"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
-  integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
 loose-envify@^1.0.0:
   version "1.4.0"