Update For Latest WIP bevy_mod_js_scripting

fishfolk · Sep 22, 2022 · 6907ab8 · 6907ab8
1 parent d64d8c7
commit 6907ab8
Show file tree

Hide file tree

Showing 4 changed files with 473 additions and 439 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/assets/items/health/health.ts b/assets/items/health/health.ts
@@ -12,10 +12,11 @@ export default {
   postUpdate() {
     const grabEvents = punchy.getItemGrabEvents();
 
+    const fighterQuery = world.query(Health, Stats);
     for (const event of grabEvents) {
       const fighter = event.fighter;
 
-      const [health, stats] = world.get(fighter, Health, Stats);
+      const [health, stats] = fighterQuery.get(fighter);
 
       health[0] = stats.max_health;
     }

diff --git a/lib.bevy.d.ts b/lib.bevy.d.ts
@@ -23,10 +23,6 @@ declare interface BevyScript {
 declare class ComponentId {
   index: number;
 }
-declare class Entity {
-  id: number;
-  generation: number;
-}
 
 type ComponentInfo = {
   id: ComponentId;
@@ -47,18 +43,23 @@ type BevyType<T> = {
   typeName: string;
 };
 
-
-type ExtractBevyType<T> = T extends BevyType<infer U> ? U
-  : T extends ComponentId ? Value
+type ExtractBevyType<T> = T extends BevyType<infer U>
+  ? U
+  : T extends ComponentId
+  ? Value
   : never;
 type MapQueryArgs<Q> = { [C in keyof Q]: ExtractBevyType<Q[C]> };
 
 type QueryParameter = BevyType<unknown> | ComponentId;
 type QueryItem<Q> = {
   entity: Entity;
-  components: MapQueryArgs<Q>,
+  components: MapQueryArgs<Q>;
 };
 
+declare class QueryItems<Q> extends Array<QueryItem<Q>> {
+  get(entity: Entity): MapQueryArgs<Q> | undefined;
+}
+
 declare class World {
   get components(): ComponentInfo[];
   get resources(): ComponentInfo[];
@@ -67,8 +68,11 @@ declare class World {
   resource(componentId: ComponentId): Value | null;
   resource<T>(type: BevyType<T>): T | null;
 
-  query<Q extends QueryParameter[]>(...query: Q): QueryItem<Q>[];
-  get<Q extends QueryParameter[]>(entity: Entity, ...components: Q): MapQueryArgs<Q>;
+  query<Q extends QueryParameter[]>(...query: Q): QueryItems<Q>;
+  get<Q extends QueryParameter[]>(
+    entity: Entity,
+    ...components: Q
+  ): MapQueryArgs<Q>;
 }
 
 declare let world: World;