@getodk/xforms-engine 0.13.0 → 0.14.0

package/src/parse/model/NodeDefinition.ts

@@ -7,10 +7,10 @@ import type { QualifiedName } from '../../lib/names/QualifiedName.ts';
 import type { AnyBodyElementDefinition } from '../body/BodyDefinition.ts';
 import type { RepeatElementDefinition } from '../body/RepeatElementDefinition.ts';
 import type { BindDefinition } from './BindDefinition.ts';
+import type { GroupDefinition } from './GroupDefinition.ts';
 import type { LeafNodeDefinition } from './LeafNodeDefinition.ts';
 import type { AnyRepeatDefinition } from './RepeatDefinition.ts';
 import type { RootDefinition } from './RootDefinition.ts';
-import type { SubtreeDefinition } from './SubtreeDefinition.ts';
 
 /**
  * Corresponds to a model instance root node, i.e.:
@@ -33,10 +33,9 @@ export type RepeatType = 'repeat';
 
 /**
  * Corresponds to a model instance subtree which **does not** correspond to a
- * <repeat> in the form definition. This will typically correspond to a <group>,
- * but this is not strictly necessary per spec (hence the distinct name).
+ * <repeat> in the form definition.
  */
-export type SubtreeNodeType = 'subtree';
+export type GroupNodeType = 'group';
 
 /**
  * Corresponds to a model instance leaf node, i.e. one of:
@@ -51,7 +50,7 @@ export type NodeDefinitionType =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
 	| RootNodeType
 	| RepeatType
-	| SubtreeNodeType
+	| GroupNodeType
 	| LeafNodeType;
 
 // prettier-ignore
@@ -59,13 +58,13 @@ export type ParentNodeDefinition =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
 	| RootDefinition
 	| AnyRepeatDefinition
-	| SubtreeDefinition;
+	| GroupDefinition;
 
 // prettier-ignore
 export type ChildNodeDefinition =
 	| AnyRepeatDefinition
-	| LeafNodeDefinition
-	| SubtreeDefinition;
+	| GroupDefinition
+	| LeafNodeDefinition;
 
 export abstract class NodeDefinition<Type extends NodeDefinitionType>
 	implements NamedSubtreeDefinition
@@ -92,5 +91,5 @@ export type AnyNodeDefinition =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
 	| RootDefinition
 	| AnyRepeatDefinition
-	| SubtreeDefinition
+	| GroupDefinition
 	| LeafNodeDefinition;

package/src/parse/model/RepeatDefinition.ts

@@ -21,9 +21,9 @@ import type { RepeatElementDefinition } from '../body/RepeatElementDefinition.ts
 import { RepeatCountControlExpression } from '../expression/RepeatCountControlExpression.ts';
 import type { BindDefinition } from './BindDefinition.ts';
 import { DescendentNodeDefinition } from './DescendentNodeDefinition.ts';
+import type { GroupDefinition } from './GroupDefinition.ts';
 import type { ChildNodeDefinition, ParentNodeDefinition } from './NodeDefinition.ts';
 import type { RootDefinition } from './RootDefinition.ts';
-import type { SubtreeDefinition } from './SubtreeDefinition.ts';
 
 interface JavaRosaNamespaceURI extends NamespaceURL {
 	readonly href: JAVAROSA_NAMESPACE_URI;
@@ -284,7 +284,7 @@ export interface UncontrolledRepeatDefinition extends RepeatDefinition {
  * "repeat", as defined by a form, where those concepts include:
  *
  * - A {@link RepeatElementDefinition}—corresponding to a `<repeat>` {@link https://getodk.github.io/xforms-spec/#body-elements | body element}—which is associated with the nodeset referencing the "repeat template" and
- *   all "repeat instances" (see below points describing both concepts in more detail). The presence of such a body element determines whether to produce a repeat definition (rather than e.g. a {@link SubtreeDefinition}).
+ *   all "repeat instances" (see below points describing both concepts in more detail). The presence of such a body element determines whether to produce a repeat definition (rather than e.g. a {@link GroupDefinition}).
  *
  * - A "repeat template", defined by a form either
  *   explicitly,

package/src/parse/model/RootDefinition.ts

@@ -3,6 +3,7 @@ import { NamespaceDeclarationMap } from '../../lib/names/NamespaceDeclarationMap
 import { QualifiedName } from '../../lib/names/QualifiedName.ts';
 import type { BodyClassList } from '../body/BodyDefinition.ts';
 import type { XFormDefinition } from '../XFormDefinition.ts';
+import { GroupDefinition } from './GroupDefinition.ts';
 import { LeafNodeDefinition } from './LeafNodeDefinition.ts';
 import type { ModelDefinition } from './ModelDefinition.ts';
 import type { ChildNodeDefinition, ParentNodeDefinition } from './NodeDefinition.ts';
@@ -12,7 +13,6 @@ import { RangeNodeDefinition } from './RangeNodeDefinition.ts';
 import { RepeatDefinition } from './RepeatDefinition.ts';
 import { RootAttributeMap } from './RootAttributeMap.ts';
 import type { SubmissionDefinition } from './SubmissionDefinition.ts';
-import { SubtreeDefinition } from './SubtreeDefinition.ts';
 
 export class RootDefinition extends NodeDefinition<'root'> {
 	readonly type = 'root';
@@ -107,7 +107,7 @@ export class RootDefinition extends NodeDefinition<'root'> {
 				);
 			}
 
-			return new SubtreeDefinition(parent, bind, bodyElement, element);
+			return new GroupDefinition(parent, bind, bodyElement, element);
 		});
 	}
 

package/src/parse/text/LabelDefinition.ts

@@ -1,16 +1,15 @@
 import type { LocalNamedElement } from '@getodk/common/types/dom.ts';
 import { getLabelElement, getRepeatGroupLabelElement } from '../../lib/dom/query.ts';
 import type { XFormDefinition } from '../../parse/XFormDefinition.ts';
-import type { AnyGroupElementDefinition } from '../../parse/body/BodyDefinition.ts';
-import type { RepeatElementDefinition } from '../body/RepeatElementDefinition.ts';
 import type { AnyControlDefinition } from '../body/control/ControlDefinition.ts';
-import type { BaseGroupDefinition } from '../body/group/BaseGroupDefinition.ts';
+import type { GroupElementDefinition } from '../body/GroupElementDefinition.ts';
+import type { RepeatElementDefinition } from '../body/RepeatElementDefinition.ts';
 import { TextElementDefinition } from './abstract/TextElementDefinition.ts';
 
 // prettier-ignore
 export type LabelOwner =
 	| AnyControlDefinition
-	| AnyGroupElementDefinition
+	| GroupElementDefinition
 	| RepeatElementDefinition;
 
 interface LabelElement extends LocalNamedElement<'label'> {}
@@ -39,11 +38,7 @@ export class LabelDefinition extends TextElementDefinition<'label'> {
 		return new this(form, repeat, repeatGroupLabel);
 	}
 
-	static forGroup(
-		form: XFormDefinition,
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		group: BaseGroupDefinition<any>
-	): LabelDefinition | null {
+	static forGroup(form: XFormDefinition, group: GroupElementDefinition): LabelDefinition | null {
 		const labelElement = getLabelElement(group.element);
 
 		if (labelElement == null) {

package/dist/client/SubtreeNode.d.ts

@@ -1,56 +0,0 @@
-import { SubtreeDefinition as BaseSubtreeDefinition } from '../parse/model/SubtreeDefinition.ts';
-import { BaseNode, BaseNodeState } from './BaseNode.ts';
-import { RootNode } from './RootNode.ts';
-import { GeneralChildNode, GeneralParentNode } from './hierarchy.ts';
-import { AncestorNodeValidationState } from './validation.ts';
-export interface SubtreeNodeState extends BaseNodeState {
-    get label(): null;
-    get hint(): null;
-    get children(): readonly GeneralChildNode[];
-    get valueOptions(): null;
-    get value(): null;
-}
-export interface SubtreeDefinition extends BaseSubtreeDefinition {
-    readonly bodyElement: null;
-}
-/**
- * A non-root node which has children, but **no** corresponding XForms
- * `<group>`. A subtree node does not have any direct implications for
- * presentation to users, but its descendants may specify presentational details
- * in their own {@link BaseNode.definition | definition}s.
- *
- * @example
- *
- * A common `SubtreeNode` case will be a form's `<meta>` element:
- *
- * ```xml
- * <!-- /h:html/h:head/model -->
- * <instance>
- *   <data>
- *     <some-group>
- *       <some-field />
- *     </some-group>
- *     <!-- Note that `meta` does not have a corresponding group body element -->
- *     <!-- SubtreeNode(/data/meta): { ... -->
- *     <meta>
- *       <instanceID/>
- *     </meta>
- *     <!-- } -->
- *   </data>
- * </instance>
- * <!-- /h:html/h:body -->
- * <group ref="/data/some-group">
- *   <input ref="/data/some-group/some-field" />
- * </group>
- * ```
- */
-export interface SubtreeNode extends BaseNode {
-    readonly nodeType: 'subtree';
-    readonly appearances: null;
-    readonly nodeOptions: null;
-    readonly definition: SubtreeDefinition;
-    readonly root: RootNode;
-    readonly parent: GeneralParentNode;
-    readonly currentState: SubtreeNodeState;
-    readonly validationState: AncestorNodeValidationState;
-}

