teamplay 0.3.6 → 0.3.8

package/connect/test.js

@@ -1,24 +1,12 @@
 // mock of client connection to sharedb to use inside tests.
 // This just creates a sharedb server with in-memory database
 // and creates a server connection to it.
+import ShareDbMingo from '@startupjs/sharedb-mingo-memory'
 import ShareBackend from 'sharedb'
-import ShareDbMingo from 'sharedb-mingo-memory'
 import { connection, setConnection } from '../orm/connection.js'
 
 export default function connect () {
   if (connection) return
-  patchSharedbMingoAggregations()
   const backend = new ShareBackend({ db: new ShareDbMingo() })
   setConnection(backend.connect())
 }
-
-let patched
-function patchSharedbMingoAggregations () {
-  if (patched) return
-  patched = true
-  const oldCanPollDoc = ShareDbMingo.prototype.canPollDoc
-  ShareDbMingo.prototype.canPollDoc = function (collection, query) {
-    if (query.hasOwnProperty('$aggregate')) return false // eslint-disable-line no-prototype-builtins
-    return oldCanPollDoc.call(this, collection, query)
-  }
-}

package/index.js

@@ -17,6 +17,7 @@ export { default as sub } from './orm/sub.js'
 export { default as useSub, setUseDeferredValue as __setUseDeferredValue } from './react/useSub.js'
 export { default as observer } from './react/observer.js'
 export { connection, setConnection, getConnection, fetchOnly, setFetchOnly, publicOnly, setPublicOnly } from './orm/connection.js'
+export { useId, useNow, useScheduleUpdate, useTriggerUpdate } from './react/helpers.js'
 export { GUID_PATTERN, hasMany, hasOne, hasManyFlags, belongsTo, pickFormFields } from '@teamplay/schema'
 export { aggregation, aggregationHeader as __aggregationHeader } from '@teamplay/utils/aggregation'
 export { accessControl } from '@teamplay/utils/accessControl'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "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.6",
-    "@teamplay/cache": "^0.3.6",
-    "@teamplay/channel": "^0.3.6",
-    "@teamplay/debug": "^0.3.6",
-    "@teamplay/schema": "^0.3.6",
-    "@teamplay/utils": "^0.3.6",
+    "@teamplay/backend": "^0.3.8",
+    "@teamplay/cache": "^0.3.8",
+    "@teamplay/channel": "^0.3.8",
+    "@teamplay/debug": "^0.3.8",
+    "@teamplay/schema": "^0.3.8",
+    "@teamplay/utils": "^0.3.8",
     "diff-match-patch": "^1.0.5",
     "events": "^3.3.0",
     "json0-ot-diff": "^1.1.2",
@@ -37,19 +37,19 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
+    "@startupjs/sharedb-mingo-memory": "^4.0.0-1",
     "@testing-library/react": "^15.0.7",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "sharedb-mingo-memory": "^3.0.1"
+    "react-dom": "^18.3.1"
   },
   "peerDependencies": {
-    "react": "*",
-    "sharedb-mingo-memory": "*"
+    "@startupjs/sharedb-mingo-memory": "*",
+    "react": "*"
   },
   "peerDependenciesMeta": {
-    "sharedb-mingo-memory": {
+    "@startupjs/sharedb-mingo-memory": {
       "optional": true
     }
   },
@@ -63,5 +63,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "ea4cc604f47a48c67579af40eb1e719091bc2bcb"
+  "gitHead": "627be4811f622fe0202480b0c6f1bd2fead83e19"
 }

package/react/helpers.js

@@ -22,6 +22,12 @@ export function pipeComponentMeta (SourceComponent, TargetComponent, suffix = ''
   return TargetComponent
 }
 
