teamplay 0.3.15 → 0.3.17

package/orm/Doc.js

@@ -162,24 +162,22 @@ class DocSubscriptions {
   constructor () {
     this.subCount = new Map()
     this.docs = new Map()
-    this.initialized = new Map()
     this.fr = new FinalizationRegistry(segments => this.destroy(segments))
   }
 
   init ($doc) {
     const segments = [...$doc[SEGMENTS]]
     const hash = hashDoc(segments)
-    if (this.initialized.has(hash)) return
-    this.initialized.set(hash, true)
-
-    this.fr.register($doc, segments, $doc)
-
     let doc = this.docs.get(hash)
-    if (!doc) {
+    if (doc) {
+      if (doc.initialized) return
+      doc.init()
+    } else {
       doc = new Doc(...segments)
       this.docs.set(hash, doc)
+      this.fr.register($doc, segments, $doc)
+      doc.init()
     }
-    doc.init()
   }
 
   subscribe ($doc) {
@@ -216,11 +214,10 @@ class DocSubscriptions {
     const hash = hashDoc(segments)
     const doc = this.docs.get(hash)
     if (!doc) return
-    this.subCount.delete(hash)
-    this.initialized.delete(hash)
-    // If the document was initialized as part of query and wasn't directly subscribed to, we should not unsubscribe from it.
+    // Wait until after unsubscribe to delete subCount and docs
     if (doc.subscribed) await doc.unsubscribe()
-    if (doc.subscribed) return // if we subscribed again while waiting for unsubscribe, we don't delete the doc
+    if (doc.subscribed) return // Subscribed again while unsubscribing
+    this.subCount.delete(hash)
     this.docs.delete(hash)
   }
 }

package/orm/Signal.js

@@ -24,7 +24,7 @@ export const SEGMENTS = Symbol('path segments targeting the particular node in t
 export const ARRAY_METHOD = Symbol('run array method on the signal')
 export const GET = Symbol('get the value of the signal - either observed or raw')
 export const GETTERS = Symbol('get the list of this signal\'s getters')
-const DEFAULT_GETTERS = ['path', 'id', 'get', 'peek', 'getId', 'map', 'reduce', 'find', 'getIds']
+const DEFAULT_GETTERS = ['path', 'id', 'get', 'peek', 'getId', 'map', 'reduce', 'find', 'getIds', 'getCollection']
 
 export default class Signal extends Function {
   static [GETTERS] = DEFAULT_GETTERS
@@ -108,6 +108,14 @@ export default class Signal extends Function {
     return this[SEGMENTS][this[SEGMENTS].length - 1]
   }
 
+  getCollection () {
+    if (this[SEGMENTS].length === 0) throw Error('Can\'t get the id of the root signal')
+    if (this[SEGMENTS][0] === AGGREGATIONS) {
+      return getAggregationCollectionName(this[SEGMENTS])
+    }
+    return this[SEGMENTS][0]
+  }
+
   * [Symbol.iterator] () {
     if (this[IS_QUERY]) {
       const ids = _get([QUERIES, this[HASH], 'ids'])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.3.15",
+  "version": "0.3.17",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "index.js",
@@ -23,12 +23,12 @@
   },
   "dependencies": {
     "@nx-js/observer-util": "^4.1.3",
-    "@teamplay/backend": "^0.3.15",
-    "@teamplay/cache": "^0.3.15",
-    "@teamplay/channel": "^0.3.15",
-    "@teamplay/debug": "^0.3.15",
-    "@teamplay/schema": "^0.3.15",
-    "@teamplay/utils": "^0.3.15",
+    "@teamplay/backend": "^0.3.17",
+    "@teamplay/cache": "^0.3.17",
+    "@teamplay/channel": "^0.3.17",
+    "@teamplay/debug": "^0.3.17",
+    "@teamplay/schema": "^0.3.17",
+    "@teamplay/utils": "^0.3.17",
     "diff-match-patch": "^1.0.5",
     "events": "^3.3.0",
     "json0-ot-diff": "^1.1.2",
@@ -63,5 +63,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "108543261b228e76cfd4ceb4673b8190bb31bbb8"
+  "gitHead": "3c86c80a5a9af166a60428c608cc73dcdf281769"
 }

package/utils/MockFinalizationRegistry.js

@@ -1,6 +1,4 @@
-export const REGISTRY_SWEEP_INTERVAL = 10_000
-export const MOCK_FINALIZATION_TIMEOUT = 10_000
-const PERMANENT = false
+export const REGISTRY_SWEEP_INTERVAL = 10000
 
 // This is a mock implementation of FinalizationRegistry which doesn't actually
 // finalize anything. It's used in environments where FinalizationRegistry is not
@@ -42,7 +40,7 @@ export class WeakRefBasedFinalizationRegistry {
   register (target, value, token) {
     this.registrations.set(this.counter, {
       targetRef: new WeakRef(target),
-      tokenRef: token && new WeakRef(token),
+      tokenRef: token != null ? new WeakRef(token) : undefined,
       value
     })
     this.counter++
@@ -50,9 +48,11 @@ export class WeakRefBasedFinalizationRegistry {
   }
 
   unregister (token) {
+    if (token == null) return
     this.registrations.forEach((registration, key) => {
-      if (registration?.tokenRef.deref() !== token) return
-      this.registrations.delete(key)
+      if (registration.tokenRef?.deref() === token) {
+        this.registrations.delete(key)
+      }
     })
   }
 
@@ -65,7 +65,7 @@ export class WeakRefBasedFinalizationRegistry {
       if (registration.targetRef.deref() !== undefined) return
       const value = registration.value
       this.registrations.delete(key)
-      setTimeout(() => this.finalize(value), MOCK_FINALIZATION_TIMEOUT)
+      this.finalize(value)
     })
 
     if (this.registrations.size > 0) this.scheduleSweep()
@@ -81,12 +81,12 @@ let ExportedFinalizationRegistry
 
 if (typeof FinalizationRegistry !== 'undefined') {
   ExportedFinalizationRegistry = FinalizationRegistry
-} else if (typeof WeakRef !== 'undefined' && !PERMANENT) {
+} else if (typeof WeakRef !== 'undefined') {
   console.warn('FinalizationRegistry is not available in this environment. ' +
       'Using a mock implementation: WeakRefBasedFinalizationRegistry')
   ExportedFinalizationRegistry = WeakRefBasedFinalizationRegistry
 } else {
-  console.warn('FinalizationRegistry is not available in this environment. ' +
+  console.warn('Neither FinalizationRegistry nor WeakRef are available in this environment. ' +
       'Using a mock implementation: PermanentFinalizationRegistry')
   ExportedFinalizationRegistry = PermanentFinalizationRegistry
 }