teamplay 0.5.0-alpha.26 → 0.5.0-alpha.28

package/dist/orm/Compat/SignalCompat.js

@@ -1,10 +1,10 @@
 import { raw, observe, unobserve } from '@nx-js/observer-util';
 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, unregisterRootFinalizer } from "../Root.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';
@@ -16,7 +16,6 @@ import { runInBatch } from '../batchScheduler.js';
 import { runInSilentContext, runInModelEventsSilentContext, isSilentContextActive } from './silentContext.js';
 import universal$ from "../../react/universal$.js";
 import { getRootContext } from "../rootContext.js";
-import disposeRootContext from "../disposeRootContext.js";
 import { arrayInsertPrivateData, arrayMovePrivateData, arrayPopPrivateData, arrayPushPrivateData, arrayRemovePrivateData, arrayShiftPrivateData, arrayUnshiftPrivateData, delPrivateData, setReplacePrivateData, stringInsertPrivateData, stringRemovePrivateData } from '../privateData.js';
 class SignalCompat extends Signal {
     static ID_FIELDS = ['_id', 'id'];
@@ -50,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)
@@ -92,24 +68,6 @@ class SignalCompat extends Signal {
             return this.extra.get();
         return undefined;
     }
-    close(callback) {
-        if (arguments.length > 1)
-            throw Error('Signal.close() expects zero or one argument');
-        if (callback != null && typeof callback !== 'function') {
-            throw Error('Signal.close() expects callback to be a function');
-        }
-        const $root = getRoot(this) || this;
-        const rootId = $root?.[ROOT_ID];
-        unregisterRootFinalizer($root);
-        disposeRootContext(rootId)
-            .then(() => callback?.())
-            .catch(err => {
-            if (callback)
-                callback(err);
-            else
-                console.error(err);
-        });
-    }
     silent(value) {
         if (arguments.length > 1)
             throw Error('Signal.silent() expects zero or one argument');
@@ -1068,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);
     }
@@ -1134,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 });
@@ -1150,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])
@@ -1165,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/Root.d.ts

@@ -14,8 +14,12 @@ export type RootSignalRuntime = SignalBaseInstance & {
     [ROOT]?: RootSignalRuntime;
     [ROOT_ID]?: string;
 };
+export type RootCloseCallback = (err?: unknown) => void;
 export declare function getRootSignal({ rootFunction, fetchOnly, rootId, ...options }?: RootSignalOptions): RootSignalRuntime;
 export declare function getRoot(signal: RootSignalRuntime | undefined): RootSignalRuntime | undefined;
+export declare function closeRootSignalAsync(signal: RootSignalRuntime | undefined): Promise<void>;
+export declare function closeRootSignal(signal: RootSignalRuntime | undefined): Promise<void>;
+export declare function closeRootSignal(signal: RootSignalRuntime | undefined, callback?: RootCloseCallback): void;
 export declare function getRootFetchOnly(rootOrRootId: RootSignalRuntime | string | undefined): boolean;
 export declare function getRootTransportMode(rootOrRootId: RootSignalRuntime | string | undefined, intent?: RootTransportIntent): RootTransportIntent;
 export declare function registerRootFinalizer($root: RootSignalRuntime | undefined): void;

package/dist/orm/Root.js

@@ -43,6 +43,22 @@ export function getRoot(signal) {
     else
         return undefined;
 }
+export function closeRootSignalAsync(signal) {
+    const $root = getRoot(signal) || signal;
+    const rootId = $root?.[ROOT_ID];
+    unregisterRootFinalizer($root);
+    return disposeRootContext(rootId);
+}
+export function closeRootSignal(signal, callback) {
+    const promise = closeRootSignalAsync(signal);
+    if (!callback)
+        return promise;
+    promise
+        .then(() => callback?.())
+        .catch(err => {
+        callback(err);
+    });
+}
 export function getRootFetchOnly(rootOrRootId) {
     const $root = typeof rootOrRootId === 'string'
         ? undefined

package/dist/orm/SignalBase.d.ts

@@ -45,6 +45,8 @@ export declare class Signal<TValue = unknown> extends Function {
      * @param fn Function to execute inside the batch.
      */
     batch<TResult>(fn: () => TResult): TResult;
+    close(): Promise<void>;
+    close(callback: (err?: unknown) => void): void;
     /**
      * Internal read hook used by `.get()` and `.peek()`.
      * @param method Storage read function to use for the current signal path.

package/dist/orm/SignalBase.js

@@ -20,7 +20,7 @@ import getSignal, { rawSignal } from "./getSignal.js";
 import { docSubscriptions } from './Doc.js';
 import { IS_QUERY, HASH, QUERIES } from './Query.js';
 import { AGGREGATIONS, IS_AGGREGATION, getAggregationCollectionName, getAggregationDocId } from './Aggregation.js';
-import { ROOT_FUNCTION, ROOT_ID, getRoot } from "./Root.js";
+import { ROOT_FUNCTION, ROOT_ID, closeRootSignal, getRoot } from "./Root.js";
 import { DEFAULT_ID_FIELDS, getIdFieldsForSegments, isIdFieldPath, isPlainObject, isPublicDocPath, normalizeIdFields, prepareAddPayload, resolveAddDocId } from "./idFields.js";
 import { isCompatEnv } from './compatEnv.js';
 import { resolveRefSegmentsSafe, resolveRefSignalSafe } from './Compat/refFallback.js';
@@ -181,6 +181,14 @@ export class Signal extends Function {
             throw Error('Signal.batch() expects a function argument');
         return runInBatch(fn);
     }
+    close(callback) {
+        if (arguments.length > 1)
+            throw Error('Signal.close() expects zero or one argument');
+        if (callback != null && typeof callback !== 'function') {
+            throw Error('Signal.close() expects callback to be a function');
+        }
+        return callback ? closeRootSignal(this, callback) : closeRootSignal(this);
+    }
     /**
      * Internal read hook used by `.get()` and `.peek()`.
      * @param method Storage read function to use for the current signal path.
@@ -769,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.5.0-alpha.26",
+  "version": "0.5.0-alpha.28",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "./dist/index.js",
@@ -134,5 +134,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "a432e1c1dc272cfe2b87e3820557db4721a0f38b"
+  "gitHead": "3b775365e270ca2f93918780d3be4d03c4e56d51"
 }