@based/react 0.6.0 → 0.7.1

package/dist/gql.d.ts

@@ -0,0 +1,11 @@
+import { BasedGraphQL, GenericObject, BasedOpts } from '@based/client';
+declare type Data = GenericObject;
+declare type Loading = boolean;
+export declare function useQuery(query: string | BasedGraphQL, variables?: Record<string, any>, clientSelector?: string | (BasedOpts & {
+    key?: string;
+})): {
+    data: Data;
+    error?: Error;
+    loading: Loading;
+};
+export {};

package/dist/gql.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useQuery = void 0;
+const react_1 = require("react");
+const client_1 = require("@based/client");
+function resultReducer(state, action) {
+    if (action.error) {
+        state.error = action.error;
+    }
+    if (action.data) {
+        state.checksum = action.checksum || 0;
+        state.data = action.data;
+        state.loading = false;
+        if (state.error) {
+            delete state.error;
+        }
+    }
+    if (action.loading) {
+        state.loading = action.loading;
+    }
+    return { ...state };
+}
+function useQuery(query, variables = {}, clientSelector) {
+    const [result, dispatch] = (0, react_1.useReducer)(resultReducer, {
+        loading: true,
+        data: {},
+        checksum: 0,
+    });
+    if (a) {
+        const subId = (0, react_1.useMemo)(() => {
+            return (0, client_1.generateSubscriptionId)(typeof a === 'string' ? [a, payload] : a);
+        }, [payload, a]);
+        const isNamed = typeof a === 'string';
+        const selector = clientSelector || (!isNamed ? payload : 'default');
+        const client = useClient(selector);
+        const clientKey = typeof selector === 'string' ? selector : genOptsId(selector);
+        if (client) {
+            const subKey = clientKey + subId;
+            (0, react_1.useEffect)(() => {
+                updateMeta(subKey, true, false);
+                dispatch({ error: null, loading: true, data: {} });
+                const [, subscriberId] = (0, client_1.addSubscriber)(client.client, isNamed ? payload : a, (d, checksum) => {
+                    updateMeta(subKey, false, false);
+                    dispatch({ data: d, checksum });
+                }, (err) => {
+                    if (err) {
+                        console.error(err);
+                        updateMeta(subKey, false, err);
+                        dispatch({ error: err, loading: false });
+                    }
+                }, (err) => {
+                    console.error(err);
+                    updateMeta(subKey, false, err);
+                    dispatch({ error: err });
+                }, subId, typeof a === 'string' ? a : undefined);
+                return () => {
+                    updateMeta(subKey, false, false);
+                    (0, client_1.removeSubscriber)(client.client, subId, subscriberId);
+                };
+            }, [subId, clientKey]);
+        }
+        else {
+            (0, react_1.useEffect)(stubFn, [null, null]);
+        }
+    }
+    else {
+        (0, react_1.useMemo)(stubFn, [payload, a]);
+        useClient(clientSelector);
+        (0, react_1.useEffect)(stubFn, [null, null]);
+    }
+    return result;
+}
+exports.useQuery = useQuery;
+//# sourceMappingURL=gql.js.map

