@getodk/xforms-engine 0.3.0 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getodk/xforms-engine",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "license": "Apache-2.0",
   "description": "XForms engine for ODK Web Forms",
   "type": "module",
@@ -29,7 +29,7 @@
     "README.md"
   ],
   "engines": {
-    "node": "^18.20.4 || ^20.15.1 || ^22.4.1",
+    "node": "^18.20.4 || ^20.17.0 || ^22.8.0",
     "yarn": "1.22.22"
   },
   "scripts": {
@@ -54,22 +54,22 @@
     "test:types": "tsc --project ./tsconfig.json --emitDeclarationOnly false --noEmit"
   },
   "dependencies": {
-    "solid-js": "^1.8.18"
+    "solid-js": "^1.8.22"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.8",
+    "@babel/core": "^7.25.2",
     "@getodk/tree-sitter-xpath": "0.1.2",
     "@getodk/xpath": "0.2.0",
-    "@playwright/test": "^1.45.1",
-    "@vitest/browser": "^2.0.2",
+    "@playwright/test": "^1.46.1",
+    "@vitest/browser": "^2.0.5",
     "babel-plugin-transform-jsbi-to-bigint": "^1.4.0",
     "http-server": "^14.1.1",
-    "jsdom": "^24.1.0",
-    "typedoc": "^0.26.4",
-    "vite": "^5.3.3",
-    "vite-plugin-dts": "^3.9.1",
+    "jsdom": "^25.0.0",
+    "typedoc": "^0.26.6",
+    "vite": "^5.4.3",
+    "vite-plugin-dts": "^4.1.0",
     "vite-plugin-no-bundle": "^4.0.0",
-    "vitest": "^2.0.2"
+    "vitest": "^2.0.5"
   },
   "peerDependencies": {
     "solid-js": "^1.8.18"

package/src/client/BaseNode.ts

@@ -1,5 +1,5 @@
 import type { TokenListParser } from '../lib/TokenListParser.ts';
-import type { AnyNodeDefinition } from '../model/NodeDefinition.ts';
+import type { AnyNodeDefinition } from '../parse/model/NodeDefinition.ts';
 import type { NodeAppearances } from './NodeAppearances.ts';
 import type { OpaqueReactiveObjectFactory } from './OpaqueReactiveObjectFactory.ts';
 import type { TextRange } from './TextRange.ts';

package/src/client/GroupNode.ts

@@ -1,5 +1,5 @@
-import type { AnyGroupElementDefinition } from '../body/BodyDefinition.ts';
-import type { SubtreeDefinition } from '../model/SubtreeDefinition.ts';
+import type { AnyGroupElementDefinition } from '../parse/body/BodyDefinition.ts';
+import type { SubtreeDefinition } from '../parse/model/SubtreeDefinition.ts';
 import type { BaseNode, BaseNodeState } from './BaseNode.ts';
 import type { NodeAppearances } from './NodeAppearances.ts';
 import type { RootNode } from './RootNode.ts';

package/src/client/ModelValueNode.ts

@@ -1,4 +1,4 @@
-import type { LeafNodeDefinition } from '../model/LeafNodeDefinition.ts';
+import type { LeafNodeDefinition } from '../parse/model/LeafNodeDefinition.ts';
 import type { BaseNode, BaseNodeState } from './BaseNode.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { RootNode } from './RootNode.ts';

package/src/client/NodeAppearances.ts

@@ -1,5 +1,5 @@
 import type { ParsedTokenList } from '../lib/TokenListParser.ts';
-import type { NodeDefinition } from '../model/NodeDefinition.ts';
+import type { NodeDefinition } from '../parse/model/NodeDefinition.ts';
 
 /**
  * - Provides a means to distinguish between internal and client-facing names

package/src/client/NoteNode.ts

@@ -1,5 +1,5 @@
-import type { InputDefinition } from '../body/control/InputDefinition.ts';
-import type { LeafNodeDefinition } from '../model/LeafNodeDefinition.ts';
+import type { InputDefinition } from '../parse/body/control/InputDefinition.ts';
+import type { LeafNodeDefinition } from '../parse/model/LeafNodeDefinition.ts';
 import type { BaseNode, BaseNodeState } from './BaseNode.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
 import type { NodeAppearances } from './NodeAppearances.ts';

package/src/client/RootNode.ts

@@ -1,5 +1,5 @@
-import type { BodyClassList } from '../body/BodyDefinition.ts';
-import type { RootDefinition } from '../model/RootDefinition.ts';
+import type { BodyClassList } from '../parse/body/BodyDefinition.ts';
+import type { RootDefinition } from '../parse/model/RootDefinition.ts';
 import type { BaseNode, BaseNodeState } from './BaseNode.ts';
 import type { ActiveLanguage, FormLanguage, FormLanguages } from './FormLanguage.ts';
 import type { GeneralChildNode } from './hierarchy.ts';

package/src/client/SelectNode.ts

@@ -1,5 +1,5 @@
-import type { AnySelectDefinition } from '../body/control/select/SelectDefinition.ts';
-import type { LeafNodeDefinition } from '../model/LeafNodeDefinition.ts';
+import type { AnySelectDefinition } from '../parse/body/control/select/SelectDefinition.ts';
+import type { LeafNodeDefinition } from '../parse/model/LeafNodeDefinition.ts';
 import type { BaseNode, BaseNodeState } from './BaseNode.ts';
 import type { NodeAppearances } from './NodeAppearances.ts';
 import type { RootNode } from './RootNode.ts';

package/src/client/StringNode.ts

@@ -1,5 +1,5 @@
-import type { InputDefinition } from '../body/control/InputDefinition.ts';
-import type { LeafNodeDefinition } from '../model/LeafNodeDefinition.ts';
+import type { InputDefinition } from '../parse/body/control/InputDefinition.ts';
+import type { LeafNodeDefinition } from '../parse/model/LeafNodeDefinition.ts';
 import type { BaseNode, BaseNodeState } from './BaseNode.ts';
 import type { NodeAppearances } from './NodeAppearances.ts';
 import type { RootNode } from './RootNode.ts';

package/src/client/SubtreeNode.ts

@@ -1,4 +1,4 @@
-import type { SubtreeDefinition as BaseSubtreeDefinition } from '../model/SubtreeDefinition.ts';
+import type { SubtreeDefinition as BaseSubtreeDefinition } from '../parse/model/SubtreeDefinition.ts';
 import type { BaseNode, BaseNodeState } from './BaseNode.ts';
 import type { RootNode } from './RootNode.ts';
 import type { GeneralChildNode, GeneralParentNode } from './hierarchy.ts';

package/src/client/TextRange.ts

@@ -24,7 +24,7 @@ import type { RootNodeState } from './RootNode.ts';
  *       Here, `is-translation-expr()` is a fictional shorthand for checking
  *       that the attribute's value is a valid `jr:itext(...)` FunctionCall
  *       expression. Note that, per spec, these attributes **do not accept
- *       arbitrary XPath expressions**! The non-translation case is  treated as
+ *       arbitrary XPath expressions**! The non-translation case is treated as
  *       static text, not parsed for e.g. an XPath [string] Literal expression.
  *       This is why we have introduced this 'translation' case, distinct from
  *       'reference', which previously handled translated labels and hints.
@@ -34,7 +34,7 @@ import type { RootNodeState } from './RootNode.ts';
  *
  *     - `h:body//label/@ref[is-translation-expr()]`
  *
- * - 'static':
+ * - 'literal':
  *   - `h:head//bind/@jr:constraintMsg[not(is-translation-expr())]`
  *   - `h:head//bind/@jr:requiredMsg[not(is-translation-expr())]`
  *   - `h:body//label/text()`
@@ -60,11 +60,10 @@ import type { RootNodeState } from './RootNode.ts';
  */
 // prettier-ignore
 export type TextChunkSource =
-	// eslint-disable-next-line @typescript-eslint/sort-type-constituents
+	| 'literal'
 	| 'output'
 	| 'reference'
-	| 'translation'
-	| 'static';
+	| 'translation';
 
 /**
  * @todo This (and everything else to do with {@link TextRange}s is for

package/src/client/TriggerNode.ts

@@ -0,0 +1,29 @@
+import type { UnknownAppearanceDefinition } from '../parse/body/appearance/unknownAppearanceParser.ts';
+import type { TriggerControlDefinition } from '../parse/body/control/TriggerControlDefinition.ts';
+import type { LeafNodeDefinition } from '../parse/model/LeafNodeDefinition.ts';
+import type { BaseNode, BaseNodeState } from './BaseNode.ts';
+import type { GeneralParentNode } from './hierarchy.ts';
+import type { RootNode } from './RootNode.ts';
+import type { LeafNodeValidationState } from './validation.ts';
+
+export interface TriggerNodeState extends BaseNodeState {
+	get children(): null;
+	get valueOptions(): null;
+	get value(): boolean;
+}
+
+export interface TriggerNodeDefinition extends LeafNodeDefinition {
+	readonly bodyElement: TriggerControlDefinition;
+}
+
+export interface TriggerNode extends BaseNode {
+	readonly nodeType: 'trigger';
+	readonly definition: TriggerNodeDefinition;
+	readonly appearances: UnknownAppearanceDefinition;
+	readonly root: RootNode;
+	readonly parent: GeneralParentNode;
+	readonly currentState: TriggerNodeState;
+	readonly validationState: LeafNodeValidationState;
+
+	setValue(value: boolean): RootNode;
+}

package/src/client/hierarchy.ts

@@ -9,16 +9,28 @@ import type { RootNode } from './RootNode.ts';
 import type { SelectNode } from './SelectNode.ts';
 import type { StringNode } from './StringNode.ts';
 import type { SubtreeNode } from './SubtreeNode.ts';
+import type { TriggerNode } from './TriggerNode.ts';
+import type { RangeNode } from './unsupported/RangeNode.ts';
+import type { RankNode } from './unsupported/RankNode.ts';
+import type { UploadNode } from './unsupported/UploadNode.ts';
+
+// prettier-ignore
+export type AnyUnsupportedControlNode =
+	| RangeNode
+	| RankNode
+	| UploadNode;
 
 // prettier-ignore
 export type AnyControlNode =
 	| NoteNode
 	| SelectNode
-	| StringNode;
+	| StringNode
+	| TriggerNode;
 
 // prettier-ignore
 export type AnyLeafNode =
 	| AnyControlNode
+	| AnyUnsupportedControlNode
 	| ModelValueNode;
 
 // prettier-ignore

package/src/client/node-types.ts

@@ -1,3 +1,9 @@
+// prettier-ignore
+export type UnsupportedControlNodeType =
+	| 'range'
+	| 'rank'
+	| 'upload';
+
 // prettier-ignore
 export type RepeatRangeNodeType =
 	| 'repeat-range:controlled'
@@ -14,4 +20,6 @@ export type InstanceNodeType =
 	| 'model-value'
 	| 'note'
 	| 'select'
-	| 'string';
+	| 'string'
+	| 'trigger'
+	| UnsupportedControlNodeType;

package/src/client/repeat/BaseRepeatRangeNode.ts

@@ -1,4 +1,4 @@
-import type { AnyRepeatRangeDefinition } from '../../model/RepeatRangeDefinition.ts';
+import type { AnyRepeatRangeDefinition } from '../../parse/model/RepeatRangeDefinition.ts';
 import type { BaseNode, BaseNodeState } from '../BaseNode.ts';
 import type { NodeAppearances } from '../NodeAppearances.ts';
 import type { RootNode } from '../RootNode.ts';

package/src/client/repeat/RepeatInstanceNode.ts

@@ -1,5 +1,5 @@
-import type { RepeatInstanceDefinition } from '../../model/RepeatInstanceDefinition.ts';
-import type { RepeatTemplateDefinition } from '../../model/RepeatTemplateDefinition.ts';
+import type { RepeatInstanceDefinition } from '../../parse/model/RepeatInstanceDefinition.ts';
+import type { RepeatTemplateDefinition } from '../../parse/model/RepeatTemplateDefinition.ts';
 import type { BaseNode, BaseNodeState } from '../BaseNode.ts';
 import type { GeneralChildNode, RepeatRangeNode } from '../hierarchy.ts';
 import type { NodeAppearances } from '../NodeAppearances.ts';

package/src/client/repeat/RepeatRangeControlledNode.ts

@@ -1,4 +1,4 @@
-import type { ControlledRepeatRangeDefinition } from '../../model/RepeatRangeDefinition.ts';
+import type { ControlledRepeatRangeDefinition } from '../../parse/model/RepeatRangeDefinition.ts';
 import type { BaseRepeatRangeNode, BaseRepeatRangeNodeState } from './BaseRepeatRangeNode.ts';
 import type { RepeatRangeUncontrolledNode } from './RepeatRangeUncontrolledNode.ts';
 

package/src/client/repeat/RepeatRangeUncontrolledNode.ts

@@ -1,4 +1,4 @@
-import type { UncontrolledRepeatRangeDefinition } from '../../model/RepeatRangeDefinition.ts';
+import type { UncontrolledRepeatRangeDefinition } from '../../parse/model/RepeatRangeDefinition.ts';
 import type { RootNode } from '../RootNode.ts';
 import type { BaseRepeatRangeNode, BaseRepeatRangeNodeState } from './BaseRepeatRangeNode.ts';
 

package/src/client/unsupported/RangeNode.ts

@@ -0,0 +1,14 @@
+import type { RangeControlDefinition } from '../../parse/body/control/RangeControlDefinition.ts';
+import type {
+	UnsupportedControlDefinition,
+	UnsupportedControlNode,
+} from './UnsupportedControlNode.ts';
+
+export interface RangeNodeDefinition extends UnsupportedControlDefinition {
+	readonly bodyElement: RangeControlDefinition;
+}
+
+export interface RangeNode extends UnsupportedControlNode {
+	readonly nodeType: 'range';
+	readonly definition: RangeNodeDefinition;
+}

package/src/client/unsupported/RankNode.ts

@@ -0,0 +1,14 @@
+import type { RankControlDefinition } from '../../parse/body/control/RankControlDefinition.ts';
+import type {
+	UnsupportedControlDefinition,
+	UnsupportedControlNode,
+} from './UnsupportedControlNode.ts';
+
+export interface RankNodeDefinition extends UnsupportedControlDefinition {
+	readonly bodyElement: RankControlDefinition;
+}
+
+export interface RankNode extends UnsupportedControlNode {
+	readonly nodeType: 'rank';
+	readonly definition: RankNodeDefinition;
+}

package/src/client/unsupported/UnsupportedControlNode.ts

@@ -0,0 +1,40 @@
+import type { UnknownAppearanceDefinition } from '../../parse/body/appearance/unknownAppearanceParser.ts';
+import type { RangeControlDefinition } from '../../parse/body/control/RangeControlDefinition.ts';
+import type { RankControlDefinition } from '../../parse/body/control/RankControlDefinition.ts';
+import type { UploadControlDefinition } from '../../parse/body/control/UploadControlDefinition.ts';
+import type { LeafNodeDefinition } from '../../parse/model/LeafNodeDefinition.ts';
+import type { BaseNode, BaseNodeState } from '../BaseNode.ts';
+import type { RootNode } from '../RootNode.ts';
+import type { GeneralParentNode } from '../hierarchy.ts';
+import type { UnsupportedControlNodeType } from '../node-types.ts';
+import type { LeafNodeValidationState } from '../validation.ts';
+
+export interface UnsupportedControlNodeState extends BaseNodeState {
+	get children(): null;
+	get valueOptions(): unknown;
+	get value(): unknown;
+}
+
+export type UnsupportedControlElementDefinition =
+	| RangeControlDefinition
+	| RankControlDefinition
+	| UploadControlDefinition;
+
+export interface UnsupportedControlDefinition extends LeafNodeDefinition {
+	readonly bodyElement: UnsupportedControlElementDefinition;
+}
+
+/**
+ * Stub node, for form controls pending further engine support.
+ */
+export interface UnsupportedControlNode extends BaseNode {
+	readonly nodeType: UnsupportedControlNodeType;
+	readonly appearances: UnknownAppearanceDefinition;
+	readonly definition: UnsupportedControlDefinition;
+	readonly root: RootNode;
+	readonly parent: GeneralParentNode;
+	readonly currentState: UnsupportedControlNodeState;
+	readonly validationState: LeafNodeValidationState;
+
+	setValue?(value: never): never;
+}

package/src/client/unsupported/UploadNode.ts

@@ -0,0 +1,14 @@
+import type { UploadControlDefinition } from '../../parse/body/control/UploadControlDefinition.ts';
+import type {
+	UnsupportedControlDefinition,
+	UnsupportedControlNode,
+} from './UnsupportedControlNode.ts';
+
+export interface UploadNodeDefinition extends UnsupportedControlDefinition {
+	readonly bodyElement: UploadControlDefinition;
+}
+
+export interface UploadNode extends UnsupportedControlNode {
+	readonly nodeType: 'upload';
+	readonly definition: UploadNodeDefinition;
+}

package/src/index.ts

@@ -13,6 +13,7 @@ export type {
 	AnyLeafNode,
 	AnyNode,
 	AnyParentNode,
+	AnyUnsupportedControlNode,
 	GeneralChildNode,
 	GeneralParentNode,
 	RepeatRangeNode,
@@ -29,6 +30,10 @@ export type * from './client/SelectNode.ts';
 export type * from './client/StringNode.ts';
 export type * from './client/SubtreeNode.ts';
 export type * from './client/TextRange.ts';
+export type * from './client/TriggerNode.ts';
+export type * from './client/unsupported/RangeNode.ts';
+export type * from './client/unsupported/RankNode.ts';
+export type * from './client/unsupported/UploadNode.ts';
 export type * from './client/validation.ts';
 
 // TODO: notwithstanding potential conflicts with parallel work on `web-forms`
@@ -39,4 +44,4 @@ export type * from './client/validation.ts';
 export type {
 	AnySelectDefinition,
 	SelectDefinition,
-} from './body/control/select/SelectDefinition.ts';
+} from './parse/body/control/select/SelectDefinition.ts';

package/src/instance/ModelValue.ts

@@ -9,7 +9,7 @@ import { createSharedNodeState } from '../lib/reactivity/node-state/createShared
 import type { SimpleAtomicState } from '../lib/reactivity/types.ts';
 import type { SharedValidationState } from '../lib/reactivity/validation/createValidation.ts';
 import { createValidationState } from '../lib/reactivity/validation/createValidation.ts';
-import type { LeafNodeDefinition } from '../model/LeafNodeDefinition.ts';
+import type { LeafNodeDefinition } from '../parse/model/LeafNodeDefinition.ts';
 import type { DescendantNodeStateSpec } from './abstract/DescendantNode.ts';
 import { DescendantNode } from './abstract/DescendantNode.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
@@ -88,11 +88,11 @@ export class ModelValue
 		this.validation = createValidationState(this, sharedStateOptions);
 	}
 
