@getodk/xforms-engine 0.16.0 → 0.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getodk/xforms-engine",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "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.10.0",
     "@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/client/InputNode.ts

@@ -49,8 +49,8 @@ interface InputNodeOptionsByValueType {
 	readonly time: null;
 	readonly dateTime: null;
 	readonly geopoint: GeoInputNodeOptions;
-	readonly geotrace: GeoInputNodeOptions;
-	readonly geoshape: GeoInputNodeOptions;
+	readonly geotrace: null;
+	readonly geoshape: null;
 	readonly binary: null;
 	readonly barcode: null;
 	readonly intent: null;
@@ -86,12 +86,16 @@ export type IntInputValue = InputValue<'int'>;
 export type DecimalInputValue = InputValue<'decimal'>;
 export type DateInputValue = InputValue<'date'>;
 export type GeopointInputValue = InputValue<'geopoint'>;
+export type GeoshapeInputValue = InputValue<'geoshape'>;
+export type GeotraceInputValue = InputValue<'geotrace'>;
 
 export type StringInputNode = InputNode<'string'>;
 export type IntInputNode = InputNode<'int'>;
 export type DecimalInputNode = InputNode<'decimal'>;
 export type DateInputNode = InputNode<'date'>;
 export type GeopointInputNode = InputNode<'geopoint'>;
+export type GeoshapeInputNode = InputNode<'geoshape'>;
+export type GeotraceInputNode = InputNode<'geotrace'>;
 
 // prettier-ignore
 type SupportedInputValueType =
@@ -100,7 +104,9 @@ type SupportedInputValueType =
 	| 'int'
 	| 'decimal'
 	| 'date'
-	| 'geopoint';
+	| 'geopoint'
+	| 'geoshape'
+	| 'geotrace';
 
 type TemporaryStringValueType = Exclude<ValueType, SupportedInputValueType>;
 
@@ -114,4 +120,6 @@ export type AnyInputNode =
 	| DecimalInputNode
 	| DateInputNode
 	| GeopointInputNode
+	| GeoshapeInputNode
+	| GeotraceInputNode
 	| TemporaryStringValueInputNode;

package/src/client/MarkdownNode.ts

@@ -16,17 +16,20 @@ export type ElementName =
 export type MarkdownNode = ChildMarkdownNode | HtmlMarkdownNode | ParentMarkdownNode;
 
 export interface ParentMarkdownNode {
+	readonly id: string;
 	readonly role: 'parent';
 	readonly elementName: string;
 	readonly children: MarkdownNode[];
 }
 
 export interface ChildMarkdownNode {
+	readonly id: string;
 	readonly role: 'child';
 	readonly value: string;
 }
 
 export interface HtmlMarkdownNode {
+	readonly id: string;
 	readonly role: 'html';
 	readonly unsafeHtml: string;
 }

package/src/client/NoteNode.ts

@@ -83,12 +83,16 @@ export type IntNoteValue = NoteValue<'int'>;
 export type DecimalNoteValue = NoteValue<'decimal'>;
 export type DateNoteValue = NoteValue<'date'>;
 export type GeopointNoteValue = NoteValue<'geopoint'>;
+export type GeoshapeNoteValue = NoteValue<'geoshape'>;
+export type GeotraceNoteValue = NoteValue<'geotrace'>;
 
 export type StringNoteNode = NoteNode<'string'>;
 export type IntNoteNode = NoteNode<'int'>;
 export type DecimalNoteNode = NoteNode<'decimal'>;
 export type DateNoteNode = NoteNode<'date'>;
 export type GeopointNoteNode = NoteNode<'geopoint'>;
+export type GeoshapeNoteNode = NoteNode<'geoshape'>;
+export type GeotraceNoteNode = NoteNode<'geotrace'>;
 
 // prettier-ignore
 type SupportedNoteValueType =
@@ -97,7 +101,9 @@ type SupportedNoteValueType =
 	| 'int'
 	| 'decimal'
 	| 'date'
-	| 'geopoint';
+	| 'geopoint'
+	| 'geoshape'
+	| 'geotrace';
 
 type TemporaryStringValueType = Exclude<ValueType, SupportedNoteValueType>;
 
@@ -111,4 +117,6 @@ export type AnyNoteNode =
 	| DecimalNoteNode
 	| DateNoteNode
 	| GeopointNoteNode
+	| GeoshapeNoteNode
+	| GeotraceNoteNode
 	| TemporaryStringValueNoteNode;

package/src/client/form/FormInstanceConfig.ts

@@ -16,6 +16,10 @@ export interface PreloadProperties {
 	readonly phoneNumber?: string;
 }
 
+export interface GeolocationProvider {
+	getLocation(): Promise<string>;
+}
+
 export interface FormInstanceConfig {
 	/**
 	 * A client may specify a generic function for constructing stateful objects.
@@ -35,4 +39,6 @@ export interface FormInstanceConfig {
 	readonly instanceAttachments?: InstanceAttachmentsConfig;
 
 	readonly preloadProperties?: PreloadProperties;
+
+	readonly geolocationProvider?: GeolocationProvider;
 }

package/src/client/form/LoadFormResult.ts

@@ -3,6 +3,7 @@ import type { AnyFunction } from '@getodk/common/types/helpers.js';
 import type { LoadFormFailureError } from '../../error/LoadFormFailureError.ts';
 import type { CreateFormInstance } from './CreateFormInstance.ts';
 import type { EditFormInstance } from './EditFormInstance.ts';
+import type { ResetFormInstance } from './ResetFormInstance.ts';
 import type { RestoreFormInstance } from './RestoreFormInstance.ts';
 
 // Re-export for client access
@@ -44,6 +45,7 @@ interface BaseLoadFormResult {
 	readonly warnings: LoadFormWarnings | null;
 	readonly error: LoadFormFailureError | null;
 	readonly createInstance: FallibleLoadFormResultMethod<CreateFormInstance>;
+	readonly resetInstance: FallibleLoadFormResultMethod<ResetFormInstance>;
 	readonly editInstance: FallibleLoadFormResultMethod<EditFormInstance>;
 	readonly restoreInstance: FallibleLoadFormResultMethod<RestoreFormInstance>;
 }
@@ -53,6 +55,7 @@ export interface LoadFormSuccessResult extends BaseLoadFormResult {
 	readonly warnings: null;
 	readonly error: null;
 	readonly createInstance: CreateFormInstance;
+	readonly resetInstance: ResetFormInstance;
 	readonly editInstance: EditFormInstance;
 	readonly restoreInstance: RestoreFormInstance;
 }
@@ -62,6 +65,7 @@ export interface LoadFormWarningResult extends BaseLoadFormResult {
 	readonly warnings: LoadFormWarnings;
 	readonly error: null;
 	readonly createInstance: CreateFormInstance;
+	readonly resetInstance: ResetFormInstance;
 	readonly editInstance: EditFormInstance;
 	readonly restoreInstance: RestoreFormInstance;
 }
@@ -70,25 +74,9 @@ export interface LoadFormFailureResult extends BaseLoadFormResult {
 	readonly status: 'failure';
 	readonly warnings: LoadFormWarnings | null;
 	readonly error: LoadFormFailureError;
-
-	/**
-	 * @example A temporary demo integration was built during development of this
-	 * interface.
-	 *
-	 * @see
-	 * {@link https://github.com/getodk/web-forms/pull/345/commits/9ef36355d89dd1450d3a87c3a55506bb9b0fc414}
-	 */
 	readonly createInstance: FailedLoadFormResultMethod<CreateFormInstance>;
-
+	readonly resetInstance: FailedLoadFormResultMethod<ResetFormInstance>;
 	readonly editInstance: FailedLoadFormResultMethod<EditFormInstance>;
-
-	/**
-	 * @example A temporary demo integration was built during development of this
-	 * interface.
-	 *
-	 * @see
-	 * {@link https://github.com/getodk/web-forms/pull/345/commits/9ef36355d89dd1450d3a87c3a55506bb9b0fc414}
-	 */
 	readonly restoreInstance: FailedLoadFormResultMethod<RestoreFormInstance>;
 }
 

package/src/client/form/ResetFormInstance.ts

@@ -0,0 +1,17 @@
+import type { RootNode } from '../RootNode.ts';
+import type { CreatedFormInstance } from './CreateFormInstance.ts';
+import type { FormInstanceConfig } from './FormInstanceConfig.ts';
+import type { LoadForm } from './LoadForm.ts';
+import type { LoadFormResult } from './LoadFormResult.ts';
+
+/**
+ * @todo This is fallible! Client-facing interfaces will need to account for
+ * this. We've begun addressing fallibility _at the interface level_ in
+ * {@link LoadForm} (with {@link LoadFormResult}). We'll eventually have a more
+ * general interface pattern for this, and we'll apply it here as well. The baby
+ * step approach in {@link LoadFormResult} is impractical here due to
+ * engine-internal designs, and revising that is currently out of scope. As
+ * such, explicit interface-level documentation of fallibility is deferred here,
+ * on {@link RootNode} itself, and into any of its sub-interfaces.
+ */
+export type ResetFormInstance = (config?: FormInstanceConfig) => CreatedFormInstance;

package/src/entrypoints/FormInstance.ts

@@ -42,6 +42,7 @@ export class FormInstance<Mode extends FormInstanceInitializationMode>
 			clientStateFactory: instanceConfig.stateFactory ?? identity,
 			computeAttachmentName: instanceConfig.instanceAttachments?.fileNameFactory ?? (() => null),
 			preloadProperties: instanceConfig.preloadProperties ?? {},
+			geolocationProvider: instanceConfig.geolocationProvider,
 		};
 		const primaryInstanceOptions: PrimaryInstanceOptions<Mode> = {
 			...options.instanceOptions,
@@ -49,6 +50,7 @@ export class FormInstance<Mode extends FormInstanceInitializationMode>
 			initialState,
 			config,
 		};
