@getodk/xforms-engine 0.3.0 → 0.5.0

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 { InputControlDefinition } from './control/InputControlDefinition.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;
+	| InputControlDefinition
+	| RangeControlDefinition
+	| RankControlDefinition
+	| TriggerControlDefinition
+	| UploadControlDefinition;
 
 type SupportedBodyElementDefinition =
 	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
@@ -38,8 +47,12 @@ const BodyElementDefinitionConstructors = [
 	LogicalGroupDefinition,
 	PresentationGroupDefinition,
 	StructuralGroupDefinition,
-	InputDefinition,
+	InputControlDefinition,
 	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,10 +1,10 @@
-import { TokenListParser, type ParsedTokenList } from '../../lib/TokenListParser.ts';
+import { TokenListParser, type ParsedTokenList } from '../../../lib/TokenListParser.ts';
 
 export const inputAppearanceParser = new TokenListParser([
 	'multiline',
 	'numbers',
 	'url',
-	'thousand-sep',
+	'thousands-sep',
 
 	// date (TODO: data types)
 	'no-calendar',

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/{body/control/InputDefinition.ts → parse/body/control/InputControlDefinition.ts}

@@ -1,12 +1,10 @@
 import type { XFormDefinition } from '../../XFormDefinition.ts';
+import type { InputAppearanceDefinition } from '../appearance/inputAppearanceParser.ts';
+import { inputAppearanceParser } from '../appearance/inputAppearanceParser.ts';
 import type { BodyElementParentContext } from '../BodyDefinition.ts';
-import {
-	inputAppearanceParser,
-	type InputAppearanceDefinition,
-} from '../appearance/inputAppearanceParser.ts';
 import { ControlDefinition } from './ControlDefinition.ts';
 
-export class InputDefinition extends ControlDefinition<'input'> {
+export class InputControlDefinition extends ControlDefinition<'input'> {
 	static override isCompatible(localName: string): boolean {
 		return localName === 'input';
 	}

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,4 @@
-import { DependencyContext } from '../../../expression/DependencyContext.ts';
-import type { AnyDependentExpression } from '../../../expression/DependentExpression.ts';
+import { DependencyContext } from '../../../expression/abstract/DependencyContext.ts';
 import type { ItemsetDefinition } from './ItemsetDefinition.ts';
 
 export class ItemsetNodesetContext extends DependencyContext {
@@ -19,8 +18,4 @@ export class ItemsetNodesetContext extends DependencyContext {
 		super.isTranslated = value;
 		this.itemset.isTranslated = value;
 	}
-
-	override registerDependentExpression(expression: AnyDependentExpression): void {
-		this.itemset.registerDependentExpression(expression);
-	}
 }

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>;
 

package/src/{body → parse/body}/group/BaseGroupDefinition.ts

@@ -1,16 +1,15 @@
 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 { getLabelElement } from '../../lib/dom/query.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 { StructureElementAppearanceDefinition } from '../appearance/structureElementAppearanceParser.ts';
+import { structureElementAppearanceParser } from '../appearance/structureElementAppearanceParser.ts';
 import {
-	BodyDefinition,
 	type BodyElementDefinitionArray,
 	type BodyElementParentContext,
 } from '../BodyDefinition.ts';
 import { BodyElementDefinition } from '../BodyElementDefinition.ts';
-import type { StructureElementAppearanceDefinition } from '../appearance/structureElementAppearanceParser.ts';
-import { structureElementAppearanceParser } from '../appearance/structureElementAppearanceParser.ts';
 
 /**
  * These type names are derived from **and expand upon** the language used in
@@ -73,28 +72,18 @@ export abstract class BaseGroupDefinition<
 	readonly appearances: StructureElementAppearanceDefinition;
 	override readonly label: LabelDefinition | null;
 
-	constructor(
-		form: XFormDefinition,
-		parent: BodyElementParentContext,
-		element: Element,
-		children?: BodyElementDefinitionArray
-	) {
+	constructor(form: XFormDefinition, parent: BodyElementParentContext, element: Element) {
 		super(form, parent, element);
 
-		this.children = children ?? this.getChildren(element);
-		this.reference = parseNodesetReference(parent, element, 'ref');
-		this.appearances = structureElementAppearanceParser.parseFrom(element, 'appearance');
-		this.label = LabelDefinition.forGroup(form, this);
-	}
-
-	getChildren(element: Element): BodyElementDefinitionArray {
-		const { form } = this;
-		const children = Array.from(element.children).filter((child) => {
+		const childElements = Array.from(element.children).filter((child) => {
 			const childName = child.localName;
 
 			return childName !== 'label';
 		});
 
-		return BodyDefinition.getChildElementDefinitions(form, this, element, children);
+		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/{body → parse/body}/group/PresentationGroupDefinition.ts

@@ -1,5 +1,5 @@
+import { LabelDefinition } from '../../text/LabelDefinition.ts';
 import type { XFormDefinition } from '../../XFormDefinition.ts';
-import { LabelDefinition } from '../../parse/text/LabelDefinition.ts';
 import type { BodyElementParentContext } from '../BodyDefinition.ts';
 import { BaseGroupDefinition } from './BaseGroupDefinition.ts';
 

package/src/{model/BindComputation.ts → parse/expression/BindComputationExpression.ts}

@@ -1,5 +1,5 @@
-import { DependentExpression } from '../expression/DependentExpression.ts';
-import type { BindDefinition } from './BindDefinition.ts';
+import type { BindDefinition } from '../model/BindDefinition.ts';
+import { DependentExpression } from './abstract/DependentExpression.ts';
 
 const defaultBindComputationExpressions = {
 	calculate: null,
@@ -16,8 +16,8 @@ export type BindComputationType = keyof DefaultBindComputationExpressions;
 
 type BindComputationFactoryResult<Type extends BindComputationType> =
 	DefaultBindComputationExpressions[Type] extends null
-		? BindComputation<Type> | null
-		: BindComputation<Type>;
+		? BindComputationExpression<Type> | null
+		: BindComputationExpression<Type>;
 
 const bindComputationResultTypes = {
 	calculate: 'string',
@@ -33,10 +33,10 @@ type BindComputationResultTypes = typeof bindComputationResultTypes;
 export type BindComputationResultType<Computation extends BindComputationType> =
 	BindComputationResultTypes[Computation];
 
-export class BindComputation<Computation extends BindComputationType> extends DependentExpression<
-	BindComputationResultType<Computation>
-> {
-	static forExpression<Type extends BindComputationType>(
+export class BindComputationExpression<
+	Computation extends BindComputationType,
+> extends DependentExpression<BindComputationResultType<Computation>> {
+	static forComputation<Type extends BindComputationType>(
 		bind: BindDefinition,
 		computation: Type
 	): BindComputationFactoryResult<Type> {

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

@@ -1,5 +1,5 @@
-import { DependentExpression } from '../../../expression/DependentExpression.ts';
-import type { ItemsetDefinition } from './ItemsetDefinition.ts';
+import type { ItemsetDefinition } from '../body/control/select/ItemsetDefinition.ts';
+import { DependentExpression } from './abstract/DependentExpression.ts';
 
 export class ItemsetNodesetExpression extends DependentExpression<'nodes'> {
 	constructor(itemset: ItemsetDefinition, nodesetExpression: string) {

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

@@ -1,5 +1,5 @@
-import { DependentExpression } from '../../../expression/DependentExpression.ts';
-import type { ItemsetDefinition } from './ItemsetDefinition.ts';
+import type { ItemsetDefinition } from '../body/control/select/ItemsetDefinition.ts';
+import { DependentExpression } from './abstract/DependentExpression.ts';
 
 export class ItemsetValueExpression extends DependentExpression<'string'> {
 	constructor(

package/src/parse/expression/RepeatCountControlExpression.ts

@@ -1,7 +1,7 @@
-import { RepeatElementDefinition } from '../../body/RepeatElementDefinition.ts';
 import type { RepeatRangeControlledNode } from '../../client/repeat/RepeatRangeControlledNode.ts';
-import { DependentExpression } from '../../expression/DependentExpression.ts';
+import { RepeatElementDefinition } from '../body/RepeatElementDefinition.ts';
 import { isConstantTruthyExpression } from '../xpath/semantic-analysis.ts';
+import { DependentExpression } from './abstract/DependentExpression.ts';
 
 /**
  * Represents either of these

package/src/parse/expression/TextLiteralExpression.ts

@@ -0,0 +1,19 @@
+import type { AnyTextRangeDefinition } from '../text/abstract/TextRangeDefinition.ts';
+import { TextChunkExpression } from './abstract/TextChunkExpression.ts';
+
+export type TextLiteralSourceNode = Attr | Text;
+
+export class TextLiteralExpression extends TextChunkExpression<'literal'> {
+	static from(context: AnyTextRangeDefinition, stringValue: string): TextLiteralExpression {
+		return new this(context, stringValue);
+	}
+
+	readonly source = 'literal';
+
+	private constructor(
+		context: AnyTextRangeDefinition,
+		override readonly stringValue: string
+	) {
+		super(context, 'null');
+	}
+}

package/src/parse/{text/OutputChunkDefinition.ts → expression/TextOutputExpression.ts}

@@ -1,6 +1,6 @@
 import type { KnownAttributeLocalNamedElement } from '@getodk/common/types/dom.ts';
-import { TextChunkDefinition } from './abstract/TextChunkDefinition.ts';
-import type { AnyTextRangeDefinition } from './abstract/TextRangeDefinition.ts';
+import type { AnyTextRangeDefinition } from '../text/abstract/TextRangeDefinition.ts';
+import { TextChunkExpression } from './abstract/TextChunkExpression.ts';
 
 interface OutputElement extends KnownAttributeLocalNamedElement<'output', 'value'> {}
 
@@ -8,8 +8,8 @@ const isOutputElement = (element: Element): element is OutputElement => {
 	return element.localName === 'output' && element.hasAttribute('value');
 };
 
-export class OutputChunkDefinition extends TextChunkDefinition<'output'> {
-	static from(context: AnyTextRangeDefinition, element: Element): OutputChunkDefinition | null {
+export class TextOutputExpression extends TextChunkExpression<'output'> {
+	static from(context: AnyTextRangeDefinition, element: Element): TextOutputExpression | null {
 		if (isOutputElement(element)) {
 			return new this(context, element);
 		}

package/src/parse/{text/ReferenceChunkDefinition.ts → expression/TextReferenceExpression.ts}

@@ -1,8 +1,8 @@
-import { TextChunkDefinition } from './abstract/TextChunkDefinition.ts';
-import type { AnyTextRangeDefinition } from './abstract/TextRangeDefinition.ts';
+import type { AnyTextRangeDefinition } from '../text/abstract/TextRangeDefinition.ts';
+import { TextChunkExpression } from './abstract/TextChunkExpression.ts';
 
-export class ReferenceChunkDefinition extends TextChunkDefinition<'reference'> {
-	static from(context: AnyTextRangeDefinition, refExpression: string): ReferenceChunkDefinition {
+export class TextReferenceExpression extends TextChunkExpression<'reference'> {
+	static from(context: AnyTextRangeDefinition, refExpression: string): TextReferenceExpression {
 		return new this(context, refExpression);
 	}