teamplay 0.3.3 → 0.3.5

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.slice(0, 3))
-  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

@@ -79,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]
   }
 

package/orm/sub.js

@@ -3,6 +3,7 @@ import Signal, { SEGMENTS, isPublicCollectionSignal, isPublicDocumentSignal } fr
 import { docSubscriptions } from './Doc.js'
 import { querySubscriptions, getQuerySignal } from './Query.js'
 import { aggregationSubscriptions, getAggregationSignal } from './Aggregation.js'
+import isServer from '../utils/isServer.js'
 
 export default function sub ($signal, params) {
   // TODO: temporarily disable support for multiple subscriptions
@@ -20,9 +21,7 @@ export default function sub ($signal, params) {
     if (arguments.length !== 2) throw Error(ERRORS.subQueryArguments(...arguments))
     return query$($signal[SEGMENTS][0], params)
   } else if (isClientAggregationFunction($signal)) {
-    params = $signal(sanitizeAggregationParams(params))
-    if (Array.isArray(params)) params = { $aggregate: params }
-    return aggregation$($signal.collection, params)
+    return getAggregationFromFunction($signal, $signal.collection, params)
   } else if (isAggregationHeader($signal)) {
     params = {
       $aggregationName: $signal.name,
@@ -30,7 +29,15 @@ export default function sub ($signal, params) {
     }
     return aggregation$($signal.collection, params)
   } else if (isAggregationFunction($signal)) {
-    throw Error(ERRORS.gotAggregationFunction($signal))
+    if (isServer) {
+      if (!params?.$collection) throw Error(ERRORS.subServerAggregationCollection($signal, params))
+      params = { ...params }
+      const collection = params.$collection
+      delete params.$collection
+      return getAggregationFromFunction($signal, collection, params)
+    } else {
+      throw Error(ERRORS.gotAggregationFunction($signal))
+    }
   } else if (typeof $signal === 'function' && !($signal instanceof Signal)) {
     return api$($signal, params)
   } else {
@@ -38,6 +45,21 @@ export default function sub ($signal, params) {
   }
 }
 
+function getAggregationFromFunction (fn, collection, params) {
+  params = sanitizeAggregationParams(params) // clones it, so mutation becomes safe
+  let session
+  if (params.$session) {
+    session = params.$session
+    delete params.$session
+  }
+  session ??= {}
+  // should match the context in @teamplay/backend/features/serverAggregate.js
+  const context = { collection, session, isServer }
+  params = fn(params, context)
+  if (Array.isArray(params)) params = { $aggregate: params }
+  return aggregation$(collection, params)
+}
+
 function doc$ ($doc) {
   const promise = docSubscriptions.subscribe($doc)
   if (!promise) return $doc
@@ -104,5 +126,16 @@ const ERRORS = {
 
       Got:
         ${aggregationFn.toString()}
+  `,
+  subServerAggregationCollection: ($signal, params) => `
+    sub($$aggregation, params):
+      Server-side aggregation function must receive the collection name from the params.
+      Make sure you pass the collection name as $collection in the params object
+      when running aggregation from the server code:
+      sub($$aggregation, { $collection: 'collectionName', ...actualParams })
+
+      Got:
+        Aggregation: ${$signal}
+        Params: ${params}
   `
 }

package/package.json

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