@getodk/xforms-engine 0.13.0 → 0.15.0

package/src/instance/RangeControl.ts

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

package/src/instance/RankControl.ts

@@ -174,6 +174,7 @@ export class RankControl
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
+				attributes: null,
 				valueOptions,
 				value: valueState,
 				instanceValue: this.getInstanceValue,

package/src/instance/Root.ts

@@ -12,6 +12,10 @@ import type { InstanceState } from '../client/serialization/InstanceState.ts';
 import type { AncestorNodeValidationState } from '../client/validation.ts';
 import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import { createRootInstanceState } from '../lib/client-reactivity/instance-state/createRootInstanceState.ts';
+import {
+	createAttributeState,
+	type AttributeState,
+} from '../lib/reactivity/createAttributeState.ts';
 import type { ChildrenState } from '../lib/reactivity/createChildrenState.ts';
 import { createChildrenState } from '../lib/reactivity/createChildrenState.ts';
 import type { MaterializedChildren } from '../lib/reactivity/materializeCurrentStateChildren.ts';
@@ -24,6 +28,8 @@ import { createAggregatedViolations } from '../lib/reactivity/validation/createA
 import type { BodyClassList } from '../parse/body/BodyDefinition.ts';
 import type { RootDefinition } from '../parse/model/RootDefinition.ts';
 import { DescendantNode } from './abstract/DescendantNode.ts';
+import { buildAttributes } from './attachments/buildAttributes.ts';
+import { Attribute } from './Attribute.ts';
 import { buildChildren } from './children/buildChildren.ts';
 import type { GeneralChildNode } from './hierarchy.ts';
 import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
@@ -39,6 +45,7 @@ interface RootStateSpec {
 	readonly label: null;
 	readonly hint: null;
 	readonly children: Accessor<readonly FormNodeID[]>;
+	readonly attributes: Accessor<readonly Attribute[]>;
 	readonly valueOptions: null;
 	readonly value: null;
 
@@ -56,6 +63,7 @@ export class Root
 		ClientReactiveSerializableParentNode<GeneralChildNode>
 {
 	private readonly childrenState: ChildrenState<GeneralChildNode>;
+	private readonly attributeState: AttributeState;
 
 	// XFormsXPathElement
 	override readonly [XPathNodeKindKey] = 'element';
@@ -95,8 +103,10 @@ export class Root
 		this.classes = parent.classes;
 
 		const childrenState = createChildrenState<Root, GeneralChildNode>(this);
+		const attributeState = createAttributeState(this.scope);
 
 		this.childrenState = childrenState;
+		this.attributeState = attributeState;
 		this.languages = parent.languages;
 
 		const state = createSharedNodeState(
@@ -112,6 +122,7 @@ export class Root
 				valueOptions: null,
 				value: null,
 				children: childrenState.childIds,
+				attributes: attributeState.getAttributes,
 			},
 			this.instanceConfig
 		);
@@ -125,6 +136,7 @@ export class Root
 		);
 
 		childrenState.setChildren(buildChildren(this));
+		attributeState.setAttributes(buildAttributes(this));
 		this.validationState = createAggregatedViolations(this, this.instanceConfig);
 		this.instanceState = createRootInstanceState(this);
 	}
@@ -133,6 +145,10 @@ export class Root
 		return this.childrenState.getChildren();
 	}
 
