h
', }); - expect(res).toEqual({ ok: false, error: 'Invalid API key' }); + expect(res).toEqual({ ok: false, error: 'Invalid API key', kind: 'transient' }); }); it('falls back to SendGridh
', }); - expect(res).toEqual({ ok: false, error: 'SendGrid 500' }); + expect(res).toEqual({ ok: false, error: 'SendGrid 500', kind: 'transient' }); }); it('returns ok:false on network error', async () => { @@ -107,7 +107,7 @@ describe('SendgridProvider', () => { subject: 'Hi', html: 'h
', }); - expect(res).toEqual({ ok: false, error: 'network failure' }); + expect(res).toEqual({ ok: false, error: 'network failure', kind: 'transient' }); }); it('validateCredentials GETs /v3/scopes and returns ok:true on 200', async () => { @@ -239,7 +239,7 @@ describe('PostmarkProvider', () => { subject: 'Hi', html: 'h
', }); - expect(res).toEqual({ ok: false, error: 'Bad token' }); + expect(res).toEqual({ ok: false, error: 'Bad token', kind: 'transient' }); }); it('falls back to Postmarkh
', }); - expect(res).toEqual({ ok: false, error: 'Postmark 500' }); + expect(res).toEqual({ ok: false, error: 'Postmark 500', kind: 'transient' }); }); it('returns ok:false on network error', async () => { @@ -262,7 +262,7 @@ describe('PostmarkProvider', () => { subject: 'Hi', html: 'h
', }); - expect(res).toEqual({ ok: false, error: 'connection refused' }); + expect(res).toEqual({ ok: false, error: 'connection refused', kind: 'transient' }); }); it('validateCredentials GETs /server and returns ok:true on 200', async () => { @@ -397,7 +397,7 @@ describe('MailgunProvider', () => { subject: 'Hi', html: 'h
', }); - expect(res).toEqual({ ok: false, error: 'Forbidden. Provide valid API credentials.' }); + expect(res).toEqual({ ok: false, error: 'Forbidden. Provide valid API credentials.', kind: 'transient' }); }); it('falls back to Mailgunh
', }); - expect(res).toEqual({ ok: false, error: 'Mailgun 500' }); + expect(res).toEqual({ ok: false, error: 'Mailgun 500', kind: 'transient' }); }); it('returns ok:false on network error', async () => { @@ -420,7 +420,7 @@ describe('MailgunProvider', () => { subject: 'Hi', html: 'h
', }); - expect(res).toEqual({ ok: false, error: 'timeout' }); + expect(res).toEqual({ ok: false, error: 'timeout', kind: 'transient' }); }); it('validateCredentials GETs /v3/hi
'); @@ -61,7 +65,10 @@ describe('EmailService send-path suppression gate (WH-3)', () => { }); it('clean recipient → provider called normally (unchanged)', async () => { - const suppression = { isSuppressed: vi.fn(async () => false) }; + const suppression = { + isSuppressed: vi.fn(async () => false), + recordSuppression: vi.fn(async () => {}), + }; const { svc, provider } = buildService(suppression); const result = await svc.sendEmail(['ok@x.io'], 'Subj', 'hi
'); @@ -72,17 +79,21 @@ describe('EmailService send-path suppression gate (WH-3)', () => { }); it('normalizes the recipient before lookup (trim + lowercase)', async () => { - const isSuppressed = vi.fn(async () => false); - const { svc } = buildService({ isSuppressed }); + const suppression = { + isSuppressed: vi.fn(async () => false), + recordSuppression: vi.fn(async () => {}), + }; + const { svc } = buildService(suppression); await svc.sendEmail([' Mixed.Case@X.IO '], 'Subj', 'hi
'); - expect(isSuppressed).toHaveBeenCalledWith('mixed.case@x.io'); + expect(suppression.isSuppressed).toHaveBeenCalledWith('mixed.case@x.io'); }); it('multi-recipient with one suppressed → provider gets only the clean ones', async () => { const suppression = { isSuppressed: vi.fn(async (email: string) => email === 'blocked@x.io'), + recordSuppression: vi.fn(async () => {}), }; const { svc, provider } = buildService(suppression); @@ -105,7 +116,10 @@ describe('EmailService send-path suppression gate (WH-3)', () => { it('fail-OPEN: a lookup error never blocks the send', async () => { const warn = vi.spyOn(logger, 'warn').mockImplementation(() => {}); - const suppression = { isSuppressed: vi.fn(async () => { throw new Error('db down'); }) }; + const suppression = { + isSuppressed: vi.fn(async () => { throw new Error('db down'); }), + recordSuppression: vi.fn(async () => {}), + }; const { svc, provider } = buildService(suppression); const result = await svc.sendEmail(['ok@x.io'], 'Subj', 'hi
'); diff --git a/tests/unit/inspections/send-report-multi.spec.ts b/tests/unit/inspections/send-report-multi.spec.ts index e185eb642..f10914618 100644 --- a/tests/unit/inspections/send-report-multi.spec.ts +++ b/tests/unit/inspections/send-report-multi.spec.ts @@ -168,7 +168,7 @@ describe('POST /api/inspections/:id/send-report-pdf — multi-recipient, role-ke expect(sendInspectionReportPdf).toHaveBeenCalledTimes(1); }); - it('an unknown roleKey fails gracefully for that recipient only — batch still 200', async () => { + it('an unknown roleKey returns 400 and aborts the batch before sending', async () => { const app = buildApp({ propertyAddress: '1 Main St', inspectorId: null, id: INSP_ID }); const res = await app.fetch(post({ recipients: [ @@ -177,11 +177,9 @@ describe('POST /api/inspections/:id/send-report-pdf — multi-recipient, role-ke ], }), ENV, CTX); - expect(res.status).toBe(200); - const body = (await res.json()) as { data: { sentTo: string[]; skipped?: Array<{ recipient: string; reason: string }> } }; - expect(body.data.sentTo).toEqual(['jane@example.com']); - expect(body.data.skipped).toHaveLength(1); - expect(body.data.skipped?.[0].recipient).toBe('weird@example.com'); + expect(res.status).toBe(400); + expect(sendInspectionReportPdf).not.toHaveBeenCalled(); + expect(sendReportReady).not.toHaveBeenCalled(); }); it('empty recipients array — 400 (Zod validation), no emails sent', async () => { diff --git a/tsconfig.json b/tsconfig.json index 3209d4afe..83b4b4626 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -66,6 +66,14 @@ ".react-router/types/**/*", "app/**/*.ts", "app/**/*.tsx", + // Paraglide-compiled declaration files. The compiler (v2.7+) generates + // .d.ts alongside .js when --emit-ts-declarations is set, but tsc won't + // pick them up from app/**/*.ts alone because .d.ts files need an explicit + // include or a matching .js with allowJs:true. Listing them here gives + // TypeScript the type signatures for every m.*() call without touching + // allowJs or the .gitignore (paraglide's own .gitignore excludes the whole + // outdir, so these are gitignored but still present after i18n:compile). + "app/paraglide/**/*.d.ts", "workers/**/*.ts", "vite.config.ts", // The worker entry's `typeof import("../server/index")` pulls the server diff --git a/workers/app.ts b/workers/app.ts index 36d0710e1..94a817484 100644 --- a/workers/app.ts +++ b/workers/app.ts @@ -90,7 +90,7 @@ const ssr = (c: Ctx) => { // language instead of English-then-Spanish. It returns the SAME request // object once the cookie already agrees, which is every request after the // first — the steady-state cost here is one header read. - return paraglideMiddleware(withResolvedUiLocale(c.req.raw), ({ request }) => + return paraglideMiddleware(withResolvedUiLocale(c.req.raw), ({ request }: { request: Request }) => requestHandler(request, context), ); };