@based/react 4.1.0 → 4.2.0

package/dist/index.d.ts

@@ -1,65 +1,15 @@
-import { Query, BasedOpts, AnalyticsHistoryOpts, AnalyticsOpts, AnalyticsTypesOpts } from '@based/client';
-import { Loading, Data } from './types';
-export * from './meta';
-export * from './clients';
-export * from './gql';
-export { InfiniteList } from './components/InfiniteList';
-export declare function useAuth(clientSelector?: string | (BasedOpts & {
-    key?: string;
-})): {
-    id: string | false;
-    token: string;
-};
-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(query: null): {
-    data: Data;
-    error?: Error;
-    loading: Loading;
-    checksum: number;
-};
-export declare function useData(): {
-    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 useAnalytics(params?: AnalyticsHistoryOpts | AnalyticsTypesOpts | AnalyticsOpts, clientSelector?: string | (BasedOpts & {
-    key?: string;
-})): {
-    data: Data;
-    error?: Error;
-    loading: Loading;
-};
+import { ReactNode } from 'react';
+import { BasedClient, AuthState } from '@based/client';
+export declare const Provider: ({ client, children, }: {
+    client: BasedClient;
+    children: ReactNode;
+}) => any;
+export declare const useAuthState: () => AuthState;
+export declare const useQuery: (name?: string, payload?: any, opts?: {
+    persistent: boolean;
+}) => {
+    loading: boolean;
+    data?: any;
+    checksum?: number;
+};
+export declare const useClient: () => BasedClient;

package/dist/index.js

@@ -1 +1,55 @@
-var me=Object.create;var F=Object.defineProperty,ge=Object.defineProperties,pe=Object.getOwnPropertyDescriptor,be=Object.getOwnPropertyDescriptors,ke=Object.getOwnPropertyNames,P=Object.getOwnPropertySymbols,ye=Object.getPrototypeOf,Z=Object.prototype.hasOwnProperty,se=Object.prototype.propertyIsEnumerable;var ne=(e,t,r)=>t in e?F(e,t,{enumerable:!0,configurable:!0,writable:!0,value:r}):e[t]=r,Q=(e,t)=>{for(var r in t||(t={}))Z.call(t,r)&&ne(e,r,t[r]);if(P)for(var r of P(t))se.call(t,r)&&ne(e,r,t[r]);return e},oe=(e,t)=>ge(e,be(t));var ie=(e,t)=>{var r={};for(var n in e)Z.call(e,n)&&t.indexOf(n)<0&&(r[n]=e[n]);if(e!=null&&P)for(var n of P(e))t.indexOf(n)<0&&se.call(e,n)&&(r[n]=e[n]);return r};var he=(e,t)=>{for(var r in t)F(e,r,{get:t[r],enumerable:!0})},ae=(e,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of ke(t))!Z.call(e,o)&&o!==r&&F(e,o,{get:()=>t[o],enumerable:!(n=pe(t,o))||n.enumerable});return e};var z=(e,t,r)=>(r=e!=null?me(ye(e)):{},ae(t||!e||!e.__esModule?F(r,"default",{value:e,enumerable:!0}):r,e)),Ce=e=>ae(F({},"__esModule",{value:!0}),e);var $e={};he($e,{BasedContext:()=>W,InfiniteList:()=>de,Provider:()=>xe,defaultCreateClient:()=>ce,updateMeta:()=>C,useAnalytics:()=>Re,useAuth:()=>ve,useBasedContext:()=>ue,useClient:()=>B,useClients:()=>Be,useData:()=>Y,useError:()=>Ee,useLoading:()=>Le,useQuery:()=>Ie,useSchema:()=>De,useTrack:()=>Te});module.exports=Ce($e);var g=require("react"),v=require("@based/client");function N(e,t){return t.error&&(e.error=t.error),t.data&&(e.checksum=t.checksum||0,e.data=t.data,e.loading=!1,e.error&&delete e.error),t.merge&&(e.checksum=t.checksum||0,e.data?Object.assign(e.data,t.merge):e.data=t.merge,e.loading=!1,e.error&&delete e.error),t.loading&&(e.loading=t.loading),Q({},e)}var $=e=>{if(!!e)return e.key?e.key:`${e.env}_${e.project}_${e.org}_${e.cluster||""}_${e.name||""}`};var E=z(require("react")),V=z(require("@based/client"));var K=new Set,W=(0,E.createContext)({clients:{},removeClient:(...e)=>{}}),ce=e=>{if(typeof e=="object")return typeof process!="undefined"&&process.env.CLUSTER&&process.env.CLUSTER.startsWith("local")&&!e.cluster&&(e.cluster=process.env.CLUSTER),(0,V.default)(e);console.error("Cannot create client from "+e)},xe=({client:e,children:t,clients:r,createClient:n})=>(!r&&e?r={default:e}:r&&e&&(r.default=e),E.default.createElement(W.Provider,{value:{clients:r,createClient:n||ce,removeClient:s=>{if(s instanceof V.Based){for(let m in r)if(r[m]===s){s=m;break}if(typeof s!="string"){console.error("Cannot find client to remove from ctx",s);return}}else typeof s!="string"&&(s=$(s));r[s]&&(r[s].disconnect(),delete r[s],K.forEach(m=>m()))}}},t)),ue=()=>(0,E.useContext)(W);function Oe(e){return e+1}var Be=()=>{let e=ue(),[,t]=(0,E.useReducer)(Oe,0);return(0,E.useEffect)(()=>{let r,n=()=>{r=setTimeout(t,0)};return K.add(n),()=>{K.delete(n),clearTimeout(r)}},[]),Object.values(e.clients)},B=(e="default")=>{let t=(0,E.useContext)(W);if(typeof e=="object"&&!(e.env&&e.project&&e.org))return;let r;typeof e=="string"?r=e:r=e.key||$(e);let n=t.clients[r];return!n&&t.createClient&&(n=t.createClient(e),n&&(t.clients[r]=n,K.forEach(o=>o()))),n};var A=require("react"),j={},te=new Set,ee=new Set,re=new Set,G=!1,J="",H=0,q=H+J;function C(e,t,r){r?(J=r,e in j?j[e]=r:(j[e]=r,H++)):e in j&&(H--,delete j[e]);let n=H+J;n!==q&&(q=n,te.forEach(s=>s(q))),t?ee.add(e):ee.delete(e);let o=!!ee.size;o!==G&&(G=o,re.forEach(s=>s(G)))}function Le(){let[,e]=(0,A.useState)(G);return re.add(e),(0,A.useEffect)(()=>()=>{re.delete(e)},[]),{loading:G}}function Ee(){let[,e]=(0,A.useState)(q);return te.add(e),(0,A.useEffect)(()=>()=>{te.delete(e)},[]),{error:H?J:null,errors:Object.values(j)}}var l=require("react"),x=require("@based/client");var X=require("@saulx/hash"),le=(0,x.generateSubscriptionId)({$subscribe_schema:"default"});function Ie(e,t={},r){let[n,o]=(0,l.useReducer)(N,{loading:!0,data:{},checksum:0}),s=(0,l.useRef)({checksum:0,fns:{}}),m=r||"default",a=B(m);if(e){let[p,y]=(0,l.useState)(0);if((0,l.useEffect)(()=>{let[,c]=(0,x.addSubscriber)(a.client,{$subscribe_schema:"default"},(u,f)=>{a.client.configuration||(a.client.configuration={dbs:[],schema:{},functions:{}}),a.client.configuration.schema.default=u,y(f)},u=>{u&&console.error(u)},u=>{console.error(u)},le);return()=>{(0,x.removeSubscriber)(a.client,le,c)}},[]),p){let c;typeof e=="string"?c=a.gql(e):c=e,c=(0,x.handleGraphqlVariables)(c,c,t);let u={},f={};for(let h in c.ops){if(c.ops[h].fnObserve){let{name:i,payload:d}=c.ops[h].fnObserve;u[h]={name:i,payload:d,key:h};continue}f[h]=c.ops[h].get}let w=(0,l.useMemo)(()=>(0,X.hashObjectIgnoreKeyOrder)(u),[u]),D=(0,l.useMemo)(()=>(0,x.generateSubscriptionId)(f),[f]),_=typeof m=="string"?m:$(m);if(a){let h=_+D;(0,l.useEffect)(()=>{let i=[];for(let d in u)i.push((0,x.addSubscriber)(a.client,u[d].payload,(b,k)=>{C(h,!1,!1),s.current.fns[d]!==k&&(s.current.fns[d]=k,o({merge:{[d]:b},checksum:(0,X.hashObjectIgnoreKeyOrder)(s.current)}))},b=>{b&&(console.error(b),o({error:b,loading:!1}))},b=>{console.error(b),C(h,!1,b),o({error:b})},void 0,u[d].name));return()=>{for(let[d,b]of i)(0,x.removeSubscriber)(a.client,d,b)}},[w]),(0,l.useEffect)(()=>{if(!p)return;C(h,!0,!1);let[,i]=(0,x.addSubscriber)(a.client,f,(d,b)=>{C(h,!1,!1),s.current.checksum!==b&&(s.current.checksum=b,o({merge:d,checksum:(0,X.hashObjectIgnoreKeyOrder)(s.current)}))},d=>{d&&(console.error(d),C(h,!1,d),o({error:d,loading:!1}))},d=>{console.error(d),C(h,!1,d),o({error:d})},D);return()=>{C(h,!1,!1),(0,x.removeSubscriber)(a.client,D,i)}},[D,_,p])}else(0,l.useEffect)(I,[null,null])}else(0,l.useMemo)(I,[null]),(0,l.useMemo)(I,[null]),(0,l.useEffect)(I,[null]),(0,l.useEffect)(I,[null,null,null])}else(0,l.useState)(null),(0,l.useEffect)(I,[null]),(0,l.useMemo)(I,[null]),(0,l.useMemo)(I,[null]),(0,l.useEffect)(I,[null]),(0,l.useEffect)(I,[null,null,null]);return n}function I(){}var M=require("@based/client"),L=z(require("react")),fe=require("react-window");var Se=(e,t,r,n,o,s)=>{let[,m]=(0,M.addSubscriber)(e.client,r,({items:a},p)=>{for(let y=0;y<a.length;y++)o.items[y+n]=a[y];s(`${n}-${p}`)},a=>a&&console.error(a),console.error,t);return m};function de(p){var y=p,{query:e,delay:t=100,itemSize:r=50,height:n=400,limit:o=Math.ceil(n/r),treshold:s=0,target:m="root"}=y,a=ie(y,["query","delay","itemSize","height","limit","treshold","target"]);let c=r*o,u=B(),[f,w]=(0,L.useState)(0),[D,_]=(0,L.useState)(()=>{let k=Math.ceil(n/c);return s&&(k+=Math.ceil((n/r+s-k*o)/o)),k}),[,h]=(0,L.useState)(),{current:i}=(0,L.useRef)({offset:f,blocks:D,scroll:0,items:[],timer:null,subs:{}}),{data:{itemCount:d}}=Y({itemCount:{$aggregate:Q({$function:"count"},e().$list.$find)}});if((0,L.useEffect)(()=>{if(u)return()=>{let{subs:k}=i;i.subs={},setTimeout(()=>{for(let R in k){let O=i.subs[R];(0,M.removeSubscriber)(u.client,Number(R),O)}})}},[u,i]),(0,L.useEffect)(()=>{if(u){let k={},R=D;for(;R--;){let O=f+o*R,S={$id:m,items:e(O,o)},T=(0,M.generateSubscriptionId)(S);k[T]=i.subs[T]||Se(u,T,S,O,i,h)}for(let O in i.subs)if(!(O in k)){let S=i.subs[O];(0,M.removeSubscriber)(u.client,Number(O),S)}i.subs=k}},[m,u,f,D,e,i]),(0,L.useEffect)(b,[c,t,n,r,i,o,s]),!d||!i.items.length)return null;return L.default.createElement(fe.FixedSizeList,oe(Q({},a),{height:n,itemSize:r,itemData:i.items,itemCount:d,onScroll:({scrollOffset:k})=>{i.scroll=k,b()}}));function b(){let k=Math.max(0,i.scroll/r-s),R=(i.scroll+n)/r,O=k-k%o,S=Math.ceil(n/c+i.scroll%c/c);if(s){let T=O+o*S;S+=Math.max(0,Math.ceil((R+s-T)/o))}if(O!==i.offset||S!==i.blocks){i.offset=O,i.blocks=S;let T=()=>{w(i.offset),_(i.blocks)};i.timer?clearTimeout(i.timer):T(),i.timer=setTimeout(()=>{i.timer=null,T()},t)}else i.timer&&(clearTimeout(i.timer),i.timer=setTimeout(()=>{i.timer=null,w(i.offset),_(i.blocks)},t))}}function ve(e){let t=B(e),[r,n]=(0,g.useState)(!1),[o,s]=(0,g.useState)("");return(0,g.useEffect)(()=>{let m=a=>{a?(s(t.client.user),n(a)):(s(!1),n(!1))};return t.on("auth",m),t.client.token&&m(t.client.token),()=>{t.removeListener("auth",m)}},[]),r?{token:r,id:o}:null}function De(e="default",t){let r=Y(e?{$subscribe_schema:e}:null,t);return{loading:r.loading,error:r.error,schema:r.data}}function Te(e,t,r){if(e){let o=B(r||"default"),s=(0,g.useMemo)(()=>(0,v.generateSubscriptionId)(t,e),[e,t]);(0,g.useEffect)(()=>(o.track(e,t),()=>{o.untrack(e,t)}),[s])}else B(r),(0,g.useMemo)(()=>{},[]),(0,g.useEffect)(U,[null,null])}function Y(e,t,r){let[n,o]=(0,g.useReducer)(N,{loading:!0,data:{},checksum:0});if(e){let s=(0,g.useMemo)(()=>(0,v.generateSubscriptionId)(typeof e=="string"?[e,t]:e),[t,e]),m=typeof e=="string",a=r||(m?"default":t),p=B(a),y=typeof a=="string"?a:$(a);if(p){let c=y+s;(0,g.useEffect)(()=>{C(c,!0,!1),o({error:null,loading:!0,data:{}});let[,u]=(0,v.addSubscriber)(p.client,m?t:e,(f,w)=>{C(c,!1,!1),o({data:f,checksum:w})},f=>{f&&(console.error(f),C(c,!1,f),o({error:f,loading:!1}))},f=>{console.error(f),C(c,!1,f),o({error:f})},s,typeof e=="string"?e:void 0);return()=>{C(c,!1,!1),(0,v.removeSubscriber)(p.client,s,u)}},[s,y])}else(0,g.useEffect)(U,[null,null])}else(0,g.useMemo)(U,[t,e]),B(r),(0,g.useEffect)(U,[null,null]);return n}function Re(e,t){let[r,n]=(0,g.useReducer)(N,{loading:!0,data:{},checksum:0}),o,s,a=B(t||"default");return a&&e?(0,g.useEffect)(()=>(n({error:null,loading:!0,data:{}}),(0,v.addSubscriber)(a.client,e,(p,y)=>{n({data:p,checksum:y})},(p,y,c,u,f)=>{o=y,s=c,(p||f)&&(console.error(p),n({error:p,loading:!1}))},p=>{console.error(p),n({error:p})},void 0,"analytics"),()=>{(0,v.removeSubscriber)(a.client,o,s)}),[]):(0,g.useEffect)(U,[]),r}function U(){}0&&(module.exports={BasedContext,InfiniteList,Provider,defaultCreateClient,updateMeta,useAnalytics,useAuth,useBasedContext,useClient,useClients,useData,useError,useLoading,useQuery,useSchema,useTrack});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useClient = exports.useQuery = exports.useAuthState = exports.Provider = void 0;
+const react_1 = require("react");
+const Ctx = (0, react_1.createContext)();
+const Provider = ({ client, children, }) => {
+    return (0, react_1.createElement)(Ctx.Provider, { value: client }, children);
+};
+exports.Provider = Provider;
+const useAuthState = () => {
+    const client = (0, react_1.useContext)(Ctx);
+    const [state, setState] = (0, react_1.useState)(client?.authState || {});
+    (0, react_1.useEffect)(() => {
+        if (client) {
+            setState(client.authState);
+            const listener = (authState) => {
+                setState(authState);
+            };
+            client.on('authstate-change', listener);
+            return () => client.off('authstate-change', listener);
+        }
+    }, [client]);
+    return state;
+};
+exports.useAuthState = useAuthState;
+const useQuery = (name, payload, opts) => {
+    const client = (0, react_1.useContext)(Ctx);
+    if (name) {
+        const q = client.query(name, payload, opts);
+        const { id, cache } = q;
+        const [checksum, update] = (0, react_1.useState)(cache?.checksum);
+        (0, react_1.useEffect)(() => {
+            const unsubscribe = q.subscribe((_, checksum) => {
+                update(checksum);
+            });
+            return () => {
+                unsubscribe();
+            };
+        }, [id]);
+        return cache
+            ? { loading: false, data: cache.value, checksum }
+            : { loading: true };
+    }
+    // stubs
+    (0, react_1.useEffect)(() => { }, [null]);
+    (0, react_1.useState)();
+    return { loading: true, data: null };
+};
+exports.useQuery = useQuery;
+const useClient = () => {
+    const client = (0, react_1.useContext)(Ctx);
+    return client;
+};
+exports.useClient = useClient;
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iCAOc;AAGd,MAAM,GAAG,GAAG,IAAA,qBAAa,GAAe,CAAA;AAEjC,MAAM,QAAQ,GAAG,CAAC,EACvB,MAAM,EACN,QAAQ,GAIT,EAAE,EAAE;IACH,OAAO,IAAA,qBAAa,EAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,CAAC,CAAA;AACjE,CAAC,CAAA;AARY,QAAA,QAAQ,YAQpB;AAEM,MAAM,YAAY,GAAG,GAAc,EAAE;IAC1C,MAAM,MAAM,GAAgB,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAA;IAC3C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAY,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC,CAAA;IAEtE,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,MAAM,EAAE;YACV,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YAC1B,MAAM,QAAQ,GAAG,CAAC,SAAS,EAAE,EAAE;gBAC7B,QAAQ,CAAC,SAAS,CAAC,CAAA;YACrB,CAAC,CAAA;YACD,MAAM,CAAC,EAAE,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;YACvC,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;SACtD;IACH,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;IAEZ,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAhBY,QAAA,YAAY,gBAgBxB;AAEM,MAAM,QAAQ,GAAG,CACtB,IAAa,EACb,OAAa,EACb,IAEC,EAKD,EAAE;IACF,MAAM,MAAM,GAAgB,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAA;IAE3C,IAAI,IAAI,EAAE;QACR,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QAC3C,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,CAAA;QACvB,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAEpD,IAAA,iBAAS,EAAC,GAAG,EAAE;YACb,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE;gBAC9C,MAAM,CAAC,QAAQ,CAAC,CAAA;YAClB,CAAC,CAAC,CAAA;YAEF,OAAO,GAAG,EAAE;gBACV,WAAW,EAAE,CAAA;YACf,CAAC,CAAA;QACH,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;QAER,OAAO,KAAK;YACV,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE;YACjD,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;KACtB;IAED,QAAQ;IACR,IAAA,iBAAS,EAAC,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3B,IAAA,gBAAQ,GAAE,CAAA;IAEV,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;AACtC,CAAC,CAAA;AAtCY,QAAA,QAAQ,YAsCpB;AAEM,MAAM,SAAS,GAAG,GAAgB,EAAE;IACzC,MAAM,MAAM,GAAG,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAA;IAC9B,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAHY,QAAA,SAAS,aAGrB"}