+
 		const { root } = new PrimaryInstance(primaryInstanceOptions);
 
 		this.mode = mode;

package/src/entrypoints/FormResult/BaseFormResult.ts

@@ -29,6 +29,7 @@ export abstract class BaseFormResult<Status extends FormResultStatus> {
 	readonly error: BaseFormResultProperty<Status, 'error'>;
 
 	abstract readonly createInstance: BaseFormResultProperty<Status, 'createInstance'>;
+	abstract readonly resetInstance: BaseFormResultProperty<Status, 'resetInstance'>;
 	abstract readonly editInstance: BaseFormResultProperty<Status, 'editInstance'>;
 	abstract readonly restoreInstance: BaseFormResultProperty<Status, 'restoreInstance'>;
 

package/src/entrypoints/FormResult/BaseInstantiableFormResult.ts

@@ -5,6 +5,7 @@ import type {
 } from '../../client/form/EditFormInstance.ts';
 import type { FormInstanceConfig } from '../../client/form/FormInstanceConfig.ts';
 import type { FormResultStatus } from '../../client/form/LoadFormResult.ts';
+import type { ResetFormInstance } from '../../client/form/ResetFormInstance.ts';
 import type {
 	RestoreFormInstance,
 	RestoreFormInstanceInput,
@@ -13,7 +14,8 @@ import { ErrorProductionDesignPendingError } from '../../error/ErrorProductionDe
 import { InitialInstanceState } from '../../instance/input/InitialInstanceState.ts';
 import type { BasePrimaryInstanceOptions } from '../../instance/PrimaryInstance.ts';
 import type { FormResource } from '../../instance/resource.ts';
-import type { ReactiveScope } from '../../lib/reactivity/scope.ts';
+import { type ReactiveScope } from '../../lib/reactivity/scope.ts';
+import { createPotentiallyClientOwnedReactiveScope } from '../createPotentiallyClientOwnedReactiveScope.ts';
 import type { InstantiableFormResult } from '../FormInstance.ts';
 import { FormInstance } from '../FormInstance.ts';
 import type { BaseFormResultProperty } from './BaseFormResult.ts';
@@ -37,6 +39,7 @@ export abstract class BaseInstantiableFormResult<
 	Status extends InstantiableFormResultStatus,
 > extends BaseFormResult<Status> {
 	readonly createInstance: CreateFormInstance;
+	readonly resetInstance: ResetFormInstance;
 	readonly editInstance: EditFormInstance;
 	readonly restoreInstance: RestoreFormInstance;
 
@@ -60,6 +63,12 @@ export abstract class BaseInstantiableFormResult<
 			});
 		};
 
