teamplay 0.5.0-alpha.27 → 0.5.0-alpha.29

package/dist/orm/Compat/SignalCompat.js

@@ -3,8 +3,8 @@ import arrayDiff from 'arraydiff';
 import { Signal, GETTERS, DEFAULT_GETTERS, SEGMENTS, isPublicCollection, isPublicCollectionSignal, isPublicDocumentSignal } from "../SignalBase.js";
 import { getRoot, ROOT, ROOT_ID, getRootSignal, GLOBAL_ROOT_ID } from "../Root.js";
 import { docSubscriptions } from '../Doc.js';
-import { IS_QUERY, getQuerySignal, querySubscriptions } from '../Query.js';
-import { AGGREGATIONS, IS_AGGREGATION, aggregationSubscriptions, getAggregationSignal } from '../Aggregation.js';
+import { IS_QUERY, querySubscriptions } from '../Query.js';
+import { AGGREGATIONS, IS_AGGREGATION, aggregationSubscriptions } 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';
@@ -49,38 +49,15 @@ class SignalCompat extends Signal {
             throw Error('Signal.getDeepCopy() does not accept any arguments');
         return deepCopy(this.get());
     }
-    query(collection, params, options) {
-        if (arguments.length < 1 || arguments.length > 3)
-            throw Error('Signal.query() expects one to three arguments');
-        if (typeof collection !== 'string')
-            throw Error('Signal.query() expects collection to be a string');
-        const normalized = normalizeQueryParams(collection, params);
-        const root = getRoot(this) || (this[ROOT_ID] ? this : undefined);
-        const scopedOptions = withQueryScopeOptions(options, root);
-        if (isAggregationParams(normalized)) {
-            return getAggregationSignal(collection, normalized, scopedOptions);
-        }
-        return getQuerySignal(collection, normalized, scopedOptions);
-    }
-    subscribe(...items) {
-        if (items.length > 0)
-            return subscribeMany(items, 'subscribe');
-        return subscribeSelf(this);
-    }
-    unsubscribe(...items) {
-        if (items.length > 0)
-            return subscribeMany(items, 'unsubscribe');
-        return unsubscribeSelf(this);
-    }
     fetch(...items) {
         if (items.length > 0)
-            return subscribeMany(items, 'subscribe', 'fetch');
-        return subscribeSelf(this, 'fetch');
+            return subscribeMany(items, 'subscribe', 'fetch', 'fetch');
+        return subscribeSelf(this, 'fetch', 'fetch');
     }
     unfetch(...items) {
         if (items.length > 0)
-            return subscribeMany(items, 'unsubscribe', 'fetch');
-        return unsubscribeSelf(this, 'fetch');
+            return subscribeMany(items, 'unsubscribe', 'fetch', 'unfetch');
+        return unsubscribeSelf(this, 'fetch', 'unfetch');
     }
     getExtra() {
         if (arguments.length > 0)
@@ -1049,53 +1026,18 @@ function deepCopy(value) {
     }
     return racerDeepCopy(rawValue);
 }