package/dist/instance/Subtree.d.ts

@@ -1,38 +0,0 @@
-import { XPathNodeKindKey } from '@getodk/xpath';
-import { Accessor } from 'solid-js';
-import { FormNodeID } from '../client/identity.ts';
-import { InstanceState } from '../client/serialization/InstanceState.ts';
-import { SubtreeDefinition, SubtreeNode } from '../client/SubtreeNode.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 { MaterializedChildren } from '../lib/reactivity/materializeCurrentStateChildren.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 { DescendantNodeSharedStateSpec, DescendantNode } from './abstract/DescendantNode.ts';
-import { GeneralChildNode, GeneralParentNode } from './hierarchy.ts';
-import { EvaluationContext } from './internal-api/EvaluationContext.ts';
-import { ClientReactiveSerializableParentNode } from './internal-api/serialization/ClientReactiveSerializableParentNode.ts';
-interface SubtreeStateSpec extends DescendantNodeSharedStateSpec {
-    readonly label: null;
-    readonly hint: null;
-    readonly children: Accessor<readonly FormNodeID[]>;
-    readonly valueOptions: null;
-    readonly value: null;
-}
-export declare class Subtree extends DescendantNode<SubtreeDefinition, SubtreeStateSpec, GeneralParentNode, GeneralChildNode> implements SubtreeNode, XFormsXPathElement, EvaluationContext, ClientReactiveSerializableParentNode<GeneralChildNode> {
-    private readonly childrenState;
-    readonly [XPathNodeKindKey] = "element";
-    protected readonly state: SharedNodeState<SubtreeStateSpec>;
-    protected readonly engineState: EngineState<SubtreeStateSpec>;
-    readonly nodeType = "subtree";
-    readonly appearances: null;
-    readonly nodeOptions: null;
-    readonly currentState: MaterializedChildren<CurrentState<SubtreeStateSpec>, GeneralChildNode>;
-    readonly validationState: AncestorNodeValidationState;
-    readonly instanceState: InstanceState;
-    constructor(parent: GeneralParentNode, instanceNode: StaticElement | null, definition: SubtreeDefinition);
-    getChildren(): readonly GeneralChildNode[];
-}
-export {};