+	// ValidationContext
 	getViolation(): AnyViolation | null {
 		return this.validation.engineState.violation;
 	}
 
-	// ValidationContext
 	isBlank(): boolean {
 		return this.engineState.value === '';
 	}

package/src/instance/Note.ts

@@ -16,7 +16,7 @@ import { createNoteText, type ComputedNoteText } from '../lib/reactivity/text/cr
 import type { SimpleAtomicState } from '../lib/reactivity/types.ts';
 import type { SharedValidationState } from '../lib/reactivity/validation/createValidation.ts';
 import { createValidationState } from '../lib/reactivity/validation/createValidation.ts';
-import type { NoteNodeDefinition } from '../parse/NoteNodeDefinition.ts';
+import type { NoteNodeDefinition } from '../parse/model/NoteNodeDefinition.ts';
 import type { DescendantNodeStateSpec } from './abstract/DescendantNode.ts';
 import { DescendantNode } from './abstract/DescendantNode.ts';
 import type { GeneralParentNode } from './hierarchy.ts';
@@ -126,11 +126,11 @@ export class Note
 		this.validation = createValidationState(this, sharedStateOptions);
 	}
 
+	// ValidationContext
 	getViolation(): AnyViolation | null {
 		return this.validation.engineState.violation;
 	}
 
