@rpcbase/client 0.62.0 → 0.64.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.62.0",
+  "version": "0.64.0",
   "scripts": {
     "test": "jest"
   },

package/rts/getUseQuery.js

@@ -8,7 +8,7 @@ import _omit from "lodash/omit"
 
 import get_uid from "../auth/get_uid"
 
-import cacheStorage from "./cacheStorage"
+// import cacheStorage from "./cacheStorage"
 
 
 const log = debug("rb:rts:useQuery")
@@ -45,7 +45,7 @@ const getUseQuery = (register_query) => (
     sort = {},
   } = options
 
-  const storageKey = `${uid}.${key}.${model_name}.${JSON.stringify(query)}.${JSON.stringify(projection)}.${JSON.stringify(sort)}`
+  // const storageKey = `${uid}.${key}.${model_name}.${JSON.stringify(query)}.${JSON.stringify(projection)}.${JSON.stringify(sort)}`
 
   useEffect(() => {
     if (options.debug) {
@@ -53,27 +53,23 @@ const getUseQuery = (register_query) => (
     }
   }, [])
 
-  useEffect(() => {
-    const load = async() => {
-      const val = await cacheStorage.get(storageKey)
-      // TODO: rm this
-      // always initially apply when first load here
-      if (val) {
-        console.log("Will set val from cache storage")
-        setData(val)
-        setLoading(false)
-      }
-    }
-
-    load()
-  }, [storageKey])
+  // useEffect(() => {
+  //   const load = async() => {
+  //     const val = await cacheStorage.get(storageKey)
+  //     // TODO: rm this
+  //     // always initially apply when first load here
+  //     if (val) {
+  //       console.log("Will set val from cache storage")
+  //       setData(val)
+  //       setLoading(false)
+  //     }
+  //   }
+  //
+  //   load()
+  // }, [storageKey])
 
   const applyNewData = (newData, context) => {
     setData(newData)
-    // write data to storage
-    // TODO: is there a better way than doing it on every update ?
-    // should this be throttled
-    cacheStorage.set(storageKey, newData)
 
     if (newData?.length > 0) {
       lastDocRef.current = newData[newData.length - 1]
@@ -161,7 +157,7 @@ const getUseQuery = (register_query) => (
       log && log("useQuery cleanup unsubscribe()")
       unsubscribe()
     }
-  }, [JSON.stringify(query), key, storageKey])
+  }, [JSON.stringify(query), key])
 
 
   const loadNextPage = useCallback(() => {

package/rts/index.js

@@ -184,7 +184,7 @@ export const register_query = (model_name, query, _options, _callback) => {
   }
 
   const key = options.key || ""
-  const query_key = `${key}${JSON.stringify(query)}`
+  const query_key = `${key}${JSON.stringify(query)}${options.projection ? JSON.stringify(options.projection) : ""}`
   log("registering query with key", key, model_name, query, query_key)
 
   // save callback to update hooks

package/rts/store/index.js

@@ -67,7 +67,6 @@ const run_query = async({model_name, query, query_key, options}, callback) => {
       return remapped_doc
     })
 
-
   if (options.projection) {
     mapped_docs = mapped_docs.filter((doc) => satisfies_projection(doc, options.projection))
   }

package/rts/store/satisfies_projection.test.js

@@ -30,6 +30,14 @@ test("missing field", () => {
   })).toBe(false)
 })
 
+test("matching and missing field", () => {
+  expect(satisfies_projection(doc, {
+    field1: true,
+    missing_field: 1,
+    ...projection
+  })).toBe(false)
+})
+
 test("missing nested field", () => {
   expect(satisfies_projection(doc, {
     "missing_field.missing_nested": 1,