@getodk/xforms-engine 0.14.0 → 0.16.0

package/src/instance/RankControl.ts

@@ -10,6 +10,7 @@ import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPat
 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 { createAttributeState } from '../lib/reactivity/createAttributeState.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';
@@ -22,6 +23,7 @@ import type { UnknownAppearanceDefinition } from '../parse/body/appearance/unkno
 import type { Root } from './Root.ts';
 import type { ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import { ValueNode } from './abstract/ValueNode.ts';
+import { buildAttributes } from './attachments/buildAttributes.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ValidationContext } from './internal-api/ValidationContext.ts';
@@ -123,6 +125,8 @@ export class RankControl
 		const baseValueState = this.valueState;
 		const [baseGetValue, setValue] = baseValueState;
 
+		const attributeState = createAttributeState(this.scope);
+
 		/**
 		 * @ToDo As new value options become available, they're not yet in the
 		 * `currentValues` state. This appends them. We intend to change this
@@ -174,6 +178,7 @@ export class RankControl
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
+				attributes: attributeState.getAttributes,
 				valueOptions,
 				value: valueState,
 				instanceValue: this.getInstanceValue,
@@ -181,6 +186,8 @@ export class RankControl
 			this.instanceConfig
 		);
 
+		attributeState.setAttributes(buildAttributes(this));
+
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;

package/src/instance/Root.ts

@@ -12,6 +12,7 @@ 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 { createRootInstanceState } from '../lib/client-reactivity/instance-state/createRootInstanceState.ts';
+import { createAttributeState } from '../lib/reactivity/createAttributeState.ts';
 import type { ChildrenState } from '../lib/reactivity/createChildrenState.ts';
 import { createChildrenState } from '../lib/reactivity/createChildrenState.ts';
 import type { MaterializedChildren } from '../lib/reactivity/materializeCurrentStateChildren.ts';
@@ -24,6 +25,8 @@ 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 { buildAttributes } from './attachments/buildAttributes.ts';
+import { Attribute } from './Attribute.ts';
 import { buildChildren } from './children/buildChildren.ts';
 import type { GeneralChildNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
@@ -39,6 +42,7 @@ interface RootStateSpec {
 	readonly label: null;
 	readonly hint: null;
 	readonly children: Accessor<readonly FormNodeID[]>;
+	readonly attributes: Accessor<readonly Attribute[]>;
 	readonly valueOptions: null;
 	readonly value: null;
 
@@ -95,6 +99,7 @@ export class Root
 		this.classes = parent.classes;
 
 		const childrenState = createChildrenState<Root, GeneralChildNode>(this);
+		const attributeState = createAttributeState(this.scope);
 
 		this.childrenState = childrenState;
 		this.languages = parent.languages;
@@ -112,6 +117,7 @@ export class Root
 				valueOptions: null,
 				value: null,
 				children: childrenState.childIds,
+				attributes: attributeState.getAttributes,
 			},
 			this.instanceConfig
 		);
@@ -125,6 +131,7 @@ export class Root
 		);
 
 		childrenState.setChildren(buildChildren(this));
+		attributeState.setAttributes(buildAttributes(this));
 		this.validationState = createAggregatedViolations(this, this.instanceConfig);
 		this.instanceState = createRootInstanceState(this);
 	}

package/src/instance/SelectControl.ts

@@ -14,6 +14,7 @@ import { SelectValueTypeError } from '../error/SelectValueTypeError.ts';
 import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import type { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import { getSelectCodec } from '../lib/codecs/getSelectCodec.ts';
+import { createAttributeState } from '../lib/reactivity/createAttributeState.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';
@@ -26,6 +27,7 @@ import type { SelectType } from '../parse/body/control/SelectControlDefinition.t
 import type { Root } from './Root.ts';
 import type { ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import { ValueNode } from './abstract/ValueNode.ts';
+import { buildAttributes } from './attachments/buildAttributes.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ValidationContext } from './internal-api/ValidationContext.ts';
@@ -108,6 +110,7 @@ export class SelectControl
 
 		this.appearances = definition.bodyElement.appearances;
 		this.selectType = definition.bodyElement.type;
+		const attributeState = createAttributeState(this.scope);
 
 		const valueOptions = createItemCollection(this);
 
@@ -153,6 +156,7 @@ export class SelectControl
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
+				attributes: attributeState.getAttributes,
 				valueOptions,
 				value: valueState,
 				instanceValue: this.getInstanceValue,
@@ -161,6 +165,8 @@ export class SelectControl
 			this.instanceConfig
 		);
 
+		attributeState.setAttributes(buildAttributes(this));
+
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;

package/src/instance/TriggerControl.ts

@@ -8,6 +8,7 @@ import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPat
 import type { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import type { TriggerInputValue, TriggerRuntimeValue } from '../lib/codecs/TriggerCodec.ts';
 import { TriggerCodec } from '../lib/codecs/TriggerCodec.ts';
+import { createAttributeState } from '../lib/reactivity/createAttributeState.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';
@@ -17,6 +18,7 @@ import { createNodeLabel } from '../lib/reactivity/text/createNodeLabel.ts';
 import type { UnknownAppearanceDefinition } from '../parse/body/appearance/unknownAppearanceParser.ts';
 import type { Root } from './Root.ts';
 import { ValueNode, type ValueNodeStateSpec } from './abstract/ValueNode.ts';
+import { buildAttributes } from './attachments/buildAttributes.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ValidationContext } from './internal-api/ValidationContext.ts';
@@ -88,6 +90,7 @@ export class TriggerControl
 		super(parent, instanceNode, definition, codec);
 
 		this.appearances = definition.bodyElement.appearances;
+		const attributeState = createAttributeState(this.scope);
 
 		const state = createSharedNodeState(
 			this.scope,
@@ -100,6 +103,7 @@ export class TriggerControl
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
+				attributes: attributeState.getAttributes,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
@@ -107,6 +111,8 @@ export class TriggerControl
 			this.instanceConfig
 		);
 
+		attributeState.setAttributes(buildAttributes(this));
+
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;

package/src/instance/UploadControl.ts

@@ -9,6 +9,7 @@ import { UploadValueTypeError } from '../error/UploadValueTypeError.ts';
 import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import type { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import { createValueNodeInstanceState } from '../lib/client-reactivity/instance-state/createValueNodeInstanceState.ts';
+import { createAttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { createInstanceAttachment } from '../lib/reactivity/createInstanceAttachment.ts';
 import type { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import type { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
@@ -20,6 +21,7 @@ import type { SimpleAtomicState } from '../lib/reactivity/types.ts';
 import type { SharedValidationState } from '../lib/reactivity/validation/createValidation.ts';
 import { createValidationState } from '../lib/reactivity/validation/createValidation.ts';
 import type { UnknownAppearanceDefinition } from '../parse/body/appearance/unknownAppearanceParser.ts';
+import type { Attribute } from './Attribute.ts';
 import type { Root } from './Root.ts';
 import type { DescendantNodeStateSpec } from './abstract/DescendantNode.ts';
 import { DescendantNode } from './abstract/DescendantNode.ts';
@@ -57,6 +59,7 @@ interface UploadControlStateSpec extends DescendantNodeStateSpec<InstanceAttachm
 	readonly label: Accessor<TextRange<'label'> | null>;
 	readonly hint: Accessor<TextRange<'hint'> | null>;
 	readonly children: null;
+	readonly attributes: Accessor<readonly Attribute[]>;
 	readonly valueOptions: null;
 	readonly value: SimpleAtomicState<InstanceAttachmentRuntimeValue>;
 	readonly instanceValue: Accessor<InstanceAttachmentFileName>;
@@ -133,6 +136,7 @@ export class UploadControl
 		const instanceAttachment = createInstanceAttachment(this);
 
 		this.instanceAttachment = instanceAttachment;
+		const attributeState = createAttributeState(this.scope);
 		this.decodeInstanceValue = instanceAttachment.decodeInstanceValue;
 		this.getXPathValue = instanceAttachment.getInstanceValue;
 
@@ -149,6 +153,7 @@ export class UploadControl
 				children: null,
 				valueOptions: null,
 				value: instanceAttachment.valueState,
+				attributes: attributeState.getAttributes,
 				instanceValue: instanceAttachment.getInstanceValue,
 			},
 			this.instanceConfig

package/src/instance/abstract/DescendantNode.ts

@@ -167,7 +167,6 @@ export abstract class DescendantNode<
 						return true;
 					}
 				}
-
 				return false;
 			});
 		});

package/src/instance/abstract/InstanceNode.ts

@@ -13,6 +13,7 @@ import type {
 	XFormsXPathPrimaryInstanceNodeKind,
 } from '../../integration/xpath/adapter/XFormsXPathNode.ts';
 import type { PrimaryInstanceXPathNode } from '../../integration/xpath/adapter/kind.ts';
+import type { StaticAttribute } from '../../integration/xpath/static-dom/StaticAttribute.ts';
 import type { StaticDocument } from '../../integration/xpath/static-dom/StaticDocument.ts';
 import type { StaticElement } from '../../integration/xpath/static-dom/StaticElement.ts';
 import type { MaterializedChildren } from '../../lib/reactivity/materializeCurrentStateChildren.ts';
@@ -24,6 +25,7 @@ import { createReactiveScope } from '../../lib/reactivity/scope.ts';
 import type { SimpleAtomicState } from '../../lib/reactivity/types.ts';
 import { createUniqueId } from '../../lib/unique-id.ts';
 import type { AnyNodeDefinition } from '../../parse/model/NodeDefinition.ts';
+import type { Attribute } from '../Attribute.ts';
 import type { PrimaryInstance } from '../PrimaryInstance.ts';
 import type { Root } from '../Root.ts';
 import type { AnyChildNode, AnyNode, AnyParentNode } from '../hierarchy.ts';
@@ -51,6 +53,7 @@ export interface InstanceNodeStateSpec<Value = never> {
 	readonly label: Accessor<TextRange<'label'> | null> | null;
 	readonly hint: Accessor<TextRange<'hint'> | null> | null;
 	readonly children: Accessor<readonly FormNodeID[]> | null;
+	readonly attributes: Accessor<readonly Attribute[]> | null;
 	readonly valueOptions: InstanceNodeValueOptionsStateSpec;
 	readonly value: Signal<Value> | SimpleAtomicState<Value> | null;
 }
@@ -191,7 +194,7 @@ export abstract class InstanceNode<
 	constructor(
 		readonly instanceConfig: InstanceConfig,
 		readonly parent: Parent,
-		readonly instanceNode: StaticDocument | StaticElement | null,
+		readonly instanceNode: StaticAttribute | StaticDocument | StaticElement | null,
 		readonly definition: Definition,
 		options?: InstanceNodeOptions
 	) {

package/src/instance/abstract/ValueNode.ts

@@ -21,6 +21,7 @@ import type { SimpleAtomicState } from '../../lib/reactivity/types.ts';
 import type { SharedValidationState } from '../../lib/reactivity/validation/createValidation.ts';
 import { createValidationState } from '../../lib/reactivity/validation/createValidation.ts';
 import { LeafNodeDefinition } from '../../parse/model/LeafNodeDefinition.ts';
+import type { Attribute } from '../Attribute.ts';
 import type { GeneralParentNode } from '../hierarchy.ts';
 import type { EvaluationContext } from '../internal-api/EvaluationContext.ts';
 import type {
@@ -36,6 +37,7 @@ export type ValueNodeDefinition<V extends ValueType> = LeafNodeDefinition<V>;
 
 export interface ValueNodeStateSpec<RuntimeValue> extends DescendantNodeStateSpec<RuntimeValue> {
 	readonly children: null;
+	readonly attributes: Accessor<readonly Attribute[]>;
 	readonly value: SimpleAtomicState<RuntimeValue>;
 	readonly instanceValue: Accessor<string>;
 }

package/src/instance/attachments/buildAttributes.ts

@@ -0,0 +1,15 @@
+import { Attribute } from '../Attribute';
+import type { AnyNode } from '../hierarchy.ts';
+import type { InputControl } from '../InputControl.ts';
+import type { ModelValue } from '../ModelValue.ts';
+import type { Note } from '../Note.ts';
+import type { RangeControl } from '../RangeControl.ts';
+
+export function buildAttributes(
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	owner: AnyNode | InputControl<any> | ModelValue<any> | Note<any> | RangeControl<any>
+): Attribute[] {
+	return Array.from(owner.definition.attributes.values()).map((attributeDefinition) => {
+		return new Attribute(owner, attributeDefinition, attributeDefinition.template);
+	});
+}

package/src/instance/children/normalizeChildInitOptions.ts

@@ -217,7 +217,7 @@ const buildDeprecatedIDDefinition = (
 	const nodeset = instanceNode.nodeset;
 	const bind = group.model.binds.getOrCreateBindDefinition(nodeset);
 
-	return new LeafNodeDefinition(group.parent.definition, bind, null, instanceNode);
+	return new LeafNodeDefinition(group.model, group.parent.definition, bind, null, instanceNode);
 };
 
 const buildDeprecatedID = (

package/src/instance/internal-api/AttributeContext.ts

@@ -0,0 +1,40 @@
+import type { Accessor } from 'solid-js';
+import type { FormInstanceInitializationMode } from '../../client/index.ts';
+import type { StaticAttribute } from '../../integration/xpath/static-dom/StaticAttribute.ts';
+import type { ReactiveScope } from '../../lib/reactivity/scope.ts';
+import type { BindComputationExpression } from '../../parse/expression/BindComputationExpression.ts';
+import type { AnyBindPreloadDefinition } from '../../parse/model/BindPreloadDefinition.ts';
+import type { ModelDefinition } from '../../parse/model/ModelDefinition.ts';
+import type { EvaluationContext } from './EvaluationContext.ts';
+import type { InstanceConfig } from './InstanceConfig.ts';
+
+export interface InstanceAttributeContextDocument {
+	readonly initializationMode: FormInstanceInitializationMode;
+	readonly isAttached: Accessor<boolean>;
+}
+
+export type DecodeInstanceValue = (value: string) => string;
+
+interface InstanceAttributeContextDefinitionBind {
+	readonly preload: AnyBindPreloadDefinition | null;
+	readonly calculate: BindComputationExpression<'calculate'> | null;
+	readonly readonly: BindComputationExpression<'readonly'>;
+}
+
+export interface InstanceAttributeContextDefinition {
+	readonly bind: InstanceAttributeContextDefinitionBind;
+	readonly template: StaticAttribute;
+	readonly model: ModelDefinition;
+}
+
+export interface AttributeContext extends EvaluationContext {
+	readonly scope: ReactiveScope;
+	readonly rootDocument: InstanceAttributeContextDocument;
+	readonly definition: InstanceAttributeContextDefinition;
+	readonly instanceNode: StaticAttribute;
+	readonly instanceConfig: InstanceConfig;
+	readonly decodeInstanceValue: DecodeInstanceValue;
+
+	isReadonly(): boolean;
+	isRelevant(): boolean;
+}

package/src/instance/internal-api/InstanceConfig.ts

@@ -1,5 +1,8 @@
 import type { InstanceAttachmentFileNameFactory } from '../../client/attachments/InstanceAttachmentsConfig.ts';
-import type { FormInstanceConfig } from '../../client/form/FormInstanceConfig.ts';
+import type {
+	FormInstanceConfig,
+	PreloadProperties,
+} from '../../client/form/FormInstanceConfig.ts';
 import type { OpaqueReactiveObjectFactory } from '../../client/OpaqueReactiveObjectFactory.ts';
 
 export interface InstanceConfig {
@@ -9,4 +12,6 @@ export interface InstanceConfig {
 	readonly clientStateFactory: OpaqueReactiveObjectFactory;
 
 	readonly computeAttachmentName: InstanceAttachmentFileNameFactory;
+
+	readonly preloadProperties: PreloadProperties;
 }

package/src/instance/internal-api/InstanceValueContext.ts

@@ -1,12 +1,16 @@
+import type { Accessor } from 'solid-js';
 import type { FormInstanceInitializationMode } from '../../client/index.ts';
 import type { StaticLeafElement } from '../../integration/xpath/static-dom/StaticElement.ts';
 import type { ReactiveScope } from '../../lib/reactivity/scope.ts';
 import type { BindComputationExpression } from '../../parse/expression/BindComputationExpression.ts';
 import type { AnyBindPreloadDefinition } from '../../parse/model/BindPreloadDefinition.ts';
+import type { ModelDefinition } from '../../parse/model/ModelDefinition.ts';
 import type { EvaluationContext } from './EvaluationContext.ts';
+import type { InstanceConfig } from './InstanceConfig.ts';
 
 export interface InstanceValueContextDocument {
 	readonly initializationMode: FormInstanceInitializationMode;
+	readonly isAttached: Accessor<boolean>;
 }
 
 export type DecodeInstanceValue = (value: string) => string;
@@ -20,6 +24,7 @@ interface InstanceValueContextDefinitionBind {
 export interface InstanceValueContextDefinition {
 	readonly bind: InstanceValueContextDefinitionBind;
 	readonly template: StaticLeafElement;
+	readonly model: ModelDefinition;
 }
 
 export interface InstanceValueContext extends EvaluationContext {
@@ -27,6 +32,7 @@ export interface InstanceValueContext extends EvaluationContext {
 	readonly rootDocument: InstanceValueContextDocument;
 	readonly definition: InstanceValueContextDefinition;
 	readonly instanceNode: StaticLeafElement | null;
+	readonly instanceConfig: InstanceConfig;
 	readonly decodeInstanceValue: DecodeInstanceValue;
 
 	isReadonly(): boolean;

package/src/instance/internal-api/serialization/ClientReactiveSerializableAttributeNode.ts

@@ -0,0 +1,18 @@
+import type { InstanceState } from '../../../client/serialization/InstanceState.ts';
+import type { QualifiedName } from '../../../lib/names/QualifiedName.ts';
+
+export type SerializedInstanceValue = string;
+
+interface ClientReactiveSerializableAttributeNodeCurrentState {
+	get instanceValue(): SerializedInstanceValue;
+}
+
+interface ClientReactiveSerializableAttributeNodeDefinition {
+	readonly qualifiedName: QualifiedName;
+}
+
+export interface ClientReactiveSerializableAttributeNode {
+	readonly definition: ClientReactiveSerializableAttributeNodeDefinition;
+	readonly currentState: ClientReactiveSerializableAttributeNodeCurrentState;
+	readonly instanceState: InstanceState;
+}

package/src/instance/internal-api/serialization/ClientReactiveSerializableParentNode.ts

@@ -1,5 +1,6 @@
 import type { InstanceState } from '../../../client/serialization/InstanceState.ts';
 import type { QualifiedName } from '../../../lib/names/QualifiedName.ts';
+import type { Attribute } from '../../Attribute.ts';
 
 export interface ClientReactiveSerializableChildNode {
 	readonly instanceState: InstanceState;
@@ -10,6 +11,7 @@ export interface ClientReactiveSerializableParentNodeCurrentState<
 > {
 	get relevant(): boolean;
 	get children(): readonly Child[];
+	get attributes(): readonly Attribute[];
 }
 
 export interface ClientReactiveSerializableParentNodeDefinition {

package/src/instance/internal-api/serialization/ClientReactiveSerializableTemplatedNode.ts

@@ -1,5 +1,5 @@
-import type { TemplatedNodeAttributeSerializationError } from '../../../error/TemplatedNodeAttributeSerializationError.ts';
 import type { StaticElement } from '../../../integration/xpath/static-dom/StaticElement.ts';
+import type { Attribute } from '../../Attribute.ts';
 import type { GeneralChildNode } from '../../hierarchy.ts';
 import type {
 	ClientReactiveSerializableParentNode,
@@ -9,8 +9,7 @@ import type {
 
 export interface ClientReactiveSerializableTemplatedNodeCurrentState
 	extends ClientReactiveSerializableParentNodeCurrentState<GeneralChildNode> {
-	/** @see {@link TemplatedNodeAttributeSerializationError} */
-	get attributes(): unknown;
+	get attributes(): readonly Attribute[];
 }
 
 export interface ClientReactiveSerializableTemplatedNodeDefinition

