teamplay 0.5.0-alpha.19 → 0.5.0-alpha.20

package/dist/orm/Aggregation.js

@@ -1,7 +1,7 @@
 import { raw } from '@nx-js/observer-util';
 import { getRaw } from './dataTree.js';
 import getSignal from "./getSignal.js";
-import { QuerySubscriptions, hashQuery, Query, HASH, PARAMS, COLLECTION_NAME, parseQueryHash } from './Query.js';
+import { QuerySubscriptions, hashQuery, Query, cloneQueryParams, HASH, PARAMS, COLLECTION_NAME, parseQueryHash } from './Query.js';
 import Signal, { SEGMENTS } from "./Signal.js";
 import { getIdFieldsForSegments, isPlainObject } from "./idFields.js";
 import { delPrivateData, getPrivateData, setPrivateData } from './privateData.js';
@@ -64,7 +64,7 @@ export function getAggregationRowId(row, collectionName) {
     }
 }
 export function getAggregationSignal(collectionName, params, options) {
-    params = JSON.parse(JSON.stringify(params));
+    params = cloneQueryParams(collectionName, params);
     const transportHash = hashQuery(collectionName, params);
     const { root, signalOptions } = parseAggregationSignalOptions(options);
     const $aggregation = getSignal(root, [AGGREGATIONS, transportHash], signalOptions);

package/dist/orm/Query.js

@@ -465,7 +465,7 @@ export class QuerySubscriptions {
     }
     subscribe($query, { intent = 'subscribe' } = {}) {
         const collectionName = $query[COLLECTION_NAME];
-        const params = cloneQueryParams($query[PARAMS]);
+        const params = cloneQueryParams(collectionName, $query[PARAMS]);
         const transportHash = $query[HASH];
         const rootId = getOwningRootId($query);
         const ownerKey = getQueryOwnerKey(rootId, transportHash);
@@ -920,7 +920,7 @@ export function materializeQueryDataDocsToCollection(collectionName, docs) {
     }
 }
 export function hashQuery(collectionName, params) {
-    params = normalizeQueryParamsForHash(params);
+    params = normalizeQueryParamsForHash(collectionName, params);
     // TODO: probably makes sense to use fast-stable-json-stringify for this because of the params
     return JSON.stringify({ query: [collectionName, params] });
 }
@@ -934,7 +934,7 @@ export function parseQueryHash(hash) {
     }
 }
 export function getQuerySignal(collectionName, params, options) {
-    params = cloneQueryParams(params);
+    params = cloneQueryParams(collectionName, params);
     const transportHash = hashQuery(collectionName, params);
     const { root, signalOptions } = parseQuerySignalOptions(options);
     const signalHash = getScopedSignalHash(root?.[ROOT_ID] ?? signalOptions.rootId, transportHash, 'querySignal');
@@ -987,10 +987,9 @@ function getOwningRootId($query) {
 function getQueryOwnerKey(rootId, transportHash) {
     return getScopedSignalHash(rootId, transportHash, 'queryOwner');
 }
-function cloneQueryParams(params) {
-    if (!isCompatEnv())
-        return JSON.parse(JSON.stringify(params));
-    return cloneQueryParamsCompat(params);
+export function cloneQueryParams(collectionName, params) {
+    warnIfCompatQueryParamsHaveUndefinedFields(collectionName, params);
+    return JSON.parse(JSON.stringify(params));
 }
 function parseQuerySignalOptions(options) {
     if (!options || typeof options !== 'object') {
@@ -1002,27 +1001,55 @@ function parseQuerySignalOptions(options) {
     const { root, ...signalOptions } = options;
     return { root, signalOptions };
 }
-function normalizeQueryParamsForHash(params) {
+function normalizeQueryParamsForHash(collectionName, params) {
+    warnIfCompatQueryParamsHaveUndefinedFields(collectionName, params);
+    return params;
+}
+const warnedUndefinedQueryParamKeys = new Set();
+function warnIfCompatQueryParamsHaveUndefinedFields(collectionName, params) {
     if (!isCompatEnv())
-        return params;
-    return cloneQueryParamsCompat(params);
+        return;
+    const paths = getUndefinedQueryParamFieldPaths(params);
+    if (paths.length === 0)
+        return;
+    const key = `${collectionName || '<unknown>'}:${paths.join(',')}`;
+    if (warnedUndefinedQueryParamKeys.has(key))
+        return;
+    warnedUndefinedQueryParamKeys.add(key);
+    console.warn('[teamplay] Compat query params contain object fields with undefined values. ' +
+        'TeamPlay now clones query params like non-compat mode, so these fields are dropped ' +
+        'instead of being converted to null. Normalize query params explicitly.', {
+        collectionName,
+        paths
+    }, new Error().stack);
+}
+function getUndefinedQueryParamFieldPaths(value) {
+    const paths = [];
+    collectUndefinedQueryParamFieldPaths(value, '', paths, new WeakSet());
+    return paths;
 }
-// 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;
+function collectUndefinedQueryParamFieldPaths(value, path, paths, seen) {
     if (value == null || typeof value !== 'object')
-        return value;
-    if (Array.isArray(value))
-        return value.map(item => cloneQueryParamsCompat(item));
-    const object = {};
+        return;
+    if (seen.has(value))
+        return;
+    seen.add(value);
+    if (Array.isArray(value)) {
+        for (let i = 0; i < value.length; i++) {
+            collectUndefinedQueryParamFieldPaths(value[i], `${path}[${i}]`, paths, seen);
+        }
+        return;
+    }
     for (const key in value) {
-        if (Object.prototype.hasOwnProperty.call(value, key)) {
-            object[key] = cloneQueryParamsCompat(value[key]);
+        if (!Object.prototype.hasOwnProperty.call(value, key))
+            continue;
+        const childPath = path ? `${path}.${key}` : key;
+        if (value[key] === undefined) {
+            paths.push(childPath);
+            continue;
         }
+        collectUndefinedQueryParamFieldPaths(value[key], childPath, paths, seen);
     }
-    return object;
 }
 function createPendingDestroyEntry() {
     let resolvePending;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.5.0-alpha.19",
+  "version": "0.5.0-alpha.20",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "./dist/index.js",
@@ -134,5 +134,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "4bafa99265d8aed36e952d89d8d0ed0082748ad5"
+  "gitHead": "f1a50d980e3748d58b85e565c0dc40291a4806f0"
 }