@civet/events 4.1.2 → 4.1.4

package/dist/EventHandler.d.ts

@@ -1,5 +1,6 @@
-import { ReactNode } from 'react';
+import { PropsWithChildren } from 'react';
 import { GenericEventReceiver, InferEvent, InferOptions, InferResource } from './EventReceiver';
+import { EventProps } from './useEventHandler';
 /**
  * Enables automatic updating for a Resource component or useResource hook by subscribing to an EventReceiver.
  *
@@ -7,21 +8,4 @@ import { GenericEventReceiver, InferEvent, InferOptions, InferResource } from '.
  *
  * onEvent can be used to directly access events allowing you to add custom event logic to your components.
  */
-export default function EventHandler<EventReceiverI extends GenericEventReceiver, EventI extends InferEvent<EventReceiverI> = InferEvent<EventReceiverI>, ResourceI extends InferResource<EventReceiverI> = InferResource<EventReceiverI>, OptionsI extends InferOptions<EventReceiverI> = InferOptions<EventReceiverI>>({ eventReceiver, resource, disabled, options, onEvent, onNotify, children, }: {
-    /** EventReceiver to be used */
-    eventReceiver?: EventReceiverI;
-    /** ResourceContext to be used */
-    resource?: ResourceI;
-    /** Disables the event handler */
-    disabled?: boolean;
-    /** Options for the EventReceiver */
-    options?: OptionsI;
-    /** Callback to filter events and handle your own event logic - if true is returned, the event does not cause the resource to update */
-    onEvent?: (event: EventI) => boolean;
-    /** Provides information on when the resource has been requested to update - events contains the events that lead to the update */
-    onNotify?: (next: {
-        request: string;
-        revision: string;
-    }, events: EventI[]) => void;
-    children?: ReactNode;
-}): import("react/jsx-runtime").JSX.Element;
+export default function EventHandler<EventReceiverI extends GenericEventReceiver, EventI extends InferEvent<EventReceiverI> = InferEvent<EventReceiverI>, ResourceI extends InferResource<EventReceiverI> = InferResource<EventReceiverI>, OptionsI extends InferOptions<EventReceiverI> = InferOptions<EventReceiverI>>({ eventReceiver, resource, disabled, options, onEvent, onNotify, children, }: PropsWithChildren<EventProps<EventReceiverI, EventI, ResourceI, OptionsI>>): import("react/jsx-runtime").JSX.Element;

package/dist/eventPlugin.d.ts

@@ -1,21 +1,8 @@
 import { GenericDataProviderImplementation } from '@civet/core';
-import { GenericEventReceiver, InferEvent, InferOptions } from './EventReceiver';
-type EventProps<EventReceiverI extends GenericEventReceiver, EventI extends InferEvent<EventReceiverI> = InferEvent<EventReceiverI>, OptionsI extends InferOptions<EventReceiverI> = InferOptions<EventReceiverI>> = {
-    events?: {
-        /** EventReceiver to be used */
-        eventReceiver?: EventReceiverI;
-        /** Disables the event handler */
-        disabled?: boolean;
-        /** Options for the EventReceiver */
-        options?: OptionsI;
-        /** Callback to filter events and handle your own event logic - if true is returned, the event does not cause the resource to update */
-        onEvent?: (event: EventI) => boolean;
-        /** Provides information on when the resource has been requested to update - events contains the events that lead to the update */
-        onNotify?: (next: {
-            request: string;
-            revision: string;
-        }, events: EventI[]) => void;
-    } | boolean;
+import { GenericEventReceiver, InferEvent, InferOptions, InferResource } from './EventReceiver';
+import { EventProps } from './useEventHandler';
+type EventPluginContextProps = {
+    events?: Omit<EventProps<GenericEventReceiver, InferEvent<GenericEventReceiver>, InferResource<GenericEventReceiver>, InferOptions<GenericEventReceiver>>, 'resource'> | boolean;
 };
-declare const eventPlugin: import('@civet/core').DataProviderPlugin<GenericDataProviderImplementation, unknown, EventProps<GenericEventReceiver, unknown, unknown>, unknown, unknown, unknown>;
+declare const eventPlugin: import('@civet/core').DataProviderPlugin<GenericDataProviderImplementation, unknown, EventPluginContextProps, unknown, unknown, unknown>;
 export default eventPlugin;

package/dist/main.js

@@ -1,159 +1,135 @@
-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),
-    !1
-  );
+import { createContext as e, useContext as t, useEffect as n, useMemo as r, useState as i } from "react";
+import { Notifier as a, createPlugin as o, useResourceContext as s } from "@civet/core";
+import { Fragment as c, jsx as l } from "react/jsx-runtime";
+//#region \0rolldown/runtime.js
+var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescriptor, p = Object.getOwnPropertyNames, m = Object.getPrototypeOf, h = Object.prototype.hasOwnProperty, g = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t.exports), _ = (e, t, n, r) => {
+	if (t && typeof t == "object" || typeof t == "function") for (var i = p(t), a = 0, o = i.length, s; a < o; a++) s = i[a], !h.call(e, s) && s !== n && d(e, s, {
+		get: ((e) => t[e]).bind(null, s),
+		enumerable: !(r = f(t, s)) || r.enumerable
+	});
+	return e;
+}, v = (e, t, n) => (n = e == null ? {} : u(m(e)), _(t || !e || !e.__esModule ? d(n, "default", {
+	value: e,
+	enumerable: !0
+}) : n, e)), y = e({});
+y.displayName = "Events.ConfigContext";
+var b = y.Consumer, x = () => t(y);
+//#endregion
+//#region lib/composeHandlers.ts
+function S(...e) {
+	return (...t) => e.reduce((e, n) => e || (typeof n == "function" ? n(...t) : !1), !1);
 }
