teamplay 0.5.0-alpha.10 → 0.5.0-alpha.11

package/dist/orm/Compat/silentContext.js

@@ -8,39 +8,21 @@ export function isModelEventsSilentContextActive() {
 }
 export function runInSilentContext(fn) {
     silentDepth += 1;
-    let result;
     try {
-        result = fn();
+        return fn();
     }
-    catch (error) {
+    finally {
         silentDepth -= 1;
-        throw error;
     }
-    if (result?.then) {
-        return Promise.resolve(result).finally(() => {
-            silentDepth -= 1;
-        });
-    }
-    silentDepth -= 1;
-    return result;
 }
 export function runInModelEventsSilentContext(fn) {
     modelEventsSilentDepth += 1;
-    let result;
     try {
-        result = fn();
+        return fn();
     }
-    catch (error) {
+    finally {
         modelEventsSilentDepth -= 1;
-        throw error;
-    }
-    if (result?.then) {
-        return Promise.resolve(result).finally(() => {
-            modelEventsSilentDepth -= 1;
-        });
     }
-    modelEventsSilentDepth -= 1;
-    return result;
 }
 export function __resetSilentContextForTests() {
     silentDepth = 0;

package/dist/orm/Compat/startStopCompat.js

@@ -1,4 +1,5 @@
 import { observe, raw, unobserve } from '@nx-js/observer-util';
+import { getActiveDocOpContext } from '../Doc.js';
 import { getRoot } from "../Root.js";
 import { scheduleReaction } from '../batchScheduler.js';
 const START_REACTIONS = Symbol('compat start reactions');
@@ -19,11 +20,15 @@ export function compatStartOnRoot($root, targetPath, ...depsAndGetter) {
     const targetSegments = parsePathSegments(targetPath);
     const $target = resolveSignal($root, targetSegments);
     const targetKey = $target.path();
+    const depPaths = deps
+        .map(dep => getStartDepPath(dep, $root))
+        .filter(Boolean);
     const store = getStartStore($root);
     const existing = store.get(targetKey);
     if (existing)
         existing.stop();
     let lastSourceSnapshot = UNSET;
+    let lastTargetSnapshot = UNSET;
     const reaction = observe(() => {
         const resolvedDeps = [];
         for (const dep of deps) {
@@ -45,8 +50,23 @@ export function compatStartOnRoot($root, targetPath, ...depsAndGetter) {
         if (lastSourceSnapshot !== UNSET && deepEqualStartValue(lastSourceSnapshot, sourceSnapshot)) {
             return;
         }
+        const currentTargetSnapshot = lastTargetSnapshot === UNSET
+            ? UNSET
+            : detachStartValue($target.peek());
+        if (currentTargetSnapshot !== UNSET && deepEqualStartValue(currentTargetSnapshot, sourceSnapshot)) {
+            lastSourceSnapshot = sourceSnapshot;
+            lastTargetSnapshot = sourceSnapshot;
+            return;
+        }
+        if (currentTargetSnapshot !== UNSET &&
+            !deepEqualStartValue(lastTargetSnapshot, currentTargetSnapshot) &&
+            isActiveLocalDocOpForDeps(depPaths)) {
+            lastSourceSnapshot = sourceSnapshot;
+            return;
+        }
         lastSourceSnapshot = sourceSnapshot;
         const detachedValue = detachStartValue(sourceSnapshot);
+        lastTargetSnapshot = detachStartValue(detachedValue);
         // Keep the detached snapshot to avoid aliasing source and target.
         // Old racer start() writes through diffDeep by default. In compat mode we must preserve
         // that behavior, but also avoid reading the target reactively inside start(), otherwise
@@ -104,9 +124,22 @@ function resolveStartDep(dep, $root) {
         throw err;
     }
 }
+function getStartDepPath(dep, $root) {
+    if (isSignalLike(dep))
+        return dep.path();
+    if (typeof dep === 'string')
+        return resolveSignal($root, parsePathSegments(dep)).path();
+}
 function getStartDepValue($signal) {
     return readReactiveSnapshot($signal.get());
 }
+function isActiveLocalDocOpForDeps(depPaths) {
+    const context = getActiveDocOpContext();
+    if (!context?.source)
+        return false;
+    const docPath = `${context.collection}.${context.docId}`;
+    return depPaths.some(depPath => depPath === docPath || depPath.startsWith(docPath + '.'));
+}
 function readReactiveSnapshot(value) {
     if (!value || typeof value !== 'object')
         return value;

package/dist/orm/Doc.js

@@ -12,6 +12,43 @@ import { getRoot, ROOT_ID, GLOBAL_ROOT_ID, getRootTransportMode } from "./Root.j
 import { registerRootOwnedDirectDocSubscription, unregisterRootOwnedDirectDocSubscription, getRootOwnedDirectDocSubscriptions, clearRootOwnedDirectDocSubscriptions } from "./rootContext.js";
 const ERROR_ON_EXCESSIVE_UNSUBSCRIBES = false;
 const DOC_FINALIZATION_TOKENS = new WeakMap();
+const RECENT_DOC_OP_CONTEXT_TTL = 100;
+const ACTIVE_DOC_OP_CONTEXTS = [];
+let recentDocOpContext;
+export function getActiveDocOpContext() {
+    return ACTIVE_DOC_OP_CONTEXTS[ACTIVE_DOC_OP_CONTEXTS.length - 1] || recentDocOpContext;
+}
+function pushActiveDocOpContext(collection, docId, source) {
+    const context = { collection, docId, source };
+    ACTIVE_DOC_OP_CONTEXTS.push(context);
+    recentDocOpContext = context;
+}
+function popActiveDocOpContext(collection, docId, source) {
+    const current = ACTIVE_DOC_OP_CONTEXTS[ACTIVE_DOC_OP_CONTEXTS.length - 1];
+    if (current?.collection === collection && current?.docId === docId && current?.source === source) {
+        ACTIVE_DOC_OP_CONTEXTS.pop();
+        clearRecentDocOpContext(current);
+        return;
+    }
+    let index = -1;
+    for (let i = ACTIVE_DOC_OP_CONTEXTS.length - 1; i >= 0; i--) {
+        const context = ACTIVE_DOC_OP_CONTEXTS[i];
+        if (context.collection === collection && context.docId === docId && context.source === source) {
+            index = i;
+            break;
+        }
+    }
+    if (index === -1)
+        return;
+    const [context] = ACTIVE_DOC_OP_CONTEXTS.splice(index, 1);
+    clearRecentDocOpContext(context);
+}
+function clearRecentDocOpContext(context) {
+    setTimeout(() => {
+        if (recentDocOpContext === context)
+            recentDocOpContext = undefined;
+    }, RECENT_DOC_OP_CONTEXT_TTL);
+}
 function getDocFinalizationToken($doc) {
     let token = DOC_FINALIZATION_TOKENS.get($doc);
     if (!token) {
@@ -149,7 +186,15 @@ class Doc {
         doc.on('create', () => this._refData());
         doc.on('del', () => this._refMissingData());
         if (isModelEventsEnabled()) {
-            doc.on('op', op => emitDocOp(this.collection, this.docId, op));
+            doc.on('before op', (_op, source) => pushActiveDocOpContext(this.collection, this.docId, source));
+            doc.on('op', (op, source) => {
+                try {
+                    emitDocOp(this.collection, this.docId, op, source);
+                }
+                finally {
+                    popActiveDocOpContext(this.collection, this.docId, source);
+                }
+            });
         }
     }
     _refMissingData() {
@@ -870,7 +915,7 @@ function createPendingDestroyEntry() {
         reject: rejectPending
     };
 }
-function emitDocOp(collection, docId, op) {
+function emitDocOp(collection, docId, op, source) {
     if (!isModelEventsEnabled())
         return;
     const ops = Array.isArray(op) ? op : [op];
@@ -879,7 +924,7 @@ function emitDocOp(collection, docId, op) {
             continue;
         const baseSegments = [collection, docId];
         let pathSegments = baseSegments.concat(component.p);
-        const meta = {};
+        const meta = { source };
         let value;
         let prevValue;
         if (has(component, 'si') || has(component, 'sd')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.5.0-alpha.10",
+  "version": "0.5.0-alpha.11",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "./dist/index.js",
@@ -134,5 +134,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "618cf6d63af687cfa1480979b3c0b4b15f7dfc45"
+  "gitHead": "2c23ad4108aad3dc7ac4947a987e395e933761cc"
 }