@perplexdotgg/mecs 0.4.0 → 0.4.2

package/build/index.d.ts

@@ -3,6 +3,7 @@ import { MonomorphClass } from 'monomorph';
 import { MonomorphInstance } from 'monomorph';
 import { NumberArray } from 'monomorph';
 import { PartialRecursive } from 'monomorph';
+import { PoolClass } from 'monomorph';
 import { WithPool } from 'monomorph';
 
 export declare type ComponentConfig<ComponentType, ComponentInputType extends any = InputType<ComponentType> extends never ? ComponentType : InputType<ComponentType>> = {
@@ -11,10 +12,11 @@ export declare type ComponentConfig<ComponentType, ComponentInputType extends an
     afterComponentAddedCode?: string | ComponentConfigFunction<ComponentType, ComponentInputType>;
     beforeComponentRemoved?: (componentInstance: ComponentType extends abstract new (...args: any) => any ? InstanceType<ComponentType> : ComponentType, entity: any, componentKey: string) => void;
     beforeComponentRemovedCode?: string | ComponentConfigFunction<ComponentType, ComponentInputType>;
-    processDataOnAdd?: (data: ComponentInputType) => ComponentInputType;
+    processDataOnAdd?: (data: ComponentInputType, entity: any, componentKey: string) => ComponentInputType;
     processDataOnAddCode?: string | ((options: {
         dataVariableName: string;
         componentConfigReference: string;
+        entityVariableName: string;
     }) => string);
     nullComponent?: (entity: any, componentKey: string) => void;
     nullComponentCode?: string | ComponentConfigFunction<ComponentType, ComponentInputType>;
@@ -105,9 +107,7 @@ export declare interface EntityConstructor<QM extends QueryMap<any, CM>, E exten
         };
     };
     components: {
-        [K in keyof CM as ExtractMonomorphClass<CM[K]> extends MonomorphClass<infer P, infer I, infer M> ? LowercaseFirstLetter<K> : never]: {
-            [Symbol.iterator](): IterableIterator<WithPool<InstanceType<ExtractMonomorphClass<CM[K]>>>>;
-        };
+        [K in keyof CM as ExtractMonomorphClass<CM[K]> extends MonomorphClass<infer P, infer I, infer M> ? LowercaseFirstLetter<K> : never]: PoolClass<ExtractMonomorphClass<CM[K]>>;
     };
     queries: {
         [K in keyof QM]: {
@@ -124,7 +124,7 @@ export declare interface EntityConstructor<QM extends QueryMap<any, CM>, E exten
     };
 }
 
-export declare type EntityInput<X extends ComponentMap | EntityClass<any, any, any, any> | EntityInstanceWithPool<any, any, any> | EntityInstance<any, any>> = X extends ComponentMap ? ComponentMapInput<X> : X extends EntityConstructor<infer QM, infer E, infer I, infer CM> ? I : X extends EntityInstanceWithPool<infer CM, infer I, infer E> ? I : X extends EntityInstance<infer CM, infer I> ? I : never;
+export declare type EntityInput<X extends ComponentMap | EntityClass<any, any, any, any> | EntityInstanceWithPool<any, any, any> | EntityInstance<any, any>> = Writeable<X extends ComponentMap ? ComponentMapInput<X> : X extends EntityConstructor<infer QM, infer E, infer I, infer CM> ? I : X extends EntityInstanceWithPool<infer CM, infer I, infer E> ? I : X extends EntityInstance<infer CM, infer I> ? I : never>;
 
 export declare type EntityInstance<CM extends ComponentMap, I extends any = ComponentMapInput<CM>> = ComponentMapClassProperties<CM> & EntityBaseProperties<CM, I>;
 

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);
       }
     `;
@@ -117,12 +107,12 @@ function getEntityClassCode(componentMap, queries, options) {
         referenceComponentFunctionsCode += `
           const ${componentKey}ProcessDataOnAdd = componentMap.${key}.processDataOnAdd;
         `;
-        processedDataCode = `${componentKey}ProcessDataOnAdd(data)`;
+        processedDataCode = `${componentKey}ProcessDataOnAdd(data, entity, '${componentKey}')`;
       } else if ("processDataOnAddCode" in component) {
         if (typeof component.processDataOnAddCode === "string") {
           processedDataCode = component.processDataOnAddCode;
         } else {
-          processedDataCode = component.processDataOnAddCode({ dataVariableName: "data", componentConfigReference: "componentMap." + key });
+          processedDataCode = component.processDataOnAddCode({ dataVariableName: "data", entityVariableName: "entity", componentConfigReference: "componentMap." + key });
         }
       }
       if ("nullComponent" in component) {
@@ -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++;
@@ -613,7 +636,6 @@ function getEntityClassCode(componentMap, queries, options) {
       }
 
       destroy(updateQueryMemberships = true) {
-        const thisComponentFlags = this.componentFlags;
         ${destroyCode}
         if (this.version & 1 === 1) {
           ${""}

package/package.json

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