teamplay 0.4.0-alpha.86 → 0.4.0-alpha.87

package/orm/Compat/SignalCompat.js

@@ -1007,9 +1007,10 @@ function diffDeepCompatSync ($signal, before, after) {
   }
 
   if (isDiffableObject(before, after)) {
+    const preservePath = $signal[SEGMENTS]
     for (const key of Object.keys(before)) {
       if (Object.prototype.hasOwnProperty.call(after, key)) continue
-      delPrivateCompatSync(getChildSignal($signal, key))
+      delPrivateCompatSync(getChildSignal($signal, key), { preservePath })
     }
     for (const key of Object.keys(after)) {
       diffDeepCompatSync(getChildSignal($signal, key), before[key], after[key])
@@ -1055,12 +1056,12 @@ function setReplacePrivateCompatSync ($signal, value) {
   mirrorRefMutationFromTarget(segments, value)
 }
 
-function delPrivateCompatSync ($signal) {
+function delPrivateCompatSync ($signal, options) {
   const segments = $signal[SEGMENTS]
   if (segments.length === 0) throw Error('Can\'t delete the root signal data')
   const idFields = getIdFieldsForSegments(segments)
   if (isIdFieldPath(segments, idFields)) return
-  delPrivateData(getOwningRootId($signal), segments)
+  delPrivateData(getOwningRootId($signal), segments, options)
 }
 
 function deepEqualCompat (left, right) {

package/orm/Doc.js

@@ -284,6 +284,12 @@ export class DocSubscriptions {
     return count
   }
 
+  getEntryTrackedTotal (entry) {
+    if (!entry) return undefined
+    const total = this.getEntryTotalCount(entry)
+    if (total > 0 || entry.pendingDestroy) return total
+  }
+
   syncOwnerMirror () {}
 
   clearOwnerMirror () {}
@@ -293,14 +299,18 @@ export class DocSubscriptions {
   deleteEntryIfEmpty (hash) {
     const entry = this.entries.get(hash)
     if (!entry) return
-    if (entry.owners.size > 0) return
-    if (entry.retainCount > 0) return
-    if (entry.pendingDestroy) return
-    if (entry.runtime) return
-    if (entry.phase === 'transition') return
+    if (!this.canDeleteEntry(entry)) return
     this.entries.delete(hash)
   }
 
+  canDeleteEntry (entry) {
+    if (!entry) return false
+    if (this.getEntryTrackedTotal(entry) !== undefined) return false
+    if (entry.runtime) return false
+    if (entry.phase === 'transition') return false
+    return true
+  }
+
   ensureRuntime (hash, segments) {
     const entry = this.getOrCreateEntry(hash, segments)
     if (!entry.runtime) {
@@ -775,18 +785,11 @@ export class DocSubscriptions {
 
   getTrackedCount (hash) {
     const entry = this.entries.get(hash)
-    if (entry) {
-      const total = this.getEntryTotalCount(entry)
-      if (total > 0 || entry.pendingDestroy) return total
-    }
-    return undefined
+    return this.getEntryTrackedTotal(entry)
   }
 
   getTrackedHashCountSize () {
-    return countMapLike(this.entries, entry => {
-      const total = this.getEntryTotalCount(entry)
-      return total > 0 || !!entry.pendingDestroy
-    })
+    return countMapLike(this.entries, entry => this.getEntryTrackedTotal(entry) !== undefined)
   }
 
   getOwnerMeta (ownerKey) {

package/orm/privateData.js

@@ -50,13 +50,13 @@ export function setReplacePrivateData (rootId, logicalSegments, value) {
   _setReplace(segments, value, context.getPrivateDataRoot(), getModelEventContext(rootId, logicalSegments))
 }
 
-export function delPrivateData (rootId, logicalSegments) {
+export function delPrivateData (rootId, logicalSegments, options = {}) {
   if (!isPrivateCollectionSegments(logicalSegments)) return
   const context = getRootContext(rootId, false)
   if (!context) return
   const segments = getPrivateDataSegments(logicalSegments)
   _del(segments, context.getPrivateDataRoot(), getModelEventContext(rootId, logicalSegments))
-  pruneEmptyPrivateParents(context.getPrivateDataRoot(), context.getPrivateDataRawRoot(), segments)
+  pruneEmptyPrivateParents(context.getPrivateDataRoot(), context.getPrivateDataRawRoot(), segments, options)
 }
 
 export function arrayPushPrivateData (rootId, logicalSegments, value) {
@@ -132,8 +132,11 @@ function cloneValue (value) {
   return value
 }
 
-function pruneEmptyPrivateParents (tree, treeRaw, segments) {
+function pruneEmptyPrivateParents (tree, treeRaw, segments, options = {}) {
   if (!Array.isArray(segments) || segments.length < 2) return
+  const preservePath = Array.isArray(options.preservePath)
+    ? getPrivateDataSegments(options.preservePath)
+    : null
   const parents = []
   let node = tree
   let nodeRaw = treeRaw
@@ -145,6 +148,8 @@ function pruneEmptyPrivateParents (tree, treeRaw, segments) {
   }
   for (let i = parents.length - 1; i >= 0; i--) {
     const [parent, parentRaw, segment] = parents[i]
+    const currentPath = segments.slice(0, i + 1)
+    if (segmentsEqual(currentPath, preservePath)) break
     const valueRaw = parentRaw?.[segment]
     if (!isPlainObjectEmpty(valueRaw)) break
     delete parent[segment]
@@ -154,3 +159,12 @@ function pruneEmptyPrivateParents (tree, treeRaw, segments) {
 function isPlainObjectEmpty (value) {
   return value != null && typeof value === 'object' && !Array.isArray(value) && Object.keys(value).length === 0
 }
+
+function segmentsEqual (left, right) {
+  if (!Array.isArray(left) || !Array.isArray(right)) return false
+  if (left.length !== right.length) return false
+  for (let i = 0; i < left.length; i++) {
+    if (left[i] !== right[i]) return false
+  }
+  return true
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.4.0-alpha.86",
+  "version": "0.4.0-alpha.87",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "index.js",
@@ -83,5 +83,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "1a97cd53facf3d591549158e306f6167ccf086e0"
+  "gitHead": "dd7b2ff38d9b84e0b2eb24217e41f3ee3644592f"
 }