teamplay 0.3.1 → 0.3.4

package/connect/test.js

@@ -7,6 +7,18 @@ 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/orm/Aggregation.js

@@ -50,12 +50,11 @@ export function isAggregationSignal ($signal) {
 
 // example: ['$aggregations', '{"active":true}', 42]
 //          AND only if it also has either '_id' or 'id' field inside
-export function getAggregationDocId (segments) {
+export function getAggregationDocId (segments, method = getRaw) {
   if (!(segments.length >= 3)) return
   if (!(segments[0] === AGGREGATIONS)) return
   if (!(typeof segments[2] === 'number')) return
-  const doc = getRaw(segments)
-  const docId = doc?._id || doc?.id
+  const docId = method([...segments.slice(0, 3), '_id']) || method([...segments.slice(0, 3), 'id'])
   return docId
 }
 

package/orm/Signal.js

@@ -16,7 +16,7 @@ import { get as _get, set as _set, del as _del, setPublicDoc as _setPublicDoc, g
 import getSignal, { rawSignal } from './getSignal.js'
 import { docSubscriptions } from './Doc.js'
 import { IS_QUERY, HASH, QUERIES } from './Query.js'
-import { AGGREGATIONS, getAggregationCollectionName, getAggregationDocId } from './Aggregation.js'
+import { AGGREGATIONS, IS_AGGREGATION, getAggregationCollectionName, getAggregationDocId } from './Aggregation.js'
 import { ROOT_FUNCTION, getRoot } from './Root.js'
 import { publicOnly } from './connection.js'
 
@@ -24,7 +24,7 @@ export const SEGMENTS = Symbol('path segments targeting the particular node in t
 export const ARRAY_METHOD = Symbol('run array method on the signal')
 export const GET = Symbol('get the value of the signal - either observed or raw')
 export const GETTERS = Symbol('get the list of this signal\'s getters')
-const DEFAULT_GETTERS = ['path', 'id', 'get', 'peek', 'getId', 'map', 'reduce', 'find']
+const DEFAULT_GETTERS = ['path', 'id', 'get', 'peek', 'getId', 'map', 'reduce', 'find', 'getIds']
 
 export default class Signal extends Function {
   static [GETTERS] = DEFAULT_GETTERS
@@ -58,6 +58,19 @@ export default class Signal extends Function {
     return this[GET](_get)
   }
 
+  getIds () {
+    if (arguments.length > 0) throw Error('Signal.getIds() does not accept any arguments')
+    if (this[IS_QUERY]) {
+      return _get([QUERIES, this[HASH], 'ids'])
+    } else if (this[IS_AGGREGATION]) {
+      const docs = _get(this[SEGMENTS])
+      if (!Array.isArray(docs)) return []
+      return docs.map(doc => doc._id || doc.id)
+    } else {
+      throw Error('Signal.getIds() can only be used on query signals or aggregation signals')
+    }
+  }
+
   peek () {
     if (arguments.length > 0) throw Error('Signal.peek() does not accept any arguments')
     return this[GET](getRaw)
@@ -66,6 +79,11 @@ export default class Signal extends Function {
   getId () {
     if (this[SEGMENTS].length === 0) throw Error('Can\'t get the id of the root signal')
     if (this[SEGMENTS].length === 1) throw Error('Can\'t get the id of a collection')
+    if (this[SEGMENTS][0] === AGGREGATIONS && this[SEGMENTS].length === 3) {
+      // use get() instead of the default getRaw() to trigger observability on changes
+      // This is required since within aggregation array results docs can change their position
+      return getAggregationDocId(this[SEGMENTS], _get)
+    }
     return this[SEGMENTS][this[SEGMENTS].length - 1]
   }
 
@@ -212,7 +230,7 @@ export const regularBindings = {
   }
 }
 
-const QUERY_METHODS = ['map', 'reduce', 'find', 'get']
+const QUERY_METHODS = ['map', 'reduce', 'find', 'get', 'getIds']
 
 // dot syntax always returns a child signal even if such method or property exists.
 // The method is only called when the signal is explicitly called as a function,

package/orm/sub.js

@@ -1,4 +1,4 @@
-import { isAggregationHeader, isAggregationFunction } from '@teamplay/utils/aggregation'
+import { isAggregationHeader, isAggregationFunction, isClientAggregationFunction } from '@teamplay/utils/aggregation'
 import Signal, { SEGMENTS, isPublicCollectionSignal, isPublicDocumentSignal } from './Signal.js'
 import { docSubscriptions } from './Doc.js'
 import { querySubscriptions, getQuerySignal } from './Query.js'
@@ -19,8 +19,10 @@ export default function sub ($signal, params) {
   } else if (isPublicCollectionSignal($signal)) {
     if (arguments.length !== 2) throw Error(ERRORS.subQueryArguments(...arguments))
     return query$($signal[SEGMENTS][0], params)
-  } else if (typeof $signal === 'function' && !($signal instanceof Signal)) {
-    return api$($signal, params)
+  } else if (isClientAggregationFunction($signal)) {
+    params = $signal(sanitizeAggregationParams(params))
+    if (Array.isArray(params)) params = { $aggregate: params }
+    return aggregation$($signal.collection, params)
   } else if (isAggregationHeader($signal)) {
     params = {
       $aggregationName: $signal.name,
@@ -29,6 +31,8 @@ export default function sub ($signal, params) {
     return aggregation$($signal.collection, params)
   } else if (isAggregationFunction($signal)) {
     throw Error(ERRORS.gotAggregationFunction($signal))
+  } else if (typeof $signal === 'function' && !($signal instanceof Signal)) {
+    return api$($signal, params)
   } else {
     throw Error('Invalid args passed for sub()')
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.3.1",
+  "version": "0.3.4",
   "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.1",
-    "@teamplay/cache": "^0.3.1",
-    "@teamplay/channel": "^0.3.1",
-    "@teamplay/debug": "^0.3.1",
-    "@teamplay/schema": "^0.3.1",
-    "@teamplay/utils": "^0.3.1",
+    "@teamplay/backend": "^0.3.4",
+    "@teamplay/cache": "^0.3.4",
+    "@teamplay/channel": "^0.3.4",
+    "@teamplay/debug": "^0.3.4",
+    "@teamplay/schema": "^0.3.4",
+    "@teamplay/utils": "^0.3.4",
     "diff-match-patch": "^1.0.5",
     "events": "^3.3.0",
     "json0-ot-diff": "^1.1.2",
@@ -63,5 +63,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "cc2715ccbfdf6213abc607aceaae76c331a7738d"
+  "gitHead": "108c0d37aea7cbe37686fafaf129e941937d7707"
 }