-class z {
-  _inferEvent;
-  _inferResource;
-  _inferOptions;
-  subscribe(e, t, r) {
-    if (typeof r != "function")
-      throw new Error("Handler must be a function");
-    const n = e instanceof l ? e : new l(), s = this.handleSubscribe(
-      n,
-      t,
-      r
-    );
-    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."
-    ), s;
-  }
+//#endregion
+//#region lib/EventReceiver.ts
+var C = class {
+	_inferEvent;
+	_inferResource;
+	_inferOptions;
+	subscribe(e, t, n) {
+		if (typeof n != "function") throw Error("Handler must be a function");
+		let r = e instanceof a ? e : new a(), i = this.handleSubscribe(r, t, n);
+		return e instanceof a || r.trigger(e), typeof i != "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."), i;
+	}
+}, w = (e) => e instanceof C;
+//#endregion
+//#region lib/ConfigProvider.tsx
+function T({ eventReceiver: e, children: t }) {
+	let n = r(() => ({ eventReceiver: e }), [e]);
+	return /* @__PURE__ */ l(y.Provider, {
+		value: n,
+		children: t
+	});
 }
-const X = (o) => o instanceof z;
-function Y({
-  eventReceiver: o,
-  children: e
-}) {
-  const t = A(() => ({ eventReceiver: o }), [o]);
-  return /* @__PURE__ */ j(a.Provider, { value: t, children: e });
+//#endregion
+//#region lib/useEventHandler.ts
+var E = /* @__PURE__ */ v((/* @__PURE__ */ g(((e, t) => {
+	t.exports = function e(t, n) {
+		if (t === n) return !0;
+		if (t && n && typeof t == "object" && typeof n == "object") {
+			if (t.constructor !== n.constructor) return !1;
+			var r, i, a;
+			if (Array.isArray(t)) {
+				if (r = t.length, r != n.length) return !1;
+				for (i = r; i-- !== 0;) if (!e(t[i], n[i])) return !1;
+				return !0;
+			}
+			if (t.constructor === RegExp) return t.source === n.source && t.flags === n.flags;
+			if (t.valueOf !== Object.prototype.valueOf) return t.valueOf() === n.valueOf();
+			if (t.toString !== Object.prototype.toString) return t.toString() === n.toString();
+			if (a = Object.keys(t), r = a.length, r !== Object.keys(n).length) return !1;
+			for (i = r; i-- !== 0;) if (!Object.prototype.hasOwnProperty.call(n, a[i])) return !1;
+			for (i = r; i-- !== 0;) {
+				var o = a[i];
+				if (!e(t[o], n[o])) return !1;
+			}
+			return !0;
+		}
+		return t !== t && n !== n;
+	};
+})))(), 1);
+function D({ eventReceiver: e, resource: t, disabled: r, options: o, onEvent: c, onNotify: l }) {
+	let u = x(), d = e || u.eventReceiver, f = s(), p = t === null ? void 0 : t || f, [m, h] = i(p);
+	p?.request !== m?.request && h(p);
+	let [g, _] = i(o);
+	(0, E.default)(g, o) || _(o);
+	let v = !!(r || p?.isDisabled), [[y, b, S] = [], C] = i();
+	n(() => {
+		if (d == null || v) {
+			C(void 0);
+			return;
+		}
+		let e = new a(), t = d.subscribe(e, g, (e) => {
+			if ((e?.length || 0) === 0) return;
+			let t;
+			if (t = typeof c == "function" ? e.filter((e) => !c(e)) : e, t.length === 0 || typeof m?.notify != "function") return;
+			let n = m.notify();
+			typeof l == "function" && n.then((e) => l(e, t));
+		});
+		return e.trigger(m), C([
+			m?.request,
+			m?.revision,
+			e
+		]), t;
+	}, [
+		d,
+		v,
+		m,
+		g,
+		c,
+		l
+	]), n(() => {
+		S == null || p?.request !== y || p?.revision === b || S.trigger(p);
+	}, [
+		S,
+		p,
+		y,
+		b
+	]);
 }
-function G(o) {
-  return o && o.__esModule && Object.prototype.hasOwnProperty.call(o, "default") ? o.default : o;
+//#endregion
+//#region lib/EventHandler.tsx
+function O({ eventReceiver: e, resource: t, disabled: n, options: r, onEvent: i, onNotify: a, children: o }) {
+	return D({
+		eventReceiver: e,
+		resource: t,
+		disabled: n,
+		options: r,
+		onEvent: i,
+		onNotify: a
+	}), /* @__PURE__ */ l(c, { children: o });
 }
-var C, x;
-function J() {
-  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;
-      var r, n, s;
-      if (Array.isArray(e)) {
-        if (r = e.length, r != t.length) return !1;
-        for (n = r; n-- !== 0; )
-          if (!o(e[n], t[n])) return !1;
-        return !0;
-      }
-      if (e.constructor === RegExp) return e.source === t.source && e.flags === t.flags;
-      if (e.valueOf !== Object.prototype.valueOf) return e.valueOf() === t.valueOf();
-      if (e.toString !== Object.prototype.toString) return e.toString() === t.toString();
-      if (s = Object.keys(e), r = s.length, r !== Object.keys(t).length) return !1;
-      for (n = r; n-- !== 0; )
-        if (!Object.prototype.hasOwnProperty.call(t, s[n])) return !1;
-      for (n = r; n-- !== 0; ) {
-        var c = s[n];
-        if (!o(e[c], t[c])) return !1;
-      }
-      return !0;
-    }
-    return e !== e && t !== t;
-  }), C;
-}
-var K = J();
-const L = /* @__PURE__ */ G(K);
-function w({
-  eventReceiver: o,
-  resource: e,
-  disabled: t,
-  options: r,
-  onEvent: n,
-  onNotify: s
-}) {
-  const c = k(), p = o || c.eventReceiver, D = B(), u = e === null ? void 0 : e || D, [i, S] = E(
-    u
-  );
-  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 g = new l(), F = p.subscribe(
-      g,
-      v,
-      (m) => {
-        if ((m?.length || 0) === 0) return;
-        let f;
-        if (typeof n == "function" ? f = m.filter((y) => !n(y)) : f = m, f.length === 0 || typeof i?.notify != "function")
-          return;
-        const H = i.notify();
-        typeof s == "function" && H.then((y) => s(y, f));
-      }
-    );
-    return g.trigger(i), q([
-      i?.request,
-      i?.revision,
-      g
-    ]), F;
-  }, [p, R, i, v, n, s]), h(() => {
-    d == null || u?.request !== b || u?.revision === O || d.trigger(u);
-  }, [
-    d,
-    u,
-    b,
-    O
-  ]);
-}
-function Z({
-  eventReceiver: o,
-  resource: e,
-  disabled: t,
-  options: r,
-  onEvent: n,
-  onNotify: s,
-  children: c
-}) {
-  return w({
-    eventReceiver: o,
-    resource: e,
-    disabled: t,
-    options: r,
-    onEvent: n,
-    onNotify: s
-  }), /* @__PURE__ */ j(M, { children: c });
-}
-const $ = I(
-  (o) => class extends o {
-    extend(t) {
-      super.extend(t), t.context(
-        (r, { events: n = !1 }) => (w(
-          typeof n == "boolean" ? { disabled: !n, resource: r } : { ...n, resource: r }
-        ), r)
-      );
-    }
-  }
-);
-export {
-  V as ConfigConsumer,
-  Y as ConfigProvider,
-  Z as EventHandler,
-  z as EventReceiver,
-  W as composeHandlers,
-  $ as eventPlugin,
-  X as isEventReceiver,
-  k as useConfigContext,
-  w as useEventHandler
-};
+//#endregion
+//#region lib/eventPlugin.ts
+var k = o((e) => class extends e {
+	extend(e) {
+		super.extend(e), e.context((e, { events: t = !1 }) => (D(typeof t == "boolean" ? {
+			disabled: !t,
+			resource: e
+		} : {
+			...t,
+			resource: e
+		}), e));
+	}
+});
+//#endregion
+export { b as ConfigConsumer, T as ConfigProvider, O as EventHandler, C as EventReceiver, S as composeHandlers, k as eventPlugin, w as isEventReceiver, x as useConfigContext, D as useEventHandler };

