@getodk/xforms-engine 0.16.0 → 0.16.1

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);

package/src/instance/UploadControl.ts

@@ -9,7 +9,10 @@ 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 {
+	createAttributeState,
+	type AttributeState,
+} 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';
@@ -29,6 +32,7 @@ import type {
 	InstanceAttachment,
 	InstanceAttachmentRuntimeValue,
 } from './attachments/InstanceAttachment.ts';
+import { buildAttributes } from './attachments/buildAttributes.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { InstanceAttachmentContext } from './internal-api/InstanceAttachmentContext.ts';
@@ -106,6 +110,7 @@ export class UploadControl
 	// InstanceNode
 	protected readonly state: SharedNodeState<UploadControlStateSpec>;
 	protected readonly engineState: EngineState<UploadControlStateSpec>;
+	readonly attributeState: AttributeState;
 
 	// InstanceValueContext
 	readonly decodeInstanceValue: DecodeInstanceValue;
@@ -136,7 +141,7 @@ export class UploadControl
 		const instanceAttachment = createInstanceAttachment(this);
 
 		this.instanceAttachment = instanceAttachment;
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 		this.decodeInstanceValue = instanceAttachment.decodeInstanceValue;
 		this.getXPathValue = instanceAttachment.getInstanceValue;
 
@@ -153,7 +158,7 @@ export class UploadControl
 				children: null,
 				valueOptions: null,
 				value: instanceAttachment.valueState,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 				instanceValue: instanceAttachment.getInstanceValue,
 			},
 			this.instanceConfig
@@ -163,6 +168,7 @@ export class UploadControl
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;
 		this.validation = createValidationState(this, this.instanceConfig);
+		this.attributeState.setAttributes(buildAttributes(this));
 		this.instanceState = createValueNodeInstanceState(this);
 	}
 
@@ -180,6 +186,10 @@ export class UploadControl
 		return [];
 	}
 
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
+
 	// UploadNode
 	setValue(value: InstanceAttachmentRuntimeValue): Root {
 		this.instanceAttachment.setValue(value);

package/src/instance/abstract/DescendantNode.ts

@@ -11,12 +11,13 @@ import type {
 } from '../../integration/xpath/adapter/XFormsXPathNode.ts';
 import { XFORMS_XPATH_NODE_RANGE_KIND } 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 type { StaticElement } from '../../integration/xpath/static-dom/StaticElement.ts';
 import { createComputedExpression } from '../../lib/reactivity/createComputedExpression.ts';
 import type { ReactiveScope } from '../../lib/reactivity/scope.ts';
 import type { AnyNodeDefinition } from '../../parse/model/NodeDefinition.ts';
 import type { DescendantNodeInitOptions } from '../children/DescendantNodeInitOptions.ts';
-import type { AnyChildNode, AnyParentNode, RepeatRange } from '../hierarchy.ts';
+import type { AnyChildNode, AnyNode, RepeatRange } from '../hierarchy.ts';
 import type { EvaluationContext } from '../internal-api/EvaluationContext.ts';
 import type { RepeatInstance } from '../repeat/RepeatInstance.ts';
 import type { Root } from '../Root.ts';
@@ -63,7 +64,7 @@ export abstract class DescendantNode<
 		Definition extends DescendantNodeDefinition,
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		Spec extends DescendantNodeStateSpec<any>,
-		Parent extends AnyParentNode,
+		Parent extends AnyNode,
 		Child extends AnyChildNode | null = null,
 	>
 	extends InstanceNode<Definition, Spec, Parent, Child>
@@ -137,7 +138,7 @@ export abstract class DescendantNode<
 
 	constructor(
 		override readonly parent: Parent,
-		override readonly instanceNode: StaticElement | null,
+		override readonly instanceNode: StaticAttribute | StaticElement | null,
 		override readonly definition: Definition,
 		options?: DescendantNodeOptions
 	) {

package/src/instance/abstract/InstanceNode.ts

@@ -28,7 +28,7 @@ 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';
+import type { AnyChildNode, AnyNode } from '../hierarchy.ts';
 import { nodeID } from '../identity.ts';
 import type { EvaluationContext } from '../internal-api/EvaluationContext.ts';
 import type { InstanceConfig } from '../internal-api/InstanceConfig.ts';
@@ -84,7 +84,7 @@ export type InstanceNodeCurrentState<
 		};
 
 interface ComputableReferenceNode {
-	readonly parent: AnyParentNode | null;
+	readonly parent: AnyNode | null;
 	readonly definition: AnyNodeDefinition;
 }
 
@@ -103,7 +103,7 @@ export abstract class InstanceNode<
 		Definition extends AnyNodeDefinition,
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		Spec extends InstanceNodeStateSpec<any>,
-		Parent extends AnyParentNode | null,
+		Parent extends AnyNode | null,
 		Child extends AnyChildNode | null = null,
 	>
 	implements BaseEngineNode, XFormsXPathPrimaryInstanceNode, EvaluationContext
@@ -272,4 +272,6 @@ export abstract class InstanceNode<
 			.map((child) => child.getXPathValue())
 			.join('');
 	}