package/dist/gql.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gql.js","sourceRoot":"","sources":["../src/gql.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -0,0 +1,83 @@
+import React, { FunctionComponent, ReactNode } from 'react';
+import { Based, GenericObject, Query, BasedGraphQL, BasedOpts } from '@based/client';
+export declare type CreateClient = (selector: string | (BasedOpts & {
+    key?: string;
+})) => Based;
+interface BasedContextType {
+    clients: {
+        [key: string]: Based;
+    };
+    createClient?: CreateClient;
+    removeClient: (selector: string | (BasedOpts & {
+        key?: string;
+    }) | Based) => void;
+}
+export declare const BasedContext: React.Context<BasedContextType>;
+export declare const defaultCreateClient: CreateClient;
+export declare const Provider: FunctionComponent<{
+    client?: Based;
+    clients?: {
+        [key: string]: Based;
+    };
+    children: ReactNode;
+    createClient?: CreateClient;
+}>;
+export declare const useBasedContext: () => BasedContextType;
+export declare const useClients: () => Based[];
+export declare const useClient: (selector?: string | (BasedOpts & {
+    key?: string;
+})) => Based;
+declare type Data = GenericObject;
+declare type Loading = boolean;
+export declare function useAuth(clientSelector?: string | (BasedOpts & {
+    key?: string;
+})): string | false;
+export declare function useSchema(name?: string | null | false, clientSelector?: string | (BasedOpts & {
+    key?: string;
+})): {
+    schema: Data;
+    error?: Error;
+    loading: Loading;
+};
+export declare function useTrack(type: string, params?: {
+    [key: string]: number | string | boolean;
+}, clientSelector?: string | (BasedOpts & {
+    key?: string;
+})): void;
+export declare function useData(query: Query, clientSelector?: string | (BasedOpts & {
+    key?: string;
+})): {
+    data: Data;
+    error?: Error;
+    loading: Loading;
+    checksum: number;
+};
+export declare function useData(name: string): {
+    data: Data;
+    error?: Error;
+    loading: Loading;
+    checksum: number;
+};
+export declare function useData(name: string, payload: any, clientSelector?: string | (BasedOpts & {
+    key?: string;
+})): {
+    data: Data;
+    error?: Error;
+    loading: Loading;
+    checksum: number;
+};
+export declare function useLoading(): {
+    loading: boolean;
+};
+export declare function useError(): {
+    error: string;
+    errors: unknown[];
+};
+export declare function useQuery(query?: string | BasedGraphQL, variables?: Record<string, any>, clientSelector?: string | (BasedOpts & {
+    key?: string;
+})): {
+    data: Data;
+    error?: Error;
+    loading: Loading;
+};
+export {};

package/dist/index.js