+	getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
+
 	// RootNode
 	setLanguage(language: FormLanguage): Root {
 		this.rootDocument.setLanguage(language);

package/src/instance/SelectControl.ts

@@ -153,6 +153,7 @@ export class SelectControl
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
+				attributes: null,
 				valueOptions,
 				value: valueState,
 				instanceValue: this.getInstanceValue,

package/src/instance/TriggerControl.ts

@@ -100,6 +100,7 @@ export class TriggerControl
 				label: createNodeLabel(this, definition),
 				hint: createFieldHint(this, definition),
 				children: null,
+				attributes: null,
 				valueOptions: null,
 				value: this.valueState,
 				instanceValue: this.getInstanceValue,

package/src/instance/UploadControl.ts

@@ -9,6 +9,10 @@ import { UploadValueTypeError } from '../error/UploadValueTypeError.ts';
 import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
 import type { StaticLeafElement } from '../integration/xpath/static-dom/StaticElement.ts';
 import { createValueNodeInstanceState } from '../lib/client-reactivity/instance-state/createValueNodeInstanceState.ts';
+import {
+	createAttributeState,
+	type AttributeState,
+} from '../lib/reactivity/createAttributeState.ts';
 import { createInstanceAttachment } from '../lib/reactivity/createInstanceAttachment.ts';
 import type { CurrentState } from '../lib/reactivity/node-state/createCurrentState.ts';
 import type { EngineState } from '../lib/reactivity/node-state/createEngineState.ts';
@@ -20,6 +24,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 type { UnknownAppearanceDefinition } from '../parse/body/appearance/unknownAppearanceParser.ts';
+import type { Attribute } from './Attribute.ts';
 import type { Root } from './Root.ts';
 import type { DescendantNodeStateSpec } from './abstract/DescendantNode.ts';
 import { DescendantNode } from './abstract/DescendantNode.ts';
@@ -57,6 +62,7 @@ interface UploadControlStateSpec extends DescendantNodeStateSpec<InstanceAttachm
 	readonly label: Accessor<TextRange<'label'> | null>;
 	readonly hint: Accessor<TextRange<'hint'> | null>;
 	readonly children: null;
+	readonly attributes: Accessor<readonly Attribute[]>;
 	readonly valueOptions: null;
 	readonly value: SimpleAtomicState<InstanceAttachmentRuntimeValue>;
 	readonly instanceValue: Accessor<InstanceAttachmentFileName>;
@@ -95,6 +101,7 @@ export class UploadControl
 
 	private readonly validation: SharedValidationState;
 	private readonly instanceAttachment: InstanceAttachment;
+	private readonly attributeState: AttributeState;
 
 	// XFormsXPathElement
 	override readonly [XPathNodeKindKey] = 'element';
@@ -133,6 +140,8 @@ export class UploadControl
 		const instanceAttachment = createInstanceAttachment(this);
 
 		this.instanceAttachment = instanceAttachment;
+		const attributeState = createAttributeState(this.scope);
+		this.attributeState = attributeState;
 		this.decodeInstanceValue = instanceAttachment.decodeInstanceValue;
 		this.getXPathValue = instanceAttachment.getInstanceValue;
 
@@ -149,6 +158,7 @@ export class UploadControl
 				children: null,
 				valueOptions: null,
 				value: instanceAttachment.valueState,
+				attributes: attributeState.getAttributes,
 				instanceValue: instanceAttachment.getInstanceValue,
 			},
 			this.instanceConfig
@@ -181,4 +191,8 @@ export class UploadControl
 
 		return this.root;
 	}
+
+	getAttributes(): readonly Attribute[] {
+		return this.attributeState.getAttributes();
+	}
 }

package/src/instance/abstract/DescendantNode.ts

@@ -167,7 +167,11 @@ 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

@@ -13,6 +13,7 @@ import type {
 	XFormsXPathPrimaryInstanceNodeKind,
 } from '../../integration/xpath/adapter/XFormsXPathNode.ts';
 import type { PrimaryInstanceXPathNode } from '../../integration/xpath/adapter/kind.ts';
+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 { MaterializedChildren } from '../../lib/reactivity/materializeCurrentStateChildren.ts';
@@ -24,6 +25,7 @@ import { createReactiveScope } from '../../lib/reactivity/scope.ts';
 import type { SimpleAtomicState } from '../../lib/reactivity/types.ts';
 import { createUniqueId } from '../../lib/unique-id.ts';
 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';
@@ -51,6 +53,7 @@ export interface InstanceNodeStateSpec<Value = never> {
 	readonly label: Accessor<TextRange<'label'> | null> | null;
 	readonly hint: Accessor<TextRange<'hint'> | null> | null;
 	readonly children: Accessor<readonly FormNodeID[]> | null;
+	readonly attributes: Accessor<readonly Attribute[]> | null;
 	readonly valueOptions: InstanceNodeValueOptionsStateSpec;
 	readonly value: Signal<Value> | SimpleAtomicState<Value> | null;
 }
