teamplay 0.4.0-alpha.20 → 0.4.0-alpha.22

package/orm/Compat/hooksCompat.js

@@ -97,7 +97,8 @@ export function useBatchDoc (collection, id, options) {
 
 export function useBatchDoc$ (collection, id, _options) {
   const $doc = getDocSignal(collection, id, 'useBatchDoc')
-  return useSub($doc, undefined, { async: false, batch: true })
+  const options = _options ? { ..._options, ...BATCH_SUB_OPTIONS } : BATCH_SUB_OPTIONS
+  return useSub($doc, undefined, options)
 }
 
 export function useAsyncDoc$ (collection, id, options) {
@@ -140,7 +141,8 @@ export function useAsyncQuery (collection, query, options) {
 
 export function useBatchQuery$ (collection, query, _options) {
   const $collection = getCollectionSignal(collection, query, 'useBatchQuery')
-  return useSub($collection, normalizeQuery(query, 'useBatchQuery'), { async: false, batch: true })
+  const options = _options ? { ..._options, ...BATCH_SUB_OPTIONS } : BATCH_SUB_OPTIONS
+  return useSub($collection, normalizeQuery(query, 'useBatchQuery'), options)
 }
 
 export function useBatchQuery (collection, query, options) {
@@ -306,3 +308,11 @@ function normalizeQuery (query, hookName) {
   }
   return query
 }
+
+const BATCH_SUB_OPTIONS = Object.freeze({
+  async: false,
+  batch: true,
+  // Batch hooks are a hard suspense barrier. Deferred params can skip the barrier
+  // on route transitions and cause immediate reads from stale/empty local nodes.
+  defer: false
+})

package/orm/Query.js

@@ -1,8 +1,9 @@
 import { raw } from '@nx-js/observer-util'
-import { get as _get, set as _set, del as _del } from './dataTree.js'
+import { get as _get, set as _set, del as _del, getRaw } from './dataTree.js'
 import getSignal from './getSignal.js'
 import { getConnection, fetchOnly } from './connection.js'
 import { emitModelChange, isModelEventsEnabled } from './Compat/modelEvents.js'
+import { isCompatEnv } from './compatEnv.js'
 import { docSubscriptions } from './Doc.js'
 import FinalizationRegistry from '../utils/MockFinalizationRegistry.js'
 import SubscriptionState from './SubscriptionState.js'
@@ -76,6 +77,7 @@ export class Query {
 
   _initData () {
     { // reference the fetched docs
+      maybeMaterializeQueryDocsToCollection(this.collectionName, this.shareQuery.results)
       const docs = this.shareQuery.results.map(doc => {
         const idFields = getIdFieldsForSegments([this.collectionName, doc.id])
         if (isPlainObject(doc.data)) injectIdFields(doc.data, idFields, doc.id)
@@ -98,6 +100,7 @@ export class Query {
     }
 
     this.shareQuery.on('insert', (shareDocs, index) => {
+      maybeMaterializeQueryDocsToCollection(this.collectionName, shareDocs)
       const newDocs = shareDocs.map(doc => {
         const idFields = getIdFieldsForSegments([this.collectionName, doc.id])
         if (isPlainObject(doc.data)) injectIdFields(doc.data, idFields, doc.id)
@@ -271,6 +274,18 @@ export class QuerySubscriptions {
 
 export const querySubscriptions = new QuerySubscriptions()
 
+function maybeMaterializeQueryDocsToCollection (collectionName, shareDocs) {
+  if (!isCompatEnv()) return
+  for (const doc of shareDocs) {
+    if (!doc?.id || doc.data == null) continue
+    const existing = getRaw([collectionName, doc.id])
+    if (existing != null) continue
+    const idFields = getIdFieldsForSegments([collectionName, doc.id])
+    if (isPlainObject(doc.data)) injectIdFields(doc.data, idFields, doc.id)
+    _set([collectionName, doc.id], raw(doc.data))
+  }
+}
+
 export function hashQuery (collectionName, params) {
   // TODO: probably makes sense to use fast-stable-json-stringify for this because of the params
   return JSON.stringify({ query: [collectionName, params] })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.4.0-alpha.20",
+  "version": "0.4.0-alpha.22",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "index.js",
@@ -81,5 +81,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "ea7674a973e839840747fab51e70695013b2935e"
+  "gitHead": "c66a5b5dbfe9d2ff95f9531c31b0794d2b647ce7"
 }