From 1b0138c3f3458c4d8f0b30b4550652e8e0317fc7 Mon Sep 17 00:00:00 2001
From: Christian Kaisermann <christian@kaisermann.me>
Date: Wed, 20 Nov 2019 18:29:14 -0300
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20consider=20generic=20loca?=
 =?UTF-8?q?les=20when=20registering=20loaders?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/includes/loaderQueue.ts | 42 ++++++++++++++++++++++++------
 src/client/includes/utils.ts       | 11 ++++----
 src/client/stores/locale.ts        |  7 +++--
 3 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/src/client/includes/loaderQueue.ts b/src/client/includes/loaderQueue.ts
index 3d7df88..25bfb87 100644
--- a/src/client/includes/loaderQueue.ts
+++ b/src/client/includes/loaderQueue.ts
@@ -6,13 +6,10 @@ import { getCurrentLocale } from '../stores/locale'
 import { $loading } from '../stores/loading'
 
 import { removeFromLookupCache } from './lookup'
+import { getLocalesFrom } from './utils'
 
 const loaderQueue: Record<string, Set<LocaleLoader>> = {}
 
-function getLocaleQueue(locale: string) {
-  return loaderQueue[locale]
-}
-
 function createLocaleQueue(locale: string) {
   loaderQueue[locale] = new Set()
 }
@@ -21,15 +18,44 @@ function removeLocaleFromQueue(locale: string) {
   delete loaderQueue[locale]
 }
 
+function getLocaleQueue(locale: string) {
+  return loaderQueue[locale]
+}
+
+function getLocalesQueue(locale: string) {
+  return getLocalesFrom(locale)
+    .reverse()
+    .reduce(
+      (acc, localeItem) =>
+        getLocaleQueue(localeItem)
+          ? acc.concat([...getLocaleQueue(localeItem)])
+          : acc,
+      []
+    )
+}
+
+export function hasLocaleQueue(locale: string) {
+  return getLocalesFrom(locale)
+    .reverse()
+    .some(getLocaleQueue)
+}
+
 export function addLoaderToQueue(locale: string, loader: LocaleLoader) {
   loaderQueue[locale].add(loader)
 }
 
 export async function flushQueue(locale: string = getCurrentLocale()) {
-  if (!getLocaleQueue(locale)) return
-
-  const queue = [...getLocaleQueue(locale)]
+  if (locale == null) {
+    throw new Error(
+      `[svelte-i18n] Invalid locale into "waitLocale": ${JSON.stringify(
+        locale
+      )}`
+    )
+  }
+  if (!hasLocaleQueue(locale)) return
 
+  // get queue of XX-YY and XX locales
+  const queue = getLocalesQueue(locale)
   if (queue.length === 0) return
 
   removeLocaleFromQueue(locale)
@@ -54,7 +80,7 @@ export function registerLocaleLoader(locale: string, loader: LocaleLoader) {
   if (!getLocaleQueue(locale)) createLocaleQueue(locale)
 
   const queue = getLocaleQueue(locale)
-  if (queue.has(loader)) return
+  if (getLocaleQueue(locale).has(loader)) return
 
   if (!hasLocaleDictionary(locale)) {
     $dictionary.update(d => {
diff --git a/src/client/includes/utils.ts b/src/client/includes/utils.ts
index b568e70..3bf2a2a 100644
--- a/src/client/includes/utils.ts
+++ b/src/client/includes/utils.ts
@@ -34,13 +34,12 @@ const getFromURL = (urlPart: string, key: string) => {
   }
 }
 
-const getMatch = (base: string, pattern: RegExp) => {
+const getFirstMatch = (base: string, pattern: RegExp) => {
   const match = pattern.exec(base)
   if (!match) return null
   return match[1] || null
 }
 
-// todo add a urlPattern method/regexp
 export const getClientLocale = ({
   navigator,
   hash,
@@ -64,12 +63,12 @@ export const getClientLocale = ({
   }
 
   if (hostname) {
-    locale = getMatch(window.location.hostname, hostname)
+    locale = getFirstMatch(window.location.hostname, hostname)
     if (locale) return locale
   }
 
   if (pathname) {
-    locale = getMatch(window.location.pathname, pathname)
+    locale = getFirstMatch(window.location.pathname, pathname)
     if (locale) return locale
   }
 
@@ -83,7 +82,7 @@ export const getClientLocale = ({
     locale =
       typeof search === 'string'
         ? getFromURL(window.location.search, search)
-        : getMatch(window.location.search, search)
+        : getFirstMatch(window.location.search, search)
     if (locale) return locale
   }
 
@@ -91,7 +90,7 @@ export const getClientLocale = ({
     locale =
       typeof hash === 'string'
         ? getFromURL(window.location.hash, hash)
-        : getMatch(window.location.hash, hash)
+        : getFirstMatch(window.location.hash, hash)
     if (locale) return locale
   }
 
diff --git a/src/client/stores/locale.ts b/src/client/stores/locale.ts
index 800ee9b..7b94217 100644
--- a/src/client/stores/locale.ts
+++ b/src/client/stores/locale.ts
@@ -1,7 +1,7 @@
 import { writable } from 'svelte/store'
 
 import { getGenericLocaleFrom, getLocalesFrom } from '../includes/utils'
-import { flushQueue } from '../includes/loaderQueue'
+import { flushQueue, hasLocaleQueue } from '../includes/loaderQueue'
 
 import { getDictionary } from './dictionary'
 
@@ -34,7 +34,10 @@ $locale.subscribe((newLocale: string) => {
 const localeSet = $locale.set
 $locale.set = (newLocale: string): void | Promise<void> => {
   if (getAvailableLocale(newLocale)) {
-    return flushQueue(newLocale).then(() => localeSet(newLocale))
+    if (hasLocaleQueue(newLocale)) {
+      return flushQueue(newLocale).then(() => localeSet(newLocale))
+    }
+    return localeSet(newLocale)
   }
 
   throw Error(`[svelte-i18n] Locale "${newLocale}" not found.`)