package/src/instance/internal-api/serialization/ClientReactiveSerializableValueNode.ts

@@ -1,5 +1,7 @@
 import type { InstanceState } from '../../../client/serialization/InstanceState.ts';
 import type { QualifiedName } from '../../../lib/names/QualifiedName.ts';
+import type { BindDefinition } from '../../../parse/model/BindDefinition.ts';
+import type { Attribute } from '../../Attribute.ts';
 import type {
 	ClientReactiveSerializableChildNode,
 	ClientReactiveSerializableParentNode,
@@ -14,10 +16,12 @@ interface ClientReactiveSerializableValueNodeCurrentState {
 	 * @todo Consider moving into {@link InstanceState}
 	 */
 	get instanceValue(): SerializedInstanceValue;
+	get attributes(): readonly Attribute[];
 }
 
 interface ClientReactiveSerializableValueNodeDefinition {
 	readonly qualifiedName: QualifiedName;
+	readonly bind: BindDefinition;
 }
 
 export interface ClientReactiveSerializableValueNode {

package/src/instance/repeat/BaseRepeatRange.ts

@@ -17,6 +17,10 @@ import type {
 import { XFORMS_XPATH_NODE_RANGE_KIND } from '../../integration/xpath/adapter/XFormsXPathNode.ts';
 import type { StaticElement } from '../../integration/xpath/static-dom/StaticElement.ts';
 import { createNodeRangeInstanceState } from '../../lib/client-reactivity/instance-state/createNodeRangeInstanceState.ts';
+import {
+	createAttributeState,
+	type AttributeState,
+} from '../../lib/reactivity/createAttributeState.ts';
 import type { ChildrenState } from '../../lib/reactivity/createChildrenState.ts';
 import { createChildrenState } from '../../lib/reactivity/createChildrenState.ts';
 import type { MaterializedChildren } from '../../lib/reactivity/materializeCurrentStateChildren.ts';
@@ -32,6 +36,7 @@ import type {
 	DescendantNodeSharedStateSpec,
 } from '../abstract/DescendantNode.ts';
 import { DescendantNode } from '../abstract/DescendantNode.ts';
+import type { Attribute } from '../Attribute.ts';
 import type { GeneralParentNode, RepeatRange } from '../hierarchy.ts';
 import type { EvaluationContext } from '../internal-api/EvaluationContext.ts';
 import type { ClientReactiveSerializableParentNode } from '../internal-api/serialization/ClientReactiveSerializableParentNode.ts';
@@ -41,6 +46,7 @@ interface RepeatRangeStateSpec extends DescendantNodeSharedStateSpec {
 	readonly hint: null;
 	readonly label: Accessor<TextRange<'label'> | null>;
 	readonly children: Accessor<readonly FormNodeID[]>;
+	readonly attributes: Accessor<readonly Attribute[]>;
 	readonly valueOptions: null;
 	readonly value: null;
 }
@@ -60,6 +66,7 @@ export abstract class BaseRepeatRange<Definition extends AnyRepeatDefinition>
 		ClientReactiveSerializableParentNode<RepeatInstance>
 {
 	protected readonly childrenState: ChildrenState<RepeatInstance>;
+	protected readonly attributeState: AttributeState;
 
 	/**
 	 * A repeat range doesn't have a corresponding primary instance element of its
@@ -156,8 +163,10 @@ export abstract class BaseRepeatRange<Definition extends AnyRepeatDefinition>
 		const repeatRange = this as AnyDescendantNode as RepeatRange;
 
 		const childrenState = createChildrenState<RepeatRange, RepeatInstance>(repeatRange);
+		const attributeState = createAttributeState(this.scope);
 
 		this.childrenState = childrenState;
+		this.attributeState = attributeState;
 
 		const state = createSharedNodeState(
 			this.scope,
@@ -170,6 +179,7 @@ export abstract class BaseRepeatRange<Definition extends AnyRepeatDefinition>
 				label: createNodeLabel(this, definition),
 				hint: null,
 				children: childrenState.childIds,
+				attributes: attributeState.getAttributes,
 				valueOptions: null,
 				value: null,
 			},
@@ -260,4 +270,8 @@ export abstract class BaseRepeatRange<Definition extends AnyRepeatDefinition>
 	getChildren(): readonly RepeatInstance[] {
 		return this.childrenState.getChildren();
 	}
+
+	getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
 }

package/src/instance/repeat/RepeatInstance.ts

@@ -10,10 +10,10 @@ import type {
 import type { InstanceState } from '../../client/serialization/InstanceState.ts';
 import type { TextRange } from '../../client/TextRange.ts';
 import type { AncestorNodeValidationState } from '../../client/validation.ts';
-import type { TemplatedNodeAttributeSerializationError } from '../../error/TemplatedNodeAttributeSerializationError.ts';
 import type { XFormsXPathElement } from '../../integration/xpath/adapter/XFormsXPathNode.ts';
 import type { StaticElement } from '../../integration/xpath/static-dom/StaticElement.ts';
 import { createTemplatedNodeInstanceState } from '../../lib/client-reactivity/instance-state/createTemplatedNodeInstanceState.ts';
+import { createAttributeState } from '../../lib/reactivity/createAttributeState.ts';
 import type { ChildrenState } from '../../lib/reactivity/createChildrenState.ts';
 import { createChildrenState } from '../../lib/reactivity/createChildrenState.ts';
 import type { MaterializedChildren } from '../../lib/reactivity/materializeCurrentStateChildren.ts';
@@ -26,6 +26,7 @@ import { createNodeLabel } from '../../lib/reactivity/text/createNodeLabel.ts';
 import { createAggregatedViolations } from '../../lib/reactivity/validation/createAggregatedViolations.ts';
 import type { DescendantNodeSharedStateSpec } from '../abstract/DescendantNode.ts';
 import { DescendantNode } from '../abstract/DescendantNode.ts';
+import type { Attribute } from '../Attribute.ts';
 import { buildChildren } from '../children/buildChildren.ts';
 import type { GeneralChildNode, RepeatRange } from '../hierarchy.ts';
 import type { EvaluationContext } from '../internal-api/EvaluationContext.ts';
@@ -35,9 +36,7 @@ interface RepeatInstanceStateSpec extends DescendantNodeSharedStateSpec {
 	readonly label: Accessor<TextRange<'label'> | null>;
 	readonly hint: null;
 
-	/** @see {@link TemplatedNodeAttributeSerializationError} */
-	readonly attributes: null;
-
+	readonly attributes: Accessor<readonly Attribute[]>;
 	readonly children: Accessor<readonly FormNodeID[]>;
 	readonly valueOptions: null;
 	readonly value: null;
@@ -132,6 +131,7 @@ export class RepeatInstance
 		this.appearances = definition.bodyElement.appearances;
 
 		const childrenState = createChildrenState<RepeatInstance, GeneralChildNode>(this);
+		const attributeState = createAttributeState(this.scope);
 
 		this.childrenState = childrenState;
 		this.currentIndex = currentIndex;
@@ -147,7 +147,7 @@ export class RepeatInstance
 				// TODO: only-child <group><label>
 				label: createNodeLabel(this, definition),
 				hint: null,
-				attributes: null,
+				attributes: attributeState.getAttributes,
 				children: childrenState.childIds,
 				valueOptions: null,
 				value: null,

package/src/integration/xpath/adapter/XFormsXPathNode.ts

@@ -97,7 +97,8 @@ export type XFormsXPathDescendantNodeKind =
 	| XFormsXPathNodeRangeKind
 	| XPathElementKind
 	| XPathTextKind
-	| XPathCommentKind;
+	| XPathCommentKind
+	| XPathAttributeKind;
 
 export interface XFormsXPathDescendantNode extends XFormsXPathNode {
 	readonly [XPathNodeKindKey]: XFormsXPathDescendantNodeKind;
@@ -109,6 +110,7 @@ export type XFormsXPathPrimaryInstanceNodeKind =
 	| XPathDocumentKind
 	| XFormsXPathNodeRangeKind
 	| XPathElementKind
+	| XPathAttributeKind
 	| XPathTextKind;
 
 export interface XFormsXPathPrimaryInstanceNode extends XFormsXPathNode {

package/src/lib/client-reactivity/instance-state/createAttributeNodeInstanceState.ts

@@ -0,0 +1,16 @@
+import type { InstanceState } from '../../../client/serialization/InstanceState.ts';
+import type { ClientReactiveSerializableAttributeNode } from '../../../instance/internal-api/serialization/ClientReactiveSerializableAttributeNode.ts';
+import { escapeXMLText, serializeAttributeXML } from '../../xml-serialization.ts';
+
+export const createAttributeNodeInstanceState = (
+	node: ClientReactiveSerializableAttributeNode
+): InstanceState => {
+	const { qualifiedName } = node.definition;
+
+	return {
+		get instanceXML() {
+			const xmlValue = escapeXMLText(node.currentState.instanceValue, true);
+			return serializeAttributeXML(qualifiedName, xmlValue);
+		},
+	};
+};

package/src/lib/client-reactivity/instance-state/createParentNodeInstanceState.ts

@@ -12,11 +12,11 @@ export const createParentNodeInstanceState = (
 				return '';
 			}
 
-			const serializedChildren = node.currentState.children.map((child) => {
-				return child.instanceState.instanceXML;
-			});
-
-			return serializeParentElementXML(node.definition.qualifiedName, serializedChildren);
+			return serializeParentElementXML(
+				node.definition.qualifiedName,
+				node.currentState.children,
+				node.currentState.attributes
+			);
 		},
 	};
 };

package/src/lib/client-reactivity/instance-state/createRootInstanceState.ts

@@ -5,15 +5,12 @@ import { serializeParentElementXML } from '../../xml-serialization.ts';
 export const createRootInstanceState = (node: Root): InstanceState => {
 	return {
 		get instanceXML() {
-			const { namespaceDeclarations, attributes } = node.definition;
-			const serializedChildren = node.currentState.children.map((child) => {
-				return child.instanceState.instanceXML;
-			});
-
-			return serializeParentElementXML(node.definition.qualifiedName, serializedChildren, {
-				namespaceDeclarations,
-				attributes: Array.from(attributes.values()),
-			});
+			return serializeParentElementXML(
+				node.definition.qualifiedName,
+				node.currentState.children,
+				node.currentState.attributes,
+				node.definition.namespaceDeclarations
+			);
 		},
 	};
 };