From 5ada5beed32009f18bf27a529d68e9b73c6bfe54 Mon Sep 17 00:00:00 2001
From: Christian Kaisermann <christian@kaisermann.me>
Date: Wed, 20 Nov 2019 01:32:54 -0300
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20testing=20partial=20loa?=
 =?UTF-8?q?ding=20and=20merging?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierrc                           |  2 +-
 example/messages/en.json              | 10 ++++++++++
 example/src/i18n.js                   | 11 +++++------
 example/src/routes/_layout.svelte     |  8 ++++----
 example/src/routes/about/index.svelte | 18 +++++++-----------
 test/client/index.test.ts             | 22 ++++++++++++++++------
 test/fixtures/en.json                 |  3 +++
 test/fixtures/partials/en.json        |  5 +++++
 yarn.lock                             |  5 +++++
 9 files changed, 56 insertions(+), 28 deletions(-)
 create mode 100644 example/messages/en.json
 create mode 100644 test/fixtures/partials/en.json

diff --git a/.prettierrc b/.prettierrc
index 279ffd9..beaab0d 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,7 +1,7 @@
 {
   "semi": false,
   "printWidth": 100,
-  "trailingComma": "all",
+  "trailingComma": "es5",
   "bracketSpacing": true,
   "jsxBracketSameLine": false,
   "singleQuote": true
diff --git a/example/messages/en.json b/example/messages/en.json
new file mode 100644
index 0000000..fb80aae
--- /dev/null
+++ b/example/messages/en.json
@@ -0,0 +1,10 @@
+{
+  "title": {
+    "index": "Sapper project template!"
+  },
+  "messages": {
+    "success": "Great success!",
+    "high_five": "High five",
+    "try_editing": "Try editing this file (src/routes/index.svelte) to test live reloading."
+  }
+}
diff --git a/example/src/i18n.js b/example/src/i18n.js
index 6c272fc..d6ebe1e 100644
--- a/example/src/i18n.js
+++ b/example/src/i18n.js
@@ -1,7 +1,6 @@
-import { dictionary } from 'svelte-i18n'
+import { registerLocaleLoader } from 'svelte-i18n'
 
-dictionary.set({
-  'pt-BR': () => import('../messages/pt-BR.json'),
-  'en-US': () => import('../messages/en-US.json'),
-  'es-ES': () => import('../messages/es-ES.json'),
-})
+registerLocaleLoader('en', () => import('../messages/en.json'))
+registerLocaleLoader('pt-BR', () => import('../messages/pt-BR.json'))
+registerLocaleLoader('en-US', () => import('../messages/en-US.json'))
+registerLocaleLoader('es-ES', () => import('../messages/es-ES.json'))
diff --git a/example/src/routes/_layout.svelte b/example/src/routes/_layout.svelte
index 5d8c826..9234774 100644
--- a/example/src/routes/_layout.svelte
+++ b/example/src/routes/_layout.svelte
@@ -30,16 +30,16 @@
   }
 </style>
 
