feat(i18n): country/phone/timezone/subdivision primitives + form wiring
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>
This commit is contained in:
@@ -1,12 +1,21 @@
|
||||
import { z } from 'zod';
|
||||
|
||||
import { baseListQuerySchema } from '@/lib/api/route-helpers';
|
||||
import {
|
||||
optionalCountryIsoSchema,
|
||||
optionalIanaTimezoneSchema,
|
||||
optionalPhoneE164Schema,
|
||||
} from '@/lib/validators/i18n';
|
||||
|
||||
// ─── Contact sub-schema ──────────────────────────────────────────────────────
|
||||
|
||||
export const contactSchema = z.object({
|
||||
channel: z.enum(['email', 'phone', 'whatsapp', 'other']),
|
||||
value: z.string().min(1),
|
||||
/** E.164-normalized number; required when channel is phone/whatsapp. */
|
||||
valueE164: optionalPhoneE164Schema.optional(),
|
||||
/** ISO-3166-1 alpha-2 country the number was parsed against. */
|
||||
valueCountry: optionalCountryIsoSchema.optional(),
|
||||
label: z.string().optional(),
|
||||
isPrimary: z.boolean().optional().default(false),
|
||||
notes: z.string().optional(),
|
||||
@@ -17,10 +26,14 @@ export const contactSchema = z.object({
|
||||
export const createClientSchema = z.object({
|
||||
fullName: z.string().min(1).max(200),
|
||||
contacts: z.array(contactSchema).min(1, 'At least one contact is required'),
|
||||
/** Legacy free-text nationality. Kept for backfill only — new edits write `nationalityIso`. */
|
||||
nationality: z.string().optional(),
|
||||
/** ISO-3166-1 alpha-2 nationality code. */
|
||||
nationalityIso: optionalCountryIsoSchema.optional(),
|
||||
preferredContactMethod: z.enum(['email', 'phone', 'whatsapp']).optional(),
|
||||
preferredLanguage: z.string().optional(),
|
||||
timezone: z.string().optional(),
|
||||
/** IANA timezone (e.g. 'Europe/Warsaw'). */
|
||||
timezone: optionalIanaTimezoneSchema.optional(),
|
||||
source: z.enum(['website', 'manual', 'referral', 'broker']).optional(),
|
||||
sourceDetails: z.string().optional(),
|
||||
tagIds: z.array(z.string()).optional().default([]),
|
||||
|
||||
@@ -1,12 +1,18 @@
|
||||
import { z } from 'zod';
|
||||
import { baseListQuerySchema } from '@/lib/api/route-helpers';
|
||||
import { optionalCountryIsoSchema, optionalSubdivisionIsoSchema } from '@/lib/validators/i18n';
|
||||
|
||||
export const createCompanySchema = z.object({
|
||||
name: z.string().min(1).max(200),
|
||||
legalName: z.string().optional(),
|
||||
taxId: z.string().optional(),
|
||||
registrationNumber: z.string().optional(),
|
||||
/** Legacy free-text. New writes use `incorporationCountryIso`. */
|
||||
incorporationCountry: z.string().optional(),
|
||||
/** ISO-3166-1 alpha-2 country of incorporation. */
|
||||
incorporationCountryIso: optionalCountryIsoSchema.optional(),
|
||||
/** ISO 3166-2 state/province of incorporation. */
|
||||
incorporationSubdivisionIso: optionalSubdivisionIsoSchema.optional(),
|
||||
incorporationDate: z.coerce.date().optional(),
|
||||
status: z.enum(['active', 'dissolved']).optional().default('active'),
|
||||
billingEmail: z.string().email().optional(),
|
||||
|
||||
78
src/lib/validators/i18n.ts
Normal file
78
src/lib/validators/i18n.ts
Normal file
@@ -0,0 +1,78 @@
|
||||
/**
|
||||
* Zod schemas wrapping the i18n primitives. Used by route handlers
|
||||
* and form-level validation so the same rules run client + server.
|
||||
*/
|
||||
|
||||
import { z } from 'zod';
|
||||
|
||||
import { ISO_COUNTRIES } from '@/lib/i18n/countries';
|
||||
import { isValidE164 } from '@/lib/i18n/phone';
|
||||
import { isValidSubdivisionCode } from '@/lib/i18n/subdivisions';
|
||||
|
||||
// ─── Country ──────────────────────────────────────────────────────────────────
|
||||
|
||||
/** ISO-3166-1 alpha-2, uppercase. */
|
||||
export const countryIsoSchema = z
|
||||
.string()
|
||||
.length(2)
|
||||
.toUpperCase()
|
||||
.refine((c) => ISO_COUNTRIES.has(c), 'Unknown country code');
|
||||
|
||||
// ─── Phone ────────────────────────────────────────────────────────────────────
|
||||
|
||||
/** E.164 form, e.g. '+442079460958'. */
|
||||
export const phoneE164Schema = z
|
||||
.string()
|
||||
.min(1)
|
||||
.refine((v) => isValidE164(v), 'Invalid phone number');
|
||||
|
||||
// ─── Timezone ─────────────────────────────────────────────────────────────────
|
||||
|
||||
/**
|
||||
* IANA timezone (e.g. 'Europe/Warsaw'). Validates against
|
||||
* `Intl.supportedValuesOf('timeZone')` when available. Older Node
|
||||
* runtimes that lack the API fall back to a permissive shape check
|
||||
* (`Region/City`) so the validator never blocks the path.
|
||||
*/
|
||||
export const ianaTimezoneSchema = z
|
||||
.string()
|
||||
.min(1)
|
||||
.refine((tz) => {
|
||||
if (typeof Intl !== 'undefined' && 'supportedValuesOf' in Intl) {
|
||||
try {
|
||||
const supported = Intl.supportedValuesOf('timeZone') as string[];
|
||||
if (supported.length > 0) return supported.includes(tz);
|
||||
} catch {
|
||||
// fall through
|
||||
}
|
||||
}
|
||||
return /^[A-Z][A-Za-z_+-]+\/[A-Za-z_+-]+/.test(tz);
|
||||
}, 'Unknown timezone');
|
||||
|
||||
// ─── Subdivision ──────────────────────────────────────────────────────────────
|
||||
|
||||
/** ISO 3166-2 code, e.g. 'PL-MZ'. */
|
||||
export const subdivisionIsoSchema = z
|
||||
.string()
|
||||
.min(2)
|
||||
.refine((code) => isValidSubdivisionCode(code), 'Unknown subdivision code');
|
||||
|
||||
// ─── Optional variants ────────────────────────────────────────────────────────
|
||||
// Inline forms most callers will use — empty strings normalize to null
|
||||
// so the user clearing a field doesn't fail validation.
|
||||
|
||||
export const optionalCountryIsoSchema = z
|
||||
.union([z.literal(''), z.null(), countryIsoSchema])
|
||||
.transform((v) => (v === '' || v === null ? null : v));
|
||||
|
||||
export const optionalPhoneE164Schema = z
|
||||
.union([z.literal(''), z.null(), phoneE164Schema])
|
||||
.transform((v) => (v === '' || v === null ? null : v));
|
||||
|
||||
export const optionalIanaTimezoneSchema = z
|
||||
.union([z.literal(''), z.null(), ianaTimezoneSchema])
|
||||
.transform((v) => (v === '' || v === null ? null : v));
|
||||
|
||||
export const optionalSubdivisionIsoSchema = z
|
||||
.union([z.literal(''), z.null(), subdivisionIsoSchema])
|
||||
.transform((v) => (v === '' || v === null ? null : v));
|
||||
@@ -1,6 +1,12 @@
|
||||
import { z } from 'zod';
|
||||
|
||||
import { baseListQuerySchema } from '@/lib/api/route-helpers';
|
||||
import {
|
||||
optionalCountryIsoSchema,
|
||||
optionalIanaTimezoneSchema,
|
||||
optionalPhoneE164Schema,
|
||||
optionalSubdivisionIsoSchema,
|
||||
} from '@/lib/validators/i18n';
|
||||
|
||||
// ─── Residential client ──────────────────────────────────────────────────────
|
||||
|
||||
@@ -12,7 +18,19 @@ export const createResidentialClientSchema = z.object({
|
||||
.optional()
|
||||
.or(z.literal('').transform(() => undefined)),
|
||||
phone: z.string().optional(),
|
||||
/** E.164-normalized phone alongside the legacy free-text `phone`. */
|
||||
phoneE164: optionalPhoneE164Schema.optional(),
|
||||
/** ISO-3166-1 alpha-2 the phone was parsed against. */
|
||||
phoneCountry: optionalCountryIsoSchema.optional(),
|
||||
/** ISO-3166-1 alpha-2 nationality. */
|
||||
nationalityIso: optionalCountryIsoSchema.optional(),
|
||||
/** IANA timezone. */
|
||||
timezone: optionalIanaTimezoneSchema.optional(),
|
||||
placeOfResidence: z.string().optional(),
|
||||
/** ISO-3166-1 alpha-2 country of residence. */
|
||||
placeOfResidenceCountryIso: optionalCountryIsoSchema.optional(),
|
||||
/** ISO 3166-2 subdivision code for place of residence. */
|
||||
subdivisionIso: optionalSubdivisionIsoSchema.optional(),
|
||||
preferredContactMethod: z.enum(['email', 'phone']).optional(),
|
||||
status: z.enum(['prospect', 'active', 'inactive']).optional().default('prospect'),
|
||||
source: z.enum(['website', 'manual', 'referral', 'broker']).optional(),
|
||||
@@ -62,13 +80,30 @@ export const listResidentialInterestsSchema = baseListQuerySchema.extend({
|
||||
/**
|
||||
* Shape posted by the public website's residential interest form. Coerces
|
||||
* to internal create-shapes inside the public route.
|
||||
*
|
||||
* The legacy `phone` field stays free-text — older website builds may post
|
||||
* raw international strings ('+44 7700 900123'). The route handler parses
|
||||
* it server-side into `phoneE164` + `phoneCountry`. Newer website builds
|
||||
* can post normalized values directly.
|
||||
*/
|
||||
export const publicResidentialInquirySchema = z.object({
|
||||
firstName: z.string().min(1),
|
||||
lastName: z.string().min(1),
|
||||
email: z.string().email(),
|
||||
phone: z.string().min(1),
|
||||
/** Pre-normalized E.164 form, optional for backwards compat. */
|
||||
phoneE164: optionalPhoneE164Schema.optional(),
|
||||
/** ISO-3166-1 alpha-2 the phone was parsed against. */
|
||||
phoneCountry: optionalCountryIsoSchema.optional(),
|
||||
/** ISO-3166-1 alpha-2 nationality. */
|
||||
nationalityIso: optionalCountryIsoSchema.optional(),
|
||||
/** IANA timezone. */
|
||||
timezone: optionalIanaTimezoneSchema.optional(),
|
||||
placeOfResidence: z.string().optional(),
|
||||
/** ISO-3166-1 alpha-2 country of residence. */
|
||||
placeOfResidenceCountryIso: optionalCountryIsoSchema.optional(),
|
||||
/** ISO 3166-2 subdivision code for place of residence. */
|
||||
subdivisionIso: optionalSubdivisionIsoSchema.optional(),
|
||||
preferredContactMethod: z.enum(['email', 'phone']).optional(),
|
||||
notes: z.string().optional(),
|
||||
preferences: z.string().optional(),
|
||||
|
||||
Reference in New Issue
Block a user