@getodk/xforms-engine 0.15.0 → 0.16.1

package/src/instance/RangeControl.ts

@@ -11,6 +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,
+	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';
@@ -22,8 +26,10 @@ 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';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ValidationContext } from './internal-api/ValidationContext.ts';
@@ -64,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';
@@ -82,6 +89,7 @@ export class RangeControl<V extends RangeValueType = RangeValueType>
 		super(parent, instanceNode, definition, codec);
 
 		this.appearances = definition.bodyElement.appearances;
+		this.attributeState = createAttributeState(this.scope);
 
 		const state = createSharedNodeState(
 			this.scope,
@@ -94,7 +102,7 @@ export class RangeControl<V extends RangeValueType = RangeValueType>
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
-				attributes: null,
+				attributes: this.attributeState.getAttributes,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
@@ -102,6 +110,8 @@ export class RangeControl<V extends RangeValueType = RangeValueType>
 			this.instanceConfig
 		);
 
+		this.attributeState.setAttributes(buildAttributes(this));
+
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;
@@ -112,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,6 +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,
+	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';
@@ -19,9 +23,11 @@ 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';
+import { buildAttributes } from './attachments/buildAttributes.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ValidationContext } from './internal-api/ValidationContext.ts';
@@ -94,6 +100,7 @@ export class RankControl
 	// InstanceNode
 	protected readonly state: SharedNodeState<RankControlStateSpec>;
 	protected readonly engineState: EngineState<RankControlStateSpec>;
+	readonly attributeState: AttributeState;
 
 	// RankNode
 	readonly nodeType = 'rank';
@@ -123,6 +130,8 @@ export class RankControl
 		const baseValueState = this.valueState;
 		const [baseGetValue, setValue] = baseValueState;
 
