@getodk/xforms-engine 0.4.0 → 0.5.0

package/src/lib/codecs/ValueCodec.ts

@@ -0,0 +1,106 @@
+import type { Accessor } from 'solid-js';
+import type { ValueType } from '../../client/ValueType.ts';
+import type { DecodeInstanceValue } from '../../instance/internal-api/InstanceValueContext.ts';
+import type { SimpleAtomicState } from '../reactivity/types.ts';
+
+type CodecEncoder<RuntimeInputValue> = (input: RuntimeInputValue) => string;
+
+type CodecDecoder<RuntimeValue> = (value: string) => RuntimeValue;
+
+type RuntimeValueAccessor<RuntimeValue> = Accessor<RuntimeValue>;
+
+export type RuntimeValueSetter<
+	RuntimeValue extends RuntimeInputValue,
+	RuntimeInputValue = RuntimeValue,
+> = (input: RuntimeInputValue) => RuntimeValue;
+
+export type RuntimeValueState<
+	RuntimeValue extends RuntimeInputValue,
+	RuntimeInputValue = RuntimeValue,
+> = readonly [
+	get: RuntimeValueAccessor<RuntimeValue>,
+	set: RuntimeValueSetter<RuntimeValue, RuntimeInputValue>,
+];
+
+export type CreateRuntimeValueState<
+	RuntimeValue extends RuntimeInputValue,
+	RuntimeInputValue = RuntimeValue,
+> = (
+	instanceState: SimpleAtomicState<string>
+) => RuntimeValueState<RuntimeValue, RuntimeInputValue>;
+
+type RuntimeValueStateFactory<
+	RuntimeValue extends RuntimeInputValue,
+	RuntimeInputValue = RuntimeValue,
+> = (
+	encodeValue: CodecEncoder<RuntimeInputValue>,
+	decodeValue: CodecDecoder<RuntimeValue>
+) => CreateRuntimeValueState<RuntimeValue, RuntimeInputValue>;
+
+type DecodeInstanceValueFactory<
+	RuntimeValue extends RuntimeInputValue,
+	RuntimeInputValue = RuntimeValue,
+> = (
+	encodeValue: CodecEncoder<RuntimeInputValue>,
+	decodeValue: CodecDecoder<RuntimeValue>
+) => DecodeInstanceValue;
+
+interface ValueCodecOptions<RuntimeValue extends RuntimeInputValue, RuntimeInputValue> {
+	readonly decodeInstanceValueFactory?: DecodeInstanceValueFactory<RuntimeValue, RuntimeInputValue>;
+	readonly runtimeValueStateFactory?: RuntimeValueStateFactory<RuntimeValue, RuntimeInputValue>;
+}
+
+export abstract class ValueCodec<
+	V extends ValueType,
+	RuntimeValue extends RuntimeInputValue,
+	RuntimeInputValue = RuntimeValue,
+> {
+	protected readonly defaultRuntimeValueStateFactory: RuntimeValueStateFactory<
+		RuntimeValue,
+		RuntimeInputValue
+	> = (encodeValue, decodeValue) => {
+		return (instanceState) => {
+			const [getInstanceValue, setInstanceValue] = instanceState;
+
+			const getValue = (): RuntimeValue => {
+				return decodeValue(getInstanceValue());
+			};
+
+			const setValue = (runtimeValue: RuntimeInputValue): RuntimeValue => {
+				const encodedValue = encodeValue(runtimeValue);
+				const persistedValue = setInstanceValue(encodedValue);
+
+				return decodeValue(persistedValue);
+			};
+
+			return [getValue, setValue];
+		};
+	};
+
+	protected readonly defaultDecodeInstanceValueFactory: DecodeInstanceValueFactory<
+		RuntimeValue,
+		RuntimeInputValue
+	> = (encodeValue, decodeValue) => {
+		return (instanceValue) => {
+			return encodeValue(decodeValue(instanceValue));
+		};
+	};
+
+	readonly decodeInstanceValue: DecodeInstanceValue;
+	readonly createRuntimeValueState: CreateRuntimeValueState<RuntimeValue, RuntimeInputValue>;
+
+	constructor(
+		readonly valueType: V,
+		readonly encodeValue: CodecEncoder<RuntimeInputValue>,
+		readonly decodeValue: CodecDecoder<RuntimeValue>,
+		options: ValueCodecOptions<RuntimeValue, RuntimeInputValue> = {}
+	) {
+		const {
+			decodeInstanceValueFactory = this.defaultDecodeInstanceValueFactory,
+			runtimeValueStateFactory = this.defaultRuntimeValueStateFactory,
+		} = options;
+
+		this.decodeInstanceValue = decodeInstanceValueFactory(encodeValue, decodeValue);
+		this.createRuntimeValueState = runtimeValueStateFactory(encodeValue, decodeValue);
+	}
+}

