@getodk/xforms-engine 0.16.0 → 0.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getodk/xforms-engine",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "license": "Apache-2.0",
   "description": "XForms engine for ODK Web Forms",
   "type": "module",
@@ -63,7 +63,7 @@
   "devDependencies": {
     "@babel/core": "^7.28.5",
     "@getodk/tree-sitter-xpath": "0.2.2",
-    "@getodk/xpath": "0.9.1",
+    "@getodk/xpath": "0.9.2",
     "@playwright/test": "^1.57.0",
     "@types/papaparse": "^5.5.0",
     "@vitest/browser": "^3.2.4",

package/src/client/AttributeNode.ts

@@ -1,9 +1,10 @@
 import type { Root } from '../instance/Root.ts';
 import type { AttributeDefinition } from '../parse/model/AttributeDefinition.ts';
+import type { BaseNode, BaseNodeState } from './BaseNode.ts';
 import type { OpaqueReactiveObjectFactory } from './OpaqueReactiveObjectFactory.ts';
 import type { InstanceState } from './serialization/InstanceState.ts';
 
-export interface AttributeNodeState {
+export interface AttributeNodeState extends BaseNodeState {
 	get value(): string;
 	get relevant(): boolean;
 }
@@ -11,7 +12,7 @@ export interface AttributeNodeState {
 /**
  * Base interface for common/shared aspects of attributes.
  */
-export interface AttributeNode {
+export interface AttributeNode extends BaseNode {
 	/**
 	 * Specifies the node's general type. This can be useful for narrowing types,
 	 * e.g. those of children.
@@ -31,7 +32,7 @@ export interface AttributeNode {
 	 */
 	readonly root: Root;
 
-	readonly owner: unknown;
+	readonly parent: unknown;
 
 	/**
 	 * Each node provides a discrete object representing the stateful aspects of

package/src/instance/Attribute.ts

@@ -1,9 +1,8 @@
 import { XPathNodeKindKey } from '@getodk/xpath';
 import type { Accessor } from 'solid-js';
 import type { AttributeNode } from '../client/AttributeNode.ts';
-import type { ActiveLanguage, InstanceState, NullValidationState } from '../client/index.ts';
+import type { InstanceState, NullValidationState } from '../client/index.ts';
 import type { XFormsXPathAttribute } from '../integration/xpath/adapter/XFormsXPathNode.ts';
-import type { EngineXPathEvaluator } from '../integration/xpath/EngineXPathEvaluator.ts';
 import type { StaticAttribute } from '../integration/xpath/static-dom/StaticAttribute.ts';
 import { createAttributeNodeInstanceState } from '../lib/client-reactivity/instance-state/createAttributeNodeInstanceState.ts';
 import {
@@ -12,6 +11,10 @@ import {
 	type RuntimeValue,
 } from '../lib/codecs/getSharedValueCodec.ts';
 import type { RuntimeValueSetter, RuntimeValueState } from '../lib/codecs/ValueCodec.ts';
+import {
+	createAttributeState,
+	type AttributeState,
+} from '../lib/reactivity/createAttributeState.ts';
 import { createInstanceValueState } from '../lib/reactivity/createInstanceValueState.ts';
 import type { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import type { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
@@ -19,31 +22,32 @@ import {
 	createSharedNodeState,
 	type SharedNodeState,
 } from '../lib/reactivity/node-state/createSharedNodeState.ts';
-import type { ReactiveScope } from '../lib/reactivity/scope.ts';
 import type { SimpleAtomicState } from '../lib/reactivity/types.ts';
 import type { AttributeDefinition } from '../parse/model/AttributeDefinition.ts';
-import type { AnyChildNode, AnyNode } from './hierarchy.ts';
+import { DescendantNode, type DescendantNodeStateSpec } from './abstract/DescendantNode.ts';
+import type { AnyNode } from './hierarchy.ts';
 import type { AttributeContext } from './internal-api/AttributeContext.ts';
-import type { InstanceConfig } from './internal-api/InstanceConfig.ts';
 import type { DecodeInstanceValue } from './internal-api/InstanceValueContext.ts';
 import type { ClientReactiveSerializableAttributeNode } from './internal-api/serialization/ClientReactiveSerializableAttributeNode.ts';
-import type { PrimaryInstance } from './PrimaryInstance.ts';
 import type { Root } from './Root.ts';
 
-export interface AttributeStateSpec {
+export interface AttributeStateSpec extends DescendantNodeStateSpec<string> {
+	readonly children: null;
+	readonly attributes: Accessor<Attribute[]>;
 	readonly value: SimpleAtomicState<string>;
 	readonly instanceValue: Accessor<string>;
 	readonly relevant: Accessor<boolean>;
 }
 
 export class Attribute
+	extends DescendantNode<AttributeDefinition, AttributeStateSpec, AnyNode, null>
 	implements
 		AttributeNode,
 		ClientReactiveSerializableAttributeNode,
 		AttributeContext,
 		XFormsXPathAttribute
 {
-	readonly [XPathNodeKindKey] = 'attribute';
+	override readonly [XPathNodeKindKey] = 'attribute';
 
 	protected readonly state: SharedNodeState<AttributeStateSpec>;
 	protected readonly engineState: EngineState<AttributeStateSpec>;
@@ -62,60 +66,30 @@ export class Attribute
 	protected readonly getInstanceValue: Accessor<string>;
 	protected readonly valueState: RuntimeValueState<RuntimeValue<'string'>>;
 	protected readonly setValueState: RuntimeValueSetter<RuntimeInputValue<'string'>>;
-	readonly evaluator: EngineXPathEvaluator;
-	readonly getActiveLanguage: Accessor<ActiveLanguage>;
-	readonly contextNode: AnyNode;
-	readonly scope: ReactiveScope;
-	readonly rootDocument: PrimaryInstance;
-	readonly instanceConfig: InstanceConfig;
-
-	readonly root: Root;
+	readonly attributeState: AttributeState;
 
-	readonly isRelevant: Accessor<boolean> = () => {
-		return this.owner.isRelevant();
-	};
-
-	readonly isAttached: Accessor<boolean> = () => {
+	override readonly isAttached: Accessor<boolean> = () => {
 		return this.owner.isAttached();
 	};
 
-	readonly isReadonly: Accessor<boolean> = () => {
-		return true;
-	};
-
-	readonly hasReadonlyAncestor: Accessor<boolean> = () => {
-		const { owner } = this;
-		return owner.hasReadonlyAncestor() || owner.isReadonly();
-	};
-
-	readonly hasNonRelevantAncestor: Accessor<boolean> = () => {
-		const { owner } = this;
-		return owner.hasNonRelevantAncestor() || !owner.isRelevant();
-	};
-
-	readonly contextReference = (): string => {
-		return this.owner.contextReference() + '/@' + this.definition.qualifiedName.getPrefixedName();
-	};
+	override readonly getXPathValue: () => string;
 
 	constructor(
 		readonly owner: AnyNode,
-		readonly definition: AttributeDefinition,
-		readonly instanceNode: StaticAttribute
+		definition: AttributeDefinition,
+		override readonly instanceNode: StaticAttribute
 	) {
-		const codec = getSharedValueCodec('string');
+		const computeReference = () => {
+			return `${this.owner.contextReference()}/@${this.definition.qualifiedName.getPrefixedName()}`;
+		};
 
-		this.contextNode = owner;
-		this.scope = owner.scope;
-		this.rootDocument = owner.rootDocument;
+		super(owner, instanceNode, definition, { computeReference });
 
-		this.root = owner.root;
-		this.instanceConfig = owner.instanceConfig;
+		const codec = getSharedValueCodec('string');
 
-		this.getActiveLanguage = owner.getActiveLanguage;
 		this.validationState = { violations: [] };
 
 		this.valueType = 'string';
-		this.evaluator = owner.evaluator;
 		this.decodeInstanceValue = codec.decodeInstanceValue;
 
 		const instanceValueState = createInstanceValueState(this);
@@ -134,6 +108,15 @@ export class Attribute
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
 				relevant: this.owner.isRelevant,
+
+				readonly: () => true,
+				reference: this.contextReference,
+				required: () => false,
+				children: null,
+				label: () => null,
+				hint: () => null,
+				attributes: () => [],
+				valueOptions: () => [],
 			},
 			this.instanceConfig
 		);
@@ -142,6 +125,11 @@ export class Attribute
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;
 		this.instanceState = createAttributeNodeInstanceState(this);
+		this.attributeState = createAttributeState(this.scope);
+
+		this.getXPathValue = () => {
+			return this.getInstanceValue();
+		};
 	}
 
 	setValue(value: string): Root {
@@ -150,15 +138,11 @@ export class Attribute
 		return this.root;
 	}
 
-	getChildren(): readonly [] {
+	override getAttributes(): readonly Attribute[] {
 		return [];
 	}
 
-	getXPathChildNodes(): readonly AnyChildNode[] {
+	getChildren(): readonly [] {
 		return [];
 	}
-
-	getXPathValue(): string {
-		return '';
-	}
 }

package/src/instance/Group.ts

@@ -8,7 +8,10 @@ import type { AncestorNodeValidationState } from '../client/validation.ts';
 import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import type { StaticElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import { createParentNodeInstanceState } from '../lib/client-reactivity/instance-state/createParentNodeInstanceState.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';
@@ -53,6 +56,7 @@ export class Group
 	// InstanceNode
 	protected readonly state: SharedNodeState<GroupStateSpec>;
 	protected override engineState: EngineState<GroupStateSpec>;
+	readonly attributeState: AttributeState;
 
 	// GroupNode
 	readonly nodeType = 'group';
@@ -72,7 +76,7 @@ export class Group
 		this.appearances = definition.bodyElement?.appearances ?? null;
 
 		const childrenState = createChildrenState<Group, GeneralChildNode>(this);
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		this.childrenState = childrenState;
 
@@ -87,7 +91,7 @@ export class Group
 				label: createNodeLabel(this, definition),
 				hint: null,
 				children: childrenState.childIds,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 				valueOptions: null,
 				value: null,
 			},
@@ -103,7 +107,7 @@ export class Group
 		);
 
 		childrenState.setChildren(buildChildren(this));
-		attributeState.setAttributes(buildAttributes(this));
+		this.attributeState.setAttributes(buildAttributes(this));
 		this.validationState = createAggregatedViolations(this, this.instanceConfig);
 		this.instanceState = createParentNodeInstanceState(this);
 	}
@@ -111,4 +115,8 @@ export class Group
 	getChildren(): readonly GeneralChildNode[] {
 		return this.childrenState.getChildren();
 	}
+
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
 }

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';
@@ -104,6 +107,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 +126,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 +139,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 +147,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 +159,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

@@ -17,7 +17,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';
@@ -125,6 +128,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[]>;
@@ -197,7 +201,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 +216,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 +237,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

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;