+		this.attributeState = createAttributeState(this.scope);
+
 		/**
 		 * @ToDo As new value options become available, they're not yet in the
 		 * `currentValues` state. This appends them. We intend to change this
@@ -174,7 +183,7 @@ export class RankControl
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
-				attributes: null,
+				attributes: this.attributeState.getAttributes,
 				valueOptions,
 				value: valueState,
 				instanceValue: this.getInstanceValue,
@@ -182,11 +191,17 @@ export class RankControl
 			this.instanceConfig
 		);
 
+		this.attributeState.setAttributes(buildAttributes(this));
+
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;
 	}
 
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
+
 	getValueLabel(value: string): TextRange<'item-label'> | null {
 		const valueOption = this.currentState.valueOptions.find((item) => item.value === value);
 		return valueOption?.label ?? null;

package/src/instance/Root.ts

@@ -63,7 +63,6 @@ export class Root
 		ClientReactiveSerializableParentNode<GeneralChildNode>
 {
 	private readonly childrenState: ChildrenState<GeneralChildNode>;
-	private readonly attributeState: AttributeState;
 
 	// XFormsXPathElement
 	override readonly [XPathNodeKindKey] = 'element';
@@ -71,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;
@@ -103,10 +103,9 @@ 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.attributeState = attributeState;
 		this.languages = parent.languages;
 
 		const state = createSharedNodeState(
@@ -122,7 +121,7 @@ export class Root
 				valueOptions: null,
 				value: null,
 				children: childrenState.childIds,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 			},
 			this.instanceConfig
 		);
@@ -136,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);
 	}
@@ -145,7 +144,7 @@ export class Root
 		return this.childrenState.getChildren();
 	}
 
-	getAttributes(): readonly Attribute[] {
+	override getAttributes(): readonly Attribute[] {
 		return this.attributeState.getAttributes();
 	}
 

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,6 +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,
+	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';
@@ -23,9 +27,11 @@ 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';
+import { buildAttributes } from './attachments/buildAttributes.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ValidationContext } from './internal-api/ValidationContext.ts';
@@ -89,6 +95,7 @@ export class SelectControl
 	// InstanceNode
 	protected readonly state: SharedNodeState<SelectControlStateSpec>;
 	protected readonly engineState: EngineState<SelectControlStateSpec>;
+	readonly attributeState: AttributeState;
 
 	// SelectNode
 	readonly nodeType = 'select';
@@ -108,6 +115,7 @@ export class SelectControl
 
 		this.appearances = definition.bodyElement.appearances;
 		this.selectType = definition.bodyElement.type;
+		this.attributeState = createAttributeState(this.scope);
 
 		const valueOptions = createItemCollection(this);
 
@@ -153,7 +161,7 @@ export class SelectControl
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
-				attributes: null,
+				attributes: this.attributeState.getAttributes,
 				valueOptions,
 				value: valueState,
 				instanceValue: this.getInstanceValue,
@@ -162,6 +170,8 @@ export class SelectControl
 			this.instanceConfig
 		);
 
+		this.attributeState.setAttributes(buildAttributes(this));
+
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;
@@ -238,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,6 +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,
+	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';
@@ -15,8 +19,10 @@ 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';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ValidationContext } from './internal-api/ValidationContext.ts';
@@ -73,6 +79,7 @@ export class TriggerControl
 	// InstanceNode
 	protected readonly state: SharedNodeState<TriggerControlStateSpec>;
 	protected readonly engineState: EngineState<TriggerControlStateSpec>;
+	readonly attributeState: AttributeState;
 
 	// TriggerNode
 	readonly nodeType = 'trigger';
@@ -88,6 +95,7 @@ export class TriggerControl
 		super(parent, instanceNode, definition, codec);
 
 		this.appearances = definition.bodyElement.appearances;
+		this.attributeState = createAttributeState(this.scope);
 
 		const state = createSharedNodeState(
 			this.scope,
@@ -100,7 +108,7 @@ export class TriggerControl
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
-				attributes: null,
+				attributes: this.attributeState.getAttributes,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
@@ -108,11 +116,17 @@ export class TriggerControl
 			this.instanceConfig
 		);
 
+		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

@@ -32,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';
@@ -101,7 +102,6 @@ export class UploadControl
 
 	private readonly validation: SharedValidationState;
 	private readonly instanceAttachment: InstanceAttachment;
-	private readonly attributeState: AttributeState;
 
 	// XFormsXPathElement
 	override readonly [XPathNodeKindKey] = 'element';
@@ -110,6 +110,7 @@ export class UploadControl
 	// InstanceNode
 	protected readonly state: SharedNodeState<UploadControlStateSpec>;
 	protected readonly engineState: EngineState<UploadControlStateSpec>;
+	readonly attributeState: AttributeState;
 
 	// InstanceValueContext
 	readonly decodeInstanceValue: DecodeInstanceValue;
@@ -140,8 +141,7 @@ export class UploadControl
 		const instanceAttachment = createInstanceAttachment(this);
 
 		this.instanceAttachment = instanceAttachment;
-		const attributeState = createAttributeState(this.scope);
-		this.attributeState = attributeState;
+		this.attributeState = createAttributeState(this.scope);
 		this.decodeInstanceValue = instanceAttachment.decodeInstanceValue;
 		this.getXPathValue = instanceAttachment.getInstanceValue;
 
@@ -158,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
@@ -168,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);
 	}
 
@@ -185,14 +186,14 @@ export class UploadControl
 		return [];
 	}
 
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
+
 	// UploadNode
 	setValue(value: InstanceAttachmentRuntimeValue): Root {
 		this.instanceAttachment.setValue(value);
 
 		return this.root;
 	}
-
-	getAttributes(): readonly Attribute[] {
-		return this.attributeState.getAttributes();
-	}
 }

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
 	) {
@@ -167,11 +168,6 @@ export abstract class DescendantNode<
 						return true;
 					}
 				}
-				for (const attr of parent.getAttributes()) {
-					if (attr === self) {
-						return true;
-					}
-				}
 				return false;
 			});
 		});

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
@@ -240,13 +240,13 @@ export abstract class InstanceNode<
 	 * (though for those nodes it will always be empty). This affords consistency
 	 * and efficiency of interface for those internal uses.
 	 */
-	abstract getChildren(this: AnyInstanceNode): ReadonlyArray<Exclude<AnyChildNode, Attribute>>;
+	abstract getChildren(this: AnyInstanceNode): readonly AnyChildNode[];
 
 	// XFormsXPathNode
 	/**
 	 * @todo Values as text nodes(?)
 	 */
