diff --git a/src/lib/canvas-core/copy-paths.ts b/src/lib/canvas-core/copy-paths.ts new file mode 100644 index 0000000..17c4384 --- /dev/null +++ b/src/lib/canvas-core/copy-paths.ts @@ -0,0 +1,28 @@ +import type { Json } from './types.ts'; +import { fault } from './values.ts'; + +/** Own JSON fields only. A * segment enumerates an array, never object keys. */ +export function* copySlots(data: Json, path: readonly string[]): Generator<{parent: Record; key: string}> { + const work: {value: Json; depth: number}[] = [{value: data, depth: 0}]; + while (work.length) { + const {value, depth} = work.pop()!, key = path[depth]; + if (key === '*') { + if (!Array.isArray(value)) throw fault('invalid_copy_reference'); + if (depth === path.length - 1) { for (let i = 0; i < value.length; i++) yield {parent: value as unknown as Record, key: String(i)}; } + else for (let i = value.length - 1; i >= 0; i--) work.push({value: value[i], depth: depth + 1}); + } else if (value && typeof value === 'object' && Object.hasOwn(value, key)) { + if (depth === path.length - 1) yield {parent: value as Record, key}; + else work.push({value: (value as Record)[key], depth: depth + 1}); + } + } +} +export function* copyReferenceIds(data: Json, ref: {path: readonly string[]; many?: boolean}): Generator { + for (const {parent, key} of copySlots(data, ref.path)) { + const value = parent[key]; if (value === null) continue; + if (ref.many && !Array.isArray(value)) throw fault('invalid_copy_reference'); + for (const id of ref.many ? value as Json[] : [value]) { + if (typeof id !== 'string' || !id) throw fault('invalid_copy_reference'); + yield id; + } + } +} diff --git a/src/lib/canvas-core/duplicate.ts b/src/lib/canvas-core/duplicate.ts index 7741030..8176991 100644 --- a/src/lib/canvas-core/duplicate.ts +++ b/src/lib/canvas-core/duplicate.ts @@ -1,4 +1,5 @@ import type { CanvasRecord, Change, Data, Document, ElementRecord, Id, Json, Point, Registry, Target } from './types.ts'; +import { copySlots } from './copy-paths.ts'; import { ancestors, commonCanvas, targetElement, validateDocumentSteps } from './document.ts'; import { connectionPathValid } from './features.ts'; import { canvasTransform, convertPath, toLocal, toWorld } from './coordinates.ts'; @@ -11,25 +12,22 @@ export function remapCopyData(element: ElementRecord, registry: Registry, elemen const definition = registry.components.get(element.componentId), schema = definition?.copy; if (registry.resolve(element) !== 'known' || !schema) throw fault('copy_schema_unavailable', [element.id]); const data = clone(element.data) as Record; - const locate = (path: readonly string[]) => { - let parent: Json = data; - for (const key of path.slice(0, -1)) { if (!parent || typeof parent !== 'object' || !Object.hasOwn(parent, key)) return; parent = (parent as Record)[key]; } - if (parent && typeof parent === 'object' && Object.hasOwn(parent, path.at(-1)!)) return { parent: parent as Record, key: path.at(-1)! }; - }; for (const ref of schema.references) { - const slot = locate(ref.path); if (!slot || slot.parent[slot.key] === null) continue; - const mapped = (value: Json): Json => { - if (typeof value !== 'string' || !value) throw fault('invalid_copy_reference', [element.id]); - const map = ref.target === 'element' ? elements : canvases, known = ref.target === 'element' ? document.elements : document.canvases; - if (map.has(value)) return map.get(value)!; - if (ref.external !== 'preserve' || !known.has(value)) throw fault('copy_external_reference', [element.id, value]); - return value; - }; - const value = slot.parent[slot.key]; - if (ref.many && !Array.isArray(value)) throw fault('invalid_copy_reference', [element.id]); - slot.parent[slot.key] = ref.many ? (value as Json[]).map(mapped) : mapped(value); + for (const slot of copySlots(data, ref.path)) { + if (slot.parent[slot.key] === null) continue; + const mapped = (value: Json): Json => { + if (typeof value !== 'string' || !value) throw fault('invalid_copy_reference', [element.id]); + const map = ref.target === 'element' ? elements : canvases, known = ref.target === 'element' ? document.elements : document.canvases; + if (map.has(value)) return map.get(value)!; + if (ref.external !== 'preserve' || !known.has(value)) throw fault('copy_external_reference', [element.id, value]); + return value; + }; + const value = slot.parent[slot.key]; + if (ref.many && !Array.isArray(value)) throw fault('invalid_copy_reference', [element.id]); + slot.parent[slot.key] = ref.many ? (value as Json[]).map(mapped) : mapped(value); + } } - for (const path of schema.omit) { const slot = locate(path); if (slot) { if (Array.isArray(slot.parent)) throw fault('invalid_copy_omit', [element.id]); delete slot.parent[slot.key]; } } + for (const path of schema.omit) for (const slot of copySlots(data, path)) { if (Array.isArray(slot.parent)) throw fault('invalid_copy_omit', [element.id]); delete slot.parent[slot.key]; } return data; } diff --git a/src/lib/canvas-core/features.ts b/src/lib/canvas-core/features.ts index d9a4904..430d73a 100644 --- a/src/lib/canvas-core/features.ts +++ b/src/lib/canvas-core/features.ts @@ -48,7 +48,7 @@ export function builtinComponents(): readonly ComponentDefinition[] { id, dataVersion: 1, structure: 'node', validate: textData, features: [movable(), resizable(), ...(id === 'frame' ? [] : [rotatable()]), editable()], resourceFields: ['image', 'plain-image'].includes(id) ? ['assetId','asset'] : [], - copy: { references: [], omit: [['taskId'], ['runId'], ['progress'], ['runStatus']] }, + copy: { references: id === 'frame' ? [{path:['ports','*','nodeId'],target:'element',external:'reject'}] : [], omit: [['taskId'], ['runId'], ['progress'], ['runStatus']] }, })).concat([defineComponent({ id: 'connection', dataVersion: 1, structure: 'connection', validate: data => validJson(data), features: [editable(), connectionEditable()], resourceFields: [], copy: { references: [], omit: [] } })]); } diff --git a/src/lib/canvas-core/registry.ts b/src/lib/canvas-core/registry.ts index 9bb2ab8..0ac2473 100644 --- a/src/lib/canvas-core/registry.ts +++ b/src/lib/canvas-core/registry.ts @@ -12,7 +12,7 @@ export function defineComponent(definition: ComponentDefinition): ComponentDefin const references = definition.copy.references, omitted = definition.copy.omit; if (!Array.isArray(references) || !Array.isArray(omitted) || omitted.some(path => !pathValid(path)) || references.some(ref => !pathValid(ref.path) || !['element','canvas'].includes(ref.target) || !['preserve','reject'].includes(ref.external) || ref.many !== undefined && typeof ref.many !== 'boolean')) throw fault('invalid_copy_schema'); const paths: readonly (readonly string[])[] = [...references.map(ref => ref.path), ...omitted]; - for (let i = 0; i < paths.length; i++) for (let j = 0; j < i; j++) if (paths[i].slice(0, Math.min(paths[i].length, paths[j].length)).every((key, index) => key === paths[j][index])) throw fault('conflicting_copy_paths'); + for (let i = 0; i < paths.length; i++) for (let j = 0; j < i; j++) if (paths[i].slice(0, Math.min(paths[i].length, paths[j].length)).every((key, index) => (key === paths[j][index] || key === '*' || paths[j][index] === '*'))) throw fault('conflicting_copy_paths'); } return freeze({ ...definition, copy: definition.copy ? clone(definition.copy) : undefined, features: definition.features.map(feature => defineFeature(feature.id, feature.handlers)), migrations: definition.migrations ? { ...definition.migrations } : undefined, resourceFields: definition.resourceFields ? [...definition.resourceFields] : undefined }); } diff --git a/src/lib/canvas-core/types.ts b/src/lib/canvas-core/types.ts index 984551e..8177051 100644 --- a/src/lib/canvas-core/types.ts +++ b/src/lib/canvas-core/types.ts @@ -50,6 +50,7 @@ export type ReadonlyValueSet = Pick, 'size' | 'has' | 'entries export type Capability = 'geometry.move' | 'geometry.resize' | 'geometry.rotate' | 'content.edit' | 'connection.edit'; export type CapabilityHandler = (context: { readonly element: ElementRecord; readonly input: Readonly> }) => readonly FieldChange[]; export type Feature = { readonly id: string; readonly handlers: Readonly>> }; +/** Path segments address own fields; * iterates array entries. many marks a terminal ID array. */ export type CopyReference = { readonly path: readonly string[]; readonly target: 'element' | 'canvas'; readonly many?: boolean; readonly external: 'preserve' | 'reject' }; export type CopySchema = { readonly references: readonly CopyReference[]; readonly omit: readonly (readonly string[])[] }; export type ComponentDefinition = { readonly id: string; readonly dataVersion: number; readonly structure: ElementRecord['structure']; readonly features: readonly Feature[]; readonly validate: (data: Data) => boolean; readonly migrations?: Readonly Data>>; readonly resourceFields?: readonly string[]; readonly copy?: CopySchema }; diff --git a/src/lib/canvas-runtime/engine.ts b/src/lib/canvas-runtime/engine.ts index d9598c7..7705aa9 100644 --- a/src/lib/canvas-runtime/engine.ts +++ b/src/lib/canvas-runtime/engine.ts @@ -318,7 +318,7 @@ export async function openProjectEngine(options: EngineOptions) { function getImport(id:Id){const job=editor.getSnapshot().runtime.imports?.get(id);if(!job)throw fault('import_missing',[id]);return job;} function publishImport(job:ImportJob,expectedGeneration:number){ assertWritable();const permission=options.policy?.({type:'changes.apply',changes:[]},editor.getSnapshot().document);if(permission&&!permission.enabled)throw fault(permission.code,permission.targets); - const result=editor.updateRuntime(previous=>{const imports=new Map(previous.imports??[]);if(imports.get(job.id)?.generation!==expectedGeneration)throw fault('stale_import_job');imports.set(job.id,job);return Object.freeze({...previous,imports:readMap(imports)});});if(result.status==='rejected')throw fault(result.code,result.targets); + const result=editor.updateRuntime(previous=>{const imports=new Map(previous.imports??[]);if(imports.get(job.id)?.generation!==expectedGeneration)throw fault('stale_import_job');imports.set(job.id,job.version===2?job:freeze({...job,version:2 as const}));return Object.freeze({...previous,imports:readMap(imports)});});if(result.status==='rejected')throw fault(result.code,result.targets); } function holdImports(){const token=Symbol(),releases=new Mapvoid>();importHolds.set(token,releases);for(const controller of preparationControllers.values())controller.abort();for(const[id,runner]of importRunners)releases.set(id,runner.hold());return()=>{if(!importHolds.delete(token))return;for(const release of releases.values())release();if(!closing&&!closed)for(const job of editor.getSnapshot().runtime.imports?.values()??[])if(['running','preparing'].includes(job.status)&&!importRunners.has(job.id))void loadImport(job.id);};} async function materializeCopy(id:Id,bytes:Blob,controller:AbortController){ @@ -355,10 +355,10 @@ export async function openProjectEngine(options: EngineOptions) { if(!bytes)throw fault('import_source_unavailable');if(bytes.size!==source.byteLength)throw fault('import_source_changed'); if(source.kind==='duplicate-snapshot'){if(preparationController.signal.aborted||importHolds.size||latest.status!=='preparing')return;const materialized=await materializeCopy(id,bytes,preparationController);job=materialized.job;source=job.source!;bytes=materialized.bytes;expectedFingerprint=job.sourceFingerprint;} const runner=createImportRunner({optimisticLocal:true,source:createNdjsonImportSource({bytes,fingerprint:job.sourceFingerprint}),getJob:()=>getImport(id),createId, - publish:publishImport,prepare:(line,job,reserve)=>job.source?.kind==='duplicate-ndjson'?prepareDuplicateImport(line,job,reserve):prepareNativeImport(line,job,reserve,editor.getSnapshot().document,options.registry),persist,onError:report, + publish:publishImport,prepare:(line,job,reserve)=>job.source?.kind==='duplicate-ndjson'?prepareDuplicateImport(line,job,reserve,options.registry):prepareNativeImport(line,job,reserve,editor.getSnapshot().document,options.registry),persist,onError:report, commit(units,next,expected){ assertWritable();if(importing)throw fault('reentrant_dispatch');const current=getImport(id);if(current.generation!==expected)throw fault('stale_import_job'); - try{assertNativeImportTarget(current,editor.getSnapshot().document);for(const unit of units){assertNativeImportDependencies(current,editor.getSnapshot().document,unit.dependencies);if(current.source?.kind==='duplicate-ndjson')assertDuplicateExternal({cursor:0,nextCursor:1,key:unit.key,value:unit.guard},current,editor.getSnapshot().document);}}catch(error){return reject(error);} + try{assertNativeImportTarget(current,editor.getSnapshot().document);for(const unit of units){assertNativeImportDependencies(current,editor.getSnapshot().document,unit.dependencies);if(current.source?.kind==='duplicate-ndjson')assertDuplicateExternal({cursor:0,nextCursor:1,key:unit.key,value:unit.guard},current,editor.getSnapshot().document,options.registry);}}catch(error){return reject(error);} importing={job:next,expectedGeneration:expected}; try{return editor.transaction(tx=>{for(const unit of units)for(const change of unit.changes){if(change.kind==='element'&&change.before===null&&change.after)tx.dispatch({type:'element.create',element:change.after});else if(change.kind==='canvas'&&change.before===null&&change.after)tx.dispatch({type:'canvas.create',canvas:change.after});else throw fault('invalid_native_import_unit');}},{label:current.source?.kind==='duplicate-ndjson'?'Duplicate selection':'Import canvas content',groupId:`import:${id}`});}finally{importing=undefined;} }, diff --git a/src/lib/canvas-runtime/import-duplicate.ts b/src/lib/canvas-runtime/import-duplicate.ts index bd15759..5b6f9e5 100644 --- a/src/lib/canvas-runtime/import-duplicate.ts +++ b/src/lib/canvas-runtime/import-duplicate.ts @@ -1,4 +1,5 @@ import type { CanvasRecord, Change, Document, Id, Json, Registry } from '../canvas-core/types.ts'; +import { copyReferenceIds } from '../canvas-core/copy-paths.ts'; import type { DuplicatePlan } from '../canvas-core/duplicate.ts'; import { clone, equal, fault, validJson } from '../canvas-core/values.ts'; import type { ImportJob, ImportLine, ImportUnit } from './imports.ts'; @@ -34,7 +35,7 @@ export async function encodeDuplicateSource(document: Document, registry: Regist const record=change.after;canvas(record.ownerCanvasId); if(record.structure==='connection'){element(record.source.elementId);element(record.target.elementId);} const schema=registry.components.get(record.componentId)?.copy;if(!schema)throw fault('copy_schema_unavailable'); - for(const ref of schema.references){let value:Json|undefined=record.data;for(const part of ref.path){if(!value||typeof value!=='object'||!Object.hasOwn(value,part)){value=undefined;break;}value=(value as Record)[part];}if(value===undefined||value===null)continue;for(const id of ref.many?value as Json[]:[value]){if(typeof id!=='string')throw fault('invalid_copy_reference');if(ref.target==='element')element(id);else canvas(id);}} + for(const ref of schema.references)for(const id of copyReferenceIds(record.data,ref)){if(ref.target==='element')element(id);else canvas(id);} } const key=keys.get(change.id);if(!key)throw fault('invalid_duplicate_plan');dependencies.delete(key); const line:CopyLine={key,change,dependencies:[...dependencies],externalElements:[...elements.values()],externalCanvases:[...canvases.values()]}; @@ -50,14 +51,25 @@ function copyLine(line:ImportLine,job:ImportJob):CopyLine { if(value.change.kind==='element'&&value.change.after?.incarnation!==1)throw fault('invalid_duplicate_source'); return value; } -export function prepareDuplicateImport(line:ImportLine,job:ImportJob,reserve:(key:string)=>Id):ImportUnit { - const value=copyLine(line,job);if(reserve(value.key)!==value.change.id)throw fault('invalid_duplicate_source'); +/** Re-check the current reference contract when decoding old durable prepared sources. */ +function assertCopyReferences(value:CopyLine,job:ImportJob,registry:Registry){ + if(value.change.kind!=='element')return; + const record=value.change.after!,schema=registry.components.get(record.componentId)?.copy; + if(registry.resolve(record)!=='known'||!schema)throw fault('copy_schema_unavailable'); + for(const ref of schema.references)for(const id of copyReferenceIds(record.data,ref)){ + const key=Object.keys(job.stableIds).find(key=>job.stableIds[key]===id&&key.startsWith(`${ref.target}:`)); + if(key){if(key!==value.key&&!value.dependencies.includes(key))throw fault('invalid_duplicate_source');} + else if(ref.external!=='preserve'||!(ref.target==='element'?value.externalElements:value.externalCanvases).some(guard=>guard.id===id))throw fault('copy_external_reference',[record.id,id]); + } +} +export function prepareDuplicateImport(line:ImportLine,job:ImportJob,reserve:(key:string)=>Id,registry:Registry):ImportUnit { + const value=copyLine(line,job);assertCopyReferences(value,job,registry);if(reserve(value.key)!==value.change.id)throw fault('invalid_duplicate_source'); for(const key of value.dependencies)if(!Object.hasOwn(job.stableIds,key))throw fault('invalid_duplicate_source'); return{key:value.key,dependencies:value.dependencies,changes:[value.change],guard:clone(line.value!)}; } /** Check at the synchronous commit boundary, never only when the source was first parsed. */ -export function assertDuplicateExternal(line:ImportLine,job:ImportJob,document:Document){ - const value=copyLine(line,job); +export function assertDuplicateExternal(line:ImportLine,job:ImportJob,document:Document,registry:Registry){ + const value=copyLine(line,job);assertCopyReferences(value,job,registry); for(const guard of value.externalElements){const record=document.elements.get(guard.id);if(!record||record.incarnation!==guard.incarnation||record.ownerCanvasId!==guard.ownerCanvasId)throw fault('copy_external_changed',[guard.id]);} for(const guard of value.externalCanvases){const record=document.canvases.get(guard.id);if(!record||!equal(record.parent,guard.parent)||guard.parent&&document.elements.get(guard.parent.entryElementId)?.incarnation!==guard.entryIncarnation)throw fault('copy_external_changed',[guard.id]);} } diff --git a/src/lib/canvas-runtime/import-groups.ts b/src/lib/canvas-runtime/import-groups.ts new file mode 100644 index 0000000..6b31cda --- /dev/null +++ b/src/lib/canvas-runtime/import-groups.ts @@ -0,0 +1,40 @@ +import type { ImportLocator } from './imports.ts'; +import { fault } from '../canvas-core/values.ts'; + +/** Ready SCCs are indivisible. Ordinary records retain source-order FIFO selection. */ +export function selectImportGroups(pending: readonly ImportLocator[], committed: ReadonlySet, limits: {units: number; bytes: number; changes: number}): readonly (readonly ImportLocator[])[] { + const byKey = new Map(pending.map((row, index) => [row.key, {row, index}])), edges = new Map(), reverse = new Map(); + for (const row of pending) { + const dependencies = row.dependencies.filter(key => byKey.has(key)); edges.set(row.key, dependencies); + for (const key of dependencies) { const list = reverse.get(key) ?? []; list.push(row.key); reverse.set(key, list); } + } + const seen = new Set(), finish: string[] = []; + for (const row of pending) { + if (seen.has(row.key)) continue; + seen.add(row.key); const stack = [{key: row.key, index: 0}]; + while (stack.length) { + const frame = stack.at(-1)!, neighbors = edges.get(frame.key)!; + if (frame.index === neighbors.length) { finish.push(frame.key); stack.pop(); continue; } + const key = neighbors[frame.index++]; if (!seen.has(key)) { seen.add(key); stack.push({key, index: 0}); } + } + } + seen.clear(); const components: ImportLocator[][] = []; + for (let i = finish.length - 1; i >= 0; i--) { + const first = finish[i]; if (seen.has(first)) continue; + const stack = [first], group: ImportLocator[] = []; seen.add(first); + while (stack.length) { const key = stack.pop()!; group.push(byKey.get(key)!.row); for (const next of reverse.get(key) ?? []) if (!seen.has(next)) { seen.add(next); stack.push(next); } } + group.sort((a, b) => byKey.get(a.key)!.index - byKey.get(b.key)!.index); components.push(group); + } + components.sort((a, b) => byKey.get(a[0].key)!.index - byKey.get(b[0].key)!.index); + const available = new Set(committed), chosen: ImportLocator[][] = []; let units = 0, bytes = 0, changes = 0; + for (const group of components) { + const internal = new Set(group.map(row => row.key)); + if (!group.every(row => row.dependencies.every(key => available.has(key) || internal.has(key)))) continue; + const size = group.reduce((sum, row) => sum + row.byteLength, 0), count = group.reduce((sum, row) => sum + row.changeCount, 0); + if (size > limits.bytes || count > limits.changes) throw fault('import_dependency_group_capacity'); + // The frame's adaptive unit budget is soft for one SCC, byte/change safety limits are hard. + if (units && units + group.length > limits.units || bytes + size > limits.bytes || changes + count > limits.changes) continue; + chosen.push(group); units += group.length; bytes += size; changes += count; for (const row of group) available.add(row.key); + } + return chosen; +} diff --git a/src/lib/canvas-runtime/import-native.ts b/src/lib/canvas-runtime/import-native.ts index e416b67..6b9583c 100644 --- a/src/lib/canvas-runtime/import-native.ts +++ b/src/lib/canvas-runtime/import-native.ts @@ -1,4 +1,5 @@ import type { Document, ElementRecord, Id, Json, Registry } from '../canvas-core/types.ts'; +import { copyReferenceIds } from '../canvas-core/copy-paths.ts'; import { remapCopyData } from '../canvas-core/duplicate.ts'; import { clone, fault } from '../canvas-core/values.ts'; import type { ImportJob, ImportLine, ImportUnit } from './imports.ts'; @@ -36,12 +37,7 @@ export function prepareNativeImport(line:ImportLine,job:ImportJob,reserve:(key:s } const original=record as unknown as ElementRecord,definition=registry.components.get(original.componentId); if(registry.resolve(original)!=='known'||!definition?.copy||!original.data||typeof original.data!=='object'||Array.isArray(original.data))throw fault('import_component_unavailable'); - for(const ref of definition.copy.references){ - let value:Json|undefined=original.data;for(const part of ref.path){if(!value||typeof value!=='object'||!Object.hasOwn(value,part)){value=undefined;break;}value=(value as Record)[part];} - if(value===undefined||value===null)continue; - if(ref.many&&!Array.isArray(value))throw fault('invalid_import_reference'); - for(const item of ref.many?value as Json[]:[value]){if(typeof item!=='string'||!item)throw fault('invalid_import_reference');if(ref.target==='element')element(item);else owner(item);} - } + for(const ref of definition.copy.references)for(const item of copyReferenceIds(original.data,ref)){if(ref.target==='element')element(item);else owner(item);} const after={...record,id,incarnation:1,ownerCanvasId:owner(original.ownerCanvasId),data:remapCopyData(original,registry,elementIds,canvasIds,document)}; if(original.structure==='connection'){ if(!original.source||!original.target)throw fault('invalid_import_endpoint'); diff --git a/src/lib/canvas-runtime/imports.ts b/src/lib/canvas-runtime/imports.ts index f93ec83..411f546 100644 --- a/src/lib/canvas-runtime/imports.ts +++ b/src/lib/canvas-runtime/imports.ts @@ -1,4 +1,5 @@ import type { Change, Id, Json, Result, Target, Point } from '../canvas-core/types.ts'; +import { selectImportGroups } from './import-groups.ts'; import { clone, equal, fault, freeze, validJson } from '../canvas-core/values.ts'; export type ImportLine = { readonly cursor: number; readonly nextCursor: number; readonly key: string; readonly value?: Json; readonly error?: string; readonly skip?: boolean }; @@ -9,7 +10,7 @@ export type ImportFailure = { readonly key: string; readonly cursor: number; rea export type NativeImportSource = { readonly kind: 'native-ndjson' | 'duplicate-ndjson' | 'duplicate-snapshot'; readonly copy?: {readonly sourceRevision:number; readonly roots:readonly Id[]}; readonly name?:string; readonly fileId: Id; readonly byteLength: number; readonly targetCanvasId: Id; readonly targetEntry?: {readonly id:Id;readonly incarnation:number} }; export type ImportBinding = {readonly kind:'element';readonly incarnation:number}|{readonly kind:'canvas';readonly entryElementId?:Id}; export type ImportJob = { - readonly version: 1; readonly id: Id; readonly projectId: Id; readonly sourceFingerprint: string; readonly parserVersion: number; + readonly version: 1 | 2; readonly id: Id; readonly projectId: Id; readonly sourceFingerprint: string; readonly parserVersion: number; readonly source?: NativeImportSource; readonly preparation?: {readonly version:1;readonly registrySignature:string;readonly selection:readonly Target[];readonly worldOffset:Point;readonly allocationIds:readonly Id[];readonly steps:number}; readonly generation: number; readonly status: 'preparing' | 'paused' | 'running' | 'completed' | 'partial' | 'cancelled'; readonly cursor: number; readonly eof: boolean; @@ -18,11 +19,11 @@ export type ImportJob = { }; export function createImportJob(input: Pick): ImportJob { if (![input.id,input.projectId,input.sourceFingerprint].every(value=>typeof value==='string'&&!!value) || !Number.isSafeInteger(input.parserVersion) || input.parserVersion<1) throw fault('invalid_import_job'); - return freeze({ id: input.id, projectId: input.projectId, sourceFingerprint: input.sourceFingerprint, parserVersion: input.parserVersion, ...(input.source?{source:clone(input.source)}:{}), version: 1, generation: 0, status: 'paused', cursor: 0, eof: false, bindings: {}, stableIds: {}, pending: [], committedSourceKeys: [], failures: [] }); + return freeze({ id: input.id, projectId: input.projectId, sourceFingerprint: input.sourceFingerprint, parserVersion: input.parserVersion, ...(input.source?{source:clone(input.source)}:{}), version: 2, generation: 0, status: 'paused', cursor: 0, eof: false, bindings: {}, stableIds: {}, pending: [], committedSourceKeys: [], failures: [] }); } export function validateImportJob(job: ImportJob): void { if(!job||typeof job!=='object'||!validJson(job)||!job.stableIds||typeof job.stableIds!=='object'||Array.isArray(job.stableIds)||![job.pending,job.committedSourceKeys,job.failures].every(Array.isArray)||job.error!==undefined&&typeof job.error!=='string')throw fault('invalid_import_job'); - if (job.version !== 1) throw fault('import_interpreter_unavailable'); + if (job.version !== 1 && job.version !== 2) throw fault('import_interpreter_unavailable'); createImportJob(job); if (!Number.isSafeInteger(job.generation) || job.generation<0 || !Number.isSafeInteger(job.cursor) || job.cursor<0 || typeof job.eof!=='boolean' || !['preparing','paused','running','completed','partial','cancelled'].includes(job.status)) throw fault('invalid_import_job'); if(job.source&&(!['native-ndjson','duplicate-ndjson','duplicate-snapshot'].includes(job.source.kind)||job.source.kind==='duplicate-ndjson'&&(!job.source.copy||!Number.isSafeInteger(job.source.copy.sourceRevision)||job.source.copy.sourceRevision<0||!Array.isArray(job.source.copy.roots)||!job.source.copy.roots.length||job.source.copy.roots.some(id=>typeof id!=='string'||!id))||job.source.name!==undefined&&(typeof job.source.name!=='string'||job.source.name.length>255)||!job.source.fileId||!job.source.targetCanvasId||!Number.isSafeInteger(job.source.byteLength)||job.source.byteLength<0||job.source.targetEntry&&(!job.source.targetEntry.id||!Number.isSafeInteger(job.source.targetEntry.incarnation)||job.source.targetEntry.incarnation<1)))throw fault('invalid_import_source'); @@ -98,7 +99,7 @@ export function createImportRunner(ports:ImportRunnerPorts){ let active:Promise|undefined,controller:AbortController|undefined,closed=false,restart=false;const holds=new Set(); const report=(error:unknown)=>{try{ports.onError(error);}catch{/* Reporting cannot change imported content. */}}; function current(){const job=ports.getJob();if(job.id!==identity.id||job.projectId!==identity.projectId||job.sourceFingerprint!==identity.sourceFingerprint||job.parserVersion!==identity.parserVersion)throw fault('import_identity_changed');return job;} - function next(job:ImportJob,patch:Partial):ImportJob{const value={...job,...patch,generation:job.generation+1};if(value.error===undefined)delete value.error;return freeze(value);} + function next(job:ImportJob,patch:Partial):ImportJob{const value={...job,...patch,version:2 as const,generation:job.generation+1};if(value.error===undefined)delete value.error;return freeze(value);} function publish(job:ImportJob,patch:Partial){const value=next(job,patch);ports.publish(value,job.generation);if(!equal(current(),value))throw fault('invalid_import_publish');return value;} function prepare(line:ImportLine,job:ImportJob){ const ids:Record=Object.assign(Object.create(null),job.stableIds),used=new Set(Object.values(ids)); @@ -136,11 +137,11 @@ export function createImportRunner(ports:ImportRunnerPorts){ if(ports.source.fingerprint!==job.sourceFingerprint||ports.source.parserVersion!==job.parserVersion)throw fault('import_source_mismatch'); if(didWork&&now()-frame>=budget){await(ports.yieldTask??yieldTask)();frame=now();didWork=false;continue;} didWork=true; - const committed=new Set(job.committedSourceKeys),chosen:ImportLocator[]=[];let chosenBytes=0,chosenChanges=0; + const committed=new Set(job.committedSourceKeys); const batchLimit=Math.max(1,Math.min(maxBatch,costPerUnit===undefined?1:Math.floor(budget/(costPerUnit*1.5)))); - for(const locator of job.pending)if(chosen.lengthcommitted.has(key)||chosen.some(unit=>unit.key===key))){chosen.push(locator);chosenBytes+=locator.byteLength;chosenChanges+=locator.changeCount;} + const groups=selectImportGroups(job.pending,committed,{units:batchLimit,bytes:maxBytes,changes:10000}),chosen=groups.flat(); if(chosen.length){ - const units:ImportUnit[]=[];let failed:ImportFailure|undefined; + const units:ImportUnit[]=[]; for(const locator of chosen){ const cached=decoded.get(locator.key); if(cached&&cached.digest===locator.digest){units.push(cached.unit);continue;} @@ -157,13 +158,14 @@ export function createImportRunner(ports:ImportRunnerPorts){ let proposed=completed(job,units,job.pending.filter(unit=>!chosen.includes(unit))); let result=commit(units,job,proposed); if(result.status==='rejected'){ - // Isolate a failed record without discarding valid independent records in the same candidate batch. - for(let index=0;indexjob.committedSourceKeys.includes(key)))continue; - proposed=completed(job,[unit],job.pending.filter(value=>value.key!==unit.key)); - result=commit([unit],job,proposed); - if(result.status==='rejected'){failed={key:unit.key,cursor:locator.cursor,code:result.code};publish(job,{pending:job.pending.filter(value=>value.key!==unit.key),failures:[...job.failures,failed]});} + // Reject a reference cycle as a whole; isolate only independent SCCs. + const byKey=new Map(units.map(unit=>[unit.key,unit])); + for(const group of groups){ + job=current();const internal=new Set(group.map(row=>row.key)),members=group.map(row=>byKey.get(row.key)!); + if(!members.every(unit=>unit.dependencies.every(key=>internal.has(key)||job.committedSourceKeys.includes(key))))continue; + proposed=completed(job,members,job.pending.filter(value=>!internal.has(value.key))); + result=commit(members,job,proposed); + if(result.status==='rejected'){const code=result.code;publish(job,{pending:job.pending.filter(value=>!internal.has(value.key)),failures:[...job.failures,...group.map(row=>({key:row.key,cursor:row.cursor,code}))]});} await ports.persist();if(closed||signal.aborted||current().status!=='running')return; if(now()-frame>=budget){await(ports.yieldTask??yieldTask)();frame=now();} } diff --git a/tests/headless/browser-storage-cases.mjs b/tests/headless/browser-storage-cases.mjs index d347f1c..b28e12f 100644 --- a/tests/headless/browser-storage-cases.mjs +++ b/tests/headless/browser-storage-cases.mjs @@ -319,6 +319,19 @@ async function resourceRecoveryCase(name, assert) { } +async function referenceCycleCase(name,assert){ + const root=crypto.randomUUID(),workspace=crypto.randomUUID(),registry=createRegistry(builtinComponents()),database=`${name}-reference-cycle`,storage=createBrowserStorage({name:database}),original=createDocument(root,[{id:root,parent:null}],[]); + let document=original,versions=new Map([[root,1]]),engine; + const transport=async request=>{const body=JSON.parse(request.body);for(const[id,version]of Object.entries(body.expected_versions))assert(version===(versions.get(id)??0),'cycle lost a version fence');for(const operation of body.operations)document=applyChanges(document,operation.changes);for(const id of Object.keys(body.expected_versions))versions.set(id,(versions.get(id)??0)+1);const participants=Object.keys(body.expected_versions);return{status:200,body:{protocol_version:2,request_id:request.requestId,status:'applied',operation_ids:body.operations.map(row=>row.id),model:{documentFormatVersion:1,projectId:root,complete:false,removedCanvasIds:participants.filter(id=>!document.canvases.has(id)),canvases:[...document.canvases.values()].filter(row=>participants.includes(row.id)),elements:[...document.elements.values()].filter(row=>participants.includes(row.ownerCanvasId)),tombstones:Object.fromEntries(document.tombstones),versions:Object.fromEntries(participants.map(id=>[id,versions.get(id)]))}}};}; + const options={scope:{accountId:crypto.randomUUID(),workspaceId:workspace,projectId:root},registry,document:original,versions:new Map(versions),storage,persistence:createFoundryPersistence({workspaceId:workspace,rootId:root,registry,transport})}; + const node=(id,owner,componentId='text')=>({kind:'element',key:id,record:{id,incarnation:1,structure:'node',componentId,dataVersion:1,ownerCanvasId:owner,data:{title:id,text:'',...(componentId==='frame'?{ports:[{id:'in',direction:'input',nodeId:'A',handle:'left'}]}:{})},geometry:{x:0,y:0,width:200,height:100,rotation:0}}}); + try{ + engine=await openProjectEngine(options);const imported=engine.imports.startNdjson(new Blob([[node('F','$target','frame'),{kind:'canvas',key:'S',record:{id:'S',parent:{canvasId:'$target',entryElementId:'F'}}},node('A','S')].map(row=>JSON.stringify(row)).join('\n')]),root);await engine.settle();const first=engine.imports.getJobs().get(imported),F=first.stableIds['element:F'],A=first.stableIds['element:A'];assert(first.status==='completed'&&first.committedSourceKeys.length===3,'native cycle did not complete atomically');assert(document.elements.get(F).data.ports[0].nodeId===A,'native port kept the source ID'); + const copied=await engine.imports.duplicate([{id:F,incarnation:1}]);await engine.settle();const job=engine.imports.getJobs().get(copied),F2=job.stableIds[`element:${F}`],A2=job.stableIds[`element:${A}`];assert(job.status==='completed'&&job.committedSourceKeys.length===3,'copy cycle lost a member');assert(document.elements.get(F2).data.ports[0].nodeId===A2&&A2!==A,'copy port attached to the original child'); + await engine.close();engine=await openProjectEngine(options);assert(engine.getSnapshot().document.elements.get(F2).data.ports[0].nodeId===A2,'IndexedDB lost the copied reference');assert(engine.editor.history.undo().status==='applied','cycle undo failed');await engine.settle();assert(!document.elements.has(F2)&&!document.elements.has(A2)&&document.elements.has(F),'cycle undo exposed half a group');assert(engine.editor.history.redo().status==='applied','cycle redo failed');await engine.settle();await engine.close();engine=await openProjectEngine(options);assert(engine.getSnapshot().document.elements.get(F2).data.ports[0].nodeId===A2&&engine.getSnapshot().document.elements.get(A2).incarnation===2,'cycle redo/reopen lost the restored identity'); + }finally{await engine?.close();storage.close();indexedDB.deleteDatabase(database);} +} + async function duplicateRecoveryCase(name,assert){ const root=crypto.randomUUID(),child=crypto.randomUUID(),workspace=crypto.randomUUID(),account=crypto.randomUUID(),registry=createRegistry(builtinComponents()),database=`${name}-duplicate`,storage=createBrowserStorage({name:database}); const node=(id,owner=root,componentId='text')=>({id,incarnation:1,structure:'node',ownerCanvasId:owner,componentId,dataVersion:1,data:{title:id,text:'',...(componentId==='image'?{assetId:'shared',src:'asset:shared',runId:'do-not-run'}:{})},geometry:{x:0,y:0,width:200,height:100,rotation:0}}); @@ -529,6 +542,8 @@ export async function run() { results.push('owned immutable recovery images survive IndexedDB checksums; mutable images and file descriptors are captured before asynchronous work'); await cooperativeCopyCase(assert); results.push('cooperative duplicate planning yields to actual browser tasks and cancellation without mutating the source'); + await referenceCycleCase(name,assert); + results.push('native frame reference cycles and copied port mappings commit atomically through protocol 2 and real IndexedDB undo/redo/reopening'); await duplicateRecoveryCase(name,assert); results.push('deep copy source/mapping survive IndexedDB pause/reopen/resume, retain C to F-prime and shared assets, preserve edits and do not revive undone content'); await nativeImportRecoveryCase(name,assert); diff --git a/tests/headless/copy-reference-source.test.mjs b/tests/headless/copy-reference-source.test.mjs new file mode 100644 index 0000000..628335b --- /dev/null +++ b/tests/headless/copy-reference-source.test.mjs @@ -0,0 +1,31 @@ +import {test} from 'node:test'; +import assert from 'node:assert/strict'; +import {createDocument,createRegistry,builtinComponents,planDuplicate,defineComponent} from '../../src/lib/canvas-core/index.ts'; +import {encodeDuplicateSource,prepareDuplicateImport,assertDuplicateExternal} from '../../src/lib/canvas-runtime/import-duplicate.ts'; +import {selectImportGroups} from '../../src/lib/canvas-runtime/import-groups.ts'; +const node=(id,owner='P',componentId='text',data={})=>({id,incarnation:1,structure:'node',ownerCanvasId:owner,componentId,dataVersion:1,data:{title:id,text:'',...data},geometry:{x:0,y:0,width:100,height:100,rotation:0}}); +const registry=createRegistry(builtinComponents()); + +test('durable copy source includes mapped port dependencies and refuses an old source still targeting original children',async()=>{ + const document=createDocument('P',[{id:'P',parent:null},{id:'S',parent:{canvasId:'P',entryElementId:'F'}}],[node('F','P','frame',{ports:[{nodeId:'A',id:'in',direction:'input',handle:'left'}]}),node('A','S')]);let next=0; + const plan=planDuplicate(document,registry,[{id:'F',incarnation:1}],{createId:()=>`new-${++next}`}),source=await encodeDuplicateSource(document,registry,plan,new AbortController().signal),rows=(await source.text()).trim().split('\n').map(row=>JSON.parse(row)),value=rows.find(row=>row.key==='element:F'); + assert.ok(value.dependencies.includes('element:A'));assert.equal(value.change.after.data.ports[0].nodeId,plan.elementIds.A); + const stableIds=Object.fromEntries([...Object.entries(plan.elementIds).map(([id,mapped])=>[`element:${id}`,mapped]),...Object.entries(plan.canvasIds).map(([id,mapped])=>[`canvas:${id}`,mapped])]),job={source:{kind:'duplicate-ndjson'},stableIds}; + const line={value};assert.equal(prepareDuplicateImport(line,job,key=>stableIds[key],registry).key,'element:F'); + const stale=structuredClone(value);stale.change.after.data.ports[0].nodeId='A';stale.dependencies=stale.dependencies.filter(key=>key!=='element:A');assert.throws(()=>prepareDuplicateImport({value:stale},job,key=>stableIds[key],registry),/copy_external_reference/); + const missing=structuredClone(value);missing.dependencies=missing.dependencies.filter(key=>key!=='element:A');assert.throws(()=>prepareDuplicateImport({value:missing},job,key=>stableIds[key],registry),/invalid_duplicate_source/); +}); + +test('object-array external references share the same traversal for mapping and late lifecycle guards',async()=>{ + const linked=defineComponent({...builtinComponents()[0],id:'linked',copy:{references:[{path:['rows','*','node'],target:'element',external:'preserve'}],omit:[]}}),r=createRegistry([...builtinComponents(),linked]),document=createDocument('P',[{id:'P',parent:null}],[node('C'),node('L','P','linked',{rows:[{node:'C',literal:'C'}]})]); + const plan=planDuplicate(document,r,[{id:'L',incarnation:1}],{createId:()=> 'new-L'}),rows=(await(await encodeDuplicateSource(document,r,plan,new AbortController().signal)).text()).trim().split('\n').map(row=>JSON.parse(row)),job={source:{kind:'duplicate-ndjson'},stableIds:{'element:L':'new-L'}}; + assert.equal(rows[0].externalElements.find(row=>row.id==='C').incarnation,1);assertDuplicateExternal({value:rows[0]},job,document,r); + const changed=createDocument('P',[...document.canvases.values()],[...document.elements.values()].map(row=>row.id==='C'?{...row,incarnation:2}:row));assert.throws(()=>assertDuplicateExternal({value:rows[0]},job,changed,r),/copy_external_changed/); +}); + +const locator=(key,dependencies,byteLength=100)=>({key,dependencies,byteLength,changeCount:1}); +test('SCC selection waits for missing external dependencies and enforces hard group capacity',()=>{ + const pending=[locator('A',['B']),locator('B',['A','outside'])];assert.deepEqual(selectImportGroups(pending,new Set(),{units:1,bytes:1000,changes:100}),[]); + assert.deepEqual(selectImportGroups(pending,new Set(['outside']),{units:1,bytes:1000,changes:100}).flat().map(row=>row.key),['A','B']); + assert.throws(()=>selectImportGroups(pending,new Set(['outside']),{units:32,bytes:199,changes:100}),/import_dependency_group_capacity/);assert.throws(()=>selectImportGroups(pending,new Set(['outside']),{units:32,bytes:1000,changes:1}),/import_dependency_group_capacity/); +}); diff --git a/tests/headless/duplicate.test.mjs b/tests/headless/duplicate.test.mjs index ff6fca6..cc5f2e0 100644 --- a/tests/headless/duplicate.test.mjs +++ b/tests/headless/duplicate.test.mjs @@ -64,3 +64,11 @@ test('missing copy schema, unknown versions, ambiguous paths and opaque curves a const future=createDocument('P',[...document.canvases.values()],[...document.elements.values()].map(element=>element.id==='A'?{...element,dataVersion:9}:element));assert.throws(()=>planDuplicate(future,registry,[target('F')],{createId:(()=>{let n=0;return()=>`future-${++n}`;})()}),/copy_schema_unavailable/); const invalid=createDocument('P',[...document.canvases.values()],[...document.elements.values()].map(element=>element.id==='incoming'?{...element,path:{type:'future'}}:element));assert.throws(()=>planDuplicate(invalid,registry,[target('F')],{createId:(()=>{let n=0;return()=>`unknown-${++n}`;})()}),/unsupported_copy_path/); }); + +test('frame port object arrays map child identities but retain local port IDs, handles and the source data',()=>{ + const ports=[{id:'in',direction:'input',nodeId:'A',handle:'left'},{id:'out',direction:'output',nodeId:'B',handle:'port:nested'}],source=createDocument('P',[...document.canvases.values()],[...document.elements.values()].map(record=>record.id==='F'?{...record,data:{...record.data,ports}}:record));let next=0; + const plan=planDuplicate(source,registry,[target('F')],{createId:()=>`port-${++next}`}),data=applyChanges(source,plan.changes).elements.get(plan.elementIds.F).data; + assert.deepEqual(data.ports,ports.map(port=>({...port,nodeId:plan.elementIds[port.nodeId]})));assert.deepEqual(source.elements.get('F').data.ports,ports); + const bad=createDocument('P',[...source.canvases.values()],[...source.elements.values()].map(record=>record.id==='F'?{...record,data:{...record.data,ports:{bad:'A'}}}:record));assert.throws(()=>planDuplicate(bad,registry,[target('F')],{createId:()=>`bad-${++next}`}),/invalid_copy_reference/); + assert.throws(()=>defineComponent({...builtinComponents()[0],copy:{references:[{path:['rows','*','id'],target:'element',external:'reject'},{path:['rows','0','id'],target:'element',external:'reject'}],omit:[]}}),/conflicting_copy_paths/); +}); diff --git a/tests/headless/imports-engine.test.mjs b/tests/headless/imports-engine.test.mjs index a2aa8aa..a749b1f 100644 --- a/tests/headless/imports-engine.test.mjs +++ b/tests/headless/imports-engine.test.mjs @@ -154,3 +154,14 @@ test('a reopened preparation rejects changed registry copy declarations instead test('canonical recovery holds a preparing copy and restarts it only after the coordinated root is adopted',async()=>{ const f=fixture(),engine=await f.open();try{await seedCopy(engine);const id=await engine.imports.duplicate([{id:'F',incarnation:1}]);const recovery=await engine.prepareRecovery(),cut=engine.getSnapshot().rootRevision;await new Promise(resolve=>setTimeout(resolve,10));assert.equal(engine.getSnapshot().rootRevision,cut);assert.equal(engine.imports.getJobs().get(id).status,'preparing');assert.equal((await recovery.apply()).status,'applied');await engine.settle();assert.equal(engine.imports.getJobs().get(id).status,'completed');assert.equal(f.errors.length,0);}finally{await engine.close();} }); + +test('native frame ports and deep copy close ownership/reference cycles atomically, keep local handles and recover every binding',async()=>{ + const f=fixture();let engine=await f.open(); + const frame={...node('F'),record:{...node('F').record,componentId:'frame',data:{title:'Frame',text:'',ports:[{id:'input',direction:'input',nodeId:'A',handle:'left'}]}}},child={...node('A'),record:{...node('A').record,ownerCanvasId:'S'}},canvas={kind:'canvas',key:'S',record:{id:'S',parent:{canvasId:'$target',entryElementId:'F'}}}; + try{ + const cuts=[],unsubscribe=engine.editor.subscribe((_,snapshot)=>{const rows=[...snapshot.document.elements.values()],frames=rows.filter(row=>row.componentId==='frame');for(const row of frames){const port=row.data.ports[0];assert.ok(snapshot.document.elements.has(port.nodeId),'published a frame without its port target');assert.notEqual(port.nodeId,'A');}cuts.push(rows.length);}); + const imported=engine.imports.startNdjson(file([frame,canvas,child]),'canvas');await engine.settle();const first=engine.imports.getJobs().get(imported);assert.equal(first.status,'completed');assert.equal(first.committedSourceKeys.length,3);const F=first.stableIds['element:F'],A=first.stableIds['element:A'];assert.equal(engine.getSnapshot().document.elements.get(F).data.ports[0].nodeId,A);assert.ok(cuts.every(size=>size===0||size===2));unsubscribe(); + const copied=await engine.imports.duplicate([{id:F,incarnation:1}]);await engine.settle();const job=engine.imports.getJobs().get(copied);assert.equal(job.status,'completed');assert.equal(job.committedSourceKeys.length,3);const F2=job.stableIds[`element:${F}`],A2=job.stableIds[`element:${A}`],port=engine.getSnapshot().document.elements.get(F2).data.ports[0];assert.deepEqual(port,{id:'input',direction:'input',nodeId:A2,handle:'left'});assert.notEqual(A2,A);assert.equal(f.server().elements.size,4); + await engine.close();engine=await f.open();assert.equal(engine.imports.getJobs().get(copied).status,'completed');assert.equal(engine.getSnapshot().document.elements.get(F2).data.ports[0].nodeId,A2);assert.equal(engine.editor.history.undo().status,'applied');await engine.settle();assert.equal(engine.getSnapshot().document.elements.has(F2),false);assert.ok(engine.getSnapshot().document.elements.has(F));assert.equal(engine.editor.history.redo().status,'applied');await engine.settle();assert.equal(engine.getSnapshot().document.elements.get(F2).data.ports[0].nodeId,A2);assert.equal(f.errors.length,0);decodeRecovery(f.image(),registry); + }finally{await engine.close();} +}); diff --git a/tests/headless/imports.test.mjs b/tests/headless/imports.test.mjs index 7c6c60c..cb2cda3 100644 --- a/tests/headless/imports.test.mjs +++ b/tests/headless/imports.test.mjs @@ -64,7 +64,7 @@ test('dependency backpressure pauses with locators intact and a larger budget re }); test('future interpreter versions and malformed job cuts fail before any source read',()=>{ - const job=createImportJob({id:'i',projectId:'p',sourceFingerprint:'s',parserVersion:1});assert.throws(()=>validateImportJob({...job,version:2}),/import_interpreter_unavailable/);assert.throws(()=>validateImportJob({...job,stableIds:{a:'same',b:'same'}}),/invalid_import_job/);assert.throws(()=>validateImportJob({...job,status:'completed'}),/invalid_import_job/); + const job=createImportJob({id:'i',projectId:'p',sourceFingerprint:'s',parserVersion:1});assert.throws(()=>validateImportJob({...job,version:3}),/import_interpreter_unavailable/);assert.throws(()=>validateImportJob({...job,stableIds:{a:'same',b:'same'}}),/invalid_import_job/);assert.throws(()=>validateImportJob({...job,status:'completed'}),/invalid_import_job/); }); test('fast independent records stage bounded publications and commits while the first record remains immediate',async()=>{ @@ -89,3 +89,22 @@ test('a source I/O failure is reported after publishing all already prepared rea const raw=createNdjsonImportSource({bytes:bytes([{id:'first'},{id:'second'}]),fingerprint:'immutable-source'}),first=await raw.read(0,new AbortController().signal),second=await raw.read(first.nextCursor,new AbortController().signal),f=fixture([],{source:{...raw,async read(cursor,signal){if(cursor===second.nextCursor)throw fault('source_offline');return raw.read(cursor,signal);}},ports:{now:()=>0,optimisticLocal:true}}); await f.runner.start();assert.equal(f.root.job.status,'paused');assert.equal(f.root.job.error,'source_offline');assert.deepEqual(f.root.job.committedSourceKeys,['first','second']);assert.equal(f.root.document.elements.size,2);assert.equal(f.root.job.pending.length,0);assert.equal(f.errors.length,1); }); + +test('a reference cycle commits every member in one root even when the adaptive batch budget is one',async()=>{ + const f=fixture([{id:'A',dependencies:['B']},{id:'B',dependencies:['C']},{id:'C',dependencies:['A']}],{ports:{maxBatch:1}});await f.runner.start();assert.equal(f.root.job.status,'completed');assert.deepEqual(f.calls,[['A','B','C']]);assert.equal(f.commits.length,1);assert.equal(f.root.document.elements.size,3);validateImportJob(f.root.job); +}); + +test('a rejected reference cycle never isolates or publishes one member; independent content survives',async()=>{ + const f=fixture([{id:'A',dependencies:['B']},{id:'B',dependencies:['A'],bad:true},{id:'tail'}]);await f.runner.start();assert.equal(f.root.job.status,'partial');assert.deepEqual(f.root.job.committedSourceKeys,['tail']);assert.ok(f.calls.filter(keys=>keys.includes('A')||keys.includes('B')).every(keys=>keys.includes('A')&&keys.includes('B')));assert.deepEqual(f.root.job.failures.map(value=>value.key),['A','B']);assert.equal(f.root.document.elements.size,1); +}); + +test('a durable pending cycle resumes without reallocating IDs or exposing a partial group',async()=>{ + const gate=deferred(),entered=deferred(),f=fixture([{id:'A',dependencies:['B']},{id:'B',dependencies:['A']}]);const persist=f.ports.persist;f.ports.persist=async()=>{await persist();if(f.root.job.pending.length===2&&!f.root.job.committedSourceKeys.length){entered.resolve();await gate.promise;}}; + const running=f.runner.start();await entered.promise;const cut=f.root,closing=f.runner.close();gate.resolve();await running;await closing;assert.equal(cut.document.elements.size,0); + const r=fixture([],{source:f.source,root:cut,ports:{createId(){throw Error('identity reallocated');}}});await r.runner.start();assert.equal(r.root.job.status,'completed');assert.deepEqual(r.calls,[['A','B']]);assert.deepEqual(r.root.job.stableIds,cut.job.stableIds); +}); + + +test('new jobs carry interpreter version 2 and a resumed legacy job upgrades in its first published cut',async()=>{ + const f=fixture([{id:'one'}]);assert.equal(f.root.job.version,2);f.root={...f.root,job:{...f.root.job,version:1}};validateImportJob(f.root.job);const publish=f.ports.publish;f.ports.publish=(job,expected)=>{assert.equal(job.version,2);return publish(job,expected);};await f.runner.start();assert.equal(f.root.job.status,'completed');assert.equal(f.root.job.version,2); +});