Case insensitive search in getCountryCode function #131

annexare · Mar 4, 2024 · 5ebe32a · 5ebe32a
1 parent 9a0e968
commit 5ebe32a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/packages/countries/src/getCountryCode.ts b/packages/countries/src/getCountryCode.ts
@@ -3,6 +3,12 @@ import { getCountryDataList } from './getCountryData.ts'
 
 const countryDataList = getCountryDataList()
 
-export const getCountryCode = (countryName: string): TCountryCode | false =>
-  countryDataList.find(({ name, native }) => countryName === name || countryName === native)
-    ?.iso2 || false
+export const getCountryCode = (countryName: string): TCountryCode | false => {
+  // Match exact country name, but case insensitive
+  const nameRegex = new RegExp('^' + countryName + '$', 'i')
+
+  return (
+    countryDataList.find(({ name, native }) => nameRegex.test(name) || nameRegex.test(native))
+      ?.iso2 || false
+  )
+}
diff --git a/packages/test-node/getCountryCode.test.ts b/packages/test-node/getCountryCode.test.ts
@@ -5,5 +5,11 @@ import { getCountryCode } from 'src/getCountryCode.ts'
 
 test('getCountryCode()', () => {
   assert.equal(getCountryCode('Ukraine'), 'UA')
+  assert.equal(getCountryCode('uKraine'), 'UA')
   assert.equal(getCountryCode('Україна'), 'UA')
+  assert.equal(getCountryCode('уКраїна'), 'UA')
+
+  assert.equal(getCountryCode('Ukrain'), false)
+  assert.equal(getCountryCode('Ukraine1'), false)
+  assert.equal(getCountryCode('Unknown'), false)
 })