Skip to content

Fix phone validation performance by using Set/Map instead of Array lookups #17843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FelixMalfait merged 1 commit into from
Feb 10, 2026
Merged

Fix phone validation performance by using Set/Map instead of Array lookups #17843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions packages/twenty-shared/src/utils/validation/phones-value/getCountryCodesForCallingCode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
import { getCountries, getCountryCallingCode } from 'libphonenumber-js';
import {
type CountryCode,
getCountries,
getCountryCallingCode,
} from 'libphonenumber-js';

const ALL_COUNTRIES_CODE = getCountries();
// Precompute a map from calling code to country codes for O(1) lookups
const CALLING_CODE_TO_COUNTRIES = new Map<string, CountryCode[]>();

export const getCountryCodesForCallingCode = (callingCode: string) => {
for (const country of getCountries()) {
const callingCode = getCountryCallingCode(country);

const existing = CALLING_CODE_TO_COUNTRIES.get(callingCode);

if (existing) {
existing.push(country);
} else {
CALLING_CODE_TO_COUNTRIES.set(callingCode, [country]);
}
}

export const getCountryCodesForCallingCode = (
callingCode: string,
): CountryCode[] => {
const cleanCallingCode = callingCode.startsWith('+')
? callingCode.slice(1)
: callingCode;

return ALL_COUNTRIES_CODE.filter((country) => {
const countryCallingCode = getCountryCallingCode(country);

return countryCallingCode === cleanCallingCode;
});
return CALLING_CODE_TO_COUNTRIES.get(cleanCallingCode) ?? [];
Copy link
Copy Markdown
Contributor

@cubic-dev-ai cubic-dev-ai bot Feb 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: Returning the cached array exposes internal mutable state; callers can mutate it and corrupt future lookups. Return a copy to preserve previous behavior of returning a fresh array.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At packages/twenty-shared/src/utils/validation/phones-value/getCountryCodesForCallingCode.ts, line 29:

<comment>Returning the cached array exposes internal mutable state; callers can mutate it and corrupt future lookups. Return a copy to preserve previous behavior of returning a fresh array.</comment>

<file context>
@@ -1,15 +1,30 @@
-
-    return countryCallingCode === cleanCallingCode;
-  });
+  return CALLING_CODE_TO_COUNTRIES.get(cleanCallingCode) ?? [];
 };
</file context>
Suggested change
return CALLING_CODE_TO_COUNTRIES.get(cleanCallingCode) ?? [];
return [...(CALLING_CODE_TO_COUNTRIES.get(cleanCallingCode) ?? [])];
Fix with Cubic

};
4 changes: 2 additions & 2 deletions packages/twenty-shared/src/utils/validation/phones-value/isValidCountryCode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type CountryCode, getCountries } from 'libphonenumber-js';

const ALL_COUNTRIES_CODE = getCountries();
const ALL_COUNTRIES_CODE_SET = new Set<string>(getCountries());

export const isValidCountryCode = (input: string): input is CountryCode => {
return ALL_COUNTRIES_CODE.includes(input as unknown as CountryCode);
return ALL_COUNTRIES_CODE_SET.has(input);
};