teamplay 0.5.0-alpha.11 → 0.5.0-alpha.12

package/dist/orm/Aggregation.d.ts

@@ -3,15 +3,17 @@ import type {
   QuerySubscriptions,
   QuerySignalOptions
 } from './Query.js'
+import type { PathSegment } from './types/path.js'
 
 export const IS_AGGREGATION: unique symbol
 export const AGGREGATIONS: '$aggregations'
 export const aggregationSubscriptions: QuerySubscriptions
 export function getAggregationSignal (collectionName: string, params: unknown, options?: QuerySignalOptions): Signal
 export function isAggregationSignal ($signal: unknown): boolean | undefined
+export function getAggregationRowId (row: unknown, collectionName?: string): string | undefined
 export function getAggregationDocId (
-  segments: readonly unknown[],
+  segments: readonly PathSegment[],
   rootId?: string,
-  method?: (path: unknown[]) => unknown
+  method?: (path: PathSegment[]) => unknown
 ): string | undefined
-export function getAggregationCollectionName (segments: readonly unknown[]): string | undefined
+export function getAggregationCollectionName (segments: readonly PathSegment[]): string | undefined

package/dist/orm/Aggregation.js

@@ -8,6 +8,7 @@ import { delPrivateData, getPrivateData, setPrivateData } from './privateData.js
 import { setSignalRuntimeDescriptor } from "./signalRuntimeDescriptor.js";
 export const IS_AGGREGATION = Symbol('is aggregation signal');
 export const AGGREGATIONS = '$aggregations';
