koota 0.1.12 → 0.2.1

package/README.md

@@ -283,6 +283,15 @@ const movedEntities = world.query(Changed(Position));
 // After running the query, the Changed modifier is reset
 ```
 
+### Query all entities
+
+To get al queryable entities you simply query with not paramerters. Note, that not all entities are queryable. Any entity that has `IsExcluded` will not be able to be queried. This is used in Koota to exclude world entities, for example, but maybe used for other system level entities in the future. To get all entities regardless, use `world.entities`.
+
+```js
+// Returns all queryable entities
+const allQueryableEntities = world.query()
+```
+
 ### Add, remove and change events
 
 Koota allows you to subscribe to add, remove, and change events for specific traits.
@@ -309,7 +318,7 @@ entity.set(Position, { x: 10, y: 20 });
 entity.remove(Position);
 ```
 
-### Change detection with `udpateEach`
+### Change detection with `updateEach`
 
 By default, `updateEach` will automatically turn on change detection for traits that are being tracked via `onChange` or the `Changed` modifier. If you want to silence change detection for a loop or force it to always run, you can do so with an options config.
 
@@ -320,7 +329,7 @@ world.query(Position, Velocity).updateEach(([position, velocity]) => {
 
 // Setting changeDetection to 'always' will ignore selective tracking and always emit change events for all traits that are mutated
 world.query(Position, Velocity).updateEach(([position, velocity]) => {
-}, { changeDetection: 'never' });
+}, { changeDetection: 'always' });
 ```
 
 ### World traits
@@ -427,7 +436,7 @@ const unsub = world.onAdd([Position], (entity) => {})
 const unsub = world.onRemove([Position], (entity) => {})
 const unsub = world.onChange([Position], (entity) => {})
 
-// An array of all entities alive in the world
+// An array of all entities alive in the world, including non-queryable entities
 // This is a copy so editing it won't do anything!
 // Entity[]
 world.entities
@@ -754,4 +763,4 @@ useEffect(() => {
     spawnPlayer()
     return () => destroyAllPlayers()
 }, [])
-```
+```

package/dist/{chunk-FAWXK4QV.js → chunk-4QEK6BHY.js}

@@ -330,7 +330,12 @@ function defineRelation(definition) {
   function relationFn(target) {
     if (target === void 0) throw Error("Relation target is undefined");
     if (target === "*") target = Wildcard;
-    return getRelationTrait(relationFn, traitFactory, pairsMap, target);
+    return getRelationTrait(
+      relationFn,
+      traitFactory,
+      pairsMap,
+      target
+    );
   }
   return Object.assign(relationFn, {
     [$internal]: {
@@ -570,9 +575,7 @@ Number.prototype.set = function(trait2, value, triggerChanged = true) {
   const index = this & ENTITY_ID_MASK;
   const worldId = this >>> WORLD_ID_SHIFT;
   const store = ctx.stores[worldId];
-  if (value instanceof Function) {
-    value = value(ctx.get(index, store));
-  }
+  value instanceof Function && (value = value(ctx.get(index, store)));
   ctx.set(index, store, value);
   triggerChanged && setChanged(universe.worlds[worldId], this, trait2);
 };
@@ -791,6 +794,7 @@ var createQueryHash = (parameters) => {
 var IsExcluded = trait();
 var Query = class {
   constructor(world, parameters = []) {
+    __publicField(this, "version", 0);
     __publicField(this, "world");
     __publicField(this, "parameters");
     __publicField(this, "hash");
@@ -876,6 +880,7 @@ var Query = class {
         this.traits.push(trait2);
       }
     }
+    this.traitData.forbidden.push(ctx.traitData.get(IsExcluded));
     this.traitData.all = [
       ...this.traitData.required,
       ...this.traitData.forbidden,
@@ -957,7 +962,6 @@ var Query = class {
         const entities = ctx.entityIndex.dense;
         for (let i = 0; i < entities.length; i++) {
           const entity = entities[i];
-          if (entity.has(IsExcluded)) continue;
           const match = this.check(world, entity);
           if (match) this.add(entity);
         }
@@ -976,6 +980,7 @@ var Query = class {
     for (const sub of this.addSubscriptions) {
       sub(entity);
     }
+    this.version++;
   }
   remove(world, entity) {
     if (!this.entities.has(entity) || this.toRemove.has(entity)) return;

package/dist/index.cjs

@@ -35,8 +35,8 @@ var __privateWrapper = (obj, member, setter, getter) => ({
 });
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   $internal: () => $internal,
   Not: () => Not,
   Or: () => Or,
@@ -52,7 +52,7 @@ __export(src_exports, {
   trait: () => trait,
   universe: () => universe
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // ../core/src/common.ts
 var $internal = Symbol("internal");
@@ -82,7 +82,12 @@ function defineRelation(definition) {
   function relationFn(target) {
     if (target === void 0) throw Error("Relation target is undefined");
     if (target === "*") target = Wildcard;
-    return getRelationTrait(relationFn, traitFactory, pairsMap, target);
+    return getRelationTrait(
+      relationFn,
+      traitFactory,
+      pairsMap,
+      target
+    );
   }
   return Object.assign(relationFn, {
     [$internal]: {
@@ -607,9 +612,7 @@ Number.prototype.set = function(trait2, value, triggerChanged = true) {
   const index = this & ENTITY_ID_MASK;
   const worldId = this >>> WORLD_ID_SHIFT;
   const store = ctx.stores[worldId];
-  if (value instanceof Function) {
-    value = value(ctx.get(index, store));
-  }
+  value instanceof Function && (value = value(ctx.get(index, store)));
   ctx.set(index, store, value);
   triggerChanged && setChanged(universe.worlds[worldId], this, trait2);
 };
@@ -769,6 +772,7 @@ var createQueryHash = (parameters) => {
 var IsExcluded = trait();
 var Query = class {
   constructor(world, parameters = []) {
+    __publicField(this, "version", 0);
     __publicField(this, "world");
     __publicField(this, "parameters");
     __publicField(this, "hash");
@@ -854,6 +858,7 @@ var Query = class {
         this.traits.push(trait2);
       }
     }
+    this.traitData.forbidden.push(ctx.traitData.get(IsExcluded));
     this.traitData.all = [
       ...this.traitData.required,
       ...this.traitData.forbidden,
@@ -935,7 +940,6 @@ var Query = class {
         const entities = ctx.entityIndex.dense;
         for (let i = 0; i < entities.length; i++) {
           const entity = entities[i];
-          if (entity.has(IsExcluded)) continue;
           const match = this.check(world, entity);
           if (match) this.add(entity);
         }
@@ -954,6 +958,7 @@ var Query = class {
     for (const sub of this.addSubscriptions) {
       sub(entity);
     }
+    this.version++;
   }
   remove(world, entity) {
     if (!this.entities.has(entity) || this.toRemove.has(entity)) return;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { S as Schema, T as Trait, N as Norm, M as ModifierData, W as World, Q as QueryParameter, R as Relation, a as RelationTarget, b as WildcardRelation } from './world-CIrtrsKj.cjs';
-export { $ as $internal, A as AoSFactory, C as ConfigurableTrait, l as Entity, j as ExtractIsTag, E as ExtractSchema, i as ExtractStore, k as ExtractStores, r as InstancesFromParameters, s as IsNotModifier, I as IsTag, m as QueryModifier, p as QueryResult, o as QueryResultOptions, n as QuerySubscriber, h as Store, q as StoresFromParameters, g as TraitInstance, f as TraitTuple, d as TraitType, e as TraitValue, c as createWorld } from './world-CIrtrsKj.cjs';
+import { S as Schema, T as Trait, N as Norm, M as ModifierData, W as World, Q as QueryParameter, R as Relation, a as RelationTarget, b as WildcardRelation } from './world-DQXl4lI8.cjs';
+export { $ as $internal, A as AoSFactory, C as ConfigurableTrait, k as Entity, j as ExtractIsTag, E as ExtractSchema, i as ExtractStore, q as InstancesFromParameters, r as IsNotModifier, I as IsTag, l as QueryModifier, o as QueryResult, n as QueryResultOptions, m as QuerySubscriber, h as Store, p as StoresFromParameters, g as TraitInstance, f as TraitTuple, d as TraitType, e as TraitValue, c as createWorld } from './world-DQXl4lI8.cjs';
 
 declare function defineTrait<S extends Schema = {}>(schema?: S): Trait<Norm<S>>;
 declare const trait: typeof defineTrait;
@@ -29,11 +29,11 @@ declare const universe: {
 
 declare function cacheQuery(...parameters: QueryParameter[]): string;
 
-declare function defineRelation<S extends Schema = any, T extends Trait = Trait<Schema>>(definition?: {
+declare function defineRelation<S extends Schema = any>(definition?: {
     exclusive?: boolean;
     autoRemoveTarget?: boolean;
     store?: S;
-}): Relation<T>;
+}): Relation<Trait<S>>;
 declare const relation: typeof defineRelation;
 declare const Pair: <T extends Trait>(relation: Relation<T>, target: RelationTarget) => T;
 declare const Wildcard: WildcardRelation;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { S as Schema, T as Trait, N as Norm, M as ModifierData, W as World, Q as QueryParameter, R as Relation, a as RelationTarget, b as WildcardRelation } from './world-CIrtrsKj.js';
-export { $ as $internal, A as AoSFactory, C as ConfigurableTrait, l as Entity, j as ExtractIsTag, E as ExtractSchema, i as ExtractStore, k as ExtractStores, r as InstancesFromParameters, s as IsNotModifier, I as IsTag, m as QueryModifier, p as QueryResult, o as QueryResultOptions, n as QuerySubscriber, h as Store, q as StoresFromParameters, g as TraitInstance, f as TraitTuple, d as TraitType, e as TraitValue, c as createWorld } from './world-CIrtrsKj.js';
+import { S as Schema, T as Trait, N as Norm, M as ModifierData, W as World, Q as QueryParameter, R as Relation, a as RelationTarget, b as WildcardRelation } from './world-DQXl4lI8.js';
+export { $ as $internal, A as AoSFactory, C as ConfigurableTrait, k as Entity, j as ExtractIsTag, E as ExtractSchema, i as ExtractStore, q as InstancesFromParameters, r as IsNotModifier, I as IsTag, l as QueryModifier, o as QueryResult, n as QueryResultOptions, m as QuerySubscriber, h as Store, p as StoresFromParameters, g as TraitInstance, f as TraitTuple, d as TraitType, e as TraitValue, c as createWorld } from './world-DQXl4lI8.js';
 
 declare function defineTrait<S extends Schema = {}>(schema?: S): Trait<Norm<S>>;
 declare const trait: typeof defineTrait;
@@ -29,11 +29,11 @@ declare const universe: {
 
 declare function cacheQuery(...parameters: QueryParameter[]): string;
 
-declare function defineRelation<S extends Schema = any, T extends Trait = Trait<Schema>>(definition?: {
+declare function defineRelation<S extends Schema = any>(definition?: {
     exclusive?: boolean;
     autoRemoveTarget?: boolean;
     store?: S;
-}): Relation<T>;
+}): Relation<Trait<S>>;
 declare const relation: typeof defineRelation;
 declare const Pair: <T extends Trait>(relation: Relation<T>, target: RelationTarget) => T;
 declare const Wildcard: WildcardRelation;

package/dist/index.js

@@ -13,7 +13,7 @@ import {
   relation,
   trait,
   universe
-} from "./chunk-FAWXK4QV.js";
+} from "./chunk-4QEK6BHY.js";
 export {
   $internal,
   Not,

package/dist/react.cjs

@@ -48,16 +48,6 @@ __export(react_exports, {
 });
 module.exports = __toCommonJS(react_exports);
 
-// ../react/src/hooks/use-query.ts
-var import_react3 = require("react");
-
-// ../react/src/world/use-world.ts
-var import_react2 = require("react");
-
-// ../react/src/world/world-context.ts
-var import_react = require("react");
-var WorldContext = (0, import_react.createContext)(null);
-
 // ../core/src/common.ts
 var $internal = Symbol("internal");
 
@@ -86,7 +76,12 @@ function defineRelation(definition) {
   function relationFn(target) {
     if (target === void 0) throw Error("Relation target is undefined");
     if (target === "*") target = Wildcard;
-    return getRelationTrait(relationFn, traitFactory, pairsMap, target);
+    return getRelationTrait(
+      relationFn,
+      traitFactory,
+      pairsMap,
+      target
+    );
   }
   return Object.assign(relationFn, {
     [$internal]: {
@@ -599,9 +594,7 @@ Number.prototype.set = function(trait2, value, triggerChanged = true) {
   const index = this & ENTITY_ID_MASK;
   const worldId = this >>> WORLD_ID_SHIFT;
   const store = ctx.stores[worldId];
-  if (value instanceof Function) {
-    value = value(ctx.get(index, store));
-  }
+  value instanceof Function && (value = value(ctx.get(index, store)));
   ctx.set(index, store, value);
   triggerChanged && setChanged(universe.worlds[worldId], this, trait2);
 };
@@ -761,6 +754,7 @@ var createQueryHash = (parameters) => {
 var IsExcluded = trait();
 var Query = class {
   constructor(world, parameters = []) {
+    __publicField(this, "version", 0);
     __publicField(this, "world");
     __publicField(this, "parameters");
     __publicField(this, "hash");
@@ -846,6 +840,7 @@ var Query = class {
         this.traits.push(trait2);
       }
     }
+    this.traitData.forbidden.push(ctx.traitData.get(IsExcluded));
     this.traitData.all = [
       ...this.traitData.required,
       ...this.traitData.forbidden,
@@ -927,7 +922,6 @@ var Query = class {
         const entities = ctx.entityIndex.dense;
         for (let i = 0; i < entities.length; i++) {
           const entity = entities[i];
-          if (entity.has(IsExcluded)) continue;
           const match = this.check(world, entity);
           if (match) this.add(entity);
         }
@@ -946,6 +940,7 @@ var Query = class {
     for (const sub of this.addSubscriptions) {
       sub(entity);
     }
+    this.version++;
   }
   remove(world, entity) {
     if (!this.entities.has(entity) || this.toRemove.has(entity)) return;
@@ -1362,6 +1357,31 @@ function createWorld(...traits) {
   return new World(...traits);
 }
 
+// ../core/src/query/utils/cache-query.ts
+function cacheQuery(...parameters) {
+  const hash = createQueryHash(parameters);
+  for (const world of universe.worlds) {
+    if (!world) continue;
+    const ctx = world[$internal];
+    if (!ctx.queriesHashMap.has(hash)) {
+      const query = new Query(world, parameters);
+      ctx.queriesHashMap.set(hash, query);
+    }
+  }
+  universe.cachedQueries.set(hash, parameters);
+  return hash;
+}
+
+// ../react/src/hooks/use-query.ts
+var import_react3 = require("react");
+
+// ../react/src/world/use-world.ts
+var import_react2 = require("react");
+
+// ../react/src/world/world-context.ts
+var import_react = require("react");
+var WorldContext = (0, import_react.createContext)(null);
+
 // ../react/src/world/default-world.ts
 var defaultWorld = createWorld();
 var getDefaultWorld = () => defaultWorld;
@@ -1374,34 +1394,29 @@ function useWorld() {
 
 // ../react/src/hooks/use-query.ts
 function useQuery(...parameters) {
-  const memoizedParameters = (0, import_react3.useMemo)(() => parameters, [parameters]);
   const world = useWorld();
-  const entities = (0, import_react3.useMemo)(() => world.query(...memoizedParameters), [world, memoizedParameters]);
-  const [, forceUpdate] = (0, import_react3.useReducer)((v) => v + 1, 0);
-  (0, import_react3.useEffect)(() => {
-    const mutableEntities = entities;
-    mutableEntities.length = 0;
-    mutableEntities.push(...world.query(...memoizedParameters));
-    forceUpdate();
-  }, [world]);
+  const [hash, initialVersion] = (0, import_react3.useMemo)(() => {
+    const hash2 = cacheQuery(...parameters);
+    const query = world[$internal].queriesHashMap.get(hash2);
+    return [hash2, query.version];
+  }, [parameters]);
+  const [entities, setEntities] = (0, import_react3.useState)(() => world.query(hash));
   (0, import_react3.useEffect)(() => {
-    const unsubAdd = world.onAdd(memoizedParameters, (entity) => {
-      const mutableEntities = entities;
-      mutableEntities.push(entity);
-      forceUpdate();
+    const unsubAdd = world.onAdd(parameters, () => {
+      setEntities(world.query(hash));
     });
-    const unsubRemove = world.onRemove(memoizedParameters, (entity) => {
-      const mutableEntities = entities;
-      const index = mutableEntities.indexOf(entity);
-      mutableEntities[index] = mutableEntities[mutableEntities.length - 1];
-      mutableEntities.pop();
-      forceUpdate();
+    const unsubRemove = world.onRemove(parameters, () => {
+      setEntities(world.query(hash));
     });
+    const query = world[$internal].queriesHashMap.get(hash);
+    if (query.version !== initialVersion) {
+      setEntities(world.query(hash));
+    }
     return () => {
       unsubAdd();
       unsubRemove();
     };
-  }, [world]);
+  }, [world, hash]);
   return entities;
 }
 

package/dist/react.d.cts

@@ -1,4 +1,4 @@
-import { Q as QueryParameter, p as QueryResult, W as World, T as Trait, l as Entity, g as TraitInstance } from './world-CIrtrsKj.cjs';
+import { Q as QueryParameter, o as QueryResult, W as World, T as Trait, k as Entity, g as TraitInstance } from './world-DQXl4lI8.cjs';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 
 declare function useQuery<T extends QueryParameter[]>(...parameters: T): QueryResult<T>;

package/dist/react.d.ts

@@ -1,4 +1,4 @@
-import { Q as QueryParameter, p as QueryResult, W as World, T as Trait, l as Entity, g as TraitInstance } from './world-CIrtrsKj.js';
+import { Q as QueryParameter, o as QueryResult, W as World, T as Trait, k as Entity, g as TraitInstance } from './world-DQXl4lI8.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 
 declare function useQuery<T extends QueryParameter[]>(...parameters: T): QueryResult<T>;

package/dist/react.js

@@ -1,10 +1,11 @@
 import {
   $internal,
+  cacheQuery,
   createWorld
-} from "./chunk-FAWXK4QV.js";
+} from "./chunk-4QEK6BHY.js";
 
 // ../react/src/hooks/use-query.ts
-import { useEffect, useMemo, useReducer } from "react";
+import { useEffect, useMemo, useState } from "react";
 
 // ../react/src/world/use-world.ts
 import { useContext } from "react";
@@ -25,34 +26,29 @@ function useWorld() {
 
 // ../react/src/hooks/use-query.ts
 function useQuery(...parameters) {
-  const memoizedParameters = useMemo(() => parameters, [parameters]);
   const world = useWorld();
-  const entities = useMemo(() => world.query(...memoizedParameters), [world, memoizedParameters]);
-  const [, forceUpdate] = useReducer((v) => v + 1, 0);
+  const [hash, initialVersion] = useMemo(() => {
+    const hash2 = cacheQuery(...parameters);
+    const query = world[$internal].queriesHashMap.get(hash2);
+    return [hash2, query.version];
+  }, [parameters]);
+  const [entities, setEntities] = useState(() => world.query(hash));
   useEffect(() => {
-    const mutableEntities = entities;
-    mutableEntities.length = 0;
-    mutableEntities.push(...world.query(...memoizedParameters));
-    forceUpdate();
-  }, [world]);
-  useEffect(() => {
-    const unsubAdd = world.onAdd(memoizedParameters, (entity) => {
-      const mutableEntities = entities;
-      mutableEntities.push(entity);
-      forceUpdate();
+    const unsubAdd = world.onAdd(parameters, () => {
+      setEntities(world.query(hash));
     });
-    const unsubRemove = world.onRemove(memoizedParameters, (entity) => {
-      const mutableEntities = entities;
-      const index = mutableEntities.indexOf(entity);
-      mutableEntities[index] = mutableEntities[mutableEntities.length - 1];
-      mutableEntities.pop();
-      forceUpdate();
+    const unsubRemove = world.onRemove(parameters, () => {
+      setEntities(world.query(hash));
     });
+    const query = world[$internal].queriesHashMap.get(hash);
+    if (query.version !== initialVersion) {
+      setEntities(world.query(hash));
+    }
     return () => {
       unsubAdd();
       unsubRemove();
     };
-  }, [world]);
+  }, [world, hash]);
   return entities;
 }
 
@@ -69,7 +65,7 @@ function useActions(actions) {
 }
 
 // ../react/src/hooks/use-trait.ts
-import { useEffect as useEffect2, useMemo as useMemo2, useState } from "react";
+import { useEffect as useEffect2, useMemo as useMemo2, useState as useState2 } from "react";
 
 // ../react/src/utils/is-world.ts
 function isWorld(target) {
@@ -83,7 +79,7 @@ function useTrait(target, trait) {
     () => target ? createSubscriptions(target, trait, contextWorld) : void 0,
     [target, trait, contextWorld]
   );
-  const [value, setValue] = useState(() => {
+  const [value, setValue] = useState2(() => {
     return memo?.entity.has(trait) ? memo?.entity.get(trait) : void 0;
   });
   useEffect2(() => {

package/dist/{world-CIrtrsKj.d.cts → world-DQXl4lI8.d.cts}

@@ -43,12 +43,9 @@ type Store<T extends Schema = any> = T extends AoSFactory ? ReturnType<T>[] : {
 type Norm<T extends Schema> = T extends AoSFactory ? () => ReturnType<T> extends number ? number : ReturnType<T> extends boolean ? boolean : ReturnType<T> extends string ? string : ReturnType<T> : {
     [K in keyof T]: T[K] extends boolean ? boolean : T[K];
 };
-type ExtractSchema<T extends Trait> = T extends Trait<infer S, any> ? S : never;
+type ExtractSchema<T extends Trait | Relation<Trait>> = T extends Relation<infer R> ? ExtractSchema<R> : T extends Trait<infer S> ? S : never;
 type ExtractStore<T extends Trait> = T extends Trait<any, infer S> ? S : never;
 type ExtractIsTag<T extends Trait> = T extends Trait<any, any, infer Tag> ? Tag : false;
-type ExtractStores<T extends [Trait, ...Trait[]]> = T extends [infer C] ? C extends Trait<any, Store<any>> ? ExtractStore<C> : never : {
-    [K in keyof T]: ExtractStore<T[K]>;
-};
 type IsTag<T extends Trait> = T extends Trait<any, any, infer Tag> ? Tag : false;
 
 type RelationTarget = Entity | '*' | WildcardRelation;
@@ -79,7 +76,7 @@ type Entity = number & {
     destroy: () => void;
     changed: (trait: Trait) => void;
     set: <T extends Trait>(trait: T, value: TraitValue<ExtractSchema<T>> | ((prev: TraitInstance<ExtractSchema<T>>) => TraitValue<ExtractSchema<T>>), flagChanged?: boolean) => void;
-    get: <T extends Trait>(trait: T) => TraitInstance<ExtractSchema<T>> | undefined;
+    get: <T extends Trait | Relation<Trait>>(trait: T) => TraitInstance<ExtractSchema<T>> | undefined;
     targetFor: <T extends Trait>(relation: Relation<T>) => Entity | undefined;
     targetsFor: <T extends Trait>(relation: Relation<T>) => Entity[];
     id: () => number;
@@ -156,6 +153,7 @@ type InstancesFromParameters<T extends QueryParameter[]> = T extends [
 type IsNotModifier<T> = T extends ModifierData<any, infer TType> ? TType extends 'not' ? true : false : false;
 
 declare class Query {
+    version: number;
     world: World;
     parameters: QueryParameter[];
     hash: string;
@@ -244,4 +242,4 @@ declare class World {
 }
 declare function createWorld(...traits: ConfigurableTrait[]): World;
 
-export { $internal as $, type AoSFactory as A, type ConfigurableTrait as C, type ExtractSchema as E, type IsTag as I, ModifierData as M, type Norm as N, type QueryParameter as Q, type Relation as R, type Schema as S, type Trait as T, World as W, type RelationTarget as a, type WildcardRelation as b, createWorld as c, type TraitType as d, type TraitValue as e, type TraitTuple as f, type TraitInstance as g, type Store as h, type ExtractStore as i, type ExtractIsTag as j, type ExtractStores as k, type Entity as l, type QueryModifier as m, type QuerySubscriber as n, type QueryResultOptions as o, type QueryResult as p, type StoresFromParameters as q, type InstancesFromParameters as r, type IsNotModifier as s };
+export { $internal as $, type AoSFactory as A, type ConfigurableTrait as C, type ExtractSchema as E, type IsTag as I, ModifierData as M, type Norm as N, type QueryParameter as Q, type Relation as R, type Schema as S, type Trait as T, World as W, type RelationTarget as a, type WildcardRelation as b, createWorld as c, type TraitType as d, type TraitValue as e, type TraitTuple as f, type TraitInstance as g, type Store as h, type ExtractStore as i, type ExtractIsTag as j, type Entity as k, type QueryModifier as l, type QuerySubscriber as m, type QueryResultOptions as n, type QueryResult as o, type StoresFromParameters as p, type InstancesFromParameters as q, type IsNotModifier as r };

package/dist/{world-CIrtrsKj.d.ts → world-DQXl4lI8.d.ts}

@@ -43,12 +43,9 @@ type Store<T extends Schema = any> = T extends AoSFactory ? ReturnType<T>[] : {
 type Norm<T extends Schema> = T extends AoSFactory ? () => ReturnType<T> extends number ? number : ReturnType<T> extends boolean ? boolean : ReturnType<T> extends string ? string : ReturnType<T> : {
     [K in keyof T]: T[K] extends boolean ? boolean : T[K];
 };
-type ExtractSchema<T extends Trait> = T extends Trait<infer S, any> ? S : never;
+type ExtractSchema<T extends Trait | Relation<Trait>> = T extends Relation<infer R> ? ExtractSchema<R> : T extends Trait<infer S> ? S : never;
 type ExtractStore<T extends Trait> = T extends Trait<any, infer S> ? S : never;
 type ExtractIsTag<T extends Trait> = T extends Trait<any, any, infer Tag> ? Tag : false;
-type ExtractStores<T extends [Trait, ...Trait[]]> = T extends [infer C] ? C extends Trait<any, Store<any>> ? ExtractStore<C> : never : {
-    [K in keyof T]: ExtractStore<T[K]>;
-};
 type IsTag<T extends Trait> = T extends Trait<any, any, infer Tag> ? Tag : false;
 
 type RelationTarget = Entity | '*' | WildcardRelation;
@@ -79,7 +76,7 @@ type Entity = number & {
     destroy: () => void;
     changed: (trait: Trait) => void;
     set: <T extends Trait>(trait: T, value: TraitValue<ExtractSchema<T>> | ((prev: TraitInstance<ExtractSchema<T>>) => TraitValue<ExtractSchema<T>>), flagChanged?: boolean) => void;
-    get: <T extends Trait>(trait: T) => TraitInstance<ExtractSchema<T>> | undefined;
+    get: <T extends Trait | Relation<Trait>>(trait: T) => TraitInstance<ExtractSchema<T>> | undefined;
     targetFor: <T extends Trait>(relation: Relation<T>) => Entity | undefined;
     targetsFor: <T extends Trait>(relation: Relation<T>) => Entity[];
     id: () => number;
@@ -156,6 +153,7 @@ type InstancesFromParameters<T extends QueryParameter[]> = T extends [
 type IsNotModifier<T> = T extends ModifierData<any, infer TType> ? TType extends 'not' ? true : false : false;
 
 declare class Query {
+    version: number;
     world: World;
     parameters: QueryParameter[];
     hash: string;
@@ -244,4 +242,4 @@ declare class World {
 }
 declare function createWorld(...traits: ConfigurableTrait[]): World;
 
-export { $internal as $, type AoSFactory as A, type ConfigurableTrait as C, type ExtractSchema as E, type IsTag as I, ModifierData as M, type Norm as N, type QueryParameter as Q, type Relation as R, type Schema as S, type Trait as T, World as W, type RelationTarget as a, type WildcardRelation as b, createWorld as c, type TraitType as d, type TraitValue as e, type TraitTuple as f, type TraitInstance as g, type Store as h, type ExtractStore as i, type ExtractIsTag as j, type ExtractStores as k, type Entity as l, type QueryModifier as m, type QuerySubscriber as n, type QueryResultOptions as o, type QueryResult as p, type StoresFromParameters as q, type InstancesFromParameters as r, type IsNotModifier as s };
+export { $internal as $, type AoSFactory as A, type ConfigurableTrait as C, type ExtractSchema as E, type IsTag as I, ModifierData as M, type Norm as N, type QueryParameter as Q, type Relation as R, type Schema as S, type Trait as T, World as W, type RelationTarget as a, type WildcardRelation as b, createWorld as c, type TraitType as d, type TraitValue as e, type TraitTuple as f, type TraitInstance as g, type Store as h, type ExtractStore as i, type ExtractIsTag as j, type Entity as k, type QueryModifier as l, type QuerySubscriber as m, type QueryResultOptions as n, type QueryResult as o, type StoresFromParameters as p, type InstancesFromParameters as q, type IsNotModifier as r };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koota",
-  "version": "0.1.12",
+  "version": "0.2.1",
   "description": "🌎 Performant real-time state management for React and TypeScript",
   "license": "ISC",
   "type": "module",
@@ -32,36 +32,35 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
-    "@types/three": "^0.162.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "rimraf": "^6.0.1",
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0",
     "tsup": "^8.3.0",
     "@koota/core": "0.0.1",
-    "@koota/react": "0.0.1",
-    "tsconfig": "0.1.0"
+    "tsconfig": "0.1.0",
+    "@koota/react": "0.0.1"
   },
   "peerDependencies": {
-    "@react-three/fiber": "^8.17.10",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "three": ">=0.159"
+    "@types/react": "^18.0.0 || ^19.0.0",
+    "@types/react-dom": "^18.0.0 || ^19.0.0",
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0"
   },
   "peerDependenciesMeta": {
-    "@react-three/fiber": {
+    "@types/react": {
       "optional": true
     },
-    "three": {
+    "@types/react-dom": {
       "optional": true
     },
     "react-dom": {
       "optional": true
+    },
+    "react": {
+      "optional": true
     }
   },
   "scripts": {
-    "build": "rimraf dist react && tsup src/index.ts src/react.ts --format esm,cjs --dts --dts-resolve && tsx scripts/copy-readme.ts && tsx scripts/copy-react-files.ts",
+    "build": "tsup && tsx scripts/copy-readme.ts && tsx scripts/copy-react-files.ts",
     "test": "vitest --environment=jsdom"
   }
 }

package/react/index.cjs

@@ -48,16 +48,6 @@ __export(react_exports, {
 });
 module.exports = __toCommonJS(react_exports);
 
-// ../react/src/hooks/use-query.ts
-var import_react3 = require("react");
-
-// ../react/src/world/use-world.ts
-var import_react2 = require("react");
-
-// ../react/src/world/world-context.ts
-var import_react = require("react");
-var WorldContext = (0, import_react.createContext)(null);
-
 // ../core/src/common.ts
 var $internal = Symbol("internal");
 
@@ -86,7 +76,12 @@ function defineRelation(definition) {
   function relationFn(target) {
     if (target === void 0) throw Error("Relation target is undefined");
     if (target === "*") target = Wildcard;
-    return getRelationTrait(relationFn, traitFactory, pairsMap, target);
+    return getRelationTrait(
+      relationFn,
+      traitFactory,
+      pairsMap,
+      target
+    );
   }
   return Object.assign(relationFn, {
     [$internal]: {
@@ -599,9 +594,7 @@ Number.prototype.set = function(trait2, value, triggerChanged = true) {
   const index = this & ENTITY_ID_MASK;
   const worldId = this >>> WORLD_ID_SHIFT;
   const store = ctx.stores[worldId];
-  if (value instanceof Function) {
-    value = value(ctx.get(index, store));
-  }
+  value instanceof Function && (value = value(ctx.get(index, store)));
   ctx.set(index, store, value);
   triggerChanged && setChanged(universe.worlds[worldId], this, trait2);
 };
@@ -761,6 +754,7 @@ var createQueryHash = (parameters) => {
 var IsExcluded = trait();
 var Query = class {
   constructor(world, parameters = []) {
+    __publicField(this, "version", 0);
     __publicField(this, "world");
     __publicField(this, "parameters");
     __publicField(this, "hash");
@@ -846,6 +840,7 @@ var Query = class {
         this.traits.push(trait2);
       }
     }
+    this.traitData.forbidden.push(ctx.traitData.get(IsExcluded));
     this.traitData.all = [
       ...this.traitData.required,
       ...this.traitData.forbidden,
@@ -927,7 +922,6 @@ var Query = class {
         const entities = ctx.entityIndex.dense;
         for (let i = 0; i < entities.length; i++) {
           const entity = entities[i];
-          if (entity.has(IsExcluded)) continue;
           const match = this.check(world, entity);
           if (match) this.add(entity);
         }
@@ -946,6 +940,7 @@ var Query = class {
     for (const sub of this.addSubscriptions) {
       sub(entity);
     }
+    this.version++;
   }
   remove(world, entity) {
     if (!this.entities.has(entity) || this.toRemove.has(entity)) return;
@@ -1362,6 +1357,31 @@ function createWorld(...traits) {
   return new World(...traits);
 }
 
+// ../core/src/query/utils/cache-query.ts
+function cacheQuery(...parameters) {
+  const hash = createQueryHash(parameters);
+  for (const world of universe.worlds) {
+    if (!world) continue;
+    const ctx = world[$internal];
+    if (!ctx.queriesHashMap.has(hash)) {
+      const query = new Query(world, parameters);
+      ctx.queriesHashMap.set(hash, query);
+    }
+  }
+  universe.cachedQueries.set(hash, parameters);
+  return hash;
+}
+
+// ../react/src/hooks/use-query.ts
+var import_react3 = require("react");
+
+// ../react/src/world/use-world.ts
+var import_react2 = require("react");
+
+// ../react/src/world/world-context.ts
+var import_react = require("react");
+var WorldContext = (0, import_react.createContext)(null);
+
 // ../react/src/world/default-world.ts
 var defaultWorld = createWorld();
 var getDefaultWorld = () => defaultWorld;
@@ -1374,34 +1394,29 @@ function useWorld() {
 
 // ../react/src/hooks/use-query.ts
 function useQuery(...parameters) {
-  const memoizedParameters = (0, import_react3.useMemo)(() => parameters, [parameters]);
   const world = useWorld();
-  const entities = (0, import_react3.useMemo)(() => world.query(...memoizedParameters), [world, memoizedParameters]);
-  const [, forceUpdate] = (0, import_react3.useReducer)((v) => v + 1, 0);
-  (0, import_react3.useEffect)(() => {
-    const mutableEntities = entities;
-    mutableEntities.length = 0;
-    mutableEntities.push(...world.query(...memoizedParameters));
-    forceUpdate();
-  }, [world]);
+  const [hash, initialVersion] = (0, import_react3.useMemo)(() => {
+    const hash2 = cacheQuery(...parameters);
+    const query = world[$internal].queriesHashMap.get(hash2);
+    return [hash2, query.version];
+  }, [parameters]);
+  const [entities, setEntities] = (0, import_react3.useState)(() => world.query(hash));
   (0, import_react3.useEffect)(() => {
-    const unsubAdd = world.onAdd(memoizedParameters, (entity) => {
-      const mutableEntities = entities;
-      mutableEntities.push(entity);
-      forceUpdate();
+    const unsubAdd = world.onAdd(parameters, () => {
+      setEntities(world.query(hash));
     });
-    const unsubRemove = world.onRemove(memoizedParameters, (entity) => {
-      const mutableEntities = entities;
-      const index = mutableEntities.indexOf(entity);
-      mutableEntities[index] = mutableEntities[mutableEntities.length - 1];
-      mutableEntities.pop();
-      forceUpdate();
+    const unsubRemove = world.onRemove(parameters, () => {
+      setEntities(world.query(hash));
     });
+    const query = world[$internal].queriesHashMap.get(hash);
+    if (query.version !== initialVersion) {
+      setEntities(world.query(hash));
+    }
     return () => {
       unsubAdd();
       unsubRemove();
     };
-  }, [world]);
+  }, [world, hash]);
   return entities;
 }
 

package/react/index.d.cts

@@ -1,4 +1,4 @@
-import { Q as QueryParameter, p as QueryResult, W as World, T as Trait, l as Entity, g as TraitInstance } from '../dist/world-CIrtrsKj.cjs';
+import { Q as QueryParameter, o as QueryResult, W as World, T as Trait, k as Entity, g as TraitInstance } from '../dist/world-DQXl4lI8.cjs';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 
 declare function useQuery<T extends QueryParameter[]>(...parameters: T): QueryResult<T>;

package/react/index.d.ts

@@ -1,4 +1,4 @@
-import { Q as QueryParameter, p as QueryResult, W as World, T as Trait, l as Entity, g as TraitInstance } from '../dist/world-CIrtrsKj.js';
+import { Q as QueryParameter, o as QueryResult, W as World, T as Trait, k as Entity, g as TraitInstance } from '../dist/world-DQXl4lI8.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 
 declare function useQuery<T extends QueryParameter[]>(...parameters: T): QueryResult<T>;

package/react/index.js

@@ -1,10 +1,11 @@
 import {
   $internal,
+  cacheQuery,
   createWorld
-} from "../dist/chunk-FAWXK4QV.js";
+} from "../dist/chunk-4QEK6BHY.js";
 
 // ../react/src/hooks/use-query.ts
-import { useEffect, useMemo, useReducer } from "react";
+import { useEffect, useMemo, useState } from "react";
 
 // ../react/src/world/use-world.ts
 import { useContext } from "react";
@@ -25,34 +26,29 @@ function useWorld() {
 
 // ../react/src/hooks/use-query.ts
 function useQuery(...parameters) {
-  const memoizedParameters = useMemo(() => parameters, [parameters]);
   const world = useWorld();
-  const entities = useMemo(() => world.query(...memoizedParameters), [world, memoizedParameters]);
-  const [, forceUpdate] = useReducer((v) => v + 1, 0);
+  const [hash, initialVersion] = useMemo(() => {
+    const hash2 = cacheQuery(...parameters);
+    const query = world[$internal].queriesHashMap.get(hash2);
+    return [hash2, query.version];
+  }, [parameters]);
+  const [entities, setEntities] = useState(() => world.query(hash));
   useEffect(() => {
-    const mutableEntities = entities;
-    mutableEntities.length = 0;
-    mutableEntities.push(...world.query(...memoizedParameters));
-    forceUpdate();
-  }, [world]);
-  useEffect(() => {
-    const unsubAdd = world.onAdd(memoizedParameters, (entity) => {
-      const mutableEntities = entities;
-      mutableEntities.push(entity);
-      forceUpdate();
+    const unsubAdd = world.onAdd(parameters, () => {
+      setEntities(world.query(hash));
     });
-    const unsubRemove = world.onRemove(memoizedParameters, (entity) => {
-      const mutableEntities = entities;
-      const index = mutableEntities.indexOf(entity);
-      mutableEntities[index] = mutableEntities[mutableEntities.length - 1];
-      mutableEntities.pop();
-      forceUpdate();
+    const unsubRemove = world.onRemove(parameters, () => {
+      setEntities(world.query(hash));
     });
+    const query = world[$internal].queriesHashMap.get(hash);
+    if (query.version !== initialVersion) {
+      setEntities(world.query(hash));
+    }
     return () => {
       unsubAdd();
       unsubRemove();
     };
-  }, [world]);
+  }, [world, hash]);
   return entities;
 }
 
@@ -69,7 +65,7 @@ function useActions(actions) {
 }
 
 // ../react/src/hooks/use-trait.ts
-import { useEffect as useEffect2, useMemo as useMemo2, useState } from "react";
+import { useEffect as useEffect2, useMemo as useMemo2, useState as useState2 } from "react";
 
 // ../react/src/utils/is-world.ts
 function isWorld(target) {
@@ -83,7 +79,7 @@ function useTrait(target, trait) {
     () => target ? createSubscriptions(target, trait, contextWorld) : void 0,
     [target, trait, contextWorld]
   );
-  const [value, setValue] = useState(() => {
+  const [value, setValue] = useState2(() => {
     return memo?.entity.has(trait) ? memo?.entity.get(trait) : void 0;
   });
   useEffect2(() => {