package/src/lib/codecs/ValueTypePlaceholderCodec.ts

@@ -0,0 +1,19 @@
+import { identity } from '@getodk/common/lib/identity.ts';
+import type { ValueType } from '../../client/ValueType.ts';
+import { ValueCodec } from './ValueCodec.ts';
+
+/**
+ * Provides fallback functionality where a {@link ValueCodec} is expected, for
+ * those {@link ValueType | value types} which are still pending implementation.
+ * This allows consistent use of the {@link ValueCodec} interface while
+ * maintaining the current behavior of treating those unimplemented value types
+ * as string values.
+ */
+export class ValueTypePlaceholderCodec<V extends ValueType> extends ValueCodec<V, string, string> {
+	constructor(valueType: V) {
+		super(valueType, identity, identity, {
+			decodeInstanceValueFactory: () => identity,
+			runtimeValueStateFactory: () => identity,
+		});
+	}
+}

package/src/lib/codecs/getSharedValueCodec.ts

@@ -0,0 +1,77 @@
+import type { ValueType } from '../../client/ValueType.ts';
+import {
+	DecimalValueCodec,
+	type DecimalInputValue,
+	type DecimalRuntimeValue,
+} from './DecimalValueCodec.ts';
+import { IntValueCodec, type IntInputValue, type IntRuntimeValue } from './IntValueCodec.ts';
+import { StringValueCodec } from './StringValueCodec.ts';
+import type { ValueCodec } from './ValueCodec.ts';
+import { ValueTypePlaceholderCodec } from './ValueTypePlaceholderCodec.ts';
+
+interface RuntimeValuesByType {
+	readonly string: string;
+	readonly int: IntRuntimeValue;
+	readonly decimal: DecimalRuntimeValue;
+	readonly boolean: string;
+	readonly date: string;
+	readonly time: string;
+	readonly dateTime: string;
+	readonly geopoint: string;
+	readonly geotrace: string;
+	readonly geoshape: string;
+	readonly binary: string;
+	readonly barcode: string;
+	readonly intent: string;
+}
+
+export type RuntimeValue<V extends ValueType> = RuntimeValuesByType[V];
+
+interface RuntimeInputValuesByType {
+	readonly string: string;
+	readonly int: IntInputValue;
+	readonly decimal: DecimalInputValue;
+	readonly boolean: string;
+	readonly date: string;
+	readonly time: string;
+	readonly dateTime: string;
+	readonly geopoint: string;
+	readonly geotrace: string;
+	readonly geoshape: string;
+	readonly binary: string;
+	readonly barcode: string;
+	readonly intent: string;
+}
+
+export type RuntimeInputValue<V extends ValueType> = RuntimeInputValuesByType[V];
+
+type SharedValueCodecs = {
+	readonly [V in ValueType]: ValueCodec<V, RuntimeValue<V>, RuntimeInputValue<V>>;
+};
+
+export type SharedValueCodec<V extends ValueType> = SharedValueCodecs[V];
+
+/**
+ * Provides codecs for each {@link ValueType | value type}, for nodes with a
+ * common representation of those value types.
+ */
+export const sharedValueCodecs: SharedValueCodecs = {
+	string: new StringValueCodec(),
+
+	int: new IntValueCodec(),
+	decimal: new DecimalValueCodec(),
+	boolean: new ValueTypePlaceholderCodec('boolean'),
+	date: new ValueTypePlaceholderCodec('date'),
+	time: new ValueTypePlaceholderCodec('time'),
+	dateTime: new ValueTypePlaceholderCodec('dateTime'),
+	geopoint: new ValueTypePlaceholderCodec('geopoint'),
+	geotrace: new ValueTypePlaceholderCodec('geotrace'),
+	geoshape: new ValueTypePlaceholderCodec('geoshape'),
+	binary: new ValueTypePlaceholderCodec('binary'),
+	barcode: new ValueTypePlaceholderCodec('barcode'),
+	intent: new ValueTypePlaceholderCodec('intent'),
+};
+
+export const getSharedValueCodec = <V extends ValueType>(valueType: V): SharedValueCodec<V> => {
+	return sharedValueCodecs[valueType];
+};

