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
@@ -15,23 +15,24 @@ import {
|
||||
} from 'vitest'
|
||||
import { readFileSync } from 'node:fs'
|
||||
import { resolve } from 'node:path'
|
||||
import {
|
||||
buildSheetIndex,
|
||||
buildSheetSnapshot,
|
||||
ReportSchema,
|
||||
type Branding,
|
||||
type FindingCategory,
|
||||
type FindingNode,
|
||||
type Report,
|
||||
type ReportArchiveEnvelope,
|
||||
} from '@faunosteo/domain'
|
||||
import { exportFromEnvelope, readReportArchive } from '@faunosteo/pdf'
|
||||
import type {
|
||||
Branding,
|
||||
LocalizedText,
|
||||
Report,
|
||||
} from '@faunosteo/core-wasm/types'
|
||||
import { exportFromEnvelope } from '@faunosteo/pdf'
|
||||
import { exportReportToPdf } from '@/pdf/export'
|
||||
import { importAttachment, importReportFromPdf } from '@/pdf/import'
|
||||
import { browserRasterizer } from '@/pdf/browserRasterizer'
|
||||
import { loadBranding } from '@/pdf/branding'
|
||||
import type { LoadedSheet } from '@/sheets/provider'
|
||||
import type { BundledSheetData } from '@/sheets/provider'
|
||||
import type { SheetIndex } from '@/services/sheetIndex'
|
||||
import { loadTestSheet } from '../helpers/sheet'
|
||||
import {
|
||||
bundledSheet,
|
||||
loadTestSheet,
|
||||
sheetFromBundle,
|
||||
sheetSnapshot,
|
||||
} from '../helpers/sheet'
|
||||
import {
|
||||
FIXTURES_DIR,
|
||||
ONE_PX_PNG,
|
||||
@@ -63,11 +64,12 @@ let demo: Report
|
||||
|
||||
beforeAll(async () => {
|
||||
sheet = await loadTestSheet()
|
||||
demo = ReportSchema.parse(
|
||||
demo = importAttachment(
|
||||
JSON.parse(
|
||||
readFileSync(resolve(FIXTURES_DIR, 'report-v3.demo.json'), 'utf8'),
|
||||
),
|
||||
)
|
||||
sheet,
|
||||
).read.report
|
||||
vi.spyOn(console, 'warn').mockImplementation(() => undefined)
|
||||
})
|
||||
afterEach(() => {
|
||||
@@ -107,10 +109,13 @@ function appExport(index: SheetIndex): Promise<Facts & { pdf: Uint8Array }> {
|
||||
return recorded(() => exportReportToPdf(demo, index, { locale: 'fr' }))
|
||||
}
|
||||
|
||||
async function archiveOf(pdf: Uint8Array): Promise<ReportArchiveEnvelope> {
|
||||
const outcome = await readReportArchive(pdf, sheet.sheet.migrationMap)
|
||||
/** The envelope the app reads back from its own export, as the engine takes it. */
|
||||
type EngineEnvelope = Parameters<typeof exportFromEnvelope>[0]
|
||||
|
||||
async function archiveOf(pdf: Uint8Array): Promise<EngineEnvelope> {
|
||||
const { read: outcome } = await importReportFromPdf(pdf, sheet)
|
||||
expect(outcome.origin).toBe('envelope_v1')
|
||||
return outcome.archive!
|
||||
return outcome.archive! as EngineEnvelope
|
||||
}
|
||||
|
||||
const REEXPORT = {
|
||||
@@ -119,26 +124,42 @@ const REEXPORT = {
|
||||
exportedAt: new Date('2027-01-01T00:00:00.000Z'),
|
||||
}
|
||||
|
||||
function renameNodes(nodes: (FindingCategory | FindingNode)[]): void {
|
||||
/** A category or node of the bundled payload (authoring form: leaves have no children). */
|
||||
interface PayloadNode {
|
||||
name: LocalizedText
|
||||
children?: PayloadNode[]
|
||||
}
|
||||
|
||||
interface PayloadDocument {
|
||||
annotations: {
|
||||
id: string
|
||||
name: LocalizedText | null
|
||||
geometry: { type: string; cx?: number } | null
|
||||
}[]
|
||||
finding_zones: { name: LocalizedText; categories: PayloadNode[] }[]
|
||||
}
|
||||
|
||||
function renameNodes(nodes: PayloadNode[]): void {
|
||||
for (const node of nodes) {
|
||||
node.name = {
|
||||
fr: `${node.name.fr} (révisé)`,
|
||||
en: `${node.name.en} (revised)`,
|
||||
}
|
||||
renameNodes(node.children)
|
||||
renameNodes(node.children ?? [])
|
||||
}
|
||||
}
|
||||
|
||||
/** The catalog after a revision: every label changed, the hip marker moved. */
|
||||
function revisedSheet(source: LoadedSheet): LoadedSheet {
|
||||
function revisedSheet(source: BundledSheetData): BundledSheetData {
|
||||
const next = structuredClone(source)
|
||||
for (const a of next.document.annotations) {
|
||||
const document = next.document as PayloadDocument
|
||||
for (const a of document.annotations) {
|
||||
if (a.name) {
|
||||
a.name = { fr: `${a.name.fr} (révisé)`, en: `${a.name.en} (revised)` }
|
||||
}
|
||||
if (a.id === 'hip' && a.geometry?.type === 'circle') a.geometry.cx += 100
|
||||
if (a.id === 'hip' && a.geometry?.type === 'circle') a.geometry.cx! += 100
|
||||
}
|
||||
for (const zone of next.document.finding_zones) {
|
||||
for (const zone of document.finding_zones) {
|
||||
zone.name = {
|
||||
fr: `${zone.name.fr} (révisé)`,
|
||||
en: `${zone.name.en} (revised)`,
|
||||
@@ -154,14 +175,14 @@ describe('the archive survives its resources', () => {
|
||||
const archive = await archiveOf(first.pdf)
|
||||
|
||||
// The revision is visible through the app path (labels and geometry)...
|
||||
const revised = buildSheetIndex(revisedSheet(sheet.sheet))
|
||||
const revised = sheetFromBundle(revisedSheet(await bundledSheet()))
|
||||
const onRevised = await appExport(revised)
|
||||
expect(onRevised.texts).not.toEqual(first.texts)
|
||||
const revisedViews = snapshotViews(
|
||||
buildSheetSnapshot(revised.sheet, demo),
|
||||
const revisedViews = snapshotViews(sheetSnapshot(revised, demo), demo)
|
||||
const archivedViews = snapshotViews(
|
||||
archive.sheetSnapshot as Parameters<typeof snapshotViews>[0],
|
||||
demo,
|
||||
)
|
||||
const archivedViews = snapshotViews(archive.sheetSnapshot, demo)
|
||||
expect(revisedViews).not.toEqual(archivedViews)
|
||||
|
||||
// ...and absent from a re-export of the envelope alone.
|
||||
|
||||
Reference in new issue
Block a user