@@ -191,7 +194,7 @@ export abstract class InstanceNode<
 	constructor(
 		readonly instanceConfig: InstanceConfig,
 		readonly parent: Parent,
-		readonly instanceNode: StaticDocument | StaticElement | null,
+		readonly instanceNode: StaticAttribute | StaticDocument | StaticElement | null,
 		readonly definition: Definition,
 		options?: InstanceNodeOptions
 	) {
@@ -237,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): readonly AnyChildNode[];
+	abstract getChildren(this: AnyInstanceNode): ReadonlyArray<Exclude<AnyChildNode, Attribute>>;
 
 	// XFormsXPathNode
 	/**
 	 * @todo Values as text nodes(?)
 	 */
-	getXPathChildNodes(): readonly AnyChildNode[] {
+	getXPathChildNodes(): ReadonlyArray<Exclude<AnyChildNode, Attribute>> {
 		return (this as AnyInstanceNode).getChildren().flatMap((child) => {
 			switch (child.nodeType) {
 				case 'repeat-range:controlled':

package/src/instance/abstract/ValueNode.ts

@@ -36,6 +36,7 @@ export type ValueNodeDefinition<V extends ValueType> = LeafNodeDefinition<V>;
 
 export interface ValueNodeStateSpec<RuntimeValue> extends DescendantNodeStateSpec<RuntimeValue> {
 	readonly children: null;
+	readonly attributes: null;
 	readonly value: SimpleAtomicState<RuntimeValue>;
 	readonly instanceValue: Accessor<string>;
 }

package/src/instance/attachments/buildAttributes.ts

@@ -0,0 +1,8 @@
+import { Attribute } from '../Attribute';
+import type { AnyParentNode } from '../hierarchy';
+
+export function buildAttributes(parent: AnyParentNode): Attribute[] {
+	return Array.from(parent.definition.attributes.values()).map((attributeDefinition) => {
+		return new Attribute(parent, attributeDefinition, attributeDefinition.template);
+	});
+}

package/src/instance/children/buildChildren.ts

@@ -4,7 +4,6 @@ import type { InputDefinition } from '../../client/InputNode.ts';
 import type { ModelValueDefinition } from '../../client/ModelValueNode.ts';
 import type { RankDefinition } from '../../client/RankNode.ts';
 import type { SelectDefinition } from '../../client/SelectNode.ts';
-import type { SubtreeDefinition } from '../../client/SubtreeNode.ts';
 import type { TriggerNodeDefinition } from '../../client/TriggerNode.ts';
 import type { UploadDefinition } from '../../client/UploadNode.ts';
 import { ErrorProductionDesignPendingError } from '../../error/ErrorProductionDesignPendingError.ts';
@@ -15,7 +14,6 @@ import type {
 	RangeLeafNodeDefinition,
 } from '../../parse/model/RangeNodeDefinition.ts';
 import { RangeNodeDefinition } from '../../parse/model/RangeNodeDefinition.ts';
-import type { SubtreeDefinition as ModelSubtreeDefinition } from '../../parse/model/SubtreeDefinition.ts';
 import { Group } from '../Group.ts';
 import type { GeneralChildNode, GeneralParentNode } from '../hierarchy.ts';
 import { InputControl } from '../InputControl.ts';
@@ -26,17 +24,10 @@ import { RankControl } from '../RankControl.ts';
 import { RepeatRangeControlled } from '../repeat/RepeatRangeControlled.ts';
 import { RepeatRangeUncontrolled } from '../repeat/RepeatRangeUncontrolled.ts';
 import { SelectControl } from '../SelectControl.ts';
-import { Subtree } from '../Subtree.ts';
 import { TriggerControl } from '../TriggerControl.ts';
 import { UploadControl } from '../UploadControl.ts';
 import { childrenInitOptions } from './childrenInitOptions.ts';
 
-const isSubtreeDefinition = (
-	definition: ModelSubtreeDefinition
-): definition is SubtreeDefinition => {
-	return definition.bodyElement == null;
-};
-
 // prettier-ignore
 type ControlNodeDefinition =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
@@ -131,14 +122,7 @@ export const buildChildren = (parent: GeneralParentNode): GeneralChildNode[] =>
 		const [instanceNode = null] = instanceNodes;
 
 		switch (definition.type) {
-			case 'subtree': {
-				if (isSubtreeDefinition(definition)) {
-					return new Subtree(parent, instanceNode, definition);
-				}
-
-				// TODO: it'd be good to be able to do without this type assertion. The
-				// only distinction between the types is whether `bodyElement` is
-				// `null`, but for some reason that's insufficient to narrow the union.
+			case 'group': {
 				return new Group(parent, instanceNode, definition as GroupDefinition);
 			}
 

package/src/instance/children/normalizeChildInitOptions.ts

@@ -3,21 +3,19 @@ import {
 	XFORMS_NAMESPACE_URI,
 } from '@getodk/common/constants/xmlns.ts';
 import type { GroupDefinition } from '../../client/GroupNode.ts';
-import type { SubtreeDefinition } from '../../client/SubtreeNode.ts';
 import { ErrorProductionDesignPendingError } from '../../error/ErrorProductionDesignPendingError.ts';
 import { StaticDocument } from '../../integration/xpath/static-dom/StaticDocument.ts';
 import type { StaticLeafElement } from '../../integration/xpath/static-dom/StaticElement.ts';
 import { StaticElement } from '../../integration/xpath/static-dom/StaticElement.ts';
 import type { NamespaceURL } from '../../lib/names/NamespaceURL.ts';
 import type { QualifiedName } from '../../lib/names/QualifiedName.ts';
+import type { GroupDefinition as ModelGroupDefinition } from '../../parse/model/GroupDefinition.ts';
 import { LeafNodeDefinition } from '../../parse/model/LeafNodeDefinition.ts';
-import type { SubtreeDefinition as ModelSubtreeDefinition } from '../../parse/model/SubtreeDefinition.ts';
 import type { XFormDOM } from '../../parse/XFormDOM.ts';
 import type { Group } from '../Group.ts';
 import type { GeneralParentNode } from '../hierarchy.ts';
 import type { PrimaryInstance } from '../PrimaryInstance.ts';
 import type { Root } from '../Root.ts';
-import type { Subtree } from '../Subtree.ts';
 import type { ChildrenInitOptions } from './childrenInitOptions.ts';
 import type { DescendantNodeInitOptions } from './DescendantNodeInitOptions.ts';
 
@@ -65,21 +63,12 @@ interface BaseMetaDefinition {
 	readonly qualifiedName: MetaName;
 }
 
-const isBaseMetaDefinition = <T extends ModelSubtreeDefinition>(
+const isBaseMetaDefinition = <T extends ModelGroupDefinition>(
 	definition: T
 ): definition is BaseMetaDefinition & T => {
 	return isMetaName(definition.qualifiedName);
 };
 
-interface MetaSubtreeDefinition extends SubtreeDefinition {
-	readonly qualifiedName: MetaName;
-}
-
-interface MetaSubtree extends Subtree {
-	readonly parent: Root;
-	readonly definition: MetaSubtreeDefinition;
-}
-
 interface MetaGroupDefinition extends GroupDefinition {
 	readonly qualifiedName: MetaName;
 }
@@ -89,17 +78,15 @@ interface MetaGroup extends Group {
 	readonly definition: MetaGroupDefinition;
 }
 
-type MetaSubroot = MetaGroup | MetaSubtree;
-
-interface MetaSubrootInitOptions extends ChildrenInitOptions {
-	readonly parent: MetaGroup | MetaSubtree;
+interface MetaGroupInitOptions extends ChildrenInitOptions {
+	readonly parent: MetaGroup;
 }
 
-const isMetaSubroot = (options: ChildrenInitOptions): options is MetaSubrootInitOptions => {
+const isMetaGroup = (options: ChildrenInitOptions): options is MetaGroupInitOptions => {
 	const { nodeType } = options.parent;
 
 	return (
-		(nodeType === 'subtree' || nodeType === 'group') &&
+		nodeType === 'group' &&
 		isDirectRootDescendant(options.parent) &&
 		isBaseMetaDefinition(options.parent.definition)
 	);
@@ -119,16 +106,16 @@ interface EditModeInstanceDescendant {
 	readonly rootDocument: EditModeInstance;
 }
 
-type EditModeMetaSubroot = EditModeInstanceDescendant & MetaSubroot;
+type EditModeMetaGroup = EditModeInstanceDescendant & MetaGroup;
 
-interface EditModeMetaSubrootInitOptions extends MetaSubrootInitOptions {
-	readonly parent: EditModeMetaSubroot;
+interface EditModeMetaGroupInitOptions extends MetaGroupInitOptions {
+	readonly parent: EditModeMetaGroup;
 }
 
-const isEditModeMetaSubroot = (
-	subroot: MetaSubrootInitOptions
-): subroot is EditModeMetaSubrootInitOptions => {
-	return isEditModeInstance(subroot.parent.rootDocument);
+const isEditModeMetaGroup = (
+	group: MetaGroupInitOptions
+): group is EditModeMetaGroupInitOptions => {
+	return isEditModeInstance(group.parent.rootDocument);
 };
 
 interface LeafNodeInitOptions extends DescendantNodeInitOptions {
@@ -147,13 +134,13 @@ const isLeafNodeInitOptions = (
 type MetaLeafChildEntry = readonly [index: number, child: LeafNodeInitOptions];
 
 const findMetaLeafChild = (
-	subroot: MetaSubrootInitOptions,
+	group: MetaGroupInitOptions,
 	localName: string
 ): MetaLeafChildEntry | null => {
-	const metaName = subroot.parent.definition.qualifiedName satisfies MetaName;
+	const metaName = group.parent.definition.qualifiedName satisfies MetaName;
 	const namespaceURI = metaName.namespaceURI.href satisfies MetaNamespaceURIValue;
 
-	const result = Array.from(subroot.children.entries()).find(
+	const result = Array.from(group.children.entries()).find(
 		(entry): entry is [number, LeafNodeInitOptions] => {
 			const [, child] = entry;
 
@@ -173,8 +160,8 @@ const findMetaLeafChild = (
 	return result ?? null;
 };
 
-const getInstanceIDValue = (subroot: MetaSubrootInitOptions): string | null => {
-	const [, child = null] = findMetaLeafChild(subroot, INSTANCE_ID_LOCAL_NAME) ?? [];
+const getInstanceIDValue = (group: MetaGroupInitOptions): string | null => {
+	const [, child = null] = findMetaLeafChild(group, INSTANCE_ID_LOCAL_NAME) ?? [];
 
 	if (child == null) {
 		return null;
@@ -200,11 +187,11 @@ const assertStaticLeafElement: AssertStaticLeafElement = (element) => {
  * on {@link populateDeprecatedID}.
  */
 const buildMetaValueElement = (
-	subroot: MetaSubrootInitOptions,
+	group: MetaGroupInitOptions,
 	localName: string,
 	value: string
 ): StaticLeafElement => {
-	const { qualifiedName, nodeset } = subroot.parent.definition;
+	const { qualifiedName, nodeset } = group.parent.definition;
 	const { namespaceURI, prefix } = qualifiedName;
 	const { root } = new StaticDocument({
 		documentRoot: {
@@ -224,21 +211,21 @@ const buildMetaValueElement = (
 };
 
 const buildDeprecatedIDDefinition = (
-	subroot: EditModeMetaSubrootInitOptions,
+	group: EditModeMetaGroupInitOptions,
 	instanceNode: StaticLeafElement
 ): LeafNodeDefinition => {
 	const nodeset = instanceNode.nodeset;
-	const bind = subroot.model.binds.getOrCreateBindDefinition(nodeset);
+	const bind = group.model.binds.getOrCreateBindDefinition(nodeset);
 
-	return new LeafNodeDefinition(subroot.parent.definition, bind, null, instanceNode);
+	return new LeafNodeDefinition(group.parent.definition, bind, null, instanceNode);
 };
 
 const buildDeprecatedID = (
-	subroot: EditModeMetaSubrootInitOptions,
+	group: EditModeMetaGroupInitOptions,
 	value: string
 ): LeafNodeInitOptions => {
-	const instanceNode = buildMetaValueElement(subroot, DEPRECATED_ID_LOCAL_NAME, value);
-	const definition = buildDeprecatedIDDefinition(subroot, instanceNode);
+	const instanceNode = buildMetaValueElement(group, DEPRECATED_ID_LOCAL_NAME, value);
+	const definition = buildDeprecatedIDDefinition(group, instanceNode);
 
 	return {
 		childNodeset: instanceNode.nodeset,
@@ -248,11 +235,11 @@ const buildDeprecatedID = (
 };
 
 const updateDeprecatedID = (
-	subroot: EditModeMetaSubrootInitOptions,
+	group: EditModeMetaGroupInitOptions,
 	child: LeafNodeInitOptions,
 	value: string
 ): LeafNodeInitOptions => {
-	const instanceNode = buildMetaValueElement(subroot, DEPRECATED_ID_LOCAL_NAME, value);
+	const instanceNode = buildMetaValueElement(group, DEPRECATED_ID_LOCAL_NAME, value);
 
 	return {
 		childNodeset: child.childNodeset,
@@ -288,44 +275,42 @@ const replaceOrConcat = <T>(values: readonly T[], index: number | null, value: T
  * hacky normalization for `instanceID`.
  */
 const populateDeprecatedID = (
-	subroot: EditModeMetaSubrootInitOptions
-): EditModeMetaSubrootInitOptions => {
-	const value = getInstanceIDValue(subroot);
+	group: EditModeMetaGroupInitOptions
+): EditModeMetaGroupInitOptions => {
+	const value = getInstanceIDValue(group);
 
 	if (value == null) {
-		return subroot;
+		return group;
 	}
 
-	const [index, currentDeprecatedID] = findMetaLeafChild(subroot, DEPRECATED_ID_LOCAL_NAME) ?? [
-		null,
-	];
+	const [index, currentDeprecatedID] = findMetaLeafChild(group, DEPRECATED_ID_LOCAL_NAME) ?? [null];
 
 	let deprecatedID: LeafNodeInitOptions;
 
 	if (currentDeprecatedID == null) {
-		deprecatedID = buildDeprecatedID(subroot, value);
+		deprecatedID = buildDeprecatedID(group, value);
 	} else {
-		deprecatedID = updateDeprecatedID(subroot, currentDeprecatedID, value);
+		deprecatedID = updateDeprecatedID(group, currentDeprecatedID, value);
 	}
 
 	return {
-		model: subroot.model,
-		parent: subroot.parent,
-		children: replaceOrConcat(subroot.children, index, deprecatedID),
+		model: group.model,
+		parent: group.parent,
+		children: replaceOrConcat(group.children, index, deprecatedID),
 	};
 };
 
-const normalizeMetaSubroot = (subroot: MetaSubrootInitOptions): MetaSubrootInitOptions => {
-	if (isEditModeMetaSubroot(subroot)) {
-		return populateDeprecatedID(subroot);
+const normalizeMetaGroup = (group: MetaGroupInitOptions): MetaGroupInitOptions => {
+	if (isEditModeMetaGroup(group)) {
+		return populateDeprecatedID(group);
 	}
 
-	return subroot;
+	return group;
 };
 
 export const normalizeChildInitOptions = (options: ChildrenInitOptions): ChildrenInitOptions => {
-	if (isMetaSubroot(options)) {
-		return normalizeMetaSubroot(options);
+	if (isMetaGroup(options)) {
+		return normalizeMetaGroup(options);
 	}
 
 	return options;

package/src/instance/hierarchy.ts

@@ -1,3 +1,4 @@
+import type { Attribute } from './Attribute.ts';
 import type { Group } from './Group.ts';
 import type { AnyInputControl } from './InputControl.ts';
 import type { AnyModelValue } from './ModelValue.ts';
@@ -10,7 +11,6 @@ import type { RepeatRangeControlled } from './repeat/RepeatRangeControlled.ts';
 import type { RepeatRangeUncontrolled } from './repeat/RepeatRangeUncontrolled.ts';
 import type { Root } from './Root.ts';
 import type { SelectControl } from './SelectControl.ts';
-import type { Subtree } from './Subtree.ts';
 import type { TriggerControl } from './TriggerControl.ts';
 import type { UploadControl } from './UploadControl.ts';
 
@@ -22,7 +22,6 @@ export type AnyNode =
 	| PrimaryInstance
 	| Root
 	| Group
-	| Subtree
 	| RepeatRange
 	| RepeatInstance
 	| AnyNote
@@ -40,7 +39,6 @@ export type AnyParentNode =
 	| PrimaryInstance
 	| Root
 	| Group
-	| Subtree
 	| RepeatRange
 	| RepeatInstance;
 
@@ -49,7 +47,6 @@ export type GeneralParentNode =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
 	| Root
 	| Group
-	| Subtree
 	| RepeatInstance;
 
 // prettier-ignore
@@ -57,7 +54,6 @@ export type AnyChildNode =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
 	| Root
 	| Group
-	| Subtree
 	| RepeatRange
 	| RepeatInstance
 	| AnyModelValue
@@ -67,13 +63,13 @@ export type AnyChildNode =
 	| RankControl
 	| SelectControl
 	| TriggerControl
-	| UploadControl;
+	| UploadControl
+	| Attribute;
 
 // prettier-ignore
 export type GeneralChildNode =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
 	| Group
-	| Subtree
 	| RepeatRange
 	| AnyModelValue
 	| AnyNote

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

@@ -0,0 +1,34 @@
+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 { EvaluationContext } from './EvaluationContext.ts';
+
+export interface InstanceAttributeContextDocument {
+	readonly initializationMode: FormInstanceInitializationMode;
+}
+
+export type DecodeInstanceValue = (value: string) => string;
+
+interface InstanceAttributeContextDefinitionBind {
+	readonly preload: AnyBindPreloadDefinition | null;
+	readonly calculate: BindComputationExpression<'calculate'> | null;
+	readonly readonly: BindComputationExpression<'readonly'>;
+}
+
+export interface InstanceAttributeContextDefinition {
+	readonly bind: InstanceAttributeContextDefinitionBind;
+	readonly template: StaticAttribute;
+}
+
+export interface AttributeContext extends EvaluationContext {
+	readonly scope: ReactiveScope;
+	readonly rootDocument: InstanceAttributeContextDocument;
+	readonly definition: InstanceAttributeContextDefinition;
+	readonly instanceNode: StaticAttribute;
+	readonly decodeInstanceValue: DecodeInstanceValue;
+
+	isReadonly(): boolean;
+	isRelevant(): boolean;
+}

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

@@ -0,0 +1,19 @@
+import type { InstanceState } from '../../../client/serialization/InstanceState.ts';
+import type { QualifiedName } from '../../../lib/names/QualifiedName.ts';
+
+export type SerializedInstanceValue = string;
+
+interface ClientReactiveSerializableAttributeNodeCurrentState {
+	get relevant(): boolean;
+	get instanceValue(): SerializedInstanceValue;
+}
+
+interface ClientReactiveSerializableAttributeNodeDefinition {
+	readonly qualifiedName: QualifiedName;
+}
+
+export interface ClientReactiveSerializableAttributeNode {
+	readonly definition: ClientReactiveSerializableAttributeNodeDefinition;
+	readonly currentState: ClientReactiveSerializableAttributeNodeCurrentState;
+	readonly instanceState: InstanceState;
+}

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

@@ -1,5 +1,6 @@
 import type { InstanceState } from '../../../client/serialization/InstanceState.ts';
 import type { QualifiedName } from '../../../lib/names/QualifiedName.ts';
+import type { Attribute } from '../../Attribute.ts';
 
 export interface ClientReactiveSerializableChildNode {
 	readonly instanceState: InstanceState;
@@ -10,6 +11,7 @@ export interface ClientReactiveSerializableParentNodeCurrentState<
 > {
 	get relevant(): boolean;
 	get children(): readonly Child[];
+	get attributes(): readonly Attribute[];
 }
 
 export interface ClientReactiveSerializableParentNodeDefinition {