From c59a9cfbd24e77c9a59ae91e91549eae7c91ab44 Mon Sep 17 00:00:00 2001
From: Bobbie Goede <bobbiegoede@gmail.com>
Date: Wed, 15 Mar 2023 16:08:25 +0100
Subject: [PATCH] fix: useCookieLocale parameter defaults (#1932)

---
 src/runtime/composables.ts | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/runtime/composables.ts b/src/runtime/composables.ts
index 60bcc82a8..7018db154 100644
--- a/src/runtime/composables.ts
+++ b/src/runtime/composables.ts
@@ -1,5 +1,5 @@
 import { findBrowserLocale, getComposer } from 'vue-i18n-routing'
-import { useRoute, useRouter, useRequestHeaders, useCookie as _useCookie, useNuxtApp } from '#imports'
+import { useRoute, useRouter, useRequestHeaders, useCookie, useNuxtApp } from '#imports'
 import { parseAcceptLanguage } from '#build/i18n.internal.mjs'
 import { nuxtI18nInternalOptions, nuxtI18nOptionsDefault, localeCodes as _localeCodes } from '#build/i18n.options.mjs'
 import {
@@ -153,36 +153,38 @@ export function useBrowserLocale(normalizedLocales = nuxtI18nInternalOptions.__n
  * The `useCookieLocale` composable returns the cookie locale.
  *
  * @remarks
- * If this composable function is called on client-side, it detects the locale from the value of `document.cookie` via `useCookie`. else on the server side, the locale is detected from the value of `cookie` header.
+ * If this composable function is called client-side, it detects the locale from the value of `document.cookie` via `useCookie`. Otherwise when used server-side, it detects the locale from the value of the `cookie` header.
  *
  * Note that if the value of `detectBrowserLanguage.useCookie` is `false`, an empty string is always returned.
  *
- * @returns the cookie locale with Vue `ref`. if not detected, return **empty string** wiht `ref`.
+ * @returns the cookie locale with Vue `ref`. if not detected, return **empty string** with `ref`.
  *
  * @public
  */
-export function useCookieLocale({
-  useCookie = nuxtI18nOptionsDefault.detectBrowserLanguage.useCookie,
-  cookieKey = nuxtI18nOptionsDefault.detectBrowserLanguage.cookieKey,
-  localeCodes = _localeCodes
-}: Pick<DetectBrowserLanguageOptions, 'useCookie' | 'cookieKey'> & {
-  localeCodes: readonly string[]
-}): Ref<string> {
+export function useCookieLocale(
+  options: Required<Pick<DetectBrowserLanguageOptions, 'useCookie' | 'cookieKey'>> & {
+    localeCodes: readonly string[]
+  } = {
+    useCookie: nuxtI18nOptionsDefault.detectBrowserLanguage.useCookie,
+    cookieKey: nuxtI18nOptionsDefault.detectBrowserLanguage.cookieKey,
+    localeCodes: _localeCodes
+  }
+): Ref<string> {
   // @ts-ignore NOTE: `ref` is auto-imported from `nuxt`
   const locale: Ref<string> = ref('')
 
-  if (useCookie) {
+  if (options.useCookie) {
     let code: string | null = null
     if (process.client) {
-      const cookie = _useCookie<string>(cookieKey) as Ref<string>
+      const cookie = useCookie<string>(options.cookieKey) as Ref<string>
       code = cookie.value
     } else if (process.server) {
       const cookie = useRequestHeaders(['cookie'])
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      code = (cookie as any)[cookieKey]
+      code = (cookie as any)[options.cookieKey]
     }
 
-    if (code && localeCodes.includes(code)) {
+    if (code && options.localeCodes.includes(code)) {
       locale.value = code
     }
   }