@inglorious/store 9.4.0 → 9.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inglorious/store",
-  "version": "9.4.0",
+  "version": "9.5.1",
   "description": "A state manager for real-time, collaborative apps, inspired by game development patterns and compatible with Redux.",
   "author": "IceOnFire <antony.mistretta@gmail.com> (https://ingloriouscoderz.it)",
   "license": "MIT",

package/src/store.js

@@ -93,24 +93,12 @@ export function createStore({
 
         // Handle special system events
         if (event.type === "add") {
-          const { id, ...entity } = event.payload
-          draft[id] = augmentEntity(id, entity)
-          const type = types[entity.type]
-
-          eventMap.addEntity(id, type, entity.type)
-          incomingEvents.unshift({ type: `#${id}:create` })
+          addEntity(draft, event.payload)
           continue
         }
 
         if (event.type === "remove") {
-          const id = event.payload
-          const entity = draft[id]
-          const type = types[entity.type]
-          const typeName = entity.type
-          delete draft[id]
-
-          eventMap.removeEntity(id, type, typeName)
-          incomingEvents.unshift({ type: `#${id}:destroy` })
+          removeEntity(draft, event.payload)
           continue
         }
 
@@ -203,6 +191,13 @@ export function createStore({
         eventMap.addEntity(id, newType, typeName)
       }
     }
+
+    if (autoCreateEntities && !state[typeName]) {
+      notify("add", {
+        id: typeName,
+        type: typeName,
+      })
+    }
   }
 
   /**
@@ -220,29 +215,7 @@ export function createStore({
    */
   function setState(nextState) {
     const oldEntities = state ?? {}
-    const newEntities = augmentEntities(nextState)
-
-    if (autoCreateEntities) {
-      for (const typeName of Object.keys(types)) {
-        // Check if entity already exists
-        const hasEntity = Object.values(newEntities).some(
-          (entity) => entity.type === typeName,
-        )
-
-        if (!hasEntity) {
-          // No entity for this type → auto-create minimal entity
-          newEntities[typeName] = {
-            id: typeName,
-            type: typeName,
-          }
-        }
-      }
-    }
-
-    state = newEntities
-    eventMap = new EventMap(types, newEntities)
-    incomingEvents = []
-    isProcessing = false
+    let newEntities = augmentEntities(nextState)
 
     const oldEntityIds = new Set(Object.keys(oldEntities))
     const newEntityIds = new Set(Object.keys(newEntities))
@@ -254,13 +227,31 @@ export function createStore({
       (id) => !newEntityIds.has(id),
     )
 
-    entitiesToCreate.forEach((id) => {
-      incomingEvents.push({ type: `#${id}:create` })
-    })
+    state = oldEntities
+    eventMap = new EventMap(types, oldEntities)
+    incomingEvents = []
+    isProcessing = false
 
     entitiesToDestroy.forEach((id) => {
-      incomingEvents.push({ type: `#${id}:destroy` })
+      removeEntity(state, id)
+    })
+
+    entitiesToCreate.forEach((id) => {
+      const entity = newEntities[id]
+      addEntity(state, { id, ...entity })
     })
+
+    if (autoCreateEntities) {
+      for (const typeName of Object.keys(types)) {
+        const hasEntity = Object.values(state).some(
+          (entity) => entity.type === typeName,
+        )
+
+        if (!hasEntity) {
+          addEntity(state, { id: typeName, type: typeName })
+        }
+      }
+    }
   }
 
   /**
@@ -269,4 +260,24 @@ export function createStore({
   function reset() {
     setState(originalEntities)
   }
+
+  function addEntity(draft, payload) {
+    const { id, ...entity } = payload
+    draft[id] = augmentEntity(id, entity)
+    const type = types[entity.type]
+
+    eventMap.addEntity(id, type, entity.type)
+    incomingEvents.unshift({ type: `#${id}:create` })
+  }
+
+  function removeEntity(draft, payload) {
+    const id = payload
+    const entity = draft[id]
+    const type = types[entity.type]
+    const typeName = entity.type
+    delete draft[id]
+
+    eventMap.removeEntity(id, type, typeName)
+    incomingEvents.unshift({ type: `#${id}:destroy` })
+  }
 }