@automerge/automerge-repo-react-hooks 1.1.0 → 1.1.2

package/dist/index.js

@@ -1,293 +1 @@
-import I, { createContext as H, useContext as j, useState as E, useRef as A, useEffect as _, useMemo as V } from "react";
-const $ = H(null);
-function L() {
-  const e = j($);
-  if (!e)
-    throw new Error("Repo was not found on RepoContext.");
-  return e;
-}
-function J(e) {
-  const [a, s] = E(), f = L(), p = e ? f.find(e) : null, d = A(null);
-  return _(() => {
-    if (s(void 0), !p)
-      return;
-    d.current = p, p.doc().then((t) => {
-      d.current === p && s(t);
-    }).catch((t) => console.error(t));
-    const l = (t) => s(t.doc);
-    return p.on("change", l), () => {
-      p.removeListener("change", l);
-    };
-  }, [p]), [a, (l, o) => {
-    p && p.change(l, o);
-  }];
-}
-const K = (e) => {
-  const [a, s] = E({}), [f, p] = E({}), d = L();
-  return _(
-    () => {
-      const v = (n, r) => {
-        r && s((i) => ({ ...i, [n]: r }));
-      }, l = (n) => {
-        const r = n.documentId, i = ({ doc: h }) => v(r, h);
-        n.on("change", i), p((h) => ({ ...h, [r]: i }));
-      }, o = (n) => {
-        d.find(n).off("change", f[n]), s((i) => {
-          const { [n]: h, ...u } = i;
-          return u;
-        });
-      };
-      return e && (e.filter((i) => !a[i]).forEach((i) => {
-        const h = d.find(i);
-        h.doc().then((u) => {
-          v(i, u), l(h);
-        });
-      }), Object.keys(a).map((i) => i).filter((i) => !e.includes(i)).forEach(o)), () => {
-        Object.entries(f).forEach(([n, r]) => {
-          d.find(n).off("change", r);
-        });
-      };
-    },
-    [e]
-    // only run this effect when the list of ids changes
-  ), a;
-}, F = (e, a = !1) => {
-  history[a ? "pushState" : "replaceState"]("", "", "#" + e), window.dispatchEvent(
-    new HashChangeEvent("hashchange", {
-      newURL: window.location.origin + window.location.pathname + e,
-      oldURL: window.location.href
-    })
-  );
-}, M = () => {
-  const [e, a] = E(window.location.hash);
-  return _(() => {
-    const s = () => void a(window.location.hash);
-    return window.addEventListener("hashchange", s), () => void window.removeEventListener("hashchange", s);
-  }, []), e;
-}, C = (e, a) => new URLSearchParams(a.slice(1)).get(e), Q = (e, a, s) => {
-  const f = new URLSearchParams(s.slice(1));
-  return f.set(e, a), f.toString();
-}, q = (e, a) => e && (C(e, a) || localStorage.getItem(e)), B = (e, a) => {
-  e && a !== C(e, window.location.hash) && F(Q(e, a, window.location.hash)), e && localStorage.setItem(e, a);
-}, W = ({
-  key: e = "automergeUrl",
-  onNoDocument: a = (f) => f.create(),
-  onInvalidAutomergeUrl: s
-} = {}) => {
-  const f = L(), p = M(), d = V(() => {
-    const v = q(e, p);
-    try {
-      return v ? f.find(v) : a(f);
-    } catch (l) {
-      if (v && s)
-        return s(f, l);
-      throw l;
-    }
-  }, [p, f, a, s]);
-  return _(() => {
-    d && B(e, d.url);
-  }, [p, d]), d;
-};
-function X(e) {
-  const a = L(), [s, f] = E(
-    e ? a.find(e) : void 0
-  );
-  return _(() => {
-    f(e ? a.find(e) : void 0);
-  }, [e]), s;
-}
-function O(e) {
-  return e && e.__esModule && Object.prototype.hasOwnProperty.call(e, "default") ? e.default : e;
-}
-var x = I, N = function(e) {
-  return typeof e == "function";
-}, T = function(e) {
-  var a = x.useState(e), s = a[0], f = a[1], p = x.useRef(s), d = x.useCallback(function(v) {
-    p.current = N(v) ? v(p.current) : v, f(p.current);
-  }, []);
-  return [s, d, p];
-}, U = T;
-const S = /* @__PURE__ */ O(U);
-var P = { exports: {} };
-(function(e) {
-  var a = Object.prototype.hasOwnProperty, s = "~";
-  function f() {
-  }
-  Object.create && (f.prototype = /* @__PURE__ */ Object.create(null), new f().__proto__ || (s = !1));
-  function p(o, t, n) {
-    this.fn = o, this.context = t, this.once = n || !1;
-  }
-  function d(o, t, n, r, i) {
-    if (typeof n != "function")
-      throw new TypeError("The listener must be a function");
-    var h = new p(n, r || o, i), u = s ? s + t : t;
-    return o._events[u] ? o._events[u].fn ? o._events[u] = [o._events[u], h] : o._events[u].push(h) : (o._events[u] = h, o._eventsCount++), o;
-  }
-  function v(o, t) {
-    --o._eventsCount === 0 ? o._events = new f() : delete o._events[t];
-  }
-  function l() {
-    this._events = new f(), this._eventsCount = 0;
-  }
-  l.prototype.eventNames = function() {
-    var t = [], n, r;
-    if (this._eventsCount === 0)
-      return t;
-    for (r in n = this._events)
-      a.call(n, r) && t.push(s ? r.slice(1) : r);
-    return Object.getOwnPropertySymbols ? t.concat(Object.getOwnPropertySymbols(n)) : t;
-  }, l.prototype.listeners = function(t) {
-    var n = s ? s + t : t, r = this._events[n];
-    if (!r)
-      return [];
-    if (r.fn)
-      return [r.fn];
-    for (var i = 0, h = r.length, u = new Array(h); i < h; i++)
-      u[i] = r[i].fn;
-    return u;
-  }, l.prototype.listenerCount = function(t) {
-    var n = s ? s + t : t, r = this._events[n];
-    return r ? r.fn ? 1 : r.length : 0;
-  }, l.prototype.emit = function(t, n, r, i, h, u) {
-    var m = s ? s + t : t;
-    if (!this._events[m])
-      return !1;
-    var c = this._events[m], g = arguments.length, y, w;
-    if (c.fn) {
-      switch (c.once && this.removeListener(t, c.fn, void 0, !0), g) {
-        case 1:
-          return c.fn.call(c.context), !0;
-        case 2:
-          return c.fn.call(c.context, n), !0;
-        case 3:
-          return c.fn.call(c.context, n, r), !0;
-        case 4:
-          return c.fn.call(c.context, n, r, i), !0;
-        case 5:
-          return c.fn.call(c.context, n, r, i, h), !0;
-        case 6:
-          return c.fn.call(c.context, n, r, i, h, u), !0;
-      }
-      for (w = 1, y = new Array(g - 1); w < g; w++)
-        y[w - 1] = arguments[w];
-      c.fn.apply(c.context, y);
-    } else {
-      var D = c.length, b;
-      for (w = 0; w < D; w++)
-        switch (c[w].once && this.removeListener(t, c[w].fn, void 0, !0), g) {
-          case 1:
-            c[w].fn.call(c[w].context);
-            break;
-          case 2:
-            c[w].fn.call(c[w].context, n);
-            break;
-          case 3:
-            c[w].fn.call(c[w].context, n, r);
-            break;
-          case 4:
-            c[w].fn.call(c[w].context, n, r, i);
-            break;
-          default:
-            if (!y)
-              for (b = 1, y = new Array(g - 1); b < g; b++)
-                y[b - 1] = arguments[b];
-            c[w].fn.apply(c[w].context, y);
-        }
-    }
-    return !0;
-  }, l.prototype.on = function(t, n, r) {
-    return d(this, t, n, r, !1);
-  }, l.prototype.once = function(t, n, r) {
-    return d(this, t, n, r, !0);
-  }, l.prototype.removeListener = function(t, n, r, i) {
-    var h = s ? s + t : t;
-    if (!this._events[h])
-      return this;
-    if (!n)
-      return v(this, h), this;
-    var u = this._events[h];
-    if (u.fn)
-      u.fn === n && (!i || u.once) && (!r || u.context === r) && v(this, h);
-    else {
-      for (var m = 0, c = [], g = u.length; m < g; m++)
-        (u[m].fn !== n || i && !u[m].once || r && u[m].context !== r) && c.push(u[m]);
-      c.length ? this._events[h] = c.length === 1 ? c[0] : c : v(this, h);
-    }
-    return this;
-  }, l.prototype.removeAllListeners = function(t) {
-    var n;
-    return t ? (n = s ? s + t : t, this._events[n] && v(this, n)) : (this._events = new f(), this._eventsCount = 0), this;
-  }, l.prototype.off = l.prototype.removeListener, l.prototype.addListener = l.prototype.on, l.prefixed = s, l.EventEmitter = l, e.exports = l;
-})(P);
-var k = P.exports;
-const z = /* @__PURE__ */ O(k), R = new z(), Y = ({
-  handle: e,
-  localUserId: a,
-  offlineTimeout: s = 3e4,
-  getTime: f = () => (/* @__PURE__ */ new Date()).getTime()
-}) => {
-  const [p, d, v] = S({}), [l, o, t] = S({});
-  return _(() => {
-    const n = (h) => {
-      const [u, m] = h.message;
-      u !== a && (t.current[u] || R.emit("new_peer", h), d({
-        ...v.current,
-        [u]: m
-      }), o({
-        ...t.current,
-        [u]: f()
-      }));
-    }, r = () => {
-      const h = v.current, u = t.current, m = f();
-      for (const c in u)
-        m - u[c] > s && (delete h[c], delete u[c]);
-      d(h), o(u);
-    };
-    e.on("ephemeral-message", n);
-    const i = setInterval(
-      r,
-      s
-    );
-    return () => {
-      e.removeListener("ephemeral-message", n), clearInterval(i);
-    };
-  }, [e, a, s, f]), [p, l];
-}, Z = ({
-  handle: e,
-  userId: a,
-  initialState: s,
-  heartbeatTime: f = 15e3
-}) => {
-  const [p, d, v] = S(s), l = (o) => {
-    const t = typeof o == "function" ? o(v.current) : o;
-    d(t), e.broadcast([a, t]);
-  };
-  return _(() => {
-    const o = () => void e.broadcast([a, v.current]);
-    o();
-    const t = setInterval(o, f);
-    return () => void clearInterval(t);
-  }, [e, a, f]), _(() => {
-    let o;
-    const t = R.on("new_peer", () => {
-      o = setTimeout(
-        () => e.broadcast([a, v.current]),
-        500
-        // Wait for the peer to be ready
-      );
-    });
-    return () => {
-      t.off("new_peer"), o && clearTimeout(o);
-    };
-  }, [e, a, R]), [p, l];
-};
-export {
-  $ as RepoContext,
-  W as useBootstrap,
-  J as useDocument,
-  K as useDocuments,
-  X as useHandle,
-  Z as useLocalAwareness,
-  Y as useRemoteAwareness,
-  L as useRepo
-};
+import T,{createContext as k,useContext as A,useState as x,useRef as U,useEffect as g,useMemo as D}from"react";const O=k(null);function b(){const t=A(O);if(!t)throw new Error("Repo was not found on RepoContext.");return t}function P(t){const[s,o]=x(),i=b(),f=t?i.find(t):null,d=U(null);return g(()=>{if(o(void 0),!f)return;d.current=f,f.doc().then(a=>{d.current===f&&o(a)}).catch(a=>console.error(a));const u=a=>o(a.doc);return f.on("change",u),()=>{f.removeListener("change",u)}},[f]),[s,(u,a)=>{f&&f.change(u,a)}]}const H=t=>{const[s,o]=x({}),[i,f]=x({}),d=b();return g(()=>{const u=(e,r)=>{r&&o(l=>({...l,[e]:r}))},a=e=>{const r=e.documentId,l=({doc:v})=>u(r,v);e.on("change",l),f(v=>({...v,[r]:l}))},n=e=>{d.find(e).off("change",i[e]),o(r=>{const{[e]:l,...v}=r;return v})};return t&&(t.filter(e=>!s[e]).forEach(e=>{const r=d.find(e);r.doc().then(l=>{u(e,l),a(r)}).catch(l=>{console.error(`Error loading document ${e} in useDocuments: `,l)})}),Object.keys(s).map(e=>e).filter(e=>!t.includes(e)).forEach(n)),()=>{Object.entries(i).forEach(([e,r])=>{d.find(e).off("change",r)})}},[t]),s},M=(t,s=!1)=>{history[s?"pushState":"replaceState"]("","","#"+t),window.dispatchEvent(new HashChangeEvent("hashchange",{newURL:window.location.origin+window.location.pathname+t,oldURL:window.location.href}))},N=()=>{const[t,s]=x(window.location.hash);return g(()=>{const o=()=>void s(window.location.hash);return window.addEventListener("hashchange",o),()=>void window.removeEventListener("hashchange",o)},[]),t},S=(t,s)=>new URLSearchParams(s.slice(1)).get(t),B=(t,s,o)=>{const i=new URLSearchParams(o.slice(1));return i.set(t,s),i.toString()},$=(t,s)=>t&&(S(t,s)||localStorage.getItem(t)),q=(t,s)=>{t&&s!==S(t,window.location.hash)&&M(B(t,s,window.location.hash)),t&&localStorage.setItem(t,s)},z=({key:t="automergeUrl",onNoDocument:s=i=>i.create(),onInvalidAutomergeUrl:o}={})=>{const i=b(),f=N(),d=D(()=>{const u=$(t,f);try{return u?i.find(u):s(i)}catch(a){if(u&&o)return o(i,a);throw a}},[f,i,s,o]);return g(()=>{d&&q(t,d.url)},[f,d]),d};function F(t){const s=b(),[o,i]=x(t?s.find(t):void 0);return g(()=>{i(t?s.find(t):void 0)},[t]),o}function R(t){return t&&t.__esModule&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t}var L=T,J=function(t){return typeof t=="function"},K=function(t){var s=L.useState(t),o=s[0],i=s[1],f=L.useRef(o),d=L.useCallback(function(u){f.current=J(u)?u(f.current):u,i(f.current)},[]);return[o,d,f]},Q=K;const E=R(Q);var I={exports:{}};(function(t){var s=Object.prototype.hasOwnProperty,o="~";function i(){}Object.create&&(i.prototype=Object.create(null),new i().__proto__||(o=!1));function f(n,e,r){this.fn=n,this.context=e,this.once=r||!1}function d(n,e,r,l,v){if(typeof r!="function")throw new TypeError("The listener must be a function");var p=new f(r,l||n,v),h=o?o+e:e;return n._events[h]?n._events[h].fn?n._events[h]=[n._events[h],p]:n._events[h].push(p):(n._events[h]=p,n._eventsCount++),n}function u(n,e){--n._eventsCount===0?n._events=new i:delete n._events[e]}function a(){this._events=new i,this._eventsCount=0}a.prototype.eventNames=function(){var n=[],e,r;if(this._eventsCount===0)return n;for(r in e=this._events)s.call(e,r)&&n.push(o?r.slice(1):r);return Object.getOwnPropertySymbols?n.concat(Object.getOwnPropertySymbols(e)):n},a.prototype.listeners=function(n){var e=o?o+n:n,r=this._events[e];if(!r)return[];if(r.fn)return[r.fn];for(var l=0,v=r.length,p=new Array(v);l<v;l++)p[l]=r[l].fn;return p},a.prototype.listenerCount=function(n){var e=o?o+n:n,r=this._events[e];return r?r.fn?1:r.length:0},a.prototype.emit=function(n,e,r,l,v,p){var h=o?o+n:n;if(!this._events[h])return!1;var c=this._events[h],m=arguments.length,y,w;if(c.fn){switch(c.once&&this.removeListener(n,c.fn,void 0,!0),m){case 1:return c.fn.call(c.context),!0;case 2:return c.fn.call(c.context,e),!0;case 3:return c.fn.call(c.context,e,r),!0;case 4:return c.fn.call(c.context,e,r,l),!0;case 5:return c.fn.call(c.context,e,r,l,v),!0;case 6:return c.fn.call(c.context,e,r,l,v,p),!0}for(w=1,y=new Array(m-1);w<m;w++)y[w-1]=arguments[w];c.fn.apply(c.context,y)}else{var j=c.length,_;for(w=0;w<j;w++)switch(c[w].once&&this.removeListener(n,c[w].fn,void 0,!0),m){case 1:c[w].fn.call(c[w].context);break;case 2:c[w].fn.call(c[w].context,e);break;case 3:c[w].fn.call(c[w].context,e,r);break;case 4:c[w].fn.call(c[w].context,e,r,l);break;default:if(!y)for(_=1,y=new Array(m-1);_<m;_++)y[_-1]=arguments[_];c[w].fn.apply(c[w].context,y)}}return!0},a.prototype.on=function(n,e,r){return d(this,n,e,r,!1)},a.prototype.once=function(n,e,r){return d(this,n,e,r,!0)},a.prototype.removeListener=function(n,e,r,l){var v=o?o+n:n;if(!this._events[v])return this;if(!e)return u(this,v),this;var p=this._events[v];if(p.fn)p.fn===e&&(!l||p.once)&&(!r||p.context===r)&&u(this,v);else{for(var h=0,c=[],m=p.length;h<m;h++)(p[h].fn!==e||l&&!p[h].once||r&&p[h].context!==r)&&c.push(p[h]);c.length?this._events[v]=c.length===1?c[0]:c:u(this,v)}return this},a.prototype.removeAllListeners=function(n){var e;return n?(e=o?o+n:n,this._events[e]&&u(this,e)):(this._events=new i,this._eventsCount=0),this},a.prototype.off=a.prototype.removeListener,a.prototype.addListener=a.prototype.on,a.prefixed=o,a.EventEmitter=a,t.exports=a})(I);var V=I.exports;const W=R(V),C=new W,X=({handle:t,localUserId:s,offlineTimeout:o=3e4,getTime:i=()=>new Date().getTime()})=>{const[f,d,u]=E({}),[a,n,e]=E({});return g(()=>{const r=p=>{const[h,c]=p.message;h!==s&&(e.current[h]||C.emit("new_peer",p),d({...u.current,[h]:c}),n({...e.current,[h]:i()}))},l=()=>{const p=u.current,h=e.current,c=i();for(const m in h)c-h[m]>o&&(delete p[m],delete h[m]);d(p),n(h)};t.on("ephemeral-message",r);const v=setInterval(l,o);return()=>{t.removeListener("ephemeral-message",r),clearInterval(v)}},[t,s,o,i]),[f,a]},Y=({handle:t,userId:s,initialState:o,heartbeatTime:i=15e3})=>{const[f,d,u]=E(o),a=n=>{const e=typeof n=="function"?n(u.current):n;d(e),t.broadcast([s,e])};return g(()=>{if(!s)return;const n=()=>void t.broadcast([s,u.current]);n();const e=setInterval(n,i);return()=>void clearInterval(e)},[t,s,i]),g(()=>{let n;const e=C.on("new_peer",()=>{n=setTimeout(()=>t.broadcast([s,u.current]),500)});return()=>{e.off("new_peer"),n&&clearTimeout(n)}},[t,s,C]),[f,a]};export{O as RepoContext,z as useBootstrap,P as useDocument,H as useDocuments,F as useHandle,Y as useLocalAwareness,X as useRemoteAwareness,b as useRepo};