package/package.json

@@ -1,30 +1,21 @@
 {
   "name": "@based/react",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "license": "MIT",
-  "source": "src/index.tsx",
   "main": "dist/index.js",
   "scripts": {
-    "buildBundle": "node ./build/index.js",
-    "build": "npx tsc && npm run buildBundle",
+    "build": "npx  tsc",
     "watch": "npm run build -- --watch",
     "clean": "rimraf {.turbo,dist,node_modules}"
   },
   "sideEffects": false,
-  "peerDependencies": {
-    "@based/client": "^3.0.0",
-    "react": "17||18||16"
-  },
-  "dependencies": {
-    "@saulx/hash": "^1.1.0",
-    "react-window": "^1.8.7"
-  },
   "devDependencies": {
-    "@based/client": "^3.3.0",
-    "@types/react": "^17.0.14",
-    "esbuild": "^0.14.29",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.1.0",
+    "ts-node": "10.9.1",
     "typescript": "^4.3.5"
+  },
+  "peerDependencies": {
+    "@based/client": "4",
+    "react": "16||17||18"
   }
 }

package/src/index.ts

@@ -1,272 +1,84 @@
-import { useEffect, useMemo, useReducer, useState } from 'react'
-
 import {
-  Query,
-  addSubscriber,
-  removeSubscriber,
-  generateSubscriptionId,
-  BasedOpts,
-  AnalyticsHistoryOpts,
-  AnalyticsOpts,
-  AnalyticsTypesOpts,
-} from '@based/client'
-
-import { resultReducer } from './reducer'
-
-import { Loading, Data } from './types'
-
-import { genOptsId } from './genOptsId'
-
-import { useClient } from './clients'
-
-import { updateMeta } from './meta'
-
-export * from './meta'
-export * from './clients'
-export * from './gql'
+  useContext,
+  createContext,
+  createElement,
+  ReactNode,
+  useState,
+  useEffect,
+} from 'react'
+import { BasedClient, AuthState } from '@based/client'
+
+const Ctx = createContext<BasedClient>()
+
+export const Provider = ({
+  client,
+  children,
+}: {
+  client: BasedClient
+  children: ReactNode
+}) => {
+  return createElement(Ctx.Provider, { value: client }, children)
+}
 
