@perplexdotgg/mecs 0.3.2 → 0.4.1

package/build/index.d.ts

@@ -2,6 +2,7 @@ import { InputType } from 'monomorph';
 import { MonomorphClass } from 'monomorph';
 import { MonomorphInstance } from 'monomorph';
 import { NumberArray } from 'monomorph';
+import { PartialRecursive } from 'monomorph';
 import { WithPool } from 'monomorph';
 
 export declare type ComponentConfig<ComponentType, ComponentInputType extends any = InputType<ComponentType> extends never ? ComponentType : InputType<ComponentType>> = {
@@ -49,18 +50,19 @@ export declare type ComponentMapInput<CM extends ComponentMap> = Partial<{
 
 export declare function createEntityClass<C>(options?: EntityCodeGenerationOptions): <CM extends ComponentMap, QM extends QueryMap<C, CM>, I extends ComponentMapInput<CM> = ComponentMapInput<CM>>(componentMap: CM, queries?: QM) => EntityClassWithStatics<C, CM, QM, I>;
 
-export declare type CreateEntityFunction<C, CM extends ComponentMap, I extends ComponentMapInput<CM>> = (data?: I, pool?: EntityPoolClass<C>) => EntityInstanceWithPool<CM, I, C>;
+export declare type CreateEntityFunction<C, CM extends ComponentMap, I extends ComponentMapInput<CM>> = (data?: I, updateQueryMemberships?: boolean, pool?: EntityPoolClass<C>) => EntityInstanceWithPool<CM, I, C>;
 
 declare type ElementOfArray<T> = T extends (infer E)[] ? E : never;
 
 declare interface EntityBaseProperties<CM extends ComponentMap, I extends any = ComponentMapInput<CM>> {
     componentMap: CM;
     __typescriptOnlyInputType: I;
-    addComponent: <CCK extends LowercaseFirstLetter<keyof CM>, CC extends CM[OriginalComponentKey<CCK, CM>] = CM[OriginalComponentKey<CCK, CM>]>(...a: (undefined extends ComponentInput<ExtractMonomorphClass<CC>> ? [key: CCK, data?: ComponentInput<ExtractMonomorphClass<CC>>] : [key: CCK, data: ComponentInput<ExtractMonomorphClass<CC>>])) => void;
-    removeComponent: <CCK extends LowercaseFirstLetter<keyof CM>>(key: CCK) => void;
+    addComponent: <CCK extends LowercaseFirstLetter<keyof CM>, CC extends CM[OriginalComponentKey<CCK, CM>] = CM[OriginalComponentKey<CCK, CM>]>(...a: (undefined extends ComponentInput<ExtractMonomorphClass<CC>> ? [key: CCK, data?: ComponentInput<ExtractMonomorphClass<CC>>, updateQueryMemberships?: boolean] : [key: CCK, data: ComponentInput<ExtractMonomorphClass<CC>>, updateQueryMemberships?: boolean])) => void;
+    removeComponent: <CCK extends LowercaseFirstLetter<keyof CM>>(key: CCK, updateQueryMemberships?: boolean) => void;
     hasComponent: <CCK extends LowercaseFirstLetter<keyof CM>>(key: CCK) => boolean;
     clone(): this;
-    destroy(): void;
+    reset(data?: PartialRecursive<I>, updateQueryMemberships?: boolean, pool?: EntityPoolClass<this>): void;
+    destroy(updateQueryMemberships?: boolean): void;
     isDestroyed(): boolean;
 }
 
@@ -93,7 +95,7 @@ declare type EntityCodeGenerationOptions = {
 };
 
 export declare interface EntityConstructor<QM extends QueryMap<any, CM>, E extends EntityInstance<CM, I>, I extends any, CM extends ComponentMap> {
-    new (data: I): E;
+    new (data: I, index?: number, pool?: EntityPoolClass<E>, updateQueryMemberships?: boolean): E;
     componentMap: CM;
     __typescriptOnlyInputType: I;
     pool: EntityPoolClass<E>;

package/build/mecs.js

@@ -42,18 +42,8 @@ function getEntityClassCode(componentMap, queries, options) {
     `;
     componentFlags.push(componentFlagValue);
     componentFlagsCode += `${componentFlagValue}n, `;
-    createFromDataCode += `
-      if ('${componentKey}' in data) {
-        this.addComponent('${componentKey}', data.${componentKey}, false);
-      } else {
-        this.${componentKey} = null;
-      }
-    `;
-    createFromDataCodeAllNulls += `
-      this.${componentKey} = null;
-    `;
     destroyCode += `
-      if ((thisComponentFlags & ${componentFlagValue}n) !== 0n) {
+      if ((this.componentFlags & ${componentFlagValue}n) !== 0n) {
         this.removeComponent('${componentKey}', updateQueryMemberships);
       }
     `;
@@ -229,9 +219,8 @@ function getEntityClassCode(componentMap, queries, options) {
       `;
       removeComponentFunctionsCode += `
         (instance, entity, componentKey, updateQueryMemberships) => {
-          const newFlagValue = entity.componentFlags & ~${componentFlagValue}n;
           if (updateQueryMemberships) {
-            entity.updateQueryMemberships(newFlagValue);
+            entity.updateQueryMemberships(entity.componentFlags & ~${componentFlagValue}n);
           }
 
           ${beforeComponentRemovedCode}
@@ -239,10 +228,28 @@ function getEntityClassCode(componentMap, queries, options) {
           ${componentKey}ComponentToEntity[instance.index] = null;
           instance.destroy();
 
-          entity.componentFlags = newFlagValue;
+          ${""}
+          ${""}
+          entity.componentFlags = entity.componentFlags & ~${componentFlagValue}n;
           ${nullComponentCode};
         },
       `;
+      createFromDataCode += `
+        if ('${componentKey}' in data) {
+          if (this.hasComponent('${componentKey}')) {
+            this.${componentKey}.reset(data.${componentKey}, false);
+          } else {
+            this.addComponent('${componentKey}', data.${componentKey}, false);
+          }
+        } else if (!this.hasComponent('${componentKey}')) {
+          this.${componentKey} = null;
+        }
+      `;
+      createFromDataCodeAllNulls += `
+        if (!this.hasComponent('${componentKey}')) {
+          this.${componentKey} = null;
+        }
+      `;
     } else {
       addComponentFunctionsCode += `
         (data, entity, componentKey, updateQueryMemberships) => {
@@ -269,6 +276,22 @@ function getEntityClassCode(componentMap, queries, options) {
           ${nullComponentCode};
         },
       `;
+      createFromDataCode += `
+        if ('${componentKey}' in data) {
+          if (this.hasComponent('${componentKey}')) {
+            this.${componentKey} = data.${componentKey};
+          } else {
+            this.addComponent('${componentKey}', data.${componentKey}, false);
+          }
+        } else if (!this.hasComponent('${componentKey}')) {
+          this.${componentKey} = null;
+        }
+      `;
+      createFromDataCodeAllNulls += `
+        if (!this.hasComponent('${componentKey}')) {
+          this.${componentKey} = null;
+        }
+      `;
     }
     componentFlagValue <<= 1n;
     componentIndex++;
@@ -553,10 +576,10 @@ function getEntityClassCode(componentMap, queries, options) {
     }
 
     const theClass = class {
-      constructor(data, index = 0, updateQueryMemberships = true) {
+      constructor(data, index = 0, updateQueryMemberships = true, pool = this.constructor.pool) {
         this.index = index;
         this.version = 0; ${""}
-        this.pool = this.constructor.pool;
+        this.pool = pool;
         this.queryIndices = new Array(${queryIndex}).fill(-1);
         this.componentFlags = 0n; ${""}
         if (data) {
@@ -569,9 +592,10 @@ function getEntityClassCode(componentMap, queries, options) {
         }
       }
 
-      fullSet(data, updateQueryMemberships = true) {
+      reset(data, updateQueryMemberships = true, pool = this.pool) {
         this.queryIndices.fill(-1);
         this.componentFlags = 0n;
+        this.pool = pool;
         if (data) {
           ${createFromDataCode}
         } else {
@@ -612,7 +636,6 @@ function getEntityClassCode(componentMap, queries, options) {
       }
 
       destroy(updateQueryMemberships = true) {
-        const thisComponentFlags = this.componentFlags;
         ${destroyCode}
         if (this.version & 1 === 1) {
           ${""}
@@ -782,7 +805,7 @@ function getEntityClassCode(componentMap, queries, options) {
             }
 
             create(data, updateQueryMemberships = true) {
-              return this.classConstructor.create(data, this, updateQueryMemberships);
+              return this.classConstructor.create(data, updateQueryMemberships, this);
             }
 
             toArray(array, startOffset = 0, skipPoolReferences = false) {
@@ -952,17 +975,16 @@ function getEntityClassCode(componentMap, queries, options) {
       ${componentWithEntityIteratorFunctionsCode}
     };
 
-    theClass.create = function(data, updateQueryMemberships = true) {
-      const pool = this.pool;
+    theClass.create = function(data, updateQueryMemberships = true, pool = this.pool) {
       if (pool.freeIndices.length) {
         const index = pool.freeIndices.pop();
         pool.length++;
         const instance = pool.array[index];
         instance.version++; ${""}
-        instance.fullSet(data, updateQueryMemberships);
+        instance.reset(data, updateQueryMemberships, pool);
         return instance;
       } else {
-        const instance = new this(data, pool.length, updateQueryMemberships);
+        const instance = new this(data, pool.length, updateQueryMemberships, pool);
         pool.array[pool.length] = instance;
         pool.length++;
         return instance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perplexdotgg/mecs",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "description": "MECS - Monomorph ECS - A high-performance Entity Component System for TypeScript and JavaScript projects, designed for games and simulations.",
   "repository": {
     "type": "git",