-function normalizeQueryParams(collection, params) {
-    if (params == null) {
-        console.warn(`
-      [Signal.query] Query is undefined. Got:
-        ${collection}, ${params}
-      Falling back to {_id: '__NON_EXISTENT__'} query to prevent critical crash.
-      You should prevent situations when the \`query\` is undefined.
-    `);
-        return { _id: '__NON_EXISTENT__' };
-    }
-    if (Array.isArray(params)) {
-        return { _id: { $in: params.slice() } };
-    }
-    if (typeof params === 'string' || typeof params === 'number') {
-        return { _id: params };
-    }
-    if (typeof params !== 'object') {
-        throw Error(`Signal.query() expects params to be an object, array, or id. Got: ${params}`);
-    }
-    return params;
-}
-function isAggregationParams(params) {
-    return Boolean(params?.$aggregate || params?.$aggregationName);
-}
-function withQueryScopeOptions(options, $root) {
-    if (!options || typeof options !== 'object') {
-        if (!$root)
-            return options;
-        return { root: $root };
-    }
-    const nextOptions = { ...options };
-    if (nextOptions.root == null && $root)
-        nextOptions.root = $root;
-    return nextOptions;
-}
-function subscribeMany(items, action, intent = 'subscribe') {
+function subscribeMany(items, action, intent = 'subscribe', methodName = action) {
     const targets = flattenItems(items);
     const promises = [];
     for (const target of targets) {
         if (!target)
             continue;
         if (!(target instanceof Signal)) {
-            throw Error(`Signal.${action}() accepts only Signal instances. Got: ${target}`);
+            throw Error(`Signal.${methodName}() accepts only Signal instances. Got: ${target}`);
         }
         const result = action === 'subscribe'
-            ? subscribeSelf(target, intent)
-            : unsubscribeSelf(target, intent);
+            ? subscribeSelf(target, intent, methodName)
+            : unsubscribeSelf(target, intent, methodName);
         if (result?.then)
             promises.push(result);
     }
@@ -1115,7 +1057,7 @@ function flattenItems(items, result = []) {
     }
     return result;
 }
-function subscribeSelf($signal, intent = 'subscribe') {
+function subscribeSelf($signal, intent = 'subscribe', methodName = 'subscribe') {
     if ($signal[IS_QUERY]) {
         return (async () => {
             await querySubscriptions.subscribe($signal, { intent });
@@ -1131,14 +1073,14 @@ function subscribeSelf($signal, intent = 'subscribe') {
     if (isPublicDocumentSignal($signal))
         return docSubscriptions.subscribe($signal, { intent });
     if (isPublicCollectionSignal($signal)) {
-        throw Error('Signal.subscribe() expects a query signal. Use .query() for collections.');
+        throw Error(`Signal.${methodName}() expects a document or query signal. Use sub($collection, params, { mode: 'fetch' }) for collection fetches.`);
     }
     if ($signal[SEGMENTS].length === 0) {
-        throw Error('Signal.subscribe() cannot be called on the root signal');
+        throw Error(`Signal.${methodName}() cannot be called on the root signal`);
     }
-    throw Error('Signal.subscribe() expects a document or query signal');
+    throw Error(`Signal.${methodName}() expects a document or query signal`);
 }
-function unsubscribeSelf($signal, intent = 'subscribe') {
+function unsubscribeSelf($signal, intent = 'subscribe', methodName = 'unsubscribe') {
     if ($signal[IS_QUERY])
         return querySubscriptions.unsubscribe($signal, { intent });
     if ($signal[IS_AGGREGATION])
@@ -1146,12 +1088,12 @@ function unsubscribeSelf($signal, intent = 'subscribe') {
     if (isPublicDocumentSignal($signal))
         return docSubscriptions.unsubscribe($signal, { intent });
     if (isPublicCollectionSignal($signal)) {
-        throw Error('Signal.unsubscribe() expects a query signal. Use .query() for collections.');
+        throw Error(`Signal.${methodName}() expects a document or query signal`);
     }
     if ($signal[SEGMENTS].length === 0) {
-        throw Error('Signal.unsubscribe() cannot be called on the root signal');
+        throw Error(`Signal.${methodName}() cannot be called on the root signal`);
     }
-    throw Error('Signal.unsubscribe() expects a document or query signal');
+    throw Error(`Signal.${methodName}() expects a document or query signal`);
 }
 // Racer-style deep copy:
 // - Preserves prototypes by instantiating via `new value.constructor()`

package/dist/orm/SignalBase.js

@@ -777,8 +777,8 @@ export const regularBindings = {
         return Reflect.apply(extremelyLateBindings.get, this, arguments);
     }
 };
-const QUERY_METHODS = ['map', 'reduce', 'find', 'get', 'getIds', 'getExtra', 'subscribe', 'unsubscribe', 'fetch', 'unfetch'];
-const AGGREGATION_ALLOWED_METHODS = ['subscribe', 'unsubscribe', 'fetch', 'unfetch', 'ref', 'removeRef', 'refExtra', 'refIds'];
+const QUERY_METHODS = ['map', 'reduce', 'find', 'get', 'getIds', 'getExtra', 'fetch', 'unfetch'];
+const AGGREGATION_ALLOWED_METHODS = ['fetch', 'unfetch', 'ref', 'removeRef', 'refExtra', 'refIds'];
 // 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,
 // in which case we get the original method from the raw (non-proxied) parent signal

package/dist/orm/getSignal.js

@@ -1,12 +1,11 @@
 import Cache from "./Cache.js";
-import Signal, { SEGMENTS, regularBindings, extremelyLateBindings, isPublicCollection, isPrivateCollection } from "./Signal.js";
+import Signal, { regularBindings, extremelyLateBindings, isPublicCollection, isPrivateCollection } from "./Signal.js";
 import { findModel } from "./addModel.js";
 import { LOCAL } from './$.js';
 import { ROOT, ROOT_ID, GLOBAL_ROOT_ID } from "./Root.js";
 import { QUERIES } from './Query.js';
 import { AGGREGATIONS } from './Aggregation.js';
 import { isCompatEnv } from './compatEnv.js';
-import { getConnection } from "./connection.js";
 import { resolveRefSegmentsSafe } from './Compat/refFallback.js';
 import { getSignalIdentityHash } from "./rootScope.js";
 import { isRootContextClosed, registerRootOwnedSignalHash } from "./rootContext.js";
@@ -80,25 +79,7 @@ export default function getSignal($root, segments = [], { useExtremelyLateBindin
     return proxy;
 }
 function getDefaultProxyHandlers({ useExtremelyLateBindings } = {}) {
-    const baseHandlers = (useExtremelyLateBindings ? extremelyLateBindings : regularBindings);
-    if (!isCompatEnv() || baseHandlers !== extremelyLateBindings)
-        return baseHandlers;
-    return {
-        ...baseHandlers,
-        get(signal, key, receiver) {
-            if (key === 'connection' && signal[SEGMENTS].length === 0) {
-                try {
-                    return getConnection();
-                }
-                catch {
-                    return undefined;
-                }
-            }
-            return baseHandlers.get
-                ? baseHandlers.get(signal, key, receiver)
-                : Reflect.get(signal, key, receiver);
-        }
-    };
+    return (useExtremelyLateBindings ? extremelyLateBindings : regularBindings);
 }
 export function getSignalClass(segments, rootId = GLOBAL_ROOT_ID) {
     let Model = findModel(segments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.5.0-alpha.27",
+  "version": "0.5.0-alpha.29",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "./dist/index.js",
@@ -134,5 +134,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "cbdbd79ede32eab577708675ab7a50c205bed50b"
+  "gitHead": "731a77d720afb01918969d9e02cc4eb0c2fa111e"
 }