🔀 Merge pull request #44 from pmndrs:fix/update-each-instability

🐛 core: fix updateEach instability
pmndrs · Jan 3, 2025 · abe6bf5 · abe6bf5
2 parents 2211efa + ed66a15
commit abe6bf5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/core/src/query/query-result.ts b/packages/core/src/query/query-result.ts
@@ -80,15 +80,16 @@ export function createQueryResult<T extends QueryParameter[]>(
 						const trait = traits[index];
 						const ctx = trait[$internal];
 						const newValue = state[index];
+						const store = stores[index];
 
 						let changed = false;
 						if (ctx.type === 'aos') {
-							changed = ctx.fastSetWithChangeDetection(eid, stores[j], newValue);
+							changed = ctx.fastSetWithChangeDetection(eid, store, newValue);
 							if (!changed) {
-								changed = !shallowEqual(newValue, atomicSnapshots[j]);
+								changed = !shallowEqual(newValue, atomicSnapshots[index]);
 							}
 						} else {
-							changed = ctx.fastSetWithChangeDetection(eid, stores[j], newValue);
+							changed = ctx.fastSetWithChangeDetection(eid, store, newValue);
 						}
 
 						// Collect changed traits.
@@ -100,7 +101,8 @@ export function createQueryResult<T extends QueryParameter[]>(
 						const index = untrackedIndices[j];
 						const trait = traits[index];
 						const ctx = trait[$internal];
-						ctx.fastSet(eid, stores[index], state[index]);
+						const store = stores[index];
+						ctx.fastSet(eid, store, state[index]);
 					}
 				}
 

diff --git a/packages/core/tests/query.test.ts b/packages/core/tests/query.test.ts
@@ -715,8 +715,9 @@ describe('Query', () => {
 
 		// This has changes tracked automatically.
 		// Here we test that mixing tracked and untracked traits works.
+		// We do it would of order to catch misaligned indices internally.
 		world.spawn(Position, Name);
-		world.query(Position, Name).updateEach(([position]) => {
+		world.query(Name, Position).updateEach(([name, position]) => {
 			position.x = 1;
 		});