@ptolemy2002/react-proxy-context 2.1.3 → 2.3.0

package/README.md

@@ -20,9 +20,9 @@ type OnChangeReinitCallback<T> =
     (current: T, prev?: T) => void
 ;
 
-type Dependency<T> = keyof T | (
+type Dependency<_T, T=Exclude<_T, null | undefined>> = keyof T | (
     <K extends keyof T>(prop: K, current: T[K], prev: T[K], obj: T) => boolean
-) | null | undefined | false;
+) | null | undefined | false | [keyof T, ...PropertyKey[]];
 
 type ProxyContext<T> = ContextWithName<ProxyContextValue<T> | undefined>;
 
@@ -54,9 +54,19 @@ type UseProxyContextResult<T> = HookResultData<{
 ## Functions
 The following functions are available in the library:
 
+### evaluateDependency<T>
+#### Description
+Given a dependency, if it is an array instance, converts it to the equivalent function that will test for equality of a nested property. If it is not an array instance, returns the dependency as is.
+
+#### Parameters
+- `dependency` (`Dependency<T>`): The dependency to evaluate.
+
+#### Returns
+`Dependency<T>` - The evaluated dependency. If the dependency is an array, it will be converted to a function that tests for equality of a nested property.
+
 ### createProxyContext<T>
 #### Description
-Creates a new instance of the ProxyContext, essentially to be used as the context type, with the specified name. This is effectively just the normal React createContext function, but with a check to ensure that the browser supports Proxies. `T` represents the type of the object that will be stored in the context.
+Creates a new instance of the ProxyContext, essentially to be used as the context type, with the specified name. This is effectively just the normal React `createContext` function, but with a check to ensure that the browser supports Proxies. `T` represents the type of the object that will be stored in the context.
 
 #### Parameters
 - `name` (String): The name of the context. This is used for debugging purposes.
@@ -88,7 +98,7 @@ A hook that uses the context provided by the `ProxyContextProvider` component. T
 
 #### Parameters
 - `contextClass` (`ProxyContext<T>`): The context class that was created using `createProxyContext`.
-- `deps` (`Dependency<T>[] | null`): An array of dependencies to listen to. If any of these properties on the context change, the hook will re-render. If this is falsy, any mutation will trigger a re-render. You can also specify a function that returns a boolean to determine whether to re-render. If this is null, the hook will re-render on any mutation. By default, this is an empty array.
+- `deps` (`Dependency<T>[] | null`): An array of dependencies to listen to. If any of these properties on the context change, the hook will re-render. If this is falsy, any mutation will trigger a re-render. If a dependency is an array, it represents a nested property dependency. You can also specify a function that returns a boolean to determine whether to re-render. By default, this is an empty array.
 - `onChangeProp` (`OnChangePropCallback<T> | undefined`): A function that is called whenever a property of the context is changed. The first parameter is the property that was changed, the second parameter is the current value of the property, and the third parameter is the previous value of the property. This is useful for listening to changes in the provider's parent component.
 - `onChangeReinit` (`OnChangeReinitCallback<T> | undefined`): A function that is called whenever the context is reinitialized. The first parameter is the current value of the context, and the second parameter is the previous value of the context. This is useful for listening to changes in the provider's parent component.
 - `listenReinit` (`boolean`): Whether to listen to full reassignments of the context. If this is true, the hook will re-render whenever the context is reinitialized. By default, this is true.

package/dist/main.d.ts

@@ -12,7 +12,8 @@ export type ProxyContextValue<T> = {
     unsubscribe: (id: string) => void;
 };
 export declare function createProxyContext<T>(name: string): ProxyContext<T>;
-export type Dependency<T> = keyof T | (<K extends keyof T>(prop: K, current: T[K], prev: T[K], obj: T) => boolean) | null | undefined | false;
+export type Dependency<T> = keyof T | (<K extends keyof T>(prop: K, current: T[K], prev: T[K], obj: T) => boolean) | null | undefined | false | [keyof T, ...PropertyKey[]];
+export declare function evaluateDependency<T>(dep: Dependency<T>): Exclude<Dependency<T>, any[]> | keyof T;
 export type ProxyContext<T> = ContextWithName<ProxyContextValue<T> | undefined>;
 export type ProxyContextProviderProps<T> = {
     children: ReactNode;

package/dist/main.js

@@ -1,10 +1,10 @@
-import Ae, { useEffect as Ie, createContext as br, useRef as H, useImperativeHandle as yr, useCallback as ie, useContext as mr } from "react";
+import $e, { useEffect as We, createContext as br, useRef as Z, useImperativeHandle as yr, useCallback as se, useContext as mr } from "react";
 import { nanoid as Rr } from "nanoid";
-import L from "is-callable";
-import $e from "@ptolemy2002/react-force-rerender";
+import Y from "is-callable";
+import Ye from "@ptolemy2002/react-force-rerender";
 import gr from "@ptolemy2002/react-hook-result";
 import { partialMemo as hr } from "@ptolemy2002/react-utils";
-var ue = { exports: {} }, N = {};
+var ce = { exports: {} }, N = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -14,19 +14,19 @@ var ue = { exports: {} }, N = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var De;
+var Fe;
 function Er() {
-  if (De) return N;
-  De = 1;
-  var y = Ae, _ = Symbol.for("react.element"), k = Symbol.for("react.fragment"), h = Object.prototype.hasOwnProperty, x = y.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, R = { key: !0, ref: !0, __self: !0, __source: !0 };
-  function E(c, s, T) {
-    var v, S = {}, O = null, b = null;
-    T !== void 0 && (O = "" + T), s.key !== void 0 && (O = "" + s.key), s.ref !== void 0 && (b = s.ref);
-    for (v in s) h.call(s, v) && !R.hasOwnProperty(v) && (S[v] = s[v]);
-    if (c && c.defaultProps) for (v in s = c.defaultProps, s) S[v] === void 0 && (S[v] = s[v]);
-    return { $$typeof: _, type: c, key: O, ref: b, props: S, _owner: x.current };
+  if (Fe) return N;
+  Fe = 1;
+  var v = $e, E = Symbol.for("react.element"), w = Symbol.for("react.fragment"), g = Object.prototype.hasOwnProperty, T = v.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, m = { key: !0, ref: !0, __self: !0, __source: !0 };
+  function p(i, s, P) {
+    var b, x = {}, O = null, R = null;
+    P !== void 0 && (O = "" + P), s.key !== void 0 && (O = "" + s.key), s.ref !== void 0 && (R = s.ref);
+    for (b in s) g.call(s, b) && !m.hasOwnProperty(b) && (x[b] = s[b]);
+    if (i && i.defaultProps) for (b in s = i.defaultProps, s) x[b] === void 0 && (x[b] = s[b]);
+    return { $$typeof: E, type: i, key: O, ref: R, props: x, _owner: T.current };
   }
-  return N.Fragment = k, N.jsx = E, N.jsxs = E, N;
+  return N.Fragment = w, N.jsx = p, N.jsxs = p, N;
 }
 var B = {};
 /**
@@ -38,17 +38,17 @@ var B = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var Fe;
+var Ie;
 function _r() {
-  return Fe || (Fe = 1, process.env.NODE_ENV !== "production" && function() {
-    var y = Ae, _ = Symbol.for("react.element"), k = Symbol.for("react.portal"), h = Symbol.for("react.fragment"), x = Symbol.for("react.strict_mode"), R = Symbol.for("react.profiler"), E = Symbol.for("react.provider"), c = Symbol.for("react.context"), s = Symbol.for("react.forward_ref"), T = Symbol.for("react.suspense"), v = Symbol.for("react.suspense_list"), S = Symbol.for("react.memo"), O = Symbol.for("react.lazy"), b = Symbol.for("react.offscreen"), D = Symbol.iterator, C = "@@iterator";
-    function j(e) {
+  return Ie || (Ie = 1, process.env.NODE_ENV !== "production" && function() {
+    var v = $e, E = Symbol.for("react.element"), w = Symbol.for("react.portal"), g = Symbol.for("react.fragment"), T = Symbol.for("react.strict_mode"), m = Symbol.for("react.profiler"), p = Symbol.for("react.provider"), i = Symbol.for("react.context"), s = Symbol.for("react.forward_ref"), P = Symbol.for("react.suspense"), b = Symbol.for("react.suspense_list"), x = Symbol.for("react.memo"), O = Symbol.for("react.lazy"), R = Symbol.for("react.offscreen"), D = Symbol.iterator, C = "@@iterator";
+    function k(e) {
       if (e === null || typeof e != "object")
         return null;
       var r = D && e[D] || e[C];
       return typeof r == "function" ? r : null;
     }
-    var p = y.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+    var y = v.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
     function f(e) {
       {
         for (var r = arguments.length, t = new Array(r > 1 ? r - 1 : 0), n = 1; n < r; n++)
@@ -58,34 +58,34 @@ function _r() {
     }
     function I(e, r, t) {
       {
-        var n = p.ReactDebugCurrentFrame, i = n.getStackAddendum();
-        i !== "" && (r += "%s", t = t.concat([i]));
-        var u = t.map(function(o) {
+        var n = y.ReactDebugCurrentFrame, u = n.getStackAddendum();
+        u !== "" && (r += "%s", t = t.concat([u]));
+        var c = t.map(function(o) {
           return String(o);
         });
-        u.unshift("Warning: " + r), Function.prototype.apply.call(console[e], console, u);
+        c.unshift("Warning: " + r), Function.prototype.apply.call(console[e], console, c);
       }
     }
-    var $ = !1, J = !1, We = !1, Ye = !1, Le = !1, se;
-    se = Symbol.for("react.module.reference");
+    var J = !1, L = !1, q = !1, K = !1, Le = !1, fe;
+    fe = Symbol.for("react.module.reference");
     function Ve(e) {
-      return !!(typeof e == "string" || typeof e == "function" || e === h || e === R || Le || e === x || e === T || e === v || Ye || e === b || $ || J || We || typeof e == "object" && e !== null && (e.$$typeof === O || e.$$typeof === S || e.$$typeof === E || e.$$typeof === c || e.$$typeof === s || // This needs to include all possible module reference object
+      return !!(typeof e == "string" || typeof e == "function" || e === g || e === m || Le || e === T || e === P || e === b || K || e === R || J || L || q || typeof e == "object" && e !== null && (e.$$typeof === O || e.$$typeof === x || e.$$typeof === p || e.$$typeof === i || e.$$typeof === s || // This needs to include all possible module reference object
       // types supported by any Flight configuration anywhere since
       // we don't know which Flight build this will end up being used
       // with.
-      e.$$typeof === se || e.getModuleId !== void 0));
+      e.$$typeof === fe || e.getModuleId !== void 0));
     }
     function Me(e, r, t) {
       var n = e.displayName;
       if (n)
         return n;
-      var i = r.displayName || r.name || "";
-      return i !== "" ? t + "(" + i + ")" : t;
+      var u = r.displayName || r.name || "";
+      return u !== "" ? t + "(" + u + ")" : t;
     }
-    function ce(e) {
+    function le(e) {
       return e.displayName || "Context";
     }
-    function w(e) {
+    function j(e) {
       if (e == null)
         return null;
       if (typeof e.tag == "number" && f("Received an unexpected object in getComponentNameFromType(). This is likely a bug in React. Please file an issue."), typeof e == "function")
@@ -93,36 +93,36 @@ function _r() {
       if (typeof e == "string")
         return e;
       switch (e) {
-        case h:
+        case g:
           return "Fragment";
-        case k:
+        case w:
           return "Portal";
-        case R:
+        case m:
           return "Profiler";
-        case x:
-          return "StrictMode";
         case T:
+          return "StrictMode";
+        case P:
           return "Suspense";
-        case v:
+        case b:
           return "SuspenseList";
       }
       if (typeof e == "object")
         switch (e.$$typeof) {
-          case c:
+          case i:
             var r = e;
-            return ce(r) + ".Consumer";
-          case E:
+            return le(r) + ".Consumer";
+          case p:
             var t = e;
-            return ce(t._context) + ".Provider";
+            return le(t._context) + ".Provider";
           case s:
             return Me(e, e.render, "ForwardRef");
-          case S:
+          case x:
             var n = e.displayName || null;
-            return n !== null ? n : w(e.type) || "Memo";
+            return n !== null ? n : j(e.type) || "Memo";
           case O: {
-            var i = e, u = i._payload, o = i._init;
+            var u = e, c = u._payload, o = u._init;
             try {
-              return w(o(u));
+              return j(o(c));
             } catch {
               return null;
             }
@@ -130,18 +130,18 @@ function _r() {
         }
       return null;
     }
-    var F = Object.assign, V = 0, fe, le, de, ve, pe, be, ye;
-    function me() {
+    var A = Object.assign, V = 0, de, ve, pe, be, ye, me, Re;
+    function ge() {
     }
-    me.__reactDisabledLog = !0;
+    ge.__reactDisabledLog = !0;
     function Ue() {
       {
         if (V === 0) {
-          fe = console.log, le = console.info, de = console.warn, ve = console.error, pe = console.group, be = console.groupCollapsed, ye = console.groupEnd;
+          de = console.log, ve = console.info, pe = console.warn, be = console.error, ye = console.group, me = console.groupCollapsed, Re = console.groupEnd;
           var e = {
             configurable: !0,
             enumerable: !0,
-            value: me,
+            value: ge,
             writable: !0
           };
           Object.defineProperties(console, {
@@ -166,65 +166,65 @@ function _r() {
             writable: !0
           };
           Object.defineProperties(console, {
-            log: F({}, e, {
-              value: fe
-            }),
-            info: F({}, e, {
-              value: le
-            }),
-            warn: F({}, e, {
+            log: A({}, e, {
               value: de
             }),
-            error: F({}, e, {
+            info: A({}, e, {
               value: ve
             }),
-            group: F({}, e, {
+            warn: A({}, e, {
               value: pe
             }),
-            groupCollapsed: F({}, e, {
+            error: A({}, e, {
               value: be
             }),
-            groupEnd: F({}, e, {
+            group: A({}, e, {
               value: ye
+            }),
+            groupCollapsed: A({}, e, {
+              value: me
+            }),
+            groupEnd: A({}, e, {
+              value: Re
             })
           });
         }
         V < 0 && f("disabledDepth fell below zero. This is a bug in React. Please file an issue.");
       }
     }
-    var X = p.ReactCurrentDispatcher, Z;
-    function q(e, r, t) {
+    var Q = y.ReactCurrentDispatcher, ee;
+    function G(e, r, t) {
       {
-        if (Z === void 0)
+        if (ee === void 0)
           try {
             throw Error();
-          } catch (i) {
-            var n = i.stack.trim().match(/\n( *(at )?)/);
-            Z = n && n[1] || "";
+          } catch (u) {
+            var n = u.stack.trim().match(/\n( *(at )?)/);
+            ee = n && n[1] || "";
           }
         return `
-` + Z + e;
+` + ee + e;
       }
     }
-    var Q = !1, K;
+    var re = !1, z;
     {
       var Be = typeof WeakMap == "function" ? WeakMap : Map;
-      K = new Be();
+      z = new Be();
     }
-    function Re(e, r) {
-      if (!e || Q)
+    function he(e, r) {
+      if (!e || re)
         return "";
       {
-        var t = K.get(e);
+        var t = z.get(e);
         if (t !== void 0)
           return t;
       }
       var n;
-      Q = !0;
-      var i = Error.prepareStackTrace;
+      re = !0;
+      var u = Error.prepareStackTrace;
       Error.prepareStackTrace = void 0;
-      var u;
-      u = X.current, X.current = null, Ue();
+      var c;
+      c = Q.current, Q.current = null, Ue();
       try {
         if (r) {
           var o = function() {
@@ -237,116 +237,116 @@ function _r() {
           }), typeof Reflect == "object" && Reflect.construct) {
             try {
               Reflect.construct(o, []);
-            } catch (g) {
-              n = g;
+            } catch (_) {
+              n = _;
             }
             Reflect.construct(e, [], o);
           } else {
             try {
               o.call();
-            } catch (g) {
-              n = g;
+            } catch (_) {
+              n = _;
             }
             e.call(o.prototype);
           }
         } else {
           try {
             throw Error();
-          } catch (g) {
-            n = g;
+          } catch (_) {
+            n = _;
           }
           e();
         }
-      } catch (g) {
-        if (g && n && typeof g.stack == "string") {
-          for (var a = g.stack.split(`
-`), m = n.stack.split(`
-`), l = a.length - 1, d = m.length - 1; l >= 1 && d >= 0 && a[l] !== m[d]; )
+      } catch (_) {
+        if (_ && n && typeof _.stack == "string") {
+          for (var a = _.stack.split(`
+`), h = n.stack.split(`
+`), l = a.length - 1, d = h.length - 1; l >= 1 && d >= 0 && a[l] !== h[d]; )
             d--;
           for (; l >= 1 && d >= 0; l--, d--)
-            if (a[l] !== m[d]) {
+            if (a[l] !== h[d]) {
               if (l !== 1 || d !== 1)
                 do
-                  if (l--, d--, d < 0 || a[l] !== m[d]) {
-                    var P = `
+                  if (l--, d--, d < 0 || a[l] !== h[d]) {
+                    var S = `
 ` + a[l].replace(" at new ", " at ");
-                    return e.displayName && P.includes("<anonymous>") && (P = P.replace("<anonymous>", e.displayName)), typeof e == "function" && K.set(e, P), P;
+                    return e.displayName && S.includes("<anonymous>") && (S = S.replace("<anonymous>", e.displayName)), typeof e == "function" && z.set(e, S), S;
                   }
                 while (l >= 1 && d >= 0);
               break;
             }
         }
       } finally {
-        Q = !1, X.current = u, Ne(), Error.prepareStackTrace = i;
+        re = !1, Q.current = c, Ne(), Error.prepareStackTrace = u;
       }
-      var Y = e ? e.displayName || e.name : "", A = Y ? q(Y) : "";
-      return typeof e == "function" && K.set(e, A), A;
+      var W = e ? e.displayName || e.name : "", F = W ? G(W) : "";
+      return typeof e == "function" && z.set(e, F), F;
     }
     function Je(e, r, t) {
-      return Re(e, !1);
+      return he(e, !1);
     }
     function qe(e) {
       var r = e.prototype;
       return !!(r && r.isReactComponent);
     }
-    function G(e, r, t) {
+    function H(e, r, t) {
       if (e == null)
         return "";
       if (typeof e == "function")
-        return Re(e, qe(e));
+        return he(e, qe(e));
       if (typeof e == "string")
-        return q(e);
+        return G(e);
       switch (e) {
-        case T:
-          return q("Suspense");
-        case v:
-          return q("SuspenseList");
+        case P:
+          return G("Suspense");
+        case b:
+          return G("SuspenseList");
       }
       if (typeof e == "object")
         switch (e.$$typeof) {
           case s:
             return Je(e.render);
-          case S:
-            return G(e.type, r, t);
+          case x:
+            return H(e.type, r, t);
           case O: {
-            var n = e, i = n._payload, u = n._init;
+            var n = e, u = n._payload, c = n._init;
             try {
-              return G(u(i), r, t);
+              return H(c(u), r, t);
             } catch {
             }
           }
         }
       return "";
     }
-    var M = Object.prototype.hasOwnProperty, ge = {}, he = p.ReactDebugCurrentFrame;
-    function z(e) {
+    var M = Object.prototype.hasOwnProperty, Ee = {}, _e = y.ReactDebugCurrentFrame;
+    function X(e) {
       if (e) {
-        var r = e._owner, t = G(e.type, e._source, r ? r.type : null);
-        he.setExtraStackFrame(t);
+        var r = e._owner, t = H(e.type, e._source, r ? r.type : null);
+        _e.setExtraStackFrame(t);
       } else
-        he.setExtraStackFrame(null);
+        _e.setExtraStackFrame(null);
     }
-    function Ke(e, r, t, n, i) {
+    function Ke(e, r, t, n, u) {
       {
-        var u = Function.call.bind(M);
+        var c = Function.call.bind(M);
         for (var o in e)
-          if (u(e, o)) {
+          if (c(e, o)) {
             var a = void 0;
             try {
               if (typeof e[o] != "function") {
-                var m = Error((n || "React class") + ": " + t + " type `" + o + "` is invalid; it must be a function, usually from the `prop-types` package, but received `" + typeof e[o] + "`.This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`.");
-                throw m.name = "Invariant Violation", m;
+                var h = Error((n || "React class") + ": " + t + " type `" + o + "` is invalid; it must be a function, usually from the `prop-types` package, but received `" + typeof e[o] + "`.This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`.");
+                throw h.name = "Invariant Violation", h;
               }
               a = e[o](r, o, n, t, null, "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED");
             } catch (l) {
               a = l;
             }
-            a && !(a instanceof Error) && (z(i), f("%s: type specification of %s `%s` is invalid; the type checker function must return `null` or an `Error` but returned a %s. You may have forgotten to pass an argument to the type checker creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and shape all require an argument).", n || "React class", t, o, typeof a), z(null)), a instanceof Error && !(a.message in ge) && (ge[a.message] = !0, z(i), f("Failed %s type: %s", t, a.message), z(null));
+            a && !(a instanceof Error) && (X(u), f("%s: type specification of %s `%s` is invalid; the type checker function must return `null` or an `Error` but returned a %s. You may have forgotten to pass an argument to the type checker creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and shape all require an argument).", n || "React class", t, o, typeof a), X(null)), a instanceof Error && !(a.message in Ee) && (Ee[a.message] = !0, X(u), f("Failed %s type: %s", t, a.message), X(null));
           }
       }
     }
     var Ge = Array.isArray;
-    function ee(e) {
+    function te(e) {
       return Ge(e);
     }
     function ze(e) {
@@ -357,25 +357,25 @@ function _r() {
     }
     function He(e) {
       try {
-        return Ee(e), !1;
+        return Te(e), !1;
       } catch {
         return !0;
       }
     }
-    function Ee(e) {
+    function Te(e) {
       return "" + e;
     }
-    function _e(e) {
+    function Pe(e) {
       if (He(e))
-        return f("The provided key is an unsupported type %s. This value must be coerced to a string before before using it here.", ze(e)), Ee(e);
+        return f("The provided key is an unsupported type %s. This value must be coerced to a string before before using it here.", ze(e)), Te(e);
     }
-    var U = p.ReactCurrentOwner, Xe = {
+    var U = y.ReactCurrentOwner, Xe = {
       key: !0,
       ref: !0,
       __self: !0,
       __source: !0
-    }, Te, Pe, re;
-    re = {};
+    }, Se, xe, ne;
+    ne = {};
     function Ze(e) {
       if (M.call(e, "ref")) {
         var r = Object.getOwnPropertyDescriptor(e, "ref").get;
@@ -394,14 +394,14 @@ function _r() {
     }
     function er(e, r) {
       if (typeof e.ref == "string" && U.current && r && U.current.stateNode !== r) {
-        var t = w(U.current.type);
-        re[t] || (f('Component "%s" contains the string ref "%s". Support for string refs will be removed in a future major release. This case cannot be automatically converted to an arrow function. We ask you to manually fix this case by using useRef() or createRef() instead. Learn more about using refs safely here: https://reactjs.org/link/strict-mode-string-ref', w(U.current.type), e.ref), re[t] = !0);
+        var t = j(U.current.type);
+        ne[t] || (f('Component "%s" contains the string ref "%s". Support for string refs will be removed in a future major release. This case cannot be automatically converted to an arrow function. We ask you to manually fix this case by using useRef() or createRef() instead. Learn more about using refs safely here: https://reactjs.org/link/strict-mode-string-ref', j(U.current.type), e.ref), ne[t] = !0);
       }
     }
     function rr(e, r) {
       {
         var t = function() {
-          Te || (Te = !0, f("%s: `key` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://reactjs.org/link/special-props)", r));
+          Se || (Se = !0, f("%s: `key` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://reactjs.org/link/special-props)", r));
         };
         t.isReactWarning = !0, Object.defineProperty(e, "key", {
           get: t,
@@ -412,7 +412,7 @@ function _r() {
     function tr(e, r) {
       {
         var t = function() {
-          Pe || (Pe = !0, f("%s: `ref` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://reactjs.org/link/special-props)", r));
+          xe || (xe = !0, f("%s: `ref` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://reactjs.org/link/special-props)", r));
         };
         t.isReactWarning = !0, Object.defineProperty(e, "ref", {
           get: t,
@@ -420,17 +420,17 @@ function _r() {
         });
       }
     }
-    var nr = function(e, r, t, n, i, u, o) {
+    var nr = function(e, r, t, n, u, c, o) {
       var a = {
         // This tag allows us to uniquely identify this as a React Element
-        $$typeof: _,
+        $$typeof: E,
         // Built-in properties that belong on the element
         type: e,
         key: r,
         ref: t,
         props: o,
         // Record the component responsible for creating this element.
-        _owner: u
+        _owner: c
       };
       return a._store = {}, Object.defineProperty(a._store, "validated", {
         configurable: !1,
@@ -446,44 +446,44 @@ function _r() {
         configurable: !1,
         enumerable: !1,
         writable: !1,
-        value: i
+        value: u
       }), Object.freeze && (Object.freeze(a.props), Object.freeze(a)), a;
     };
-    function ar(e, r, t, n, i) {
+    function ar(e, r, t, n, u) {
       {
-        var u, o = {}, a = null, m = null;
-        t !== void 0 && (_e(t), a = "" + t), Qe(r) && (_e(r.key), a = "" + r.key), Ze(r) && (m = r.ref, er(r, i));
-        for (u in r)
-          M.call(r, u) && !Xe.hasOwnProperty(u) && (o[u] = r[u]);
+        var c, o = {}, a = null, h = null;
+        t !== void 0 && (Pe(t), a = "" + t), Qe(r) && (Pe(r.key), a = "" + r.key), Ze(r) && (h = r.ref, er(r, u));
+        for (c in r)
+          M.call(r, c) && !Xe.hasOwnProperty(c) && (o[c] = r[c]);
         if (e && e.defaultProps) {
           var l = e.defaultProps;
-          for (u in l)
-            o[u] === void 0 && (o[u] = l[u]);
+          for (c in l)
+            o[c] === void 0 && (o[c] = l[c]);
         }
-        if (a || m) {
+        if (a || h) {
           var d = typeof e == "function" ? e.displayName || e.name || "Unknown" : e;
-          a && rr(o, d), m && tr(o, d);
+          a && rr(o, d), h && tr(o, d);
         }
-        return nr(e, a, m, i, n, U.current, o);
+        return nr(e, a, h, u, n, U.current, o);
       }
     }
-    var te = p.ReactCurrentOwner, Se = p.ReactDebugCurrentFrame;
-    function W(e) {
+    var ae = y.ReactCurrentOwner, Ce = y.ReactDebugCurrentFrame;
+    function $(e) {
       if (e) {
-        var r = e._owner, t = G(e.type, e._source, r ? r.type : null);
-        Se.setExtraStackFrame(t);
+        var r = e._owner, t = H(e.type, e._source, r ? r.type : null);
+        Ce.setExtraStackFrame(t);
       } else
-        Se.setExtraStackFrame(null);
+        Ce.setExtraStackFrame(null);
     }
-    var ne;
-    ne = !1;
-    function ae(e) {
-      return typeof e == "object" && e !== null && e.$$typeof === _;
+    var oe;
+    oe = !1;
+    function ie(e) {
+      return typeof e == "object" && e !== null && e.$$typeof === E;
     }
-    function Ce() {
+    function we() {
       {
-        if (te.current) {
-          var e = w(te.current.type);
+        if (ae.current) {
+          var e = j(ae.current.type);
           if (e)
             return `
 
@@ -495,10 +495,10 @@ Check the render method of \`` + e + "`.";
     function or(e) {
       return "";
     }
-    var xe = {};
+    var Oe = {};
     function ir(e) {
       {
-        var r = Ce();
+        var r = we();
         if (!r) {
           var t = typeof e == "string" ? e : e.displayName || e.name;
           t && (r = `
@@ -508,35 +508,35 @@ Check the top-level render call using <` + t + ">.");
         return r;
       }
     }
-    function Oe(e, r) {
+    function je(e, r) {
       {
         if (!e._store || e._store.validated || e.key != null)
           return;
         e._store.validated = !0;
         var t = ir(r);
-        if (xe[t])
+        if (Oe[t])
           return;
-        xe[t] = !0;
+        Oe[t] = !0;
         var n = "";
-        e && e._owner && e._owner !== te.current && (n = " It was passed a child from " + w(e._owner.type) + "."), W(e), f('Each child in a list should have a unique "key" prop.%s%s See https://reactjs.org/link/warning-keys for more information.', t, n), W(null);
+        e && e._owner && e._owner !== ae.current && (n = " It was passed a child from " + j(e._owner.type) + "."), $(e), f('Each child in a list should have a unique "key" prop.%s%s See https://reactjs.org/link/warning-keys for more information.', t, n), $(null);
       }
     }
-    function we(e, r) {
+    function ke(e, r) {
       {
         if (typeof e != "object")
           return;
-        if (ee(e))
+        if (te(e))
           for (var t = 0; t < e.length; t++) {
             var n = e[t];
-            ae(n) && Oe(n, r);
+            ie(n) && je(n, r);
           }
-        else if (ae(e))
+        else if (ie(e))
           e._store && (e._store.validated = !0);
         else if (e) {
-          var i = j(e);
-          if (typeof i == "function" && i !== e.entries)
-            for (var u = i.call(e), o; !(o = u.next()).done; )
-              ae(o.value) && Oe(o.value, r);
+          var u = k(e);
+          if (typeof u == "function" && u !== e.entries)
+            for (var c = u.call(e), o; !(o = c.next()).done; )
+              ie(o.value) && je(o.value, r);
         }
       }
     }
@@ -550,17 +550,17 @@ Check the top-level render call using <` + t + ">.");
           t = r.propTypes;
         else if (typeof r == "object" && (r.$$typeof === s || // Note: Memo only checks outer props here.
         // Inner props are checked in the reconciler.
-        r.$$typeof === S))
+        r.$$typeof === x))
           t = r.propTypes;
         else
           return;
         if (t) {
-          var n = w(r);
+          var n = j(r);
           Ke(t, e.props, "prop", n, e);
-        } else if (r.PropTypes !== void 0 && !ne) {
-          ne = !0;
-          var i = w(r);
-          f("Component %s declared `PropTypes` instead of `propTypes`. Did you misspell the property assignment?", i || "Unknown");
+        } else if (r.PropTypes !== void 0 && !oe) {
+          oe = !0;
+          var u = j(r);
+          f("Component %s declared `PropTypes` instead of `propTypes`. Did you misspell the property assignment?", u || "Unknown");
         }
         typeof r.getDefaultProps == "function" && !r.getDefaultProps.isReactClassApproved && f("getDefaultProps is only used on classic React.createClass definitions. Use a static property named `defaultProps` instead.");
       }
@@ -570,155 +570,173 @@ Check the top-level render call using <` + t + ">.");
         for (var r = Object.keys(e.props), t = 0; t < r.length; t++) {
           var n = r[t];
           if (n !== "children" && n !== "key") {
-            W(e), f("Invalid prop `%s` supplied to `React.Fragment`. React.Fragment can only have `key` and `children` props.", n), W(null);
+            $(e), f("Invalid prop `%s` supplied to `React.Fragment`. React.Fragment can only have `key` and `children` props.", n), $(null);
             break;
           }
         }
-        e.ref !== null && (W(e), f("Invalid attribute `ref` supplied to `React.Fragment`."), W(null));
+        e.ref !== null && ($(e), f("Invalid attribute `ref` supplied to `React.Fragment`."), $(null));
       }
     }
-    var je = {};
-    function ke(e, r, t, n, i, u) {
+    var De = {};
+    function Ae(e, r, t, n, u, c) {
       {
         var o = Ve(e);
         if (!o) {
           var a = "";
           (e === void 0 || typeof e == "object" && e !== null && Object.keys(e).length === 0) && (a += " You likely forgot to export your component from the file it's defined in, or you might have mixed up default and named imports.");
-          var m = or();
-          m ? a += m : a += Ce();
+          var h = or();
+          h ? a += h : a += we();
           var l;
-          e === null ? l = "null" : ee(e) ? l = "array" : e !== void 0 && e.$$typeof === _ ? (l = "<" + (w(e.type) || "Unknown") + " />", a = " Did you accidentally export a JSX literal instead of a component?") : l = typeof e, f("React.jsx: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s", l, a);
+          e === null ? l = "null" : te(e) ? l = "array" : e !== void 0 && e.$$typeof === E ? (l = "<" + (j(e.type) || "Unknown") + " />", a = " Did you accidentally export a JSX literal instead of a component?") : l = typeof e, f("React.jsx: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s", l, a);
         }
-        var d = ar(e, r, t, i, u);
+        var d = ar(e, r, t, u, c);
         if (d == null)
           return d;
         if (o) {
-          var P = r.children;
-          if (P !== void 0)
+          var S = r.children;
+          if (S !== void 0)
             if (n)
-              if (ee(P)) {
-                for (var Y = 0; Y < P.length; Y++)
-                  we(P[Y], e);
-                Object.freeze && Object.freeze(P);
+              if (te(S)) {
+                for (var W = 0; W < S.length; W++)
+                  ke(S[W], e);
+                Object.freeze && Object.freeze(S);
               } else
                 f("React.jsx: Static children should always be an array. You are likely explicitly calling React.jsxs or React.jsxDEV. Use the Babel transform instead.");
             else
-              we(P, e);
+              ke(S, e);
         }
         if (M.call(r, "key")) {
-          var A = w(e), g = Object.keys(r).filter(function(pr) {
+          var F = j(e), _ = Object.keys(r).filter(function(pr) {
             return pr !== "key";
-          }), oe = g.length > 0 ? "{key: someKey, " + g.join(": ..., ") + ": ...}" : "{key: someKey}";
-          if (!je[A + oe]) {
-            var vr = g.length > 0 ? "{" + g.join(": ..., ") + ": ...}" : "{}";
+          }), ue = _.length > 0 ? "{key: someKey, " + _.join(": ..., ") + ": ...}" : "{key: someKey}";
+          if (!De[F + ue]) {
+            var vr = _.length > 0 ? "{" + _.join(": ..., ") + ": ...}" : "{}";
             f(`A props object containing a "key" prop is being spread into JSX:
   let props = %s;
   <%s {...props} />
 React keys must be passed directly to JSX without using spread:
   let props = %s;
-  <%s key={someKey} {...props} />`, oe, A, vr, A), je[A + oe] = !0;
+  <%s key={someKey} {...props} />`, ue, F, vr, F), De[F + ue] = !0;
           }
         }
-        return e === h ? sr(d) : ur(d), d;
+        return e === g ? sr(d) : ur(d), d;
       }
     }
     function cr(e, r, t) {
-      return ke(e, r, t, !0);
+      return Ae(e, r, t, !0);
     }
     function fr(e, r, t) {
-      return ke(e, r, t, !1);
+      return Ae(e, r, t, !1);
     }
     var lr = fr, dr = cr;
-    B.Fragment = h, B.jsx = lr, B.jsxs = dr;
+    B.Fragment = g, B.jsx = lr, B.jsxs = dr;
   }()), B;
 }
-process.env.NODE_ENV === "production" ? ue.exports = Er() : ue.exports = _r();
-var Tr = ue.exports;
-function Pr(y) {
-  Ie(() => {
-    y();
+process.env.NODE_ENV === "production" ? ce.exports = Er() : ce.exports = _r();
+var Tr = ce.exports;
+function Pr(v) {
+  We(() => {
+    v();
   }, []);
 }
-function Sr(y) {
-  Ie(() => y, []);
+function Sr(v) {
+  We(() => v, []);
 }
-function Dr(y) {
+function Ar(v) {
   if (typeof Proxy > "u") throw new Error("Proxy is not supported in this environment.");
-  const _ = br(
+  const E = br(
     void 0
   );
-  return _.name = y, _;
+  return E.name = v, E;
+}
+function xr(v) {
+  if (Array.isArray(v)) {
+    const [E, ...w] = v;
+    return (g, T, m) => {
+      if (g !== E) return !1;
+      let p = T, i = m;
+      for (const s of w)
+        p = p == null ? void 0 : p[s], i = i == null ? void 0 : i[s];
+      return p !== i;
+    };
+  }
+  return v;
 }
-function Fr(y) {
+function Fr(v) {
   return hr(
     ({
-      children: _,
-      value: k,
-      onChangeProp: h,
-      onChangeReinit: x,
-      proxyRef: R
+      children: E,
+      value: w,
+      onChangeProp: g,
+      onChangeReinit: T,
+      proxyRef: m
     }) => {
-      const E = H({}), c = H(), s = H({}), T = $e();
-      yr(R, () => c.current, [c.current]);
-      const v = ie((b, D, C) => {
-        const j = Rr();
-        return E.current[j] = {
-          id: j,
+      const p = Z({}), i = Z(), s = Z({}), P = Ye();
+      yr(m, () => i.current, [i.current]);
+      const b = se((R, D, C) => {
+        const k = Rr();
+        return p.current[k] = {
+          id: k,
           deps: C,
-          propCallback: b,
+          propCallback: R,
           reinitCallback: D
-        }, j;
-      }, []), S = ie((b) => {
-        delete E.current[b];
-      }, []), O = ie((b) => {
-        if (b !== c.current) {
-          const D = c.current;
-          b !== null ? c.current = new Proxy(b, {
-            get: function(C, j) {
-              const p = Reflect.get(C, j, b);
-              return L(p) ? p.bind(c.current) : p;
+        }, k;
+      }, []), x = se((R) => {
+        delete p.current[R];
+      }, []), O = se((R) => {
+        if (R !== i.current) {
+          const D = i.current;
+          R !== null ? i.current = new Proxy(R, {
+            get: function(C, k) {
+              const y = Reflect.get(C, k, R);
+              return Y(y) ? y.bind(i.current) : y;
             },
-            set: function(C, j, p) {
-              const f = j, I = C[f];
-              return Reflect.set(C, f, p, b), p = C[f], Object.values(E.current).forEach(($) => {
-                (!$.deps || $.deps.includes(f) && I !== p || $.deps.some((J) => L(J) && J(f, p, I, b))) && $.propCallback(f, p, I);
-              }), L(h) && h(f, p, I), !0;
+            set: function(C, k, y) {
+              const f = k, I = C[f];
+              return Reflect.set(C, f, y, R), y = C[f], Object.values(p.current).forEach((J) => {
+                var q;
+                const L = (q = J.deps) == null ? void 0 : q.map(xr);
+                (!L || L.includes(f) && I !== y || L.some(
+                  (K) => Y(K) && K(f, y, I, R)
+                )) && J.propCallback(f, y, I);
+              }), Y(g) && g(f, y, I), !0;
             }
-          }) : c.current = b, Object.values(E.current).forEach((C) => {
-            C.reinitCallback(c.current, D);
-          }), L(x) && x(c.current, D), T();
+          }) : i.current = R, Object.values(p.current).forEach((C) => {
+            C.reinitCallback(i.current, D);
+          }), Y(T) && T(i.current, D), P();
         }
-        return s.current.obj = c.current, c.current;
-      }, [h, x]);
-      return c.current === void 0 && (c.current = O(k)), s.current.obj = c.current, s.current.set = O, s.current.subscribe = v, s.current.unsubscribe = S, /* @__PURE__ */ Tr.jsx(y.Provider, { value: s.current, children: _ });
+        return s.current.obj = i.current, i.current;
+      }, [g, T]);
+      return i.current === void 0 && (i.current = O(w)), s.current.obj = i.current, s.current.set = O, s.current.subscribe = b, s.current.unsubscribe = x, /* @__PURE__ */ Tr.jsx(v.Provider, { value: s.current, children: E });
     },
     ["children", "onChangeProp", "onChangeReinit", "proxyRef"],
