teamplay 0.5.0-alpha.15 → 0.5.0-alpha.16

package/dist/index.d.ts

@@ -57,7 +57,7 @@ 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 useSuspendMemo, useSuspendMemoByKey } from './react/useSuspendMemo.js';
 export declare const observer: ObserverFunction;
-export { 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 { useBatch, useBatchDoc, useBatchDoc$, 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/index.js

@@ -18,7 +18,7 @@ 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 useSuspendMemo, useSuspendMemoByKey } from "./react/useSuspendMemo.js";
 export const observer = runtimeObserver;
-export { 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 { useBatch, useBatchDoc, useBatchDoc$, 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/Compat/hooksCompat.d.ts

@@ -1,14 +1,6 @@
 export const useBatch: any
-export const useDoc: any
-export const useDoc$: any
 export const useBatchDoc: any
 export const useBatchDoc$: any
-export const useAsyncDoc: any
-export const useAsyncDoc$: any
-export const useQuery: any
-export const useQuery$: any
-export const useAsyncQuery: any
-export const useAsyncQuery$: any
 export const useBatchQuery: any
 export const useBatchQuery$: any
 export const useQueryIds: any

package/dist/orm/Compat/hooksCompat.js

@@ -11,15 +11,6 @@ export function useBatch() {
     if (promise)
         throw promise;
 }
-export function useDoc$(collection, id, options) {
-    const $doc = getDocSignal(collection, id, 'useDoc');
-    const normalizedOptions = normalizeSyncSubOptions(options);
-    return useSub($doc, undefined, normalizedOptions);
-}
-export function useDoc(collection, id, options) {
-    const $doc = useDoc$(collection, id, options);
-    return [$doc.get(), $doc];
-}
 export function useBatchDoc(collection, id, options) {
     const $doc = useBatchDoc$(collection, id, options);
     if (!$doc)
@@ -31,16 +22,6 @@ export function useBatchDoc$(collection, id, _options) {
     const options = _options ? { ..._options, ...BATCH_SUB_OPTIONS } : BATCH_SUB_OPTIONS;
     return useSub($doc, undefined, options);
 }
-export function useAsyncDoc$(collection, id, options) {
-    const $doc = getDocSignal(collection, id, 'useAsyncDoc');
-    return useAsyncSub($doc, undefined, options);
-}
-export function useAsyncDoc(collection, id, options) {
-    const $doc = useAsyncDoc$(collection, id, options);
-    if (!$doc)
-        return [undefined, undefined];
-    return [$doc.get(), $doc];
-}
 function useSubscribedQuery(collection, query, options, hookName, subscribe) {
     const normalizedQuery = normalizeQuery(query, hookName);
     const $collection = getCollectionSignal(collection, query, hookName);
@@ -56,22 +37,13 @@ function getExtraQuerySignal($query, normalizedQuery) {
         return $query;
     return isExtraQuery(normalizedQuery) ? $query.extra : $query;
 }
-export function useQuery$(collection, query, options) {
+function useSyncQueryResult(collection, query, options, hookName) {
     const normalizedOptions = normalizeSyncSubOptions(options);
-    const { $query } = useSubscribedQuery(collection, query, normalizedOptions, 'useQuery', useSub);
-    return $query;
-}
-export function useQuery(collection, query, options) {
-    const normalizedOptions = normalizeSyncSubOptions(options);
-    const { $collection, $query } = useSubscribedQuery(collection, query, normalizedOptions, 'useQuery', useSub);
+    const { $collection, $query } = useSubscribedQuery(collection, query, normalizedOptions, hookName, useSub);
     return [$query.get(), $collection];
 }
-export function useAsyncQuery$(collection, query, options) {
-    const { $query } = useSubscribedQuery(collection, query, options, 'useAsyncQuery', useAsyncSub);
-    return $query;
-}
-export function useAsyncQuery(collection, query, options) {
-    const { $collection, $query } = useSubscribedQuery(collection, query, options, 'useAsyncQuery', useAsyncSub);
+function useAsyncQueryResult(collection, query, options, hookName) {
+    const { $collection, $query } = useSubscribedQuery(collection, query, options, hookName, useAsyncSub);
     if (!$query)
         return [undefined, $collection];
     return [$query.get(), $collection];
@@ -92,7 +64,7 @@ export function useQueryIds(collection, ids = [], options = {}) {
     const list = Array.isArray(ids) ? ids.slice() : [];
     if (options?.reverse)
         list.reverse();
-    const [docs, $collection] = useQuery(collection, { _id: { $in: list } }, options);
+    const [docs, $collection] = useSyncQueryResult(collection, { _id: { $in: list } }, options, 'useQueryIds');
     if (!docs)
         return [docs, $collection];
     const docsById = new Map();
@@ -124,7 +96,7 @@ export function useAsyncQueryIds(collection, ids = [], options = {}) {
     const list = Array.isArray(ids) ? ids.slice() : [];
     if (options?.reverse)
         list.reverse();
-    const [docs, $collection] = useAsyncQuery(collection, { _id: { $in: list } }, options);
+    const [docs, $collection] = useAsyncQueryResult(collection, { _id: { $in: list } }, options, 'useAsyncQueryIds');
     if (docs == null)
         return [undefined, $collection];
     const docsById = new Map();
@@ -143,7 +115,7 @@ export function useQueryDoc(collection, query, options) {
         $limit: 1,
         $sort: normalized.$sort || { createdAt: -1 }
     };
-    const [docs, $collection] = useQuery(collection, queryDoc, options);
+    const [docs, $collection] = useSyncQueryResult(collection, queryDoc, options, 'useQueryDoc');
     const doc = docs && docs[0];
     const docId = doc?._id ?? doc?.id;
     const $doc = docId != null ? $collection[docId] : undefined;
@@ -179,7 +151,7 @@ export function useAsyncQueryDoc(collection, query, options) {
         $limit: 1,
         $sort: normalized.$sort || { createdAt: -1 }
     };
-    const [docs, $collection] = useAsyncQuery(collection, queryDoc, options);
+    const [docs, $collection] = useAsyncQueryResult(collection, queryDoc, options, 'useAsyncQueryDoc');
     if (docs == null)
         return [undefined, undefined];
     const doc = docs && docs[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.5.0-alpha.15",
+  "version": "0.5.0-alpha.16",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "./dist/index.js",
@@ -134,5 +134,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "87701e8a3d9512a71eb2faebf01901c939cc323b"
+  "gitHead": "a6f311fb793aeeba904b81416400e609ab597174"
 }