teamplay 0.4.0-alpha.54 → 0.4.0-alpha.56

package/orm/Query.js

@@ -230,7 +230,7 @@ export class QuerySubscriptions {
 
   subscribe ($query) {
     const collectionName = $query[COLLECTION_NAME]
-    const params = JSON.parse(JSON.stringify($query[PARAMS]))
+    const params = cloneQueryParams($query[PARAMS])
     const hash = $query[HASH]
     this.cancelDestroy(hash)
     let count = this.subCount.get(hash) || 0
@@ -395,6 +395,7 @@ function maybeMaterializeQueryDocsToCollection (collectionName, shareDocs) {
 }
 
 export function hashQuery (collectionName, params) {
+  params = normalizeQueryParamsForHash(params)
   // TODO: probably makes sense to use fast-stable-json-stringify for this because of the params
   return JSON.stringify({ query: [collectionName, params] })
 }
@@ -409,7 +410,7 @@ export function parseQueryHash (hash) {
 }
 
 export function getQuerySignal (collectionName, params, options) {
-  params = JSON.parse(JSON.stringify(params))
+  params = cloneQueryParams(params)
   const hash = hashQuery(collectionName, params)
 
   const $query = getSignal(undefined, [collectionName], {
@@ -433,6 +434,31 @@ const ERRORS = {
 
 function ignoreDestroyError () {}
 
+function cloneQueryParams (params) {
+  if (!isCompatEnv()) return JSON.parse(JSON.stringify(params))
+  return cloneQueryParamsCompat(params)
+}
+
+function normalizeQueryParamsForHash (params) {
+  if (!isCompatEnv()) return params
+  return cloneQueryParamsCompat(params)
+}
+
+// Racer compat: keep query keys with undefined values by normalizing them to null
+// instead of dropping them via JSON serialization.
+function cloneQueryParamsCompat (value) {
+  if (value === undefined) return null
+  if (value == null || typeof value !== 'object') return value
+  if (Array.isArray(value)) return value.map(item => cloneQueryParamsCompat(item))
+  const object = {}
+  for (const key in value) {
+    if (Object.prototype.hasOwnProperty.call(value, key)) {
+      object[key] = cloneQueryParamsCompat(value[key])
+    }
+  }
+  return object
+}
+
 function createPendingDestroyEntry () {
   let resolvePending
   let rejectPending

package/orm/dataTree.js

@@ -155,7 +155,16 @@ export async function setPublicDoc (segments, value, deleteValue = false) {
   const idFields = getIdFieldsForSegments([collection, docId])
   if (segments.length >= 3 && idFields.includes(segments[segments.length - 1])) return
   const doc = getConnection().get(collection, docId)
-  const docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true })
+  let docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true })
+  if (!docState.exists && segments.length > 2) {
+    docState = await resolvePublicDocStateWithCompatFetchFallback({
+      collection,
+      docId,
+      doc,
+      idFields,
+      hydrateCompatDocData: true
+    })
+  }
   if (!docState.exists && deleteValue) throw Error(ERRORS.deleteNonExistentDoc(segments))
   // make sure that the value is not observable to not trigger extra reads. And clone it
   value = raw(value)
@@ -235,7 +244,16 @@ export async function setPublicDocReplace (segments, value) {
   const idFields = getIdFieldsForSegments([collection, docId])
   if (segments.length >= 3 && idFields.includes(segments[segments.length - 1])) return
   const doc = getConnection().get(collection, docId)
-  const docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true })
+  let docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true })
+  if (!docState.exists && segments.length > 2) {
+    docState = await resolvePublicDocStateWithCompatFetchFallback({
+      collection,
+      docId,
+      doc,
+      idFields,
+      hydrateCompatDocData: true
+    })
+  }
   // make sure that the value is not observable to not trigger extra reads. And clone it
   value = raw(value)
   if (value != null) {
@@ -344,6 +362,24 @@ function resolvePublicDocState ({
   return { exists: true, snapshot: localSnapshot, source: 'local' }
 }
 
+async function resolvePublicDocStateWithCompatFetchFallback ({
+  collection,
+  docId,
+  doc,
+  idFields,
+  hydrateCompatDocData = false
+}) {
+  let docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData })
+  if (docState.exists || !isCompatEnv()) return docState
+
+  await new Promise((resolve, reject) => {
+    doc.fetch(err => err ? reject(err) : resolve())
+  })
+
+  docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData })
+  return docState
+}
+
 function ensureLocalDocSyncedWithShareDoc ({
   collection,
   docId,
@@ -463,7 +499,13 @@ export async function incrementPublic (segments, byNumber) {
   if (!(collection && docId)) throw Error(ERRORS.publicDoc(segments))
   const doc = getConnection().get(collection, docId)
   const idFields = getIdFieldsForSegments([collection, docId])
-  const docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true })
+  const docState = await resolvePublicDocStateWithCompatFetchFallback({
+    collection,
+    docId,
+    doc,
+    idFields,
+    hydrateCompatDocData: true
+  })
   if (!docState.exists) throw Error(ERRORS.nonExistingDoc(segments))
   const relativePath = segments.slice(2)
   const op = [{ p: relativePath, na: byNumber }]
@@ -490,7 +532,13 @@ export async function arrayInsertPublic (segments, index, values) {
   if (!(collection && docId)) throw Error(ERRORS.publicDoc(segments))
   const doc = getConnection().get(collection, docId)
   const idFields = getIdFieldsForSegments([collection, docId])
-  const docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true })
+  const docState = await resolvePublicDocStateWithCompatFetchFallback({
+    collection,
+    docId,
+    doc,
+    idFields,
+    hydrateCompatDocData: true
+  })
   if (!docState.exists) throw Error(ERRORS.nonExistingDoc(segments))
   let current = getRaw(segments)
   if (current == null) {
@@ -539,7 +587,13 @@ export async function arrayRemovePublic (segments, index, howMany = 1) {
   if (!(collection && docId)) throw Error(ERRORS.publicDoc(segments))
   const doc = getConnection().get(collection, docId)
   const idFields = getIdFieldsForSegments([collection, docId])
-  const docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true })
+  const docState = await resolvePublicDocStateWithCompatFetchFallback({
+    collection,
+    docId,
+    doc,
+    idFields,
+    hydrateCompatDocData: true
+  })
   if (!docState.exists) throw Error(ERRORS.nonExistingDoc(segments))
   const arr = getRaw(segments) || []
   const removed = arr.slice(index, index + howMany)
