@getodk/xforms-engine 0.13.0 → 0.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getodk/xforms-engine",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "license": "Apache-2.0",
   "description": "XForms engine for ODK Web Forms",
   "type": "module",
@@ -55,22 +55,23 @@
   },
   "dependencies": {
     "bin-packer": "1.7.0",
+    "mdast-util-from-markdown": "^2.0.2",
     "papaparse": "^5.5.3",
     "solid-js": "^1.9.7",
     "temporal-polyfill": "^0.3.0"
   },
   "devDependencies": {
     "@babel/core": "^7.28.0",
-    "@getodk/tree-sitter-xpath": "0.2.0",
-    "@getodk/xpath": "0.8.0",
-    "@playwright/test": "^1.53.2",
+    "@getodk/tree-sitter-xpath": "0.2.1",
+    "@getodk/xpath": "0.9.0",
+    "@playwright/test": "^1.55.1",
     "@types/papaparse": "^5.3.16",
     "@vitest/browser": "^3.2.4",
     "babel-plugin-transform-jsbi-to-bigint": "^1.4.2",
     "http-server": "^14.1.1",
     "jsdom": "^26.1.0",
     "typedoc": "^0.28.7",
-    "vite": "^7.0.3",
+    "vite": "^7.0.8",
     "vite-plugin-dts": "^4.5.4",
     "vite-plugin-no-bundle": "^4.0.0",
     "vitest": "^3.2.4"

package/src/client/AttributeNode.ts

@@ -0,0 +1,62 @@
+import type { Root } from '../instance/Root.ts';
+import type { AttributeDefinition } from '../parse/model/AttributeDefinition.ts';
+import type { OpaqueReactiveObjectFactory } from './OpaqueReactiveObjectFactory.ts';
+import type { InstanceState } from './serialization/InstanceState.ts';
+
+export interface AttributeNodeState {
+	get value(): string;
+}
+
+/**
+ * Base interface for common/shared aspects of attributes.
+ */
+export interface AttributeNode {
+	/**
+	 * Specifies the node's general type. This can be useful for narrowing types,
+	 * e.g. those of children.
+	 */
+	readonly nodeType: 'attribute';
+
+	/**
+	 * Each node has a definition which specifies aspects of the node defined in
+	 * the form. These aspects include (but are not limited to) the node's data
+	 * type, its body presentation constraints (if any), its bound nodeset, and
+	 * so on...
+	 */
+	readonly definition: AttributeDefinition;
+
+	/**
+	 * Each node links back to the node representing the root of the form.
+	 */
+	readonly root: Root;
+
+	/**
+	 * Each node links back to its parent, if any. All nodes have a parent except
+	 * the form's {@link root}.
+	 */
+	readonly parent: unknown;
+
+	/**
+	 * Each node provides a discrete object representing the stateful aspects of
+	 * that node which will change over time. This includes state which is either
+	 * client-/user-mutable, or state which is computed based on the core XForms
+	 * computation model. Each node also exposes {@link validationState}, which
+	 * reflects the validity of the node, or its descendants.
+	 *
+	 * When a client provides a {@link OpaqueReactiveObjectFactory}, the engine
+	 * will update the properties of this object as their respective states
+	 * change, so a client can implement reactive updates that respond to changes
+	 * as they occur.
+	 */
+	readonly currentState: AttributeNodeState;
+
+	/**
+	 * Represents the current instance state of the node.
+	 *
+	 * @see {@link InstanceState.instanceXML} for additional detail.
+	 */
+	readonly instanceState: InstanceState;
+
+	readonly appearances: null;
+	readonly nodeOptions: null;
+}

package/src/client/BaseItem.ts

@@ -0,0 +1,7 @@
+import type { TextRange } from './TextRange.ts';
+
+export interface BaseItem {
+	get label(): TextRange<'item-label'>;
+	get value(): string;
+	properties: Array<[string, string]>;
+}

package/src/client/GroupNode.ts

@@ -1,5 +1,5 @@
-import type { AnyGroupElementDefinition } from '../parse/body/BodyDefinition.ts';
-import type { SubtreeDefinition } from '../parse/model/SubtreeDefinition.ts';
+import type { GroupElementDefinition } from '../parse/body/GroupElementDefinition.ts';
+import type { GroupDefinition as GroupNodeDefinition } from '../parse/model/GroupDefinition.ts';
 import type { BaseNode, BaseNodeState } from './BaseNode.ts';
 import type { NodeAppearances } from './NodeAppearances.ts';
 import type { RootNode } from './RootNode.ts';
@@ -13,10 +13,8 @@ export interface GroupNodeState extends BaseNodeState {
 	get value(): null;
 }
 
-// TODO: as with `SubtreeNode`'s `SubtreeDefinition`, there is a naming
-// inconsistency emerging here.
-export interface GroupDefinition extends SubtreeDefinition {
-	readonly bodyElement: AnyGroupElementDefinition;
+export interface GroupDefinition extends GroupNodeDefinition {
+	readonly bodyElement: GroupElementDefinition;
 }
 
 export type GroupNodeAppearances = NodeAppearances<GroupDefinition>;
@@ -24,10 +22,6 @@ export type GroupNodeAppearances = NodeAppearances<GroupDefinition>;
 /**
  * A node corresponding to an XForms `<group>`.
  */
-// TODO: test (fix?) case where a `<group>` is implicitly connected to a
-// subtree, but doesn't reference it directly. See
-// https://github.com/getodk/web-forms/blob/6cfff8b4c5a2cf6a23a71ef6d4308343bccd2436/packages/odk-web-forms/src/lib/xform/model/ModelDefinition.test.ts#L480-L540
-// for context.
 export interface GroupNode extends BaseNode {
 	readonly nodeType: 'group';
 	readonly appearances: GroupNodeAppearances;

package/src/client/MarkdownNode.ts

@@ -0,0 +1,53 @@
+export type Heading = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+
+export type ElementName =
+	| Heading
+	| 'a'
+	| 'div'
+	| 'em'
+	| 'li'
+	| 'ol'
+	| 'p'
+	| 'span'
+	| 'strong'
+	| 'u'
+	| 'ul';
+
+export type MarkdownNode = ChildMarkdownNode | HtmlMarkdownNode | ParentMarkdownNode;
+
+export interface ParentMarkdownNode {
+	readonly role: 'parent';
+	readonly elementName: string;
+	readonly children: MarkdownNode[];
+}
+
+export interface ChildMarkdownNode {
+	readonly role: 'child';
+	readonly value: string;
+}
+
+export interface HtmlMarkdownNode {
+	readonly role: 'html';
+	readonly unsafeHtml: string;
+}
+
+export interface AnchorMarkdownNode extends ParentMarkdownNode {
+	readonly elementName: 'a';
+	readonly url: string;
+}
+
+export interface StyledMarkdownNode extends ParentMarkdownNode {
+	readonly elementName: 'div' | 'p' | 'span';
+	readonly properties: MarkdownProperty | undefined;
+}
+
+export interface MarkdownProperty {
+	readonly style: StyleProperty;
+}
+
+export interface StyleProperty {
+	readonly color: string | undefined;
+	readonly 'font-family': string | undefined;
+	readonly 'text-align': 'center' | 'left' | 'right' | undefined;
+	readonly 'font-size': string | undefined;
+}

package/src/client/RankNode.ts

@@ -1,6 +1,7 @@
 import type { RankControlDefinition } from '../parse/body/control/RankControlDefinition.ts';
 import type { LeafNodeDefinition } from '../parse/model/LeafNodeDefinition.ts';
 import type { BaseValueNode, BaseValueNodeState } from './BaseValueNode.ts';
+import type { BaseItem } from './BaseItem.ts';
 import type { RootNode } from './RootNode.ts';
 import type { TextRange } from './TextRange.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
@@ -8,11 +9,7 @@ import type { LeafNodeValidationState } from './validation.ts';
 import type { UnknownAppearanceDefinition } from '../parse/body/appearance/unknownAppearanceParser.ts';
 import type { ValueType } from './ValueType.ts';
 
-export interface RankItem {
-	get label(): TextRange<'item-label'>;
-	get value(): string;
-}
-
+export type RankItem = BaseItem;
 export type RankValueOptions = readonly RankItem[];
 
 export interface RankNodeState extends BaseValueNodeState<readonly string[]> {

package/src/client/SelectNode.ts

@@ -4,18 +4,14 @@ import type {
 } from '../parse/body/control/SelectControlDefinition.ts';
 import type { LeafNodeDefinition } from '../parse/model/LeafNodeDefinition.ts';
 import type { BaseValueNode, BaseValueNodeState } from './BaseValueNode.ts';
+import type { BaseItem } from './BaseItem.ts';
 import type { NodeAppearances } from './NodeAppearances.ts';
 import type { RootNode } from './RootNode.ts';
-import type { TextRange } from './TextRange.ts';
 import type { ValueType } from './ValueType.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { LeafNodeValidationState } from './validation.ts';
 
-export interface SelectItem {
-	get label(): TextRange<'item-label'>;
-	get value(): string;
-}
-
+export type SelectItem = BaseItem;
 export type SelectValueOptions = readonly SelectItem[];
 
 export interface SelectNodeState extends BaseValueNodeState<readonly string[]> {

package/src/client/TextRange.ts

@@ -1,5 +1,6 @@
 import { JRResourceURL } from '@getodk/common/jr-resources/JRResourceURL.ts';
 import type { ActiveLanguage } from './FormLanguage.ts';
+import type { MarkdownNode } from './MarkdownNode.ts';
 
 /**
  * **COMMENTARY**
@@ -73,7 +74,6 @@ export interface TextChunk {
 	get language(): ActiveLanguage;
 
 	get asString(): string;
-	get formatted(): unknown;
 }
 
 // eslint-disable-next-line @typescript-eslint/sort-type-constituents
@@ -146,7 +146,7 @@ export interface TextRange<Role extends TextRole, Origin extends TextOrigin = Te
 	[Symbol.iterator](): Iterable<TextChunk>;
 
 	get asString(): string;
-	get formatted(): unknown;
+	get formatted(): MarkdownNode[];
 
 	get imageSource(): JRResourceURL | undefined;
 	get audioSource(): JRResourceURL | undefined;

package/src/client/hierarchy.ts

@@ -10,7 +10,6 @@ import type { RepeatRangeControlledNode } from './repeat/RepeatRangeControlledNo
 import type { RepeatRangeUncontrolledNode } from './repeat/RepeatRangeUncontrolledNode.ts';
 import type { RootNode } from './RootNode.ts';
 import type { SelectNode } from './SelectNode.ts';
-import type { SubtreeNode } from './SubtreeNode.ts';
 import type { TriggerNode } from './TriggerNode.ts';
 import type { UploadNode } from './UploadNode.ts';
 
@@ -40,7 +39,6 @@ export type RepeatRangeNode =
  */
 export type GeneralParentNode =
 	| RootNode // eslint-disable-line @typescript-eslint/sort-type-constituents
-	| SubtreeNode
 	| GroupNode
 	| RepeatInstanceNode;
 

package/src/client/index.ts

@@ -1,5 +1,6 @@
 export type * from './attachments/InstanceAttachmentMeta.ts';
 export type * from './attachments/InstanceAttachmentsConfig.ts';
+export type * from './AttributeNode.ts';
 export type * from './constants.ts';
 export * as constants from './constants.ts';
 export type * from './form/CreateFormInstance.ts';
@@ -24,6 +25,7 @@ export type {
 } from './hierarchy.ts';
 export type * from './identity.ts';
 export type * from './InputNode.ts';
+export type * from './MarkdownNode.ts';
 export type * from './ModelValueNode.ts';
 export type * from './NoteNode.ts';
 export type * from './OpaqueReactiveObjectFactory.ts';
@@ -41,7 +43,6 @@ export type * from './serialization/InstancePayload.ts';
 export type * from './serialization/InstancePayloadOptions.ts';
 export type * from './serialization/InstanceState.ts';
 export type * from './submission/SubmissionMeta.ts';
-export type * from './SubtreeNode.ts';
 export type * from './TextRange.ts';
 export type * from './TriggerNode.ts';
 export type * from './UploadNode.ts';

package/src/client/node-types.ts

@@ -13,6 +13,7 @@ export type LeafNodeType =
 	| 'trigger'
 	| 'range'
 	| 'rank'
+	| 'attribute'
 	| 'upload';
 
 // prettier-ignore
@@ -22,5 +23,4 @@ export type InstanceNodeType =
 	| RepeatRangeNodeType
 	| 'repeat-instance'
 	| 'group'
-	| 'subtree'
 	| LeafNodeType;

package/src/client/validation.ts

@@ -193,7 +193,15 @@ export interface AncestorNodeValidationState {
 	get violations(): readonly DescendantNodeViolationReference[];
 }
 
+/**
+ * Convenience interface for nodes that cannot be invalid.
+ */
+export interface NullValidationState {
+	get violations(): readonly [];
+}
+
 // prettier-ignore
 export type NodeValidationState =
 	| AncestorNodeValidationState
-	| LeafNodeValidationState;
+	| LeafNodeValidationState
+	| NullValidationState;

package/src/instance/Attribute.ts

@@ -0,0 +1,164 @@
+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 { 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 {
+	getSharedValueCodec,
+	type RuntimeInputValue,
+	type RuntimeValue,
+} from '../lib/codecs/getSharedValueCodec.ts';
+import type { RuntimeValueSetter, RuntimeValueState } from '../lib/codecs/ValueCodec.ts';
+import { createAttributeValueState } from '../lib/reactivity/createAttributeValueState.ts';
+import type { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
+import type { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
+import {
+	createSharedNodeState,
+	type SharedNodeState,
+} from '../lib/reactivity/node-state/createSharedNodeState.ts';
+import type { SimpleAtomicState } from '../lib/reactivity/types.ts';
+import type { AttributeDefinition } from '../parse/model/AttributeDefinition.ts';
+import type { DescendantNodeSharedStateSpec } from './abstract/DescendantNode.ts';
+import { InstanceNode } from './abstract/InstanceNode.ts';
+import type { AnyParentNode } from './hierarchy.ts';
+import type { AttributeContext } from './internal-api/AttributeContext.ts';
+import type { DecodeInstanceValue } from './internal-api/InstanceValueContext.ts';
+import type { ClientReactiveSerializableAttributeNode } from './internal-api/serialization/ClientReactiveSerializableAttributeNode.ts';
+import type { Root } from './Root.ts';
+
+export interface AttributeStateSpec extends DescendantNodeSharedStateSpec {
+	readonly children: null;
+	readonly attributes: null;
+	readonly value: SimpleAtomicState<string>;
+	readonly instanceValue: Accessor<string>;
+	readonly label: null;
+	readonly hint: null;
+	readonly valueOptions: null;
+}
+
+export class Attribute
+	extends InstanceNode<AttributeDefinition, AttributeStateSpec, AnyParentNode, null>
+	implements
+		AttributeNode,
+		ClientReactiveSerializableAttributeNode,
+		AttributeContext,
+		XFormsXPathAttribute
+{
+	override readonly [XPathNodeKindKey] = 'attribute';
+
+	protected readonly state: SharedNodeState<AttributeStateSpec>;
+	protected readonly engineState: EngineState<AttributeStateSpec>;
+	readonly validationState: NullValidationState;
+
+	readonly nodeType = 'attribute';
+	readonly currentState: CurrentState<AttributeStateSpec>;
+	override readonly instanceState: InstanceState;
+
+	readonly appearances = null;
+	readonly nodeOptions = null;
+
+	readonly valueType: string;
+	readonly decodeInstanceValue: DecodeInstanceValue;
+
+	protected readonly getInstanceValue: Accessor<string>;
+	protected readonly valueState: RuntimeValueState<RuntimeValue<'string'>>;
+	protected readonly setValueState: RuntimeValueSetter<RuntimeInputValue<'string'>>;
+	readonly evaluator: EngineXPathEvaluator;
+	readonly getActiveLanguage: Accessor<ActiveLanguage>;
+
+	override readonly root: Root;
+
+	readonly isRelevant: Accessor<boolean> = () => {
+		return this.parent.isRelevant();
+	};
+
+	readonly isAttached: Accessor<boolean> = () => {
+		return this.parent.isAttached();
+	};
+
+	readonly isReadonly: Accessor<boolean> = () => {
+		return true;
+	};
+
+	readonly hasReadonlyAncestor: Accessor<boolean> = () => {
+		const { parent } = this;
+		return parent.hasReadonlyAncestor() || parent.isReadonly();
+	};
+
+	readonly hasNonRelevantAncestor: Accessor<boolean> = () => {
+		const { parent } = this;
+		return parent.hasNonRelevantAncestor() || !parent.isRelevant();
+	};
+
+	constructor(
+		parent: AnyParentNode,
+		definition: AttributeDefinition,
+		override readonly instanceNode: StaticAttribute
+	) {
+		const codec = getSharedValueCodec('string');
+
+		super(parent.instanceConfig, parent, instanceNode, definition, {
+			scope: parent.scope,
+			computeReference: (): string => '@' + this.definition.qualifiedName.getPrefixedName(),
+		});
+
+		this.root = parent.root;
+
+		this.getActiveLanguage = parent.getActiveLanguage;
+		this.validationState = { violations: [] };
+
+		this.valueType = 'string';
+		this.evaluator = parent.evaluator;
+		this.decodeInstanceValue = codec.decodeInstanceValue;
+
+		const instanceValueState = createAttributeValueState(this);
+		const valueState = codec.createRuntimeValueState(instanceValueState);
+
+		const [getInstanceValue] = instanceValueState;
+		const [, setValueState] = valueState;
+
+		this.getInstanceValue = getInstanceValue;
+		this.setValueState = setValueState;
+		this.getXPathValue = () => {
+			return this.getInstanceValue();
+		};
+		this.valueState = valueState;
+
+		const state = createSharedNodeState(
+			this.scope,
+			{
+				reference: this.contextReference,
+				readonly: this.isReadonly,
+				relevant: this.isRelevant,
+				required: () => false,
+
+				label: null,
+				hint: null,
+				children: null,
+				valueOptions: null,
+				value: this.valueState,
+				instanceValue: this.getInstanceValue,
+				attributes: null,
+			},
+			this.instanceConfig
+		);
+
+		this.state = state;
+		this.engineState = state.engineState;
+		this.currentState = state.currentState;
+		this.instanceState = createAttributeNodeInstanceState(this);
+	}
+
+	setValue(value: string): Root {
+		this.setValueState(value);
+
+		return this.root;
+	}
+
+	getChildren(): readonly [] {
+		return [];
+	}
+}

package/src/instance/Group.ts

@@ -8,6 +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,
+	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';
@@ -20,6 +24,8 @@ import { createNodeLabel } from '../lib/reactivity/text/createNodeLabel.ts';
 import { createAggregatedViolations } from '../lib/reactivity/validation/createAggregatedViolations.ts';
 import type { DescendantNodeSharedStateSpec } from './abstract/DescendantNode.ts';
 import { DescendantNode } from './abstract/DescendantNode.ts';
+import { buildAttributes } from './attachments/buildAttributes.ts';
+import { Attribute } from './Attribute.ts';
 import { buildChildren } from './children/buildChildren.ts';
 import type { GeneralChildNode, GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
@@ -30,6 +36,7 @@ interface GroupStateSpec extends DescendantNodeSharedStateSpec {
 	readonly label: Accessor<TextRange<'label'> | null>;
 	readonly hint: null;
 	readonly children: Accessor<readonly FormNodeID[]>;
+	readonly attributes: Accessor<readonly Attribute[]>;
 	readonly valueOptions: null;
 	readonly value: null;
 }
@@ -43,6 +50,7 @@ export class Group
 		ClientReactiveSerializableParentNode<GeneralChildNode>
 {
 	private readonly childrenState: ChildrenState<GeneralChildNode>;
+	private readonly attributeState: AttributeState;
 
 	override readonly [XPathNodeKindKey] = 'element';
 
@@ -65,11 +73,13 @@ export class Group
 	) {
 		super(parent, instanceNode, definition);
 
-		this.appearances = definition.bodyElement.appearances;
+		this.appearances = definition.bodyElement?.appearances ?? null;
 
 		const childrenState = createChildrenState<Group, GeneralChildNode>(this);
+		const attributeState = createAttributeState(this.scope);
 
 		this.childrenState = childrenState;
+		this.attributeState = attributeState;
 
 		const state = createSharedNodeState(
 			this.scope,
@@ -82,6 +92,7 @@ export class Group
 				label: createNodeLabel(this, definition),
 				hint: null,
 				children: childrenState.childIds,
+				attributes: attributeState.getAttributes,
 				valueOptions: null,
 				value: null,
 			},
@@ -97,6 +108,7 @@ export class Group
 		);
 
 		childrenState.setChildren(buildChildren(this));
+		attributeState.setAttributes(buildAttributes(this));
 		this.validationState = createAggregatedViolations(this, this.instanceConfig);
 		this.instanceState = createParentNodeInstanceState(this);
 	}
@@ -104,4 +116,8 @@ export class Group
 	getChildren(): readonly GeneralChildNode[] {
 		return this.childrenState.getChildren();
 	}
+
+	getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
 }

package/src/instance/InputControl.ts

@@ -130,6 +130,7 @@ export class InputControl<V extends ValueType = ValueType>
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
+				attributes: null,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,

package/src/instance/ModelValue.ts

@@ -76,6 +76,7 @@ export class ModelValue<V extends ValueType = ValueType>
 				label: null,
 				hint: null,
 				children: null,
+				attributes: null,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,

package/src/instance/Note.ts

@@ -105,6 +105,7 @@ export class Note<V extends ValueType = ValueType>
 				noteText,
 
 				children: null,
+				attributes: null,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,

package/src/instance/PrimaryInstance.ts

@@ -17,6 +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,
+	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';
@@ -32,7 +36,9 @@ import type { ModelDefinition } from '../parse/model/ModelDefinition.ts';
 import type { RootDefinition } from '../parse/model/RootDefinition.ts';
 import type { SecondaryInstancesDefinition } from '../parse/model/SecondaryInstance/SecondaryInstancesDefinition.ts';
 import { InstanceNode } from './abstract/InstanceNode.ts';
+import { buildAttributes } from './attachments/buildAttributes.ts';
 import { InstanceAttachmentsState } from './attachments/InstanceAttachmentsState.ts';
+import type { Attribute } from './Attribute.ts';
 import type { InitialInstanceState } from './input/InitialInstanceState.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { InstanceConfig } from './internal-api/InstanceConfig.ts';
@@ -71,6 +77,7 @@ interface PrimaryInstanceStateSpec {
 	readonly label: null;
 	readonly hint: null;
 	readonly children: Accessor<readonly FormNodeID[]>;
+	readonly attributes: Accessor<readonly Attribute[]>;
 	readonly valueOptions: null;
 	readonly value: null;
 
@@ -154,6 +161,8 @@ export class PrimaryInstance<
 	readonly evaluator: EngineXPathEvaluator;
 	override readonly contextNode = this;
 
+	private readonly attributeState: AttributeState;
+
 	constructor(options: PrimaryInstanceOptions<Mode>) {
 		const { mode, initialState, scope, model, secondaryInstances, config } = options;
 		const { instance: modelInstance } = model;
@@ -193,8 +202,10 @@ export class PrimaryInstance<
 		this.classes = definition.classes;
 
 		const childrenState = createChildrenState<this, Root>(this);
+		const attributeState = createAttributeState(this.scope);
 
 		this.getChildren = childrenState.getChildren;
+		this.attributeState = attributeState;
 
 		const stateSpec: PrimaryInstanceStateSpec = {
 			activeLanguage: getActiveLanguage,
@@ -207,6 +218,7 @@ export class PrimaryInstance<
 			valueOptions: null,
 			value: null,
 			children: childrenState.childIds,
+			attributes: attributeState.getAttributes,
 		};
 
 		const state = createSharedNodeState(scope, stateSpec, config);
@@ -227,6 +239,7 @@ export class PrimaryInstance<
 		this.instanceState = createPrimaryInstanceState(this);
 
 		childrenState.setChildren([root]);
+		attributeState.setAttributes(buildAttributes(this));
 		setIsAttached(true);
 	}
 
@@ -279,4 +292,8 @@ export class PrimaryInstance<
 
 		return Promise.resolve(result);
 	}
+
+	getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
 }