-	// ValidationContext
 	isBlank(): boolean {
 		return this.engineState.value === '';
 	}

package/src/instance/Root.ts

@@ -1,8 +1,6 @@
 import type { XFormsXPathEvaluator } from '@getodk/xpath';
 import type { Accessor, Signal } from 'solid-js';
 import { createSignal } from 'solid-js';
-import type { XFormDOM } from '../XFormDOM.ts';
-import type { BodyClassList } from '../body/BodyDefinition.ts';
 import type { ActiveLanguage, FormLanguage, FormLanguages } from '../client/FormLanguage.ts';
 import type { RootNode } from '../client/RootNode.ts';
 import type { AncestorNodeValidationState } from '../client/validation.ts';
@@ -15,7 +13,9 @@ import type { EngineState } from '../lib/reactivity/node-state/createEngineState
 import type { SharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
 import { createSharedNodeState } from '../lib/reactivity/node-state/createSharedNodeState.ts';
 import { createAggregatedViolations } from '../lib/reactivity/validation/createAggregatedViolations.ts';
-import type { RootDefinition } from '../model/RootDefinition.ts';
+import type { BodyClassList } from '../parse/body/BodyDefinition.ts';
+import type { RootDefinition } from '../parse/model/RootDefinition.ts';
+import type { XFormDOM } from '../parse/XFormDOM.ts';
 import { InstanceNode } from './abstract/InstanceNode.ts';
 import { buildChildren } from './children.ts';
 import type { GeneralChildNode } from './hierarchy.ts';
@@ -221,6 +221,10 @@ export class Root
 	override subscribe(): void {
 		super.subscribe();
 
+		// TODO: typescript-eslint is right to object to this! We should _at least_
+		// make internal reactive reads obvious, i.e. function calls.
+		//
+		// eslint-disable-next-line @typescript-eslint/no-unused-expressions -- read == subscribe
 		this.engineState.activeLanguage;
 	}
 }