+		this.resetInstance = (instanceConfig: FormInstanceConfig = {}) => {
+			instanceOptions.scope.dispose();
+			instanceOptions.scope = createPotentiallyClientOwnedReactiveScope();
+			return this.createInstance(instanceConfig);
+		};
+
 		this.editInstance = async (
 			input: EditFormInstanceInput,
 			instanceConfig: FormInstanceConfig = {}

package/src/entrypoints/FormResult/FormFailureResult.ts

@@ -6,6 +6,7 @@ import type {
 	LoadFormFailureResult,
 	LoadFormWarnings,
 } from '../../client/form/LoadFormResult.ts';
+import type { ResetFormInstance } from '../../client/form/ResetFormInstance.ts';
 import type { RestoreFormInstance } from '../../client/form/RestoreFormInstance.ts';
 import { LoadFormFailureError } from '../../error/LoadFormFailureError.ts';
 import { BaseFormResult } from './BaseFormResult.ts';
@@ -25,6 +26,7 @@ const failedFormResultMethodFactory = <T extends AnyFunction>(
 
 export class FormFailureResult extends BaseFormResult<'failure'> implements LoadFormFailureResult {
 	readonly createInstance: FailedLoadFormResultMethod<CreateFormInstance>;
+	readonly resetInstance: FailedLoadFormResultMethod<ResetFormInstance>;
 	readonly editInstance: FailedLoadFormResultMethod<EditFormInstance>;
 	readonly restoreInstance: FailedLoadFormResultMethod<RestoreFormInstance>;
 
@@ -38,6 +40,7 @@ export class FormFailureResult extends BaseFormResult<'failure'> implements Load
 		});
 
 		this.createInstance = failedFormResultMethodFactory(error);
+		this.resetInstance = failedFormResultMethodFactory(error);
 		this.editInstance = failedFormResultMethodFactory(error);
 		this.restoreInstance = failedFormResultMethodFactory(error);
 	}

