koota 0.2.3 → 0.3.0

package/README.md

@@ -446,7 +446,15 @@ world.entities
 const id = world.id()
 
 // Resets the world as if it were just created
-world.reset()
+// Options can be passed in to modify the reset behavior
+world.reset({
+  // Default false. If true, does not clear cached queries
+  preserveQueries: false 
+  // Default false. If true, does not clear cached traits
+  preserveTraits: false 
+  // Default false. If true, does not clear subscrptions, queries or traits
+  preserveSubscriptions: false 
+})
 
 // Nukes the world and releases its ID
 world.destroy()
@@ -647,7 +655,7 @@ return player ? (
 
 ### `useWorld` 
 
-Returns the default world. If a world is passed in via `WorldProvider` then this is returned instead. The default world can be gotten at any time with `getDefaultWorld`.
+Returns the world held in context via `WorldProvider`.
 
 ```js
 // Get the default world
@@ -663,7 +671,7 @@ useEffect(() => {
 
 ### `WorldProvider` 
 
-The provider for the world context. A world must be created and passed in, which then overrides the default world.
+The provider for the world context. A world must be created and passed in.
 
 ```js
 // Create a world and pass it to the provider

package/dist/{chunk-ZHBGFPP2.js → chunk-G375UJC5.js}

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateWrapper = (obj, member, setter, getter) => ({
-  set _(value) {
-    __privateSet(obj, member, value, setter);
-  },
-  get _() {
-    return __privateGet(obj, member, getter);
-  }
-});
-
 // ../core/src/common.ts
 var $internal = Symbol("internal");
 
@@ -72,7 +53,7 @@ var universe = {
   cachedQueries: /* @__PURE__ */ new Map(),
   worldIndex: createWorldIndex(),
   reset: () => {
-    universe.worlds = new Array(WORLD_ID_BITS ** 2);
+    universe.worlds = new Array(WORLD_ID_BITS ** 2).fill(null);
     universe.cachedQueries = /* @__PURE__ */ new Map();
     universe.worldIndex = createWorldIndex();
   }
@@ -84,9 +65,9 @@ var ModifierData = class {
     this.type = type;
     this.id = id;
     this.traits = traits;
-    __publicField(this, "traitIds");
     this.traitIds = traits.map((trait2) => trait2[$internal].id);
   }
+  traitIds;
 };
 
 // ../core/src/query/utils/tracking-cursor.ts
@@ -148,8 +129,9 @@ function getRelationTrait(relation2, traitFactory, pairsMap, target) {
 }
 var getRelationTargets = (world, relation2, entity) => {
   const ctx = world[$internal];
-  const traits = ctx.entityTraits.get(entity) || [];
+  const traits = ctx.entityTraits.get(entity);
   const targets = [];
+  if (!traits) return targets;
   for (const trait2 of traits) {
     const traitCtx = trait2[$internal];
     if (traitCtx.relation === relation2 && traitCtx.pairTarget !== Wildcard) {
@@ -181,15 +163,15 @@ var incrementWorldBitflag = (world) => {
 
 // ../core/src/trait/trait-data.ts
 var TraitData = class {
+  generationId;
+  bitflag;
+  trait;
+  store;
+  queries;
+  notQueries;
+  schema;
+  changedSubscriptions;
   constructor(world, trait2) {
-    __publicField(this, "generationId");
-    __publicField(this, "bitflag");
-    __publicField(this, "trait");
-    __publicField(this, "store");
-    __publicField(this, "queries");
-    __publicField(this, "notQueries");
-    __publicField(this, "schema");
-    __publicField(this, "changedSubscriptions");
     const ctx = world[$internal];
     const traitCtx = trait2[$internal];
     this.generationId = ctx.entityMasks.length - 1;
@@ -478,7 +460,7 @@ function createChanged() {
   const id = createTrackingId();
   for (const world of universe.worlds) {
     if (!world) continue;
-    setTrackingMasks(world, id);
+    setTrackingMasks(world.deref(), id);
   }
   return (...traits) => new ModifierData(`changed-${id}`, id, traits);
 }
@@ -553,47 +535,47 @@ var getAliveEntities = (index) => {
 // ../core/src/entity/entity-methods-patch.ts
 Number.prototype.add = function(...traits) {
   const worldId = this >>> WORLD_ID_SHIFT;
-  const world = universe.worlds[worldId];
+  const world = universe.worlds[worldId].deref();
   return addTrait(world, this, ...traits);
 };
 Number.prototype.remove = function(...traits) {
   const worldId = this >>> WORLD_ID_SHIFT;
-  const world = universe.worlds[worldId];
+  const world = universe.worlds[worldId].deref();
   return removeTrait(world, this, ...traits);
 };
 Number.prototype.has = function(trait2) {
   const worldId = this >>> WORLD_ID_SHIFT;
-  const world = universe.worlds[worldId];
+  const world = universe.worlds[worldId].deref();
   return hasTrait(world, this, trait2);
 };
 Number.prototype.destroy = function() {
   const worldId = this >>> WORLD_ID_SHIFT;
-  const world = universe.worlds[worldId];
+  const world = universe.worlds[worldId].deref();
   return destroyEntity(world, this);
 };
 Number.prototype.changed = function(trait2) {
   const worldId = this >>> WORLD_ID_SHIFT;
-  const world = universe.worlds[worldId];
+  const world = universe.worlds[worldId].deref();
   return setChanged(world, this, trait2);
 };
 Number.prototype.get = function(trait2) {
   const worldId = this >>> WORLD_ID_SHIFT;
-  const world = universe.worlds[worldId];
+  const world = universe.worlds[worldId].deref();
   return getTrait(world, this, trait2);
 };
 Number.prototype.set = function(trait2, value, triggerChanged = true) {
   const worldId = this >>> WORLD_ID_SHIFT;
-  const world = universe.worlds[worldId];
+  const world = universe.worlds[worldId].deref();
   setTrait(world, this, trait2, value, triggerChanged);
 };
 Number.prototype.targetsFor = function(relation2) {
   const worldId = this >>> WORLD_ID_SHIFT;
-  const world = universe.worlds[worldId];
+  const world = universe.worlds[worldId].deref();
   return getRelationTargets(world, relation2, this);
 };
 Number.prototype.targetFor = function(relation2) {
   const worldId = this >>> WORLD_ID_SHIFT;
-  const world = universe.worlds[worldId];
+  const world = universe.worlds[worldId].deref();
   return getRelationTargets(world, relation2, this)[0];
 };
 Number.prototype.id = function() {
@@ -602,7 +584,7 @@ Number.prototype.id = function() {
 };
 Number.prototype.isAlive = function() {
   const worldId = this >>> WORLD_ID_SHIFT;
-  const world = universe.worlds[worldId];
+  const world = universe.worlds[worldId].deref();
   return isEntityAlive(world[$internal].entityIndex, this);
 };
 
@@ -668,64 +650,58 @@ function destroyEntity(world, entity) {
 }
 
 // ../core/src/utils/sparse-set.ts
-var _dense, _sparse, _cursor;
 var SparseSet = class {
-  constructor() {
-    __privateAdd(this, _dense, []);
-    __privateAdd(this, _sparse, []);
-    __privateAdd(this, _cursor, 0);
-  }
+  #dense = [];
+  #sparse = [];
+  #cursor = 0;
   has(val) {
-    const index = __privateGet(this, _sparse)[val];
-    return index < __privateGet(this, _cursor) && __privateGet(this, _dense)[index] === val;
+    const index = this.#sparse[val];
+    return index < this.#cursor && this.#dense[index] === val;
   }
   add(val) {
     if (this.has(val)) return;
-    __privateGet(this, _sparse)[val] = __privateGet(this, _cursor);
-    __privateGet(this, _dense)[__privateWrapper(this, _cursor)._++] = val;
+    this.#sparse[val] = this.#cursor;
+    this.#dense[this.#cursor++] = val;
   }
   remove(val) {
     if (!this.has(val)) return;
-    const index = __privateGet(this, _sparse)[val];
-    __privateWrapper(this, _cursor)._--;
-    const swapped = __privateGet(this, _dense)[__privateGet(this, _cursor)];
+    const index = this.#sparse[val];
+    this.#cursor--;
+    const swapped = this.#dense[this.#cursor];
     if (swapped !== val) {
-      __privateGet(this, _dense)[index] = swapped;
-      __privateGet(this, _sparse)[swapped] = index;
+      this.#dense[index] = swapped;
+      this.#sparse[swapped] = index;
     }
   }
   clear() {
-    for (let i = 0; i < __privateGet(this, _cursor); i++) {
-      __privateGet(this, _sparse)[__privateGet(this, _dense)[i]] = 0;
+    for (let i = 0; i < this.#cursor; i++) {
+      this.#sparse[this.#dense[i]] = 0;
     }
-    __privateSet(this, _cursor, 0);
+    this.#cursor = 0;
   }
   sort() {
-    __privateGet(this, _dense).sort((a, b) => a - b);
-    for (let i = 0; i < __privateGet(this, _dense).length; i++) {
-      __privateGet(this, _sparse)[__privateGet(this, _dense)[i]] = i;
+    this.#dense.sort((a, b) => a - b);
+    for (let i = 0; i < this.#dense.length; i++) {
+      this.#sparse[this.#dense[i]] = i;
     }
   }
   getIndex(val) {
-    return __privateGet(this, _sparse)[val];
+    return this.#sparse[val];
   }
   get dense() {
-    return __privateGet(this, _dense).slice(0, __privateGet(this, _cursor));
+    return this.#dense.slice(0, this.#cursor);
   }
   get sparse() {
-    return __privateGet(this, _sparse);
+    return this.#sparse;
   }
 };
-_dense = new WeakMap();
-_sparse = new WeakMap();
-_cursor = new WeakMap();
 
 // ../core/src/query/modifiers/added.ts
 function createAdded() {
   const id = createTrackingId();
   for (const world of universe.worlds) {
     if (!world) continue;
-    setTrackingMasks(world, id);
+    setTrackingMasks(world.deref(), id);
   }
   return (...traits) => new ModifierData(`added-${id}`, id, traits);
 }
@@ -735,7 +711,7 @@ function createRemoved() {
   const id = createTrackingId();
   for (const world of universe.worlds) {
     if (!world) continue;
-    setTrackingMasks(world, id);
+    setTrackingMasks(world.deref(), id);
   }
   return (...traits) => new ModifierData(`removed-${id}`, id, traits);
 }
@@ -749,8 +725,9 @@ var Or = (...traits) => new ModifierData("or", 2, traits);
 // ../core/src/query/utils/cache-query.ts
 function cacheQuery(...parameters) {
   const hash = createQueryHash(parameters);
-  for (const world of universe.worlds) {
-    if (!world) continue;
+  for (const worldRef of universe.worlds) {
+    if (!worldRef) continue;
+    const world = worldRef.deref();
     const ctx = world[$internal];
     if (!ctx.queriesHashMap.has(hash)) {
       const query = new Query(world, parameters);
@@ -779,6 +756,9 @@ function createActions(actionSet) {
   };
 }
 
+// ../core/src/query/types.ts
+var $parameters = Symbol();
+
 // ../core/src/query/utils/create-query-hash.ts
 var sortedIDs = new Float32Array(1024);
 var createQueryHash = (parameters) => {
@@ -807,22 +787,22 @@ var createQueryHash = (parameters) => {
 // ../core/src/query/query.ts
 var IsExcluded = trait();
 var Query = class {
+  version = 0;
+  world;
+  parameters;
+  hash;
+  traits = [];
+  traitData = { required: [], forbidden: [], or: [], added: [], removed: [], changed: [], all: [] };
+  bitmasks = [];
+  generations;
+  entities = new SparseSet();
+  isTracking = false;
+  hasChangedModifiers = false;
+  changedTraits = /* @__PURE__ */ new Set();
+  toRemove = new SparseSet();
+  addSubscriptions = /* @__PURE__ */ new Set();
+  removeSubscriptions = /* @__PURE__ */ new Set();
   constructor(world, parameters = []) {
-    __publicField(this, "version", 0);
-    __publicField(this, "world");
-    __publicField(this, "parameters");
-    __publicField(this, "hash");
-    __publicField(this, "traits", []);
-    __publicField(this, "traitData", { required: [], forbidden: [], or: [], added: [], removed: [], changed: [], all: [] });
-    __publicField(this, "bitmasks", []);
-    __publicField(this, "generations");
-    __publicField(this, "entities", new SparseSet());
-    __publicField(this, "isTracking", false);
-    __publicField(this, "hasChangedModifiers", false);
-    __publicField(this, "changedTraits", /* @__PURE__ */ new Set());
-    __publicField(this, "toRemove", new SparseSet());
-    __publicField(this, "addSubscriptions", /* @__PURE__ */ new Set());
-    __publicField(this, "removeSubscriptions", /* @__PURE__ */ new Set());
     this.world = world;
     this.parameters = parameters;
     const ctx = world[$internal];
@@ -1232,6 +1212,10 @@ function createQueryResult(query, world, params) {
       stores.length = 0;
       getQueryStores(params2, traits, stores, world);
       return results;
+    },
+    sort(callback = (a, b) => getEntityId(a) - getEntityId(b)) {
+      Array.prototype.sort.call(entities, callback);
+      return results;
     }
   });
   return results;
@@ -1256,46 +1240,44 @@ function getQueryStores(params, traits, stores, world) {
 }
 
 // ../core/src/world/world.ts
-var _a, _id, _isInitialized;
-_a = $internal;
 var World = class {
-  constructor(...traits) {
-    __privateAdd(this, _id, allocateWorldId(universe.worldIndex));
-    __publicField(this, _a, {
-      entityIndex: createEntityIndex(__privateGet(this, _id)),
-      entityMasks: [[]],
-      entityTraits: /* @__PURE__ */ new Map(),
-      bitflag: 1,
-      traitData: /* @__PURE__ */ new Map(),
-      queries: /* @__PURE__ */ new Set(),
-      queriesHashMap: /* @__PURE__ */ new Map(),
-      notQueries: /* @__PURE__ */ new Set(),
-      dirtyQueries: /* @__PURE__ */ new Set(),
-      relationTargetEntities: /* @__PURE__ */ new Set(),
-      dirtyMasks: /* @__PURE__ */ new Map(),
-      trackingSnapshots: /* @__PURE__ */ new Map(),
-      changedMasks: /* @__PURE__ */ new Map(),
-      worldEntity: null,
-      trackedTraits: /* @__PURE__ */ new Set()
-    });
-    __privateAdd(this, _isInitialized, false);
-    __publicField(this, "traits", /* @__PURE__ */ new Set());
-    this.init(...traits);
-  }
+  #id = allocateWorldId(universe.worldIndex);
+  [$internal] = {
+    entityIndex: createEntityIndex(this.#id),
+    entityMasks: [[]],
+    entityTraits: /* @__PURE__ */ new Map(),
+    bitflag: 1,
+    traitData: /* @__PURE__ */ new Map(),
+    queries: /* @__PURE__ */ new Set(),
+    queriesHashMap: /* @__PURE__ */ new Map(),
+    notQueries: /* @__PURE__ */ new Set(),
+    dirtyQueries: /* @__PURE__ */ new Set(),
+    relationTargetEntities: /* @__PURE__ */ new Set(),
+    dirtyMasks: /* @__PURE__ */ new Map(),
+    trackingSnapshots: /* @__PURE__ */ new Map(),
+    changedMasks: /* @__PURE__ */ new Map(),
+    worldEntity: null,
+    trackedTraits: /* @__PURE__ */ new Set()
+  };
   get id() {
-    return __privateGet(this, _id);
+    return this.#id;
   }
+  #isInitialized = false;
   get isInitialized() {
-    return __privateGet(this, _isInitialized);
+    return this.#isInitialized;
   }
   get entities() {
     return getAliveEntities(this[$internal].entityIndex);
   }
+  traits = /* @__PURE__ */ new Set();
+  constructor(...traits) {
+    this.init(...traits);
+  }
   init(...traits) {
     const ctx = this[$internal];
-    if (__privateGet(this, _isInitialized)) return;
-    __privateSet(this, _isInitialized, true);
-    universe.worlds[__privateGet(this, _id)] = this;
+    if (this.#isInitialized) return;
+    this.#isInitialized = true;
+    universe.worlds[this.#id] = new WeakRef(this);
     const cursor2 = getTrackingCursor();
     for (let i = 0; i < cursor2; i++) {
       setTrackingMasks(this, i);
@@ -1329,22 +1311,28 @@ var World = class {
     this[$internal].worldEntity = null;
     this.entities.forEach((entity) => destroyEntity(this, entity));
     this.reset();
-    __privateSet(this, _isInitialized, false);
-    releaseWorldId(universe.worldIndex, __privateGet(this, _id));
-    universe.worlds.splice(universe.worlds.indexOf(this), 1);
+    this.#isInitialized = false;
+    releaseWorldId(universe.worldIndex, this.#id);
+    universe.worlds[this.#id] = null;
   }
-  reset() {
+  reset(options = {}) {
     const ctx = this[$internal];
-    ctx.entityIndex = createEntityIndex(__privateGet(this, _id));
+    const shouldPreserveTraits = options.preserveTraits || options.preserveSubscriptions;
+    const shouldPreserveQueries = options.preserveQueries || options.preserveSubscriptions;
+    ctx.entityIndex = createEntityIndex(this.#id);
     ctx.entityTraits.clear();
-    ctx.notQueries.clear();
     ctx.entityMasks = [[]];
     ctx.bitflag = 1;
-    ctx.traitData.clear();
-    this.traits.clear();
-    ctx.queries.clear();
-    ctx.queriesHashMap.clear();
-    ctx.dirtyQueries.clear();
+    if (!shouldPreserveTraits) {
+      ctx.traitData.clear();
+      this.traits.clear();
+    }
+    if (!shouldPreserveQueries) {
+      ctx.queries.clear();
+      ctx.queriesHashMap.clear();
+      ctx.dirtyQueries.clear();
+      ctx.notQueries.clear();
+    }
     ctx.relationTargetEntities.clear();
     ctx.trackingSnapshots.clear();
     ctx.dirtyMasks.clear();
@@ -1406,10 +1394,14 @@ var World = class {
     };
   }
 };
-_id = new WeakMap();
-_isInitialized = new WeakMap();
+var worldFinalizer = new FinalizationRegistry((worldId) => {
+  universe.worlds[worldId] = null;
+  releaseWorldId(universe.worldIndex, worldId);
+});
 function createWorld(...traits) {
-  return new World(...traits);
+  const world = new World(...traits);
+  worldFinalizer.register(world, world.id);
+  return world;
 }
 
 export {