package/dist/useDocuments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDocuments.d.ts","sourceRoot":"","sources":["../src/useDocuments.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,UAAU,EACX,MAAM,2BAA2B,CAAA;AAIlC;;;GAGG;AACH,eAAO,MAAM,YAAY,YAAa,KAAK,EAAE,qBAmE5C,CAAA;AAED,KAAK,KAAK,GAAG,UAAU,GAAG,YAAY,CAAA"}
+{"version":3,"file":"useDocuments.d.ts","sourceRoot":"","sources":["../src/useDocuments.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,UAAU,EACX,MAAM,2BAA2B,CAAA;AAIlC;;;GAGG;AACH,eAAO,MAAM,YAAY,YAAa,KAAK,EAAE,qBAqE5C,CAAA;AAED,KAAK,KAAK,GAAG,UAAU,GAAG,YAAY,CAAA"}

package/dist/useLocalAwareness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLocalAwareness.d.ts","sourceRoot":"","sources":["../src/useLocalAwareness.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,MAAM,WAAW,sBAAsB;IACrC,qDAAqD;IACrD,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;IAC1B,mBAAmB;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,6DAA6D;IAC7D,YAAY,EAAE,GAAG,CAAA;IACjB,wCAAwC;IACxC,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AACD;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,iBAAiB,qDAK3B,sBAAsB,UA6CxB,CAAA"}
+{"version":3,"file":"useLocalAwareness.d.ts","sourceRoot":"","sources":["../src/useLocalAwareness.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,MAAM,WAAW,sBAAsB;IACrC,qDAAqD;IACrD,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;IAC1B,mBAAmB;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,6DAA6D;IAC7D,YAAY,EAAE,GAAG,CAAA;IACjB,wCAAwC;IACxC,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AACD;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,iBAAiB,qDAK3B,sBAAsB,UAmDxB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-react-hooks",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Hooks to access an Automerge Repo from your react app.",
   "repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-react-hooks",
   "author": "Peter van Hardenberg <pvh@pvh.ca>",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@automerge/automerge": "^2.1.9",
-    "@automerge/automerge-repo": "1.1.0",
+    "@automerge/automerge-repo": "1.1.2",
     "eventemitter3": "^5.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e9e7d3f27ec2ac8a2e9d122ece80598918940067"
+  "gitHead": "8bcba031ae952b1f3302cd41d1066cd2db5b677f"
 }

package/src/useDocuments.ts

@@ -54,6 +54,8 @@ export const useDocuments = <T>(ids?: DocId[]) => {
           handle.doc().then(doc => {
             updateDocument(id, doc)
             addListener(handle)
+          }).catch(err => {
+            console.error(`Error loading document ${id} in useDocuments: `, err)
           })
         })
 

package/src/useLocalAwareness.ts

@@ -47,6 +47,12 @@ export const useLocalAwareness = ({
   }
 
   useEffect(() => {
+    // Don't broadcast if userId isn't set: this avoids bogus broadcasts
+    // during the loading of a userId document.
+    if (!userId) {
+      return
+    }
+
     // Send periodic heartbeats
     const heartbeat = () =>
       void handle.broadcast([userId, localStateRef.current])