package/src/entrypoints/createPotentiallyClientOwnedReactiveScope.ts

@@ -0,0 +1,30 @@
+import { getOwner, type Owner } from 'solid-js';
+import { createReactiveScope, type ReactiveScope } from '../lib/reactivity/scope';
+
+/**
+ * Creates a {@link ReactiveScope | reactive scope} from which all form
+ * instances derive, and:
+ *
+ * - if a client loads a form within a Solid reactive context, the scope will be
+ *   disposed along with the client's reactive context; OR
+ * - if a client loads a form outside a Solid reactive context (typically: if a
+ *   client does not use Solid reactivity), the scope will disposed if and when
+ *   the engine drops access to the loaded form
+ *
+ * **IMPORTANT:** this **MUST** be called synchronously. If it is called in an
+ * `async` function, it **MUST** be called before any `await` expression; if it
+ * is called in any other flow with mixed synchrony, it must be called before
+ * yielding to the event loop. Failing to do this will cause the engine to lose
+ * access to a client's Solid reactive context, potentially leaking form
+ * reactivity indefinitely.
+ */
+export const createPotentiallyClientOwnedReactiveScope = (): ReactiveScope => {
+	/**
+	 * A {@link clientOwner | client owner} is the owner of a client's Solid
+	 * reactive context, if one exists. If none exists, the {@link ReactiveScope}
+	 * is fully owned by the engine.
+	 */
+	const clientOwner: Owner | null = getOwner();
+
+	return createReactiveScope({ owner: clientOwner });
+};

package/src/entrypoints/loadForm.ts

@@ -1,5 +1,3 @@
-import type { Owner } from 'solid-js';
-import { getOwner } from 'solid-js';
 import { MISSING_RESOURCE_BEHAVIOR } from '../client/constants.ts';
 import type { FormResource } from '../client/form/FormResource.ts';
 import type { LoadForm, LoadFormOptions } from '../client/form/LoadForm.ts';
@@ -7,40 +5,12 @@ import type { LoadFormResult } from '../client/form/LoadFormResult.ts';
 import { LoadFormFailureError } from '../error/LoadFormFailureError.ts';
 import { retrieveFormDefinition } from '../instance/resource.ts';
 import type { ReactiveScope } from '../lib/reactivity/scope.ts';
-import { createReactiveScope } from '../lib/reactivity/scope.ts';
 import { XFormDOM } from '../parse/XFormDOM.ts';
 import { XFormDefinition } from '../parse/XFormDefinition.ts';
 import { SecondaryInstancesDefinition } from '../parse/model/SecondaryInstance/SecondaryInstancesDefinition.ts';
 import { FormFailureResult } from './FormResult/FormFailureResult.ts';
 import { FormSuccessResult } from './FormResult/FormSuccessResult.ts';
-
-/**
- * Creates a {@link ReactiveScope | reactive scope} from which all form
- * instances derive, and:
- *
- * - if a client loads a form within a Solid reactive context, the scope will be
- *   disposed along with the client's reactive context; OR
- * - if a client loads a form outside a Solid reactive context (typically: if a
- *   client does not use Solid reactivity), the scope will disposed if and when
- *   the engine drops access to the loaded form
- *
- * **IMPORTANT:** this **MUST** be called synchronously. If it is called in an
- * `async` function, it **MUST** be called before any `await` expression; if it
- * is called in any other flow with mixed synchrony, it must be called before
- * yielding to the event loop. Failing to do this will cause the engine to lose
- * access to a client's Solid reactive context, potentially leaking form
- * reactivity indefinitely.
- */
-const createPotentiallyClientOwnedReactiveScope = (): ReactiveScope => {
-	/**
-	 * A {@link clientOwner | client owner} is the owner of a client's Solid
-	 * reactive context, if one exists. If none exists, the {@link ReactiveScope}
-	 * is fully owned by the engine.
-	 */
-	const clientOwner: Owner | null = getOwner();
-
-	return createReactiveScope({ owner: clientOwner });
-};
+import { createPotentiallyClientOwnedReactiveScope } from './createPotentiallyClientOwnedReactiveScope.ts';
 
 type GlobalFetch = typeof globalThis.fetch;
 

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();
+	}
 }