test(phoneNumber): tests phone number variations

README.md

@@ -1,42 +1,3 @@
-# Send WhatsApp Extension
-
-![build](https://github.com/bolshchikov/send-whatsapp-extension/workflows/build/badge.svg)
+# Send WhatsApp Chrome Extension ![build](https://github.com/bolshchikov/send-whatsapp-extension/workflows/build/badge.svg)
 
 > Send a whatsapp message any number right from the browser
-
-## Development
-
-```
-npm install
-```
-
-## Import as Visual Studio Code project
-
-...
-
-## Build
-
-```
-npm run build
-```
-
-## Build in watch mode
-
-### terminal
-
-```
-npm run watch
-```
-
-### Visual Studio Code
-
-Run watch mode.
-
-type `Ctrl + Shift + B`
-
-## Load extension to chrome
-
-Load `dist` directory
-
-## Test
-`npx jest` or `npm run test`

src/background.ts

@@ -1,4 +1,5 @@
-import { getCountryDialCode } from './countryCodes';
+import { getUserCountry } from './services/country';
+import { extractPhoneNumber } from './services/phoneNumber';
 
 chrome.runtime.onInstalled.addListener(() => {
   chrome.contextMenus.create({
@@ -11,7 +12,7 @@ chrome.runtime.onInstalled.addListener(() => {
 chrome.contextMenus.onClicked.addListener((info, tab) => {
   if (info.menuItemId === 'sendWhatsApp' && info.selectionText) {
     getUserCountry().then(countryCode => {
-      const phoneNumber = formatPhoneNumber(extractPhoneNumber(info.selectionText), countryCode);
+      const phoneNumber = extractPhoneNumber(countryCode, info.selectionText);
       if (phoneNumber) {
         const url = `https://api.whatsapp.com/send/?phone=${phoneNumber}&text&type=phone_number&app_absent=0`;
         chrome.tabs.create({ url: url });
@@ -21,31 +22,3 @@ chrome.contextMenus.onClicked.addListener((info, tab) => {
     });
   }
 });
-
-function extractPhoneNumber(text?: string): string {
-  if (!text) {
-    throw new Error('No phone text provided')
-  }
-  const phoneNumber = text.replace(/\D/g, '');
-  if (phoneNumber.length === 0) {
-    throw new Error('No phone number is provided');
-  }
-  return phoneNumber;
-}
-
-function getUserCountry() {
-  return fetch('https://api.country.is/')
-    .then(response => response.json())
-    .then(data => data.country)
-    .catch(error => console.error('Failed to fetch country:', error));
-}
-
-function formatPhoneNumber(phoneNumber: string, countryCode: string) {
-  const dialCode = getCountryDialCode(countryCode);
-  if (dialCode) {
-    const normalizedPhoneNumber = phoneNumber.replace(/^0+/, '');  // Remove leading zeros
-    return dialCode + normalizedPhoneNumber;
-  } else {
-    return phoneNumber;  // Default to the number without modification if country code is not found
-  }
-}

src/services/country.ts

@@ -0,0 +1,6 @@
+export const getUserCountry = (): Promise<string> => {
+  return fetch('https://api.country.is/')
+    .then(response => response.json())
+    .then(data => data.country)
+    .catch(error => console.error('Failed to fetch country:', error));
+};

src/countryCodes.ts → src/services/countryCodes.ts

@@ -1,5 +1,5 @@
 import { codes } from 'country-calling-code';
 
 export const getCountryDialCode = (countryIsoCode: string): string | undefined => {
-  return codes.find(({ isoCode2 }) => countryIsoCode)?.countryCodes[0]
+  return codes.find(({ isoCode2 }) => isoCode2 === countryIsoCode)?.countryCodes[0]
 } 

src/services/phoneNumber.spec.ts

@@ -0,0 +1,32 @@
+import { extractPhoneNumber } from './phoneNumber';
+
+describe('extractPhoneNumber', () => {
+  it('should return formatted phone number', () => {
+    const countryCode = 'US';
+    const maybePhoneNumber = '+1 (555) 123-4567';
+    const expectedPhoneNumber = '15551234567';
+
+    const result = extractPhoneNumber(countryCode, maybePhoneNumber);
+
+    expect(result).toBe(expectedPhoneNumber);
+  });
+
+  it('should handle local phone number', () => {
+    const countryCode = 'IL';
+    const maybePhoneNumber = '052-534-4907';
+    const expectedPhoneNumber = '972525344907';
+
+    const result = extractPhoneNumber(countryCode, maybePhoneNumber);
+
+    expect(result).toBe(expectedPhoneNumber);
+  });
+
+  it('should return empty string if maybePhoneNumber is undefined', () => {
+    const countryCode = 'US';
+    const maybePhoneNumber = undefined;
+
+    expect(() => {
+      extractPhoneNumber(countryCode, maybePhoneNumber);
+    }).toThrow();
+  });
+});

src/services/phoneNumber.ts

@@ -0,0 +1,26 @@
+import { getCountryDialCode } from './countryCodes';
+
+const parsePhoneNumber = (text?: string): string => {
+  if (!text) {
+    throw new Error('No phone text provided')
+  }
+  const phoneNumber = text.replace(/\D/g, '');
+  if (phoneNumber.length === 0) {
+    throw new Error('No phone number is provided');
+  }
+  return phoneNumber;
+};
+
+const formatPhoneNumber = (phoneNumber: string, countryCode: string) => {
+  const dialCode = getCountryDialCode(countryCode);
+  if (dialCode && !phoneNumber.startsWith(dialCode)) {
+    const normalizedPhoneNumber = phoneNumber.replace(/^0+/, '');  // Remove leading zeros
+    return dialCode + normalizedPhoneNumber;
+  } else {
+    return phoneNumber;  // Default to the number without modification if country code is not found
+  }
+};
+
+export const extractPhoneNumber = (countryCode: string, maybePhoneNumber?: string): string => {
+  return formatPhoneNumber(parsePhoneNumber(maybePhoneNumber), countryCode);
+};