@@ -557,7 +611,13 @@ export async function arrayMovePublic (segments, from, to, howMany = 1) {
   if (!(collection && docId)) throw Error(ERRORS.publicDoc(segments))
   const doc = getConnection().get(collection, docId)
   const idFields = getIdFieldsForSegments([collection, docId])
-  const docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true })
+  const docState = await resolvePublicDocStateWithCompatFetchFallback({
+    collection,
+    docId,
+    doc,
+    idFields,
+    hydrateCompatDocData: true
+  })
   if (!docState.exists) throw Error(ERRORS.nonExistingDoc(segments))
   const arr = getRaw(segments) || []
   const len = arr.length
@@ -623,7 +683,13 @@ export async function stringInsertPublic (segments, index, text) {
   if (!(collection && docId)) throw Error(ERRORS.publicDoc(segments))
   const doc = getConnection().get(collection, docId)
   const idFields = getIdFieldsForSegments([collection, docId])
-  const docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true })
+  const docState = await resolvePublicDocStateWithCompatFetchFallback({
+    collection,
+    docId,
+    doc,
+    idFields,
+    hydrateCompatDocData: true
+  })
   if (!docState.exists) throw Error(ERRORS.nonExistingDoc(segments))
   const relativePath = segments.slice(2)
   const previous = getRaw(segments)
@@ -646,7 +712,13 @@ export async function stringRemovePublic (segments, index, howMany) {
   if (!(collection && docId)) throw Error(ERRORS.publicDoc(segments))
   const doc = getConnection().get(collection, docId)
   const idFields = getIdFieldsForSegments([collection, docId])
-  const docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true })
+  const docState = await resolvePublicDocStateWithCompatFetchFallback({
+    collection,
+    docId,
+    doc,
+    idFields,
+    hydrateCompatDocData: true
+  })
   if (!docState.exists) throw Error(ERRORS.nonExistingDoc(segments))
   const relativePath = segments.slice(2)
   const previous = getRaw(segments)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.4.0-alpha.54",
+  "version": "0.4.0-alpha.56",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "index.js",
@@ -83,5 +83,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "4e0872cc4f98406c9561835f8032590c677492e5"
+  "gitHead": "50b36e96bbd184b0608a654759c2e8f7340f7559"
 }