teamplay 0.4.0-alpha.36 → 0.4.0-alpha.37

package/orm/Compat/README.md

@@ -389,6 +389,11 @@ console.log(getSubscriptionGcDelay()) // 500
 When refCount drops to `0`, unsubscribe/destroy is scheduled after this delay.
 If a new subscribe arrives before timeout, pending destroy is cancelled and the same doc/query instance is reused.
 
+Compat queries also retain lifecycle ownership of docs they materialize into DataTree.
+This means a doc that arrived through `useQuery` / `useBatchQuery` will stay available
+for immediate `useLocal` / `useModel` reads while that query remains subscribed, even if
+some unrelated `useDoc` subscriber for the same `collection.id` unmounts.
+
 ### set(value) and set(path, value)
 
 `SignalCompat` accepts both:

package/orm/Doc.js

@@ -149,6 +149,15 @@ export class DocSubscriptions {
     return doc._subscribing
   }
 
+  retain ($doc) {
+    const segments = [...$doc[SEGMENTS]]
+    const hash = hashDoc(segments)
+    this.cancelDestroy(hash)
+    const count = this.subCount.get(hash) || 0
+    this.subCount.set(hash, count + 1)
+    this.init($doc)
+  }
+
   async unsubscribe ($doc) {
     const segments = [...$doc[SEGMENTS]]
     const hash = hashDoc(segments)
@@ -167,6 +176,23 @@ export class DocSubscriptions {
     await this.scheduleDestroy(segments)
   }
 
+  async release ($doc) {
+    const segments = [...$doc[SEGMENTS]]
+    const hash = hashDoc(segments)
+    let count = this.subCount.get(hash) || 0
+    count -= 1
+    if (count < 0) {
+      if (ERROR_ON_EXCESSIVE_UNSUBSCRIBES) throw ERRORS.notSubscribed($doc)
+      return
+    }
+    if (count > 0) {
+      this.subCount.set(hash, count)
+      return
+    }
+    this.subCount.set(hash, 0)
+    await this.scheduleDestroy(segments)
+  }
+
   async destroy (segments) {
     const hash = hashDoc(segments)
     await this.destroyByHash(hash, { force: true })

package/orm/Query.js

@@ -89,7 +89,7 @@ export class Query {
       const ids = this.shareQuery.results.map(doc => doc.id)
       for (const docId of ids) {
         const $doc = getSignal(undefined, [this.collectionName, docId])
-        docSubscriptions.init($doc)
+        docSubscriptions.retain($doc)
         this.docSignals.add($doc)
       }
       _set([QUERIES, this.hash, 'ids'], ids)
@@ -112,7 +112,7 @@ export class Query {
       const ids = shareDocs.map(doc => doc.id)
       for (const docId of ids) {
         const $doc = getSignal(undefined, [this.collectionName, docId])
-        docSubscriptions.init($doc)
+        docSubscriptions.retain($doc)
         this.docSignals.add($doc)
       }
       _get([QUERIES, this.hash, 'ids']).splice(index, 0, ...ids)
@@ -172,6 +172,7 @@ export class Query {
       const docIds = shareDocs.map(doc => doc.id)
       for (const docId of docIds) {
         const $doc = getSignal(undefined, [this.collectionName, docId])
+        docSubscriptions.release($doc).catch(ignoreDestroyError)
         this.docSignals.delete($doc)
       }
       const ids = _get([QUERIES, this.hash, 'ids'])
@@ -202,6 +203,9 @@ export class Query {
   }
 
   _removeData () {
+    for (const $doc of this.docSignals) {
+      docSubscriptions.release($doc).catch(ignoreDestroyError)
+    }
     this.docSignals.clear()
     _del([QUERIES, this.hash])
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.4.0-alpha.36",
+  "version": "0.4.0-alpha.37",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "index.js",
@@ -81,5 +81,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "0f90958b39502634ec8fefc99d7e688f0ac4c4bc"
+  "gitHead": "5ef9050360d503f068c90c54fc1a549f7d63ee8d"
 }