From ce1e6e2ce2fba39519fcc19182aa8ff6aa4b6dbe Mon Sep 17 00:00:00 2001
From: kabirbatrakb <kbatra@prendio.com>
Date: Wed, 26 Mar 2025 00:35:59 +0530
Subject: [PATCH 1/4] chore(packages/spec): add precise types for locales.ts

---
 packages/spec/src/locales.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/spec/src/locales.ts b/packages/spec/src/locales.ts
index 3c4e8fd77..49605c76e 100644
--- a/packages/spec/src/locales.ts
+++ b/packages/spec/src/locales.ts
@@ -201,6 +201,7 @@ const localeMap = {
 export type LocaleCodeShort = keyof typeof localeMap;
 export type LocaleCodeFull = (typeof localeMap)[LocaleCodeShort][number];
 export type LocaleCode = LocaleCodeShort | LocaleCodeFull;
+export type LocaleDelimiter = "-" | "_" | null;
 
 export const localeCodesShort = Object.keys(localeMap) as LocaleCodeShort[];
 export const localeCodesFull = Object.values(localeMap).flat() as LocaleCodeFull[];
@@ -239,7 +240,7 @@ export const resolveLocaleCode = (value: LocaleCode): LocaleCodeFull => {
   throw new Error(`Invalid locale code: ${value}`);
 };
 
-export const getLocaleCodeDelimiter = (locale: string): string | null => {
+export const getLocaleCodeDelimiter = (locale: LocaleCode): LocaleDelimiter => {
   if (locale.includes("_")) {
     return "_";
   } else if (locale.includes("-")) {
@@ -249,7 +250,7 @@ export const getLocaleCodeDelimiter = (locale: string): string | null => {
   }
 };
 
-export const resolveOverridenLocale = (locale: string, delimiter?: "-" | "_" | null): string => {
+export const resolveOverridenLocale = (locale: LocaleCode, delimiter?: LocaleDelimiter): string => {
   if (!delimiter) {
     return locale;
   }
@@ -262,6 +263,6 @@ export const resolveOverridenLocale = (locale: string, delimiter?: "-" | "_" | n
   return locale.replace(currentDelimiter, delimiter);
 };
 
-export function normalizeLocale(locale: string) {
+export function normalizeLocale(locale: LocaleCode): string {
   return locale.replaceAll("_", "-").replace(/([a-z]{2,3}-)r/, "$1");
 }

From c22577ee1dca70adaa885835dce4a2941b86839f Mon Sep 17 00:00:00 2001
From: kabirbatrakb <kbatra@prendio.com>
Date: Wed, 26 Mar 2025 00:41:58 +0530
Subject: [PATCH 2/4] chore: revert type for localecode

---
 packages/spec/src/locales.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/spec/src/locales.ts b/packages/spec/src/locales.ts
index 49605c76e..88a111675 100644
--- a/packages/spec/src/locales.ts
+++ b/packages/spec/src/locales.ts
@@ -240,7 +240,7 @@ export const resolveLocaleCode = (value: LocaleCode): LocaleCodeFull => {
   throw new Error(`Invalid locale code: ${value}`);
 };
 
-export const getLocaleCodeDelimiter = (locale: LocaleCode): LocaleDelimiter => {
+export const getLocaleCodeDelimiter = (locale: string): LocaleDelimiter => {
   if (locale.includes("_")) {
     return "_";
   } else if (locale.includes("-")) {
@@ -250,7 +250,7 @@ export const getLocaleCodeDelimiter = (locale: LocaleCode): LocaleDelimiter => {
   }
 };
 
-export const resolveOverridenLocale = (locale: LocaleCode, delimiter?: LocaleDelimiter): string => {
+export const resolveOverridenLocale = (locale: string, delimiter?: LocaleDelimiter): string => {
   if (!delimiter) {
     return locale;
   }
@@ -263,6 +263,6 @@ export const resolveOverridenLocale = (locale: LocaleCode, delimiter?: LocaleDel
   return locale.replace(currentDelimiter, delimiter);
 };
 
-export function normalizeLocale(locale: LocaleCode): string {
+export function normalizeLocale(locale: string): string {
   return locale.replaceAll("_", "-").replace(/([a-z]{2,3}-)r/, "$1");
 }

From 453dc2bc161568526dd5a6525102ddbf189c0428 Mon Sep 17 00:00:00 2001
From: kabirbatrakb <kbatra@prendio.com>
Date: Wed, 26 Mar 2025 00:49:07 +0530
Subject: [PATCH 3/4] chore: add empty changeset

---
 .changeset/funny-shoes-scream.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .changeset/funny-shoes-scream.md

diff --git a/.changeset/funny-shoes-scream.md b/.changeset/funny-shoes-scream.md
new file mode 100644
index 000000000..a845151cc
--- /dev/null
+++ b/.changeset/funny-shoes-scream.md
@@ -0,0 +1,2 @@
+---
+---

From 685e17c924cb6e103a8b79975367a73462324833 Mon Sep 17 00:00:00 2001
From: kabirbatrakb <kbatra@prendio.com>
Date: Wed, 26 Mar 2025 22:10:49 +0530
Subject: [PATCH 4/4] fix: merge conflict

---
 packages/spec/src/locales.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/spec/src/locales.ts b/packages/spec/src/locales.ts
index 2c6649a3a..8f4e6299a 100644
--- a/packages/spec/src/locales.ts
+++ b/packages/spec/src/locales.ts
@@ -250,9 +250,7 @@ export const getLocaleCodeDelimiter = (locale: string): LocaleDelimiter => {
   }
 };
 
-
-export const resolveOverridenLocale = (locale: string, delimiter?: LocaleDelimiter): string => {
-
+export const resolveOverriddenLocale = (locale: string, delimiter?: LocaleDelimiter): string => {
   if (!delimiter) {
     return locale;
   }