@rpcbase/client 0.59.0 → 0.61.0

package/base_url.js

@@ -11,6 +11,5 @@ const is_local = ["localhost", "127.0.0.1"].includes(APP_DOMAIN)
 
 const BASE_URL = is_local ? `${protocol}//${APP_DOMAIN}:${SERVER_PORT}` : `https://${APP_DOMAIN}`
 
-console.log("APP_DOMAIN", APP_DOMAIN, BASE_URL)
 
 export default BASE_URL

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.59.0",
+  "version": "0.61.0",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 0"
   },

package/rts/getUseDocument.js

@@ -0,0 +1,23 @@
+/* @flow */
+import getUseQuery from "./getUseQuery"
+
+
+const getUseDocument = (register_query) => (...args) => {
+
+  const useQuery = getUseQuery(register_query)
+
+  const res = useQuery(...args)
+
+  let data
+  // cache will always return [] when there are no matching documents, but we want null instead
+  if (Array.isArray(res.data) && res.data.length === 0 && res.source === "cache") {
+    data = null
+  } else if (Array.isArray(res.data) && res.data.length  > 0) {
+    // TODO: should we throw if res.data.length > 1 ? ie: there are more than one matching document
+    data = res.data[0]
+  }
+
+  return {...res, data}
+}
+
+export default getUseDocument

package/rts/getUseQuery.js

@@ -11,7 +11,8 @@ import get_uid from "../auth/get_uid"
 import cacheStorage from "./cacheStorage"
 
 
-const log = debug("rb:useQuery")
+const log = debug("rb:rts:useQuery")
+
 
 const getUseQuery = (register_query) => (
   model_name,
@@ -44,10 +45,8 @@ const getUseQuery = (register_query) => (
     sort = {},
   } = options
 
-
   const storageKey = `${uid}.${key}.${model_name}.${JSON.stringify(query)}.${JSON.stringify(projection)}.${JSON.stringify(sort)}`
 
-
   useEffect(() => {
     if (options.debug) {
       console.log("use query", model_name, query, options)
@@ -57,9 +56,10 @@ const getUseQuery = (register_query) => (
   useEffect(() => {
     const load = async() => {
       const val = await cacheStorage.get(storageKey)
-      // console.log("got val from storage", val)
+      // TODO: rm this
       // always initially apply when first load here
       if (val) {
+        console.log("Will set val from cache storage")
         setData(val)
         setLoading(false)
       }
@@ -94,6 +94,7 @@ const getUseQuery = (register_query) => (
     }
 
     const start = Date.now()
+    log("will register query", model_name, query)
     const unsubscribe = register_query(model_name, query, {...options, key: queryKey}, (err, queryResult, context) => {
       log("callback answer with context", context, queryResult?.length)
 
@@ -170,6 +171,11 @@ const getUseQuery = (register_query) => (
 
   const result = useMemo(() => ({data, source, error, loading}), [data, source, error, loading])
 
+  // TODO: investigate this one
+  // if (Array.isArray(result.data) && !result.source) {
+  //   console.warn("RESULT HAS NO SOURCE", {data, error, loading, source})
+  // }
+
   return result
 }
 

package/rts/index.js

@@ -9,6 +9,7 @@ import BASE_URL from "../base_url"
 import {get_tenant_id} from "../auth"
 
 import store from "./store"
+import getUseDocument from "./getUseDocument"
 import getUseQuery from "./getUseQuery"
 
 const log = debug("rb:socket")
@@ -219,3 +220,5 @@ export const register_query = (model_name, query, _options, _callback) => {
 }
 
 export const useQuery = getUseQuery(register_query)
+
+export const useDocument = getUseDocument(register_query)

package/rts/store/debug.js

@@ -2,7 +2,7 @@
 import debug from "debug"
 import PouchDB from "pouchdb-core"
 
-if (debug.enabled("rb:store")) {
+if (debug.enabled("rb:rts:store")) {
 
   const log = debug("rb:store:pouch")
 

package/rts/store/get_collection.js

@@ -6,7 +6,7 @@ import FindPlugin from "pouchdb-find"
 
 import {TENANT_PREFIX, DATABASE_NAME} from "env"
 
-const log = debug("rb:store")
+const log = debug("rb:rts:store")
 
 let prefix = `rb/${TENANT_PREFIX}/`
 

package/rts/store/index.js

@@ -6,7 +6,7 @@ import "./debug"
 import get_collection from "./get_collection"
 import update_docs from "./update_docs"
 
-const log = debug("rb:store")
+const log = debug("rb:rts:store")
 
 // import updateDocument from "./updateDocument"
 // import {DATABASE_NAME} from "env"
@@ -122,9 +122,10 @@ const log = debug("rb:store")
 // TODO: should the store be in a worker or the main thread ?
 
 const run_query = async({model_name, query, query_key, options}, callback) => {
-  // console.log("ALAAARM")
   // console.log("run_query", {model_name, query, query_key, options})
   // console.time("store run_query")
+
+  // TODO: we should prefix model_name with tenant_prefix + env_id
   const col = get_collection(model_name)
 
   // https://github.com/pouchdb/pouchdb/tree/master/packages/node_modules/pouchdb-find#dbcreateindexindex--callback
@@ -136,6 +137,8 @@ const run_query = async({model_name, query, query_key, options}, callback) => {
     // fields: [""]
   })
 
+  // console.log("GOT QUERY RESULT", col, docs)
+
   const mapped_docs = docs.map(({_rev, ...doc}) => {
     // TODO: handle projections here
     const remapped_doc = Object.entries(doc).reduce((new_doc, [key, value]) => {