koota 0.2.2 → 0.3.0

package/dist/index.cjs

@@ -3,10 +3,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -20,19 +16,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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);
-  }
-});
 
 // src/index.ts
 var index_exports = {};
@@ -75,6 +58,110 @@ var getEntityGeneration = (entity) => entity >>> GENERATION_SHIFT & GENERATION_M
 var incrementGeneration = (entity) => entity & ~(GENERATION_MASK << GENERATION_SHIFT) | // Clear current generation bits
 ((entity >>> GENERATION_SHIFT & GENERATION_MASK) + 1 & GENERATION_MASK) << GENERATION_SHIFT;
 
+// ../core/src/world/utils/world-index.ts
+function createWorldIndex() {
+  return {
+    worldCursor: 0,
+    releasedWorldIds: [],
+    maxWorlds: 2 ** WORLD_ID_BITS
+  };
+}
+function allocateWorldId(index) {
+  if (index.releasedWorldIds.length > 0) {
+    return index.releasedWorldIds.pop();
+  }
+  if (index.worldCursor >= index.maxWorlds) {
+    throw new Error(`Koota: Too many worlds created. The maximum is ${index.maxWorlds}.`);
+  }
+  return index.worldCursor++;
+}
+function releaseWorldId(index, worldId) {
+  if (worldId < 0 || worldId >= index.maxWorlds) {
+    throw new Error(`Invalid world ID: ${worldId}`);
+  }
+  if (worldId === index.worldCursor - 1) {
+    index.worldCursor--;
+  } else if (worldId < index.worldCursor && !index.releasedWorldIds.includes(worldId)) {
+    index.releasedWorldIds.push(worldId);
+  }
+}
+
+// ../core/src/universe/universe.ts
+var universe = {
+  worlds: new Array(WORLD_ID_BITS ** 2),
+  cachedQueries: /* @__PURE__ */ new Map(),
+  worldIndex: createWorldIndex(),
+  reset: () => {
+    universe.worlds = new Array(WORLD_ID_BITS ** 2).fill(null);
+    universe.cachedQueries = /* @__PURE__ */ new Map();
+    universe.worldIndex = createWorldIndex();
+  }
+};
+
+// ../core/src/query/modifier.ts
+var ModifierData = class {
+  constructor(type, id, traits) {
+    this.type = type;
+    this.id = id;
+    this.traits = traits;
+    this.traitIds = traits.map((trait2) => trait2[$internal].id);
+  }
+  traitIds;
+};
+
+// ../core/src/query/utils/tracking-cursor.ts
+var cursor = 3;
+function createTrackingId() {
+  return cursor++;
+}
+function getTrackingCursor() {
+  return cursor;
+}
+function setTrackingMasks(world, id) {
+  const ctx = world[$internal];
+  const snapshot = structuredClone(ctx.entityMasks);
+  ctx.trackingSnapshots.set(id, snapshot);
+  ctx.dirtyMasks.set(
+    id,
+    snapshot.map((mask) => mask.map(() => 0))
+  );
+  ctx.changedMasks.set(
+    id,
+    snapshot.map((mask) => mask.map(() => 0))
+  );
+}
+
+// ../core/src/query/modifiers/changed.ts
+function createChanged() {
+  const id = createTrackingId();
+  for (const world of universe.worlds) {
+    if (!world) continue;
+    setTrackingMasks(world.deref(), id);
+  }
+  return (...traits) => new ModifierData(`changed-${id}`, id, traits);
+}
+function setChanged(world, entity, trait2) {
+  const ctx = world[$internal];
+  if (!hasTrait(world, entity, trait2)) return;
+  if (!ctx.traitData.has(trait2)) registerTrait(world, trait2);
+  const data = ctx.traitData.get(trait2);
+  for (const changedMask of ctx.changedMasks.values()) {
+    const eid = getEntityId(entity);
+    if (!changedMask[eid]) changedMask[eid] = new Array();
+    const traitId2 = trait2[$internal].id;
+    changedMask[eid][traitId2] = 1;
+  }
+  for (const query of data.queries) {
+    if (!query.hasChangedModifiers) continue;
+    let match = query.check(world, entity, { type: "change", traitData: data });
+    if (match) query.add(entity);
+    else query.remove(world, entity);
+  }
+  for (const sub of data.changedSubscriptions) {
+    sub(entity);
+  }
+}
+
 // ../core/src/relation/relation.ts
 function defineRelation(definition) {
   const pairsMap = /* @__PURE__ */ new Map();
@@ -112,8 +199,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) {
@@ -145,15 +233,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;
@@ -322,7 +410,7 @@ function addTrait(world, entity, ...traits) {
     } else {
       trait2 = traits[i];
     }
-    if (entity.has(trait2)) return;
+    if (hasTrait(world, entity, trait2)) return;
     const traitCtx = trait2[$internal];
     if (!ctx.traitData.has(trait2)) registerTrait(world, trait2);
     const data = ctx.traitData.get(trait2);
@@ -344,8 +432,8 @@ function addTrait(world, entity, ...traits) {
     const target = traitCtx.pairTarget;
     if (traitCtx.isPairTrait && relation2 !== null && target !== null) {
       ctx.relationTargetEntities.add(target);
-      entity.add(Pair(Wildcard, target));
-      entity.add(Pair(relation2, Wildcard));
+      addTrait(world, entity, Pair(Wildcard, target));
+      addTrait(world, entity, Pair(relation2, Wildcard));
       if (relation2[$internal].exclusive === true && target !== Wildcard) {
         const oldTarget = getRelationTargets(world, relation2, entity)[0];
         if (oldTarget !== null && oldTarget !== void 0 && oldTarget !== target) {
@@ -362,10 +450,10 @@ function addTrait(world, entity, ...traits) {
           defaults[key] = data.schema[key];
         }
       }
-      entity.set(trait2, { ...defaults, ...params }, false);
+      setTrait(world, entity, trait2, { ...defaults, ...params }, false);
     } else {
       const state = params ?? data.schema();
-      entity.set(trait2, state, false);
+      setTrait(world, entity, trait2, state, false);
     }
   }
 }
@@ -374,7 +462,7 @@ function removeTrait(world, entity, ...traits) {
   for (let i = 0; i < traits.length; i++) {
     const trait2 = traits[i];
     const traitCtx = trait2[$internal];
-    if (!entity.has(trait2)) return;
+    if (!hasTrait(world, entity, trait2)) return;
     const data = ctx.traitData.get(trait2);
     const { generationId, bitflag, queries } = data;
     const eid = getEntityId(entity);
@@ -417,6 +505,25 @@ function getStore(world, trait2) {
   const store = data.store;
   return store;
 }
+function setTrait(world, entity, trait2, value, triggerChanged = true) {
+  const ctx = trait2[$internal];
+  const index = entity & ENTITY_ID_MASK;
+  const store = getStore(world, trait2);
+  value instanceof Function && (value = value(ctx.get(index, store)));
+  ctx.set(index, store, value);
+  triggerChanged && setChanged(world, entity, trait2);
+}
+function getTrait(world, entity, trait2) {
+  const worldCtx = world[$internal];
+  const data = worldCtx.traitData.get(trait2);
+  if (!data) return void 0;
+  const index = getEntityId(entity);
+  const mask = worldCtx.entityMasks[data.generationId][index];
+  if ((mask & data.bitflag) !== data.bitflag) return void 0;
+  const traitCtx = trait2[$internal];
+  const store = getStore(world, trait2);
+  return traitCtx.get(index, store);
+}
 
 // ../core/src/entity/utils/entity-index.ts
 var createEntityIndex = (worldId) => ({
@@ -464,172 +571,61 @@ var getAliveEntities = (index) => {
   return index.dense.slice(0, index.aliveCount);
 };
 
-// ../core/src/world/utils/world-index.ts
-function createWorldIndex() {
-  return {
-    worldCursor: 0,
-    releasedWorldIds: [],
-    maxWorlds: 2 ** WORLD_ID_BITS
-  };
-}
-function allocateWorldId(index) {
-  if (index.releasedWorldIds.length > 0) {
-    return index.releasedWorldIds.pop();
-  }
-  if (index.worldCursor >= index.maxWorlds) {
-    throw new Error(`Koota: Too many worlds created. The maximum is ${index.maxWorlds}.`);
-  }
-  return index.worldCursor++;
-}
-function releaseWorldId(index, worldId) {
-  if (worldId < 0 || worldId >= index.maxWorlds) {
-    throw new Error(`Invalid world ID: ${worldId}`);
-  }
-  if (worldId === index.worldCursor - 1) {
-    index.worldCursor--;
-  } else if (worldId < index.worldCursor && !index.releasedWorldIds.includes(worldId)) {
-    index.releasedWorldIds.push(worldId);
-  }
-}
-
-// ../core/src/universe/universe.ts
-var universe = {
-  worlds: new Array(WORLD_ID_BITS ** 2),
-  cachedQueries: /* @__PURE__ */ new Map(),
-  worldIndex: createWorldIndex(),
-  reset: () => {
-    universe.worlds = new Array(WORLD_ID_BITS ** 2);
-    universe.cachedQueries = /* @__PURE__ */ new Map();
-    universe.worldIndex = createWorldIndex();
-  }
-};
-
-// ../core/src/query/modifier.ts
-var ModifierData = class {
-  constructor(type, id, traits) {
-    this.type = type;
-    this.id = id;
-    this.traits = traits;
-    __publicField(this, "traitIds");
-    this.traitIds = traits.map((trait2) => trait2[$internal].id);
-  }
-};
-
-// ../core/src/query/utils/tracking-cursor.ts
-var cursor = 3;
-function createTrackingId() {
-  return cursor++;
-}
-function getTrackingCursor() {
-  return cursor;
-}
-function setTrackingMasks(world, id) {
-  const ctx = world[$internal];
-  const snapshot = structuredClone(ctx.entityMasks);
-  ctx.trackingSnapshots.set(id, snapshot);
-  ctx.dirtyMasks.set(
-    id,
-    snapshot.map((mask) => mask.map(() => 0))
-  );
-  ctx.changedMasks.set(
-    id,
-    snapshot.map((mask) => mask.map(() => 0))
-  );
-}
-
-// ../core/src/query/modifiers/changed.ts
-function createChanged() {
-  const id = createTrackingId();
-  for (const world of universe.worlds) {
-    if (!world) continue;
-    setTrackingMasks(world, id);
-  }
-  return (...traits) => new ModifierData(`changed-${id}`, id, traits);
-}
-function setChanged(world, entity, trait2) {
-  const ctx = world[$internal];
-  if (!entity.has(trait2)) return;
-  if (!ctx.traitData.has(trait2)) registerTrait(world, trait2);
-  const data = ctx.traitData.get(trait2);
-  for (const changedMask of ctx.changedMasks.values()) {
-    const eid = getEntityId(entity);
-    if (!changedMask[eid]) changedMask[eid] = new Array();
-    const traitId2 = trait2[$internal].id;
-    changedMask[eid][traitId2] = 1;
-  }
-  for (const query of data.queries) {
-    if (!query.hasChangedModifiers) continue;
-    let match = query.check(world, entity, { type: "change", traitData: data });
-    if (match) query.add(entity);
-    else query.remove(world, entity);
-  }
-  for (const sub of data.changedSubscriptions) {
-    sub(entity);
-  }
-}
-
 // ../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 worldCtx = world[$internal];
-  const data = worldCtx.traitData.get(trait2);
-  if (!data) return void 0;
-  const index = this & ENTITY_ID_MASK;
-  const mask = worldCtx.entityMasks[data.generationId][index];
-  if ((mask & data.bitflag) !== data.bitflag) return void 0;
-  const traitCtx = trait2[$internal];
-  const store = traitCtx.stores[worldId];
-  return traitCtx.get(index, store);
+  const world = universe.worlds[worldId].deref();
+  return getTrait(world, this, trait2);
 };
 Number.prototype.set = function(trait2, value, triggerChanged = true) {
-  const ctx = trait2[$internal];
-  const index = this & ENTITY_ID_MASK;
   const worldId = this >>> WORLD_ID_SHIFT;
-  const store = ctx.stores[worldId];
-  value instanceof Function && (value = value(ctx.get(index, store)));
-  ctx.set(index, store, value);
-  triggerChanged && setChanged(universe.worlds[worldId], this, trait2);
+  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() {
   const id = this & ENTITY_ID_MASK;
   return id;
 };
+Number.prototype.isAlive = function() {
+  const worldId = this >>> WORLD_ID_SHIFT;
+  const world = universe.worlds[worldId].deref();
+  return isEntityAlive(world[$internal].entityIndex, this);
+};
 
 // ../core/src/entity/entity.ts
 function createEntity(world, ...traits) {
@@ -638,10 +634,10 @@ function createEntity(world, ...traits) {
   for (const query of ctx.notQueries) {
     const match = query.check(world, entity);
     if (match) query.add(entity);
-    query.resetTrackingBitmasks(entity.id());
+    query.resetTrackingBitmasks(getEntityId(entity));
   }
   ctx.entityTraits.set(entity, /* @__PURE__ */ new Set());
-  entity.add(...traits);
+  addTrait(world, entity, ...traits);
   return entity;
 }
 var cachedSet = /* @__PURE__ */ new Set();
@@ -682,6 +678,8 @@ function destroyEntity(world, entity) {
       }
     }
     releaseEntity(ctx.entityIndex, currentEntity);
+    const allQuery = ctx.queriesHashMap.get("");
+    if (allQuery) allQuery.remove(world, currentEntity);
     ctx.entityTraits.delete(entity);
     const eid = getEntityId(currentEntity);
     for (let i = 0; i < ctx.entityMasks.length; i++) {
@@ -691,57 +689,51 @@ 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/utils/create-query-hash.ts
 var sortedIDs = new Float32Array(1024);
@@ -771,22 +763,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];
@@ -968,6 +960,7 @@ var Query = class {
     for (const sub of this.removeSubscriptions) {
       sub(entity);
     }
+    this.version++;
   }
   check(world, entity, event) {
     const { bitmasks, generations } = this;
@@ -1129,7 +1122,7 @@ function createQueryResult(query, world, params) {
         }
         for (let i = 0; i < changedPairs.length; i++) {
           const [entity, trait2] = changedPairs[i];
-          entity.changed(trait2);
+          setChanged(world, entity, trait2);
         }
       } else if (options.changeDetection === "always") {
         const changedPairs = [];
@@ -1164,7 +1157,7 @@ function createQueryResult(query, world, params) {
         }
         for (let i = 0; i < changedPairs.length; i++) {
           const [entity, trait2] = changedPairs[i];
-          entity.changed(trait2);
+          setChanged(world, entity, trait2);
         }
       } else if (options.changeDetection === "never") {
         for (let i = 0; i < entities.length; i++) {
@@ -1195,6 +1188,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;
@@ -1219,46 +1216,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);
@@ -1273,41 +1268,47 @@ var World = class {
     return createEntity(this, ...traits);
   }
   has(target) {
-    return typeof target === "number" ? isEntityAlive(this[$internal].entityIndex, target) : this[$internal].worldEntity.has(target);
+    return typeof target === "number" ? isEntityAlive(this[$internal].entityIndex, target) : hasTrait(this, this[$internal].worldEntity, target);
   }
   add(...traits) {
-    this[$internal].worldEntity.add(...traits);
+    addTrait(this, this[$internal].worldEntity, ...traits);
   }
   remove(...traits) {
-    this[$internal].worldEntity.remove(...traits);
+    removeTrait(this, this[$internal].worldEntity, ...traits);
   }
   get(trait2) {
-    return this[$internal].worldEntity.get(trait2);
+    return getTrait(this, this[$internal].worldEntity, trait2);
   }
   set(trait2, value) {
-    this[$internal].worldEntity.set(trait2, value);
+    setTrait(this, this[$internal].worldEntity, trait2, value);
   }
   destroy() {
     destroyEntity(this, this[$internal].worldEntity);
     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();
@@ -1369,10 +1370,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;
 }
 
 // ../core/src/query/modifiers/added.ts
@@ -1380,7 +1385,7 @@ 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);
 }
@@ -1390,7 +1395,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);
 }
@@ -1404,8 +1409,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);
@@ -1433,6 +1439,9 @@ function createActions(actionSet) {
     return actions;
   };
 }
+
+// ../core/src/query/types.ts
+var $parameters = Symbol();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   $internal,