teamplay 0.5.0-alpha.3 → 0.5.0-alpha.30

package/dist/index.d.ts

@@ -1,15 +1,31 @@
 import type * as React from 'react';
 import { SEGMENTS } from './orm/Signal.js';
 import useApi from './react/useApi.js';
-import type { AnySignal, ArraySignal, CollectionDocument, CollectionDocumentModel, CollectionSignal, CollectionSignalFromSpec, CollectionAggregationSignal, CollectionQuerySignal, CollectionSpec, CollectionsFromManifest, DocumentSignal, FromJsonSchema, JsonSchema, JsonSchemaSpec, MaybePromise, MaybePromiseSubResult, ModelEntry, ModelManifest, PathModelsFromManifest, PublicSignal, LocalSignalFactory, RuntimeSignalConstructor, RuntimeSignalInstance, RootCollections, RootSignal, WildcardPathSegment, WildcardSignalPath, AppendPath, ComputedQueryParamsInput, JoinPath, QueryParams, QueryParamsInput, QuerySignal, RegisteredAggregationInput, SignalChild, SignalBaseInstance, SignalArrayMutatorMethods, SignalArrayReaderMethods, SignalClass, SignalCollectionMethods, SignalConstructor, SignalForKind, SignalKind, SignalMetadataMethods, SignalModelConstructor, SignalStringMutatorMethods, SignalValueMethods, SubResult, TypedAggregationInput, TypedAggregationSignal, TypedSignal, ZodLikeSchema, ZodSchemaSpec } from './orm/Signal.js';
+import type { AnySignal, ArraySignal, CollectionDocument, CollectionDocumentModel, CollectionSignal, CollectionSignalFromSpec, CollectionAggregationSignal, CollectionQuerySignal, CollectionSpec, CollectionsFromManifest, DocumentSignal, FromJsonSchema, JsonSchema, JsonSchemaSpec, MaybePromise, MaybePromiseSubResult, ModelEntry, ModelManifest, PathModelsFromManifest, PrivateCollectionsFromManifest, PrivateSignalFromSpec, PublicSignal, LocalSignalFactory, RuntimeSignalConstructor, RuntimeSignalInstance, RootCollections, RootPrivateCollections, RootSignal, WildcardPathSegment, WildcardSignalPath, AppendPath, ComputedQueryParamsInput, JoinPath, QueryParams, QueryParamsInput, QuerySignal, RegisteredAggregationInput, SignalChild, SignalBaseInstance, SignalArrayMutatorMethods, SignalArrayReaderMethods, SignalClass, SignalCollectionMethods, SignalConstructor, SignalForKind, SignalKind, SignalMetadataMethods, SignalModelConstructor, SignalStringMutatorMethods, SignalValueMethods, SubResult, TypedAggregationInput, TypedAggregationSignal, TypedSignal, ZodLikeSchema, ZodSchemaSpec } from './orm/Signal.js';
 export interface TeamplayCollections {
 }
+export interface TeamplayPrivateCollections {
+}
 export interface TeamplayModels {
 }
 export interface TeamplaySignalFields {
 }
+export interface TeamplayPluginCollections {
+}
+export interface TeamplayPluginPrivateCollections {
+}
+export interface TeamplayPluginModels {
+}
+export interface TeamplayPluginSignalFields {
+}
+export interface TeamplayPluginOptions {
+}
+export interface TeamplayFeatures {
+}
+export type TeamplayPluginOption<TName extends string> = TName extends keyof TeamplayPluginOptions ? TeamplayPluginOptions[TName] : {};
+export type TeamplayFeature<TName extends string> = TName extends keyof TeamplayFeatures ? TeamplayFeatures[TName] : unknown;
 export type Signal<TValue = unknown> = PublicSignal<TValue>;