package/dist/instance/text/FormattedTextStub.d.ts

@@ -1 +0,0 @@
-export declare const FormattedTextStub: Record<PropertyKey, unknown>;

package/dist/parse/body/group/BaseGroupDefinition.d.ts

@@ -1,40 +0,0 @@
-import { LabelDefinition } from '../../text/LabelDefinition.ts';
-import { XFormDefinition } from '../../XFormDefinition.ts';
-import { StructureElementAppearanceDefinition } from '../appearance/structureElementAppearanceParser.ts';
-import { BodyElementDefinitionArray, BodyElementParentContext } from '../BodyDefinition.ts';
-import { BodyElementDefinition } from '../BodyElementDefinition.ts';
-/**
- * These type names are derived from **and expand upon** the language used in
- * the ODK XForms spec to describe various group usage. Whereas the spec
- * language allows for a group to be described as more than one case, the intent
- * here is to establish exclusive naming which may or may not compound. As such:
- *
- * - `logical-group`, per spec language, is a group with a `ref`; its usage here
- *   differs from the spec language in that it _may_ have a `<label>` child but
- *   is not also treated as a `presentation-group` (which is only used for
- *   groups which do not have a `ref`)
- * - `presentation-group` is a group with a `<label>` child; its usage here
- *   differs from the spec language in that `presentation-group` does **not**
- *   have a `ref`
- * - `structural-group` is any `<group>` element which does not satisfy any of
- *   the other usage scenarios; this isn't exactly the terminology used, but is
- *   the most closely fitting name for the concept where the other sceanarios
- *   do not apply
- *
- * A more succinct decision tree:
- *
- * - `<group ref="$ref">` -> `logical-group`, else
- * - `<group><label>` -> `presentation-group`, else
- * - `<group>` -> `structural-group`
- */
-export type GroupType = 'logical-group' | 'presentation-group' | 'structural-group';
-export declare abstract class BaseGroupDefinition<Type extends GroupType> extends BodyElementDefinition<Type> {
-    private static groupTypes;
-    protected static getGroupType(localName: string, element: Element): GroupType | null;
-    readonly category = "structure";
-    readonly children: BodyElementDefinitionArray;
-    readonly reference: string | null;
-    readonly appearances: StructureElementAppearanceDefinition;
-    readonly label: LabelDefinition | null;
-    constructor(form: XFormDefinition, parent: BodyElementParentContext, element: Element);
-}

