@civet/events 4.0.0 → 4.1.0

package/dist/EventReceiver.d.ts

@@ -1,9 +1,9 @@
-import { Constructor, GenericDataProvider, Notifier, ResourceContextValue } from '@civet/core';
+import { Notifier, Constructor, GenericDataProvider, ResourceContextValue } from '@civet/core';
 export default abstract class EventReceiver<Event, Resource extends ResourceContextValue<GenericDataProvider>, Options> {
     readonly _inferEvent: Event;
     readonly _inferResource: Resource;
     readonly _inferOptions: Options;
-    subscribe<EventI extends Event = Event, ResourceI extends Resource = Resource, OptionsI extends Options = Options>(resource: Notifier<[ResourceI | undefined]>, options: OptionsI | undefined, handler: (events: EventI[]) => void): () => void;
+    subscribe<EventI extends Event = Event, ResourceI extends Resource = Resource, OptionsI extends Options = Options>(resource: ResourceI | Notifier<[ResourceI | undefined]> | undefined, options: OptionsI | undefined, handler: (events: EventI[]) => void): () => void;
     abstract handleSubscribe(resource: Notifier<[Resource | undefined]>, options: Options | undefined, handler: (events: Event[]) => void): () => void;
 }
 export declare const isEventReceiver: (eventReceiver: unknown) => boolean;

package/dist/main.js

@@ -1,9 +1,9 @@
-import { createContext as H, useContext as P, useMemo as N, useState as y, useEffect as q } from "react";
-import { jsx as x, Fragment as A } from "react/jsx-runtime";
-import { useResourceContext as M, Notifier as B, createPlugin as I } from "@civet/core";
-const l = H({});
-l.displayName = "Events.ConfigContext";
-const V = l.Consumer, k = () => P(l);
+import { createContext as N, useContext as P, useMemo as A, useState as E, useEffect as h } from "react";
+import { jsx as j, Fragment as M } from "react/jsx-runtime";
+import { Notifier as l, useResourceContext as B, createPlugin as I } from "@civet/core";
+const a = N({});
+a.displayName = "Events.ConfigContext";
+const V = a.Consumer, k = () => P(a);
 function W(...o) {
   return (...e) => o.reduce(
     (t, r) => t || (typeof r == "function" ? r(...e) : !1),
@@ -17,14 +17,14 @@ class z {
   subscribe(e, t, r) {
     if (typeof r != "function")
       throw new Error("Handler must be a function");
-    const n = this.handleSubscribe(
-      e,
+    const n = e instanceof l ? e : new l(), s = this.handleSubscribe(
+      n,
       t,
       r
     );
-    return typeof n != "function" && console.warn(
+    return e instanceof l || n.trigger(e), typeof s != "function" && console.warn(
       "EventReceiver.handleSubscribe should return a callback to cancel the subscription. Ignoring this warning may result in the execution of obsolete handlers and potential memory leaks."
-    ), n;
+    ), s;
   }
 }
 const X = (o) => o instanceof z;
@@ -32,15 +32,15 @@ function Y({
   eventReceiver: o,
   children: e
 }) {
-  const t = N(() => ({ eventReceiver: o }), [o]);
-  return /* @__PURE__ */ x(l.Provider, { value: t, children: e });
+  const t = A(() => ({ eventReceiver: o }), [o]);
+  return /* @__PURE__ */ j(a.Provider, { value: t, children: e });
 }
 function G(o) {
   return o && o.__esModule && Object.prototype.hasOwnProperty.call(o, "default") ? o.default : o;
 }
-var E, h;
+var C, x;
 function J() {
-  return h || (h = 1, E = function o(e, t) {
+  return x || (x = 1, C = function o(e, t) {
     if (e === t) return !0;
     if (e && t && typeof e == "object" && typeof t == "object") {
       if (e.constructor !== t.constructor) return !1;
@@ -64,11 +64,11 @@ function J() {
       return !0;
     }
     return e !== e && t !== t;
-  }), E;
+  }), C;
 }
 var K = J();
 const L = /* @__PURE__ */ G(K);
-function j({
+function w({
   eventReceiver: o,
   resource: e,
   disabled: t,
@@ -76,45 +76,45 @@ function j({
   onEvent: n,
   onNotify: s
 }) {
-  const c = k(), a = o || c.eventReceiver, D = M(), u = e === null ? void 0 : e || D, [i, w] = y(
+  const c = k(), p = o || c.eventReceiver, D = B(), u = e === null ? void 0 : e || D, [i, S] = E(
     u
   );
-  u?.request !== i?.request && w(u);
-  const [p, S] = y(r);
-  L(p, r) || S(r);
-  const C = !!(t || u?.isDisabled), [
-    [R, b, v] = [],
-    O
-  ] = y();
-  q(() => {
-    if (a == null || C) {
-      O(void 0);
+  u?.request !== i?.request && S(u);
+  const [v, _] = E(r);
+  L(v, r) || _(r);
+  const R = !!(t || u?.isDisabled), [
+    [b, O, d] = [],
+    q
+  ] = E();
+  h(() => {
+    if (p == null || R) {
+      q(void 0);
       return;
     }
-    const d = new B(), _ = a.subscribe(
-      d,
-      p,
-      (g) => {
-        if ((g?.length || 0) === 0) return;
+    const g = new l(), F = p.subscribe(
+      g,
+      v,
+      (m) => {
+        if ((m?.length || 0) === 0) return;
         let f;
-        if (typeof n == "function" ? f = g.filter((m) => !n(m)) : f = g, f.length === 0 || typeof i?.notify != "function")
+        if (typeof n == "function" ? f = m.filter((y) => !n(y)) : f = m, f.length === 0 || typeof i?.notify != "function")
           return;
-        const F = i.notify();
-        typeof s == "function" && F.then((m) => s(m, f));
+        const H = i.notify();
+        typeof s == "function" && H.then((y) => s(y, f));
       }
     );
-    return d.trigger(i), O([
+    return g.trigger(i), q([
       i?.request,
       i?.revision,
-      d
-    ]), _;
-  }, [a, C, i, p, n, s]), q(() => {
-    v == null || u?.request !== R || u?.revision === b || v.trigger(u);
+      g
+    ]), F;
+  }, [p, R, i, v, n, s]), h(() => {
+    d == null || u?.request !== b || u?.revision === O || d.trigger(u);
   }, [
-    v,
+    d,
     u,
-    R,
-    b
+    b,
+    O
   ]);
 }
 function Z({
@@ -126,20 +126,20 @@ function Z({
   onNotify: s,
   children: c
 }) {
-  return j({
+  return w({
     eventReceiver: o,
     resource: e,
     disabled: t,
     options: r,
     onEvent: n,
     onNotify: s
-  }), /* @__PURE__ */ x(A, { children: c });
+  }), /* @__PURE__ */ j(M, { children: c });
 }
 const $ = I(
   (o) => class extends o {
     extend(t) {
       t.context(
-        (r, { events: n = !1 }) => (j(
+        (r, { events: n = !1 }) => (w(
           typeof n == "boolean" ? { disabled: !n, resource: r } : { ...n, resource: r }
         ), r)
       );
@@ -155,5 +155,5 @@ export {
   $ as eventPlugin,
   X as isEventReceiver,
   k as useConfigContext,
-  j as useEventHandler
+  w as useEventHandler
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civet/events",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Civet",
   "author": {
     "name": "Aaron Burmeister"