@getodk/xforms-engine 0.3.0 → 0.4.0

package/src/lib/dom/query.ts

@@ -3,7 +3,7 @@ import type {
 	KnownAttributeLocalNamedElement,
 	LocalNamedElement,
 } from '@getodk/common/types/dom.ts';
-import type { SelectElement } from '../../body/control/select/SelectDefinition';
+import type { SelectElement } from '../../parse/body/control/select/SelectDefinition';
 
 const hintLookup = new ScopedElementLookup(':scope > hint', 'hint');
 const itemLookup = new ScopedElementLookup(':scope > item', 'item');

package/src/lib/reactivity/createComputedExpression.ts

@@ -2,12 +2,12 @@ import { UnreachableError } from '@getodk/common/lib/error/UnreachableError.ts';
 import type { XFormsXPathEvaluator } from '@getodk/xpath';
 import type { Accessor } from 'solid-js';
 import { createMemo } from 'solid-js';
+import type { EvaluationContext } from '../../instance/internal-api/EvaluationContext.ts';
+import type { SubscribableDependency } from '../../instance/internal-api/SubscribableDependency.ts';
 import type {
 	DependentExpression,
 	DependentExpressionResultType,
-} from '../../expression/DependentExpression.ts';
-import type { EvaluationContext } from '../../instance/internal-api/EvaluationContext.ts';
-import type { SubscribableDependency } from '../../instance/internal-api/SubscribableDependency.ts';
+} from '../../parse/expression/abstract/DependentExpression.ts';
 import { isConstantExpression } from '../../parse/xpath/semantic-analysis.ts';
 
 interface ComputedExpressionResults {

package/src/lib/reactivity/createNoteReadonlyThunk.ts

@@ -1,11 +1,11 @@
 import type { Accessor } from 'solid-js';
 import type { EvaluationContext } from '../../instance/internal-api/EvaluationContext.ts';
-import type { BindComputation } from '../../model/BindComputation.ts';
+import type { BindComputationExpression } from '../../parse/expression/BindComputationExpression.ts';
 import { createComputedExpression } from './createComputedExpression.ts';
 
 export const createNoteReadonlyThunk = (
 	context: EvaluationContext,
-	readonlyDefinition: BindComputation<'readonly'>
+	readonlyDefinition: BindComputationExpression<'readonly'>
 ): Accessor<true> => {
 	if (!readonlyDefinition.isConstantTruthyExpression()) {
 		throw new Error('Expected a static readonly expression');

package/src/lib/reactivity/createSelectItems.ts

@@ -2,8 +2,6 @@ import { UpsertableMap } from '@getodk/common/lib/collections/UpsertableMap.ts';
 import type { XFormsXPathEvaluator } from '@getodk/xpath';
 import type { Accessor } from 'solid-js';
 import { createMemo } from 'solid-js';
-import type { ItemDefinition } from '../../body/control/select/ItemDefinition.ts';
-import type { ItemsetDefinition } from '../../body/control/select/ItemsetDefinition.ts';
 import type { TextRange as ClientTextRange } from '../../client/TextRange.ts';
 import type { SelectItem } from '../../index.ts';
 import type { SelectField } from '../../instance/SelectField.ts';
@@ -14,6 +12,8 @@ import type {
 import type { SubscribableDependency } from '../../instance/internal-api/SubscribableDependency.ts';
 import { TextChunk } from '../../instance/text/TextChunk.ts';
 import { TextRange } from '../../instance/text/TextRange.ts';
+import type { ItemDefinition } from '../../parse/body/control/select/ItemDefinition.ts';
+import type { ItemsetDefinition } from '../../parse/body/control/select/ItemsetDefinition.ts';
 import { createComputedExpression } from './createComputedExpression.ts';
 import type { ReactiveScope } from './scope.ts';
 import { createTextRange } from './text/createTextRange.ts';
@@ -21,7 +21,7 @@ import { createTextRange } from './text/createTextRange.ts';
 type DerivedItemLabel = ClientTextRange<'item-label', 'form-derived'>;
 
 const derivedItemLabel = (context: EvaluationContext, value: string): DerivedItemLabel => {
-	const chunk = new TextChunk(context.root, 'static', value);
+	const chunk = new TextChunk(context.root, 'literal', value);
 
 	return new TextRange('form-derived', 'item-label', [chunk]);
 };

package/src/lib/reactivity/createValueState.ts

@@ -1,8 +1,8 @@
 import { createComputed, createMemo, createSignal, untrack } from 'solid-js';
-import type { DependentExpression } from '../../expression/DependentExpression.ts';
 import type { SubscribableDependency } from '../../instance/internal-api/SubscribableDependency.ts';
 import type { ValueContext } from '../../instance/internal-api/ValueContext.ts';
-import type { BindComputation } from '../../model/BindComputation.ts';
+import type { BindComputationExpression } from '../../parse/expression/BindComputationExpression.ts';
+import type { DependentExpression } from '../../parse/expression/abstract/DependentExpression.ts';
 import { createComputedExpression } from './createComputedExpression.ts';
 import type { SimpleAtomicState, SimpleAtomicStateSetter } from './types.ts';
 
@@ -209,7 +209,7 @@ const guardDownstreamReadonlyWrites = <RuntimeValue>(
 const createCalculation = <RuntimeValue>(
 	context: ValueContext<RuntimeValue>,
 	setValue: SimpleAtomicStateSetter<RuntimeValue>,
-	calculateDefinition: BindComputation<'calculate'>
+	calculateDefinition: BindComputationExpression<'calculate'>
 ): void => {
 	context.scope.runTask(() => {
 		const calculate = createComputedExpression(context, calculateDefinition);

package/src/lib/reactivity/node-state/createSpecifiedState.ts

@@ -80,7 +80,7 @@ export type ComputedPropertySpec<T> = Accessor<T>;
 /**
  * @see {@link StaticPropertySpec}
  */
-// eslint-disable-next-line @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type, @typescript-eslint/no-explicit-any
 type NonStaticValue = Function | Signal<any> | SimpleAtomicState<any>;
 
 /**

package/src/lib/reactivity/text/createFieldHint.ts

@@ -1,7 +1,7 @@
 import { type Accessor } from 'solid-js';
 import type { TextRange } from '../../../client/TextRange.ts';
 import type { EvaluationContext } from '../../../instance/internal-api/EvaluationContext.ts';
-import type { LeafNodeDefinition } from '../../../model/LeafNodeDefinition.ts';
+import type { LeafNodeDefinition } from '../../../parse/model/LeafNodeDefinition.ts';
 import { createTextRange } from './createTextRange.ts';
 
 export const createFieldHint = (

package/src/lib/reactivity/text/createNodeLabel.ts

@@ -1,7 +1,7 @@
 import { type Accessor } from 'solid-js';
 import type { TextRange } from '../../../client/TextRange.ts';
 import type { EvaluationContext } from '../../../instance/internal-api/EvaluationContext.ts';
-import type { AnyNodeDefinition } from '../../../model/NodeDefinition.ts';
+import type { AnyNodeDefinition } from '../../../parse/model/NodeDefinition.ts';
 import { createTextRange } from './createTextRange.ts';
 
 export const createNodeLabel = (

package/src/lib/reactivity/text/createNoteText.ts

@@ -2,7 +2,7 @@ import { UnreachableError } from '@getodk/common/lib/error/UnreachableError.ts';
 import type { Accessor } from 'solid-js';
 import type { TextRange } from '../../../client/TextRange.ts';
 import type { EvaluationContext } from '../../../instance/internal-api/EvaluationContext.ts';
-import type { NoteTextDefinition } from '../../../parse/NoteNodeDefinition.ts';
+import type { NoteTextDefinition } from '../../../parse/model/NoteNodeDefinition.ts';
 import { createTextRange } from './createTextRange.ts';
 
 // eslint-disable-next-line @typescript-eslint/sort-type-constituents

package/src/lib/reactivity/text/createTextRange.ts

@@ -4,7 +4,7 @@ import type { TextChunkSource, TextRole } from '../../../client/TextRange.ts';
 import type { EvaluationContext } from '../../../instance/internal-api/EvaluationContext.ts';
 import { TextChunk } from '../../../instance/text/TextChunk.ts';
 import { TextRange } from '../../../instance/text/TextRange.ts';
-import type { AnyTextChunkDefinition } from '../../../parse/text/abstract/TextChunkDefinition.ts';
+import type { AnyTextChunkExpression } from '../../../parse/expression/abstract/TextChunkExpression.ts';
 import type { TextRangeDefinition } from '../../../parse/text/abstract/TextRangeDefinition.ts';
 import { createComputedExpression } from '../createComputedExpression.ts';
 
@@ -15,11 +15,11 @@ interface TextChunkComputation {
 
 const createComputedTextChunk = (
 	context: EvaluationContext,
-	textSource: AnyTextChunkDefinition
+	textSource: AnyTextChunkExpression
 ): TextChunkComputation => {
 	const { source } = textSource;
 
-	if (source === 'static') {
+	if (source === 'literal') {
 		const { stringValue } = textSource;
 
 		return {
@@ -40,7 +40,7 @@ const createComputedTextChunk = (
 
 const createTextChunks = (
 	context: EvaluationContext,
-	textSources: readonly AnyTextChunkDefinition[]
+	textSources: readonly AnyTextChunkExpression[]
 ): Accessor<readonly TextChunk[]> => {
 	return context.scope.runTask(() => {
 		const { root } = context;

package/src/lib/reactivity/validation/createAggregatedViolations.ts

@@ -4,10 +4,11 @@ import type {
 	AncestorNodeValidationState,
 	DescendantNodeViolationReference,
 } from '../../../client/validation.ts';
-import type { AnyParentNode, AnyValueNode } from '../../../instance/hierarchy.ts';
+import type { AnyParentNode } from '../../../instance/hierarchy.ts';
+import type { ValidationContext } from '../../../instance/internal-api/ValidationContext.ts';
 import { createSharedNodeState } from '../node-state/createSharedNodeState.ts';
 
-const violationReference = (node: AnyValueNode): DescendantNodeViolationReference | null => {
+const violationReference = (node: ValidationContext): DescendantNodeViolationReference | null => {
 	const violation = node.getViolation();
 
 	if (violation == null) {
@@ -33,7 +34,11 @@ const collectViolationReferences = (
 			case 'model-value':
 			case 'note':
 			case 'string':
-			case 'select': {
+			case 'select':
+			case 'range':
+			case 'rank':
+			case 'trigger':
+			case 'upload': {
 				const reference = violationReference(child);
 
 				if (reference == null) {

package/src/lib/reactivity/validation/createValidation.ts

@@ -33,7 +33,7 @@ const engineViolationMessage = <Role extends ValidationTextRole>(
 	role: Role
 ): Accessor<EngineViolationMessage<Role>> => {
 	const messageText = VALIDATION_TEXT[role];
-	const chunk = new TextChunk(context.root, 'static', messageText);
+	const chunk = new TextChunk(context.root, 'literal', messageText);
 	const message = new TextRange('engine', role, [chunk]);
 
 	return () => message;

package/src/{XFormDataType.ts → parse/XFormDataType.ts}

@@ -10,9 +10,7 @@ export type UnsupportedDataType = typeof UNSUPPORTED_DATA_TYPE;
 /**
  * Like JavaRosa. Presumably for e.g. groups with explicit binds (`relevant` etc)?
  */
-const NULL_DATA_TYPE = 'NULL';
-
-export type NullDataType = typeof NULL_DATA_TYPE;
+export type NullDataType = 'NULL';
 
 /**
  * As in ODK XForms Spec.

package/src/{XFormDefinition.ts → parse/XFormDefinition.ts}

@@ -1,6 +1,6 @@
-import { XFormDOM } from './XFormDOM.ts';
-import { BodyDefinition } from './body/BodyDefinition.ts';
+import { BodyDefinition } from '../parse/body/BodyDefinition.ts';
 import { ModelDefinition } from './model/ModelDefinition.ts';
+import { XFormDOM } from './XFormDOM.ts';
 
 export class XFormDefinition {
 	readonly xformDOM: XFormDOM;

package/src/{body → parse/body}/BodyDefinition.ts

@@ -1,18 +1,23 @@
-import type { XFormDefinition } from '../XFormDefinition.ts';
-import { DependencyContext } from '../expression/DependencyContext.ts';
-import type { ParsedTokenList } from '../lib/TokenListParser.ts';
-import { TokenListParser } from '../lib/TokenListParser.ts';
-import { RepeatElementDefinition } from './RepeatElementDefinition.ts';
-import { UnsupportedBodyElementDefinition } from './UnsupportedBodyElementDefinition.ts';
+import type { ParsedTokenList } from '../../lib/TokenListParser.ts';
+import { TokenListParser } from '../../lib/TokenListParser.ts';
+import type { XFormDefinition } from '../../parse/XFormDefinition.ts';
+import { DependencyContext } from '../expression/abstract/DependencyContext.ts';
 import { ControlDefinition } from './control/ControlDefinition.ts';
 import { InputDefinition } from './control/InputDefinition.ts';
+import { RangeControlDefinition } from './control/RangeControlDefinition.ts';
+import { RankControlDefinition } from './control/RankControlDefinition.ts';
 import type { AnySelectDefinition } from './control/select/SelectDefinition.ts';
 import { SelectDefinition } from './control/select/SelectDefinition.ts';
+import { TriggerControlDefinition } from './control/TriggerControlDefinition.ts';
+import { UploadControlDefinition } from './control/UploadControlDefinition.ts';
 import { LogicalGroupDefinition } from './group/LogicalGroupDefinition.ts';
 import { PresentationGroupDefinition } from './group/PresentationGroupDefinition.ts';
 import { StructuralGroupDefinition } from './group/StructuralGroupDefinition.ts';
+import { RepeatElementDefinition } from './RepeatElementDefinition.ts';
+import { UnsupportedBodyElementDefinition } from './UnsupportedBodyElementDefinition.ts';
 
 export interface BodyElementParentContext {
+	readonly body: BodyDefinition;
 	readonly reference: string | null;
 	readonly element: Element;
 }
@@ -20,7 +25,11 @@ export interface BodyElementParentContext {
 // prettier-ignore
 export type ControlElementDefinition =
 	| AnySelectDefinition
-	| InputDefinition;
+	| InputDefinition
+	| RangeControlDefinition
+	| RankControlDefinition
+	| TriggerControlDefinition
+	| UploadControlDefinition;
 
 type SupportedBodyElementDefinition =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
@@ -40,6 +49,10 @@ const BodyElementDefinitionConstructors = [
 	StructuralGroupDefinition,
 	InputDefinition,
 	SelectDefinition,
+	RangeControlDefinition,
+	RankControlDefinition,
+	TriggerControlDefinition,
+	UploadControlDefinition,
 ] as const satisfies readonly BodyElementDefinitionConstructor[];
 
 export type AnyBodyElementDefinition =
@@ -145,25 +158,8 @@ const bodyClassParser = new TokenListParser(['pages' /*, 'theme-grid' */]);
 
 export type BodyClassList = ParsedTokenList<typeof bodyClassParser>;
 
-export class BodyDefinition extends DependencyContext {
-	static getChildElementDefinitions(
-		form: XFormDefinition,
-		parent: BodyElementParentContext,
-		parentElement: Element,
-		children: readonly Element[] = Array.from(parentElement.children)
-	): readonly AnyBodyElementDefinition[] {
-		return Array.from(children).map((element) => {
-			const { localName } = element;
-
-			for (const Constructor of BodyElementDefinitionConstructors) {
-				if (Constructor.isCompatible(localName, element)) {
-					return new Constructor(form, parent, element);
-				}
-			}
-
-			return new UnsupportedBodyElementDefinition(form, parent, element);
-		});
-	}
+export class BodyDefinition extends DependencyContext implements BodyElementParentContext {
+	readonly body: BodyDefinition;
 
 	readonly element: Element;
 
@@ -196,12 +192,14 @@ export class BodyDefinition extends DependencyContext {
 	constructor(protected readonly form: XFormDefinition) {
 		super();
 
+		this.body = this;
+
 		const { body: element } = form.xformDOM;
 
 		this.reference = form.rootReference;
 		this.element = element;
 		this.classes = bodyClassParser.parseFrom(element, 'class');
-		this.elements = BodyDefinition.getChildElementDefinitions(form, this, element);
+		this.elements = this.getChildElementDefinitions(form, this, element);
 		this.elementsByReference = new BodyElementMap(this.elements);
 	}
 
@@ -209,6 +207,25 @@ export class BodyDefinition extends DependencyContext {
 		return this.elementsByReference.get(reference) ?? null;
 	}
 
+	getChildElementDefinitions(
+		form: XFormDefinition,
+		parent: BodyElementParentContext,
+		parentElement: Element,
+		children: readonly Element[] = Array.from(parentElement.children)
+	): readonly AnyBodyElementDefinition[] {
+		return Array.from(children).map((element) => {
+			const { localName } = element;
+
+			for (const Constructor of BodyElementDefinitionConstructors) {
+				if (Constructor.isCompatible(localName, element)) {
+					return new Constructor(form, parent, element);
+				}
+			}
+
+			return new UnsupportedBodyElementDefinition(form, parent, element);
+		});
+	}
+
 	toJSON() {
 		const { form, ...rest } = this;
 

package/src/{body → parse/body}/BodyElementDefinition.ts

@@ -1,9 +1,9 @@
+import { DependencyContext } from '../expression/abstract/DependencyContext.ts';
+import type { HintDefinition } from '../text/HintDefinition.ts';
+import type { ItemLabelDefinition } from '../text/ItemLabelDefinition.ts';
+import type { LabelDefinition } from '../text/LabelDefinition.ts';
 import type { XFormDefinition } from '../XFormDefinition.ts';
-import { DependencyContext } from '../expression/DependencyContext.ts';
-import type { HintDefinition } from '../parse/text/HintDefinition.ts';
-import type { ItemLabelDefinition } from '../parse/text/ItemLabelDefinition.ts';
-import type { LabelDefinition } from '../parse/text/LabelDefinition.ts';
-import type { BodyElementParentContext } from './BodyDefinition.ts';
+import type { BodyDefinition, BodyElementParentContext } from './BodyDefinition.ts';
 
 /**
  * These category names roughly correspond to each of the ODK XForms spec's
@@ -12,7 +12,10 @@ import type { BodyElementParentContext } from './BodyDefinition.ts';
  */
 type BodyElementCategory = 'control' | 'structure' | 'support' | 'UNSUPPORTED';
 
-export abstract class BodyElementDefinition<Type extends string> extends DependencyContext {
+export abstract class BodyElementDefinition<Type extends string>
+	extends DependencyContext
+	implements BodyElementParentContext
+{
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 	// @ts-ignore
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -20,6 +23,8 @@ export abstract class BodyElementDefinition<Type extends string> extends Depende
 		throw new Error('Must be overridden by BodyElementDefinition subclass');
 	}
 
+	readonly body: BodyDefinition;
+
 	abstract readonly category: BodyElementCategory;
 	abstract readonly type: Type;
 	readonly hint: HintDefinition | null = null;
@@ -34,6 +39,7 @@ export abstract class BodyElementDefinition<Type extends string> extends Depende
 		readonly element: Element
 	) {
 		super();
+		this.body = parent.body;
 		this.parentReference = parent.reference;
 	}
 

package/src/{body → parse/body}/RepeatElementDefinition.ts

@@ -1,9 +1,11 @@
 import { JAVAROSA_NAMESPACE_URI } from '@getodk/common/constants/xmlns.ts';
 import type { XFormDefinition } from '../XFormDefinition.ts';
-import { LabelDefinition } from '../parse/text/LabelDefinition.ts';
-import { parseNodesetReference } from '../parse/xpath/reference-parsing.ts';
-import type { BodyElementDefinitionArray, BodyElementParentContext } from './BodyDefinition.ts';
-import { BodyDefinition } from './BodyDefinition.ts';
+import type {
+	BodyElementDefinitionArray,
+	BodyElementParentContext,
+} from '../body/BodyDefinition.ts';
+import { LabelDefinition } from '../text/LabelDefinition.ts';
+import { parseNodesetReference } from '../xpath/reference-parsing.ts';
 import { BodyElementDefinition } from './BodyElementDefinition.ts';
 import type { StructureElementAppearanceDefinition } from './appearance/structureElementAppearanceParser.ts';
 import { structureElementAppearanceParser } from './appearance/structureElementAppearanceParser.ts';
@@ -45,7 +47,7 @@ export class RepeatElementDefinition extends BodyElementDefinition<'repeat'> {
 
 			return localName !== 'label' && localName !== 'group-label';
 		});
-		const children = BodyDefinition.getChildElementDefinitions(form, this, element, childElements);
+		const children = this.body.getChildElementDefinitions(form, this, element, childElements);
 
 		this.children = children;
 	}

package/src/{body → parse/body}/appearance/inputAppearanceParser.ts

@@ -1,4 +1,4 @@
-import { TokenListParser, type ParsedTokenList } from '../../lib/TokenListParser.ts';
+import { TokenListParser, type ParsedTokenList } from '../../../lib/TokenListParser.ts';
 
 export const inputAppearanceParser = new TokenListParser([
 	'multiline',

package/src/{body → parse/body}/appearance/selectAppearanceParser.ts

@@ -1,4 +1,4 @@
-import { TokenListParser, type ParsedTokenList } from '../../lib/TokenListParser.ts';
+import { TokenListParser, type ParsedTokenList } from '../../../lib/TokenListParser.ts';
 
 export const selectAppearanceParser = new TokenListParser(
 	[

package/src/{body → parse/body}/appearance/structureElementAppearanceParser.ts

@@ -1,4 +1,4 @@
-import { TokenListParser, type ParsedTokenList } from '../../lib/TokenListParser.ts';
+import { TokenListParser, type ParsedTokenList } from '../../../lib/TokenListParser.ts';
 
 export const structureElementAppearanceParser = new TokenListParser(['field-list', 'table-list']);
 

package/src/parse/body/appearance/unknownAppearanceParser.ts

@@ -0,0 +1,5 @@
+import { TokenListParser, type ParsedTokenList } from '../../../lib/TokenListParser.ts';
+
+export const unknownAppearanceParser = new TokenListParser();
+
+export type UnknownAppearanceDefinition = ParsedTokenList<typeof unknownAppearanceParser>;

package/src/{body → parse/body}/control/ControlDefinition.ts

@@ -1,8 +1,8 @@
+import type { ParsedTokenList } from '../../../lib/TokenListParser.ts';
+import { HintDefinition } from '../../text/HintDefinition.ts';
+import { LabelDefinition } from '../../text/LabelDefinition.ts';
 import type { XFormDefinition } from '../../XFormDefinition.ts';
-import type { ParsedTokenList } from '../../lib/TokenListParser.ts';
-import { HintDefinition } from '../../parse/text/HintDefinition.ts';
-import { LabelDefinition } from '../../parse/text/LabelDefinition.ts';
-import { parseNodesetReference } from '../../parse/xpath/reference-parsing.ts';
+import { parseNodesetReference } from '../../xpath/reference-parsing.ts';
 import type { BodyElementParentContext } from '../BodyDefinition.ts';
 import { BodyElementDefinition } from '../BodyElementDefinition.ts';
 

package/src/parse/body/control/RangeControlDefinition.ts

@@ -0,0 +1,26 @@
+import type { XFormDefinition } from '../../XFormDefinition.ts';
+import {
+	unknownAppearanceParser,
+	type UnknownAppearanceDefinition,
+} from '../appearance/unknownAppearanceParser.ts';
+import type { BodyElementParentContext } from '../BodyDefinition.ts';
+import { ControlDefinition } from './ControlDefinition.ts';
+
+export class RangeControlDefinition extends ControlDefinition<'range'> {
+	static override isCompatible(localName: string): boolean {
+		return localName === 'range';
+	}
+
+	readonly type = 'range';
+	readonly appearances: UnknownAppearanceDefinition;
+
+	constructor(form: XFormDefinition, parent: BodyElementParentContext, element: Element) {
+		super(form, parent, element);
+
+		this.appearances = unknownAppearanceParser.parseFrom(element, 'appearance');
+	}
+
+	override toJSON(): object {
+		return {};
+	}
+}

package/src/parse/body/control/RankControlDefinition.ts

@@ -0,0 +1,27 @@
+import { ODK_NAMESPACE_URI } from '@getodk/common/constants/xmlns.ts';
+import type { XFormDefinition } from '../../XFormDefinition.ts';
+import {
+	unknownAppearanceParser,
+	type UnknownAppearanceDefinition,
+} from '../appearance/unknownAppearanceParser.ts';
+import type { BodyElementParentContext } from '../BodyDefinition.ts';
+import { ControlDefinition } from './ControlDefinition.ts';
+
+export class RankControlDefinition extends ControlDefinition<'rank'> {
+	static override isCompatible(localName: string, element: Element): boolean {
+		return localName === 'rank' && element.namespaceURI === ODK_NAMESPACE_URI;
+	}
+
+	readonly type = 'rank';
+	readonly appearances: UnknownAppearanceDefinition;
+
+	constructor(form: XFormDefinition, parent: BodyElementParentContext, element: Element) {
+		super(form, parent, element);
+
+		this.appearances = unknownAppearanceParser.parseFrom(element, 'appearance');
+	}
+
+	override toJSON(): object {
+		return {};
+	}
+}

package/src/parse/body/control/TriggerControlDefinition.ts

@@ -0,0 +1,26 @@
+import type { XFormDefinition } from '../../XFormDefinition.ts';
+import {
+	unknownAppearanceParser,
+	type UnknownAppearanceDefinition,
+} from '../appearance/unknownAppearanceParser.ts';
+import type { BodyElementParentContext } from '../BodyDefinition.ts';
+import { ControlDefinition } from './ControlDefinition.ts';
+
+export class TriggerControlDefinition extends ControlDefinition<'trigger'> {
+	static override isCompatible(localName: string): boolean {
+		return localName === 'trigger';
+	}
+
+	readonly type = 'trigger';
+	readonly appearances: UnknownAppearanceDefinition;
+
+	constructor(form: XFormDefinition, parent: BodyElementParentContext, element: Element) {
+		super(form, parent, element);
+
+		this.appearances = unknownAppearanceParser.parseFrom(element, 'appearance');
+	}
+
+	override toJSON(): object {
+		return {};
+	}
+}

package/src/parse/body/control/UploadControlDefinition.ts

@@ -0,0 +1,26 @@
+import type { XFormDefinition } from '../../XFormDefinition.ts';
+import {
+	unknownAppearanceParser,
+	type UnknownAppearanceDefinition,
+} from '../appearance/unknownAppearanceParser.ts';
+import type { BodyElementParentContext } from '../BodyDefinition.ts';
+import { ControlDefinition } from './ControlDefinition.ts';
+
+export class UploadControlDefinition extends ControlDefinition<'upload'> {
+	static override isCompatible(localName: string): boolean {
+		return localName === 'upload';
+	}
+
+	readonly type = 'upload';
+	readonly appearances: UnknownAppearanceDefinition;
+
+	constructor(form: XFormDefinition, parent: BodyElementParentContext, element: Element) {
+		super(form, parent, element);
+
+		this.appearances = unknownAppearanceParser.parseFrom(element, 'appearance');
+	}
+
+	override toJSON(): object {
+		return {};
+	}
+}

package/src/{body → parse/body}/control/select/ItemDefinition.ts

@@ -1,5 +1,5 @@
-import { getValueElement, type ItemElement } from '../../../lib/dom/query.ts';
-import { ItemLabelDefinition } from '../../../parse/text/ItemLabelDefinition.ts';
+import { getValueElement, type ItemElement } from '../../../../lib/dom/query.ts';
+import { ItemLabelDefinition } from '../../../text/ItemLabelDefinition.ts';
 import type { XFormDefinition } from '../../../XFormDefinition.ts';
 import { BodyElementDefinition } from '../../BodyElementDefinition.ts';
 import type { AnySelectDefinition } from './SelectDefinition.ts';

package/src/{body → parse/body}/control/select/ItemsetDefinition.ts

@@ -1,10 +1,10 @@
+import { getValueElement, type ItemsetElement } from '../../../../lib/dom/query.ts';
+import { ItemsetNodesetExpression } from '../../../expression/ItemsetNodesetExpression.ts';
+import { ItemsetValueExpression } from '../../../expression/ItemsetValueExpression.ts';
+import { ItemsetLabelDefinition } from '../../../text/ItemsetLabelDefinition.ts';
 import type { XFormDefinition } from '../../../XFormDefinition.ts';
-import { getValueElement, type ItemsetElement } from '../../../lib/dom/query.ts';
-import { ItemsetLabelDefinition } from '../../../parse/text/ItemsetLabelDefinition.ts';
-import { parseNodesetReference } from '../../../parse/xpath/reference-parsing.ts';
+import { parseNodesetReference } from '../../../xpath/reference-parsing.ts';
 import { BodyElementDefinition } from '../../BodyElementDefinition.ts';
-import { ItemsetNodesetExpression } from './ItemsetNodesetExpression.ts';
-import { ItemsetValueExpression } from './ItemsetValueExpression.ts';
 import type { AnySelectDefinition } from './SelectDefinition.ts';
 
 export class ItemsetDefinition extends BodyElementDefinition<'itemset'> {

package/src/{body → parse/body}/control/select/ItemsetNodesetContext.ts

@@ -1,5 +1,5 @@
-import { DependencyContext } from '../../../expression/DependencyContext.ts';
-import type { AnyDependentExpression } from '../../../expression/DependentExpression.ts';
+import { DependencyContext } from '../../../expression/abstract/DependencyContext.ts';
+import type { AnyDependentExpression } from '../../../expression/abstract/DependentExpression.ts';
 import type { ItemsetDefinition } from './ItemsetDefinition.ts';
 
 export class ItemsetNodesetContext extends DependencyContext {

package/src/{body → parse/body}/control/select/SelectDefinition.ts

@@ -1,23 +1,15 @@
 import type { CollectionValues } from '@getodk/common/types/collections/CollectionValues.ts';
 import type { LocalNamedElement } from '@getodk/common/types/dom.ts';
+import { getItemElements, getItemsetElement } from '../../../../lib/dom/query.ts';
 import type { XFormDefinition } from '../../../XFormDefinition.ts';
-import { getItemElements, getItemsetElement } from '../../../lib/dom/query.ts';
-import type { AnyBodyElementDefinition, BodyElementParentContext } from '../../BodyDefinition.ts';
 import type { SelectAppearanceDefinition } from '../../appearance/selectAppearanceParser.ts';
 import { selectAppearanceParser } from '../../appearance/selectAppearanceParser.ts';
+import type { AnyBodyElementDefinition, BodyElementParentContext } from '../../BodyDefinition.ts';
 import { ControlDefinition } from '../ControlDefinition.ts';
 import { ItemDefinition } from './ItemDefinition.ts';
 import { ItemsetDefinition } from './ItemsetDefinition.ts';
 
-/**
- * @todo We were previously a bit overzealous about introducing `<rank>` support
- * here. It'll likely still fit, but we should approach it with more intention.
- *
- * @todo `<trigger>` is *almost* reasonable to support here too. The main
- * hesitation is that its single, implicit "item" does not have a distinct
- * <label>, and presumably has different UX **and translation** considerations.
- */
-const selectLocalNames = new Set([/* 'rank', */ 'select', 'select1'] as const);
+const selectLocalNames = new Set(['select', 'select1'] as const);
 
 export type SelectType = CollectionValues<typeof selectLocalNames>;