package/dist/useEventHandler.d.ts

@@ -1,12 +1,5 @@
 import { GenericEventReceiver, InferEvent, InferOptions, InferResource } from './EventReceiver';
-/**
- * Enables automatic updating for a Resource component or useResource hook by subscribing to an EventReceiver.
- *
- * Necessary configuration that is not directly specified is taken from the ConfigContext and ResourceContext.
- *
- * onEvent can be used to directly access events allowing you to add custom event logic to your components.
- */
-export default function useEventHandler<EventReceiverI extends GenericEventReceiver, EventI extends InferEvent<EventReceiverI> = InferEvent<EventReceiverI>, ResourceI extends InferResource<EventReceiverI> = InferResource<EventReceiverI>, OptionsI extends InferOptions<EventReceiverI> = InferOptions<EventReceiverI>>({ eventReceiver: eventReceiverProp, resource: resourceProp, disabled, options: optionsProp, onEvent, onNotify, }: {
+export type EventProps<EventReceiverI extends GenericEventReceiver, EventI extends InferEvent<EventReceiverI> = InferEvent<EventReceiverI>, ResourceI extends InferResource<EventReceiverI> = InferResource<EventReceiverI>, OptionsI extends InferOptions<EventReceiverI> = InferOptions<EventReceiverI>> = {
     /** EventReceiver to be used */
     eventReceiver?: EventReceiverI;
     /** ResourceContext to be used */
@@ -22,4 +15,12 @@ export default function useEventHandler<EventReceiverI extends GenericEventRecei
         request: string;
         revision: string;
     }, events: EventI[]) => void;
-}): void;
+};
+/**
+ * Enables automatic updating for a Resource component or useResource hook by subscribing to an EventReceiver.
+ *
+ * Necessary configuration that is not directly specified is taken from the ConfigContext and ResourceContext.
+ *
+ * onEvent can be used to directly access events allowing you to add custom event logic to your components.
+ */
+export default function useEventHandler<EventReceiverI extends GenericEventReceiver, EventI extends InferEvent<EventReceiverI> = InferEvent<EventReceiverI>, ResourceI extends InferResource<EventReceiverI> = InferResource<EventReceiverI>, OptionsI extends InferOptions<EventReceiverI> = InferOptions<EventReceiverI>>({ eventReceiver: eventReceiverProp, resource: resourceProp, disabled, options: optionsProp, onEvent, onNotify, }: EventProps<EventReceiverI, EventI, ResourceI, OptionsI>): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civet/events",
-  "version": "4.1.2",
+  "version": "4.1.4",
   "description": "Civet",
   "author": {
     "name": "Aaron Burmeister"
@@ -47,7 +47,7 @@
   "dependencies": {
     "fast-deep-equal": "^3.1.3",
     "object-hash": "^3.0.0",
-    "uuid": "^13.0.0"
+    "uuid": "^14.0.0"
   },
   "peerDependencies": {
     "@civet/core": ">=6.0",
@@ -55,28 +55,27 @@
     "react-dom": ">=18.0"
   },
   "devDependencies": {
-    "@civet/core": "^6.2.2",
-    "@eslint/js": "^9.39.3",
+    "@civet/core": "^6.2.6",
+    "@eslint/js": "^9.39.4",
     "@types/react": "^19.1.12",
     "@types/react-dom": "^19.1.9",
-    "@vitejs/plugin-react": "^5.0.2",
-    "eslint": "^9.39.3",
+    "@vitejs/plugin-react": "^6.0.1",
+    "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.5.1",
+    "eslint-plugin-react-hooks": "^7.1.1",
+    "eslint-plugin-react-refresh": "^0.5.2",
     "eslint-plugin-unused-imports": "^4.2.0",
-    "globals": "^17.3.0",
-    "prettier": "^3.6.2",
-    "react": "^19.1.1",
-    "react-dom": "^19.1.1",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.56.0",
-    "vite": "^7.1.5",
-    "vite-plugin-dts": "^4.5.4",
-    "vite-tsconfig-paths": "^6.1.1"
+    "globals": "^17.5.0",
+    "prettier": "^3.8.3",
+    "react": "^19.2.5",
+    "react-dom": "^19.2.5",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.59.0",
+    "vite": "^8.0.9",
+    "vite-plugin-dts": "^4.5.4"
   }
 }