-    y.name + ".Provider"
+    v.name + ".Provider"
   );
 }
-function Ar(y, _ = [], k, h, x = !0) {
-  const R = mr(y), E = $e(), c = H(null);
-  if (R === void 0)
-    throw new Error(`No ${y.name} provider found.`);
+function Ir(v, E = [], w, g, T = !0) {
+  const m = mr(v), p = Ye(), i = Z(null);
+  if (m === void 0)
+    throw new Error(`No ${v.name} provider found.`);
   return Pr(() => {
-    c.current = R == null ? void 0 : R.subscribe(
-      (s, T, v) => {
-        E(), L(k) && k(s, T, v);
+    i.current = m == null ? void 0 : m.subscribe(
+      (s, P, b) => {
+        p(), Y(w) && w(s, P, b);
       },
-      (s, T) => {
-        x && E(), L(h) && h(s, T);
+      (s, P) => {
+        T && p(), Y(g) && g(s, P);
       },
-      _
+      E
     );
   }), Sr(() => {
-    R.unsubscribe(c.current);
+    m.unsubscribe(i.current);
   }), new gr(
-    { value: R.obj, set: R.set },
+    { value: m.obj, set: m.set },
     ["value", "set"]
   );
 }
 export {
-  Dr as createProxyContext,
+  Ar as createProxyContext,
   Fr as createProxyContextProvider,
-  Ar as useProxyContext
+  xr as evaluateDependency,
+  Ir as useProxyContext
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ptolemy2002/react-proxy-context",
   "private": false,
-  "version": "2.1.3",
+  "version": "2.3.0",
   "type": "module",
   "repository": {
     "type": "git",