package/src/instance/SelectField.ts

@@ -1,7 +1,6 @@
 import { xmlXPathWhitespaceSeparatedList } from '@getodk/common/lib/string/whitespace.ts';
 import type { Accessor } from 'solid-js';
 import { untrack } from 'solid-js';
-import type { AnySelectDefinition } from '../body/control/select/SelectDefinition.ts';
 import type { SelectItem, SelectNode, SelectNodeAppearances } from '../client/SelectNode.ts';
 import type { TextRange } from '../client/TextRange.ts';
 import type { AnyViolation, LeafNodeValidationState } from '../client/validation.ts';
@@ -16,7 +15,8 @@ import { createNodeLabel } from '../lib/reactivity/text/createNodeLabel.ts';
 import type { SimpleAtomicState } from '../lib/reactivity/types.ts';
 import type { SharedValidationState } from '../lib/reactivity/validation/createValidation.ts';
 import { createValidationState } from '../lib/reactivity/validation/createValidation.ts';
-import type { LeafNodeDefinition } from '../model/LeafNodeDefinition.ts';
+import type { AnySelectDefinition } from '../parse/body/control/select/SelectDefinition.ts';
+import type { LeafNodeDefinition } from '../parse/model/LeafNodeDefinition.ts';
 import type { Root } from './Root.ts';
 import type { DescendantNodeStateSpec } from './abstract/DescendantNode.ts';
 import { DescendantNode } from './abstract/DescendantNode.ts';