package/dist/parse/body/group/LogicalGroupDefinition.d.ts

@@ -1,6 +0,0 @@
-import { BaseGroupDefinition } from './BaseGroupDefinition.ts';
-export declare class LogicalGroupDefinition extends BaseGroupDefinition<'logical-group'> {
-    static isCompatible(localName: string, element: Element): boolean;
-    readonly type = "logical-group";
-}
-export type LogicalGroupDefinitionClass = typeof LogicalGroupDefinition;

package/dist/parse/body/group/PresentationGroupDefinition.d.ts

@@ -1,11 +0,0 @@
-import { LabelDefinition } from '../../text/LabelDefinition.ts';
-import { XFormDefinition } from '../../XFormDefinition.ts';
-import { BodyElementParentContext } from '../BodyDefinition.ts';
-import { BaseGroupDefinition } from './BaseGroupDefinition.ts';
-export declare class PresentationGroupDefinition extends BaseGroupDefinition<'presentation-group'> {
-    static isCompatible(localName: string, element: Element): boolean;
-    readonly type = "presentation-group";
-    readonly label: LabelDefinition;
-    constructor(form: XFormDefinition, parent: BodyElementParentContext, element: Element);
-}
-export type PresentationGroupDefinitionClass = typeof PresentationGroupDefinition;

package/dist/parse/body/group/StructuralGroupDefinition.d.ts

@@ -1,6 +0,0 @@
-import { BaseGroupDefinition } from './BaseGroupDefinition.ts';
-export declare class StructuralGroupDefinition extends BaseGroupDefinition<'structural-group'> {
-    static isCompatible(localName: string, element: Element): boolean;
-    readonly type = "structural-group";
-}
-export type StructuralGroupDefinitionClass = typeof StructuralGroupDefinition;

package/src/client/SubtreeNode.ts

