@statezero/core 0.1.23 → 0.1.25

package/dist/syncEngine/stores/modelStore.d.ts

@@ -7,6 +7,7 @@ export class ModelStore {
     isSyncing: boolean;
     pruneThreshold: any;
     modelCache: Cache;
+    _lastRenderedData: Map<any, any>;
     /**
      * Load operations from data and add them to the operations map,
      * reusing existing operations from the registry if they exist

package/dist/syncEngine/stores/modelStore.js

@@ -1,12 +1,22 @@
 import { Operation, Status, Type, operationRegistry } from './operation.js';
-import { isNil, isEmpty, trim } from 'lodash-es';
+import { isNil, isEmpty, trim, isEqual } from 'lodash-es';
 import { modelEventEmitter } from './reactivity.js';
 import { Cache } from '../cache/cache.js';
 import { replaceTempPks, containsTempPk } from '../../flavours/django/tempPk.js';
-const emitEvents = (modelClass, events) => {
-    // helper method to emit every event
-    events.forEach(event => {
-        modelEventEmitter.emit(`${modelClass.configKey}::${modelClass.modelName}::render`, event);
+const emitEvents = (store, events) => {
+    if (!Array.isArray(events))
+        return;
+    events.forEach((event) => {
+        const pk = event.pk;
+        if (isNil(pk))
+            return;
+        const newRenderedDataArray = store.render([pk], true);
+        const newRenderedData = newRenderedDataArray.length > 0 ? newRenderedDataArray[0] : null;
+        const lastRenderedData = store._lastRenderedData.get(pk);
+        if (!isEqual(newRenderedData, lastRenderedData)) {
+            store._lastRenderedData.set(pk, newRenderedData);
+            modelEventEmitter.emit(`${store.modelClass.configKey}::${store.modelClass.modelName}::render`, event);
+        }
     });
 };
 class EventData {
@@ -62,6 +72,7 @@ export class ModelStore {
             this._loadOperations(initialOperations);
         }
         this.modelCache = new Cache('model-cache', {}, this.onHydrated.bind(this));
+        this._lastRenderedData = new Map();
     }
     /**
      * Load operations from data and add them to the operations map,
@@ -164,26 +175,26 @@ export class ModelStore {
         if (this.operationsMap.size > this.pruneThreshold) {
             this.prune();
         }
-        emitEvents(this.modelClass, EventData.fromOperation(operation));
+        emitEvents(this, EventData.fromOperation(operation));
     }
     updateOperation(operation) {
         if (!this.operationsMap.has(operation.operationId))
             return false;
         this.operationsMap.set(operation.operationId, operation);
-        emitEvents(this.modelClass, EventData.fromOperation(operation));
+        emitEvents(this, EventData.fromOperation(operation));
         return true;
     }
     confirm(operation) {
         if (!this.operationsMap.has(operation.operationId))
             return;
         this.operationsMap.set(operation.operationId, operation);
-        emitEvents(this.modelClass, EventData.fromOperation(operation));
+        emitEvents(this, EventData.fromOperation(operation));
     }
     reject(operation) {
         if (!this.operationsMap.has(operation.operationId))
             return;
         this.operationsMap.set(operation.operationId, operation);
-        emitEvents(this.modelClass, EventData.fromOperation(operation));
+        emitEvents(this, EventData.fromOperation(operation));
     }
     setOperations(operations = []) {
         const prevOps = this.operations;
@@ -192,7 +203,7 @@ export class ModelStore {
             this.operationsMap.set(op.operationId, op);
         });
         const allOps = [...prevOps, ...this.operations];
-        emitEvents(this.modelClass, EventData.fromOperations(allOps));
+        emitEvents(this, EventData.fromOperations(allOps));
     }
     // Ground truth data methods
     setGroundTruth(groundTruth) {
@@ -200,7 +211,7 @@ export class ModelStore {
         this.groundTruthArray = Array.isArray(groundTruth) ? groundTruth : [];
         // reactivity - gather all ops
         const allOps = [...prevGroundTruth, ...this.groundTruthArray];
-        emitEvents(this.modelClass, EventData.fromInstances(allOps, this.modelClass));
+        emitEvents(this, EventData.fromInstances(allOps, this.modelClass));
     }
     getGroundTruth() {
         return this.groundTruthArray;
@@ -263,7 +274,7 @@ export class ModelStore {
             console.log(`[ModelStore ${this.modelClass.modelName}] Created CHECKPOINT operation for ${checkpointInstances.length} existing instances`);
         }
         // reactivity - use all the newly added instances (both new and updated)
-        emitEvents(this.modelClass, EventData.fromInstances([...checkpointInstances, ...Array.from(pkMap.values())], this.modelClass));
+        emitEvents(this, EventData.fromInstances([...checkpointInstances, ...Array.from(pkMap.values())], this.modelClass));
     }
     _filteredOperations(pks, operations) {
         if (!pks)

package/dist/syncEngine/stores/querysetStore.d.ts

@@ -12,6 +12,7 @@ export class QuerysetStore {
     pruneThreshold: any;
     getRootStore: any;
     qsCache: Cache;
+    _lastRenderedPks: any[] | null;
     get cacheKey(): any;
     onHydrated(hydratedData: any): void;
     setCache(result: any): void;

package/dist/syncEngine/stores/querysetStore.js

@@ -1,6 +1,6 @@
 import { Operation, Status, Type, operationRegistry } from './operation.js';
 import { querysetEventEmitter } from './reactivity.js';
-import { isNil, isEmpty, trim } from 'lodash-es';
+import { isNil, isEmpty, trim, isEqual } from 'lodash-es';
 import { replaceTempPks, containsTempPk } from '../../flavours/django/tempPk.js';
 import { modelStoreRegistry } from '../registries/modelStoreRegistry.js';
 import { processIncludedEntities } from '../../flavours/django/makeApiCall.js';
@@ -29,6 +29,7 @@ export class QuerysetStore {
             }
         }
         this.qsCache = new Cache("queryset-cache", {}, this.onHydrated.bind(this));
+        this._lastRenderedPks = null;
     }
     // Caching
     get cacheKey() {
@@ -70,7 +71,12 @@ export class QuerysetStore {
         return new Set(this.groundTruthPks);
     }
     _emitRenderEvent() {
-        querysetEventEmitter.emit(`${this.modelClass.configKey}::${this.modelClass.modelName}::queryset::render`, { ast: this.queryset.build(), ModelClass: this.modelClass });
+        const newPks = this.render(true, false); // Get current state without using cache
+        // Directly compare PK lists. isEqual performs a deep, order-sensitive comparison.
+        if (!isEqual(newPks, this._lastRenderedPks)) {
+            this._lastRenderedPks = newPks; // Update the cache with the new state
+            querysetEventEmitter.emit(`${this.modelClass.configKey}::${this.modelClass.modelName}::queryset::render`, { ast: this.queryset.build(), ModelClass: this.modelClass });
+        }
     }
     async addOperation(operation) {
         this.operationsMap.set(operation.operationId, operation);
@@ -132,7 +138,9 @@ export class QuerysetStore {
             }
         }
         let result;
-        if (this.getRootStore && typeof this.getRootStore === "function" && !this.isTemp) {
+        if (this.getRootStore &&
+            typeof this.getRootStore === "function" &&
+            !this.isTemp) {
             const { isRoot, rootStore } = this.getRootStore(this.queryset);
             if (!isRoot && rootStore && rootStore.lastSync) {
                 result = this.renderFromRoot(optimistic, rootStore);
@@ -201,7 +209,9 @@ export class QuerysetStore {
             return;
         }
         // Check if we're delegating to a root store
-        if (this.getRootStore && typeof this.getRootStore === "function" && !this.isTemp) {
+        if (this.getRootStore &&
+            typeof this.getRootStore === "function" &&
+            !this.isTemp) {
             const { isRoot, rootStore } = this.getRootStore(this.queryset);
             if (!isRoot && rootStore && rootStore.lastSync) {
                 // We're delegating to a root store - don't sync, just mark as needing sync

package/dist/syncEngine/sync.js

@@ -80,7 +80,7 @@ export class SyncManager {
         this.followedModels.set(registry, models);
         if (models.has(modelClass))
             return;
-        const alreadyFollowed = [...this.followedModels.values()].some(set => set.has(modelClass));
+        const alreadyFollowed = [...this.followedModels.values()].some((set) => set.has(modelClass));
         models.add(modelClass);
         if (!alreadyFollowed) {
             getEventReceiver(modelClass.configKey)?.subscribe(modelClass.modelName, this.handleEvent);
@@ -91,7 +91,7 @@ export class SyncManager {
         if (!models)
             return;
         models.delete(modelClass);
-        const stillFollowed = [...this.followedModels.values()].some(set => set.has(modelClass));
+        const stillFollowed = [...this.followedModels.values()].some((set) => set.has(modelClass));
         if (!stillFollowed) {
             getEventReceiver(modelClass.configKey)?.unsubscribe(modelClass.modelName, this.handleEvent);
         }
@@ -104,10 +104,10 @@ export class SyncManager {
         this.registries.delete(registry.constructor.name);
     }
     isQuerysetFollowed(queryset) {
+        const activeSemanticKeys = new Set([...this.followedQuerysets].map((qs) => qs.semanticKey));
         let current = queryset;
-        // All followed querysets and their descendents get updated
         while (current) {
-            if (this.followedQuerysets.has(current)) {
+            if (activeSemanticKeys.has(current.semanticKey)) {
                 return true;
             }
             current = current.__parent;
@@ -127,7 +127,7 @@ export class SyncManager {
                 const followingQuerysets = registry.followingQuerysets.get(semanticKey);
                 if (followingQuerysets) {
                     // Use some() to break early when we find a match
-                    const shouldSync = [...followingQuerysets].some(queryset => {
+                    const shouldSync = [...followingQuerysets].some((queryset) => {
                         return this.isQuerysetFollowed(queryset);
                     });
                     if (shouldSync) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statezero/core",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "type": "module",
   "module": "ESNext",
   "description": "The type-safe frontend client for StateZero - connect directly to your backend models with zero boilerplate",