@@ -127,10 +127,6 @@ export class SelectField
 		this.validation = createValidationState(this, sharedStateOptions);
 	}
 
-	getViolation(): AnyViolation | null {
-		return this.validation.engineState.violation;
-	}
-
 	protected getSelectItemsByValue(
 		valueOptions: readonly SelectItem[] = this.getValueOptions()
 	): ReadonlyMap<string, SelectItem> {
@@ -220,6 +216,10 @@ export class SelectField
 	}
 
 	// ValidationContext
+	getViolation(): AnyViolation | null {
+		return this.validation.engineState.violation;
+	}
+
 	isBlank(): boolean {
 		return this.engineState.value.length === 0;
 	}

package/src/instance/StringField.ts

@@ -1,6 +1,5 @@
 import { identity } from '@getodk/common/lib/identity.ts';
 import type { Accessor } from 'solid-js';
-import type { InputDefinition } from '../body/control/InputDefinition.ts';
 import type { StringNode, StringNodeAppearances } from '../client/StringNode.ts';
 import type { TextRange } from '../client/TextRange.ts';
 import type { AnyViolation, LeafNodeValidationState } from '../client/validation.ts';
@@ -14,7 +13,8 @@ import { createNodeLabel } from '../lib/reactivity/text/createNodeLabel.ts';
 import type { SimpleAtomicState } from '../lib/reactivity/types.ts';
 import type { SharedValidationState } from '../lib/reactivity/validation/createValidation.ts';
 import { createValidationState } from '../lib/reactivity/validation/createValidation.ts';
-import type { LeafNodeDefinition } from '../model/LeafNodeDefinition.ts';
+import type { InputDefinition } from '../parse/body/control/InputDefinition.ts';
+import type { LeafNodeDefinition } from '../parse/model/LeafNodeDefinition.ts';
 import type { Root } from './Root.ts';
 import type { DescendantNodeStateSpec } from './abstract/DescendantNode.ts';
 import { DescendantNode } from './abstract/DescendantNode.ts';
@@ -97,11 +97,11 @@ export class StringField
 		this.validation = createValidationState(this, sharedStateOptions);
 	}
 
+	// ValidationContext
 	getViolation(): AnyViolation | null {
 		return this.validation.engineState.violation;
 	}
 
-	// ValidationContext
 	isBlank(): boolean {
 		return this.engineState.value === '';
 	}