@@ -1,61 +0,0 @@
-import type { SubtreeDefinition as BaseSubtreeDefinition } from '../parse/model/SubtreeDefinition.ts';
-import type { BaseNode, BaseNodeState } from './BaseNode.ts';
-import type { RootNode } from './RootNode.ts';
-import type { GeneralChildNode, GeneralParentNode } from './hierarchy.ts';
-import type { AncestorNodeValidationState } from './validation.ts';
-
-export interface SubtreeNodeState extends BaseNodeState {
-	get label(): null;
-	get hint(): null;
-	get children(): readonly GeneralChildNode[];
-	get valueOptions(): null;
-	get value(): null;
-}
-
-// TODO: obviously there is a naming inconsistency emerging here.
-export interface SubtreeDefinition extends BaseSubtreeDefinition {
-	readonly bodyElement: null;
-}
-
-/**
- * A non-root node which has children, but **no** corresponding XForms
- * `<group>`. A subtree node does not have any direct implications for
- * presentation to users, but its descendants may specify presentational details
- * in their own {@link BaseNode.definition | definition}s.
- *
- * @example
- *
- * A common `SubtreeNode` case will be a form's `<meta>` element:
- *
- * ```xml
- * <!-- /h:html/h:head/model -->
- * <instance>
- *   <data>
- *     <some-group>
- *       <some-field />
- *     </some-group>
- *     <!-- Note that `meta` does not have a corresponding group body element -->
- *     <!-- SubtreeNode(/data/meta): { ... -->
- *     <meta>
- *       <instanceID/>
- *     </meta>
- *     <!-- } -->
- *   </data>
- * </instance>
- * <!-- /h:html/h:body -->
- * <group ref="/data/some-group">
- *   <input ref="/data/some-group/some-field" />
- * </group>
- * ```
- */
-// TODO: directly test presentation of non-group subtree children/descendants
-export interface SubtreeNode extends BaseNode {
-	readonly nodeType: 'subtree';
-	readonly appearances: null;
-	readonly nodeOptions: null;
-	readonly definition: SubtreeDefinition;
-	readonly root: RootNode;
-	readonly parent: GeneralParentNode;
-	readonly currentState: SubtreeNodeState;
-	readonly validationState: AncestorNodeValidationState;
-}

package/src/instance/Subtree.ts

@@ -1,102 +0,0 @@
-import { XPathNodeKindKey } from '@getodk/xpath';
-import type { Accessor } from 'solid-js';
-import type { FormNodeID } from '../client/identity.ts';
-import type { InstanceState } from '../client/serialization/InstanceState.ts';
-import type { SubtreeDefinition, SubtreeNode } from '../client/SubtreeNode.ts';
-import type { AncestorNodeValidationState } from '../client/validation.ts';
-import type { XFormsXPathElement } from '../integration/xpath/adapter/XFormsXPathNode.ts';
-import type { StaticElement } from '../integration/xpath/static-dom/StaticElement.ts';
-import { createParentNodeInstanceState } from '../lib/client-reactivity/instance-state/createParentNodeInstanceState.ts';
-import type { ChildrenState } from '../lib/reactivity/createChildrenState.ts';
-import { createChildrenState } from '../lib/reactivity/createChildrenState.ts';
-import type { MaterializedChildren } from '../lib/reactivity/materializeCurrentStateChildren.ts';
-import { materializeCurrentStateChildren } from '../lib/reactivity/materializeCurrentStateChildren.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 { createAggregatedViolations } from '../lib/reactivity/validation/createAggregatedViolations.ts';
-import type { DescendantNodeSharedStateSpec } from './abstract/DescendantNode.ts';
-import { DescendantNode } from './abstract/DescendantNode.ts';
-import { buildChildren } from './children/buildChildren.ts';
-import type { GeneralChildNode, GeneralParentNode } from './hierarchy.ts';
-import type { EvaluationContext } from './internal-api/EvaluationContext.ts';
-import type { ClientReactiveSerializableParentNode } from './internal-api/serialization/ClientReactiveSerializableParentNode.ts';
-
-interface SubtreeStateSpec extends DescendantNodeSharedStateSpec {
-	readonly label: null;
-	readonly hint: null;
-	readonly children: Accessor<readonly FormNodeID[]>;
-	readonly valueOptions: null;
-	readonly value: null;
-}
-
-export class Subtree
-	extends DescendantNode<SubtreeDefinition, SubtreeStateSpec, GeneralParentNode, GeneralChildNode>
-	implements
-		SubtreeNode,
-		XFormsXPathElement,
-		EvaluationContext,
-		ClientReactiveSerializableParentNode<GeneralChildNode>
-{
-	private readonly childrenState: ChildrenState<GeneralChildNode>;
-
-	override readonly [XPathNodeKindKey] = 'element';
-
-	// InstanceNode
-	protected readonly state: SharedNodeState<SubtreeStateSpec>;
-	protected readonly engineState: EngineState<SubtreeStateSpec>;
-
-	// SubtreeNode
-	readonly nodeType = 'subtree';
-	readonly appearances = null;
-	readonly nodeOptions = null;
-	readonly currentState: MaterializedChildren<CurrentState<SubtreeStateSpec>, GeneralChildNode>;
-	readonly validationState: AncestorNodeValidationState;
-	readonly instanceState: InstanceState;
-
-	constructor(
-		parent: GeneralParentNode,
-		instanceNode: StaticElement | null,
-		definition: SubtreeDefinition
-	) {
-		super(parent, instanceNode, definition);
-
-		const childrenState = createChildrenState<Subtree, GeneralChildNode>(this);
-
-		this.childrenState = childrenState;
-
-		const state = createSharedNodeState(
-			this.scope,
-			{
-				reference: this.contextReference,
-				readonly: this.isReadonly,
-				relevant: this.isRelevant,
-				required: this.isRequired,
-
-				label: null,
-				hint: null,
-				children: childrenState.childIds,
-				valueOptions: null,
-				value: null,
-			},
-			this.instanceConfig
-		);
-
-		this.state = state;
-		this.engineState = state.engineState;
-		this.currentState = materializeCurrentStateChildren(
-			this.scope,
-			state.currentState,
-			childrenState
-		);
-
-		childrenState.setChildren(buildChildren(this));
-		this.validationState = createAggregatedViolations(this, this.instanceConfig);
-		this.instanceState = createParentNodeInstanceState(this);
-	}
-
-	getChildren(): readonly GeneralChildNode[] {
-		return this.childrenState.getChildren();
-	}
-}

