@getodk/xforms-engine 0.2.0 → 0.3.0

package/dist/instance/Group.d.ts

@@ -1,6 +1,7 @@
 import { Accessor } from 'solid-js';
 import { GroupDefinition, GroupNode, GroupNodeAppearances } from '../client/GroupNode.ts';
-import { TextRange } from '../index.ts';
+import { TextRange } from '../client/TextRange.ts';
+import { AncestorNodeValidationState } from '../client/validation.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';
@@ -25,6 +26,7 @@ export declare class Group extends DescendantNode<GroupDefinition, GroupStateSpe
     readonly nodeType = "group";
     readonly appearances: GroupNodeAppearances;
     readonly currentState: MaterializedChildren<CurrentState<GroupStateSpec>, GeneralChildNode>;
+    readonly validationState: AncestorNodeValidationState;
     constructor(parent: GeneralParentNode, definition: GroupDefinition);
     getChildren(): readonly GeneralChildNode[];
 }

package/dist/instance/ModelValue.d.ts

@@ -0,0 +1,40 @@
+import { ModelValueNode } from '../client/ModelValueNode.ts';
+import { AnyViolation, LeafNodeValidationState } from '../client/validation.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 { SimpleAtomicState } from '../lib/reactivity/types.ts';
+import { LeafNodeDefinition } from '../model/LeafNodeDefinition.ts';
+import { DescendantNodeStateSpec, DescendantNode } from './abstract/DescendantNode.ts';
+import { GeneralParentNode } from './hierarchy.ts';
+import { EvaluationContext } from './internal-api/EvaluationContext.ts';
+import { SubscribableDependency } from './internal-api/SubscribableDependency.ts';
+import { ValidationContext } from './internal-api/ValidationContext.ts';
+import { ValueContext } from './internal-api/ValueContext.ts';
+
+export interface ModelValueDefinition extends LeafNodeDefinition {
+    readonly bodyElement: null;
+}
+interface ModelValueStateSpec extends DescendantNodeStateSpec<string> {
+    readonly label: null;
+    readonly hint: null;
+    readonly children: null;
+    readonly value: SimpleAtomicState<string>;
+    readonly valueOptions: null;
+}
+export declare class ModelValue extends DescendantNode<ModelValueDefinition, ModelValueStateSpec, null> implements ModelValueNode, EvaluationContext, SubscribableDependency, ValidationContext, ValueContext<string> {
+    private readonly validation;
+    protected readonly state: SharedNodeState<ModelValueStateSpec>;
+    protected engineState: EngineState<ModelValueStateSpec>;
+    readonly nodeType = "model-value";
+    readonly appearances: null;
+    readonly currentState: CurrentState<ModelValueStateSpec>;
+    get validationState(): LeafNodeValidationState;
+    readonly encodeValue: (value: string) => string;
+    readonly decodeValue: (value: string) => string;
+    constructor(parent: GeneralParentNode, definition: ModelValueDefinition);
+    getViolation(): AnyViolation | null;
+    isBlank(): boolean;
+    getChildren(): readonly [];
+}
+export {};

package/dist/instance/Note.d.ts

@@ -0,0 +1,42 @@
+import { Accessor } from 'solid-js';
+import { NoteNode, NoteNodeAppearances } from '../client/NoteNode.ts';
+import { TextRange } from '../client/TextRange.ts';
+import { AnyViolation, LeafNodeValidationState } from '../client/validation.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 { ComputedNoteText } from '../lib/reactivity/text/createNoteText.ts';
+import { SimpleAtomicState } from '../lib/reactivity/types.ts';
+import { NoteNodeDefinition } from '../parse/NoteNodeDefinition.ts';
+import { DescendantNodeStateSpec, DescendantNode } from './abstract/DescendantNode.ts';
+import { GeneralParentNode } from './hierarchy.ts';
+import { EvaluationContext } from './internal-api/EvaluationContext.ts';
+import { SubscribableDependency } from './internal-api/SubscribableDependency.ts';
+import { ValidationContext } from './internal-api/ValidationContext.ts';
+import { ValueContext } from './internal-api/ValueContext.ts';
+
+interface NoteStateSpec extends DescendantNodeStateSpec<string> {
+    readonly readonly: Accessor<true>;
+    readonly noteText: ComputedNoteText;
+    readonly label: Accessor<TextRange<'label', 'form'> | null>;
+    readonly hint: Accessor<TextRange<'hint', 'form'> | null>;
+    readonly children: null;
+    readonly value: SimpleAtomicState<string>;
+    readonly valueOptions: null;
+}
+export declare class Note extends DescendantNode<NoteNodeDefinition, NoteStateSpec, null> implements NoteNode, EvaluationContext, SubscribableDependency, ValidationContext, ValueContext<string> {
+    private readonly validation;
+    protected readonly state: SharedNodeState<NoteStateSpec>;
+    protected engineState: EngineState<NoteStateSpec>;
+    readonly nodeType = "note";
+    readonly appearances: NoteNodeAppearances;
+    readonly currentState: CurrentState<NoteStateSpec>;
+    get validationState(): LeafNodeValidationState;
+    readonly encodeValue: (value: string) => string;
+    readonly decodeValue: (value: string) => string;
+    constructor(parent: GeneralParentNode, definition: NoteNodeDefinition);
+    getViolation(): AnyViolation | null;
+    isBlank(): boolean;
+    getChildren(): readonly [];
+}
+export {};