+const DEFAULT_AGGREGATION_ID_FIELDS = ['_id', 'id'];
 class Aggregation extends Query {
     _initData() {
         this._syncAllRootsData();
@@ -39,17 +40,27 @@ aggregationSubscriptions.runtimeKind = 'aggregation';
 function injectAggregationIds(extra, collectionName) {
     if (!Array.isArray(extra))
         return;
-    const idFields = getIdFieldsForSegments([collectionName, '']);
+    const idFields = getCollectionIdFields(collectionName);
     for (const doc of extra) {
         if (!isPlainObject(doc))
             continue;
-        const docId = doc._id ?? doc.id;
+        const docId = getAggregationRowId(doc, collectionName);
         if (docId == null)
             continue;
-        if (idFields.includes('_id') && doc._id !== docId)
-            doc._id = docId;
-        if (idFields.includes('id') && doc.id !== docId)
-            doc.id = docId;
+        for (const field of idFields) {
+            if (doc[field] !== docId)
+                doc[field] = docId;
+        }
+    }
+}
+export function getAggregationRowId(row, collectionName) {
+    if (!isPlainObject(row))
+        return;
+    const idFields = getAggregationIdFields(collectionName);
+    for (const field of idFields) {
+        const value = row[field];
+        if (typeof value === 'string')
+            return value;
     }
 }
 export function getAggregationSignal(collectionName, params, options) {
@@ -80,7 +91,7 @@ export function isAggregationSignal($signal) {
     return true;
 }
 // example: ['$aggregations', '{"active":true}', 42]
-//          AND only if it also has either '_id' or 'id' field inside
+//          AND only if the aggregation row carries a source document id field
 export function getAggregationDocId(segments, rootId, method) {
     if (!(segments.length >= 3))
         return;
@@ -88,15 +99,16 @@ export function getAggregationDocId(segments, rootId, method) {
         return;
     if (!(typeof segments[2] === 'number'))
         return;
+    const collectionName = getAggregationCollectionName(segments);
+    const idFields = getAggregationIdFields(collectionName);
     if (typeof method !== 'function') {
         method = path => rootId == null ? getRaw(path) : getPrivateData(rootId, path);
     }
-    const underscoreId = method([...segments.slice(0, 3), '_id']);
-    if (typeof underscoreId === 'string')
-        return underscoreId;
-    const id = method([...segments.slice(0, 3), 'id']);
-    if (typeof id === 'string')
-        return id;
+    for (const field of idFields) {
+        const id = method([...segments.slice(0, 3), field]);
+        if (typeof id === 'string')
+            return id;
+    }
 }
 export function getAggregationCollectionName(segments) {
     if (!(segments.length >= 2))
@@ -117,3 +129,15 @@ function parseAggregationSignalOptions(options) {
     const { root, ...signalOptions } = options;
     return { root, signalOptions };
 }
+function getAggregationIdFields(collectionName) {
+    const idFields = getCollectionIdFields(collectionName);
+    return uniq(idFields.concat(DEFAULT_AGGREGATION_ID_FIELDS));
+}
+function getCollectionIdFields(collectionName) {
+    return collectionName
+        ? getIdFieldsForSegments([collectionName, ''])
+        : [];
+}
+function uniq(values) {
+    return Array.from(new Set(values));
+}

package/dist/orm/Compat/SignalCompat.js

@@ -5,7 +5,7 @@ import { getRoot, ROOT, ROOT_ID, getRootSignal, GLOBAL_ROOT_ID, unregisterRootFi
 import { isPrivateMutationForbidden } from "../connection.js";
 import { docSubscriptions } from '../Doc.js';
 import { IS_QUERY, getQuerySignal, querySubscriptions } from '../Query.js';
-import { IS_AGGREGATION, aggregationSubscriptions, getAggregationSignal } from '../Aggregation.js';
+import { AGGREGATIONS, IS_AGGREGATION, aggregationSubscriptions, getAggregationSignal } from '../Aggregation.js';
 import { getIdFieldsForSegments, isIdFieldPath, isPublicDocPath, normalizeIdFields, isPlainObject } from "../idFields.js";
 import { incrementPublic as _incrementPublic, arrayPushPublic as _arrayPushPublic, arrayUnshiftPublic as _arrayUnshiftPublic, arrayInsertPublic as _arrayInsertPublic, arrayPopPublic as _arrayPopPublic, arrayShiftPublic as _arrayShiftPublic, arrayRemovePublic as _arrayRemovePublic, arrayMovePublic as _arrayMovePublic, setPublicDocReplace as _setPublicDocReplace, stringInsertPublic as _stringInsertPublic, stringRemovePublic as _stringRemovePublic } from '../dataTree.js';
 import { on as onCustomEvent, removeListener as removeCustomEventListener } from './eventsCompat.js';
@@ -28,6 +28,8 @@ class SignalCompat extends Signal {
         return super.path();
     }
     getId() {
+        if (isAggregationValuePath(this[SEGMENTS]))
+            return super.getId();
         const $target = resolveRefSignal(this);
         if ($target !== this)
             return $target.getId();
@@ -612,6 +614,11 @@ function readRefValue($signal) {
         throw err;
     }
 }
+function isAggregationValuePath(segments) {
+    return Array.isArray(segments) &&
+        segments.length >= 3 &&
+        segments[0] === AGGREGATIONS;
+}
 function resolveRefSignal($signal) {
     const directTarget = resolveRefSignalSafe($signal);
     if (directTarget && directTarget !== $signal)

package/dist/orm/signalMetadata.js

@@ -36,14 +36,14 @@ export function getSignalId($signal, rootId, readPath) {
         throw Error('Can\'t get the id of a collection');
     if (isDirectPublicDocumentSegments(segments))
         return getLeafId(segments);
+    if (segments[0] === AGGREGATIONS && segments.length === 3) {
+        return getAggregationDocId(segments, rootId, readPath);
+    }
     if (readPath) {
         const valueId = getValueIdFromPaths(segments, readPath);
         if (valueId.found)
             return valueId.id;
     }
-    if (segments[0] === AGGREGATIONS && segments.length === 3) {
-        return getAggregationDocId(segments, rootId);
-    }
     return getLeafId(segments);
 }
 export function getSignalCollection($signal) {

package/dist/orm/signalReads.js

@@ -1,4 +1,4 @@
-import { AGGREGATIONS, IS_AGGREGATION } from './Aggregation.js';
+import { AGGREGATIONS, IS_AGGREGATION, getAggregationCollectionName, getAggregationRowId } from './Aggregation.js';
 import { HASH, IS_QUERY, QUERIES } from './Query.js';
 import { SEGMENTS } from "./signalSymbols.js";
 export function readSignalValue($signal, context, method, rawMethod) {
@@ -41,7 +41,8 @@ export function getSignalIds($signal, context) {
         const docs = context.readPrivateData(rootId, $signal[SEGMENTS], false);
         if (!Array.isArray(docs))
             return [];
-        return docs.map(getAggregationRowId).filter(isString);
+        const collectionName = getAggregationCollectionName($signal[SEGMENTS]);
+        return docs.map(doc => getAggregationRowId(doc, collectionName)).filter(isString);
     }
     context.error('Signal.getIds() can only be used on query signals or aggregation signals. ' +
         'Received a regular signal: ' + JSON.stringify($signal[SEGMENTS]));
@@ -55,13 +56,6 @@ export function isAggregationValueSignal($signal) {
     const segments = $signal[SEGMENTS];
     return segments.length >= 2 && segments[0] === AGGREGATIONS;
 }
-function getAggregationRowId(doc) {
-    const row = doc;
-    if (typeof row?._id === 'string')
-        return row._id;
-    if (typeof row?.id === 'string')
-        return row.id;
-}
 function isString(value) {
     return typeof value === 'string';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.5.0-alpha.11",
+  "version": "0.5.0-alpha.12",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "./dist/index.js",
@@ -134,5 +134,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "2c23ad4108aad3dc7ac4947a987e395e933761cc"
+  "gitHead": "13e07eda7f31ee883390b3ad04bdc6ecfbcb7f4c"
 }