-export type { AnySignal, ArraySignal, CollectionDocument, CollectionDocumentModel, CollectionSignal, CollectionSpec, CollectionSignalFromSpec, CollectionAggregationSignal, CollectionQuerySignal, DocumentSignal, FromJsonSchema, JsonSchema, JsonSchemaSpec, MaybePromise, MaybePromiseSubResult, ModelEntry, ModelManifest, CollectionsFromManifest, LocalSignalFactory, PathModelsFromManifest, PublicSignal, RuntimeSignalConstructor, RuntimeSignalInstance, RootCollections, RootSignal, WildcardPathSegment, WildcardSignalPath, AppendPath, ComputedQueryParamsInput, JoinPath, QueryParams, QueryParamsInput, QuerySignal, RegisteredAggregationInput, SignalArrayMutatorMethods, SignalArrayReaderMethods, SignalBaseInstance, SignalClass, SignalChild, SignalConstructor, SignalCollectionMethods, SignalForKind, SignalKind, SignalMetadataMethods, SignalModelConstructor, SignalStringMutatorMethods, SignalValueMethods, SubResult, TypedAggregationInput, TypedAggregationSignal, TypedSignal, ZodLikeSchema, ZodSchemaSpec };
+export type { AnySignal, ArraySignal, CollectionDocument, CollectionDocumentModel, CollectionSignal, CollectionSpec, CollectionSignalFromSpec, CollectionAggregationSignal, CollectionQuerySignal, DocumentSignal, FromJsonSchema, JsonSchema, JsonSchemaSpec, MaybePromise, MaybePromiseSubResult, ModelEntry, ModelManifest, CollectionsFromManifest, PrivateCollectionsFromManifest, LocalSignalFactory, PathModelsFromManifest, PrivateSignalFromSpec, PublicSignal, RuntimeSignalConstructor, RuntimeSignalInstance, RootCollections, RootSignal, WildcardPathSegment, WildcardSignalPath, AppendPath, ComputedQueryParamsInput, JoinPath, QueryParams, QueryParamsInput, QuerySignal, RegisteredAggregationInput, RootPrivateCollections, SignalArrayMutatorMethods, SignalArrayReaderMethods, SignalBaseInstance, SignalClass, SignalChild, SignalConstructor, SignalCollectionMethods, SignalForKind, SignalKind, SignalMetadataMethods, SignalModelConstructor, SignalStringMutatorMethods, SignalValueMethods, SubResult, TypedAggregationInput, TypedAggregationSignal, TypedSignal, ZodLikeSchema, ZodSchemaSpec };
 export interface ObserverOptions {
     forwardRef?: boolean;
     cache?: boolean;
@@ -36,14 +52,12 @@ export { defineModels, default as initModels, getModels, resetModelsForTests } f
 export { default as signal } from './orm/getSignal.js';
 export { GLOBAL_ROOT_ID } from './orm/Root.js';
 export declare const $: RootSignal;
-export declare const $root: RootSignal;
-export declare const model: RootSignal;
 export default $;
-export { default as sub } from './orm/sub.js';
-export { default as useSub, useAsyncSub, setUseDeferredValue as __setUseDeferredValue, setDefaultDefer as __setDefaultDefer } from './react/useSub.js';
+export { default as sub, unsub } from './orm/sub.js';
+export type { SubMode, SubOptions } from './orm/sub.js';
+export { default as useSub, useAsyncSub, useBatchSub, setUseDeferredValue as __setUseDeferredValue, setDefaultDefer as __setDefaultDefer } from './react/useSub.js';
 export { default as useSuspendMemo, useSuspendMemoByKey } from './react/useSuspendMemo.js';
 export declare const observer: ObserverFunction;
-export { useValue, useValue$, useModel, useLocal, useLocal$, useLocalDoc, useLocalDoc$, useSession, useSession$, usePage, usePage$, useBatch, useDoc, useDoc$, useBatchDoc, useBatchDoc$, useAsyncDoc, useAsyncDoc$, useQuery, useQuery$, useAsyncQuery, useAsyncQuery$, useBatchQuery, useBatchQuery$, useQueryIds, useBatchQueryIds, useAsyncQueryIds, useQueryDoc, useQueryDoc$, useBatchQueryDoc, useBatchQueryDoc$, useAsyncQueryDoc, useAsyncQueryDoc$ } from './orm/Compat/hooksCompat.js';
 export { emit, useOn, useEmit } from './orm/Compat/eventsCompat.js';
 export { useDidUpdate, useOnce, useSyncEffect } from './react/helpers.js';
 export { connection, setConnection, getConnection, getDefaultFetchOnly, setDefaultFetchOnly, publicOnly, setPublicOnly } from './orm/connection.js';
@@ -54,7 +68,7 @@ export { GUID_PATTERN, defineSchema, hasMany, hasOne, hasManyFlags, belongsTo, p
 export { aggregation, aggregationHeader as __aggregationHeader } from '@teamplay/utils/aggregation';
 export { accessControl } from '@teamplay/utils/accessControl';
 export type { AggregationCallback, AggregationContext, AggregationFunction, AggregationMeta, AggregationParams, AggregationQuery, ClientAggregationFunction, DefaultAggregationSession } from '@teamplay/utils/aggregation';
-export type { AccessControl, AccessControlRules, AccessCreateContext, AccessDecision, AccessDeleteContext, AccessOperation, AccessReadContext, AccessRule, AccessUpdateContext, AccessValidator, AccessValidatorObject, DefaultAccessSession } from '@teamplay/utils/accessControl';
+export type { AccessControl, AccessControlOptions, AccessControlRules, AccessCreateContext, AccessDecision, AccessDeleteContext, AccessOperation, AccessReadContext, AccessRule, AccessUpdateContext, AccessValidator, AccessValidatorObject, DefaultAccessSession } from '@teamplay/utils/accessControl';
 export declare function batch(): undefined;
 export declare function batch<TResult>(fn: () => TResult): TResult;
 export declare function batchModel(): undefined;
@@ -63,4 +77,5 @@ export declare function serverOnly<TValue>(value: TValue): TValue;
 export declare function clone<TValue>(value: TValue): TValue;
 export declare function initLocalCollection(name: string): any;
 export { useApi };
-export declare function getRootSignal<TCollections extends Record<string, any> = TeamplayCollections>(options?: Record<string, any>): RootSignal<TCollections>;
+export declare function getRootSignal(options?: Record<string, any>): RootSignal;
+export declare function getRootSignal<TCollections extends Record<string, any>>(options?: Record<string, any>): RootSignal<TCollections>;

package/dist/index.js

@@ -13,14 +13,11 @@ export { default as signal } from "./orm/getSignal.js";
 export { GLOBAL_ROOT_ID } from "./orm/Root.js";
 const getRuntimeRootSignal = _getRootSignal;
 export const $ = getRuntimeRootSignal({ rootId: GLOBAL_ROOT_ID, rootFunction: universal$ });
-export const $root = $;
-export const model = $;
 export default $;
-export { default as sub } from "./orm/sub.js";
-export { default as useSub, useAsyncSub, setUseDeferredValue as __setUseDeferredValue, setDefaultDefer as __setDefaultDefer } from "./react/useSub.js";
+export { default as sub, unsub } from "./orm/sub.js";
+export { default as useSub, useAsyncSub, useBatchSub, setUseDeferredValue as __setUseDeferredValue, setDefaultDefer as __setDefaultDefer } from "./react/useSub.js";
 export { default as useSuspendMemo, useSuspendMemoByKey } from "./react/useSuspendMemo.js";
 export const observer = runtimeObserver;
-export { useValue, useValue$, useModel, useLocal, useLocal$, useLocalDoc, useLocalDoc$, useSession, useSession$, usePage, usePage$, useBatch, useDoc, useDoc$, useBatchDoc, useBatchDoc$, useAsyncDoc, useAsyncDoc$, useQuery, useQuery$, useAsyncQuery, useAsyncQuery$, useBatchQuery, useBatchQuery$, useQueryIds, useBatchQueryIds, useAsyncQueryIds, useQueryDoc, useQueryDoc$, useBatchQueryDoc, useBatchQueryDoc$, useAsyncQueryDoc, useAsyncQueryDoc$ } from './orm/Compat/hooksCompat.js';
 export { emit, useOn, useEmit } from './orm/Compat/eventsCompat.js';
 export { useDidUpdate, useOnce, useSyncEffect } from "./react/helpers.js";
 export { connection, setConnection, getConnection, getDefaultFetchOnly, setDefaultFetchOnly, publicOnly, setPublicOnly } from "./orm/connection.js";

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
-): string | number | undefined
-export function getAggregationCollectionName (segments: readonly unknown[]): string | undefined
+  method?: (path: PathSegment[]) => unknown
+): string | undefined
+export function getAggregationCollectionName (segments: readonly PathSegment[]): string | undefined

package/dist/orm/Aggregation.js

@@ -1,13 +1,14 @@
 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';
 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,21 +40,31 @@ 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) {
-    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);
@@ -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,11 +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 docId = method([...segments.slice(0, 3), '_id']) || method([...segments.slice(0, 3), 'id']);
-    return docId;
+    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))
@@ -113,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));
+}