Improve getCountryCode(), support special characters and trim any whitespace around the name

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "annexare/countries-list",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Continents & countries: ISO 3166-1 alpha-2 code, name, ISO 639-1 languages, capital, currency, native name, phone. JSON, CSV and SQL.",
   "type": "library",
   "keywords": [

dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "countries-list",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Continents & countries: ISO 3166-1 alpha-2 code, name, ISO 639-1 languages, capital, currency, native name, phone. JSON, CSV and SQL.",
   "main": "cjs/index.js",
   "module": "mjs/index.js",

packages/countries/package.json

@@ -1,6 +1,6 @@
 {
   "name": "countries",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -23,4 +23,4 @@
     "typescript": "~5.5.4"
   },
   "license": "MIT"
-}
+}

packages/countries/src/getCountryCode.ts

@@ -4,8 +4,14 @@ import { getCountryDataList } from './getCountryData.ts'
 const countryDataList = getCountryDataList()
 
 export const getCountryCode = (countryName: string): TCountryCode | false => {
+  // Escape special RegExp characters
+  const name = `${countryName}`
+    .trim()
+    .replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
+    .replace(/-/g, '\\x2d')
+
   // Match exact country name, but case insensitive
-  const nameRegex = new RegExp('^' + countryName + '$', 'i')
+  const nameRegex = new RegExp('^' + name + '$', 'i')
 
   return (
     countryDataList.find(({ name, native }) => nameRegex.test(name) || nameRegex.test(native))

packages/test-node/getCountryCode.test.ts

@@ -12,4 +12,15 @@ test('getCountryCode()', () => {
   assert.equal(getCountryCode('Ukrain'), false)
   assert.equal(getCountryCode('Ukraine1'), false)
   assert.equal(getCountryCode('Unknown'), false)
+
+  // Should not care about leading/trailing spaces
+  assert.equal(getCountryCode(' Ukraine '), 'UA')
+
+  // More unicode tests
+  assert.equal(getCountryCode('မြန်မာ'), 'MM')
+  assert.equal(getCountryCode('澳門'), 'MO')
+
+  // Special symbols
+  assert.equal(getCountryCode('Myanmar (Burma)'), 'MM')
+  assert.equal(getCountryCode('Cocos (Keeling) Islands'), 'CC')
 })