package/src/instance/text/FormattedTextStub.ts

@@ -1,8 +0,0 @@
-export const FormattedTextStub = new Proxy({} as Record<PropertyKey, unknown>, {
-	get() {
-		throw new TypeError('Not implemented');
-	},
-	set() {
-		return false;
-	},
-});

package/src/parse/body/group/BaseGroupDefinition.ts

@@ -1,89 +0,0 @@
-import { UpsertableMap } from '@getodk/common/lib/collections/UpsertableMap.ts';
-import { getLabelElement } from '../../../lib/dom/query.ts';
-import { LabelDefinition } from '../../text/LabelDefinition.ts';
-import type { XFormDefinition } from '../../XFormDefinition.ts';
-import { parseNodesetReference } from '../../xpath/reference-parsing.ts';
-import type { StructureElementAppearanceDefinition } from '../appearance/structureElementAppearanceParser.ts';
-import { structureElementAppearanceParser } from '../appearance/structureElementAppearanceParser.ts';
-import {
-	type BodyElementDefinitionArray,
-	type BodyElementParentContext,
-} from '../BodyDefinition.ts';
-import { BodyElementDefinition } from '../BodyElementDefinition.ts';
-
-/**
- * These type names are derived from **and expand upon** the language used in
- * the ODK XForms spec to describe various group usage. Whereas the spec
- * language allows for a group to be described as more than one case, the intent
- * here is to establish exclusive naming which may or may not compound. As such:
- *
- * - `logical-group`, per spec language, is a group with a `ref`; its usage here
- *   differs from the spec language in that it _may_ have a `<label>` child but
- *   is not also treated as a `presentation-group` (which is only used for
- *   groups which do not have a `ref`)
- * - `presentation-group` is a group with a `<label>` child; its usage here
- *   differs from the spec language in that `presentation-group` does **not**
- *   have a `ref`
- * - `structural-group` is any `<group>` element which does not satisfy any of
- *   the other usage scenarios; this isn't exactly the terminology used, but is
- *   the most closely fitting name for the concept where the other sceanarios
- *   do not apply
- *
- * A more succinct decision tree:
- *
- * - `<group ref="$ref">` -> `logical-group`, else
- * - `<group><label>` -> `presentation-group`, else
- * - `<group>` -> `structural-group`
- */
-export type GroupType = 'logical-group' | 'presentation-group' | 'structural-group';
-
-export abstract class BaseGroupDefinition<
-	Type extends GroupType,
-> extends BodyElementDefinition<Type> {
-	// TODO: does this really accomplish anything? It seems highly unlikely it
-	// has enough performance benefit to outweigh its memory and lookup costs.
-	private static groupTypes = new UpsertableMap<Element, GroupType | null>();
-
-	protected static getGroupType(localName: string, element: Element): GroupType | null {
-		return this.groupTypes.upsert(element, () => {
-			if (localName !== 'group') {
-				return null;
-			}
-
-			if (element.hasAttribute('ref')) {
-				return 'logical-group';
-			}
-
-			const label = getLabelElement(element);
-
-			if (label == null) {
-				return 'structural-group';
-			}
-
-			return 'presentation-group';
-		});
-	}
-
-	override readonly category = 'structure';
-
-	readonly children: BodyElementDefinitionArray;
-
-	override readonly reference: string | null;
-	readonly appearances: StructureElementAppearanceDefinition;
-	override readonly label: LabelDefinition | null;
-
-	constructor(form: XFormDefinition, parent: BodyElementParentContext, element: Element) {
-		super(form, parent, element);
-
-		const childElements = Array.from(element.children).filter((child) => {
-			const childName = child.localName;
-
-			return childName !== 'label';
-		});
-
-		this.children = this.body.getChildElementDefinitions(form, this, element, childElements);
-		this.reference = parseNodesetReference(parent, element, 'ref');
-		this.appearances = structureElementAppearanceParser.parseFrom(element, 'appearance');
-		this.label = LabelDefinition.forGroup(form, this);
-	}
-}