-	getXPathChildNodes(): ReadonlyArray<Exclude<AnyChildNode, Attribute>> {
+	getXPathChildNodes(): readonly AnyChildNode[] {
 		return (this as AnyInstanceNode).getChildren().flatMap((child) => {
 			switch (child.nodeType) {
 				case 'repeat-range:controlled':
@@ -272,4 +272,6 @@ export abstract class InstanceNode<
 			.map((child) => child.getXPathValue())
 			.join('');
 	}
+
+	abstract getAttributes(): readonly Attribute[];
 }

package/src/instance/abstract/ValueNode.ts

@@ -21,6 +21,7 @@ import type { SimpleAtomicState } from '../../lib/reactivity/types.ts';
 import type { SharedValidationState } from '../../lib/reactivity/validation/createValidation.ts';
 import { createValidationState } from '../../lib/reactivity/validation/createValidation.ts';
 import { LeafNodeDefinition } from '../../parse/model/LeafNodeDefinition.ts';
+import type { Attribute } from '../Attribute.ts';
 import type { GeneralParentNode } from '../hierarchy.ts';
 import type { EvaluationContext } from '../internal-api/EvaluationContext.ts';
 import type {
@@ -36,7 +37,7 @@ export type ValueNodeDefinition<V extends ValueType> = LeafNodeDefinition<V>;
 
 export interface ValueNodeStateSpec<RuntimeValue> extends DescendantNodeStateSpec<RuntimeValue> {
 	readonly children: null;
-	readonly attributes: null;
+	readonly attributes: Accessor<readonly Attribute[]>;
 	readonly value: SimpleAtomicState<RuntimeValue>;
 	readonly instanceValue: Accessor<string>;
 }

package/src/instance/attachments/buildAttributes.ts

@@ -1,8 +1,19 @@
 import { Attribute } from '../Attribute';
-import type { AnyParentNode } from '../hierarchy';
+import type { AnyNode } from '../hierarchy.ts';
+import type { InputControl } from '../InputControl.ts';
+import type { ModelValue } from '../ModelValue.ts';
+import type { Note } from '../Note.ts';
+import type { RangeControl } from '../RangeControl.ts';
 
-export function buildAttributes(parent: AnyParentNode): Attribute[] {
-	return Array.from(parent.definition.attributes.values()).map((attributeDefinition) => {
-		return new Attribute(parent, attributeDefinition, attributeDefinition.template);
+export function buildAttributes(
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	owner: AnyNode | InputControl<any> | ModelValue<any> | Note<any> | RangeControl<any>
+): Attribute[] {
+	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/children/normalizeChildInitOptions.ts

@@ -217,7 +217,7 @@ const buildDeprecatedIDDefinition = (
 	const nodeset = instanceNode.nodeset;
 	const bind = group.model.binds.getOrCreateBindDefinition(nodeset);
 
-	return new LeafNodeDefinition(group.parent.definition, bind, null, instanceNode);
+	return new LeafNodeDefinition(group.model, group.parent.definition, bind, null, instanceNode);
 };
 
 const buildDeprecatedID = (

package/src/instance/hierarchy.ts

@@ -24,6 +24,7 @@ export type AnyNode =
 	| Group
 	| RepeatRange
 	| RepeatInstance
+	| Attribute
 	| AnyNote
 	| AnyModelValue
 	| AnyInputControl
@@ -63,8 +64,7 @@ export type AnyChildNode =
 	| RankControl
 	| SelectControl
 	| TriggerControl
-	| UploadControl
-	| Attribute;
+	| UploadControl;
 
 // prettier-ignore
 export type GeneralChildNode =

package/src/instance/internal-api/AttributeContext.ts

@@ -1,12 +1,16 @@
+import type { Accessor } from 'solid-js';
 import type { FormInstanceInitializationMode } from '../../client/index.ts';
 import type { StaticAttribute } from '../../integration/xpath/static-dom/StaticAttribute.ts';
 import type { ReactiveScope } from '../../lib/reactivity/scope.ts';
 import type { BindComputationExpression } from '../../parse/expression/BindComputationExpression.ts';
 import type { AnyBindPreloadDefinition } from '../../parse/model/BindPreloadDefinition.ts';
+import type { ModelDefinition } from '../../parse/model/ModelDefinition.ts';
 import type { EvaluationContext } from './EvaluationContext.ts';
+import type { InstanceConfig } from './InstanceConfig.ts';
 
 export interface InstanceAttributeContextDocument {
 	readonly initializationMode: FormInstanceInitializationMode;
+	readonly isAttached: Accessor<boolean>;
 }
 
 export type DecodeInstanceValue = (value: string) => string;
@@ -20,6 +24,7 @@ interface InstanceAttributeContextDefinitionBind {
 export interface InstanceAttributeContextDefinition {
 	readonly bind: InstanceAttributeContextDefinitionBind;
 	readonly template: StaticAttribute;
+	readonly model: ModelDefinition;
 }
 
 export interface AttributeContext extends EvaluationContext {
@@ -27,6 +32,7 @@ export interface AttributeContext extends EvaluationContext {
 	readonly rootDocument: InstanceAttributeContextDocument;
 	readonly definition: InstanceAttributeContextDefinition;
 	readonly instanceNode: StaticAttribute;
+	readonly instanceConfig: InstanceConfig;
 	readonly decodeInstanceValue: DecodeInstanceValue;
 
 	isReadonly(): boolean;

package/src/instance/internal-api/InstanceConfig.ts

@@ -1,5 +1,8 @@
 import type { InstanceAttachmentFileNameFactory } from '../../client/attachments/InstanceAttachmentsConfig.ts';
-import type { FormInstanceConfig } from '../../client/form/FormInstanceConfig.ts';
+import type {
+	FormInstanceConfig,
+	PreloadProperties,
+} from '../../client/form/FormInstanceConfig.ts';
 import type { OpaqueReactiveObjectFactory } from '../../client/OpaqueReactiveObjectFactory.ts';
 
 export interface InstanceConfig {
@@ -9,4 +12,6 @@ export interface InstanceConfig {
 	readonly clientStateFactory: OpaqueReactiveObjectFactory;
 
 	readonly computeAttachmentName: InstanceAttachmentFileNameFactory;
+
+	readonly preloadProperties: PreloadProperties;
 }

package/src/instance/internal-api/InstanceValueContext.ts

@@ -1,12 +1,16 @@
+import type { Accessor } from 'solid-js';
 import type { FormInstanceInitializationMode } from '../../client/index.ts';
 import type { StaticLeafElement } from '../../integration/xpath/static-dom/StaticElement.ts';
 import type { ReactiveScope } from '../../lib/reactivity/scope.ts';
 import type { BindComputationExpression } from '../../parse/expression/BindComputationExpression.ts';
 import type { AnyBindPreloadDefinition } from '../../parse/model/BindPreloadDefinition.ts';
+import type { ModelDefinition } from '../../parse/model/ModelDefinition.ts';
 import type { EvaluationContext } from './EvaluationContext.ts';
+import type { InstanceConfig } from './InstanceConfig.ts';
 
 export interface InstanceValueContextDocument {
 	readonly initializationMode: FormInstanceInitializationMode;
+	readonly isAttached: Accessor<boolean>;
 }
 
 export type DecodeInstanceValue = (value: string) => string;
@@ -20,6 +24,7 @@ interface InstanceValueContextDefinitionBind {
 export interface InstanceValueContextDefinition {
 	readonly bind: InstanceValueContextDefinitionBind;
 	readonly template: StaticLeafElement;
+	readonly model: ModelDefinition;
 }
 
 export interface InstanceValueContext extends EvaluationContext {
@@ -27,6 +32,7 @@ export interface InstanceValueContext extends EvaluationContext {
 	readonly rootDocument: InstanceValueContextDocument;
 	readonly definition: InstanceValueContextDefinition;
 	readonly instanceNode: StaticLeafElement | null;
+	readonly instanceConfig: InstanceConfig;
 	readonly decodeInstanceValue: DecodeInstanceValue;
 
 	isReadonly(): boolean;

package/src/instance/internal-api/serialization/ClientReactiveSerializableAttributeNode.ts

@@ -4,7 +4,6 @@ import type { QualifiedName } from '../../../lib/names/QualifiedName.ts';
 export type SerializedInstanceValue = string;
 
 interface ClientReactiveSerializableAttributeNodeCurrentState {
-	get relevant(): boolean;
 	get instanceValue(): SerializedInstanceValue;
 }