@getodk/xforms-engine 0.6.0 → 0.7.0

package/src/instance/ModelValue.ts

@@ -2,6 +2,7 @@ import { XPathNodeKindKey } from '@getodk/xpath';
 import type { ModelValueDefinition, ModelValueNode } from '../client/ModelValueNode.ts';
 import type { ValueType } from '../client/ValueType.ts';
 import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
+import type { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import type { RuntimeInputValue, RuntimeValue } from '../lib/codecs/getSharedValueCodec.ts';
 import { getSharedValueCodec } from '../lib/codecs/getSharedValueCodec.ts';
 import type { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
@@ -12,7 +13,7 @@ import { ValueNode, type ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ValidationContext } from './internal-api/ValidationContext.ts';
-import type { ClientReactiveSubmittableValueNode } from './internal-api/submission/ClientReactiveSubmittableValueNode.ts';
+import type { ClientReactiveSerializableValueNode } from './internal-api/serialization/ClientReactiveSerializableValueNode.ts';
 
 interface ModelValueStateSpec<V extends ValueType> extends ValueNodeStateSpec<RuntimeValue<V>> {
 	readonly label: null;
@@ -27,14 +28,19 @@ export class ModelValue<V extends ValueType = ValueType>
 		XFormsXPathElement,
 		EvaluationContext,
 		ValidationContext,
-		ClientReactiveSubmittableValueNode
+		ClientReactiveSerializableValueNode
 {
-	static from(parent: GeneralParentNode, definition: ModelValueDefinition): AnyModelValue;
+	static from(
+		parent: GeneralParentNode,
+		instanceNode: StaticLeafElement | null,
+		definition: ModelValueDefinition
+	): AnyModelValue;
 	static from<V extends ValueType>(
 		parent: GeneralParentNode,
+		instanceNode: StaticLeafElement | null,
 		definition: ModelValueDefinition<V>
 	): ModelValue<V> {
-		return new this(parent, definition);
+		return new this(parent, instanceNode, definition);
 	}
 
 	// XFormsXPathElement
@@ -50,14 +56,14 @@ export class ModelValue<V extends ValueType = ValueType>
 	readonly nodeOptions = null;
 	readonly currentState: CurrentState<ModelValueStateSpec<V>>;
 
-	constructor(parent: GeneralParentNode, definition: ModelValueDefinition<V>) {
+	constructor(
+		parent: GeneralParentNode,
+		instanceNode: StaticLeafElement | null,
+		definition: ModelValueDefinition<V>
+	) {
 		const codec = getSharedValueCodec(definition.valueType);
 
-		super(parent, definition, codec);
-
-		const sharedStateOptions = {
-			clientStateFactory: this.engineConfig.stateFactory,
-		};
+		super(parent, instanceNode, definition, codec);
 
 		const state = createSharedNodeState(
 			this.scope,
@@ -74,7 +80,7 @@ export class ModelValue<V extends ValueType = ValueType>
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
 			},
-			sharedStateOptions
+			this.instanceConfig
 		);
 
 		this.state = state;

package/src/instance/Note.ts

@@ -5,6 +5,7 @@ import type { NoteNode, NoteNodeAppearances, NoteValue } from '../client/NoteNod
 import type { TextRange } from '../client/TextRange.ts';
 import type { ValueType } from '../client/ValueType.ts';
 import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
+import type { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import { getNoteCodec } from '../lib/codecs/getNoteCodec.ts';
 import type { NoteInputValue, NoteRuntimeValue } from '../lib/codecs/NoteCodec.ts';
 import { createNoteReadonlyThunk } from '../lib/reactivity/createNoteReadonlyThunk.ts';
@@ -19,7 +20,7 @@ import type { NoteNodeDefinition } from '../parse/model/NoteNodeDefinition.ts';
 import { ValueNode, type ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
-import type { ClientReactiveSubmittableValueNode } from './internal-api/submission/ClientReactiveSubmittableValueNode.ts';
+import type { ClientReactiveSerializableValueNode } from './internal-api/serialization/ClientReactiveSerializableValueNode.ts';
 import type { ValidationContext } from './internal-api/ValidationContext.ts';
 
 interface NoteStateSpec<V extends ValueType> extends ValueNodeStateSpec<NoteValue<V>> {
@@ -37,7 +38,7 @@ export class Note<V extends ValueType = ValueType>
 		XFormsXPathElement,
 		EvaluationContext,
 		ValidationContext,
-		ClientReactiveSubmittableValueNode
+		ClientReactiveSerializableValueNode
 {
 	// XFormsXPathElement
 	override readonly [XPathNodeKindKey] = 'element';
@@ -52,17 +53,17 @@ export class Note<V extends ValueType = ValueType>
 	readonly nodeOptions = null;
 	readonly currentState: CurrentState<NoteStateSpec<V>>;
 
-	constructor(parent: GeneralParentNode, definition: NoteNodeDefinition<V>) {
+	constructor(
+		parent: GeneralParentNode,
+		instanceNode: StaticLeafElement | null,
+		definition: NoteNodeDefinition<V>
+	) {
 		const codec = getNoteCodec(definition.valueType);
 
-		super(parent, definition, codec);
+		super(parent, instanceNode, definition, codec);
 
 		this.appearances = definition.bodyElement.appearances;
 
-		const sharedStateOptions = {
-			clientStateFactory: this.engineConfig.stateFactory,
-		};
-
 		const isReadonly = createNoteReadonlyThunk(this, definition);
 		const noteTextComputation = createNoteText(this, definition.noteTextDefinition);
 
@@ -108,7 +109,7 @@ export class Note<V extends ValueType = ValueType>
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
 			},
-			sharedStateOptions
+			this.instanceConfig
 		);
 
 		this.state = state;

package/src/instance/PrimaryInstance.ts

@@ -1,20 +1,22 @@
 import { XPathNodeKindKey } from '@getodk/xpath';
 import type { Accessor } from 'solid-js';
 import { createSignal } from 'solid-js';
+import type { FormInstanceInitializationMode } from '../client/form/FormInstance.ts';
 import type { ActiveLanguage, FormLanguage, FormLanguages } from '../client/FormLanguage.ts';
 import type { FormNodeID } from '../client/identity.ts';
 import type { RootNode } from '../client/RootNode.ts';
+import type { InstancePayload } from '../client/serialization/InstancePayload.ts';
 import type {
-	SubmissionChunkedType,
-	SubmissionOptions,
-} from '../client/submission/SubmissionOptions.ts';
-import type { SubmissionResult } from '../client/submission/SubmissionResult.ts';
-import type { SubmissionState } from '../client/submission/SubmissionState.ts';
+	InstancePayloadOptions,
+	InstancePayloadType,
+} from '../client/serialization/InstancePayloadOptions.ts';
+import type { InstanceState } from '../client/serialization/InstanceState.ts';
 import type { AncestorNodeValidationState } from '../client/validation.ts';
 import type { XFormsXPathDocument } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import { EngineXPathEvaluator } from '../integration/xpath/EngineXPathEvaluator.ts';
-import { createInstanceSubmissionState } from '../lib/client-reactivity/submission/createInstanceSubmissionState.ts';
-import { prepareSubmission } from '../lib/client-reactivity/submission/prepareSubmission.ts';
+import type { StaticDocument } from '../integration/xpath/static-dom/StaticDocument.ts';
+import { createPrimaryInstanceState } from '../lib/client-reactivity/instance-state/createPrimaryInstanceState.ts';
+import { prepareInstancePayload } from '../lib/client-reactivity/instance-state/prepareInstancePayload.ts';
 import { createChildrenState } from '../lib/reactivity/createChildrenState.ts';
 import { createTranslationState } from '../lib/reactivity/createTranslationState.ts';
 import type { MaterializedChildren } from '../lib/reactivity/materializeCurrentStateChildren.ts';
@@ -30,10 +32,11 @@ import type { ModelDefinition } from '../parse/model/ModelDefinition.ts';
 import type { RootDefinition } from '../parse/model/RootDefinition.ts';
 import type { SecondaryInstancesDefinition } from '../parse/model/SecondaryInstance/SecondaryInstancesDefinition.ts';
 import { InstanceNode } from './abstract/InstanceNode.ts';
+import type { InitialInstanceState } from './input/InitialInstanceState.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { InstanceConfig } from './internal-api/InstanceConfig.ts';
 import type { PrimaryInstanceDocument } from './internal-api/PrimaryInstanceDocument.ts';
-import type { ClientReactiveSubmittableInstance } from './internal-api/submission/ClientReactiveSubmittableInstance.ts';
+import type { ClientReactiveSerializableInstance } from './internal-api/serialization/ClientReactiveSerializableInstance.ts';
 import type { TranslationContext } from './internal-api/TranslationContext.ts';
 import { Root } from './Root.ts';
 
@@ -74,20 +77,55 @@ interface PrimaryInstanceStateSpec {
 	readonly activeLanguage: Accessor<ActiveLanguage>;
 }
 
-export class PrimaryInstance
+interface PrimaryInstanceStateInputByMode {
+	readonly create: null;
+	readonly edit: InitialInstanceState;
+	readonly restore: InitialInstanceState;
+}
+
+export type PrimaryInstanceInitialState<Mode extends FormInstanceInitializationMode> =
+	PrimaryInstanceStateInputByMode[Mode];
+
+export interface BasePrimaryInstanceOptions {
+	readonly scope: ReactiveScope;
+	readonly model: ModelDefinition;
+	readonly secondaryInstances: SecondaryInstancesDefinition;
+}
+
+export interface ModelessPrimaryInstanceOptions extends BasePrimaryInstanceOptions {
+	readonly config: InstanceConfig;
+}
+
+export interface PrimaryInstanceOptions<Mode extends FormInstanceInitializationMode>
+	extends ModelessPrimaryInstanceOptions {
+	readonly mode: Mode;
+	readonly initialState: PrimaryInstanceInitialState<Mode>;
+}
+
+export class PrimaryInstance<
+		Mode extends FormInstanceInitializationMode = FormInstanceInitializationMode,
+	>
 	extends InstanceNode<RootDefinition, PrimaryInstanceStateSpec, null, Root>
 	implements
 		PrimaryInstanceDocument,
 		XFormsXPathDocument,
 		TranslationContext,
 		EvaluationContext,
-		ClientReactiveSubmittableInstance
+		ClientReactiveSerializableInstance
 {
+	/**
+	 * @todo this will be populated as we introduce other initialization modes!
+	 */
+	readonly initializationMode: FormInstanceInitializationMode = 'create';
+
+	readonly model: ModelDefinition;
+
 	// InstanceNode
 	protected readonly state: SharedNodeState<PrimaryInstanceStateSpec>;
 	protected readonly engineState: EngineState<PrimaryInstanceStateSpec>;
-	readonly getChildren: Accessor<readonly Root[]>;
 
+	override readonly instanceNode: StaticDocument;
+	readonly getChildren: Accessor<readonly Root[]>;
 	readonly hasReadonlyAncestor = () => false;
 	readonly isReadonly = () => false;
 	readonly hasNonRelevantAncestor = () => false;
@@ -99,7 +137,7 @@ export class PrimaryInstance
 	// XFormsXPathDocument
 	readonly [XPathNodeKindKey] = 'document';
 
-	// PrimaryInstanceDocument, ClientReactiveSubmittableInstance
+	// PrimaryInstanceDocument, ClientReactiveSerializableInstance
 	readonly nodeType = 'primary-instance';
 	readonly appearances = null;
 	readonly nodeOptions = null;
@@ -107,7 +145,7 @@ export class PrimaryInstance
 	readonly root: Root;
 	readonly currentState: MaterializedChildren<CurrentState<PrimaryInstanceStateSpec>, Root>;
 	readonly validationState: AncestorNodeValidationState;
-	readonly submissionState: SubmissionState;
+	readonly instanceState: InstanceState;
 	readonly languages: FormLanguages;
 
 	// TranslationContext (+ EvaluationContext)
@@ -118,19 +156,21 @@ export class PrimaryInstance
 	readonly evaluator: EngineXPathEvaluator;
 	override readonly contextNode = this;
 
-	constructor(
-		scope: ReactiveScope,
-		model: ModelDefinition,
-		secondaryInstances: SecondaryInstancesDefinition,
-		engineConfig: InstanceConfig
-	) {
-		const { root: definition } = model;
+	constructor(options: PrimaryInstanceOptions<Mode>) {
+		const { mode, initialState, scope, model, secondaryInstances, config } = options;
+		const { instance: modelInstance } = model;
+		const activeInstance = initialState?.document ?? modelInstance;
+		const definition = model.getRootDefinition(activeInstance);
 
-		super(engineConfig, null, definition, {
+		super(config, null, activeInstance, definition, {
 			scope,
 			computeReference: () => PRIMARY_INSTANCE_REFERENCE,
 		});
 
+		this.initializationMode = mode;
+		this.model = model;
+		this.instanceNode = activeInstance;
+
 		const [isAttached, setIsAttached] = createSignal(false);
 
 		this.isAttached = isAttached;
@@ -170,9 +210,7 @@ export class PrimaryInstance
 			children: childrenState.childIds,
 		};
 
-		const state = createSharedNodeState(scope, stateSpec, {
-			clientStateFactory: engineConfig.stateFactory,
-		});
+		const state = createSharedNodeState(scope, stateSpec, config);
 
 		this.state = state;
 		this.engineState = state.engineState;
@@ -187,7 +225,7 @@ export class PrimaryInstance
 				return root.validationState.violations;
 			},
 		};
-		this.submissionState = createInstanceSubmissionState(this);
+		this.instanceState = createPrimaryInstanceState(this);
 
 		childrenState.setChildren([root]);
 		setIsAttached(true);
@@ -231,12 +269,12 @@ export class PrimaryInstance
 		return this.setActiveLanguage(availableFormLanguage);
 	}
 
-	// PrimaryInstanceDocument, ClientReactiveSubmittableInstance
-	prepareSubmission<ChunkedType extends SubmissionChunkedType = 'monolithic'>(
-		options?: SubmissionOptions<ChunkedType>
-	): Promise<SubmissionResult<ChunkedType>> {
-		const result = prepareSubmission(this, {
-			chunked: (options?.chunked ?? 'monolithic') as ChunkedType,
+	// PrimaryInstanceDocument
+	prepareInstancePayload<PayloadType extends InstancePayloadType = 'monolithic'>(
+		options?: InstancePayloadOptions<PayloadType>
+	): Promise<InstancePayload<PayloadType>> {
+		const result = prepareInstancePayload(this, {
+			payloadType: (options?.payloadType ?? 'monolithic') as PayloadType,
 			maxSize: options?.maxSize ?? Infinity,
 		});
 

package/src/instance/RangeControl.ts

@@ -8,6 +8,7 @@ import type {
 } from '../client/RangeNode.ts';
 import type { TextRange } from '../client/TextRange.ts';
 import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
+import type { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import { RangeCodec } from '../lib/codecs/RangeCodec.ts';
 import { getSharedValueCodec } from '../lib/codecs/getSharedValueCodec.ts';
 import type { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
@@ -26,7 +27,7 @@ import { ValueNode, type ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ValidationContext } from './internal-api/ValidationContext.ts';
-import type { ClientReactiveSubmittableValueNode } from './internal-api/submission/ClientReactiveSubmittableValueNode.ts';
+import type { ClientReactiveSerializableValueNode } from './internal-api/serialization/ClientReactiveSerializableValueNode.ts';
 
 interface RangeControlStateSpec<V extends RangeValueType>
 	extends ValueNodeStateSpec<RangeValue<V>> {
@@ -42,14 +43,19 @@ export class RangeControl<V extends RangeValueType = RangeValueType>
 		XFormsXPathElement,
 		EvaluationContext,
 		ValidationContext,
-		ClientReactiveSubmittableValueNode
+		ClientReactiveSerializableValueNode
 {
-	static from(parent: GeneralParentNode, definition: AnyRangeNodeDefinition): AnyRangeControl;
+	static from(
+		parent: GeneralParentNode,
+		instanceNode: StaticLeafElement | null,
+		definition: AnyRangeNodeDefinition
+	): AnyRangeControl;
 	static from<V extends RangeValueType>(
 		parent: GeneralParentNode,
+		instanceNode: StaticLeafElement | null,
 		definition: RangeNodeDefinition<V>
 	): RangeControl<V> {
-		return new this<V>(parent, definition);
+		return new this<V>(parent, instanceNode, definition);
 	}
 
 	// XFormsXPathElement
@@ -65,18 +71,18 @@ export class RangeControl<V extends RangeValueType = RangeValueType>
 	readonly nodeOptions = null;
 	readonly currentState: CurrentState<RangeControlStateSpec<V>>;
 
-	constructor(parent: GeneralParentNode, definition: RangeNodeDefinition<V>) {
+	constructor(
+		parent: GeneralParentNode,
+		instanceNode: StaticLeafElement | null,
+		definition: RangeNodeDefinition<V>
+	) {
 		const baseCodec = getSharedValueCodec(definition.valueType);
 		const codec = new RangeCodec(baseCodec, definition);
 
-		super(parent, definition, codec);
+		super(parent, instanceNode, definition, codec);
 
 		this.appearances = definition.bodyElement.appearances;
 
-		const sharedStateOptions = {
-			clientStateFactory: this.engineConfig.stateFactory,
-		};
-
 		const state = createSharedNodeState(
 			this.scope,
 			{
@@ -92,7 +98,7 @@ export class RangeControl<V extends RangeValueType = RangeValueType>
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
 			},
-			sharedStateOptions
+			this.instanceConfig
 		);
 
 		this.state = state;

package/src/instance/RankControl.ts

@@ -3,7 +3,14 @@ import type { Accessor } from 'solid-js';
 import { createMemo } from 'solid-js';
 import type { RankDefinition, RankItem, RankNode, RankValueOptions } from '../client/RankNode.ts';
 import type { TextRange } from '../client/TextRange.ts';
+import type { ValueType } from '../client/ValueType.ts';
+import { RankMissingValueError } from '../error/RankMissingValueError.ts';
+import { RankValueTypeError } from '../error/RankValueTypeError.ts';
 import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
+import type { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
+import { sharedValueCodecs } from '../lib/codecs/getSharedValueCodec.ts';
+import { MultipleValueItemCodec } from '../lib/codecs/items/MultipleValueItemCodec.ts';
+import { createItemCollection } from '../lib/reactivity/createItemCollection.ts';
 import type { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import type { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
 import type { SharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
@@ -11,20 +18,14 @@ import { createSharedNodeState } from '../lib/reactivity/node-state/createShared
 import { createFieldHint } from '../lib/reactivity/text/createFieldHint.ts';
 import { createNodeLabel } from '../lib/reactivity/text/createNodeLabel.ts';
 import type { SimpleAtomicState } from '../lib/reactivity/types.ts';
+import type { UnknownAppearanceDefinition } from '../parse/body/appearance/unknownAppearanceParser.ts';
 import type { Root } from './Root.ts';
 import type { ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import { ValueNode } from './abstract/ValueNode.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ValidationContext } from './internal-api/ValidationContext.ts';
-import type { ClientReactiveSubmittableValueNode } from './internal-api/submission/ClientReactiveSubmittableValueNode.ts';
-import { MultipleValueItemCodec } from '../lib/codecs/items/MultipleValueItemCodec.ts';
-import { sharedValueCodecs } from '../lib/codecs/getSharedValueCodec.ts';
-import { createItemCollection } from '../lib/reactivity/createItemCollection.ts';
-import type { UnknownAppearanceDefinition } from '../parse/body/appearance/unknownAppearanceParser.ts';
-import type { ValueType } from '../client/ValueType.ts';
-import { RankMissingValueError } from '../error/RankMissingValueError.ts';
-import { RankValueTypeError } from '../error/RankValueTypeError.ts';
+import type { ClientReactiveSerializableValueNode } from './internal-api/serialization/ClientReactiveSerializableValueNode.ts';
 
 export type AnyRankDefinition = {
 	[V in ValueType]: RankDefinition<V>;
@@ -66,12 +67,20 @@ export class RankControl
 		XFormsXPathElement,
 		EvaluationContext,
 		ValidationContext,
-		ClientReactiveSubmittableValueNode
+		ClientReactiveSerializableValueNode
 {
-	static from(parent: GeneralParentNode, definition: RankDefinition): RankControl;
-	static from(parent: GeneralParentNode, definition: AnyRankDefinition): RankControl {
+	static from(
+		parent: GeneralParentNode,
+		instanceNode: StaticLeafElement | null,
+		definition: RankDefinition
+	): RankControl;
+	static from(
+		parent: GeneralParentNode,
+		instanceNode: StaticLeafElement | null,
+		definition: AnyRankDefinition
+	): RankControl {
 		assertRankNodeDefinition(definition);
-		return new this(parent, definition);
+		return new this(parent, instanceNode, definition);
 	}
 
 	private readonly mapOptionsByValue: Accessor<RankItemMap>;
@@ -91,9 +100,13 @@ export class RankControl
 	readonly nodeOptions = null;
 	readonly currentState: CurrentState<RankControlStateSpec>;
 
-	private constructor(parent: GeneralParentNode, definition: RankDefinition<'string'>) {
+	private constructor(
+		parent: GeneralParentNode,
+		instanceNode: StaticLeafElement | null,
+		definition: RankDefinition<'string'>
+	) {
 		const codec = new MultipleValueItemCodec(sharedValueCodecs.string);
-		super(parent, definition, codec);
+		super(parent, instanceNode, definition, codec);
 
 		this.appearances = definition.bodyElement.appearances;
 
@@ -150,10 +163,6 @@ export class RankControl
 			return createMemo(() => codec.encodeValue(getValue()));
 		});
 
-		const sharedStateOptions = {
-			clientStateFactory: this.engineConfig.stateFactory,
-		};
-
 		const state = createSharedNodeState(
 			this.scope,
 			{
@@ -168,7 +177,7 @@ export class RankControl
 				value: valueState,
 				instanceValue: this.getInstanceValue,
 			},
-			sharedStateOptions
+			this.instanceConfig
 		);
 
 		this.state = state;

package/src/instance/Root.ts

@@ -3,16 +3,15 @@ import type { Accessor } from 'solid-js';
 import type { ActiveLanguage, FormLanguage, FormLanguages } from '../client/FormLanguage.ts';
 import type { FormNodeID } from '../client/identity.ts';
 import type { RootNode } from '../client/RootNode.ts';
-import type { SubmissionDefinition } from '../client/submission/SubmissionDefinition.ts';
+import type { InstancePayload } from '../client/serialization/InstancePayload.ts';
 import type {
-	SubmissionChunkedType,
-	SubmissionOptions,
-} from '../client/submission/SubmissionOptions.ts';
-import type { SubmissionResult } from '../client/submission/SubmissionResult.ts';
-import type { SubmissionState } from '../client/submission/SubmissionState.ts';
+	InstancePayloadOptions,
+	InstancePayloadType,
+} from '../client/serialization/InstancePayloadOptions.ts';
+import type { InstanceState } from '../client/serialization/InstanceState.ts';
 import type { AncestorNodeValidationState } from '../client/validation.ts';
 import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
-import { createRootSubmissionState } from '../lib/client-reactivity/submission/createRootSubmissionState.ts';
+import { createRootInstanceState } from '../lib/client-reactivity/instance-state/createRootInstanceState.ts';
 import type { ChildrenState } from '../lib/reactivity/createChildrenState.ts';
 import { createChildrenState } from '../lib/reactivity/createChildrenState.ts';
 import type { MaterializedChildren } from '../lib/reactivity/materializeCurrentStateChildren.ts';
@@ -25,10 +24,10 @@ import { createAggregatedViolations } from '../lib/reactivity/validation/createA
 import type { BodyClassList } from '../parse/body/BodyDefinition.ts';
 import type { RootDefinition } from '../parse/model/RootDefinition.ts';
 import { DescendantNode } from './abstract/DescendantNode.ts';
-import { buildChildren } from './children.ts';
+import { buildChildren } from './children/buildChildren.ts';
 import type { GeneralChildNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
-import type { ClientReactiveSubmittableParentNode } from './internal-api/submission/ClientReactiveSubmittableParentNode.ts';
+import type { ClientReactiveSerializableParentNode } from './internal-api/serialization/ClientReactiveSerializableParentNode.ts';
 import type { TranslationContext } from './internal-api/TranslationContext.ts';
 import type { PrimaryInstance } from './PrimaryInstance.ts';
 
@@ -54,7 +53,7 @@ export class Root
 		XFormsXPathElement,
 		EvaluationContext,
 		TranslationContext,
-		ClientReactiveSubmittableParentNode<GeneralChildNode>
+		ClientReactiveSerializableParentNode<GeneralChildNode>
 {
 	private readonly childrenState: ChildrenState<GeneralChildNode>;
 
@@ -80,22 +79,16 @@ export class Root
 	readonly classes: BodyClassList;
 	readonly currentState: MaterializedChildren<CurrentState<RootStateSpec>, GeneralChildNode>;
 	readonly validationState: AncestorNodeValidationState;
-	readonly submissionState: SubmissionState;
-
-	// ClientReactiveSubmittableInstance
-	get submissionDefinition(): SubmissionDefinition {
-		return this.definition.submission;
-	}
-
-	// RootNode
+	readonly instanceState: InstanceState;
 	readonly languages: FormLanguages;
 
 	constructor(parent: PrimaryInstance) {
-		const { definition } = parent;
+		const { definition, instanceNode: instance } = parent;
+		const instanceNode = instance.root;
 		const { nodeset: reference } = definition;
 		const computeReference: Accessor<string> = () => reference;
 
-		super(parent, definition, {
+		super(parent, instanceNode, definition, {
 			computeReference,
 		});
 
@@ -106,10 +99,6 @@ export class Root
 		this.childrenState = childrenState;
 		this.languages = parent.languages;
 
-		const sharedStateOptions = {
-			clientStateFactory: this.engineConfig.stateFactory,
-		};
-
 		const state = createSharedNodeState(
 			this.scope,
 			{
@@ -124,7 +113,7 @@ export class Root
 				value: null,
 				children: childrenState.childIds,
 			},
-			sharedStateOptions
+			this.instanceConfig
 		);
 
 		this.state = state;
@@ -136,8 +125,8 @@ export class Root
 		);
 
 		childrenState.setChildren(buildChildren(this));
-		this.validationState = createAggregatedViolations(this, sharedStateOptions);
-		this.submissionState = createRootSubmissionState(this);
+		this.validationState = createAggregatedViolations(this, this.instanceConfig);
+		this.instanceState = createRootInstanceState(this);
 	}
 
 	getChildren(): readonly GeneralChildNode[] {
@@ -151,9 +140,9 @@ export class Root
 		return this;
 	}
 
-	prepareSubmission<ChunkedType extends SubmissionChunkedType = 'monolithic'>(
-		options?: SubmissionOptions<ChunkedType>
-	): Promise<SubmissionResult<ChunkedType>> {
-		return this.rootDocument.prepareSubmission(options);
+	prepareInstancePayload<PayloadType extends InstancePayloadType = 'monolithic'>(
+		options?: InstancePayloadOptions<PayloadType>
+	): Promise<InstancePayload<PayloadType>> {
+		return this.rootDocument.prepareInstancePayload(options);
 	}
 }