@signaltree/core 6.2.2 → 6.2.4

package/dist/lib/entity-signal.js

@@ -1,283 +1,534 @@
 import { signal, computed } from '@angular/core';
 
-class EntitySignalImpl {
-  pathNotifier;
-  basePath;
-  storage = new Map();
-  allSignal;
-  countSignal;
-  idsSignal;
-  mapSignal;
-  nodeCache = new Map();
-  selectId;
-  tapHandlers = [];
-  interceptHandlers = [];
-  constructor(config, pathNotifier, basePath) {
-    this.pathNotifier = pathNotifier;
-    this.basePath = basePath;
-    this.selectId = config.selectId ?? (entity => entity['id']);
-    this.allSignal = signal([]);
-    this.countSignal = signal(0);
-    this.idsSignal = signal([]);
-    this.mapSignal = signal(new Map());
+function createEntitySignal(config, pathNotifier, basePath) {
+  const storage = new Map();
+  const allSignal = signal([]);
+  const countSignal = signal(0);
+  const idsSignal = signal([]);
+  const mapSignal = signal(new Map());
+  const nodeCache = new Map();
+  const selectId = config.selectId ?? (entity => entity['id']);
+  const tapHandlers = [];
+  const interceptHandlers = [];
+  function updateSignals() {
+    const entities = Array.from(storage.values());
+    const ids = Array.from(storage.keys());
+    const map = new Map(storage);
+    allSignal.set(entities);
+    countSignal.set(entities.length);
+    idsSignal.set(ids);
+    mapSignal.set(map);
   }
-  byId(id) {
-    const entity = this.storage.get(id);
-    if (!entity) return undefined;
-    return this.getOrCreateNode(id, entity);
+  function createEntityNode(id, entity) {
+    const node = () => storage.get(id);
+    for (const key of Object.keys(entity)) {
+      Object.defineProperty(node, key, {
+        get: () => {
+          const current = storage.get(id);
+          const value = current?.[key];
+          return () => value;
+        },
+        enumerable: true,
+        configurable: true
+      });
+    }
+    return node;
   }
-  byIdOrFail(id) {
-    const node = this.byId(id);
+  function getOrCreateNode(id, entity) {
+    let node = nodeCache.get(id);
     if (!node) {
-      throw new Error(`Entity with id ${String(id)} not found`);
+      node = createEntityNode(id, entity);
+      nodeCache.set(id, node);
     }
     return node;
   }
-  get all() {
-    return this.allSignal;
-  }
-  get count() {
-    return this.countSignal;
-  }
-  get ids() {
-    return this.idsSignal;
-  }
-  get map() {
-    return this.mapSignal;
-  }
-  has(id) {
-    return computed(() => this.storage.has(id));
-  }
-  get isEmpty() {
-    return computed(() => this.storage.size === 0);
-  }
-  where(predicate) {
-    return computed(() => {
-      const result = [];
-      for (const entity of this.storage.values()) {
+  const api = {
+    byId(id) {
+      const entity = storage.get(id);
+      if (!entity) return undefined;
+      return getOrCreateNode(id, entity);
+    },
+    byIdOrFail(id) {
+      const node = api.byId(id);
+      if (!node) {
+        throw new Error(`Entity with id ${String(id)} not found`);
+      }
+      return node;
+    },
+    get all() {
+      return allSignal;
+    },
+    get count() {
+      return countSignal;
+    },
+    get ids() {
+      return idsSignal;
+    },
+    get map() {
+      return mapSignal;
+    },
+    has(id) {
+      return computed(() => mapSignal().has(id));
+    },
+    get isEmpty() {
+      return computed(() => countSignal() === 0);
+    },
+    where(predicate) {
+      return computed(() => allSignal().filter(predicate));
+    },
+    find(predicate) {
+      return computed(() => allSignal().find(predicate));
+    },
+    addOne(entity, opts) {
+      const id = opts?.selectId?.(entity) ?? selectId(entity);
+      if (storage.has(id)) {
+        throw new Error(`Entity with id ${String(id)} already exists`);
+      }
+      let transformedEntity = entity;
+      for (const handler of interceptHandlers) {
+        const ctx = {
+          block: reason => {
+            throw new Error(`Cannot add entity: ${reason || 'blocked by interceptor'}`);
+          },
+          transform: value => {
+            transformedEntity = value;
+          },
+          blocked: false,
+          blockReason: undefined
+        };
+        handler.onAdd?.(entity, ctx);
+      }
+      storage.set(id, transformedEntity);
+      nodeCache.delete(id);
+      updateSignals();
+      pathNotifier.notify(`${basePath}.${String(id)}`, transformedEntity, undefined);
+      for (const handler of tapHandlers) {
+        handler.onAdd?.(transformedEntity, id);
+      }
+      return id;
+    },
+    addMany(entities, opts) {
+      const idsToAdd = [];
+      for (const entity of entities) {
+        const id = opts?.selectId?.(entity) ?? selectId(entity);
+        if (storage.has(id)) {
+          throw new Error(`Entity with id ${String(id)} already exists`);
+        }
+        idsToAdd.push(id);
+      }
+      const addedEntities = [];
+      for (let i = 0; i < entities.length; i++) {
+        const entity = entities[i];
+        const id = idsToAdd[i];
+        let transformedEntity = entity;
+        for (const handler of interceptHandlers) {
+          const ctx = {
+            block: reason => {
+              throw new Error(`Cannot add entity: ${reason || 'blocked by interceptor'}`);
+            },
+            transform: value => {
+              transformedEntity = value;
+            },
+            blocked: false,
+            blockReason: undefined
+          };
+          handler.onAdd?.(entity, ctx);
+        }
+        storage.set(id, transformedEntity);
+        nodeCache.delete(id);
+        addedEntities.push({
+          id,
+          entity: transformedEntity
+        });
+      }
+      updateSignals();
+      for (const {
+        id,
+        entity
+      } of addedEntities) {
+        pathNotifier.notify(`${basePath}.${String(id)}`, entity, undefined);
+      }
+      for (const {
+        id,
+        entity
+      } of addedEntities) {
+        for (const handler of tapHandlers) {
+          handler.onAdd?.(entity, id);
+        }
+      }
+      return idsToAdd;
+    },
+    updateOne(id, changes) {
+      const entity = storage.get(id);
+      if (!entity) {
+        throw new Error(`Entity with id ${String(id)} not found`);
+      }
+      const prev = entity;
+      let transformedChanges = changes;
+      for (const handler of interceptHandlers) {
+        const ctx = {
+          block: reason => {
+            throw new Error(`Cannot update entity: ${reason || 'blocked by interceptor'}`);
+          },
+          transform: value => {
+            transformedChanges = value;
+          },
+          blocked: false,
+          blockReason: undefined
+        };
+        handler.onUpdate?.(id, changes, ctx);
+      }
+      const finalUpdated = {
+        ...entity,
+        ...transformedChanges
+      };
+      storage.set(id, finalUpdated);
+      nodeCache.delete(id);
+      updateSignals();
+      pathNotifier.notify(`${basePath}.${String(id)}`, finalUpdated, prev);
+      for (const handler of tapHandlers) {
+        handler.onUpdate?.(id, transformedChanges, finalUpdated);
+      }
+    },
+    updateMany(ids, changes) {
+      if (ids.length === 0) return;
+      const updatedEntities = [];
+      for (const id of ids) {
+        const entity = storage.get(id);
+        if (!entity) {
+          throw new Error(`Entity with id ${String(id)} not found`);
+        }
+        const prev = entity;
+        let transformedChanges = changes;
+        for (const handler of interceptHandlers) {
+          const ctx = {
+            block: reason => {
+              throw new Error(`Cannot update entity: ${reason || 'blocked by interceptor'}`);
+            },
+            transform: value => {
+              transformedChanges = value;
+            },
+            blocked: false,
+            blockReason: undefined
+          };
+          handler.onUpdate?.(id, changes, ctx);
+        }
+        const finalUpdated = {
+          ...entity,
+          ...transformedChanges
+        };
+        storage.set(id, finalUpdated);
+        nodeCache.delete(id);
+        updatedEntities.push({
+          id,
+          prev,
+          finalUpdated,
+          transformedChanges
+        });
+      }
+      updateSignals();
+      for (const {
+        id,
+        prev,
+        finalUpdated
+      } of updatedEntities) {
+        pathNotifier.notify(`${basePath}.${String(id)}`, finalUpdated, prev);
+      }
+      for (const {
+        id,
+        transformedChanges,
+        finalUpdated
+      } of updatedEntities) {
+        for (const handler of tapHandlers) {
+          handler.onUpdate?.(id, transformedChanges, finalUpdated);
+        }
+      }
+    },
+    updateWhere(predicate, changes) {
+      const idsToUpdate = [];
+      for (const [id, entity] of storage) {
         if (predicate(entity)) {
-          result.push(entity);
+          idsToUpdate.push(id);
         }
       }
-      return result;
-    });
-  }
-  find(predicate) {
-    return computed(() => {
-      for (const entity of this.storage.values()) {
+      if (idsToUpdate.length > 0) {
+        api.updateMany(idsToUpdate, changes);
+      }
+      return idsToUpdate.length;
+    },
+    removeOne(id) {
+      const entity = storage.get(id);
+      if (!entity) {
+        throw new Error(`Entity with id ${String(id)} not found`);
+      }
+      for (const handler of interceptHandlers) {
+        const ctx = {
+          block: reason => {
+            throw new Error(`Cannot remove entity: ${reason || 'blocked by interceptor'}`);
+          },
+          transform: () => {},
+          blocked: false,
+          blockReason: undefined
+        };
+        handler.onRemove?.(id, entity, ctx);
+      }
+      storage.delete(id);
+      nodeCache.delete(id);
+      updateSignals();
+      pathNotifier.notify(`${basePath}.${String(id)}`, undefined, entity);
+      for (const handler of tapHandlers) {
+        handler.onRemove?.(id, entity);
+      }
+    },
+    removeMany(ids) {
+      if (ids.length === 0) return;
+      const entitiesToRemove = [];
+      for (const id of ids) {
+        const entity = storage.get(id);
+        if (!entity) {
+          throw new Error(`Entity with id ${String(id)} not found`);
+        }
+        for (const handler of interceptHandlers) {
+          const ctx = {
+            block: reason => {
+              throw new Error(`Cannot remove entity: ${reason || 'blocked by interceptor'}`);
+            },
+            transform: () => {},
+            blocked: false,
+            blockReason: undefined
+          };
+          handler.onRemove?.(id, entity, ctx);
+        }
+        entitiesToRemove.push({
+          id,
+          entity
+        });
+      }
+      for (const {
+        id
+      } of entitiesToRemove) {
+        storage.delete(id);
+        nodeCache.delete(id);
+      }
+      updateSignals();
+      for (const {
+        id,
+        entity
+      } of entitiesToRemove) {
+        pathNotifier.notify(`${basePath}.${String(id)}`, undefined, entity);
+      }
+      for (const {
+        id,
+        entity
+      } of entitiesToRemove) {
+        for (const handler of tapHandlers) {
+          handler.onRemove?.(id, entity);
+        }
+      }
+    },
+    removeWhere(predicate) {
+      const idsToRemove = [];
+      for (const [id, entity] of storage) {
         if (predicate(entity)) {
-          return entity;
+          idsToRemove.push(id);
         }
       }
-      return undefined;
-    });
-  }
-  addOne(entity, opts) {
-    const id = opts?.selectId?.(entity) ?? this.selectId(entity);
-    if (this.storage.has(id)) {
-      throw new Error(`Entity with id ${String(id)} already exists`);
-    }
-    let transformedEntity = entity;
-    for (const handler of this.interceptHandlers) {
-      const ctx = {
-        block: reason => {
-          throw new Error(`Cannot add entity: ${reason || 'blocked by interceptor'}`);
-        },
-        transform: value => {
-          transformedEntity = value;
-        },
-        blocked: false,
-        blockReason: undefined
-      };
-      handler.onAdd?.(entity, ctx);
-    }
-    this.storage.set(id, transformedEntity);
-    this.nodeCache.delete(id);
-    this.updateSignals();
-    this.pathNotifier.notify(`${this.basePath}.${String(id)}`, transformedEntity, undefined);
-    for (const handler of this.tapHandlers) {
-      handler.onAdd?.(transformedEntity, id);
-    }
-    return id;
-  }
-  addMany(entities, opts) {
-    const ids = [];
-    for (const entity of entities) {
-      ids.push(this.addOne(entity, opts));
-    }
-    return ids;
-  }
-  updateOne(id, changes) {
-    const entity = this.storage.get(id);
-    if (!entity) {
-      throw new Error(`Entity with id ${String(id)} not found`);
-    }
-    const prev = entity;
-    let transformedChanges = changes;
-    for (const handler of this.interceptHandlers) {
-      const ctx = {
-        block: reason => {
-          throw new Error(`Cannot update entity: ${reason || 'blocked by interceptor'}`);
-        },
-        transform: value => {
-          transformedChanges = value;
-        },
-        blocked: false,
-        blockReason: undefined
-      };
-      handler.onUpdate?.(id, changes, ctx);
-    }
-    const finalUpdated = {
-      ...entity,
-      ...transformedChanges
-    };
-    this.storage.set(id, finalUpdated);
-    this.nodeCache.delete(id);
-    this.updateSignals();
-    this.pathNotifier.notify(`${this.basePath}.${String(id)}`, finalUpdated, prev);
-    for (const handler of this.tapHandlers) {
-      handler.onUpdate?.(id, transformedChanges, finalUpdated);
-    }
-  }
-  updateMany(ids, changes) {
-    for (const id of ids) {
-      this.updateOne(id, changes);
-    }
-  }
-  updateWhere(predicate, changes) {
-    let count = 0;
-    for (const [id, entity] of this.storage) {
-      if (predicate(entity)) {
-        this.updateOne(id, changes);
-        count++;
+      if (idsToRemove.length > 0) {
+        api.removeMany(idsToRemove);
       }
-    }
-    return count;
-  }
-  removeOne(id) {
-    const entity = this.storage.get(id);
-    if (!entity) {
-      throw new Error(`Entity with id ${String(id)} not found`);
-    }
-    for (const handler of this.interceptHandlers) {
-      const ctx = {
-        block: reason => {
-          throw new Error(`Cannot remove entity: ${reason || 'blocked by interceptor'}`);
-        },
-        transform: () => {},
-        blocked: false,
-        blockReason: undefined
-      };
-      handler.onRemove?.(id, entity, ctx);
-    }
-    this.storage.delete(id);
-    this.nodeCache.delete(id);
-    this.updateSignals();
-    this.pathNotifier.notify(`${this.basePath}.${String(id)}`, undefined, entity);
-    for (const handler of this.tapHandlers) {
-      handler.onRemove?.(id, entity);
-    }
-  }
-  removeMany(ids) {
-    for (const id of ids) {
-      this.removeOne(id);
-    }
-  }
-  removeWhere(predicate) {
-    const idsToRemove = [];
-    for (const [id, entity] of this.storage) {
-      if (predicate(entity)) {
-        idsToRemove.push(id);
+      return idsToRemove.length;
+    },
+    upsertOne(entity, opts) {
+      const id = opts?.selectId?.(entity) ?? selectId(entity);
+      if (storage.has(id)) {
+        api.updateOne(id, entity);
+      } else {
+        api.addOne(entity, opts);
       }
+      return id;
+    },
+    upsertMany(entities, opts) {
+      if (entities.length === 0) return [];
+      const toAdd = [];
+      const toUpdate = [];
+      for (const entity of entities) {
+        const id = opts?.selectId?.(entity) ?? selectId(entity);
+        const existing = storage.get(id);
+        if (existing !== undefined) {
+          toUpdate.push({
+            entity,
+            id,
+            prev: existing
+          });
+        } else {
+          toAdd.push({
+            entity,
+            id
+          });
+        }
+      }
+      const addedEntities = [];
+      for (const {
+        entity,
+        id
+      } of toAdd) {
+        let transformedEntity = entity;
+        for (const handler of interceptHandlers) {
+          const ctx = {
+            block: reason => {
+              throw new Error(`Cannot add entity: ${reason || 'blocked by interceptor'}`);
+            },
+            transform: value => {
+              transformedEntity = value;
+            },
+            blocked: false,
+            blockReason: undefined
+          };
+          handler.onAdd?.(entity, ctx);
+        }
+        storage.set(id, transformedEntity);
+        nodeCache.delete(id);
+        addedEntities.push({
+          id,
+          entity: transformedEntity
+        });
+      }
+      const updatedEntities = [];
+      for (const {
+        entity,
+        id,
+        prev
+      } of toUpdate) {
+        let transformedChanges = entity;
+        for (const handler of interceptHandlers) {
+          const ctx = {
+            block: reason => {
+              throw new Error(`Cannot update entity: ${reason || 'blocked by interceptor'}`);
+            },
+            transform: value => {
+              transformedChanges = value;
+            },
+            blocked: false,
+            blockReason: undefined
+          };
+          handler.onUpdate?.(id, entity, ctx);
+        }
+        const finalUpdated = {
+          ...prev,
+          ...transformedChanges
+        };
+        storage.set(id, finalUpdated);
+        nodeCache.delete(id);
+        updatedEntities.push({
+          id,
+          prev,
+          finalUpdated,
+          transformedChanges
+        });
+      }
+      updateSignals();
+      for (const {
+        id,
+        entity
+      } of addedEntities) {
+        pathNotifier.notify(`${basePath}.${String(id)}`, entity, undefined);
+      }
+      for (const {
+        id,
+        prev,
+        finalUpdated
+      } of updatedEntities) {
+        pathNotifier.notify(`${basePath}.${String(id)}`, finalUpdated, prev);
+      }
+      for (const {
+        id,
+        entity
+      } of addedEntities) {
+        for (const handler of tapHandlers) {
+          handler.onAdd?.(entity, id);
+        }
+      }
+      for (const {
+        id,
+        transformedChanges,
+        finalUpdated
+      } of updatedEntities) {
+        for (const handler of tapHandlers) {
+          handler.onUpdate?.(id, transformedChanges, finalUpdated);
+        }
+      }
+      return [...toAdd.map(a => a.id), ...toUpdate.map(u => u.id)];
+    },
+    clear() {
+      storage.clear();
+      nodeCache.clear();
+      updateSignals();
+    },
+    removeAll() {
+      api.clear();
+    },
+    setAll(entities, opts) {
+      storage.clear();
+      nodeCache.clear();
+      const addedIds = [];
+      for (const entity of entities) {
+        const id = opts?.selectId?.(entity) ?? selectId(entity);
+        let transformedEntity = entity;
+        for (const handler of interceptHandlers) {
+          const ctx = {
+            block: reason => {
+              throw new Error(`Cannot add entity: ${reason || 'blocked by interceptor'}`);
+            },
+            transform: value => {
+              transformedEntity = value;
+            },
+            blocked: false,
+            blockReason: undefined
+          };
+          handler.onAdd?.(entity, ctx);
+        }
+        storage.set(id, transformedEntity);
+        addedIds.push(id);
+      }
+      updateSignals();
+      for (let i = 0; i < addedIds.length; i++) {
+        const id = addedIds[i];
+        const entity = storage.get(id);
+        pathNotifier.notify(`${basePath}.${String(id)}`, entity, undefined);
+      }
+      for (let i = 0; i < addedIds.length; i++) {
+        const id = addedIds[i];
+        const entity = storage.get(id);
+        if (entity) {
+          for (const handler of tapHandlers) {
+            handler.onAdd?.(entity, id);
+          }
+        }
+      }
+    },
+    tap(handlers) {
+      tapHandlers.push(handlers);
+      return () => {
+        const idx = tapHandlers.indexOf(handlers);
+        if (idx > -1) tapHandlers.splice(idx, 1);
+      };
+    },
+    intercept(handlers) {
+      interceptHandlers.push(handlers);
+      return () => {
+        const idx = interceptHandlers.indexOf(handlers);
+        if (idx > -1) interceptHandlers.splice(idx, 1);
+      };
     }
-    let count = 0;
-    for (const id of idsToRemove) {
-      this.removeOne(id);
-      count++;
-    }
-    return count;
-  }
-  upsertOne(entity, opts) {
-    const id = opts?.selectId?.(entity) ?? this.selectId(entity);
-    if (this.storage.has(id)) {
-      this.updateOne(id, entity);
-    } else {
-      this.addOne(entity, opts);
-    }
-    return id;
-  }
-  upsertMany(entities, opts) {
-    return entities.map(e => this.upsertOne(e, opts));
-  }
-  clear() {
-    this.storage.clear();
-    this.nodeCache.clear();
-    this.updateSignals();
-  }
-  removeAll() {
-    this.clear();
-  }
-  setAll(entities, opts) {
-    this.clear();
-    this.addMany(entities, opts);
-  }
-  tap(handlers) {
-    this.tapHandlers.push(handlers);
-    return () => {
-      const idx = this.tapHandlers.indexOf(handlers);
-      if (idx > -1) this.tapHandlers.splice(idx, 1);
-    };
-  }
-  intercept(handlers) {
-    this.interceptHandlers.push(handlers);
-    return () => {
-      const idx = this.interceptHandlers.indexOf(handlers);
-      if (idx > -1) this.interceptHandlers.splice(idx, 1);
-    };
-  }
-  updateSignals() {
-    const entities = Array.from(this.storage.values());
-    const ids = Array.from(this.storage.keys());
-    const map = new Map(this.storage);
-    this.allSignal.set(entities);
-    this.countSignal.set(entities.length);
-    this.idsSignal.set(ids);
-    this.mapSignal.set(map);
-  }
-  getOrCreateNode(id, entity) {
-    let node = this.nodeCache.get(id);
-    if (!node) {
-      node = this.createEntityNode(id, entity);
-      this.nodeCache.set(id, node);
-    }
-    return node;
-  }
-  createEntityNode(id, entity) {
-    const node = () => this.storage.get(id);
-    for (const key of Object.keys(entity)) {
-      Object.defineProperty(node, key, {
-        get: () => {
-          const current = this.storage.get(id);
-          const value = current?.[key];
-          return () => value;
-        },
-        enumerable: true,
-        configurable: true
-      });
-    }
-    return node;
-  }
-}
-function createEntitySignal(config, pathNotifier, basePath) {
-  const impl = new EntitySignalImpl(config, pathNotifier, basePath);
-  return new Proxy(impl, {
+  };
+  return new Proxy(api, {
     get: (target, prop) => {
       if (typeof prop === 'string' && !isNaN(Number(prop))) {
-        return target.byId(Number(prop));
+        return api.byId(Number(prop));
       }
       return target[prop];
     }
   });
 }
 
-export { EntitySignalImpl, createEntitySignal };
+export { createEntitySignal };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signaltree/core",
-  "version": "6.2.2",
+  "version": "6.2.4",
   "description": "Lightweight, type-safe signal-based state management for Angular. Core package providing hierarchical signal trees, basic entity management, and async actions.",
   "type": "module",
   "sideEffects": false,