16d98d630e
Cross-cutting i18n polish for forms across the marina + residential + company
domains. Introduces a single source of truth for country/phone/timezone/
subdivision data and replaces every nationality-as-free-text and timezone-
as-string Input with a dedicated combobox.
PR1 Countries — ALL_COUNTRY_CODES (~250 ISO-3166-1 alpha-2), Intl.DisplayNames
for localized labels, detectDefaultCountry() with navigator-region
fallback to US, CountryCombobox with regional-indicator flag glyphs +
compact mode for inline use.
PR2 Phone — libphonenumber-js wrapper (parsePhone / formatAsYouType /
callingCodeFor), PhoneInput with flag dropdown + national-format
AsYouType + paste-detect that flips the country dropdown for pasted
international strings.
PR3 Timezones — country->IANA map (250 entries, multi-zone for AU/BR/CA/CD/
ID/KZ/MN/MX/RU/US), formatTimezoneLabel ("Europe/London (UTC+1)"),
TimezoneCombobox with Suggested/All grouping driven by countryHint.
PR4 Subdivisions — wraps the iso-3166-2 npm package (~5000 ISO 3166-2
codes for every country), per-country cache, SubdivisionCombobox with
"Pick a country first" / "No regions available" empty states.
PR5 Schema deltas (migration 0015) — clients.nationality_iso, clientContacts
{value_e164, value_country}, clientAddresses {country_iso, subdivision_iso},
residentialClients {phone_e164, phone_country, nationality_iso, timezone,
place_of_residence_country_iso, subdivision_iso}, companies {incorporation_
country_iso, incorporation_subdivision_iso}, companyAddresses {country_iso,
subdivision_iso}. Plus shared zod validators (validators/i18n.ts) used
by every entity validator + route handler.
PR6 ClientForm + ClientDetail — CountryCombobox replaces nationality Input,
TimezoneCombobox replaces timezone Input (driven by nationalityIso hint),
PhoneInput conditionally rendered for phone/whatsapp contacts. Inline
editors (InlineCountryField / InlineTimezoneField / InlinePhoneField)
for the detail-page overview rows + ContactsEditor.
PR7 Residential client form + detail — phone -> PhoneInput, nationality/
timezone/place-of-residence-country/subdivision rows in both create
sheet and inline-editable detail view. Subdivision wipes when country
flips since codes are country-scoped.
PR8 Company form + detail — incorporation country -> CountryCombobox,
incorporation region -> SubdivisionCombobox in both modes.
PR9 Public inquiry endpoint — accepts pre-normalized phoneE164/phoneCountry
and i18n fields from newer website builds, server-side parsePhone()
fallback for legacy raw-international submissions. Old Nuxt builds
keep working unchanged.
Tests: 4 unit suites for the primitives (25 tests), 1 integration spec for
the public phone-normalization path (3 tests), 1 smoke spec asserting the
combobox triggers render in all three create sheets.
Test totals: vitest 713 -> 741 (+28).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
81 lines
2.4 KiB
TypeScript
81 lines
2.4 KiB
TypeScript
/**
|
|
* Phone-number helpers built on libphonenumber-js.
|
|
*
|
|
* Uses the default `min` build (~110 KB gz). The `/mobile` build
|
|
* rejects landlines and reserved-range numbers, which is wrong for
|
|
* a marina CRM where clients commonly give office numbers.
|
|
* The `/max` build adds carrier/geocoding we don't need.
|
|
*/
|
|
|
|
import {
|
|
AsYouType,
|
|
parsePhoneNumberFromString,
|
|
isValidPhoneNumber as libIsValid,
|
|
getCountryCallingCode,
|
|
type CountryCode as LibCountryCode,
|
|
} from 'libphonenumber-js';
|
|
|
|
import type { CountryCode } from './countries';
|
|
|
|
export interface ParsedPhone {
|
|
/** E.164 form, e.g. '+442079460958'. Null when the input isn't parseable. */
|
|
e164: string | null;
|
|
/** ISO alpha-2 of the country the number was parsed against. */
|
|
country: CountryCode | null;
|
|
/** Display-friendly national format, e.g. '020 7946 0958'. */
|
|
national: string | null;
|
|
/** Display-friendly international format, e.g. '+44 20 7946 0958'. */
|
|
international: string | null;
|
|
isValid: boolean;
|
|
}
|
|
|
|
const EMPTY: ParsedPhone = {
|
|
e164: null,
|
|
country: null,
|
|
national: null,
|
|
international: null,
|
|
isValid: false,
|
|
};
|
|
|
|
/**
|
|
* Parse a raw user-typed phone string into a normalized record.
|
|
* `defaultCountry` provides context when the input lacks a +country prefix.
|
|
*/
|
|
export function parsePhone(raw: string, defaultCountry?: CountryCode): ParsedPhone {
|
|
const trimmed = raw.trim();
|
|
if (!trimmed) return EMPTY;
|
|
try {
|
|
const parsed = parsePhoneNumberFromString(trimmed, defaultCountry as LibCountryCode);
|
|
if (!parsed) return EMPTY;
|
|
return {
|
|
e164: parsed.number,
|
|
country: (parsed.country ?? null) as CountryCode | null,
|
|
national: parsed.formatNational(),
|
|
international: parsed.formatInternational(),
|
|
isValid: parsed.isValid(),
|
|
};
|
|
} catch {
|
|
return EMPTY;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Format the in-progress digits with `AsYouType` for live typing.
|
|
* Returns the formatted string in the country's national style.
|
|
*/
|
|
export function formatAsYouType(raw: string, country: CountryCode): string {
|
|
const formatter = new AsYouType(country as LibCountryCode);
|
|
return formatter.input(raw);
|
|
}
|
|
|
|
/**
|
|
* Strict validation for zod / form layer. Accepts E.164 only.
|
|
*/
|
|
export function isValidE164(value: string): boolean {
|
|
return libIsValid(value);
|
|
}
|
|
|
|
export function callingCodeFor(country: CountryCode): string {
|
|
return `+${getCountryCallingCode(country as LibCountryCode)}`;
|
|
}
|