+export function useNow () {
+  const context = useContext(ComponentMetaContext)
+  if (!context) throw Error(ERRORS.useNow)
+  return context.createdAt
+}
+
 export function useId () {
   const context = useContext(ComponentMetaContext)
   if (!context) throw Error(ERRORS.useId)
@@ -63,5 +69,9 @@ const ERRORS = {
   useId: `
     useId() can only be used inside a component wrapped with observer().
     You have probably forgot to wrap your component with observer().
+  `,
+  useNow: `
+    useNow() can only be used inside a component wrapped with observer().
+    You have probably forgot to wrap your component with observer().
   `
 }

package/utils/MockFinalizationRegistry.js

@@ -1,17 +1,10 @@
-export const REGISTRY_FINALIZE_AFTER = 10_000
 export const REGISTRY_SWEEP_INTERVAL = 10_000
+const PERMANENT = false
 
-// This is a mock implementation of FinalizationRegistry that uses setTimeout to
-// schedule the sweep of outdated objects.
-// It is used in environments where FinalizationRegistry is not available.
-// For now we permanently keep the values in the registry until they are
-// manually unregistered since we don't have a way to know when the object is
-// no longer needed. In the future we might add the control logic to properly
-// invalidate the objects.
-export let PERMANENT = true
-export function setPermanent (permanent) { PERMANENT = permanent }
-
-export class TimerBasedFinalizationRegistry {
+// This is a mock implementation of FinalizationRegistry which doesn't actually
+// finalize anything. It's used in environments where FinalizationRegistry is not
+// available and it can not be simulated using WeakRef (e.g. React Native <0.75 or Old Architecture).
+export class PermanentFinalizationRegistry {
   registrations = new Map()
   sweepTimeout
 
@@ -25,7 +18,31 @@ export class TimerBasedFinalizationRegistry {
       value,
       registeredAt: Date.now()
     })
-    if (!PERMANENT) this.scheduleSweep()
+  }
+
+  unregister (token) {
+    this.registrations.delete(token)
+  }
+}
+
+// This is a mock implementation of FinalizationRegistry which uses WeakRef to
+// track the target objects. It's used in environments where FinalizationRegistry
+// is not available but WeakRef is (e.g. React Native >=0.75 on New Architecture).
+export class WeakRefBasedFinalizationRegistry {
+  registrations = new Map()
+  sweepTimeout
+
+  constructor (finalize) {
+    this.finalize = finalize
+  }
+
+  // Token is actually required with this impl
+  register (target, value, token) {
+    this.registrations.set(token, {
+      targetRef: new WeakRef(target),
+      value
+    })
+    this.scheduleSweep()
   }
 
   unregister (token) {
@@ -33,34 +50,37 @@ export class TimerBasedFinalizationRegistry {
   }
 
   // Bound so it can be used directly as setTimeout callback.
-  sweep = (maxAge = REGISTRY_FINALIZE_AFTER) => {
-    // cancel timeout so we can force sweep anytime
+  sweep = () => {
     clearTimeout(this.sweepTimeout)
     this.sweepTimeout = undefined
 
-    const now = Date.now()
     this.registrations.forEach((registration, token) => {
-      if (now - registration.registeredAt >= maxAge) {
-        this.finalize(registration.value)
-        this.registrations.delete(token)
-      }
+      if (registration.targetRef.deref() !== undefined) return
+      this.finalize(registration.value)
+      this.registrations.delete(token)
     })
 
-    if (this.registrations.size > 0) {
-      this.scheduleSweep()
-    }
-  }
-
-  // Bound so it can be exported directly as clearTimers test utility.
-  finalizeAllImmediately = () => {
-    this.sweep(0)
+    if (this.registrations.size > 0) this.scheduleSweep()
   }
 
   scheduleSweep () {
-    if (this.sweepTimeout === undefined) {
-      this.sweepTimeout = setTimeout(this.sweep, REGISTRY_SWEEP_INTERVAL)
-    }
+    if (this.sweepTimeout) return
+    this.sweepTimeout = setTimeout(this.sweep, REGISTRY_SWEEP_INTERVAL)
   }
 }
 
-export default (typeof FinalizationRegistry !== 'undefined' ? FinalizationRegistry : TimerBasedFinalizationRegistry)
+let ExportedFinalizationRegistry
+
+if (typeof FinalizationRegistry !== 'undefined') {
+  ExportedFinalizationRegistry = FinalizationRegistry
+} else if (typeof WeakRef !== 'undefined' && !PERMANENT) {
+  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. ' +
+      'Using a mock implementation: PermanentFinalizationRegistry')
+  ExportedFinalizationRegistry = PermanentFinalizationRegistry
+}
+
+export default ExportedFinalizationRegistry

package/utils/MockWeakRef.js

@@ -13,4 +13,13 @@ export function destroyMockWeakRef (weakRef) {
   weakRef.value = undefined
 }
 
-export default (typeof WeakRef !== 'undefined' ? WeakRef : MockWeakRef)
+let ExportedWeakRef
+
+if (typeof WeakRef !== 'undefined') {
+  ExportedWeakRef = WeakRef
+} else {
+  console.warn('WeakRef is not available in this environment. Using a mock implementation: MockWeakRef')
+  ExportedWeakRef = MockWeakRef
+}
+
+export default ExportedWeakRef