package/src/lib/dom/query.ts

@@ -15,6 +15,7 @@ const repeatGroupLabelLookup = new ScopedElementLookup(
 );
 const repeatLookup = new ScopedElementLookup(':scope > repeat[nodeset]', 'repeat[nodeset]');
 const valueLookup = new ScopedElementLookup(':scope > value', 'value');
+const submissionLookup = new ScopedElementLookup(':scope > submission', 'submission');
 
 export interface HintElement extends LocalNamedElement<'hint'> {}
 
@@ -60,3 +61,9 @@ export const getRepeatElement = (parent: Element): RepeatElement | null => {
 export const getValueElement = (parent: ItemElement | ItemsetElement): ValueElement | null => {
 	return valueLookup.getElement<ValueElement>(parent);
 };
+
+export interface SubmissionElement extends LocalNamedElement<'submission'> {}
+
+export const getSubmissionElement = (parent: Element): SubmissionElement | null => {
+	return submissionLookup.getElement<SubmissionElement>(parent);
+};

package/src/lib/reactivity/createChildrenState.ts

@@ -1,8 +1,8 @@
 import type { Accessor, Setter, Signal } from 'solid-js';
 import { createSignal } from 'solid-js';
+import type { FormNodeID } from '../../client/identity.ts';
 import type { OpaqueReactiveObjectFactory } from '../../index.ts';
 import type { AnyChildNode, AnyParentNode } from '../../instance/hierarchy.ts';
-import type { NodeID } from '../../instance/identity.ts';
 import type { materializeCurrentStateChildren } from './materializeCurrentStateChildren.ts';
 import type { ClientState } from './node-state/createClientState.ts';
 import type { CurrentState } from './node-state/createCurrentState.ts';
@@ -12,14 +12,15 @@ export interface ChildrenState<Child extends AnyChildNode> {
 	readonly children: Signal<readonly Child[]>;
 	readonly getChildren: Accessor<readonly Child[]>;
 	readonly setChildren: Setter<readonly Child[]>;
-	readonly childIds: Accessor<readonly NodeID[]>;
+	readonly childIds: Accessor<readonly FormNodeID[]>;
 }
 
 /**
  * Creates a synchronized pair of:
  *
  * - Internal children state suitable for all parent node types
- * - The same children state computed as an array of each child's {@link NodeID}
+ * - The same children state computed as an array of each child's
+ *   {@link FormNodeID}
  *
  * This state is used, in tandem with {@link materializeCurrentStateChildren},
  * to ensure children in **client-facing** state are not written into nested
@@ -34,11 +35,12 @@ export interface ChildrenState<Child extends AnyChildNode> {
  * The produced {@link ChildrenState.childIds} memo is intended to be used to
  * specify each parent node's `children` in an instance of {@link EngineState}.
  * In so doing, the node's corresponding (internal, synchronized)
- * {@link ClientState} will likewise store only the children's {@link NodeID}s.
+ * {@link ClientState} will likewise store only the children's
+ * {@link FormNodeID}s.
  *
  * As a client reacts to changes in a given parent node's `children` state, that
  * node's {@link CurrentState} should produce the child nodes corresponding to
- * those {@link NodeID}s with the aforementioned
+ * those {@link FormNodeID}s with the aforementioned
  * {@link materializeCurrentStateChildren}.
  */
 export const createChildrenState = <Parent extends AnyParentNode, Child extends AnyChildNode>(
@@ -65,7 +67,7 @@ export const createChildrenState = <Parent extends AnyParentNode, Child extends
 		 * likely also slightly more efficient. We can revisit the tradeoff if/when
 		 * those hypothetical generalizations become a priority.
 		 */
-		const ids = createSignal<readonly NodeID[]>([]);
+		const ids = createSignal<readonly FormNodeID[]>([]);
 		const [childIds, setChildIds] = ids;
 
 		type ChildrenSetterCallback = (prev: readonly Child[]) => readonly Child[];

package/src/lib/reactivity/createComputedExpression.ts

@@ -1,9 +1,9 @@
 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 { EngineXPathNode } from '../../integration/xpath/adapter/kind.ts';
+import type { EngineXPathEvaluator } from '../../integration/xpath/EngineXPathEvaluator.ts';
 import type {
 	DependentExpression,
 	DependentExpressionResultType,
@@ -12,7 +12,7 @@ import { isConstantExpression } from '../../parse/xpath/semantic-analysis.ts';
 
 interface ComputedExpressionResults {
 	readonly boolean: boolean;
-	readonly nodes: Node[];
+	readonly nodes: EngineXPathNode[];
 	readonly number: number;
 	readonly string: string;
 }
@@ -25,16 +25,18 @@ type EvaluatedExpression<
 // prettier-ignore
 type ExpressionEvaluator<
 	Type extends DependentExpressionResultType
-> = () => EvaluatedExpression<Type>
+> = () => EvaluatedExpression<Type>;
+
+interface ExpressionEvaluatorOptions {
+	get contextNode(): EngineXPathNode;
+}
 
 const expressionEvaluator = <Type extends DependentExpressionResultType>(
-	evaluator: XFormsXPathEvaluator,
-	contextNode: Node,
+	evaluator: EngineXPathEvaluator,
 	type: Type,
-	expression: string
+	expression: string,
+	options: ExpressionEvaluatorOptions
 ): ExpressionEvaluator<Type> => {
-	const options = { contextNode };
-
 	switch (type) {
 		case 'boolean':
 			return (() => {
@@ -61,50 +63,71 @@ const expressionEvaluator = <Type extends DependentExpressionResultType>(
 	}
 };
 
+type DefaultEvaluationsByType = {
+	readonly [Type in DependentExpressionResultType]: EvaluatedExpression<Type>;
+};
+
+const DEFAULT_BOOLEAN_EVALUATION = false;
+const DEFAULT_NODES_EVALUATION: [] = [];
+const DEFAULT_NUMBER_EVALUATION = NaN;
+const DEFAULT_STRING_EVALUATION = '';
+
+const defaultEvaluationsByType: DefaultEvaluationsByType = {
+	boolean: DEFAULT_BOOLEAN_EVALUATION,
+	nodes: DEFAULT_NODES_EVALUATION,
+	number: DEFAULT_NUMBER_EVALUATION,
+	string: DEFAULT_STRING_EVALUATION,
+};
+
 // prettier-ignore
 type ComputedExpression<Type extends DependentExpressionResultType> = Accessor<
 	EvaluatedExpression<Type>
 >;
 
-interface CreateComputedExpressionOptions {
-	readonly arbitraryDependencies?: readonly SubscribableDependency[];
+interface CreateComputedExpressionOptions<Type extends DependentExpressionResultType> {
+	/**
+	 * If a default value is provided, {@link createComputedExpression} will
+	 * produce this value for computations in a non-attached evaluation context,
+	 * i.e. when evaluating an expression against a node which has not yet been
+	 * appended to its parents children state (or which has since been removed
+	 * from that state). A non-attached state is detected when
+	 * {@link EvaluationContext.isAttached} returns false.
+	 *
+	 * If no default value is provided, an implicit default value is produced as
+	 * appropriate for the expression's intrinsic result type.
+	 *
+	 * @see {@link defaultEvaluationsByType} for these implicit defaults.
+	 */
+	readonly defaultValue?: EvaluatedExpression<Type>;
 }
 
 export const createComputedExpression = <Type extends DependentExpressionResultType>(
 	context: EvaluationContext,
 	dependentExpression: DependentExpression<Type>,
-	options: CreateComputedExpressionOptions = {}
+	options: CreateComputedExpressionOptions<Type> = {}
 ): ComputedExpression<Type> => {
-	const { contextNode, evaluator, root, scope } = context;
-	const { expression, isTranslated, resultType } = dependentExpression;
-	const dependencyReferences = Array.from(dependentExpression.dependencyReferences);
-	const evaluateExpression = expressionEvaluator(evaluator, contextNode, resultType, expression);
+	return context.scope.runTask(() => {
+		const { contextNode, evaluator } = context;
+		const { expression, isTranslated, resultType } = dependentExpression;
+		const evaluatePreInitializationDefaultValue = () => {
+			return options?.defaultValue ?? defaultEvaluationsByType[resultType];
+		};
+		const evaluateExpression = expressionEvaluator(evaluator, resultType, expression, {
+			contextNode,
+		});
 
-	return scope.runTask(() => {
 		if (isConstantExpression(expression)) {
 			return createMemo(evaluateExpression);
 		}
 
-		const { arbitraryDependencies = [] } = options;
-
-		const getReferencedDependencies = createMemo(() => {
-			return dependencyReferences.flatMap((reference) => {
-				return context.getSubscribableDependenciesByReference(reference) ?? [];
-			});
-		});
-
 		return createMemo(() => {
-			if (isTranslated) {
-				root.subscribe();
+			if (!context.isAttached()) {
+				return evaluatePreInitializationDefaultValue();
 			}
 
-			arbitraryDependencies.forEach((dependency) => {
-				dependency.subscribe();
-			});
-
-			getReferencedDependencies().forEach((dependency) => {
-				dependency.subscribe();
-			});
+			if (isTranslated) {
+				context.getActiveLanguage();
+			}
 
 			return evaluateExpression();
 		});

package/src/lib/reactivity/createInstanceValueState.ts

@@ -0,0 +1,166 @@
+import type { Signal } from 'solid-js';
+import { createComputed, createMemo, createSignal, untrack } from 'solid-js';
+import { ErrorProductionDesignPendingError } from '../../error/ErrorProductionDesignPendingError.ts';
+import type { InstanceValueContext } from '../../instance/internal-api/InstanceValueContext.ts';
+import type { BindComputationExpression } from '../../parse/expression/BindComputationExpression.ts';
+import { createComputedExpression } from './createComputedExpression.ts';
+import type { SimpleAtomicState, SimpleAtomicStateSetter } from './types.ts';
+
+type InitialValueSource = 'FORM_DEFAULT' | 'PRIMARY_INSTANCE';
+
+export interface InstanceValueStateOptions {
+	/**
+	 * Specifies the source of a {@link createInstanceValueState} signal's initial
+	 * value state, where:
+	 *
+	 * - 'FORM_DEFAULT': Derives the initial state from the form's definition of
+	 *   the node itself. This is the default option, appropriate when
+	 *   initializing a form without additional primary instance data. In other
+	 *   words, this value should not be used for edits.
+	 *
+	 * - 'PRIMARY_INSTANCE': Derives the initial state from the current text
+	 *   content of the {@link ValueNode.contextNode}. This option should be
+	 *   specified when initializing a form with existing primary instance data,
+	 *   such as when editing a previous submission.
+	 *
+	 * @default 'FORM_DEFAULT'
+	 *
+	 * Specifies whether a {@link createInstanceValueState} signal's initial state
+	 * should be derived from the current text content of the
+	 * {@link ValueNode.contextNode | primary instance DOM state}.
+	 */
+	readonly initialValueSource?: InitialValueSource;
+}
+
+const getInitialValue = (
+	context: InstanceValueContext,
+	options: InstanceValueStateOptions
+): string => {
+	const { initialValueSource = 'FORM_DEFAULT' } = options;
+
+	if (initialValueSource === 'FORM_DEFAULT') {
+		const { defaultValue } = context.definition;
+
+		return context.decodeInstanceValue(defaultValue);
+	}
+
+	throw new ErrorProductionDesignPendingError('Edit implementation pending');
+};
+
+type BaseValueState = Signal<string>;
+
+type RelevantValueState = SimpleAtomicState<string>;
+
+/**
+ * Wraps {@link baseValueState} in a signal-like interface which:
+ *
+ * - produces a blank value for nodes ({@link context}) in a non-relevant state
+ * - persists, and restores, the most recent non-blank value state when a
+ *   node/context's relevance is restored
+ */
+const createRelevantValueState = (
+	context: InstanceValueContext,
+	baseValueState: BaseValueState
+): RelevantValueState => {
+	return context.scope.runTask(() => {
+		const [getRelevantValue, setValue] = baseValueState;
+
+		const getValue = createMemo(() => {
+			if (context.isRelevant()) {
+				return getRelevantValue();
+			}
+
+			return '';
+		});
+
+		return [getValue, setValue];
+	});
+};
+
+/**
+ * For fields with a `readonly` bind expression, prevent downstream
+ * (client/user) writes when the field is in a `readonly` state.
+ */
+const guardDownstreamReadonlyWrites = (
+	context: InstanceValueContext,
+	baseState: SimpleAtomicState<string>
+): SimpleAtomicState<string> => {
+	const { readonly } = context.definition.bind;
+
+	if (readonly.isDefaultExpression) {
+		return baseState;
+	}
+
+	const [getValue, baseSetValue] = baseState;
+
+	const setValue: SimpleAtomicStateSetter<string> = (value) => {
+		if (context.isReadonly()) {
+			const reference = untrack(() => context.contextReference());
+
+			throw new Error(`Cannot write to readonly field: ${reference}`);
+		}
+
+		return baseSetValue(value);
+	};
+
+	return [getValue, setValue];
+};
+
+/**
+ * Defines a reactive effect which writes the result of `calculate` bind
+ * computations to the provided value setter, on initialization and any
+ * subsequent reactive update.
+ */
+const createCalculation = (
+	context: InstanceValueContext,
+	setRelevantValue: SimpleAtomicStateSetter<string>,
+	calculateDefinition: BindComputationExpression<'calculate'>
+): void => {
+	context.scope.runTask(() => {
+		const calculate = createComputedExpression(context, calculateDefinition, {
+			defaultValue: '',
+		});
+
+		createComputed(() => {
+			if (context.isAttached() && context.isRelevant()) {
+				const calculated = calculate();
+				const value = context.decodeInstanceValue(calculated);
+
+				setRelevantValue(value);
+			}
+		});
+	});
+};
+
+export type InstanceValueState = SimpleAtomicState<string>;
+
+/**
+ * Provides a consistent interface for value nodes of any type which:
+ *
+ * - derives initial state from either an existing instance (e.g. for edits) or
+ *   the node's definition (e.g. initializing a new submission)
+ * - decodes current primary instance state into the value node's runtime type
+ * - encodes updated runtime values to store updated instance state
+ * - initializes reactive computation of `calculate` bind expressions for those
+ *   nodes defined with one
+ * - prevents downstream writes to nodes in a readonly state
+ */
+export const createInstanceValueState = (
+	context: InstanceValueContext,
+	options: InstanceValueStateOptions = {}
+): InstanceValueState => {
+	return context.scope.runTask(() => {
+		const initialValue = getInitialValue(context, options);
+		const baseValueState = createSignal(initialValue);
+		const relevantValueState = createRelevantValueState(context, baseValueState);
+		const { calculate } = context.definition.bind;
+
+		if (calculate != null) {
+			const [, setValue] = relevantValueState;
+
+			createCalculation(context, setValue, calculate);
+		}
+
+		return guardDownstreamReadonlyWrites(context, relevantValueState);
+	});
+};

package/src/lib/reactivity/createNoteReadonlyThunk.ts

@@ -1,31 +1,36 @@
 import type { Accessor } from 'solid-js';
 import type { EvaluationContext } from '../../instance/internal-api/EvaluationContext.ts';
-import type { BindComputationExpression } from '../../parse/expression/BindComputationExpression.ts';
+import type { NoteNodeDefinition } from '../../parse/model/NoteNodeDefinition.ts';
+import { resolveDependencyNodesets } from '../../parse/xpath/dependency-analysis.ts';
 import { createComputedExpression } from './createComputedExpression.ts';
 
 export const createNoteReadonlyThunk = (
 	context: EvaluationContext,
-	readonlyDefinition: BindComputationExpression<'readonly'>
+	definition: NoteNodeDefinition
 ): Accessor<true> => {
-	if (!readonlyDefinition.isConstantTruthyExpression()) {
+	const { reference } = definition.bodyElement;
+	const { readonly } = definition.bind;
+
+	if (!readonly.isConstantTruthyExpression()) {
 		throw new Error('Expected a static readonly expression');
 	}
 
 	let result = true;
 
 	if (import.meta.env.DEV) {
-		const { expression } = readonlyDefinition;
+		const { expression } = readonly;
+		const dependencyReferences = resolveDependencyNodesets(reference, expression);
 
-		if (readonlyDefinition.dependencyReferences.size > 0) {
+		if (dependencyReferences.length > 0) {
 			throw new Error(`Expected expression ${expression} to have no dependencies`);
 		}
 
-		const computedExpression = createComputedExpression(context, readonlyDefinition);
+		const computedExpression = createComputedExpression(context, readonly);
 
 		result = computedExpression();
 
 		if (result !== true) {
-			throw new Error(`Expected expression ${readonlyDefinition.expression} to return true`);
+			throw new Error(`Expected expression ${readonly.expression} to return true`);
 		}
 	}