teamplay 0.4.0-alpha.99 → 0.4.0

package/orm/Compat/hooksCompat.js

@@ -115,48 +115,54 @@ export function useAsyncDoc (collection, id, options) {
   return [$doc.get(), $doc]
 }
 
+function useSubscribedQuery (collection, query, options, hookName, subscribe) {
+  const normalizedQuery = normalizeQuery(query, hookName)
+  const $collection = getCollectionSignal(collection, query, hookName)
+  const $query = subscribe($collection, normalizedQuery, options)
+  return {
+    normalizedQuery,
+    $collection,
+    $query: getExtraQuerySignal($query, normalizedQuery)
+  }
+}
+
+function getExtraQuerySignal ($query, normalizedQuery) {
+  if (!$query) return $query
+  return isExtraQuery(normalizedQuery) ? $query.extra : $query
+}
+
 export function useQuery$ (collection, query, options) {
-  const normalizedQuery = normalizeQuery(query, 'useQuery')
-  const $collection = getCollectionSignal(collection, query, 'useQuery')
   const normalizedOptions = normalizeSyncSubOptions(options)
-  const $query = useSub($collection, normalizedQuery, normalizedOptions)
-  return isExtraQuery(normalizedQuery) ? $query.extra : $query
+  const { $query } = useSubscribedQuery(collection, query, normalizedOptions, 'useQuery', useSub)
+  return $query
 }
 
 export function useQuery (collection, query, options) {
-  const $collection = getCollectionSignal(collection, query, 'useQuery')
   const normalizedOptions = normalizeSyncSubOptions(options)
-  const $query = useSub($collection, normalizeQuery(query, 'useQuery'), normalizedOptions)
+  const { $collection, $query } = useSubscribedQuery(collection, query, normalizedOptions, 'useQuery', useSub)
   return [$query.get(), $collection]
 }
 
 export function useAsyncQuery$ (collection, query, options) {
-  const normalizedQuery = normalizeQuery(query, 'useAsyncQuery')
-  const $collection = getCollectionSignal(collection, query, 'useAsyncQuery')
-  const $query = useAsyncSub($collection, normalizedQuery, options)
-  if (!$query) return $query
-  return isExtraQuery(normalizedQuery) ? $query.extra : $query
+  const { $query } = useSubscribedQuery(collection, query, options, 'useAsyncQuery', useAsyncSub)
+  return $query
 }
 
 export function useAsyncQuery (collection, query, options) {
-  const $collection = getCollectionSignal(collection, query, 'useAsyncQuery')
-  const $query = useAsyncSub($collection, normalizeQuery(query, 'useAsyncQuery'), options)
+  const { $collection, $query } = useSubscribedQuery(collection, query, options, 'useAsyncQuery', useAsyncSub)
   if (!$query) return [undefined, $collection]
   return [$query.get(), $collection]
 }
 
 export function useBatchQuery$ (collection, query, _options) {
-  const normalizedQuery = normalizeQuery(query, 'useBatchQuery')
-  const $collection = getCollectionSignal(collection, query, 'useBatchQuery')
-  const options = _options ? { ..._options, ...BATCH_SUB_OPTIONS } : BATCH_SUB_OPTIONS
-  const $query = useSub($collection, normalizedQuery, options)
-  if (!$query) return $query
-  return isExtraQuery(normalizedQuery) ? $query.extra : $query
+  const options = normalizeBatchSubOptions(_options)
+  const { $query } = useSubscribedQuery(collection, query, options, 'useBatchQuery', useSub)
+  return $query
 }
 
-export function useBatchQuery (collection, query, options) {
-  const $collection = getCollectionSignal(collection, query, 'useBatchQuery')
-  const $query = useBatchQuery$(collection, query, options)
+export function useBatchQuery (collection, query, _options) {
+  const options = normalizeBatchSubOptions(_options)
+  const { $collection, $query } = useSubscribedQuery(collection, query, options, 'useBatchQuery', useSub)
   if (!$query) return [undefined, $collection]
   return [$query.get(), $collection]
 }
@@ -359,6 +365,10 @@ function normalizeSyncSubOptions (options) {
   }
 }
 
+function normalizeBatchSubOptions (options) {
+  return options ? { ...options, ...BATCH_SUB_OPTIONS } : BATCH_SUB_OPTIONS
+}
+
 export const __COMPAT_BATCH_READY__ = {
   isQueryReady
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.4.0-alpha.99",
+  "version": "0.4.0",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "index.js",
@@ -35,12 +35,12 @@
   "dependencies": {
     "@nx-js/observer-util": "^4.1.3",
     "@startupjs/sharedb-mingo-memory": "^4.0.0-2",
-    "@teamplay/backend": "^0.4.0-alpha.9",
-    "@teamplay/cache": "^0.4.0-alpha.9",
-    "@teamplay/channel": "^0.4.0-alpha.9",
-    "@teamplay/debug": "^0.4.0-alpha.9",
-    "@teamplay/schema": "^0.4.0-alpha.9",
-    "@teamplay/utils": "^0.4.0-alpha.9",
+    "@teamplay/backend": "^0.4.0",
+    "@teamplay/cache": "^0.4.0",
+    "@teamplay/channel": "^0.4.0",
+    "@teamplay/debug": "^0.4.0",
+    "@teamplay/schema": "^0.4.0",
+    "@teamplay/utils": "^0.4.0",
     "diff-match-patch": "^1.0.5",
     "events": "^3.3.0",
     "json0-ot-diff": "^1.1.2",
@@ -83,5 +83,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "22d0358b80fa29754147b4318975b26fff3eae5a"
+  "gitHead": "c944a34b27e2dbbe5c81b1c39739caa012212e3f"
 }