Fix: childrenState must be defined before other reactive node state…

… specifically, before calling `createComputedExpression` or anything else that may exercise the `SubscribableDependency` interface. TODO(?): detect this condition and throw a more meaningful error?
getodk · Apr 3, 2024 · 0429f95 · 0429f95
1 parent 89580e3
commit 0429f95
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/packages/xforms-engine/src/instance/Group.ts b/packages/xforms-engine/src/instance/Group.ts
@@ -42,6 +42,9 @@ export class Group
 		super(parent, definition);
 
 		const childrenState = createChildrenState<Group, GeneralChildNode>(this);
+
+		this.childrenState = childrenState;
+
 		const state = createSharedNodeState(
 			this.scope,
 			{
@@ -58,7 +61,6 @@ export class Group
 			}
 		);
 
-		this.childrenState = childrenState;
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = materializeCurrentStateChildren(state.currentState, childrenState);

diff --git a/packages/xforms-engine/src/instance/RepeatInstance.ts b/packages/xforms-engine/src/instance/RepeatInstance.ts
@@ -58,6 +58,10 @@ export class RepeatInstance
 	) {
 		super(parent, definition);
 
+		const childrenState = createChildrenState<RepeatInstance, GeneralChildNode>(this);
+
+		this.childrenState = childrenState;
+
 		options.precedingPrimaryInstanceNode.after(this.contextNode);
 
 		const { precedingInstance } = options;
@@ -66,8 +70,6 @@ export class RepeatInstance
 		const [currentIndex, setCurrentIndex] = createSignal(initialIndex);
 
 		this.currentIndex = currentIndex;
-
-		const childrenState = createChildrenState<RepeatInstance, GeneralChildNode>(this);
 		const state = createSharedNodeState(
 			this.scope,
 			{
@@ -84,7 +86,6 @@ export class RepeatInstance
 			}
 		);
 
-		this.childrenState = childrenState;
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = materializeCurrentStateChildren(state.currentState, childrenState);

diff --git a/packages/xforms-engine/src/instance/Root.ts b/packages/xforms-engine/src/instance/Root.ts
@@ -150,6 +150,10 @@ export class Root
 	) {
 		super(engineConfig, null, definition);
 
+		const childrenState = createChildrenState<Root, GeneralChildNode>(this);
+
+		this.childrenState = childrenState;
+
 		const reference = definition.nodeset;
 
 		this.rootReference = reference;
@@ -158,7 +162,6 @@ export class Root
 		const evaluator = instanceDOM.primaryInstanceEvaluator;
 		const { translations } = evaluator;
 		const { defaultLanguage, languages } = getInitialLanguageState(translations);
-		const childrenState = createChildrenState<Root, GeneralChildNode>(this);
 		const state = createSharedNodeState(
 			this.scope,
 			{
@@ -178,7 +181,6 @@ export class Root
 			}
 		);
 
-		this.childrenState = childrenState;
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = materializeCurrentStateChildren(state.currentState, childrenState);

diff --git a/packages/xforms-engine/src/instance/Subtree.ts b/packages/xforms-engine/src/instance/Subtree.ts
@@ -39,6 +39,9 @@ export class Subtree
 		super(parent, definition);
 
 		const childrenState = createChildrenState<Subtree, GeneralChildNode>(this);
+
+		this.childrenState = childrenState;
+
 		const state = createSharedNodeState(
 			this.scope,
 			{
@@ -55,7 +58,6 @@ export class Subtree
 			}
 		);
 
-		this.childrenState = childrenState;
 		this.state = state;
 		this.engineState = state.engineState;
 		this.currentState = materializeCurrentStateChildren(state.currentState, childrenState);