teamplay 0.4.0-alpha.93 → 0.4.0-alpha.95

package/orm/Compat/queryReadiness.js

@@ -1,10 +1,12 @@
 import { getRaw } from '../dataTree.js'
 import { getConnection } from '../connection.js'
 import { isMissingShareDoc } from '../missingDoc.js'
-import { QUERIES, HASH, PARAMS, COLLECTION_NAME } from '../Query.js'
-import { AGGREGATIONS, IS_AGGREGATION } from '../Aggregation.js'
+import { QUERIES, HASH, PARAMS, COLLECTION_NAME, querySubscriptions } from '../Query.js'
+import { AGGREGATIONS, IS_AGGREGATION, aggregationSubscriptions } from '../Aggregation.js'
 import { getPrivateData, setPrivateData } from '../privateData.js'
 import { getRoot, ROOT_ID } from '../Root.js'
+import { isRootContextClosed } from '../rootContext.js'
+import { getScopedSignalHash, normalizeRootId } from '../rootScope.js'
 
 let imperativeQueryReadyTimeoutMs = 1000
 
@@ -47,7 +49,9 @@ export function isDocReady (segments) {
 export async function waitForImperativeQueryReady ($query) {
   const timeoutMs = imperativeQueryReadyTimeoutMs
   const startedAt = Date.now()
+  const ownerState = createImperativeOwnerState($query)
   while (true) {
+    if (isImperativeQueryCancelled($query, ownerState)) return
     if (isImperativeQueryReady($query)) {
       syncQueryDocsFromCollection($query)
       return
@@ -92,6 +96,28 @@ function isImperativeQueryReady ($query) {
   return true
 }
 
+function isImperativeQueryCancelled ($query, ownerState) {
+  const rootId = getRoot($query)?.[ROOT_ID]
+  if (isRootContextClosed(rootId)) return true
+  if (!ownerState?.wasTracked) return false
+  const trackedOwnerCount = ownerState.subscriptions.getTrackedOwnerCount(ownerState.ownerKey)
+  return trackedOwnerCount == null || trackedOwnerCount <= 0
+}
+
+function createImperativeOwnerState ($query) {
+  const hash = $query[HASH]
+  const rootId = normalizeRootId(getRoot($query)?.[ROOT_ID])
+  const subscriptions = ($query[IS_AGGREGATION] || isAggregationQuery($query[PARAMS]))
+    ? aggregationSubscriptions
+    : querySubscriptions
+  const ownerKey = getScopedSignalHash(rootId, hash, 'queryOwner')
+  return {
+    subscriptions,
+    ownerKey,
+    wasTracked: subscriptions.getTrackedOwnerCount(ownerKey) != null
+  }
+}
+
 function syncQueryDocsFromCollection ($query) {
   const params = $query[PARAMS]
   if ($query[IS_AGGREGATION] || isAggregationQuery(params) || isExtraQuery(params)) return

package/orm/Query.js

@@ -9,7 +9,7 @@ import FinalizationRegistry from '../utils/MockFinalizationRegistry.js'
 import SubscriptionState from './SubscriptionState.js'
 import { getIdFieldsForSegments, injectIdFields, isPlainObject } from './idFields.js'
 import { getSubscriptionGcDelay } from './subscriptionGcDelay.js'
-import { getScopedSignalHash } from './rootScope.js'
+import { getScopedSignalHash, normalizeRootId } from './rootScope.js'
 import { getRoot, ROOT_ID, getRootTransportMode } from './Root.js'
 import { registerRootOwnedRuntime, unregisterRootOwnedRuntime } from './rootContext.js'
 import {
@@ -980,7 +980,7 @@ function detachQueryRoot (query, rootId) {
 }
 
 function getOwningRootId ($query) {
-  return getRoot($query)?.[ROOT_ID]
+  return normalizeRootId(getRoot($query)?.[ROOT_ID])
 }
 
 function getQueryOwnerKey (rootId, transportHash) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.4.0-alpha.93",
+  "version": "0.4.0-alpha.95",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "index.js",
@@ -83,5 +83,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "286165ff8cf198fe20f8ec1be416c12839f47de8"
+  "gitHead": "43c734951b848a2da50848e9930e50cdf7fdd9d1"
 }