package/src/parse/body/group/LogicalGroupDefinition.ts

@@ -1,11 +0,0 @@
-import { BaseGroupDefinition } from './BaseGroupDefinition.ts';
-
-export class LogicalGroupDefinition extends BaseGroupDefinition<'logical-group'> {
-	static override isCompatible(localName: string, element: Element): boolean {
-		return this.getGroupType(localName, element) === 'logical-group';
-	}
-
-	readonly type = 'logical-group';
-}
-
-export type LogicalGroupDefinitionClass = typeof LogicalGroupDefinition;

package/src/parse/body/group/PresentationGroupDefinition.ts

@@ -1,28 +0,0 @@
-import { LabelDefinition } from '../../text/LabelDefinition.ts';
-import type { XFormDefinition } from '../../XFormDefinition.ts';
-import type { BodyElementParentContext } from '../BodyDefinition.ts';
-import { BaseGroupDefinition } from './BaseGroupDefinition.ts';
-
-export class PresentationGroupDefinition extends BaseGroupDefinition<'presentation-group'> {
-	static override isCompatible(localName: string, element: Element): boolean {
-		return this.getGroupType(localName, element) === 'presentation-group';
-	}
-
-	readonly type = 'presentation-group';
-
-	override readonly label: LabelDefinition;
-
-	constructor(form: XFormDefinition, parent: BodyElementParentContext, element: Element) {
-		super(form, parent, element);
-
-		const label = LabelDefinition.forGroup(form, this);
-
-		if (label == null) {
-			throw new Error('Invalid presentation-group: missing label');
-		}
-
-		this.label = label;
-	}
-}
-
-export type PresentationGroupDefinitionClass = typeof PresentationGroupDefinition;

package/src/parse/body/group/StructuralGroupDefinition.ts

@@ -1,11 +0,0 @@
-import { BaseGroupDefinition } from './BaseGroupDefinition.ts';
-
-export class StructuralGroupDefinition extends BaseGroupDefinition<'structural-group'> {
-	static override isCompatible(localName: string, element: Element): boolean {
-		return this.getGroupType(localName, element) === 'structural-group';
-	}
-
-	readonly type = 'structural-group';
-}
-
-export type StructuralGroupDefinitionClass = typeof StructuralGroupDefinition;