@perplexdotgg/mecs 0.4.0 → 0.4.1

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++;
@@ -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.1",
   "description": "MECS - Monomorph ECS - A high-performance Entity Component System for TypeScript and JavaScript projects, designed for games and simulations.",
   "repository": {
     "type": "git",