feat(app): R2 switch — the application runs its domain rules in the Rust core
Consumers now fed by the core (crates/core through @faunosteo/core-wasm):
- the sheet: the bundled payload is parsed and indexed by the core
(SheetHandle, SheetIndexData); SheetIndex reads precomputed tables only;
- the store: new report, add / remove / move observation, draft restore
(v2 migration + rebase) through the core, actions answering { ok };
- the editor click chain (zone.click), laterality and vertebra pickers
(zone.add_sides, vertebra.initial / sync / select), the findings picker
(finding.toggle by clicked leaf position), zone removal;
- the import: engine byte scan (TypeScript until R4), then the core's
layered reading and rebase in one call; the export: the core builds the
sheet snapshot, the frozen TypeScript engine writes the PDF (R4).
Lazy core: Home and the new-report form read the sheet availability from
the bundle and load the module on import / submit only; the auth shell
never references it. Degraded states (core_unavailable, invalid_sheet)
show the validated notice with a retry and never redirect or touch the
draft; an unreadable draft or archive is set aside under
osteo:quarantine:* (only content kinds; a failed write keeps it in place
and the editor stays), a rebase that flags items keeps the raw pre-rebase
draft. Four strings, wording validated by the owner.
Deleted: services/zoneInteraction.ts and its suite (13 cases ported to
cargo), the TypeScript Finding builder and vertebra selection rules of the
pickers, store rules, persistence parsing, hydrateReport. ESLint forbids
@faunosteo/domain in apps/app/src; the report:compare CLI keeps the frozen
domain until R4 (scripts/compare/sheet.ts). App suite 313/313 on the real
core (24 new tests: quarantine, degraded editor, core failures, N-1
reader); step6 goldens and the frozen envelopes unchanged.
This commit is contained in:
1 parent
794dfd9d0b
commit
74fcb37564
65 files changed
+2227
-1678
No files matched your search
@@ -13,19 +13,16 @@ import {
|
||||
it,
|
||||
vi,
|
||||
} from 'vitest'
|
||||
import type { Annotation } from '@faunosteo/domain'
|
||||
import {
|
||||
createReportStore,
|
||||
useReportStore,
|
||||
emptyObservation,
|
||||
} from '@/state/reportStore'
|
||||
import {
|
||||
ARCHIVE_KEY,
|
||||
DRAFT_KEY,
|
||||
sessionStoragePersistence,
|
||||
} from '@/state/persistence'
|
||||
import type { Annotation } from '@faunosteo/core-wasm/types'
|
||||
import { createReportStore, useReportStore } from '@/state/reportStore'
|
||||
import { ARCHIVE_KEY, DRAFT_KEY, QUARANTINE_KEYS } from '@/state/persistence'
|
||||
import type { SheetIndex } from '@/services/sheetIndex'
|
||||
import { archiveEnvelope, loadTestSheet, minimalReport } from '../helpers/sheet'
|
||||
import {
|
||||
archiveEnvelope,
|
||||
emptyObservation,
|
||||
loadTestSheet,
|
||||
minimalReport,
|
||||
} from '../helpers/sheet'
|
||||
import fullV2 from '../fixtures/report-v2.full.json'
|
||||
|
||||
let sheet: SheetIndex
|
||||
@@ -150,11 +147,21 @@ describe('sessionStorage mirror and restore', () => {
|
||||
expect(JSON.parse(sessionStorage.getItem(DRAFT_KEY)!).version).toBe(3)
|
||||
})
|
||||
|
||||
it('ignores an unreadable draft and does not replace an open report', () => {
|
||||
it('sets an unreadable draft aside instead of restoring it, and does not replace an open report', () => {
|
||||
// R2: an unreadable draft is quarantined (P12), no longer dropped.
|
||||
sessionStorage.setItem(DRAFT_KEY, '{not json')
|
||||
expect(sessionStoragePersistence.load(sheet.sheet.migrationMap)).toBeNull()
|
||||
expect(useReportStore.getState().restoreDraft(sheet)).toEqual({
|
||||
kind: 'quarantined',
|
||||
})
|
||||
expect(useReportStore.getState().report).toBeNull()
|
||||
sessionStorage.setItem(DRAFT_KEY, JSON.stringify({ version: 1 }))
|
||||
expect(sessionStoragePersistence.load(sheet.sheet.migrationMap)).toBeNull()
|
||||
expect(useReportStore.getState().restoreDraft(sheet)).toEqual({
|
||||
kind: 'quarantined',
|
||||
})
|
||||
expect(useReportStore.getState().report).toBeNull()
|
||||
expect(sessionStorage.getItem(QUARANTINE_KEYS.draft)).toBe(
|
||||
JSON.stringify({ version: 1 }),
|
||||
)
|
||||
useReportStore.getState().initReport(draft(), sheet.sheet.ref)
|
||||
const before = useReportStore.getState().report
|
||||
sessionStorage.setItem(DRAFT_KEY, JSON.stringify(minimalReport(sheet)))
|
||||
@@ -165,8 +172,8 @@ describe('sessionStorage mirror and restore', () => {
|
||||
it('createReportStore accepts another persistence adapter', () => {
|
||||
const saved: unknown[] = []
|
||||
const store = createReportStore(
|
||||
{ load: () => null, save: (r) => saved.push(r) },
|
||||
{ load: () => null, save: () => undefined },
|
||||
{ loadText: () => null, save: (r) => saved.push(r) },
|
||||
{ loadText: () => null, save: () => undefined },
|
||||
)
|
||||
store.getState().initReport(draft(), sheet.sheet.ref)
|
||||
expect(saved.at(-1)).toMatchObject({ version: 3 })
|
||||
@@ -174,15 +181,6 @@ describe('sessionStorage mirror and restore', () => {
|
||||
})
|
||||
|
||||
describe('store edge cases', () => {
|
||||
it('hydrateReport stores the given object as is, without revalidating', () => {
|
||||
const odd = { ...minimalReport(sheet), extra: 1 }
|
||||
useReportStore.getState().hydrateReport(odd)
|
||||
expect(useReportStore.getState().report).toBe(odd)
|
||||
expect(
|
||||
(useReportStore.getState().report as unknown as { extra: number }).extra,
|
||||
).toBe(1)
|
||||
})
|
||||
|
||||
it('identity setters are no-ops without a report', () => {
|
||||
const s = useReportStore.getState()
|
||||
s.setPractitioner({ name: 'X' })
|
||||
@@ -213,8 +211,8 @@ describe('archive of an imported Step 6 PDF', () => {
|
||||
it('the archive is written at the session edges only, never on an edit', () => {
|
||||
const archiveSaves: unknown[] = []
|
||||
const store = createReportStore(
|
||||
{ load: () => null, save: () => undefined },
|
||||
{ load: () => null, save: (a) => archiveSaves.push(a) },
|
||||
{ loadText: () => null, save: () => undefined },
|
||||
{ loadText: () => null, save: (a) => archiveSaves.push(a) },
|
||||
)
|
||||
const report = minimalReport(sheet)
|
||||
const archive = archiveEnvelope(sheet, report)
|
||||
@@ -239,7 +237,10 @@ describe('archive of an imported Step 6 PDF', () => {
|
||||
expect(sessionStorage.getItem(ARCHIVE_KEY)).not.toBeNull()
|
||||
sessionStorage.setItem(DRAFT_KEY, JSON.stringify(report))
|
||||
const outcome = useReportStore.getState().restoreDraft(sheet)
|
||||
expect(outcome).toMatchObject({ rebased: false })
|
||||
expect(outcome).toMatchObject({
|
||||
kind: 'restored',
|
||||
rebase: { rebased: false },
|
||||
})
|
||||
expect(useReportStore.getState().report?.conclusion).toBe('kept')
|
||||
expect(useReportStore.getState().archive).toEqual(archive)
|
||||
})
|
||||
@@ -250,8 +251,11 @@ describe('archive of an imported Step 6 PDF', () => {
|
||||
() => useReportStore.getState().initReport(draft(), sheet.sheet.ref),
|
||||
],
|
||||
[
|
||||
'hydrateReport',
|
||||
() => useReportStore.getState().hydrateReport(minimalReport(sheet)),
|
||||
'hydrateImport without an archive',
|
||||
() =>
|
||||
useReportStore
|
||||
.getState()
|
||||
.hydrateImport({ report: minimalReport(sheet), archive: null }),
|
||||
],
|
||||
['reset', () => useReportStore.getState().reset()],
|
||||
])('%s clears the archive and removes its mirror', (_name, act) => {
|
||||
@@ -292,9 +296,8 @@ describe('archive of an imported Step 6 PDF', () => {
|
||||
|
||||
const outcome = useReportStore.getState().restoreDraft(sheet)
|
||||
expect(outcome).toMatchObject({
|
||||
rebased: true,
|
||||
unresolvedZones: 1,
|
||||
unresolvedFindings: 0,
|
||||
kind: 'restored',
|
||||
rebase: { rebased: true, unresolvedZones: 1, unresolvedFindings: 0 },
|
||||
})
|
||||
const restored = useReportStore.getState().report!
|
||||
expect(restored.sheet).toEqual(sheet.sheet.ref)
|
||||
|
||||
Reference in new issue
Block a user