@getodk/xforms-engine 0.15.0 → 0.16.1

package/dist/instance/Attribute.d.ts

@@ -1,34 +1,32 @@
 import { XPathNodeKindKey } from '@getodk/xpath';
 import { Accessor } from 'solid-js';
 import { AttributeNode } from '../client/AttributeNode.ts';
-import { ActiveLanguage, InstanceState, NullValidationState } from '../client/index.ts';
+import { InstanceState, NullValidationState } from '../client/index.ts';
 import { XFormsXPathAttribute } from '../integration/xpath/adapter/XFormsXPathNode.ts';
-import { EngineXPathEvaluator } from '../integration/xpath/EngineXPathEvaluator.ts';
 import { StaticAttribute } from '../integration/xpath/static-dom/StaticAttribute.ts';
 import { RuntimeInputValue, RuntimeValue } from '../lib/codecs/getSharedValueCodec.ts';
 import { RuntimeValueSetter, RuntimeValueState } from '../lib/codecs/ValueCodec.ts';
+import { AttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
 import { SharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
 import { SimpleAtomicState } from '../lib/reactivity/types.ts';
 import { AttributeDefinition } from '../parse/model/AttributeDefinition.ts';
-import { DescendantNodeSharedStateSpec } from './abstract/DescendantNode.ts';
-import { InstanceNode } from './abstract/InstanceNode.ts';
-import { AnyParentNode } from './hierarchy.ts';
+import { DescendantNode, DescendantNodeStateSpec } from './abstract/DescendantNode.ts';
+import { AnyNode } from './hierarchy.ts';
 import { AttributeContext } from './internal-api/AttributeContext.ts';
 import { DecodeInstanceValue } from './internal-api/InstanceValueContext.ts';
 import { ClientReactiveSerializableAttributeNode } from './internal-api/serialization/ClientReactiveSerializableAttributeNode.ts';
 import { Root } from './Root.ts';
-export interface AttributeStateSpec extends DescendantNodeSharedStateSpec {
+export interface AttributeStateSpec extends DescendantNodeStateSpec<string> {
     readonly children: null;
-    readonly attributes: null;
+    readonly attributes: Accessor<Attribute[]>;
     readonly value: SimpleAtomicState<string>;
     readonly instanceValue: Accessor<string>;
-    readonly label: null;
-    readonly hint: null;
-    readonly valueOptions: null;
+    readonly relevant: Accessor<boolean>;
 }
-export declare class Attribute extends InstanceNode<AttributeDefinition, AttributeStateSpec, AnyParentNode, null> implements AttributeNode, ClientReactiveSerializableAttributeNode, AttributeContext, XFormsXPathAttribute {
+export declare class Attribute extends DescendantNode<AttributeDefinition, AttributeStateSpec, AnyNode, null> implements AttributeNode, ClientReactiveSerializableAttributeNode, AttributeContext, XFormsXPathAttribute {
+    readonly owner: AnyNode;
     readonly instanceNode: StaticAttribute;
     readonly [XPathNodeKindKey] = "attribute";
     protected readonly state: SharedNodeState<AttributeStateSpec>;
@@ -44,15 +42,11 @@ export declare class Attribute extends InstanceNode<AttributeDefinition, Attribu
     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 root: Root;
-    readonly isRelevant: Accessor<boolean>;
+    readonly attributeState: AttributeState;
     readonly isAttached: Accessor<boolean>;
-    readonly isReadonly: Accessor<boolean>;
-    readonly hasReadonlyAncestor: Accessor<boolean>;
-    readonly hasNonRelevantAncestor: Accessor<boolean>;
-    constructor(parent: AnyParentNode, definition: AttributeDefinition, instanceNode: StaticAttribute);
+    readonly getXPathValue: () => string;
+    constructor(owner: AnyNode, definition: AttributeDefinition, instanceNode: StaticAttribute);
     setValue(value: string): Root;
+    getAttributes(): readonly Attribute[];
     getChildren(): readonly [];
 }

package/dist/instance/Group.d.ts

@@ -7,6 +7,7 @@ import { TextRange } from '../client/TextRange.ts';
 import { AncestorNodeValidationState } from '../client/validation.ts';
 import { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import { StaticElement } from '../integration/xpath/static-dom/StaticElement.ts';
+import { AttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { MaterializedChildren } from '../lib/reactivity/materializeCurrentStateChildren.ts';
 import { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
@@ -26,10 +27,10 @@ interface GroupStateSpec extends DescendantNodeSharedStateSpec {
 }
 export declare class Group extends DescendantNode<GroupDefinition, GroupStateSpec, GeneralParentNode, GeneralChildNode> implements GroupNode, XFormsXPathElement, EvaluationContext, ClientReactiveSerializableParentNode<GeneralChildNode> {
     private readonly childrenState;
-    private readonly attributeState;
     readonly [XPathNodeKindKey] = "element";
     protected readonly state: SharedNodeState<GroupStateSpec>;
     protected engineState: EngineState<GroupStateSpec>;
+    readonly attributeState: AttributeState;
     readonly nodeType = "group";
     readonly appearances: GroupNodeAppearances;
     readonly nodeOptions: null;

package/dist/instance/InputControl.d.ts

@@ -6,10 +6,12 @@ import { ValueType } from '../client/ValueType.ts';
 import { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import { RuntimeInputValue, RuntimeValue } from '../lib/codecs/getSharedValueCodec.ts';
+import { AttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
 import { SharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
 import { ValueNode, ValueNodeStateSpec } from './abstract/ValueNode.ts';
+import { Attribute } from './Attribute.ts';
 import { GeneralParentNode } from './hierarchy.ts';
 import { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import { ClientReactiveSerializableValueNode } from './internal-api/serialization/ClientReactiveSerializableValueNode.ts';
@@ -21,6 +23,7 @@ export type AnyInputDefinition = {
 interface InputControlStateSpec<V extends ValueType> extends ValueNodeStateSpec<RuntimeValue<V>> {
     readonly label: Accessor<TextRange<'label'> | null>;
     readonly hint: Accessor<TextRange<'hint'> | null>;
+    readonly attributes: Accessor<readonly Attribute[]>;
     readonly valueOptions: null;
 }
 export declare class InputControl<V extends ValueType = ValueType> extends ValueNode<V, InputDefinition<V>, RuntimeValue<V>, RuntimeInputValue<V>> implements InputNode<V>, XFormsXPathElement, EvaluationContext, ValidationContext, ClientReactiveSerializableValueNode {
@@ -28,12 +31,14 @@ export declare class InputControl<V extends ValueType = ValueType> extends Value
     readonly [XPathNodeKindKey] = "element";
     protected readonly state: SharedNodeState<InputControlStateSpec<V>>;
     protected readonly engineState: EngineState<InputControlStateSpec<V>>;
+    readonly attributeState: AttributeState;
     readonly nodeType = "input";
     readonly appearances: InputNodeAppearances;
     readonly nodeOptions: InputNodeOptions<V>;
     readonly currentState: CurrentState<InputControlStateSpec<V>>;
     constructor(parent: GeneralParentNode, instanceNode: StaticLeafElement | null, definition: InputDefinition<V>);
     setValue(value: InputNodeInputValue<V>): Root;
+    getAttributes(): readonly Attribute[];
 }
 export type AnyInputControl = InputControl<'barcode'> | InputControl<'binary'> | InputControl<'boolean'> | InputControl<'date'> | InputControl<'dateTime'> | InputControl<'decimal'> | InputControl<'geopoint'> | InputControl<'geoshape'> | InputControl<'geotrace'> | InputControl<'int'> | InputControl<'intent'> | InputControl<'string'> | InputControl<'time'>;
 export {};

package/dist/instance/ModelValue.d.ts

@@ -4,9 +4,11 @@ import { ValueType } from '../client/ValueType.ts';
 import { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import { RuntimeInputValue, RuntimeValue } from '../lib/codecs/getSharedValueCodec.ts';
+import { AttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
 import { SharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
+import { Attribute } from './Attribute.ts';
 import { ValueNode, ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import { GeneralParentNode } from './hierarchy.ts';
 import { EvaluationContext } from './internal-api/EvaluationContext.ts';
@@ -22,11 +24,13 @@ export declare class ModelValue<V extends ValueType = ValueType> extends ValueNo
     readonly [XPathNodeKindKey] = "element";
     protected readonly state: SharedNodeState<ModelValueStateSpec<V>>;
     protected readonly engineState: EngineState<ModelValueStateSpec<V>>;
+    readonly attributeState: AttributeState;
     readonly nodeType = "model-value";
     readonly appearances: null;
     readonly nodeOptions: null;
     readonly currentState: CurrentState<ModelValueStateSpec<V>>;
     constructor(parent: GeneralParentNode, instanceNode: StaticLeafElement | null, definition: ModelValueDefinition<V>);
+    getAttributes(): readonly Attribute[];
 }
 export type AnyModelValue = ModelValue<'barcode'> | ModelValue<'binary'> | ModelValue<'boolean'> | ModelValue<'date'> | ModelValue<'dateTime'> | ModelValue<'decimal'> | ModelValue<'geopoint'> | ModelValue<'geoshape'> | ModelValue<'geotrace'> | ModelValue<'int'> | ModelValue<'intent'> | ModelValue<'string'> | ModelValue<'time'>;
 export {};

package/dist/instance/Note.d.ts

@@ -6,12 +6,14 @@ import { ValueType } from '../client/ValueType.ts';
 import { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import { NoteInputValue, NoteRuntimeValue } from '../lib/codecs/NoteCodec.ts';
+import { AttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
 import { SharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
 import { ComputedNoteText } from '../lib/reactivity/text/createNoteText.ts';
 import { NoteNodeDefinition } from '../parse/model/NoteNodeDefinition.ts';
 import { ValueNode, ValueNodeStateSpec } from './abstract/ValueNode.ts';
+import { Attribute } from './Attribute.ts';
 import { GeneralParentNode } from './hierarchy.ts';
 import { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import { ClientReactiveSerializableValueNode } from './internal-api/serialization/ClientReactiveSerializableValueNode.ts';
@@ -27,11 +29,13 @@ export declare class Note<V extends ValueType = ValueType> extends ValueNode<V,
     readonly [XPathNodeKindKey] = "element";
     protected readonly state: SharedNodeState<NoteStateSpec<V>>;
     protected readonly engineState: EngineState<NoteStateSpec<V>>;
+    readonly attributeState: AttributeState;
     readonly nodeType = "note";
     readonly appearances: NoteNodeAppearances;
     readonly nodeOptions: null;
     readonly currentState: CurrentState<NoteStateSpec<V>>;
     constructor(parent: GeneralParentNode, instanceNode: StaticLeafElement | null, definition: NoteNodeDefinition<V>);
+    getAttributes(): readonly Attribute[];
 }
 export type AnyNote = Note<'barcode'> | Note<'binary'> | Note<'boolean'> | Note<'date'> | Note<'dateTime'> | Note<'decimal'> | Note<'geopoint'> | Note<'geoshape'> | Note<'geotrace'> | Note<'int'> | Note<'intent'> | Note<'string'> | Note<'time'>;
 export {};

package/dist/instance/PrimaryInstance.d.ts

@@ -10,6 +10,7 @@ import { AncestorNodeValidationState } from '../client/validation.ts';
 import { XFormsXPathDocument } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import { EngineXPathEvaluator } from '../integration/xpath/EngineXPathEvaluator.ts';
 import { StaticDocument } from '../integration/xpath/static-dom/StaticDocument.ts';
+import { AttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { MaterializedChildren } from '../lib/reactivity/materializeCurrentStateChildren.ts';
 import { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
@@ -66,6 +67,7 @@ export declare class PrimaryInstance<Mode extends FormInstanceInitializationMode
     readonly attachments: InstanceAttachmentsState;
     protected readonly state: SharedNodeState<PrimaryInstanceStateSpec>;
     protected readonly engineState: EngineState<PrimaryInstanceStateSpec>;
+    readonly attributeState: AttributeState;
     readonly instanceNode: StaticDocument;
     readonly getChildren: Accessor<readonly Root[]>;
     readonly hasReadonlyAncestor: () => boolean;
@@ -87,8 +89,8 @@ export declare class PrimaryInstance<Mode extends FormInstanceInitializationMode
     readonly isAttached: Accessor<boolean>;
     readonly evaluator: EngineXPathEvaluator;
     readonly contextNode: this;
-    private readonly attributeState;
     constructor(options: PrimaryInstanceOptions<Mode>);
+    getAttributes(): readonly Attribute[];
     /**
      * @todo Note that this method's signature is intentionally derived from
      * {@link RootNode.setLanguage}, but its return type differs! The design
@@ -110,6 +112,5 @@ export declare class PrimaryInstance<Mode extends FormInstanceInitializationMode
      */
     setLanguage(language: FormLanguage): FormLanguage;
     prepareInstancePayload<PayloadType extends InstancePayloadType = 'monolithic'>(options?: InstancePayloadOptions<PayloadType>): Promise<InstancePayload<PayloadType>>;
-    getAttributes(): readonly Attribute[];
 }
 export {};

package/dist/instance/RangeControl.d.ts

@@ -4,10 +4,12 @@ import { RangeInputValue, RangeNode, RangeNodeAppearances, RangeValue } from '..
 import { TextRange } from '../client/TextRange.ts';
 import { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
+import { AttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
 import { SharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
 import { AnyRangeNodeDefinition, RangeNodeDefinition, RangeValueType } from '../parse/model/RangeNodeDefinition.ts';
+import { Attribute } from './Attribute.ts';
 import { Root } from './Root.ts';
 import { ValueNode, ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import { GeneralParentNode } from './hierarchy.ts';
@@ -24,12 +26,14 @@ export declare class RangeControl<V extends RangeValueType = RangeValueType> ext
     readonly [XPathNodeKindKey] = "element";
     protected readonly state: SharedNodeState<RangeControlStateSpec<V>>;
     protected readonly engineState: EngineState<RangeControlStateSpec<V>>;
+    readonly attributeState: AttributeState;
     readonly nodeType = "range";
     readonly appearances: RangeNodeAppearances;
     readonly nodeOptions: null;
     readonly currentState: CurrentState<RangeControlStateSpec<V>>;
     constructor(parent: GeneralParentNode, instanceNode: StaticLeafElement | null, definition: RangeNodeDefinition<V>);
     setValue(value: RangeInputValue<V>): Root;
+    getAttributes(): readonly Attribute[];
 }
 export type AnyRangeControl = RangeControl<'decimal'> | RangeControl<'int'>;
 export {};

package/dist/instance/RankControl.d.ts

@@ -1,14 +1,16 @@
-import { XPathChoiceNode, XPathNodeKindKey } from '@getodk/xpath';
+import { XPathNodeKindKey, XPathChoiceNode } from '@getodk/xpath';
 import { Accessor } from 'solid-js';
 import { RankDefinition, RankNode, RankValueOptions } from '../client/RankNode.ts';
 import { TextRange } from '../client/TextRange.ts';
 import { ValueType } from '../client/ValueType.ts';
 import { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
+import { AttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
 import { SharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
 import { UnknownAppearanceDefinition } from '../parse/body/appearance/unknownAppearanceParser.ts';
+import { Attribute } from './Attribute.ts';
 import { Root } from './Root.ts';
 import { ValueNodeStateSpec, ValueNode } from './abstract/ValueNode.ts';
 import { GeneralParentNode } from './hierarchy.ts';
@@ -30,11 +32,13 @@ export declare class RankControl extends ValueNode<'string', RankDefinition<'str
     readonly [XPathNodeKindKey] = "element";
     protected readonly state: SharedNodeState<RankControlStateSpec>;
     protected readonly engineState: EngineState<RankControlStateSpec>;
+    readonly attributeState: AttributeState;
     readonly nodeType = "rank";
     readonly appearances: UnknownAppearanceDefinition;
     readonly nodeOptions: null;
     readonly currentState: CurrentState<RankControlStateSpec>;
     private constructor();
+    getAttributes(): readonly Attribute[];
     getValueLabel(value: string): TextRange<'item-label'> | null;
     setValues(valuesInOrder: readonly string[]): Root;
     getChoiceName(value: string): string | null;

package/dist/instance/Root.d.ts

@@ -8,6 +8,7 @@ import { InstancePayloadOptions, InstancePayloadType } from '../client/serializa
 import { InstanceState } from '../client/serialization/InstanceState.ts';
 import { AncestorNodeValidationState } from '../client/validation.ts';
 import { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
+import { AttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { MaterializedChildren } from '../lib/reactivity/materializeCurrentStateChildren.ts';
 import { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
@@ -36,10 +37,10 @@ interface RootStateSpec {
 }
 export declare class Root extends DescendantNode<RootDefinition, RootStateSpec, PrimaryInstance, GeneralChildNode> implements RootNode, XFormsXPathElement, EvaluationContext, TranslationContext, ClientReactiveSerializableParentNode<GeneralChildNode> {
     private readonly childrenState;
-    private readonly attributeState;
     readonly [XPathNodeKindKey] = "element";
     protected readonly state: SharedNodeState<RootStateSpec>;
     protected readonly engineState: EngineState<RootStateSpec>;
+    readonly attributeState: AttributeState;
     readonly hasReadonlyAncestor: () => boolean;
     readonly isSelfReadonly: () => boolean;
     readonly isReadonly: () => boolean;

package/dist/instance/SelectControl.d.ts

@@ -1,14 +1,16 @@
-import { XPathChoiceNode, XPathNodeKindKey } from '@getodk/xpath';
+import { XPathNodeKindKey, XPathChoiceNode } from '@getodk/xpath';
 import { Accessor } from 'solid-js';
 import { SelectDefinition, SelectItem, SelectNode, SelectNodeAppearances, SelectValueOptions } from '../client/SelectNode.ts';
 import { TextRange } from '../client/TextRange.ts';
 import { ValueType } from '../client/ValueType.ts';
 import { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
+import { AttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
 import { SharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
 import { SelectType } from '../parse/body/control/SelectControlDefinition.ts';
+import { Attribute } from './Attribute.ts';
 import { Root } from './Root.ts';
 import { ValueNodeStateSpec, ValueNode } from './abstract/ValueNode.ts';
 import { GeneralParentNode } from './hierarchy.ts';
@@ -31,6 +33,7 @@ export declare class SelectControl extends ValueNode<'string', SelectDefinition<
     readonly [XPathNodeKindKey] = "element";
     protected readonly state: SharedNodeState<SelectControlStateSpec>;
     protected readonly engineState: EngineState<SelectControlStateSpec>;
+    readonly attributeState: AttributeState;
     readonly nodeType = "select";
     readonly selectType: SelectType;
     readonly appearances: SelectNodeAppearances;
@@ -65,5 +68,6 @@ export declare class SelectControl extends ValueNode<'string', SelectDefinition<
     selectValue(value: string | null): Root;
     selectValues(values: readonly string[]): Root;
     getChoiceName(value: string): string | null;
+    getAttributes(): readonly Attribute[];
 }
 export {};

package/dist/instance/TriggerControl.d.ts

@@ -5,10 +5,12 @@ import { TriggerNode, TriggerNodeDefinition } from '../client/TriggerNode.ts';
 import { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import { TriggerInputValue, TriggerRuntimeValue } from '../lib/codecs/TriggerCodec.ts';
+import { AttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
 import { SharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
 import { UnknownAppearanceDefinition } from '../parse/body/appearance/unknownAppearanceParser.ts';
+import { Attribute } from './Attribute.ts';
 import { Root } from './Root.ts';
 import { ValueNode, ValueNodeStateSpec } from './abstract/ValueNode.ts';
 import { GeneralParentNode } from './hierarchy.ts';
@@ -25,11 +27,13 @@ export declare class TriggerControl extends ValueNode<'string', TriggerNodeDefin
     readonly [XPathNodeKindKey] = "element";
     protected readonly state: SharedNodeState<TriggerControlStateSpec>;
     protected readonly engineState: EngineState<TriggerControlStateSpec>;
+    readonly attributeState: AttributeState;
     readonly nodeType = "trigger";
     readonly appearances: UnknownAppearanceDefinition;
     readonly nodeOptions: null;
     readonly currentState: CurrentState<TriggerControlStateSpec>;
     private constructor();
+    getAttributes(): readonly Attribute[];
     setValue(value: TriggerInputValue): Root;
 }
 export {};

package/dist/instance/UploadControl.d.ts

@@ -7,6 +7,7 @@ import { InstanceAttachmentFileName, InstanceState } from '../client/index.ts';
 import { AnyViolation, LeafNodeValidationState } from '../client/validation.ts';
 import { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
+import { AttributeState } from '../lib/reactivity/createAttributeState.ts';
 import { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
 import { SharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
@@ -39,11 +40,11 @@ export declare class UploadControl extends DescendantNode<UploadDefinition<'bina
     static from(parent: GeneralParentNode, instanceNode: StaticLeafElement | null, definition: UploadDefinition): UploadControl;
     private readonly validation;
     private readonly instanceAttachment;
-    private readonly attributeState;
     readonly [XPathNodeKindKey] = "element";
     readonly getXPathValue: () => InstanceAttachmentFileName;
     protected readonly state: SharedNodeState<UploadControlStateSpec>;
     protected readonly engineState: EngineState<UploadControlStateSpec>;
+    readonly attributeState: AttributeState;
     readonly decodeInstanceValue: DecodeInstanceValue;
     readonly nodeType = "upload";
     readonly valueType = "binary";
@@ -56,7 +57,7 @@ export declare class UploadControl extends DescendantNode<UploadDefinition<'bina
     getViolation(): AnyViolation | null;
     isBlank(): boolean;
     getChildren(): readonly [];
-    setValue(value: InstanceAttachmentRuntimeValue): Root;
     getAttributes(): readonly Attribute[];
+    setValue(value: InstanceAttachmentRuntimeValue): Root;
 }
 export {};

package/dist/instance/abstract/DescendantNode.d.ts

@@ -6,9 +6,10 @@ import { InstanceNodeType } from '../../client/node-types.ts';
 import { PrimaryInstanceXPathChildNode } from '../../integration/xpath/adapter/kind.ts';
 import { XFormsXPathPrimaryInstanceDescendantNode, XFormsXPathPrimaryInstanceDescendantNodeKind } from '../../integration/xpath/adapter/XFormsXPathNode.ts';
 import { EngineXPathEvaluator } from '../../integration/xpath/EngineXPathEvaluator.ts';
+import { StaticAttribute } from '../../integration/xpath/static-dom/StaticAttribute.ts';
 import { StaticElement } from '../../integration/xpath/static-dom/StaticElement.ts';
 import { AnyNodeDefinition } from '../../parse/model/NodeDefinition.ts';
-import { AnyChildNode, AnyParentNode } from '../hierarchy.ts';
+import { AnyChildNode, AnyNode } from '../hierarchy.ts';
 import { EvaluationContext } from '../internal-api/EvaluationContext.ts';
 import { Root } from '../Root.ts';
 import { InstanceNodeStateSpec, InstanceNode } from './InstanceNode.ts';
@@ -31,9 +32,9 @@ interface DescendantNodeOptions {
  * beginning to form in {@link DescendantNodeInitOptions} (not to be confused
  * with the current module-local {@link DescendantNodeOptions}).
  */
-export declare abstract class DescendantNode<Definition extends DescendantNodeDefinition, Spec extends DescendantNodeStateSpec<any>, Parent extends AnyParentNode, Child extends AnyChildNode | null = null> extends InstanceNode<Definition, Spec, Parent, Child> implements BaseNode, XFormsXPathPrimaryInstanceDescendantNode, EvaluationContext {
+export declare abstract class DescendantNode<Definition extends DescendantNodeDefinition, Spec extends DescendantNodeStateSpec<any>, Parent extends AnyNode, Child extends AnyChildNode | null = null> extends InstanceNode<Definition, Spec, Parent, Child> implements BaseNode, XFormsXPathPrimaryInstanceDescendantNode, EvaluationContext {
     readonly parent: Parent;
-    readonly instanceNode: StaticElement | null;
+    readonly instanceNode: StaticAttribute | StaticElement | null;
     readonly definition: Definition;
     /**
      * Partial implementation of {@link isAttached}, used to check whether `this`
@@ -65,7 +66,7 @@ export declare abstract class DescendantNode<Definition extends DescendantNodeDe
     readonly evaluator: EngineXPathEvaluator;
     readonly contextNode: PrimaryInstanceXPathChildNode;
     readonly getActiveLanguage: Accessor<ActiveLanguage>;
-    constructor(parent: Parent, instanceNode: StaticElement | null, definition: Definition, options?: DescendantNodeOptions);
+    constructor(parent: Parent, instanceNode: StaticAttribute | StaticElement | null, definition: Definition, options?: DescendantNodeOptions);
     /**
      * @package
      *

package/dist/instance/abstract/InstanceNode.d.ts

@@ -22,7 +22,7 @@ import { AnyNodeDefinition } from '../../parse/model/NodeDefinition.ts';
 import { Attribute } from '../Attribute.ts';
 import { PrimaryInstance } from '../PrimaryInstance.ts';
 import { Root } from '../Root.ts';
-import { AnyChildNode, AnyParentNode } from '../hierarchy.ts';
+import { AnyChildNode, AnyNode } from '../hierarchy.ts';
 import { EvaluationContext } from '../internal-api/EvaluationContext.ts';
 import { InstanceConfig } from '../internal-api/InstanceConfig.ts';
 export type EngineInstanceNodeType = ClientInstanceNodeType | 'primary-instance';
@@ -51,7 +51,7 @@ export type InstanceNodeCurrentState<Spec extends InstanceNodeStateSpec<any>, Ch
     readonly children: [Child] extends [AnyChildNode] ? readonly Child[] : null;
 };
 interface ComputableReferenceNode {
-    readonly parent: AnyParentNode | null;
+    readonly parent: AnyNode | null;
     readonly definition: AnyNodeDefinition;
 }
 type ComputeInstanceNodeReference = <This extends ComputableReferenceNode>(this: This, parent: This['parent'], definition: This['definition']) => string;
@@ -59,7 +59,7 @@ export interface InstanceNodeOptions {
     readonly computeReference?: () => string;
     readonly scope?: ReactiveScope;
 }
-export declare abstract class InstanceNode<Definition extends AnyNodeDefinition, Spec extends InstanceNodeStateSpec<any>, Parent extends AnyParentNode | null, Child extends AnyChildNode | null = null> implements BaseEngineNode, XFormsXPathPrimaryInstanceNode, EvaluationContext {
+export declare abstract class InstanceNode<Definition extends AnyNodeDefinition, Spec extends InstanceNodeStateSpec<any>, Parent extends AnyNode | null, Child extends AnyChildNode | null = null> implements BaseEngineNode, XFormsXPathPrimaryInstanceNode, EvaluationContext {
     readonly instanceConfig: InstanceConfig;
     readonly parent: Parent;
     readonly instanceNode: StaticAttribute | StaticDocument | StaticElement | null;
@@ -124,11 +124,12 @@ export declare abstract class InstanceNode<Definition extends AnyNodeDefinition,
      * (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[];
     /**
      * @todo Values as text nodes(?)
      */
-    getXPathChildNodes(): ReadonlyArray<Exclude<AnyChildNode, Attribute>>;
+    getXPathChildNodes(): readonly AnyChildNode[];
     getXPathValue(): string;
+    abstract getAttributes(): readonly Attribute[];
 }
 export {};

package/dist/instance/abstract/ValueNode.d.ts

@@ -14,6 +14,7 @@ import { SharedNodeState } from '../../lib/reactivity/node-state/createSharedNod
 import { SimpleAtomicState } from '../../lib/reactivity/types.ts';
 import { SharedValidationState } from '../../lib/reactivity/validation/createValidation.ts';
 import { LeafNodeDefinition } from '../../parse/model/LeafNodeDefinition.ts';
+import { Attribute } from '../Attribute.ts';
 import { GeneralParentNode } from '../hierarchy.ts';
 import { EvaluationContext } from '../internal-api/EvaluationContext.ts';
 import { DecodeInstanceValue, InstanceValueContext } from '../internal-api/InstanceValueContext.ts';
@@ -23,7 +24,7 @@ import { DescendantNodeStateSpec, DescendantNode } from './DescendantNode.ts';
 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/dist/instance/attachments/buildAttributes.d.ts

@@ -1,3 +1,7 @@
 import { Attribute } from '../Attribute';
-import { AnyParentNode } from '../hierarchy';
-export declare function buildAttributes(parent: AnyParentNode): Attribute[];
+import { AnyNode } from '../hierarchy.ts';
+import { InputControl } from '../InputControl.ts';
+import { ModelValue } from '../ModelValue.ts';
+import { Note } from '../Note.ts';
+import { RangeControl } from '../RangeControl.ts';
+export declare function buildAttributes(owner: AnyNode | InputControl<any> | ModelValue<any> | Note<any> | RangeControl<any>): Attribute[];

package/dist/instance/hierarchy.d.ts

@@ -14,9 +14,9 @@ import { SelectControl } from './SelectControl.ts';
 import { TriggerControl } from './TriggerControl.ts';
 import { UploadControl } from './UploadControl.ts';
 export type RepeatRange = RepeatRangeControlled | RepeatRangeUncontrolled;
-export type AnyNode = PrimaryInstance | Root | Group | RepeatRange | RepeatInstance | AnyNote | AnyModelValue | AnyInputControl | AnyRangeControl | RankControl | SelectControl | TriggerControl | UploadControl;
+export type AnyNode = PrimaryInstance | Root | Group | RepeatRange | RepeatInstance | Attribute | AnyNote | AnyModelValue | AnyInputControl | AnyRangeControl | RankControl | SelectControl | TriggerControl | UploadControl;
 export type AnyParentNode = PrimaryInstance | Root | Group | RepeatRange | RepeatInstance;
 export type GeneralParentNode = Root | Group | RepeatInstance;
-export type AnyChildNode = Root | Group | RepeatRange | RepeatInstance | AnyModelValue | AnyNote | AnyInputControl | AnyRangeControl | RankControl | SelectControl | TriggerControl | UploadControl | Attribute;
+export type AnyChildNode = Root | Group | RepeatRange | RepeatInstance | AnyModelValue | AnyNote | AnyInputControl | AnyRangeControl | RankControl | SelectControl | TriggerControl | UploadControl;
 export type GeneralChildNode = Group | RepeatRange | AnyModelValue | AnyNote | AnyInputControl | AnyRangeControl | RankControl | SelectControl | TriggerControl | UploadControl;
 export type AnyValueNode = AnyModelValue | AnyNote | AnyInputControl | AnyRangeControl | RankControl | SelectControl | TriggerControl | UploadControl;

package/dist/instance/internal-api/AttributeContext.d.ts

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

package/dist/instance/internal-api/InstanceConfig.d.ts

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

package/dist/instance/internal-api/InstanceValueContext.d.ts

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

package/dist/instance/internal-api/serialization/ClientReactiveSerializableAttributeNode.d.ts

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

package/dist/instance/internal-api/serialization/ClientReactiveSerializableValueNode.d.ts

@@ -1,5 +1,7 @@
 import { InstanceState } from '../../../client/serialization/InstanceState.ts';
 import { QualifiedName } from '../../../lib/names/QualifiedName.ts';
+import { BindDefinition } from '../../../parse/model/BindDefinition.ts';
+import { Attribute } from '../../Attribute.ts';
 import { ClientReactiveSerializableChildNode, ClientReactiveSerializableParentNode } from './ClientReactiveSerializableParentNode.ts';
 export type SerializedInstanceValue = string;
 interface ClientReactiveSerializableValueNodeCurrentState {
@@ -8,9 +10,11 @@ interface ClientReactiveSerializableValueNodeCurrentState {
      * @todo Consider moving into {@link InstanceState}
      */
     get instanceValue(): SerializedInstanceValue;
+    get attributes(): readonly Attribute[];
 }
 interface ClientReactiveSerializableValueNodeDefinition {
     readonly qualifiedName: QualifiedName;
+    readonly bind: BindDefinition;
 }
 export interface ClientReactiveSerializableValueNode {
     readonly definition: ClientReactiveSerializableValueNodeDefinition;