fix(recs): fix fragment types in system definitions (#109)

latticexyz · Jul 26, 2022 · c74f393 · c74f393
1 parent fcb0be8
commit c74f393
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/packages/recs/src/Query.ts b/packages/recs/src/Query.ts
@@ -1,6 +1,6 @@
 import { filterNullish } from "@latticexyz/utils";
 import { observable, ObservableSet } from "mobx";
-import { concat, concatMap, EMPTY, filter, from, map, merge, Observable, of, switchMap } from "rxjs";
+import { concat, concatMap, filter, from, map, merge, Observable, of } from "rxjs";
 import {
   componentValueEquals,
   getComponentEntities,
@@ -337,7 +337,7 @@ export function defineQuery(
  * @returns Stream of component updates of entities that had already matched the query
  */
 export function defineUpdateQuery(
-  fragments: EntityQueryFragment[],
+  fragments: QueryFragment[],
   options?: { runOnInit?: boolean }
 ): Observable<ComponentUpdate & { type: UpdateType }> {
   return defineQuery(fragments, options).update$.pipe(filter((e) => e.type === UpdateType.Update));
@@ -348,7 +348,7 @@ export function defineUpdateQuery(
  * @returns Stream of component updates of entities matching the query for the first time
  */
 export function defineEnterQuery(
-  fragments: EntityQueryFragment[],
+  fragments: QueryFragment[],
   options?: { runOnInit?: boolean }
 ): Observable<ComponentUpdate> {
   return defineQuery(fragments, options).update$.pipe(filter((e) => e.type === UpdateType.Enter));
@@ -359,7 +359,7 @@ export function defineEnterQuery(
  * @returns Stream of component updates of entities not matching the query anymore for the first time
  */
 export function defineExitQuery(
-  fragments: EntityQueryFragment[],
+  fragments: QueryFragment[],
   options?: { runOnInit?: boolean }
 ): Observable<ComponentUpdate> {
   return defineQuery(fragments, options).update$.pipe(filter((e) => e.type === UpdateType.Exit));

diff --git a/packages/recs/src/System.ts b/packages/recs/src/System.ts
@@ -2,7 +2,7 @@ import { concat, EMPTY, from, Observable } from "rxjs";
 import { getComponentEntities, removeComponent, setComponent } from "./Component";
 import { UpdateType } from "./constants";
 import { defineEnterQuery, defineExitQuery, defineQuery, defineUpdateQuery } from "./Query";
-import { Component, ComponentUpdate, ComponentValue, EntityIndex, EntityQueryFragment, Schema, World } from "./types";
+import { Component, ComponentUpdate, ComponentValue, EntityIndex, QueryFragment, Schema, World } from "./types";
 import { toUpdateStream } from "./utils";
 
 export function defineRxSystem<T>(world: World, observable$: Observable<T>, system: (event: T) => void) {
@@ -12,7 +12,7 @@ export function defineRxSystem<T>(world: World, observable$: Observable<T>, syst
 
 export function defineUpdateSystem(
   world: World,
-  query: EntityQueryFragment[],
+  query: QueryFragment[],
   system: (update: ComponentUpdate) => void,
   options: { runOnInit?: boolean } = { runOnInit: true }
 ) {
@@ -21,7 +21,7 @@ export function defineUpdateSystem(
 
 export function defineEnterSystem(
   world: World,
-  query: EntityQueryFragment[],
+  query: QueryFragment[],
   system: (update: ComponentUpdate) => void,
   options: { runOnInit?: boolean } = { runOnInit: true }
 ) {
@@ -30,7 +30,7 @@ export function defineEnterSystem(
 
 export function defineExitSystem(
   world: World,
-  query: EntityQueryFragment[],
+  query: QueryFragment[],
   system: (update: ComponentUpdate) => void,
   options: { runOnInit?: boolean } = { runOnInit: true }
 ) {
@@ -39,7 +39,7 @@ export function defineExitSystem(
 
 export function defineSystem(
   world: World,
-  query: EntityQueryFragment[],
+  query: QueryFragment[],
   system: (update: ComponentUpdate & { type: UpdateType }) => void,
   options: { runOnInit?: boolean } = { runOnInit: true }
 ) {
@@ -65,7 +65,7 @@ export function defineComponentSystem<S extends Schema>(
  */
 export function defineSyncSystem<T extends Schema>(
   world: World,
-  query: EntityQueryFragment[],
+  query: QueryFragment[],
   component: (entity: EntityIndex) => Component<T>,
   value: (entity: EntityIndex) => ComponentValue<T>,
   options: { update?: boolean; runOnInit?: boolean } = { update: false, runOnInit: true }