@@ -0,0 +1,444 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useQuery = exports.useError = exports.useLoading = exports.useData = exports.useTrack = exports.useSchema = exports.useAuth = exports.useClient = exports.useClients = exports.useBasedContext = exports.Provider = exports.defaultCreateClient = exports.BasedContext = void 0;
+const react_1 = __importStar(require("react"));
+const client_1 = __importStar(require("@based/client"));
+const schemaSubId = (0, client_1.generateSubscriptionId)({ $subscribe_schema: 'default' });
+const genOptsId = (opts) => {
+    if (!opts) {
+        return;
+    }
+    if (opts.key) {
+        return opts.key;
+    }
+    return `${opts.env}_${opts.project}_${opts.org}_${opts.cluster || ''}_${opts.name || ''}`;
+};
+exports.BasedContext = (0, react_1.createContext)({
+    clients: {},
+    // eslint-disable-next-line
+    removeClient: (...args) => { },
+});
+const errors = {};
+const errorListeners = new Set();
+const loadings = new Set();
+const loadingListeners = new Set();
+const newClientListeners = new Set();
+let isLoading = false;
+let lastError = '';
+let errorCnt = 0;
+let errorKey = errorCnt + lastError;
+const defaultCreateClient = (selector) => {
+    if (typeof selector === 'object') {
+        if (process.env.CLUSTER &&
+            process.env.CLUSTER.startsWith('local') &&
+            !selector.cluster) {
+            selector.cluster = process.env.CLUSTER;
+        }
+        return (0, client_1.default)(selector);
+    }
+    else {
+        // default
+        console.error('Cannot create client from ' + selector);
+    }
+};
+exports.defaultCreateClient = defaultCreateClient;
+const Provider = ({ client, children, clients, createClient }) => {
+    if (!clients && client) {
+        clients = {
+            default: client,
+        };
+    }
+    else if (clients && client) {
+        clients.default = client;
+    }
+    const ctx = react_1.default.createElement(exports.BasedContext.Provider, {
+        value: {
+            clients,
+            createClient: createClient || exports.defaultCreateClient,
+            removeClient: (selector) => {
+                if (selector instanceof client_1.Based) {
+                    for (const cl in clients) {
+                        if (clients[cl] === selector) {
+                            selector = cl;
+                            break;
+                        }
+                    }
+                    if (typeof selector !== 'string') {
+                        console.error('Cannot find client to remove from ctx', selector);
+                        return;
+                    }
+                }
+                else if (typeof selector !== 'string') {
+                    selector = genOptsId(selector);
+                }
+                // @ts-ignore
+                if (clients[selector]) {
+                    // @ts-ignore
+                    clients[selector].disconnect();
+                    // @ts-ignore
+                    delete clients[selector];
+                    newClientListeners.forEach((fn) => fn());
+                }
+            },
+        },
+    }, children);
+    return ctx;
+};
+exports.Provider = Provider;
+const useBasedContext = () => {
+    return (0, react_1.useContext)(exports.BasedContext);
+};
+exports.useBasedContext = useBasedContext;
+function forceUpdate(state) {
+    return state + 1;
+}
+const useClients = () => {
+    const ctx = (0, exports.useBasedContext)();
+    const [, update] = (0, react_1.useReducer)(forceUpdate, 0);
+    (0, react_1.useEffect)(() => {
+        let timer;
+        const fn = () => {
+            timer = setTimeout(update, 0);
+        };
+        newClientListeners.add(fn);
+        return () => {
+            newClientListeners.delete(fn);
+            clearTimeout(timer);
+        };
+    }, []);
+    return Object.values(ctx.clients);
+};
+exports.useClients = useClients;
+const useClient = (selector = 'default') => {
+    const basedCtx = (0, react_1.useContext)(exports.BasedContext);
+    if (typeof selector === 'object') {
+        if (!(selector.env && selector.project && selector.org)) {
+            return;
+        }
+    }
+    let key;
+    if (typeof selector === 'string') {
+        key = selector;
+    }
+    else {
+        key = selector.key || genOptsId(selector);
+    }
+    let client = basedCtx.clients[key];
+    if (!client && basedCtx.createClient) {
+        client = basedCtx.createClient(selector);
+        if (client) {
+            basedCtx.clients[key] = client;
+            newClientListeners.forEach((fn) => fn());
+        }
+    }
+    return client;
+};
+exports.useClient = useClient;
+function resultReducer(state, action) {
+    if (action.error) {
+        state.error = action.error;
+    }
+    if (action.data) {
+        state.checksum = action.checksum || 0;
+        state.data = action.data;
+        state.loading = false;
+        if (state.error) {
+            delete state.error;
+        }
+    }
+    if (action.loading) {
+        state.loading = action.loading;
+    }
+    return { ...state };
+}
+function useAuth(clientSelector) {
+    const client = (0, exports.useClient)(clientSelector);
+    const [token, setToken] = (0, react_1.useState)(false);
+    (0, react_1.useEffect)(() => {
+        const t = () => setToken(client.getToken());
+        client.on('auth', t);
+        return () => {
+            client.removeListener('auth', t);
+        };
+    }, []);
+    return token;
+}
+exports.useAuth = useAuth;
+function useSchema(name = 'default', clientSelector) {
+    const x = useData(name
+        ? {
+            $subscribe_schema: name,
+        }
+        : null, clientSelector);
+    return {
+        loading: x.loading,
+        error: x.error,
+        schema: x.data,
+    };
+}
+exports.useSchema = useSchema;
+function useTrack(type, params, clientSelector) {
+    if (type) {
+        const selector = clientSelector || 'default';
+        const client = (0, exports.useClient)(selector);
+        const id = (0, react_1.useMemo)(() => {
+            return (0, client_1.generateSubscriptionId)(params, type);
+        }, [type, params]);
+        (0, react_1.useEffect)(() => {
+            client.track(type, params);
+            return () => {
+                client.untrack(type, params);
+            };
+        }, [id]);
+    }
+    else {
+        (0, exports.useClient)(clientSelector);
+        (0, react_1.useMemo)(() => { }, []);
+        (0, react_1.useEffect)(stubFn, [null, null]);
+    }
+}
+exports.useTrack = useTrack;
+function useData(a, payload, clientSelector) {
+    const [result, dispatch] = (0, react_1.useReducer)(resultReducer, {
+        loading: true,
+        data: {},
+        checksum: 0,
+    });
+    if (a) {
+        const subId = (0, react_1.useMemo)(() => {
+            return (0, client_1.generateSubscriptionId)(typeof a === 'string' ? [a, payload] : a);
+        }, [payload, a]);
+        const isNamed = typeof a === 'string';
+        const selector = clientSelector || (!isNamed ? payload : 'default');
+        const client = (0, exports.useClient)(selector);
+        const clientKey = typeof selector === 'string' ? selector : genOptsId(selector);
+        if (client) {
+            const subKey = clientKey + subId;
+            (0, react_1.useEffect)(() => {
+                updateMeta(subKey, true, false);
+                dispatch({ error: null, loading: true, data: {} });
+                const [, subscriberId] = (0, client_1.addSubscriber)(client.client, isNamed ? payload : a, (d, checksum) => {
+                    updateMeta(subKey, false, false);
+                    dispatch({ data: d, checksum });
+                }, (err) => {
+                    if (err) {
+                        console.error(err);
+                        updateMeta(subKey, false, err);
+                        dispatch({ error: err, loading: false });
+                    }
+                }, (err) => {
+                    console.error(err);
+                    updateMeta(subKey, false, err);
+                    dispatch({ error: err });
+                }, subId, typeof a === 'string' ? a : undefined);
+                return () => {
+                    updateMeta(subKey, false, false);
+                    (0, client_1.removeSubscriber)(client.client, subId, subscriberId);
+                };
+            }, [subId, clientKey]);
+        }
+        else {
+            (0, react_1.useEffect)(stubFn, [null, null]);
+        }
+    }
+    else {
+        (0, react_1.useMemo)(stubFn, [payload, a]);
+        (0, exports.useClient)(clientSelector);
+        (0, react_1.useEffect)(stubFn, [null, null]);
+    }
+    return result;
+}
+exports.useData = useData;
+function useLoading() {
+    const [, setLoading] = (0, react_1.useState)(isLoading);
+    loadingListeners.add(setLoading);
+    (0, react_1.useEffect)(() => {
+        return () => {
+            loadingListeners.delete(setLoading);
+        };
+    }, []);
+    return { loading: isLoading };
+}
+exports.useLoading = useLoading;
+function useError() {
+    const [, setError] = (0, react_1.useState)(errorKey);
+    errorListeners.add(setError);
+    (0, react_1.useEffect)(() => {
+        return () => {
+            errorListeners.delete(setError);
+        };
+    }, []);
+    return { error: errorCnt ? lastError : null, errors: Object.values(errors) };
+}
+exports.useError = useError;
+function updateMeta(subKey, loading, error) {
+    if (error) {
+        lastError = error;
+        if (subKey in errors) {
+            errors[subKey] = error;
+        }
+        else {
+            errors[subKey] = error;
+            errorCnt++;
+        }
+    }
+    else {
+        if (subKey in errors) {
+            errorCnt--;
+            delete errors[subKey];
+        }
+    }
+    const newErrorKey = errorCnt + lastError;
+    if (newErrorKey !== errorKey) {
+        errorKey = newErrorKey;
+        errorListeners.forEach((fn) => fn(errorKey));
+    }
+    if (loading) {
+        loadings.add(subKey);
+    }
+    else {
+        loadings.delete(subKey);
+    }
+    const newLoading = !!loadings.size;
+    if (newLoading !== isLoading) {
+        isLoading = newLoading;
+        loadingListeners.forEach((fn) => fn(isLoading));
+    }
+}
+function useQuery(query, variables = {}, clientSelector) {
+    const [result, dispatch] = (0, react_1.useReducer)(resultReducer, {
+        loading: true,
+        data: {},
+        checksum: 0,
+    });
+    const r = (0, react_1.useRef)({ checksum: 0, schemaChecksum: 0 });
+    if (query) {
+        const selector = clientSelector || 'default';
+        const client = (0, exports.useClient)(selector);
+        const [configState, updateConfigState] = (0, react_1.useState)(0);
+        (0, react_1.useEffect)(() => {
+            const [, subscriberId] = (0, client_1.addSubscriber)(client.client, 
+            // FIXME
+            { $subscribe_schema: 'default' }, (d, checksum) => {
+                console.info('snurp', 'flx', checksum);
+                if (!client.client.configuration) {
+                    client.client.configuration = { dbs: [], schema: {} };
+                }
+                client.client.configuration.schema.default = d;
+                updateConfigState(checksum);
+            }, (err) => {
+                if (err) {
+                    console.error(err);
+                }
+            }, (err) => {
+                console.error(err);
+            }, schemaSubId);
+            return () => {
+                (0, client_1.removeSubscriber)(client.client, schemaSubId, subscriberId);
+            };
+            return () => { };
+        }, []);
+        if (configState) {
+            let op;
+            if (typeof query === 'string') {
+                op = client.gql(query);
+            }
+            else {
+                op = query;
+            }
+            op = (0, client_1.handleGraphqlVariables)(op, op, variables);
+            const fns = [];
+            const queryObj = {};
+            for (const key in op.ops) {
+                if (op.ops[key].fnObserve) {
+                    const { name, payload } = op.ops[key].fnObserve;
+                    fns.push({ name: name, payload });
+                    continue;
+                }
+                queryObj[key] = op.ops[key].get;
+            }
+            // if (fns?.length) {
+            //   console.log('HELLO OBSERVABLE FUNCTIONS', JSON.stringify(fns, null, 2))
+            //   // TODO: create observables for these fns and combine with below
+            //   return new Observable(this.client, { $db: op.db, data: queryObj })
+            // }
+            // return new Observable(this.client, { $db: op.db, data: queryObj })
+            // }
+            // op
+            const subId = (0, react_1.useMemo)(() => {
+                // fn?
+                return (0, client_1.generateSubscriptionId)(queryObj);
+            }, [queryObj]);
+            const clientKey = typeof selector === 'string' ? selector : genOptsId(selector);
+            if (client) {
+                const subKey = clientKey + subId;
+                (0, react_1.useEffect)(() => {
+                    if (!configState) {
+                        return;
+                    }
+                    updateMeta(subKey, true, false);
+                    // dispatch({ error: null, loading: true, data: {} })
+                    const [, subscriberId] = (0, client_1.addSubscriber)(client.client, queryObj, (d, checksum) => {
+                        // updateMeta(subKey, false, false)
+                        console.info(r.current.checksum);
+                        if (r.current.checksum !== checksum) {
+                            r.current.checksum = checksum;
+                            dispatch({ data: d, checksum });
+                        }
+                    }, (err) => {
+                        if (err) {
+                            console.error(err);
+                            // updateMeta(subKey, false, err)
+                            dispatch({ error: err, loading: false });
+                        }
+                    }, (err) => {
+                        console.error(err);
+                        // updateMeta(subKey, false, err)
+                        dispatch({ error: err });
+                    }, subId);
+                    return () => {
+                        // updateMeta(subKey, false, false)
+                        (0, client_1.removeSubscriber)(client.client, subId, subscriberId);
+                    };
+                }, [subId, clientKey, configState]);
+            }
+            else {
+                (0, react_1.useEffect)(stubFn, [null, null]);
+            }
+        }
+        else {
+            (0, react_1.useMemo)(stubFn, [query]);
+            (0, react_1.useEffect)(stubFn, [null, null, null]);
+        }
+    }
+    else {
+        (0, exports.useClient)(clientSelector);
+        (0, react_1.useState)(null);
+        (0, react_1.useEffect)(stubFn, [null]);
+        (0, react_1.useMemo)(stubFn, [query]);
+        (0, react_1.useEffect)(stubFn, [null, null, null]);
+    }
+    return result;
+}
+exports.useQuery = useQuery;
+function stubFn() { }
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "@based/react",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "source": "src/index.tsx",
   "main": "dist/index.js",
   "scripts": {
-    "build": "yarn tsconfig && tsc -b",
-    "watch": "yarn build -w"
+    "build": "npx tsc",
+    "watch": "npm run build -- --watch"
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@based/client": "^0.9.0||^1",
+    "@based/client": "^1.1.0",
     "react": "^17.0.2"
   },
   "devDependencies": {
-    "@based/tsconfig": "*",
     "@types/react": "^17.0.14",
     "ts-node": "^10.1.0",
     "typescript": "^4.3.5"

package/src/index.ts

@@ -6,6 +6,7 @@ import React, {
   useEffect,
   useMemo,
   useReducer,
+  useRef,
   useState,
 } from 'react'
 import based, {
@@ -14,10 +15,14 @@ import based, {
   Query,
   addSubscriber,
   removeSubscriber,
+  handleGraphqlVariables,
+  BasedGraphQL,
   generateSubscriptionId,
   BasedOpts,
 } from '@based/client'
 
+const schemaSubId = generateSubscriptionId({ $subscribe_schema: 'default' })
+
 const genOptsId = (opts: BasedOpts & { key?: string }): string => {
   if (!opts) {
     return
@@ -46,6 +51,7 @@ interface BasedContextType {
 
 export const BasedContext = createContext<BasedContextType>({
   clients: {},
+  // eslint-disable-next-line
   removeClient: (...args: any) => {},
 })
 
@@ -219,7 +225,7 @@ export function useAuth(
   const client = useClient(clientSelector)
   const [token, setToken] = useState<false | string>(false)
   useEffect(() => {
-    const t = (v) => setToken(client.getToken())
+    const t = () => setToken(client.getToken())
     client.on('auth', t)
     return () => {
       client.removeListener('auth', t)
@@ -436,4 +442,159 @@ function updateMeta(subKey, loading, error) {
   }
 }
 
+export function useQuery(
+  query?: string | BasedGraphQL,
+  variables: Record<string, any> = {},
+  clientSelector?: string | (BasedOpts & { key?: string })
+): {
+  data: Data
+  error?: Error
+  loading: Loading
+} {
+  const [result, dispatch] = useReducer(resultReducer, {
+    loading: true,
+    data: {},
+    checksum: 0,
+  })
+
+  const r = useRef({ checksum: 0, schemaChecksum: 0 })
+
+  if (query) {
+    const selector = clientSelector || 'default'
+
+    const client = useClient(selector)
+
+    const [configState, updateConfigState] = useState(0)
+
+    useEffect(() => {
+      const [, subscriberId] = addSubscriber(
+        client.client,
+        // FIXME
+        { $subscribe_schema: 'default' },
+        (d, checksum) => {
+          console.info('snurp', 'flx', checksum)
+          if (!client.client.configuration) {
+            client.client.configuration = { dbs: [], schema: {} }
+          }
+          client.client.configuration.schema.default = d
+          updateConfigState(checksum)
+        },
+        (err) => {
+          if (err) {
+            console.error(err)
+          }
+        },
+        (err) => {
+          console.error(err)
+        },
+        schemaSubId
+      )
+      return () => {
+        removeSubscriber(client.client, schemaSubId, subscriberId)
+      }
+      return () => {}
+    }, [])
+
+    if (configState) {
+      let op: BasedGraphQL
+      if (typeof query === 'string') {
+        op = client.gql(query)
+      } else {
+        op = query
+      }
+
+      op = handleGraphqlVariables(op, op, variables)
+
+      const fns: { name: string; payload: any }[] = []
+      const queryObj: any = {}
+      for (const key in op.ops) {
+        if (op.ops[key].fnObserve) {
+          const { name, payload } = op.ops[key].fnObserve
+          fns.push({ name: <string>name, payload })
+          continue
+        }
+        queryObj[key] = op.ops[key].get
+      }
+
+      // if (fns?.length) {
+      //   console.log('HELLO OBSERVABLE FUNCTIONS', JSON.stringify(fns, null, 2))
+
+      //   // TODO: create observables for these fns and combine with below
+      //   return new Observable(this.client, { $db: op.db, data: queryObj })
+      // }
+
+      // return new Observable(this.client, { $db: op.db, data: queryObj })
+      // }
+
+      // op
+
+      const subId = useMemo(() => {
+        // fn?
+        return generateSubscriptionId(queryObj)
+      }, [queryObj])
+
+      const clientKey =
+        typeof selector === 'string' ? selector : genOptsId(selector)
+
+      if (client) {
+        const subKey = clientKey + subId
+
+        useEffect(() => {
+          if (!configState) {
+            return
+          }
+          updateMeta(subKey, true, false)
+          // dispatch({ error: null, loading: true, data: {} })
+          const [, subscriberId] = addSubscriber(
+            client.client,
+            queryObj,
+            (d, checksum) => {
+              // updateMeta(subKey, false, false)
+
+              console.info(r.current.checksum)
+
+              if (r.current.checksum !== checksum) {
+                r.current.checksum = checksum
+                dispatch({ data: d, checksum })
+              }
+            },
+            (err) => {
+              if (err) {
+                console.error(err)
+                // updateMeta(subKey, false, err)
+                dispatch({ error: err, loading: false })
+              }
+            },
+            (err) => {
+              console.error(err)
+              // updateMeta(subKey, false, err)
+              dispatch({ error: err })
+            },
+            subId
+          )
+          return () => {
+            // updateMeta(subKey, false, false)
+            removeSubscriber(client.client, subId, subscriberId)
+          }
+        }, [subId, clientKey, configState])
+      } else {
+        useEffect(stubFn, [null, null])
+      }
+    } else {
+      useMemo(stubFn, [query])
+      useEffect(stubFn, [null, null, null])
+    }
+  } else {
+    useClient(clientSelector)
+    useState(null)
+    useEffect(stubFn, [null])
+
+    useMemo(stubFn, [query])
+
+    useEffect(stubFn, [null, null, null])
+  }
+
+  return result
+}
+
 function stubFn() {}