package/dist/instance/Root.d.ts

@@ -4,6 +4,7 @@ import { XFormDOM } from '../XFormDOM.ts';
 import { BodyClassList } from '../body/BodyDefinition.ts';
 import { ActiveLanguage, FormLanguage, FormLanguages } from '../client/FormLanguage.ts';
 import { RootNode } from '../client/RootNode.ts';
+import { AncestorNodeValidationState } from '../client/validation.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';
@@ -41,6 +42,7 @@ export declare class Root extends InstanceNode<RootDefinition, RootStateSpec, Ge
     readonly appearances: null;
     readonly classes: BodyClassList;
     readonly currentState: MaterializedChildren<CurrentState<RootStateSpec>, GeneralChildNode>;
+    readonly validationState: AncestorNodeValidationState;
     protected readonly instanceDOM: XFormDOM;
     readonly root: this;
     readonly evaluator: XFormsXPathEvaluator;

package/dist/instance/SelectField.d.ts

@@ -1,20 +1,22 @@
 import { Accessor } from 'solid-js';
 import { AnySelectDefinition } from '../body/control/select/SelectDefinition.ts';
 import { SelectItem, SelectNode, SelectNodeAppearances } from '../client/SelectNode.ts';
-import { TextRange } from '../index.ts';
+import { TextRange } from '../client/TextRange.ts';
+import { AnyViolation, LeafNodeValidationState } from '../client/validation.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 { SimpleAtomicState } from '../lib/reactivity/types.ts';
-import { ValueNodeDefinition } from '../model/ValueNodeDefinition.ts';
+import { LeafNodeDefinition } from '../model/LeafNodeDefinition.ts';
 import { Root } from './Root.ts';
 import { DescendantNodeStateSpec, DescendantNode } from './abstract/DescendantNode.ts';
 import { GeneralParentNode } from './hierarchy.ts';
 import { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import { SubscribableDependency } from './internal-api/SubscribableDependency.ts';
+import { ValidationContext } from './internal-api/ValidationContext.ts';
 import { ValueContext } from './internal-api/ValueContext.ts';
 
-export interface SelectFieldDefinition extends ValueNodeDefinition {
+export interface SelectFieldDefinition extends LeafNodeDefinition {
     readonly bodyElement: AnySelectDefinition;
 }
 interface SelectFieldStateSpec extends DescendantNodeStateSpec<readonly SelectItem[]> {
@@ -24,22 +26,26 @@ interface SelectFieldStateSpec extends DescendantNodeStateSpec<readonly SelectIt
     readonly value: SimpleAtomicState<readonly SelectItem[]>;
     readonly valueOptions: Accessor<readonly SelectItem[]>;
 }
-export declare class SelectField extends DescendantNode<SelectFieldDefinition, SelectFieldStateSpec, null> implements SelectNode, EvaluationContext, SubscribableDependency, ValueContext<readonly SelectItem[]> {
+export declare class SelectField extends DescendantNode<SelectFieldDefinition, SelectFieldStateSpec, null> implements SelectNode, EvaluationContext, SubscribableDependency, ValidationContext, ValueContext<readonly SelectItem[]> {
     private readonly selectExclusive;
+    private readonly validation;
     protected readonly state: SharedNodeState<SelectFieldStateSpec>;
     protected engineState: EngineState<SelectFieldStateSpec>;
     readonly nodeType = "select";
     readonly appearances: SelectNodeAppearances;
     readonly currentState: CurrentState<SelectFieldStateSpec>;
+    get validationState(): LeafNodeValidationState;
     readonly encodeValue: (runtimeValue: readonly SelectItem[]) => string;
     readonly decodeValue: (instanceValue: string) => readonly SelectItem[];
     protected readonly getValueOptions: Accessor<readonly SelectItem[]>;
     constructor(parent: GeneralParentNode, definition: SelectFieldDefinition);
+    getViolation(): AnyViolation | null;
     protected getSelectItemsByValue(valueOptions?: readonly SelectItem[]): ReadonlyMap<string, SelectItem>;
     protected updateSelectedItemValues(values: readonly string[]): void;
     protected setSelectedItemValue(value: string | null): void;
     select(selectedItem: SelectItem): Root;
     deselect(deselectedItem: SelectItem): Root;
     getChildren(): readonly [];
+    isBlank(): boolean;
 }
 export {};

package/dist/instance/StringField.d.ts

@@ -1,21 +1,23 @@
 import { Accessor } from 'solid-js';
 import { InputDefinition } from '../body/control/InputDefinition.ts';
 import { StringNode, StringNodeAppearances } from '../client/StringNode.ts';
-import { TextRange } from '../index.ts';
+import { TextRange } from '../client/TextRange.ts';
+import { AnyViolation, LeafNodeValidationState } from '../client/validation.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 { SimpleAtomicState } from '../lib/reactivity/types.ts';
-import { ValueNodeDefinition } from '../model/ValueNodeDefinition.ts';
+import { LeafNodeDefinition } from '../model/LeafNodeDefinition.ts';
 import { Root } from './Root.ts';
 import { DescendantNodeStateSpec, DescendantNode } from './abstract/DescendantNode.ts';
 import { GeneralParentNode } from './hierarchy.ts';
 import { EvaluationContext } from './internal-api/EvaluationContext.ts';
 import { SubscribableDependency } from './internal-api/SubscribableDependency.ts';
+import { ValidationContext } from './internal-api/ValidationContext.ts';
 import { ValueContext } from './internal-api/ValueContext.ts';
 
-export interface StringFieldDefinition extends ValueNodeDefinition {
-    readonly bodyElement: InputDefinition | null;
+export interface StringFieldDefinition extends LeafNodeDefinition {
+    readonly bodyElement: InputDefinition;
 }
 interface StringFieldStateSpec extends DescendantNodeStateSpec<string> {
     readonly label: Accessor<TextRange<'label'> | null>;
@@ -24,15 +26,19 @@ interface StringFieldStateSpec extends DescendantNodeStateSpec<string> {
     readonly value: SimpleAtomicState<string>;
     readonly valueOptions: null;
 }
-export declare class StringField extends DescendantNode<StringFieldDefinition, StringFieldStateSpec, null> implements StringNode, EvaluationContext, SubscribableDependency, ValueContext<string> {
+export declare class StringField extends DescendantNode<StringFieldDefinition, StringFieldStateSpec, null> implements StringNode, EvaluationContext, SubscribableDependency, ValidationContext, ValueContext<string> {
+    private readonly validation;
     protected readonly state: SharedNodeState<StringFieldStateSpec>;
     protected engineState: EngineState<StringFieldStateSpec>;
     readonly nodeType = "string";
     readonly appearances: StringNodeAppearances;
     readonly currentState: CurrentState<StringFieldStateSpec>;
+    get validationState(): LeafNodeValidationState;
     readonly encodeValue: (value: string) => string;
     readonly decodeValue: (value: string) => string;
     constructor(parent: GeneralParentNode, definition: StringFieldDefinition);
+    getViolation(): AnyViolation | null;
+    isBlank(): boolean;
     getChildren(): readonly [];
     setValue(value: string): Root;
 }

package/dist/instance/Subtree.d.ts

@@ -1,5 +1,6 @@
 import { Accessor } from 'solid-js';
 import { SubtreeDefinition, SubtreeNode } from '../client/SubtreeNode.ts';
+import { AncestorNodeValidationState } from '../client/validation.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';
@@ -24,6 +25,7 @@ export declare class Subtree extends DescendantNode<SubtreeDefinition, SubtreeSt
     readonly nodeType = "subtree";
     readonly appearances: null;
     readonly currentState: MaterializedChildren<CurrentState<SubtreeStateSpec>, GeneralChildNode>;
+    readonly validationState: AncestorNodeValidationState;
     constructor(parent: GeneralParentNode, definition: SubtreeDefinition);
     getChildren(): readonly GeneralChildNode[];
 }

package/dist/instance/abstract/DescendantNode.d.ts

@@ -2,14 +2,13 @@ import { XFormsXPathEvaluator } from '@getodk/xpath';
 import { Accessor } from 'solid-js';
 import { BaseNode } from '../../client/BaseNode.ts';
 import { AnyDescendantNodeDefinition } from '../../model/DescendentNodeDefinition.ts';
+import { LeafNodeDefinition } from '../../model/LeafNodeDefinition.ts';
 import { AnyNodeDefinition } from '../../model/NodeDefinition.ts';
 import { RepeatInstanceDefinition } from '../../model/RepeatInstanceDefinition.ts';
-import { ValueNodeDefinition } from '../../model/ValueNodeDefinition.ts';
-import { RepeatRange } from '../RepeatRange.ts';
-import { Root } from '../Root.ts';
-import { AnyChildNode, GeneralParentNode } from '../hierarchy.ts';
+import { AnyChildNode, GeneralParentNode, RepeatRange } from '../hierarchy.ts';
 import { EvaluationContext } from '../internal-api/EvaluationContext.ts';
 import { SubscribableDependency } from '../internal-api/SubscribableDependency.ts';
+import { Root } from '../Root.ts';
 import { InstanceNodeStateSpec, InstanceNode } from './InstanceNode.ts';
 
 export interface DescendantNodeSharedStateSpec {
@@ -20,7 +19,7 @@ export interface DescendantNodeSharedStateSpec {
 }
 export type DescendantNodeStateSpec<Value = never> = InstanceNodeStateSpec<Value> & DescendantNodeSharedStateSpec;
 export type DescendantNodeDefinition = Extract<AnyNodeDefinition, AnyDescendantNodeDefinition>;
-export type DescendantNodeParent<Definition extends DescendantNodeDefinition> = Definition extends ValueNodeDefinition ? GeneralParentNode : Definition extends RepeatInstanceDefinition ? RepeatRange : GeneralParentNode;
+export type DescendantNodeParent<Definition extends DescendantNodeDefinition> = Definition extends LeafNodeDefinition ? GeneralParentNode : Definition extends RepeatInstanceDefinition ? RepeatRange : GeneralParentNode;
 export type AnyDescendantNode = DescendantNode<DescendantNodeDefinition, DescendantNodeStateSpec<any>, any>;
 interface DescendantNodeOptions {
     readonly computeReference?: Accessor<string>;
@@ -34,7 +33,7 @@ export declare abstract class DescendantNode<Definition extends DescendantNodeDe
     readonly hasNonRelevantAncestor: Accessor<boolean>;
     readonly isSelfRelevant: Accessor<boolean>;
     readonly isRelevant: Accessor<boolean>;
-    protected readonly isRequired: Accessor<boolean>;
+    readonly isRequired: Accessor<boolean>;
     readonly root: Root;
     readonly evaluator: XFormsXPathEvaluator;
     readonly contextNode: Element;

package/dist/instance/abstract/InstanceNode.d.ts

@@ -3,6 +3,7 @@ import { Accessor, Signal } from 'solid-js';
 import { BaseNode } from '../../client/BaseNode.ts';
 import { NodeAppearances } from '../../client/NodeAppearances.ts';
 import { InstanceNodeType } from '../../client/node-types.ts';
+import { NodeValidationState } from '../../client/validation.ts';
 import { TextRange } from '../../index.ts';
 import { CurrentState } from '../../lib/reactivity/node-state/createCurrentState.ts';
 import { EngineState } from '../../lib/reactivity/node-state/createEngineState.ts';
@@ -74,6 +75,7 @@ export declare abstract class InstanceNode<Definition extends AnyNodeDefinition,
     abstract readonly nodeType: InstanceNodeType;
     abstract readonly appearances: NodeAppearances<Definition>;
     abstract readonly currentState: InstanceNodeCurrentState<Spec, Child>;
+    abstract readonly validationState: NodeValidationState;
     abstract readonly root: Root;
     abstract readonly evaluator: XFormsXPathEvaluator;
     readonly scope: ReactiveScope;

package/dist/instance/hierarchy.d.ts

@@ -1,13 +1,18 @@
 import { Group } from './Group.ts';
-import { RepeatInstance } from './RepeatInstance.ts';
-import { RepeatRange } from './RepeatRange.ts';
+import { ModelValue } from './ModelValue.ts';
+import { Note } from './Note.ts';
+import { RepeatInstance } from './repeat/RepeatInstance.ts';
+import { RepeatRangeControlled } from './repeat/RepeatRangeControlled.ts';
+import { RepeatRangeUncontrolled } from './repeat/RepeatRangeUncontrolled.ts';
 import { Root } from './Root.ts';
 import { SelectField } from './SelectField.ts';
 import { StringField } from './StringField.ts';
 import { Subtree } from './Subtree.ts';
 
-export type AnyNode = Root | Group | Subtree | RepeatRange | RepeatInstance | StringField | SelectField;
+export type RepeatRange = RepeatRangeControlled | RepeatRangeUncontrolled;
+export type AnyNode = Root | Group | Subtree | RepeatRange | RepeatInstance | Note | ModelValue | StringField | SelectField;
 export type AnyParentNode = Root | Group | Subtree | RepeatRange | RepeatInstance;
 export type GeneralParentNode = Root | Group | Subtree | RepeatInstance;
-export type AnyChildNode = Group | Subtree | RepeatRange | RepeatInstance | StringField | SelectField;
-export type GeneralChildNode = Group | Subtree | RepeatRange | StringField | SelectField;
+export type AnyChildNode = Group | Subtree | RepeatRange | RepeatInstance | ModelValue | Note | StringField | SelectField;
+export type GeneralChildNode = Group | Subtree | RepeatRange | ModelValue | Note | StringField | SelectField;
+export type AnyValueNode = ModelValue | Note | StringField | SelectField;

package/dist/instance/internal-api/ValidationContext.d.ts

@@ -0,0 +1,21 @@
+import { BindComputation } from '../../model/BindComputation.ts';
+import { MessageDefinition } from '../../parse/text/MessageDefinition.ts';
+import { EvaluationContext } from './EvaluationContext.ts';
+import { SubscribableDependency } from './SubscribableDependency.ts';
+
+interface ValidationContextDefinitionBind {
+    readonly constraint: BindComputation<'constraint'>;
+    readonly constraintMsg: MessageDefinition<'constraintMsg'> | null;
+    readonly required: BindComputation<'required'>;
+    readonly requiredMsg: MessageDefinition<'requiredMsg'> | null;
+}
+interface ValidationContextDefinition {
+    readonly bind: ValidationContextDefinitionBind;
+}
+export interface ValidationContext extends EvaluationContext, SubscribableDependency {
+    readonly definition: ValidationContextDefinition;
+    isRelevant(): boolean;
+    isRequired(): boolean;
+    isBlank(): boolean;
+}
+export {};

package/dist/instance/{RepeatRange.d.ts → repeat/BaseRepeatRange.d.ts}

@@ -1,18 +1,19 @@
 import { Accessor } from 'solid-js';
-import { RepeatRangeNode, RepeatRangeNodeAppearances } from '../client/RepeatRangeNode.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 { RepeatRangeDefinition } from '../model/RepeatRangeDefinition.ts';
-import { RepeatDefinition, RepeatInstance } from './RepeatInstance.ts';
-import { Root } from './Root.ts';
-import { DescendantNodeSharedStateSpec, DescendantNode } from './abstract/DescendantNode.ts';
-import { GeneralParentNode } from './hierarchy.ts';
-import { NodeID } from './identity.ts';
-import { EvaluationContext } from './internal-api/EvaluationContext.ts';
-import { SubscribableDependency } from './internal-api/SubscribableDependency.ts';
-import { TextRange } from './text/TextRange.ts';
+import { NodeAppearances } from '../../client/NodeAppearances.ts';
+import { BaseRepeatRangeNode } from '../../client/repeat/BaseRepeatRangeNode.ts';
+import { TextRange } from '../../client/TextRange.ts';
+import { AncestorNodeValidationState } from '../../client/validation.ts';
+import { ChildrenState } from '../../lib/reactivity/createChildrenState.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 { AnyRepeatRangeDefinition, ControlledRepeatRangeDefinition } from '../../model/RepeatRangeDefinition.ts';
+import { DescendantNodeParent, DescendantNodeSharedStateSpec, DescendantNode } from '../abstract/DescendantNode.ts';
+import { NodeID } from '../identity.ts';
+import { EvaluationContext } from '../internal-api/EvaluationContext.ts';
+import { SubscribableDependency } from '../internal-api/SubscribableDependency.ts';
+import { RepeatInstance, RepeatDefinition } from './RepeatInstance.ts';
 
 interface RepeatRangeStateSpec extends DescendantNodeSharedStateSpec {
     readonly hint: null;
@@ -21,7 +22,8 @@ interface RepeatRangeStateSpec extends DescendantNodeSharedStateSpec {
     readonly valueOptions: null;
     readonly value: null;
 }
-export declare class RepeatRange extends DescendantNode<RepeatRangeDefinition, RepeatRangeStateSpec, RepeatInstance> implements RepeatRangeNode, EvaluationContext, SubscribableDependency {
+type BaseRepeatRangeNodeType<Definition extends AnyRepeatRangeDefinition> = Definition extends ControlledRepeatRangeDefinition ? 'repeat-range:controlled' : 'repeat-range:uncontrolled';
+export declare abstract class BaseRepeatRange<Definition extends AnyRepeatRangeDefinition> extends DescendantNode<Definition, RepeatRangeStateSpec, RepeatInstance> implements BaseRepeatRangeNode, EvaluationContext, SubscribableDependency {
     /**
      * A repeat range doesn't have a corresponding primary instance element of its
      * own, and its instances are appended to the range's parent element. During
@@ -44,8 +46,27 @@ export declare class RepeatRange extends DescendantNode<RepeatRangeDefinition, R
      * {@link https://developer.mozilla.org/en-US/docs/Web/API/Range | DOM Range}
      * instead?
      */
-    private readonly anchorNode;
-    private readonly childrenState;
+    protected readonly anchorNode: Comment;
+    protected readonly childrenState: ChildrenState<RepeatInstance>;
+    /**
+     * Provides an {@link EvaluationContext} from which to evaluate expressions
+     * where some LocationPath sub-expressions may be **relative to the repeat
+     * range itself**. This is useful for evaluation of expressions where:
+     *
+     * - the expression is typically contextualized to any of its
+     *   {@link RepeatInstance} children, but it presently has none (i.e.
+     *   `relevant`)
+     *
+     * - the expression is conceptually intended to be evaluated in the context of
+     *   the repeat range itself (i.e. `jr:count`)
+     */
+    protected readonly selfEvaluationContext: EvaluationContext & {
+        readonly contextNode: Comment;
+    };
+    /**
+     * @see {@link isSelfRelevant}
+     */
+    protected readonly isEmptyRangeSelfRelevant: Accessor<boolean>;
     protected readonly state: SharedNodeState<RepeatRangeStateSpec>;
     protected engineState: EngineState<RepeatRangeStateSpec>;
     /**
@@ -55,11 +76,6 @@ export declare class RepeatRange extends DescendantNode<RepeatRangeDefinition, R
      * @see {@link isSelfRelevant}
      */
     isSelfReadonly: Accessor<boolean>;
-    private readonly emptyRangeEvaluationContext;
-    /**
-     * @see {@link isSelfRelevant}
-     */
-    private readonly isEmptyRangeSelfRelevant;
     /**
      * A repeat range does not exist in the primary instance tree. A `relevant`
      * expression applies to each {@link RepeatInstance} child of the repeat
@@ -94,7 +110,7 @@ export declare class RepeatRange extends DescendantNode<RepeatRangeDefinition, R
      * theory it could vary depending on form structure and runtime state).
      */
     readonly isSelfRelevant: Accessor<boolean>;
-    readonly nodeType = "repeat-range";
+    abstract readonly nodeType: BaseRepeatRangeNodeType<Definition>;
     /**
      * @todo RepeatRange*, RepeatInstance* (and RepeatTemplate*) all share the
      * same body element, and thus all share the same definition `bodyElement`. As
@@ -128,31 +144,16 @@ export declare class RepeatRange extends DescendantNode<RepeatRangeDefinition, R
      * All of the above creates considerable ambiguity about where "repeat
      * appearances" should apply, under which circumstances.
      */
-    readonly appearances: RepeatRangeNodeAppearances;
+    abstract readonly appearances: NodeAppearances<Definition>;
     readonly currentState: MaterializedChildren<CurrentState<RepeatRangeStateSpec>, RepeatInstance>;
-    constructor(parent: GeneralParentNode, definition: RepeatRangeDefinition);
-    private getLastIndex;
+    abstract readonly validationState: AncestorNodeValidationState;
+    constructor(parent: DescendantNodeParent<Definition>, definition: Definition);
+    protected getLastIndex(): number;
     protected initializeContextNode(parentContextNode: Element): Element;
     getInstanceIndex(instance: RepeatInstance): number;
-    addInstances(afterIndex?: number, count?: number, definition?: RepeatDefinition): Root;
-    /**
-     * Removes the {@link RepeatInstance}s corresponding to the specified range of
-     * indexes, and then removes those repeat instances from the repeat range's
-     * own children state in that order:
-     *
-     * 1. Identify the set of {@link RepeatInstance}s to be removed.
-     *
-     * 2. For each {@link RepeatInstance} pending removal, perform that node's
-     *    removal logic. @see {@link RepeatInstance.remove} for more detail.
-     *
-     * 3. Finalize update to the repeat range's own {@link childrenState},
-     *    omitting those {@link RepeatInstance}s which were removed.
-     *
-     * This ordering ensures a consistent representation of state is established
-     * prior to any downstream reactive updates, and ensures that removed nodes'
-     * reactivity is cleaned up.
-     */
-    removeInstances(startIndex: number, count?: number): Root;
+    private createChildren;
+    protected addChildren(afterIndex: number, definitions: readonly RepeatDefinition[]): readonly RepeatInstance[];
+    protected removeChildren(startIndex: number, count: number): readonly RepeatInstance[];
     subscribe(): void;
     getChildren(): readonly RepeatInstance[];
 }

package/dist/instance/{RepeatInstance.d.ts → repeat/RepeatInstance.d.ts}

@@ -1,16 +1,16 @@
 import { Accessor } from 'solid-js';
-import { RepeatDefinition, RepeatInstanceNode, RepeatInstanceNodeAppearances } from '../client/RepeatInstanceNode.ts';
-import { TextRange } from '../index.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 { RepeatRange } from './RepeatRange.ts';
-import { DescendantNodeSharedStateSpec, DescendantNode } from './abstract/DescendantNode.ts';
-import { AnyChildNode, GeneralChildNode } from './hierarchy.ts';
-import { NodeID } from './identity.ts';
-import { EvaluationContext } from './internal-api/EvaluationContext.ts';
-import { SubscribableDependency } from './internal-api/SubscribableDependency.ts';
+import { RepeatDefinition, RepeatInstanceNode, RepeatInstanceNodeAppearances } from '../../client/repeat/RepeatInstanceNode.ts';
+import { TextRange } from '../../client/TextRange.ts';
+import { AncestorNodeValidationState } from '../../client/validation.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 { AnyChildNode, GeneralChildNode, RepeatRange } from '../hierarchy.ts';
+import { NodeID } from '../identity.ts';
+import { EvaluationContext } from '../internal-api/EvaluationContext.ts';
+import { SubscribableDependency } from '../internal-api/SubscribableDependency.ts';
 
 export type { RepeatDefinition };
 interface RepeatInstanceStateSpec extends DescendantNodeSharedStateSpec {
@@ -57,6 +57,7 @@ export declare class RepeatInstance extends DescendantNode<RepeatDefinition, Rep
      */
     readonly appearances: RepeatInstanceNodeAppearances;
     readonly currentState: MaterializedChildren<CurrentState<RepeatInstanceStateSpec>, GeneralChildNode>;
+    readonly validationState: AncestorNodeValidationState;
     constructor(parent: RepeatRange, definition: RepeatDefinition, options: RepeatInstanceOptions);
     protected initializeContextNode(parentContextNode: Element, nodeName: string): Element;
     subscribe(): void;

package/dist/instance/repeat/RepeatRangeControlled.d.ts

@@ -0,0 +1,16 @@
+import { RepeatRangeNodeAppearances } from '../../client/repeat/BaseRepeatRangeNode.ts';
+import { RepeatRangeControlledNode } from '../../client/repeat/RepeatRangeControlledNode.ts';
+import { AncestorNodeValidationState } from '../../client/validation.ts';
+import { ControlledRepeatRangeDefinition } from '../../model/RepeatRangeDefinition.ts';
+import { GeneralParentNode } from '../hierarchy.ts';
+import { EvaluationContext } from '../internal-api/EvaluationContext.ts';
+import { SubscribableDependency } from '../internal-api/SubscribableDependency.ts';
+import { BaseRepeatRange } from './BaseRepeatRange.ts';
+
+export declare class RepeatRangeControlled extends BaseRepeatRange<ControlledRepeatRangeDefinition> implements RepeatRangeControlledNode, EvaluationContext, SubscribableDependency {
+    readonly nodeType = "repeat-range:controlled";
+    readonly appearances: RepeatRangeNodeAppearances;
+    readonly validationState: AncestorNodeValidationState;
+    constructor(parent: GeneralParentNode, definition: ControlledRepeatRangeDefinition);
+    private initializeControlledChildrenState;
+}

package/dist/instance/repeat/RepeatRangeUncontrolled.d.ts

@@ -0,0 +1,35 @@
+import { RepeatRangeNodeAppearances } from '../../client/repeat/BaseRepeatRangeNode.ts';
+import { RepeatRangeUncontrolledNode } from '../../client/repeat/RepeatRangeUncontrolledNode.ts';
+import { AncestorNodeValidationState } from '../../client/validation.ts';
+import { UncontrolledRepeatRangeDefinition } from '../../model/RepeatRangeDefinition.ts';
+import { GeneralParentNode } from '../hierarchy.ts';
+import { EvaluationContext } from '../internal-api/EvaluationContext.ts';
+import { SubscribableDependency } from '../internal-api/SubscribableDependency.ts';
+import { Root } from '../Root.ts';
+import { BaseRepeatRange } from './BaseRepeatRange.ts';
+
+export declare class RepeatRangeUncontrolled extends BaseRepeatRange<UncontrolledRepeatRangeDefinition> implements RepeatRangeUncontrolledNode, EvaluationContext, SubscribableDependency {
+    readonly nodeType = "repeat-range:uncontrolled";
+    readonly appearances: RepeatRangeNodeAppearances;
+    readonly validationState: AncestorNodeValidationState;
+    constructor(parent: GeneralParentNode, definition: UncontrolledRepeatRangeDefinition);
+    addInstances(afterIndex?: number, count?: number): Root;
+    /**
+     * Removes the {@link RepeatInstance}s corresponding to the specified range of
+     * indexes, and then removes those repeat instances from the repeat range's
+     * own children state in that order:
+     *
+     * 1. Identify the set of {@link RepeatInstance}s to be removed.
+     *
+     * 2. For each {@link RepeatInstance} pending removal, perform that node's
+     *    removal logic. @see {@link RepeatInstance.remove} for more detail.
+     *
+     * 3. Finalize update to the repeat range's own {@link childrenState},
+     *    omitting those {@link RepeatInstance}s which were removed.
+     *
+     * This ordering ensures a consistent representation of state is established
+     * prior to any downstream reactive updates, and ensures that removed nodes'
+     * reactivity is cleaned up.
+     */
+    removeInstances(startIndex: number, count?: number): Root;
+}

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

@@ -1,11 +1,11 @@
-import { TextRange as ClientTextRange, TextChunk } from '../../client/TextRange.ts';
+import { TextRange as ClientTextRange, TextChunk, TextOrigin, TextRole } from '../../client/TextRange.ts';
 
-export type TextRole = 'hint' | 'label';
-export declare class TextRange<Role extends TextRole> implements ClientTextRange<Role> {
+export declare class TextRange<Role extends TextRole, Origin extends TextOrigin> implements ClientTextRange<Role, Origin> {
+    readonly origin: Origin;
     readonly role: Role;
     protected readonly chunks: readonly TextChunk[];
     [Symbol.iterator](): Generator<TextChunk, void, undefined>;
     get formatted(): Record<PropertyKey, unknown>;
     get asString(): string;
-    constructor(role: Role, chunks: readonly TextChunk[]);
+    constructor(origin: Origin, role: Role, chunks: readonly TextChunk[]);
 }

package/dist/lib/reactivity/createComputedExpression.d.ts

@@ -1,13 +1,18 @@
 import { Accessor } from 'solid-js';
 import { DependentExpression, DependentExpressionResultType } from '../../expression/DependentExpression.ts';
 import { EvaluationContext } from '../../instance/internal-api/EvaluationContext.ts';
+import { SubscribableDependency } from '../../instance/internal-api/SubscribableDependency.ts';
 
 interface ComputedExpressionResults {
     readonly boolean: boolean;
     readonly nodes: Node[];
+    readonly number: number;
     readonly string: string;
 }
 type EvaluatedExpression<Type extends DependentExpressionResultType> = ComputedExpressionResults[Type];
 type ComputedExpression<Type extends DependentExpressionResultType> = Accessor<EvaluatedExpression<Type>>;
-export declare const createComputedExpression: <Type extends "string" | "boolean" | "nodes">(context: EvaluationContext, dependentExpression: DependentExpression<Type>) => ComputedExpression<Type>;
+interface CreateComputedExpressionOptions {
+    readonly arbitraryDependencies?: readonly SubscribableDependency[];
+}
+export declare const createComputedExpression: <Type extends DependentExpressionResultType>(context: EvaluationContext, dependentExpression: DependentExpression<Type>, options?: CreateComputedExpressionOptions) => ComputedExpression<Type>;
 export {};

package/dist/lib/reactivity/createNoteReadonlyThunk.d.ts

@@ -0,0 +1,5 @@
+import { Accessor } from 'solid-js';
+import { EvaluationContext } from '../../instance/internal-api/EvaluationContext.ts';
+import { BindComputation } from '../../model/BindComputation.ts';
+
+export declare const createNoteReadonlyThunk: (context: EvaluationContext, readonlyDefinition: BindComputation<"readonly">) => Accessor<true>;

package/dist/lib/reactivity/node-state/createSharedNodeState.d.ts

@@ -16,7 +16,7 @@ export interface SharedNodeState<Spec extends StateSpec> {
     readonly currentState: CurrentState<Spec>;
     readonly setProperty: SetEnginePropertyState<Spec>;
 }
-interface SharedNodeStateOptions<Factory extends OpaqueReactiveObjectFactory, Spec extends StateSpec> {
+export interface SharedNodeStateOptions<Factory extends OpaqueReactiveObjectFactory, Spec extends StateSpec> {
     readonly clientStateFactory: SpecifiedClientStateFactory<Factory, Spec>;
 }
 export declare const createSharedNodeState: <Factory extends OpaqueReactiveObjectFactory, Spec extends StateSpec>(scope: ReactiveScope, spec: Spec, options: SharedNodeStateOptions<Factory, Spec>) => SharedNodeState<Spec>;