-<Lang let:loading>
-  {loading}
-</Lang>
+<Lang let:loading>{loading}</Lang>
 
 <Nav {segment} />
 
 <main>
   <select bind:value={$locale}>
     {#each $locales as locale}
-      <option value={locale}>{localeLabels[locale]}</option>
+      {#if locale in localeLabels}
+        <option value={locale}>{localeLabels[locale]}</option>
+      {/if}
     {/each}
   </select>
   <slot />
diff --git a/example/src/routes/about/index.svelte b/example/src/routes/about/index.svelte
index 7310b21..2c112d5 100644
--- a/example/src/routes/about/index.svelte
+++ b/example/src/routes/about/index.svelte
@@ -1,12 +1,12 @@
 <script context="module">
-  // import { partial } from 'svelte-i18n'
+  import { registerLocaleLoader, flushLocaleQueue } from 'svelte-i18n'
+
+  registerLocaleLoader('en-US', () => import('./_locales/en-US.json'))
+  registerLocaleLoader('pt-BR', () => import('./_locales/pt-BR.json'))
+  registerLocaleLoader('es-ES', () => import('./_locales/es-ES.json'))
 
   export async function preload() {
-    // return partial({
-    //   'en-US': () => import('./_locales/en-US.json'),
-    //   'pt-BR': () => import('./_locales/pt-BR.json'),
-    //   'es-ES': () => import('./_locales/es-ES.json'),
-    // })
+    return flushLocaleQueue()
   }
 </script>
 
@@ -20,8 +20,4 @@
 
 <h1>{$_('about_this_site', { default: 'About this site' })}</h1>
 
-<p>
-  {$_('about_content[0]', {
-    default: "This is the 'about' page. There's not much here.",
-  })}
-</p>
+<p>{$_('about_content[0]', { default: "This is the 'about' page. There's not much here." })}</p>
diff --git a/test/client/index.test.ts b/test/client/index.test.ts
index da89a17..cbbec40 100644
--- a/test/client/index.test.ts
+++ b/test/client/index.test.ts
@@ -7,6 +7,8 @@ import {
   addCustomFormats,
   customFormats,
   preloadLocale,
+  registerLocaleLoader,
+  flushLocaleQueue,
 } from '../../src/client'
 
 global.Intl = require('intl')
@@ -16,12 +18,13 @@ let currentLocale: string
 
 const dict = {
   en: require('../fixtures/en.json'),
-  'en-GB': () => import('../fixtures/en-GB.json'),
-  pt: () => import('../fixtures/pt.json'),
-  'pt-BR': () => import('../fixtures/pt-BR.json'),
-  'pt-PT': () => import('../fixtures/pt-PT.json'),
 }
 
+registerLocaleLoader('en-GB', () => import('../fixtures/en-GB.json'))
+registerLocaleLoader('pt', () => import('../fixtures/pt.json'))
+registerLocaleLoader('pt-BR', () => import('../fixtures/pt-BR.json'))
+registerLocaleLoader('pt-PT', () => import('../fixtures/pt-PT.json'))
+
 format.subscribe(formatFn => {
   _ = formatFn
 })
@@ -29,7 +32,6 @@ dictionary.set(dict)
 locale.subscribe((l: string) => {
   currentLocale = l
 })
-locale.set('en')
 
 describe('locale', () => {
   it('should change locale', () => {
@@ -61,6 +63,15 @@ describe('dictionary', () => {
     expect(loaded[0][0]).toEqual('pt')
     expect(loaded[1][0]).toEqual('pt-PT')
   })
+
+  it('load a partial dictionary and merge it with the existing one', async () => {
+    locale.set('en')
+    registerLocaleLoader('en', () => import('../fixtures/partials/en.json'))
+    expect(_('page.title_about')).toBe('page.title_about')
+
+    await flushLocaleQueue('en')
+    expect(_('page.title_about')).toBe('About')
+  })
 })
 
 describe('formatting', () => {
@@ -219,7 +230,6 @@ describe('custom formats', () => {
     locale.set('en-US')
 
     expect(_.number(123123123, { format: 'usd' })).toContain('$123,123,123.00')
-    expect(_.number(123123123, { format: 'brl' })).toContain('R$123,123,123.00')
 
     expect(_.date(new Date(2019, 0, 1), { format: 'customDate' })).toEqual('2019 AD')
 
diff --git a/test/fixtures/en.json b/test/fixtures/en.json
index e5a3898..432f9d7 100644
--- a/test/fixtures/en.json
+++ b/test/fixtures/en.json
@@ -1,6 +1,9 @@
 {
   "hi": "hi yo",
   "switch.lang": "Switch language",
+  "page": {
+    "title_home": "Home"
+  },
   "greeting": {
     "ask": "Please type your name",
     "message": "Hello {name}, how are you?"
diff --git a/test/fixtures/partials/en.json b/test/fixtures/partials/en.json
new file mode 100644
index 0000000..8dc22dd
--- /dev/null
+++ b/test/fixtures/partials/en.json
@@ -0,0 +1,5 @@
+{
+  "page": {
+    "title_about": "About"
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index f896c2f..779fad2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1623,6 +1623,11 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"