+
+	abstract getAttributes(): readonly Attribute[];
 }

package/src/instance/attachments/buildAttributes.ts

@@ -9,7 +9,11 @@ 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) => {
+	const attributes = owner.definition.attributes;
+	if (!attributes) {
+		return [];
+	}
+	return Array.from(attributes.values()).map((attributeDefinition) => {
 		return new Attribute(owner, attributeDefinition, attributeDefinition.template);
 	});
 }

package/src/instance/children/childrenInitOptions.ts

@@ -1,3 +1,4 @@
+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 { ModelDefinition } from '../../parse/model/ModelDefinition.ts';
@@ -37,7 +38,7 @@ const collectModelChildNodesets = (parentTemplate: StaticElement): readonly stri
 type InstanceNodesByNodeset = ReadonlyMap<string, readonly [StaticElement, ...StaticElement[]]>;
 
 const groupChildElementsByNodeset = (
-	parent: StaticDocument | StaticElement
+	parent: StaticAttribute | StaticDocument | StaticElement
 ): InstanceNodesByNodeset => {
 	const result = new Map<string, [StaticElement, ...StaticElement[]]>();
 

package/src/instance/hierarchy.ts

@@ -1,3 +1,4 @@
+import type { Attribute } from './Attribute.ts';
 import type { Group } from './Group.ts';
 import type { AnyInputControl } from './InputControl.ts';
 import type { AnyModelValue } from './ModelValue.ts';
@@ -23,6 +24,7 @@ export type AnyNode =
 	| Group
 	| RepeatRange
 	| RepeatInstance
+	| Attribute
 	| AnyNote
 	| AnyModelValue
 	| AnyInputControl

package/src/instance/repeat/RepeatInstance.ts

@@ -13,7 +13,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 { createTemplatedNodeInstanceState } from '../../lib/client-reactivity/instance-state/createTemplatedNodeInstanceState.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';
@@ -60,6 +63,7 @@ export class RepeatInstance
 		ClientReactiveSerializableTemplatedNode
 {
 	private readonly childrenState: ChildrenState<GeneralChildNode>;
+	private readonly attributeState: AttributeState;
 	private readonly currentIndex: Accessor<number>;
 
 	override readonly [XPathNodeKindKey] = 'element';
@@ -131,7 +135,7 @@ export class RepeatInstance
 		this.appearances = definition.bodyElement.appearances;
 
 		const childrenState = createChildrenState<RepeatInstance, GeneralChildNode>(this);
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		this.childrenState = childrenState;
 		this.currentIndex = currentIndex;
@@ -147,7 +151,7 @@ export class RepeatInstance
 				// TODO: only-child <group><label>
 				label: createNodeLabel(this, definition),
 				hint: null,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 				children: childrenState.childIds,
 				valueOptions: null,
 				value: null,
@@ -192,4 +196,8 @@ export class RepeatInstance
 	getChildren(): readonly GeneralChildNode[] {
 		return this.childrenState.getChildren();
 	}
+
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
 }

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

@@ -120,6 +120,7 @@ export interface XFormsXPathPrimaryInstanceNode extends XFormsXPathNode {
 // prettier-ignore
 export type XFormsXPathPrimaryInstanceDescendantNodeKind =
 	| XFormsXPathNodeRangeKind
+	| XPathAttributeKind
 	| XPathElementKind
 	| XPathTextKind;
 

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

@@ -10,10 +10,10 @@ import {
 } from './names.ts';
 import {
 	compareDocumentOrder,
+	getAttributes,
 	getChildElements,
 	getChildNodes,
 	getContainingEngineXPathDocument,
-	getEngineXPathAttributes,
 	getNamespaceDeclarations,
 	getNextSiblingElement,
 	getNextSiblingNode,
@@ -43,7 +43,7 @@ export const engineDOMAdapter: EngineDOMAdapter = {
 
 	// XPathTraversalAdapter
 	compareDocumentOrder,
-	getAttributes: getEngineXPathAttributes,
+	getAttributes: getAttributes,
 	getChildElements: getChildElements,
 	getChildNodes: getChildNodes,
 	getContainingDocument: getContainingEngineXPathDocument,

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

@@ -1,5 +1,6 @@
 import type { XPathNodeKind } from '@getodk/xpath';
 import { XPathNodeKindKey } from '@getodk/xpath';
+import type { Attribute } from '../../../instance/Attribute.ts';
 import type { AnyChildNode, AnyNode, AnyParentNode } from '../../../instance/hierarchy.ts';
 import type { PrimaryInstance } from '../../../instance/PrimaryInstance.ts';
 import type { StaticAttribute } from '../static-dom/StaticAttribute.ts';
@@ -7,6 +8,7 @@ import type { StaticDocument } from '../static-dom/StaticDocument.ts';
 import type { StaticElement } from '../static-dom/StaticElement.ts';
 import type { StaticText } from '../static-dom/StaticText.ts';
 import type {
+	XFormsXPathAttribute,
 	XFormsXPathComment,
 	XFormsXPathDocument,
 	XFormsXPathElement,
@@ -17,12 +19,15 @@ export type PrimaryInstanceXPathNode = Extract<AnyNode, XFormsXPathPrimaryInstan
 
 export type PrimaryInstanceXPathElement = Extract<AnyChildNode, XFormsXPathElement>;
 
+export type PrimaryInstanceXPathAttribute = Extract<Attribute, XFormsXPathAttribute>;
+
 export type PrimaryInstanceXPathComment = Extract<AnyChildNode, XFormsXPathComment>;
 
 // prettier-ignore
 export type PrimaryInstanceXPathChildNode =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
 	| PrimaryInstanceXPathElement
+	| PrimaryInstanceXPathAttribute
 	| PrimaryInstanceXPathComment;
 
 // prettier-ignore
@@ -41,7 +46,7 @@ export type EngineXPathComment =
 
 // Giving this a type alias anticipates eventually implementing attributes
 // in primary instance state as well
-export type EngineXPathAttribute = StaticAttribute;
+export type EngineXPathAttribute = PrimaryInstanceXPathAttribute | StaticAttribute;
 
 export type EngineXPathText = StaticText;
 

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

@@ -128,6 +128,7 @@ export const resolveEngineXPathNodeNamespaceURI = (
 		case 'static-text':
 			return resolveNamespaceURIFromStaticNodeContext(node, prefix);
 
+		case 'attribute':
 		case 'group':
 		case 'input':
 		case 'model-value':

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

@@ -8,7 +8,6 @@ import type {
 	EngineXPathDocument,
 	EngineXPathElement,
 	EngineXPathNode,
-	EngineXPathParentNode,
 	PrimaryInstanceXPathChildNode,
 	XFormsXPathChildNode,
 } from './kind.ts';
@@ -18,13 +17,13 @@ export const getContainingEngineXPathDocument = (node: EngineXPathNode): EngineX
 	return node.rootDocument;
 };
 
-export const getEngineXPathAttributes = (
-	node: EngineXPathNode
-): readonly EngineXPathAttribute[] => {
+export const getAttributes = (node: EngineXPathNode): readonly EngineXPathAttribute[] => {
 	if (node.nodeType === 'static-element') {
 		return node.attributes;
 	}
-
+	if (isEngineXPathElement(node)) {
+		return node.getAttributes();
+	}
 	return [];
 };
 
@@ -43,7 +42,7 @@ export const getEngineXPathAttributes = (
  */
 export const getNamespaceDeclarations = (): readonly [] => [];
 
-export const getParentNode = (node: EngineXPathNode): EngineXPathParentNode | null => {
+export const getParentNode = (node: EngineXPathNode): EngineXPathNode | null => {
 	if (node.nodeType === 'repeat-instance') {
 		return node.parent.parent;
 	}

package/src/integration/xpath/static-dom/StaticAttribute.ts

@@ -20,6 +20,7 @@ export class StaticAttribute extends StaticNode<'attribute'> implements XFormsXP
 	readonly nodeset: string;
 	readonly attributes = [] as const;
 	readonly children = null;
+	readonly childElements = [];
 	readonly value: string;
 
 	constructor(

package/src/lib/reactivity/createInstanceValueState.ts

@@ -199,6 +199,32 @@ const createCalculation = (
 	});
 };
 
+/**
+ * Runs the computation without maintaining a reactive listener, so
+ * actions that should run only at a specific time are not triggered
+ * when referenced elements are updated.
+ */
+const createActionCalculation = (
+	context: ValueContext,
+	setRelevantValue: SimpleAtomicStateSetter<string>,
+	computation: ActionComputationExpression<'string'>
+): void => {
+	createComputed(() => {
+		if (context.isAttached()) {
+			// use untrack so the expression evaluation isn't reactive
+			const relevant = untrack(() => context.isRelevant());
+			if (!relevant) {
+				return;
+			}
+			const calculated = untrack(() => {
+				return context.evaluator.evaluateString(computation.expression, context);
+			});
+			const value = context.decodeInstanceValue(calculated);
+			setRelevantValue(value);
+		}
+	});
+};
+
 const createValueChangedCalculation = (
 	context: ValueContext,
 	setRelevantValue: SimpleAtomicStateSetter<string>,
@@ -235,17 +261,17 @@ const registerAction = (
 ) => {
 	if (action.events.includes(XFORM_EVENT.odkInstanceFirstLoad)) {
 		if (isInstanceFirstLoad(context)) {
-			createCalculation(context, setValue, action.computation);
+			createActionCalculation(context, setValue, action.computation);
 		}
 	}
 	if (action.events.includes(XFORM_EVENT.odkInstanceLoad)) {
 		if (!isAddingRepeatChild(context)) {
-			createCalculation(context, setValue, action.computation);
+			createActionCalculation(context, setValue, action.computation);
 		}
 	}
 	if (action.events.includes(XFORM_EVENT.odkNewRepeat)) {
 		if (isAddingRepeatChild(context)) {
-			createCalculation(context, setValue, action.computation);
+			createActionCalculation(context, setValue, action.computation);
 		}
 	}
 	if (action.events.includes(XFORM_EVENT.xformsValueChanged)) {

package/src/parse/model/AttributeDefinition.ts

@@ -19,6 +19,7 @@ export class AttributeDefinition
 
 	readonly value: string;
 	readonly type = 'attribute';
+	readonly valueType = 'string';
 	readonly namespaceDeclarations: NamespaceDeclarationMap;
 	readonly bodyElement = null;
 	readonly root: RootDefinition;
@@ -56,4 +57,10 @@ export class AttributeDefinition
 	serializeAttributeXML(): string {
 		return this.serializedXML;
 	}
+
+	toJSON() {
+		const { bind, bodyElement, parent, root, ...rest } = this;
+
+		return rest;
+	}
 }