@getodk/xforms-engine 0.12.0 → 0.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getodk/xforms-engine",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "license": "Apache-2.0",
   "description": "XForms engine for ODK Web Forms",
   "type": "module",
@@ -55,6 +55,7 @@
   },
   "dependencies": {
     "bin-packer": "1.7.0",
+    "mdast-util-from-markdown": "^2.0.2",
     "papaparse": "^5.5.3",
     "solid-js": "^1.9.7",
     "temporal-polyfill": "^0.3.0"
@@ -62,7 +63,7 @@
   "devDependencies": {
     "@babel/core": "^7.28.0",
     "@getodk/tree-sitter-xpath": "0.2.0",
-    "@getodk/xpath": "0.7.0",
+    "@getodk/xpath": "0.8.1",
     "@playwright/test": "^1.53.2",
     "@types/papaparse": "^5.3.16",
     "@vitest/browser": "^3.2.4",

package/src/client/BaseItem.ts

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

package/src/client/GroupNode.ts

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

package/src/client/MarkdownNode.ts

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

package/src/client/RankNode.ts

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

package/src/client/SelectNode.ts

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

package/src/client/TextRange.ts

@@ -1,5 +1,6 @@
 import { JRResourceURL } from '@getodk/common/jr-resources/JRResourceURL.ts';
 import type { ActiveLanguage } from './FormLanguage.ts';
+import type { MarkdownNode } from './MarkdownNode.ts';
 
 /**
  * **COMMENTARY**
@@ -48,15 +49,6 @@ import type { ActiveLanguage } from './FormLanguage.ts';
  *   - `h:body//hint/@ref[not(is-translation-expr())]`
  *
  *   (See notes above for clarification of `is-translation-expr()`.)
- *
- * @todo It's unclear whether this will all become simpler or more compelex when
- * we add support for outputs in translations. In theory, the actual translation
- * `<text>` nodes map quite well to the `TextRange` concept (i.e. they are a
- * range of static and output chunks, just like labels and hints). The potential
- * for complications arise from XPath implementation details being largely
- * opaque (as in, the `jr:itext` implementation is encapsulated in the `xpath`
- * package, and the engine doesn't really deal with itext translations at the
- * node level at all).
  */
 // prettier-ignore
 export type TextChunkSource =
@@ -82,7 +74,6 @@ export interface TextChunk {
 	get language(): ActiveLanguage;
 
 	get asString(): string;
-	get formatted(): unknown;
 }
 
 // eslint-disable-next-line @typescript-eslint/sort-type-constituents
@@ -155,7 +146,7 @@ export interface TextRange<Role extends TextRole, Origin extends TextOrigin = Te
 	[Symbol.iterator](): Iterable<TextChunk>;
 
 	get asString(): string;
-	get formatted(): unknown;
+	get formatted(): MarkdownNode[];
 
 	get imageSource(): JRResourceURL | undefined;
 	get audioSource(): JRResourceURL | undefined;

package/src/client/hierarchy.ts

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

package/src/client/index.ts

@@ -24,6 +24,7 @@ export type {
 } from './hierarchy.ts';
 export type * from './identity.ts';
 export type * from './InputNode.ts';
+export type * from './MarkdownNode.ts';
 export type * from './ModelValueNode.ts';
 export type * from './NoteNode.ts';
 export type * from './OpaqueReactiveObjectFactory.ts';
@@ -41,7 +42,6 @@ export type * from './serialization/InstancePayload.ts';
 export type * from './serialization/InstancePayloadOptions.ts';
 export type * from './serialization/InstanceState.ts';
 export type * from './submission/SubmissionMeta.ts';
-export type * from './SubtreeNode.ts';
 export type * from './TextRange.ts';
 export type * from './TriggerNode.ts';
 export type * from './UploadNode.ts';

package/src/client/node-types.ts

@@ -22,5 +22,4 @@ export type InstanceNodeType =
 	| RepeatRangeNodeType
 	| 'repeat-instance'
 	| 'group'
-	| 'subtree'
 	| LeafNodeType;

package/src/instance/Group.ts

@@ -65,7 +65,7 @@ export class Group
 	) {
 		super(parent, instanceNode, definition);
 
-		this.appearances = definition.bodyElement.appearances;
+		this.appearances = definition.bodyElement?.appearances ?? null;
 
 		const childrenState = createChildrenState<Group, GeneralChildNode>(this);
 

package/src/instance/RankControl.ts

@@ -1,4 +1,4 @@
-import { XPathNodeKindKey } from '@getodk/xpath';
+import { type XPathChoiceNode, XPathNodeKindKey } from '@getodk/xpath';
 import type { Accessor } from 'solid-js';
 import { createMemo } from 'solid-js';
 import type { RankDefinition, RankItem, RankNode, RankValueOptions } from '../client/RankNode.ts';
@@ -67,7 +67,8 @@ export class RankControl
 		XFormsXPathElement,
 		EvaluationContext,
 		ValidationContext,
-		ClientReactiveSerializableValueNode
+		ClientReactiveSerializableValueNode,
+		XPathChoiceNode
 {
 	static from(
 		parent: GeneralParentNode,
@@ -205,4 +206,9 @@ export class RankControl
 		this.setValueState(valuesInOrder);
 		return this.root;
 	}
+
+	getChoiceName(value: string): string | null {
+		const option = this.mapOptionsByValue().get(value);
+		return option?.label?.asString ?? null;
+	}
 }

package/src/instance/SelectControl.ts

@@ -1,4 +1,4 @@
-import { XPathNodeKindKey } from '@getodk/xpath';
+import { type XPathChoiceNode, XPathNodeKindKey } from '@getodk/xpath';
 import type { Accessor } from 'solid-js';
 import { createMemo } from 'solid-js';
 import type {
@@ -61,7 +61,8 @@ export class SelectControl
 		XFormsXPathElement,
 		EvaluationContext,
 		ValidationContext,
-		ClientReactiveSerializableValueNode
+		ClientReactiveSerializableValueNode,
+		XPathChoiceNode
 {
 	static from(
 		parent: GeneralParentNode,
@@ -231,4 +232,9 @@ export class SelectControl
 
 		return this.root;
 	}
+
+	getChoiceName(value: string): string | null {
+		const option = this.mapOptionsByValue().get(value);
+		return option?.label?.asString ?? null;
+	}
 }

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

@@ -10,7 +10,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 +21,6 @@ export type AnyNode =
 	| PrimaryInstance
 	| Root
 	| Group
-	| Subtree
 	| RepeatRange
 	| RepeatInstance
 	| AnyNote
@@ -40,7 +38,6 @@ export type AnyParentNode =
 	| PrimaryInstance
 	| Root
 	| Group
-	| Subtree
 	| RepeatRange
 	| RepeatInstance;
 
@@ -49,7 +46,6 @@ export type GeneralParentNode =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
 	| Root
 	| Group
-	| Subtree
 	| RepeatInstance;
 
 // prettier-ignore
@@ -57,7 +53,6 @@ export type AnyChildNode =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
 	| Root
 	| Group
-	| Subtree
 	| RepeatRange
 	| RepeatInstance
 	| AnyModelValue
@@ -73,7 +68,6 @@ export type AnyChildNode =
 export type GeneralChildNode =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
 	| Group
-	| Subtree
 	| RepeatRange
 	| AnyModelValue
 	| AnyNote