@getodk/xforms-engine 0.16.0 → 0.17.0

package/src/instance/InputControl.ts

@@ -13,7 +13,10 @@ import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPat
 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 { createAttributeState } from '../lib/reactivity/createAttributeState.ts';
+import {
+	createAttributeState,
+	type AttributeState,
+} 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';
@@ -38,9 +41,7 @@ const stringInputNodeOptions = (control: InputControlDefinition): InputNodeOptio
 	rows: control.rows,
 });
 
-const geoInputNodeOptions = (
-	control: InputControlDefinition
-): InputNodeOptions<'geopoint' | 'geoshape' | 'geotrace'> => ({
+const geoInputNodeOptions = (control: InputControlDefinition): InputNodeOptions<'geopoint'> => ({
 	accuracyThreshold: control.accuracyThreshold,
 	unacceptableAccuracyThreshold: control.unacceptableAccuracyThreshold,
 });
@@ -62,8 +63,8 @@ const nodeOptionsFactoryByType: NodeOptionsFactoryByType = {
 	time: () => null,
 	dateTime: () => null,
 	geopoint: geoInputNodeOptions,
-	geotrace: geoInputNodeOptions,
-	geoshape: geoInputNodeOptions,
+	geotrace: () => null,
+	geoshape: () => null,
 	binary: () => null,
 	barcode: () => null,
 	intent: () => null,
@@ -104,6 +105,7 @@ export class InputControl<V extends ValueType = ValueType>
 	// InstanceNode
 	protected readonly state: SharedNodeState<InputControlStateSpec<V>>;
 	protected readonly engineState: EngineState<InputControlStateSpec<V>>;
+	readonly attributeState: AttributeState;
 
 	// InputNode
 	readonly nodeType = 'input';
@@ -122,7 +124,7 @@ export class InputControl<V extends ValueType = ValueType>
 
 		this.appearances = definition.bodyElement.appearances;
 		this.nodeOptions = nodeOptionsFactoryByType[definition.valueType](definition.bodyElement);
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		const state = createSharedNodeState(
 			this.scope,
@@ -135,7 +137,7 @@ export class InputControl<V extends ValueType = ValueType>
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
@@ -143,7 +145,7 @@ export class InputControl<V extends ValueType = ValueType>
 			this.instanceConfig
 		);
 
-		attributeState.setAttributes(buildAttributes(this));
+		this.attributeState.setAttributes(buildAttributes(this));
 
 		this.state = state;
 		this.engineState = state.engineState;
@@ -155,6 +157,10 @@ export class InputControl<V extends ValueType = ValueType>
 
 		return this.root;
 	}
+
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
 }
 
 export type AnyInputControl =

package/src/instance/ModelValue.ts

@@ -5,11 +5,15 @@ import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPat
 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 { createAttributeState } from '../lib/reactivity/createAttributeState.ts';
+import {
+	createAttributeState,
+	type AttributeState,
+} 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';
 import { createSharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
+import type { Attribute } from './Attribute.ts';
 import { ValueNode, type ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import { buildAttributes } from './attachments/buildAttributes.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
@@ -51,6 +55,7 @@ export class ModelValue<V extends ValueType = ValueType>
 	// InstanceNode
 	protected readonly state: SharedNodeState<ModelValueStateSpec<V>>;
 	protected readonly engineState: EngineState<ModelValueStateSpec<V>>;
+	readonly attributeState: AttributeState;
 
 	// ModelValueNode
 	readonly nodeType = 'model-value';
@@ -67,7 +72,7 @@ export class ModelValue<V extends ValueType = ValueType>
 
 		super(parent, instanceNode, definition, codec);
 
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		const state = createSharedNodeState(
 			this.scope,
@@ -80,7 +85,7 @@ export class ModelValue<V extends ValueType = ValueType>
 				label: null,
 				hint: null,
 				children: null,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
@@ -88,12 +93,16 @@ export class ModelValue<V extends ValueType = ValueType>
 			this.instanceConfig
 		);
 
-		attributeState.setAttributes(buildAttributes(this));
+		this.attributeState.setAttributes(buildAttributes(this));
 
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;
 	}
+
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
 }
 
 export type AnyModelValue =

package/src/instance/Note.ts

@@ -8,7 +8,10 @@ import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPat
 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 { createAttributeState } from '../lib/reactivity/createAttributeState.ts';
+import {
+	createAttributeState,
+	type AttributeState,
+} from '../lib/reactivity/createAttributeState.ts';
 import { createNoteReadonlyThunk } from '../lib/reactivity/createNoteReadonlyThunk.ts';
 import type { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import type { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
@@ -20,6 +23,7 @@ import { createNoteText, type ComputedNoteText } from '../lib/reactivity/text/cr
 import type { NoteNodeDefinition } from '../parse/model/NoteNodeDefinition.ts';
 import { ValueNode, type ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import { buildAttributes } from './attachments/buildAttributes.ts';
+import type { Attribute } from './Attribute.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ClientReactiveSerializableValueNode } from './internal-api/serialization/ClientReactiveSerializableValueNode.ts';
@@ -48,6 +52,7 @@ export class Note<V extends ValueType = ValueType>
 	// InstanceNode
 	protected readonly state: SharedNodeState<NoteStateSpec<V>>;
 	protected readonly engineState: EngineState<NoteStateSpec<V>>;
+	readonly attributeState: AttributeState;
 
 	// NoteNode
 	readonly nodeType = 'note';
@@ -68,7 +73,7 @@ export class Note<V extends ValueType = ValueType>
 
 		const isReadonly = createNoteReadonlyThunk(this, definition);
 		const noteTextComputation = createNoteText(this, definition.noteTextDefinition);
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		let noteText: ComputedNoteText;
 		let label: Accessor<TextRange<'label', 'form'> | null>;
@@ -108,7 +113,7 @@ export class Note<V extends ValueType = ValueType>
 				noteText,
 
 				children: null,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
@@ -116,12 +121,16 @@ export class Note<V extends ValueType = ValueType>
 			this.instanceConfig
 		);
 
-		attributeState.setAttributes(buildAttributes(this));
+		this.attributeState.setAttributes(buildAttributes(this));
 
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;
 	}
+
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
 }
 
 export type AnyNote =

package/src/instance/PrimaryInstance.ts

@@ -1,6 +1,7 @@
-import { XPathNodeKindKey } from '@getodk/xpath';
+import { clearCache, XPathNodeKindKey } from '@getodk/xpath';
 import type { Accessor } from 'solid-js';
 import { createSignal } from 'solid-js';
+import type { GeolocationProvider } from '../client';
 import type { FormInstanceInitializationMode } from '../client/form/FormInstance.ts';
 import type { ActiveLanguage, FormLanguage, FormLanguages } from '../client/FormLanguage.ts';
 import type { FormNodeID } from '../client/identity.ts';
@@ -17,7 +18,10 @@ import { EngineXPathEvaluator } from '../integration/xpath/EngineXPathEvaluator.
 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 { createAttributeState } from '../lib/reactivity/createAttributeState.ts';
+import {
+	createAttributeState,
+	type AttributeState,
+} from '../lib/reactivity/createAttributeState.ts';
 import { createChildrenState } from '../lib/reactivity/createChildrenState.ts';
 import { createTranslationState } from '../lib/reactivity/createTranslationState.ts';
 import type { MaterializedChildren } from '../lib/reactivity/materializeCurrentStateChildren.ts';
@@ -84,6 +88,7 @@ interface PrimaryInstanceStateSpec {
 
 interface PrimaryInstanceStateInputByMode {
 	readonly create: null;
+	readonly reset: null;
 	readonly edit: InitialInstanceState;
 	readonly restore: InitialInstanceState;
 }
@@ -92,7 +97,7 @@ export type PrimaryInstanceInitialState<Mode extends FormInstanceInitializationM
 	PrimaryInstanceStateInputByMode[Mode];
 
 export interface BasePrimaryInstanceOptions {
-	readonly scope: ReactiveScope;
+	scope: ReactiveScope;
 	readonly model: ModelDefinition;
 	readonly secondaryInstances: SecondaryInstancesDefinition;
 }
@@ -125,6 +130,7 @@ export class PrimaryInstance<
 	// InstanceNode
 	protected readonly state: SharedNodeState<PrimaryInstanceStateSpec>;
 	protected readonly engineState: EngineState<PrimaryInstanceStateSpec>;
+	readonly attributeState: AttributeState;
 
 	override readonly instanceNode: StaticDocument;
 	readonly getChildren: Accessor<readonly Root[]>;
@@ -133,6 +139,7 @@ export class PrimaryInstance<
 	readonly hasNonRelevantAncestor = () => false;
 	readonly isRelevant = () => true;
 
+	private geolocationProvider: GeolocationProvider | undefined;
 	// TranslationContext (support)
 	private readonly setActiveLanguage: SimpleAtomicStateSetter<FormLanguage>;
 
@@ -164,6 +171,8 @@ export class PrimaryInstance<
 		const activeInstance = initialState?.document ?? modelInstance;
 		const definition = model.getRootDefinition(activeInstance);
 
+		clearCache();
+
 		super(config, null, activeInstance, definition, {
 			scope,
 			computeReference: () => PRIMARY_INSTANCE_REFERENCE,
@@ -173,6 +182,7 @@ export class PrimaryInstance<
 		this.model = model;
 		this.attachments = new InstanceAttachmentsState(initialState?.attachments);
 		this.instanceNode = activeInstance;
+		this.geolocationProvider = config.geolocationProvider;
 
 		const [isAttached, setIsAttached] = createSignal(false);
 
@@ -197,7 +207,7 @@ export class PrimaryInstance<
 		this.classes = definition.classes;
 
 		const childrenState = createChildrenState<this, Root>(this);
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		this.getChildren = childrenState.getChildren;
 
@@ -212,7 +222,7 @@ export class PrimaryInstance<
 			valueOptions: null,
 			value: null,
 			children: childrenState.childIds,
-			attributes: attributeState.getAttributes,
+			attributes: this.attributeState.getAttributes,
 		};
 
 		const state = createSharedNodeState(scope, stateSpec, config);
@@ -233,10 +243,14 @@ export class PrimaryInstance<
 		this.instanceState = createPrimaryInstanceState(this);
 
 		childrenState.setChildren([root]);
-		attributeState.setAttributes(buildAttributes(this));
+		this.attributeState.setAttributes(buildAttributes(this));
 		setIsAttached(true);
 	}
 
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
+
 	// PrimaryInstanceDocument
 	/**
 	 * @todo Note that this method's signature is intentionally derived from
@@ -286,4 +300,13 @@ export class PrimaryInstance<
 
 		return Promise.resolve(result);
 	}
+
+	async getBackgroundGeopoint(): Promise<string> {
+		if (!this.geolocationProvider) {
+			return '';
+		}
+
+		const location = await this.geolocationProvider.getLocation();
+		return location ?? '';
+	}
 }

package/src/instance/RangeControl.ts

@@ -11,7 +11,10 @@ import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPat
 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 { createAttributeState } from '../lib/reactivity/createAttributeState.ts';
+import {
+	createAttributeState,
+	type AttributeState,
+} 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';
@@ -23,6 +26,7 @@ import type {
 	RangeNodeDefinition,
 	RangeValueType,
 } from '../parse/model/RangeNodeDefinition.ts';
+import type { Attribute } from './Attribute.ts';
 import type { Root } from './Root.ts';
 import { ValueNode, type ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import { buildAttributes } from './attachments/buildAttributes.ts';
@@ -66,6 +70,7 @@ export class RangeControl<V extends RangeValueType = RangeValueType>
 	// InstanceNode
 	protected readonly state: SharedNodeState<RangeControlStateSpec<V>>;
 	protected readonly engineState: EngineState<RangeControlStateSpec<V>>;
+	readonly attributeState: AttributeState;
 
 	// RangeNode
 	readonly nodeType = 'range';
@@ -84,7 +89,7 @@ export class RangeControl<V extends RangeValueType = RangeValueType>
 		super(parent, instanceNode, definition, codec);
 
 		this.appearances = definition.bodyElement.appearances;
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		const state = createSharedNodeState(
 			this.scope,
@@ -97,7 +102,7 @@ export class RangeControl<V extends RangeValueType = RangeValueType>
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
@@ -105,7 +110,7 @@ export class RangeControl<V extends RangeValueType = RangeValueType>
 			this.instanceConfig
 		);
 
-		attributeState.setAttributes(buildAttributes(this));
+		this.attributeState.setAttributes(buildAttributes(this));
 
 		this.state = state;
 		this.engineState = state.engineState;
@@ -117,6 +122,10 @@ export class RangeControl<V extends RangeValueType = RangeValueType>
 
 		return this.root;
 	}
+
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
 }
 
 // prettier-ignore

package/src/instance/RankControl.ts

@@ -1,4 +1,4 @@
-import { type XPathChoiceNode, XPathNodeKindKey } from '@getodk/xpath';
+import { XPathNodeKindKey, type XPathChoiceNode } from '@getodk/xpath';
 import type { Accessor } from 'solid-js';
 import { createMemo } from 'solid-js';
 import type { RankDefinition, RankItem, RankNode, RankValueOptions } from '../client/RankNode.ts';
@@ -10,7 +10,10 @@ 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 {
+	createAttributeState,
+	type AttributeState,
+} 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';
@@ -20,6 +23,7 @@ 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 { Attribute } from './Attribute.ts';
 import type { Root } from './Root.ts';
 import type { ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import { ValueNode } from './abstract/ValueNode.ts';
@@ -96,6 +100,7 @@ export class RankControl
 	// InstanceNode
 	protected readonly state: SharedNodeState<RankControlStateSpec>;
 	protected readonly engineState: EngineState<RankControlStateSpec>;
+	readonly attributeState: AttributeState;
 
 	// RankNode
 	readonly nodeType = 'rank';
@@ -125,7 +130,7 @@ export class RankControl
 		const baseValueState = this.valueState;
 		const [baseGetValue, setValue] = baseValueState;
 
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		/**
 		 * @ToDo As new value options become available, they're not yet in the
@@ -178,7 +183,7 @@ export class RankControl
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 				valueOptions,
 				value: valueState,
 				instanceValue: this.getInstanceValue,
@@ -186,13 +191,17 @@ export class RankControl
 			this.instanceConfig
 		);
 
-		attributeState.setAttributes(buildAttributes(this));
+		this.attributeState.setAttributes(buildAttributes(this));
 
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;
 	}
 
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
+
 	getValueLabel(value: string): TextRange<'item-label'> | null {
 		const valueOption = this.currentState.valueOptions.find((item) => item.value === value);
 		return valueOption?.label ?? null;

package/src/instance/Root.ts

@@ -12,7 +12,10 @@ 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 {
+	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';
@@ -67,6 +70,7 @@ export class Root
 	// DescendantNode
 	protected readonly state: SharedNodeState<RootStateSpec>;
 	protected readonly engineState: EngineState<RootStateSpec>;
+	readonly attributeState: AttributeState;
 
 	override readonly hasReadonlyAncestor = () => false;
 	override readonly isSelfReadonly = () => false;
@@ -99,7 +103,7 @@ export class Root
 		this.classes = parent.classes;
 
 		const childrenState = createChildrenState<Root, GeneralChildNode>(this);
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		this.childrenState = childrenState;
 		this.languages = parent.languages;
@@ -117,7 +121,7 @@ export class Root
 				valueOptions: null,
 				value: null,
 				children: childrenState.childIds,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 			},
 			this.instanceConfig
 		);
@@ -131,7 +135,7 @@ export class Root
 		);
 
 		childrenState.setChildren(buildChildren(this));
-		attributeState.setAttributes(buildAttributes(this));
+		this.attributeState.setAttributes(buildAttributes(this));
 		this.validationState = createAggregatedViolations(this, this.instanceConfig);
 		this.instanceState = createRootInstanceState(this);
 	}
@@ -140,6 +144,10 @@ export class Root
 		return this.childrenState.getChildren();
 	}
 
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
+
 	// RootNode
 	setLanguage(language: FormLanguage): Root {
 		this.rootDocument.setLanguage(language);

package/src/instance/SelectControl.ts

@@ -1,4 +1,4 @@
-import { type XPathChoiceNode, XPathNodeKindKey } from '@getodk/xpath';
+import { XPathNodeKindKey, type XPathChoiceNode } from '@getodk/xpath';
 import type { Accessor } from 'solid-js';
 import { createMemo } from 'solid-js';
 import type {
@@ -14,7 +14,10 @@ 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 {
+	createAttributeState,
+	type AttributeState,
+} 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';
@@ -24,6 +27,7 @@ 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 { SelectType } from '../parse/body/control/SelectControlDefinition.ts';
+import type { Attribute } from './Attribute.ts';
 import type { Root } from './Root.ts';
 import type { ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import { ValueNode } from './abstract/ValueNode.ts';
@@ -91,6 +95,7 @@ export class SelectControl
 	// InstanceNode
 	protected readonly state: SharedNodeState<SelectControlStateSpec>;
 	protected readonly engineState: EngineState<SelectControlStateSpec>;
+	readonly attributeState: AttributeState;
 
 	// SelectNode
 	readonly nodeType = 'select';
@@ -110,7 +115,7 @@ export class SelectControl
 
 		this.appearances = definition.bodyElement.appearances;
 		this.selectType = definition.bodyElement.type;
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		const valueOptions = createItemCollection(this);
 
@@ -156,7 +161,7 @@ export class SelectControl
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 				valueOptions,
 				value: valueState,
 				instanceValue: this.getInstanceValue,
@@ -165,7 +170,7 @@ export class SelectControl
 			this.instanceConfig
 		);
 
-		attributeState.setAttributes(buildAttributes(this));
+		this.attributeState.setAttributes(buildAttributes(this));
 
 		this.state = state;
 		this.engineState = state.engineState;
@@ -243,4 +248,8 @@ export class SelectControl
 		const option = this.mapOptionsByValue().get(value);
 		return option?.label?.asString ?? null;
 	}
+
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
 }

package/src/instance/TriggerControl.ts

@@ -8,7 +8,10 @@ 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 {
+	createAttributeState,
+	type AttributeState,
+} 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';
@@ -16,6 +19,7 @@ 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 { UnknownAppearanceDefinition } from '../parse/body/appearance/unknownAppearanceParser.ts';
+import type { Attribute } from './Attribute.ts';
 import type { Root } from './Root.ts';
 import { ValueNode, type ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import { buildAttributes } from './attachments/buildAttributes.ts';
@@ -75,6 +79,7 @@ export class TriggerControl
 	// InstanceNode
 	protected readonly state: SharedNodeState<TriggerControlStateSpec>;
 	protected readonly engineState: EngineState<TriggerControlStateSpec>;
+	readonly attributeState: AttributeState;
 
 	// TriggerNode
 	readonly nodeType = 'trigger';
@@ -90,7 +95,7 @@ export class TriggerControl
 		super(parent, instanceNode, definition, codec);
 
 		this.appearances = definition.bodyElement.appearances;
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		const state = createSharedNodeState(
 			this.scope,
@@ -103,7 +108,7 @@ export class TriggerControl
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
@@ -111,13 +116,17 @@ export class TriggerControl
 			this.instanceConfig
 		);
 
-		attributeState.setAttributes(buildAttributes(this));
+		this.attributeState.setAttributes(buildAttributes(this));
 
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;
 	}
 
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
+
 	// TriggerNode
 	setValue(value: TriggerInputValue): Root {
 		this.setValueState(value);