@sprucelabs/schema 32.1.63 → 32.2.0

package/build/esm/utilities/formatPhoneNumber.d.ts

@@ -1,3 +1,3 @@
 export declare function isValidNumber(number: string): boolean;
-export default function formatPhoneNumber(val: string, shouldFailSilently?: boolean): string;
+export default function formatPhoneNumber(value: string, shouldFailSilently?: boolean): string;
 export declare function isDummyNumber(phone: string): boolean;

package/build/esm/utilities/formatPhoneNumber.js

@@ -1,69 +1,124 @@
-function formatNumberWithCode(phoneNumberString, code = '1') {
-    if (phoneNumberString.match(/[a-zA-Z]/g)) {
-        return null;
-    }
-    const cleaned = ('' + phoneNumberString).replace(/\D/g, '');
-    // Dynamically insert the country code into the regex
-    let regexPattern = new RegExp(`^(${code})?(\\d{3})(\\d{0,3})(\\d{0,4})$`);
-    let match = cleaned.match(regexPattern);
-    if (match) {
-        let intlCode = match[1] ? `+${match[1]} ` : `+${code} `; // Use the matched code or the provided code
-        const divider = code === '1' ? '-' : ' ';
-        const number = [
-            intlCode,
-            '',
-            match[2],
-            divider,
-            match[3],
-            divider,
-            match[4],
-        ]
-            .join('')
-            .replace(/-+$/, '');
-        return number;
-    }
-    return null;
-}
+var _a;
+const LETTER_PATTERN = /[a-zA-Z]/;
+const DEFAULT_CODE_SEPARATOR = ' ';
+const COUNTRY_FORMATS = [
+    {
+        code: '92',
+        groupSizes: [4, 7],
+        groupSeparator: ' ',
+        validDigits: [9, 10, 11],
+        detect: ({ digits, hasExplicitPlus }) => digits.startsWith('92') && (hasExplicitPlus || digits.length > 10),
+    },
+    {
+        code: '90',
+        groupSizes: [3, 3, 4],
+        groupSeparator: ' ',
+        validDigits: [10],
+        detect: ({ digits, hasExplicitPlus }) => digits.startsWith('90') && (hasExplicitPlus || digits.length > 10),
+    },
+    {
+        code: '49',
+        groupSizes: [3, 3, 4],
+        groupSeparator: ' ',
+        validDigits: [10],
+        detect: ({ digits, hasExplicitPlus }) => digits.startsWith('49') && (hasExplicitPlus || digits.length > 10),
+    },
+    {
+        code: '1',
+        groupSizes: [3, 3, 4],
+        groupSeparator: '-',
+        validDigits: [10],
+    },
+];
+const DEFAULT_COUNTRY = (_a = COUNTRY_FORMATS.find((format) => format.code === '1')) !== null && _a !== void 0 ? _a : COUNTRY_FORMATS[0];
 export function isValidNumber(number) {
     var _a;
-    const { code } = stripCode(number);
-    const formatted = (_a = formatNumberWithCode(number, code)) === null || _a === void 0 ? void 0 : _a.replace(/[^0-9]/g, '');
-    return (formatted === null || formatted === void 0 ? void 0 : formatted.length) === 11 || (formatted === null || formatted === void 0 ? void 0 : formatted.length) === 12;
-}
-function stripCode(number) {
-    let code = `1`; // Default to North American country code
-    const cleaned = number.replace(/(?!^\+)[^\d]/g, '');
-    // Explicitly check for '+' sign to distinguish international codes
-    if (cleaned.startsWith('+90') ||
-        (cleaned.startsWith('90') && cleaned.length > 10)) {
-        code = `90`;
+    if (LETTER_PATTERN.test(number)) {
+        return false;
     }
-    else if (cleaned.startsWith('+49') ||
-        (cleaned.startsWith('49') && cleaned.length > 10)) {
-        code = `49`;
+    const parsed = parseInput(number);
+    const countryFormat = detectCountryFormat(parsed);
+    const localDigits = stripCountryCodeFromDigits(parsed.digits, countryFormat.code);
+    if (!localDigits.length) {
+        return false;
     }
-    // Adjust the condition to ensure that '905...' numbers without a '+' are treated as North American
-    else if (cleaned.startsWith('905') && cleaned.length === 10) {
-        code = `1`;
+    if ((_a = countryFormat.validDigits) === null || _a === void 0 ? void 0 : _a.length) {
+        return countryFormat.validDigits.includes(localDigits.length);
     }
-    return { code, phoneWithoutCode: cleaned.replace('+' + code, '') };
+    return true;
 }
-export default function formatPhoneNumber(val, shouldFailSilently = true) {
-    const { code, phoneWithoutCode } = stripCode(val);
-    const formatted = formatNumberWithCode(phoneWithoutCode, code);
-    if (!formatted) {
+export default function formatPhoneNumber(value, shouldFailSilently = true) {
+    var _a;
+    if (LETTER_PATTERN.test(value)) {
         if (!shouldFailSilently) {
             throw new Error('INVALID_PHONE_NUMBER');
         }
-        else {
-            return val;
+        return value;
+    }
+    const parsed = parseInput(value);
+    const countryFormat = detectCountryFormat(parsed);
+    const localDigits = stripCountryCodeFromDigits(parsed.digits, countryFormat.code);
+    if (!localDigits.length) {
+        if (!shouldFailSilently) {
+            throw new Error('INVALID_PHONE_NUMBER');
         }
+        return value;
     }
-    // remove trailing spaces
-    const cleaned = formatted.replace(/\s+$/, '');
-    return cleaned;
+    const formattedLocal = formatLocalDigits(localDigits, countryFormat);
+    const codeSeparator = (_a = countryFormat.codeSeparator) !== null && _a !== void 0 ? _a : DEFAULT_CODE_SEPARATOR;
+    const formatted = formattedLocal
+        ? `+${countryFormat.code}${codeSeparator}${formattedLocal}`
+        : `+${countryFormat.code}`;
+    return formatted.trim();
 }
 export function isDummyNumber(phone) {
     const cleanedValue = phone.replace(/\D/g, '');
     return cleanedValue.startsWith('1555') || cleanedValue.startsWith('555');
 }
+function parseInput(original) {
+    const digits = original.replace(/\D/g, '');
+    const hasExplicitPlus = original.trim().startsWith('+');
+    return {
+        original,
+        digits,
+        hasExplicitPlus,
+    };
+}
+function detectCountryFormat(input) {
+    if (!input.digits.length) {
+        return DEFAULT_COUNTRY;
+    }
+    if (input.hasExplicitPlus) {
+        const explicitMatch = COUNTRY_FORMATS.find((format) => input.digits.startsWith(format.code));
+        if (explicitMatch) {
+            return explicitMatch;
+        }
+    }
+    const detected = COUNTRY_FORMATS.find((format) => format.detect ? format.detect(input) : false);
+    return detected !== null && detected !== void 0 ? detected : DEFAULT_COUNTRY;
+}
+function stripCountryCodeFromDigits(digits, code) {
+    if (digits.startsWith(code)) {
+        return digits.slice(code.length);
+    }
+    return digits;
+}
+function formatLocalDigits(digits, format) {
+    if (!digits.length) {
+        return '';
+    }
+    const parts = [];
+    let index = 0;
+    for (const size of format.groupSizes) {
+        if (index >= digits.length) {
+            break;
+        }
+        const nextIndex = Math.min(index + size, digits.length);
+        parts.push(digits.slice(index, nextIndex));
+        index = nextIndex;
+    }
+    if (index < digits.length) {
+        parts.push(digits.slice(index));
+    }
+    return parts.join(format.groupSeparator);
+}

package/build/utilities/formatPhoneNumber.d.ts

@@ -1,3 +1,3 @@
 export declare function isValidNumber(number: string): boolean;
-export default function formatPhoneNumber(val: string, shouldFailSilently?: boolean): string;
+export default function formatPhoneNumber(value: string, shouldFailSilently?: boolean): string;
 export declare function isDummyNumber(phone: string): boolean;

package/build/utilities/formatPhoneNumber.js

@@ -3,71 +3,124 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidNumber = isValidNumber;
 exports.default = formatPhoneNumber;
 exports.isDummyNumber = isDummyNumber;
-function formatNumberWithCode(phoneNumberString, code = '1') {
-    if (phoneNumberString.match(/[a-zA-Z]/g)) {
-        return null;
-    }
-    const cleaned = ('' + phoneNumberString).replace(/\D/g, '');
-    // Dynamically insert the country code into the regex
-    let regexPattern = new RegExp(`^(${code})?(\\d{3})(\\d{0,3})(\\d{0,4})$`);
-    let match = cleaned.match(regexPattern);
-    if (match) {
-        let intlCode = match[1] ? `+${match[1]} ` : `+${code} `; // Use the matched code or the provided code
-        const divider = code === '1' ? '-' : ' ';
-        const number = [
-            intlCode,
-            '',
-            match[2],
-            divider,
-            match[3],
-            divider,
-            match[4],
-        ]
-            .join('')
-            .replace(/-+$/, '');
-        return number;
-    }
-    return null;
-}
+const LETTER_PATTERN = /[a-zA-Z]/;
+const DEFAULT_CODE_SEPARATOR = ' ';
+const COUNTRY_FORMATS = [
+    {
+        code: '92',
+        groupSizes: [4, 7],
+        groupSeparator: ' ',
+        validDigits: [9, 10, 11],
+        detect: ({ digits, hasExplicitPlus }) => digits.startsWith('92') && (hasExplicitPlus || digits.length > 10),
+    },
+    {
+        code: '90',
+        groupSizes: [3, 3, 4],
+        groupSeparator: ' ',
+        validDigits: [10],
+        detect: ({ digits, hasExplicitPlus }) => digits.startsWith('90') && (hasExplicitPlus || digits.length > 10),
+    },
+    {
+        code: '49',
+        groupSizes: [3, 3, 4],
+        groupSeparator: ' ',
+        validDigits: [10],
+        detect: ({ digits, hasExplicitPlus }) => digits.startsWith('49') && (hasExplicitPlus || digits.length > 10),
+    },
+    {
+        code: '1',
+        groupSizes: [3, 3, 4],
+        groupSeparator: '-',
+        validDigits: [10],
+    },
+];
+const DEFAULT_COUNTRY = COUNTRY_FORMATS.find((format) => format.code === '1') ?? COUNTRY_FORMATS[0];
 function isValidNumber(number) {
-    const { code } = stripCode(number);
-    const formatted = formatNumberWithCode(number, code)?.replace(/[^0-9]/g, '');
-    return formatted?.length === 11 || formatted?.length === 12;
-}
-function stripCode(number) {
-    let code = `1`; // Default to North American country code
-    const cleaned = number.replace(/(?!^\+)[^\d]/g, '');
-    // Explicitly check for '+' sign to distinguish international codes
-    if (cleaned.startsWith('+90') ||
-        (cleaned.startsWith('90') && cleaned.length > 10)) {
-        code = `90`;
+    if (LETTER_PATTERN.test(number)) {
+        return false;
     }
-    else if (cleaned.startsWith('+49') ||
-        (cleaned.startsWith('49') && cleaned.length > 10)) {
-        code = `49`;
+    const parsed = parseInput(number);
+    const countryFormat = detectCountryFormat(parsed);
+    const localDigits = stripCountryCodeFromDigits(parsed.digits, countryFormat.code);
+    if (!localDigits.length) {
+        return false;
     }
-    // Adjust the condition to ensure that '905...' numbers without a '+' are treated as North American
-    else if (cleaned.startsWith('905') && cleaned.length === 10) {
-        code = `1`;
+    if (countryFormat.validDigits?.length) {
+        return countryFormat.validDigits.includes(localDigits.length);
     }
-    return { code, phoneWithoutCode: cleaned.replace('+' + code, '') };
+    return true;
 }
-function formatPhoneNumber(val, shouldFailSilently = true) {
-    const { code, phoneWithoutCode } = stripCode(val);
-    const formatted = formatNumberWithCode(phoneWithoutCode, code);
-    if (!formatted) {
+function formatPhoneNumber(value, shouldFailSilently = true) {
+    if (LETTER_PATTERN.test(value)) {
         if (!shouldFailSilently) {
             throw new Error('INVALID_PHONE_NUMBER');
         }
-        else {
-            return val;
+        return value;
+    }
+    const parsed = parseInput(value);
+    const countryFormat = detectCountryFormat(parsed);
+    const localDigits = stripCountryCodeFromDigits(parsed.digits, countryFormat.code);
+    if (!localDigits.length) {
+        if (!shouldFailSilently) {
+            throw new Error('INVALID_PHONE_NUMBER');
         }
+        return value;
     }
-    // remove trailing spaces
-    const cleaned = formatted.replace(/\s+$/, '');
-    return cleaned;
+    const formattedLocal = formatLocalDigits(localDigits, countryFormat);
+    const codeSeparator = countryFormat.codeSeparator ?? DEFAULT_CODE_SEPARATOR;
+    const formatted = formattedLocal
+        ? `+${countryFormat.code}${codeSeparator}${formattedLocal}`
+        : `+${countryFormat.code}`;
+    return formatted.trim();
 }
 function isDummyNumber(phone) {
     const cleanedValue = phone.replace(/\D/g, '');
     return cleanedValue.startsWith('1555') || cleanedValue.startsWith('555');
 }
+function parseInput(original) {
+    const digits = original.replace(/\D/g, '');
+    const hasExplicitPlus = original.trim().startsWith('+');
+    return {
+        original,
+        digits,
+        hasExplicitPlus,
+    };
+}
+function detectCountryFormat(input) {
+    if (!input.digits.length) {
+        return DEFAULT_COUNTRY;
+    }
+    if (input.hasExplicitPlus) {
+        const explicitMatch = COUNTRY_FORMATS.find((format) => input.digits.startsWith(format.code));
+        if (explicitMatch) {
+            return explicitMatch;
+        }
+    }
+    const detected = COUNTRY_FORMATS.find((format) => format.detect ? format.detect(input) : false);
+    return detected ?? DEFAULT_COUNTRY;
+}
+function stripCountryCodeFromDigits(digits, code) {
+    if (digits.startsWith(code)) {
+        return digits.slice(code.length);
+    }
+    return digits;
+}
+function formatLocalDigits(digits, format) {
+    if (!digits.length) {
+        return '';
+    }
+    const parts = [];
+    let index = 0;
+    for (const size of format.groupSizes) {
+        if (index >= digits.length) {
+            break;
+        }
+        const nextIndex = Math.min(index + size, digits.length);
+        parts.push(digits.slice(index, nextIndex));
+        index = nextIndex;
+    }
+    if (index < digits.length) {
+        parts.push(digits.slice(index));
+    }
+    return parts.join(format.groupSeparator);
+}

package/package.json

@@ -8,7 +8,7 @@
     "!build/__tests__",
     "esm"
   ],
-  "version": "32.1.63",
+  "version": "32.2.0",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "module": "./build/esm/index.js",
@@ -58,15 +58,15 @@
     "build.copy-files": "mkdir -p build && rsync -avzq --exclude='*.ts' ./src/ ./build/"
   },
   "dependencies": {
-    "@sprucelabs/error": "^7.1.30",
-    "@sprucelabs/test-utils": "^6.0.99",
+    "@sprucelabs/error": "^7.1.31",
+    "@sprucelabs/test-utils": "^6.0.100",
     "email-validator": "^2.0.4",
     "just-safe-get": "^4.2.0",
     "just-safe-set": "^4.2.1"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^7.0.42",
-    "@sprucelabs/jest-json-reporter": "^9.0.63",
+    "@sprucelabs/esm-postbuild": "^7.0.43",
+    "@sprucelabs/jest-json-reporter": "^9.0.64",
     "@sprucelabs/resolve-path-aliases": "^3.0.28",
     "@sprucelabs/semantic-release": "^5.0.2",
     "@sprucelabs/test": "^10.0.24",