@getodk/xforms-engine 0.15.0 → 0.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getodk/xforms-engine",
-  "version": "0.15.0",
+  "version": "0.16.1",
   "license": "Apache-2.0",
   "description": "XForms engine for ODK Web Forms",
   "type": "module",
@@ -29,20 +29,20 @@
     "README.md"
   ],
   "engines": {
-    "node": "^20.19.3 || ^22.12.0 || ^24.3.0",
-    "yarn": "1.22.22"
+    "node": "^20.19.3 || ^22.12.0 || ^24.11.0",
+    "yarn": "4.11.0"
   },
   "scripts": {
-    "build": "npm-run-all -nl build:*",
+    "build": "npm-run-all -nl 'build:*'",
     "build:clean": "rimraf dist/",
     "build:js": "vite build",
-    "build:solid": "export VITE_BUILD_TARGET=solid && vite build",
+    "build:solid": "VITE_BUILD_TARGET=solid vite build",
     "dev": "vite",
-    "docs": "npm-run-all -nl docs:*",
+    "docs": "npm-run-all -nl 'docs:*'",
     "docs:clean": "rimraf api-docs/",
     "docs:api": "typedoc --readme none --out api-docs --entryPoints \"src/**/*\"",
     "docs:serve": "http-server api-docs -o modules/client",
-    "test": "npm-run-all --print-name --print-label test-node:* test-browser:*",
+    "test": "npm-run-all -nl 'test-node:*' 'test-browser:*'",
     "test-node:jsdom": "vitest run",
     "test-browser:chromium": "BROWSER_NAME=chromium vitest run",
     "test-browser:firefox": "BROWSER_NAME=firefox vitest run",
@@ -57,24 +57,28 @@
     "bin-packer": "1.7.0",
     "mdast-util-from-markdown": "^2.0.2",
     "papaparse": "^5.5.3",
-    "solid-js": "^1.9.7",
+    "solid-js": "^1.9.10",
     "temporal-polyfill": "^0.3.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.28.0",
-    "@getodk/tree-sitter-xpath": "0.2.1",
-    "@getodk/xpath": "0.9.0",
-    "@playwright/test": "^1.55.1",
-    "@types/papaparse": "^5.3.16",
+    "@babel/core": "^7.28.5",
+    "@getodk/tree-sitter-xpath": "0.2.2",
+    "@getodk/xpath": "0.9.2",
+    "@playwright/test": "^1.57.0",
+    "@types/papaparse": "^5.5.0",
     "@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.8",
+    "jsdom": "^27.2.0",
+    "npm-run-all2": "^8.0.4",
+    "rimraf": "^6.0.1",
+    "typedoc": "^0.28.14",
+    "typescript": "~5.9.3",
+    "vite": "^7.2.4",
     "vite-plugin-dts": "^4.5.4",
     "vite-plugin-no-bundle": "^4.0.0",
-    "vitest": "^3.2.4"
+    "vitest": "^3.2.4",
+    "web-tree-sitter": "0.24.5"
   },
   "peerDependencies": {
     "solid-js": "^1.9.7"

package/src/client/AttributeNode.ts

@@ -1,16 +1,18 @@
 import type { Root } from '../instance/Root.ts';
 import type { AttributeDefinition } from '../parse/model/AttributeDefinition.ts';
+import type { BaseNode, BaseNodeState } from './BaseNode.ts';
 import type { OpaqueReactiveObjectFactory } from './OpaqueReactiveObjectFactory.ts';
 import type { InstanceState } from './serialization/InstanceState.ts';
 
-export interface AttributeNodeState {
+export interface AttributeNodeState extends BaseNodeState {
 	get value(): string;
+	get relevant(): boolean;
 }
 
 /**
  * Base interface for common/shared aspects of attributes.
  */
-export interface AttributeNode {
+export interface AttributeNode extends BaseNode {
 	/**
 	 * Specifies the node's general type. This can be useful for narrowing types,
 	 * e.g. those of children.
@@ -30,10 +32,6 @@ export interface AttributeNode {
 	 */
 	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;
 
 	/**

package/src/client/BaseNode.ts

@@ -1,3 +1,4 @@
+import type { Attribute } from '../instance/Attribute.ts';
 import type { TokenListParser } from '../lib/TokenListParser.ts';
 import type { AnyNodeDefinition } from '../parse/model/NodeDefinition.ts';
 import type { NodeAppearances } from './NodeAppearances.ts';
@@ -129,6 +130,11 @@ export interface BaseNodeState {
 	 * is an internal engine consideration.
 	 */
 	get value(): unknown;
+
+	/**
+	 * Nodes can own attributes, which have a literal or reference value.
+	 */
+	get attributes(): readonly Attribute[];
 }
 
 /**

package/src/client/form/FormInstanceConfig.ts

@@ -1,6 +1,21 @@
 import type { InstanceAttachmentsConfig } from '../attachments/InstanceAttachmentsConfig.ts';
 import type { OpaqueReactiveObjectFactory } from '../OpaqueReactiveObjectFactory.ts';
 
+/**
+ * @see https://getodk.github.io/xforms-spec/#preload-attributes
+ */
+export interface PreloadProperties {
+	/**
+	 * The unique identifier for this device. If not provided, then an identifier will be
+	 * generated during the first page load and stored in localstorage and reused for
+	 * subsequent form loads.
+	 */
+	readonly deviceID?: string;
+	readonly email?: string;
+	readonly username?: string;
+	readonly phoneNumber?: string;
+}
+
 export interface FormInstanceConfig {
 	/**
 	 * A client may specify a generic function for constructing stateful objects.
@@ -18,4 +33,6 @@ export interface FormInstanceConfig {
 	readonly stateFactory?: OpaqueReactiveObjectFactory;
 
 	readonly instanceAttachments?: InstanceAttachmentsConfig;
+
+	readonly preloadProperties?: PreloadProperties;
 }

package/src/client/validation.ts

@@ -204,4 +204,4 @@ export interface NullValidationState {
 export type NodeValidationState =
 	| AncestorNodeValidationState
 	| LeafNodeValidationState
-	| NullValidationState;
+	| NullValidationState; // eslint-disable-line @typescript-eslint/no-redundant-type-constituents

package/src/entrypoints/FormInstance.ts

@@ -41,6 +41,7 @@ export class FormInstance<Mode extends FormInstanceInitializationMode>
 		const config: InstanceConfig = {
 			clientStateFactory: instanceConfig.stateFactory ?? identity,
 			computeAttachmentName: instanceConfig.instanceAttachments?.fileNameFactory ?? (() => null),
+			preloadProperties: instanceConfig.preloadProperties ?? {},
 		};
 		const primaryInstanceOptions: PrimaryInstanceOptions<Mode> = {
 			...options.instanceOptions,

package/src/instance/Attribute.ts

@@ -1,9 +1,8 @@
 import { XPathNodeKindKey } from '@getodk/xpath';
 import type { Accessor } from 'solid-js';
 import type { AttributeNode } from '../client/AttributeNode.ts';
-import type { ActiveLanguage, InstanceState, NullValidationState } from '../client/index.ts';
+import type { InstanceState, NullValidationState } from '../client/index.ts';
 import type { XFormsXPathAttribute } from '../integration/xpath/adapter/XFormsXPathNode.ts';
-import type { EngineXPathEvaluator } from '../integration/xpath/EngineXPathEvaluator.ts';
 import type { StaticAttribute } from '../integration/xpath/static-dom/StaticAttribute.ts';
 import { createAttributeNodeInstanceState } from '../lib/client-reactivity/instance-state/createAttributeNodeInstanceState.ts';
 import {
@@ -12,7 +11,11 @@ import {
 	type RuntimeValue,
 } from '../lib/codecs/getSharedValueCodec.ts';
 import type { RuntimeValueSetter, RuntimeValueState } from '../lib/codecs/ValueCodec.ts';
-import { createAttributeValueState } from '../lib/reactivity/createAttributeValueState.ts';
+import {
+	createAttributeState,
+	type AttributeState,
+} from '../lib/reactivity/createAttributeState.ts';
+import { createInstanceValueState } from '../lib/reactivity/createInstanceValueState.ts';
 import type { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import type { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
 import {
@@ -21,26 +24,23 @@ import {
 } 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 { DescendantNode, type DescendantNodeStateSpec } from './abstract/DescendantNode.ts';
+import type { AnyNode } 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 {
+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 class Attribute
-	extends InstanceNode<AttributeDefinition, AttributeStateSpec, AnyParentNode, null>
+	extends DescendantNode<AttributeDefinition, AttributeStateSpec, AnyNode, null>
 	implements
 		AttributeNode,
 		ClientReactiveSerializableAttributeNode,
@@ -55,7 +55,7 @@ export class Attribute
 
 	readonly nodeType = 'attribute';
 	readonly currentState: CurrentState<AttributeStateSpec>;
-	override readonly instanceState: InstanceState;
+	readonly instanceState: InstanceState;
 
 	readonly appearances = null;
 	readonly nodeOptions = null;
@@ -66,55 +66,33 @@ export class Attribute
 	protected readonly getInstanceValue: Accessor<string>;
 	protected readonly valueState: RuntimeValueState<RuntimeValue<'string'>>;
 	protected readonly setValueState: RuntimeValueSetter<RuntimeInputValue<'string'>>;
-	readonly evaluator: EngineXPathEvaluator;
-	readonly getActiveLanguage: Accessor<ActiveLanguage>;
-
-	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 attributeState: AttributeState;
 
-	readonly hasReadonlyAncestor: Accessor<boolean> = () => {
-		const { parent } = this;
-		return parent.hasReadonlyAncestor() || parent.isReadonly();
+	override readonly isAttached: Accessor<boolean> = () => {
+		return this.owner.isAttached();
 	};
 
-	readonly hasNonRelevantAncestor: Accessor<boolean> = () => {
-		const { parent } = this;
-		return parent.hasNonRelevantAncestor() || !parent.isRelevant();
-	};
+	override readonly getXPathValue: () => string;
 
 	constructor(
-		parent: AnyParentNode,
+		readonly owner: AnyNode,
 		definition: AttributeDefinition,
 		override readonly instanceNode: StaticAttribute
 	) {
-		const codec = getSharedValueCodec('string');
+		const computeReference = () => {
+			return `${this.owner.contextReference()}/@${this.definition.qualifiedName.getPrefixedName()}`;
+		};
 
-		super(parent.instanceConfig, parent, instanceNode, definition, {
-			scope: parent.scope,
-			computeReference: (): string => '@' + this.definition.qualifiedName.getPrefixedName(),
-		});
+		super(owner, instanceNode, definition, { computeReference });
 
-		this.root = parent.root;
+		const codec = getSharedValueCodec('string');
 
-		this.getActiveLanguage = parent.getActiveLanguage;
 		this.validationState = { violations: [] };
 
 		this.valueType = 'string';
-		this.evaluator = parent.evaluator;
 		this.decodeInstanceValue = codec.decodeInstanceValue;
 
-		const instanceValueState = createAttributeValueState(this);
+		const instanceValueState = createInstanceValueState(this);
 		const valueState = codec.createRuntimeValueState(instanceValueState);
 
 		const [getInstanceValue] = instanceValueState;
@@ -122,26 +100,23 @@ export class Attribute
 
 		this.getInstanceValue = getInstanceValue;
 		this.setValueState = setValueState;
-		this.getXPathValue = () => {
-			return this.getInstanceValue();
-		};
 		this.valueState = valueState;
 
 		const state = createSharedNodeState(
-			this.scope,
+			owner.scope,
 			{
+				value: this.valueState,
+				instanceValue: this.getInstanceValue,
+				relevant: this.owner.isRelevant,
+
+				readonly: () => true,
 				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,
+				label: () => null,
+				hint: () => null,
+				attributes: () => [],
+				valueOptions: () => [],
 			},
 			this.instanceConfig
 		);
@@ -150,6 +125,11 @@ export class Attribute
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;
 		this.instanceState = createAttributeNodeInstanceState(this);
+		this.attributeState = createAttributeState(this.scope);
+
+		this.getXPathValue = () => {
+			return this.getInstanceValue();
+		};
 	}
 
 	setValue(value: string): Root {
@@ -158,6 +138,10 @@ export class Attribute
 		return this.root;
 	}
 
+	override getAttributes(): readonly Attribute[] {
+		return [];
+	}
+
 	getChildren(): readonly [] {
 		return [];
 	}

package/src/instance/Group.ts

@@ -50,13 +50,13 @@ export class Group
 		ClientReactiveSerializableParentNode<GeneralChildNode>
 {
 	private readonly childrenState: ChildrenState<GeneralChildNode>;
-	private readonly attributeState: AttributeState;
 
 	override readonly [XPathNodeKindKey] = 'element';
 
 	// InstanceNode
 	protected readonly state: SharedNodeState<GroupStateSpec>;
 	protected override engineState: EngineState<GroupStateSpec>;
+	readonly attributeState: AttributeState;
 
 	// GroupNode
 	readonly nodeType = 'group';
@@ -76,10 +76,9 @@ export class Group
 		this.appearances = definition.bodyElement?.appearances ?? null;
 
 		const childrenState = createChildrenState<Group, GeneralChildNode>(this);
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		this.childrenState = childrenState;
-		this.attributeState = attributeState;
 
 		const state = createSharedNodeState(
 			this.scope,
@@ -92,7 +91,7 @@ export class Group
 				label: createNodeLabel(this, definition),
 				hint: null,
 				children: childrenState.childIds,
-				attributes: attributeState.getAttributes,
+				attributes: this.attributeState.getAttributes,
 				valueOptions: null,
 				value: null,
 			},
@@ -108,7 +107,7 @@ export class Group
 		);
 
 		childrenState.setChildren(buildChildren(this));
-		attributeState.setAttributes(buildAttributes(this));
+		this.attributeState.setAttributes(buildAttributes(this));
 		this.validationState = createAggregatedViolations(this, this.instanceConfig);
 		this.instanceState = createParentNodeInstanceState(this);
 	}
@@ -117,7 +116,7 @@ export class Group
 		return this.childrenState.getChildren();
 	}
 
-	getAttributes(): readonly Attribute[] {
+	override getAttributes(): readonly Attribute[] {
 		return this.attributeState.getAttributes();
 	}
 }

package/src/instance/InputControl.ts

@@ -13,6 +13,10 @@ import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPat
 import type { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import type { RuntimeInputValue, RuntimeValue } from '../lib/codecs/getSharedValueCodec.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';
@@ -21,6 +25,8 @@ import { createFieldHint } from '../lib/reactivity/text/createFieldHint.ts';
 import { createNodeLabel } from '../lib/reactivity/text/createNodeLabel.ts';
 import type { InputControlDefinition } from '../parse/body/control/InputControlDefinition.ts';
 import { ValueNode, type ValueNodeStateSpec } from './abstract/ValueNode.ts';
+import { buildAttributes } from './attachments/buildAttributes.ts';
+import type { Attribute } from './Attribute.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ClientReactiveSerializableValueNode } from './internal-api/serialization/ClientReactiveSerializableValueNode.ts';
@@ -69,6 +75,7 @@ const nodeOptionsFactoryByType: NodeOptionsFactoryByType = {
 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;
 }
 
@@ -100,6 +107,7 @@ export class InputControl<V extends ValueType = ValueType>
 	// InstanceNode
 	protected readonly state: SharedNodeState<InputControlStateSpec<V>>;
 	protected readonly engineState: EngineState<InputControlStateSpec<V>>;
+	readonly attributeState: AttributeState;
 
 	// InputNode
 	readonly nodeType = 'input';
@@ -118,6 +126,7 @@ export class InputControl<V extends ValueType = ValueType>
 
 		this.appearances = definition.bodyElement.appearances;
 		this.nodeOptions = nodeOptionsFactoryByType[definition.valueType](definition.bodyElement);
+		this.attributeState = createAttributeState(this.scope);
 
 		const state = createSharedNodeState(
 			this.scope,
@@ -130,7 +139,7 @@ export class InputControl<V extends ValueType = ValueType>
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
-				attributes: null,
+				attributes: this.attributeState.getAttributes,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
@@ -138,6 +147,8 @@ export class InputControl<V extends ValueType = ValueType>
 			this.instanceConfig
 		);
 
+		this.attributeState.setAttributes(buildAttributes(this));
+
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = state.currentState;
@@ -148,6 +159,10 @@ export class InputControl<V extends ValueType = ValueType>
 
 		return this.root;
 	}
+
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
 }
 
 export type AnyInputControl =

package/src/instance/ModelValue.ts

@@ -5,11 +5,17 @@ import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPat
 import type { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import type { RuntimeInputValue, RuntimeValue } from '../lib/codecs/getSharedValueCodec.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';
 import { createSharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
+import type { Attribute } from './Attribute.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';
@@ -49,6 +55,7 @@ export class ModelValue<V extends ValueType = ValueType>
 	// InstanceNode
 	protected readonly state: SharedNodeState<ModelValueStateSpec<V>>;
 	protected readonly engineState: EngineState<ModelValueStateSpec<V>>;
+	readonly attributeState: AttributeState;
 
 	// ModelValueNode
 	readonly nodeType = 'model-value';
@@ -65,6 +72,8 @@ export class ModelValue<V extends ValueType = ValueType>
 
 		super(parent, instanceNode, definition, codec);
 
+		this.attributeState = createAttributeState(this.scope);
+
 		const state = createSharedNodeState(
 			this.scope,
 			{
@@ -76,7 +85,7 @@ export class ModelValue<V extends ValueType = ValueType>
 				label: null,
 				hint: null,
 				children: null,
-				attributes: null,
+				attributes: this.attributeState.getAttributes,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
@@ -84,10 +93,16 @@ export class ModelValue<V extends ValueType = ValueType>
 			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();
+	}
 }
 
 export type AnyModelValue =

package/src/instance/Note.ts

@@ -8,6 +8,10 @@ import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPat
 import type { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import { getNoteCodec } from '../lib/codecs/getNoteCodec.ts';
 import type { NoteInputValue, NoteRuntimeValue } from '../lib/codecs/NoteCodec.ts';
+import {
+	createAttributeState,
+	type AttributeState,
+} from '../lib/reactivity/createAttributeState.ts';
 import { createNoteReadonlyThunk } from '../lib/reactivity/createNoteReadonlyThunk.ts';
 import type { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import type { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
@@ -18,6 +22,8 @@ import { createNodeLabel } from '../lib/reactivity/text/createNodeLabel.ts';
 import { createNoteText, type ComputedNoteText } from '../lib/reactivity/text/createNoteText.ts';
 import type { NoteNodeDefinition } from '../parse/model/NoteNodeDefinition.ts';
 import { ValueNode, type ValueNodeStateSpec } from './abstract/ValueNode.ts';
+import { buildAttributes } from './attachments/buildAttributes.ts';
+import type { Attribute } from './Attribute.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import type { ClientReactiveSerializableValueNode } from './internal-api/serialization/ClientReactiveSerializableValueNode.ts';
@@ -46,6 +52,7 @@ export class Note<V extends ValueType = ValueType>
 	// InstanceNode
 	protected readonly state: SharedNodeState<NoteStateSpec<V>>;
 	protected readonly engineState: EngineState<NoteStateSpec<V>>;
+	readonly attributeState: AttributeState;
 
 	// NoteNode
 	readonly nodeType = 'note';
@@ -66,6 +73,7 @@ export class Note<V extends ValueType = ValueType>
 
 		const isReadonly = createNoteReadonlyThunk(this, definition);
 		const noteTextComputation = createNoteText(this, definition.noteTextDefinition);
+		this.attributeState = createAttributeState(this.scope);
 
 		let noteText: ComputedNoteText;
 		let label: Accessor<TextRange<'label', 'form'> | null>;
@@ -105,7 +113,7 @@ export class Note<V extends ValueType = ValueType>
 				noteText,
 
 				children: null,
-				attributes: null,
+				attributes: this.attributeState.getAttributes,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,
@@ -113,10 +121,16 @@ export class Note<V extends ValueType = ValueType>
 			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();
+	}
 }
 
 export type AnyNote =

package/src/instance/PrimaryInstance.ts

@@ -128,6 +128,7 @@ export class PrimaryInstance<
 	// InstanceNode
 	protected readonly state: SharedNodeState<PrimaryInstanceStateSpec>;
 	protected readonly engineState: EngineState<PrimaryInstanceStateSpec>;
+	readonly attributeState: AttributeState;
 
 	override readonly instanceNode: StaticDocument;
 	readonly getChildren: Accessor<readonly Root[]>;
@@ -161,8 +162,6 @@ 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;
@@ -202,10 +201,9 @@ export class PrimaryInstance<
 		this.classes = definition.classes;
 
 		const childrenState = createChildrenState<this, Root>(this);
-		const attributeState = createAttributeState(this.scope);
+		this.attributeState = createAttributeState(this.scope);
 
 		this.getChildren = childrenState.getChildren;
-		this.attributeState = attributeState;
 
 		const stateSpec: PrimaryInstanceStateSpec = {
 			activeLanguage: getActiveLanguage,
@@ -218,7 +216,7 @@ export class PrimaryInstance<
 			valueOptions: null,
 			value: null,
 			children: childrenState.childIds,
-			attributes: attributeState.getAttributes,
+			attributes: this.attributeState.getAttributes,
 		};
 
 		const state = createSharedNodeState(scope, stateSpec, config);
@@ -239,10 +237,14 @@ export class PrimaryInstance<
 		this.instanceState = createPrimaryInstanceState(this);
 
 		childrenState.setChildren([root]);
-		attributeState.setAttributes(buildAttributes(this));
+		this.attributeState.setAttributes(buildAttributes(this));
 		setIsAttached(true);
 	}
 
+	override getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
+
 	// PrimaryInstanceDocument
 	/**
 	 * @todo Note that this method's signature is intentionally derived from
@@ -292,8 +294,4 @@ export class PrimaryInstance<
 
 		return Promise.resolve(result);
 	}
-
-	getAttributes(): readonly Attribute[] {
-		return this.attributeState.getAttributes();
-	}
 }