-export { InfiniteList } from './components/InfiniteList'
+export const useAuthState = (): AuthState => {
+  const client: BasedClient = useContext(Ctx)
+  const [state, setState] = useState<AuthState>(client?.authState || {})
 
-export function useAuth(
-  clientSelector?: string | (BasedOpts & { key?: string })
-): { id: string | false; token: string } {
-  const client = useClient(clientSelector)
-  const [token, setToken] = useState<false | string>(false)
-  const [id, setId] = useState<false | string>('')
   useEffect(() => {
-    const t = (d: string) => {
-      if (d) {
-        setId(client.client.user)
-        setToken(d)
-      } else {
-        setId(false)
-        setToken(false)
+    if (client) {
+      setState(client.authState)
+      const listener = (authState) => {
+        setState(authState)
       }
+      client.on('authstate-change', listener)
+      return () => client.off('authstate-change', listener)
     }
-    client.on('auth', t)
-    if (client.client.token) {
-      t(client.client.token)
-    }
-    return () => {
-      client.removeListener('auth', t)
-    }
-  }, [])
-  return token ? { token, id } : null
+  }, [client])
+
+  return state
 }
 
-export function useSchema(
-  name: string | null | false = 'default',
-  clientSelector?: string | (BasedOpts & { key?: string })
+export const useQuery = (
+  name?: string,
+  payload?: any,
+  opts?: {
+    persistent: boolean
+  }
 ): {
-  schema: Data
-  error?: Error
-  loading: Loading
-} {
-  const x = useData(
-    name
-      ? {
-          $subscribe_schema: name,
-        }
-      : null,
-    clientSelector
-  )
+  loading: boolean
+  data?: any
+  checksum?: number
+} => {
+  const client: BasedClient = useContext(Ctx)
 
-  return {
-    loading: x.loading,
-    error: x.error,
-    schema: x.data,
-  }
-}
+  if (name) {
+    const q = client.query(name, payload, opts)
+    const { id, cache } = q
+    const [checksum, update] = useState(cache?.checksum)
 
-export function useTrack(
-  type: string,
-  params?: { [key: string]: number | string | boolean },
-  clientSelector?: string | (BasedOpts & { key?: string })
-): void {
-  if (type) {
-    const selector = clientSelector || 'default'
-    const client = useClient(selector)
-    const id = useMemo(() => {
-      return generateSubscriptionId(params, type)
-    }, [type, params])
     useEffect(() => {
-      client.track(type, params)
+      const unsubscribe = q.subscribe((_, checksum) => {
+        update(checksum)
+      })
+
       return () => {
-        client.untrack(type, params)
+        unsubscribe()
       }
     }, [id])
-  } else {
-    useClient(clientSelector)
-    useMemo(() => {}, [])
-    useEffect(stubFn, [null, null])
-  }
-}
-
-export function useData(
-  query: Query,
-  clientSelector?: string | (BasedOpts & { key?: string })
-): {
-  data: Data
-  error?: Error
-  loading: Loading
-  checksum: number
-}
-
-export function useData(name: string): {
-  data: Data
-  error?: Error
-  loading: Loading
-  checksum: number
-}
-
-export function useData(query: null): {
-  data: Data
-  error?: Error
-  loading: Loading
-  checksum: number
-}
-
-export function useData(): {
-  data: Data
-  error?: Error
-  loading: Loading
-  checksum: number
-}
-
-export function useData(
-  name: string,
-  payload: any,
-  clientSelector?: string | (BasedOpts & { key?: string })
-): { data: Data; error?: Error; loading: Loading; checksum: number }
-
-export function useData(
-  a?: string | Query,
-  payload?: any,
-  clientSelector?: string | (BasedOpts & { key?: string })
-): {
-  data: Data
-  error?: Error
-  loading: Loading
-} {
-  const [result, dispatch] = useReducer(resultReducer, {
-    loading: true,
-    data: {},
-    checksum: 0,
-  })
 
-  if (a) {
-    const subId = useMemo(() => {
-      return 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
-
-      useEffect(() => {
-        updateMeta(subKey, true, false)
-        dispatch({ error: null, loading: true, data: {} })
-        const [, subscriberId] = 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)
-          removeSubscriber(client.client, subId, subscriberId)
-        }
-      }, [subId, clientKey])
-    } else {
-      useEffect(stubFn, [null, null])
-    }
-  } else {
-    useMemo(stubFn, [payload, a])
-    useClient(clientSelector)
-    useEffect(stubFn, [null, null])
+    return cache
+      ? { loading: false, data: cache.value, checksum }
+      : { loading: true }
   }
 
-  return result
-}
-
-export function useAnalytics(
-  params?: AnalyticsHistoryOpts | AnalyticsTypesOpts | AnalyticsOpts,
-  clientSelector?: string | (BasedOpts & { key?: string })
-): { data: Data; error?: Error; loading: Loading } {
-  const [result, dispatch] = useReducer(resultReducer, {
-    loading: true,
-    data: {},
-    checksum: 0,
-  })
-
-  let subId, subscriberId
-
-  const selector = clientSelector || 'default'
-  const client = useClient(selector)
+  // stubs
+  useEffect(() => {}, [null])
+  useState()
 
-  if (client && params) {
-    useEffect(() => {
-      dispatch({ error: null, loading: true, data: {} })
-      addSubscriber(
-        client.client,
-        params,
-        // onData:
-        (d, checksum) => {
-          // updateMeta(subKey, false, false) ??
-          dispatch({ data: d, checksum })
-        },
-        // onInitial:
-        (err, subscriptionId, subscriberIdInner, _data, isAuthError) => {
-          subId = subscriptionId
-          subscriberId = subscriberIdInner
-          if (err || isAuthError) {
-            console.error(err)
-            // updateMeta(subKey, false, err)
-            dispatch({ error: err, loading: false })
-          }
-        },
-        // onError:
-        (err) => {
-          console.error(err)
-          // updateMeta(subKey, false, err)
-          dispatch({ error: err })
-        },
-        undefined,
-        'analytics'
-      )
-      return () => {
-        removeSubscriber(client.client, subId, subscriberId)
-      }
-    }, [])
-  } else {
-    useEffect(stubFn, [])
-  }
-
-  return result
+  return { loading: true, data: null }
 }
 
-function stubFn() {}
+export const useClient = (): BasedClient => {
+  const client = useContext(Ctx)
+  return client
+}

package/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist"
+  },
+  "include": ["src/**/*", "src/**/*.json"],
+  "exclude": ["node_modules", "test", "dist", "tmp", "examples"]
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Saulx B.V.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/README.md

@@ -1,69 +0,0 @@
-# @based/react
-
-React hooks for the based data platform
-
-> [Example react project here](https://github.com/atelier-saulx/based-react-sample)
-
-> Read more about [based](https://github.com/atelier-saulx/based/blob/main/packages/client/README.md)
-
----
-
-```js
-import based from "@based/client"
-import { Provider, useData, useClient } from "@based/react"
-import React from "react"
-import ReactDom from "react-dom"
-
-const client = based({ env: "prod", project: "someproject", org: "a-org" })
-
-const Things = () => {
-  const client = useClient()
-
-  // automatically observes data when components get rendered
-  const { data, loading, error } = useData({
-    things: {
-      id: true,
-      name: true,
-      $list: true,
-    },
-  })
-
-  if (loading) {
-    return <div>loading...</div>
-  }
-
-  return (
-    <div>
-      {data.things.map((thing) => (
-        <div
-          key={thing.id}
-          onClick={(e) => {
-            client.set({ $id: thing.id, name: "Some random name!" })
-          }}
-        >
-          {thing.name}
-        </div>
-      ))}
-    </div>
-  )
-}
-
-const App = () => {
-  return (
-    <Provider client={client}>
-      <Things />
-    </Provider>
-  )
-}
-
-ReactDom.render(<App />, document.body)
-```
-
-
----
-
-## License
-
-Licensed under the MIT License.
-
-See [LICENSE](./LICENSE) for more information.