@rpcbase/client 0.195.0 → 0.196.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.195.0",
+  "version": "0.196.0",
   "scripts": {
     "build": "../../node_modules/.bin/wireit",
     "test": "../../node_modules/.bin/wireit"
@@ -98,9 +98,9 @@
     "js-tree": "2.0.2",
     "lz-string": "1.5.0",
     "posthog-js": "1.147.0",
-    "pouchdb-adapter-indexeddb": "8.0.1",
-    "pouchdb-core": "8.0.1",
-    "pouchdb-find": "8.0.1",
+    "pouchdb-adapter-indexeddb": "9.0.0",
+    "pouchdb-core": "9.0.0",
+    "pouchdb-find": "9.0.0",
     "react-bootstrap-typeahead": "6.3.2",
     "react-i18next": "15.0.1",
     "rrweb": "1.1.3",

package/rts/getUseQuery/index.js

@@ -1,5 +1,4 @@
 /* @flow */
-import assert from "assert"
 import {Platform} from "react-native"
 import {useCallback, useEffect, useState, useMemo, useId, useRef} from "react"
 import debug from "debug"
@@ -25,9 +24,10 @@ const getUseQuery = (register_query) => (
 ) => {
   const id = useId()
 
+  // TODO: should the uid be gone here ? it's part of the auth layer, not this here
   // TODO: retrieve this from future AuthContext in client
   const uid = useMemo(() => {
-    // TODO: why is there a options.userId here ??
+    // TODO: why is there a options.userId here?? (it was for mobile we need to unify this)
     const _uid = Platform.OS === "web" ? getUid() : options.userId
     return _uid
   }, [])
@@ -75,12 +75,16 @@ const getUseQuery = (register_query) => (
     // set data in a ref so that it doesn't force re-rendering ie: unsubscribe / resubscribe
     dataRef.current = newData
 
+    // useStorage currently used as a fast local cache, indexedDB
     // we only save network queries
+    // TODO: use localstorage in react native and pouchdb everywhere
     if (useStorage && context.source === "network") {
       if (Platform.OS === "web") {
         localStorage.setItem(storageKey, LZString.compressToUTF16(JSON.stringify(newData)))
       } else {
+        // TODO: this is done in pouchDB nOW ?????
         // TODO: RN MMKV
+        console.log("mmkv NYI")
       }
     }
 
@@ -147,7 +151,7 @@ const getUseQuery = (register_query) => (
         newData = _omit(queryResult, "__txn_id")
       }
 
-      // We return once in any case!
+      // we return once in any case
       if (!hasFirstReply.current) {
         hasFirstReply.current = true
 
@@ -168,7 +172,7 @@ const getUseQuery = (register_query) => (
         return
       }
 
-      if (isEqual(data, newData) && !isEqualValues(data, newData) && __DEV__) {
+      if (__DEV__ && isEqual(data, newData) && !isEqualValues(data, newData)) {
         alert("EQUALITY MISMATCH THIS SHOULD NOT HAPPEN!", data, newData)
       }
 
@@ -191,11 +195,11 @@ const getUseQuery = (register_query) => (
 
 
   const loadNextPage = useCallback(() => {
-    console.log("NYI: will load next page after DOC")
+    console.log("loadNextPage NYI")
   }, [])
 
 
-  const result = useMemo(() => ({data, source, error, loading}), [data, source, error, loading])
+  const result = useMemo(() => ({data, source, error, loading, loadNextPage}), [data, source, error, loading, loadNextPage])
 
   // TODO:
   // if (Array.isArray(result.data) && !result.source) {

package/rts/rts.js

@@ -10,6 +10,7 @@ import getBaseUrl from "../getBaseUrl"
 
 import store from "./store"
 
+
 const log = debug("rb:socket")
 
 const TENANT_ID_HEADER = "rb-tenant-id"
@@ -197,8 +198,6 @@ export const register_query = (model_name, query, _options, _callback) => {
   }
   _queries_store[model_name][query]
 
-  console.log("QUERY OPTIONSSS", options)
-
   // TODO: why both run and register query here ? the run_query should come straight from register ?
   _socket.emit("run_query", {model_name, query, query_key, options})
   _socket.emit("register_query", {model_name, query, query_key, options})

package/rts/store/get_collection.js

@@ -6,22 +6,26 @@ import FindPlugin from "pouchdb-find"
 
 import {RB_TENANT_ID, RB_APP_NAME} from "env"
 
+
 const log = debug("rb:rts:store")
 
-let prefix = `rb/${RB_TENANT_ID}/`
+let prefix = `rb/`
 
 if (RB_APP_NAME) prefix += `${RB_APP_NAME}/`
 
+prefix += `${RB_TENANT_ID}/`
+
+log("prefix:", prefix)
+
 PouchDB.prefix = prefix
 
 PouchDB.plugin(IndexedDBAdapter)
 PouchDB.plugin(FindPlugin)
 
-
 const _cols_store = Object.create(null)
 
-
 const get_collection = (col_name) => {
+
   if (!col_name) {
     console.warn("supplied invalid / empty collection name to rts")
   }