@ptolemy2002/react-proxy-context 2.4.0 → 2.6.0

package/README.md

@@ -17,7 +17,7 @@ type OnChangePropCallback<T> =
     <K extends keyof T>(prop: K, current: T[K], prev?: T[K]) => void
 ;
 type OnChangeReinitCallback<T> =
-    (current: T, prev?: T) => void
+    (current: T, prev?: T, initial?: boolean) => void
 ;
 
 type Dependency<_T, T=Exclude<_T, null | undefined>> = keyof T | (
@@ -33,9 +33,9 @@ type ProxyContextChangeSubscriber<T> = {
     reinitCallback: OnChangeReinitCallback<T>;
 };
 
-type ProxyContextProviderProps<T> = {
+type ProxyContextProviderProps<T, InputT = T> = {
     children: ReactNode;
-    value: T | ProxyContextValueWrapper<T>;
+    value: InputT | ProxyContextValueWrapper<T>;
     onChangeProp?: OnChangePropCallback<T>;
     onChangeReinit?: OnChangeReinitCallback<T>;
     proxyRef?: React.MutableRefObject<T>;
@@ -45,6 +45,14 @@ type UseProxyContextResult<T> = HookResultData<{
     value: T;
     set: (newObj: T) => T;
 }, readonly [T, (newObj: T) => T]>;
+
+type UseProxyContextArgs<T> = [
+    ProxyContext<T>,
+    Dependency<T>[] | null,
+    OnChangePropCallback<T>,
+    OnChangeReinitCallback<T>,
+    boolean
+];
 ```
 
 ## Classes
@@ -100,12 +108,13 @@ Creates a new instance of the ProxyContext, essentially to be used as the contex
 #### Returns
 `ProxyContext<T>` - The context object that can be used in a provider.
 
-### createProxyContextProvider<T extends object | null>
+### createProxyContextProvider<T extends object | null, InputT = T>
 #### Description
 Creates a new proxy context provider component with the specified type. `ProxyContextProvider` is no longer used due to a TypeScript limitation that prevents the context type from being inferred.
 
 #### Parameters
 - `contextClass` (`ProxyContext<T>`): The context class that was created using `createProxyContext`.
+- `transformInput` (`(input: InputT) => T`): A function that transforms the input value into the desired type `T`. This is useful when the input type differs from the context type, allowing for custom initialization logic. By default, this function simply casts the input to type `T`.
 
 #### Returns
 `React.MemoExoticComponent<FunctionComponent<ProxyContextProviderProps<T> & { renderDeps?: any[] }>>` - The provider component that can be used in the React tree. The resulting component is memoized to prevent unnecessary re-renders, but the `renderDeps` prop can be used to force a re-render when the specified dependencies change (necessary when working with the children prop).
@@ -113,7 +122,7 @@ Creates a new proxy context provider component with the specified type. `ProxyCo
 The component has the following props:
 - `value` (`T | ProxyContextValueWrapper<T>`): The value of the context. This can be either a raw value of type `T`, which will be automatically wrapped in a `ProxyContextValueWrapper`, or a pre-existing `ProxyContextValueWrapper<T>` instance. This allows you to initialize the wrapper outside of the context and pass it in, giving you more control over the proxy lifecycle.
 - `onChangeProp` (`OnChangePropCallback<T>`): 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>`): 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.
+- `onChangeReinit` (`OnChangeReinitCallback<T>`): A function that is called whenever the context is reinitialized. The first parameter is the current value of the context, the second parameter is the previous value of the context, and the third parameter is a boolean indicating whether this is the first initialization. Also called on first initialization, with the previous value being `undefined` if you passed in a raw value instead of a `ProxyContextValueWrapper`. This is useful for listening to changes in the provider's parent component.
 - `proxyRef` (`React.MutableRefObject<T>`): A ref object that is assigned the proxy object of the context. This is useful for accessing the proxy object directly by the provider's parent component.
 
 ## Hooks
@@ -126,7 +135,7 @@ A hook that uses the context provided by the `ProxyContextProvider` component. T
 - `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. 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 consumer 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. Also called on initial initialization with the second parameter being `undefined`. This is useful for listening to changes in the consumer 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, the second parameter is the previous value of the context, and the third parameter is a boolean indicating whether this is the first initialization.
 - `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.
 
 #### Returns

package/dist/main.d.ts

@@ -4,14 +4,14 @@ export type ContextWithName<T> = Context<T> & {
     name: string;
 };
 export type OnChangePropCallback<T> = <K extends keyof T>(prop: K, current: T[K], prev?: T[K]) => void;
-export type OnChangeReinitCallback<T> = (current: T, prev?: T) => void;
+export type OnChangeReinitCallback<T> = (current: T, prev?: T, initial?: boolean) => void;
 export declare function createProxyContext<T>(name: string): ProxyContext<T>;
 export 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 | [keyof T, ...PropertyKey[]];
 export declare function evaluateDependency<T>(dep: Dependency<T>): Exclude<Dependency<T>, any[]>;
 export type ProxyContext<T> = ContextWithName<ProxyContextValueWrapper<T> | undefined>;
-export type ProxyContextProviderProps<T> = {
+export type ProxyContextProviderProps<T, InputT = T> = {
     children: ReactNode;
-    value: T | ProxyContextValueWrapper<T>;
+    value: InputT | ProxyContextValueWrapper<T>;
     onChangeProp?: OnChangePropCallback<T>;
     onChangeReinit?: OnChangeReinitCallback<T>;
     proxyRef?: React.MutableRefObject<T>;
@@ -29,15 +29,22 @@ export declare class ProxyContextValueWrapper<T> {
     subscribe(propCallback: OnChangePropCallback<T>, reinitCallback: OnChangeReinitCallback<T>, deps: Dependency<T>[] | null): string;
     unsubscribe(id: string): void;
     emitChange(prop: keyof T, current: T[keyof T], prev?: T[keyof T]): void;
-    emitReinit(current: T, prev?: T): void;
+    emitReinit(current: T, prev?: T, initial?: boolean): void;
     get(): T;
     set(newObj: T): T;
 }
-export declare function createProxyContextProvider<T extends object | null>(contextClass: ProxyContext<T>): import('react').MemoExoticComponent<import('react').FunctionComponent<ProxyContextProviderProps<T> & {
+export declare function createProxyContextProvider<T extends object | null, InputT = T>(contextClass: ProxyContext<T>, transformInput?: (input: InputT) => T): import('react').MemoExoticComponent<import('react').FunctionComponent<ProxyContextProviderProps<T, InputT> & {
     renderDeps?: unknown[] | null | false;
 }>>;
 export type UseProxyContextResult<T> = HookResultData<{
     value: T;
     set: (newObj: T) => T;
 }, readonly [T, (newObj: T) => T]>;
-export declare function useProxyContext<T>(contextClass: ProxyContext<T>, deps?: Dependency<T>[] | null, onChangeProp?: OnChangePropCallback<T>, onChangeReinit?: OnChangeReinitCallback<T>, listenReinit?: boolean): UseProxyContextResult<T>;
+export type UseProxyContextArgs<T> = [
+    ProxyContext<T>,
+    Dependency<T>[] | null,
+    OnChangePropCallback<T>,
+    OnChangeReinitCallback<T>,
+    boolean
+];
+export declare function useProxyContext<T>(...[contextClass, deps, onChangeProp, onChangeReinit, listenReinit]: UseProxyContextArgs<T>): UseProxyContextResult<T>;

package/dist/main.js

@@ -1,13 +1,13 @@
 var dr = Object.defineProperty;
-var pr = (h, a, l) => a in h ? dr(h, a, { enumerable: !0, configurable: !0, writable: !0, value: l }) : h[a] = l;
-var X = (h, a, l) => pr(h, typeof a != "symbol" ? a + "" : a, l);
+var pr = (h, a, f) => a in h ? dr(h, a, { enumerable: !0, configurable: !0, writable: !0, value: f }) : h[a] = f;
+var X = (h, a, f) => pr(h, typeof a != "symbol" ? a + "" : a, f);
 import Oe, { createContext as br, useRef as Ce, useImperativeHandle as hr, useEffect as yr, useContext as mr, useCallback as Er, useSyncExternalStore as gr } from "react";
 import { nanoid as _r } from "nanoid";
 import Y from "is-callable";
 import Rr from "@ptolemy2002/react-force-rerender";
 import Tr from "@ptolemy2002/react-hook-result";
 import { partialMemo as Sr } from "@ptolemy2002/react-utils";
-var Z = { exports: {} }, $ = {};
+var Q = { exports: {} }, $ = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -17,19 +17,19 @@ var Z = { exports: {} }, $ = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var xe;
+var Pe;
 function xr() {
-  if (xe) return $;
-  xe = 1;
-  var h = Oe, a = Symbol.for("react.element"), l = Symbol.for("react.fragment"), p = Object.prototype.hasOwnProperty, c = h.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, b = { key: !0, ref: !0, __self: !0, __source: !0 };
-  function i(v, d, x) {
+  if (Pe) return $;
+  Pe = 1;
+  var h = Oe, a = Symbol.for("react.element"), f = Symbol.for("react.fragment"), v = Object.prototype.hasOwnProperty, d = h.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, c = { key: !0, ref: !0, __self: !0, __source: !0 };
+  function l(u, p, x) {
     var E, T = {}, P = null, k = null;
-    x !== void 0 && (P = "" + x), d.key !== void 0 && (P = "" + d.key), d.ref !== void 0 && (k = d.ref);
-    for (E in d) p.call(d, E) && !b.hasOwnProperty(E) && (T[E] = d[E]);
-    if (v && v.defaultProps) for (E in d = v.defaultProps, d) T[E] === void 0 && (T[E] = d[E]);
-    return { $$typeof: a, type: v, key: P, ref: k, props: T, _owner: c.current };
+    x !== void 0 && (P = "" + x), p.key !== void 0 && (P = "" + p.key), p.ref !== void 0 && (k = p.ref);
+    for (E in p) v.call(p, E) && !c.hasOwnProperty(E) && (T[E] = p[E]);
+    if (u && u.defaultProps) for (E in p = u.defaultProps, p) T[E] === void 0 && (T[E] = p[E]);
+    return { $$typeof: a, type: u, key: P, ref: k, props: T, _owner: d.current };
   }
-  return $.Fragment = l, $.jsx = i, $.jsxs = i, $;
+  return $.Fragment = f, $.jsx = l, $.jsxs = l, $;
 }
 var W = {};
 /**
@@ -41,14 +41,14 @@ var W = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var Pe;
+var we;
 function Pr() {
-  return Pe || (Pe = 1, process.env.NODE_ENV !== "production" && function() {
-    var h = Oe, a = Symbol.for("react.element"), l = Symbol.for("react.portal"), p = Symbol.for("react.fragment"), c = Symbol.for("react.strict_mode"), b = Symbol.for("react.profiler"), i = Symbol.for("react.provider"), v = Symbol.for("react.context"), d = Symbol.for("react.forward_ref"), x = Symbol.for("react.suspense"), E = Symbol.for("react.suspense_list"), T = Symbol.for("react.memo"), P = Symbol.for("react.lazy"), k = Symbol.for("react.offscreen"), Q = Symbol.iterator, ke = "@@iterator";
+  return we || (we = 1, process.env.NODE_ENV !== "production" && function() {
+    var h = Oe, a = Symbol.for("react.element"), f = Symbol.for("react.portal"), v = Symbol.for("react.fragment"), d = Symbol.for("react.strict_mode"), c = Symbol.for("react.profiler"), l = Symbol.for("react.provider"), u = Symbol.for("react.context"), p = Symbol.for("react.forward_ref"), x = Symbol.for("react.suspense"), E = Symbol.for("react.suspense_list"), T = Symbol.for("react.memo"), P = Symbol.for("react.lazy"), k = Symbol.for("react.offscreen"), ee = Symbol.iterator, ke = "@@iterator";
     function je(e) {
       if (e === null || typeof e != "object")
         return null;
-      var r = Q && e[Q] || e[ke];
+      var r = ee && e[ee] || e[ke];
       return typeof r == "function" ? r : null;
     }
     var j = h.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
@@ -63,20 +63,20 @@ function Pr() {
       {
         var n = j.ReactDebugCurrentFrame, s = n.getStackAddendum();
         s !== "" && (r += "%s", t = t.concat([s]));
-        var f = t.map(function(u) {
-          return String(u);
+        var b = t.map(function(o) {
+          return String(o);
         });
-        f.unshift("Warning: " + r), Function.prototype.apply.call(console[e], console, f);
+        b.unshift("Warning: " + r), Function.prototype.apply.call(console[e], console, b);
       }
     }
-    var Fe = !1, Ae = !1, Ie = !1, $e = !1, We = !1, ee;
-    ee = Symbol.for("react.module.reference");
+    var Fe = !1, Ae = !1, Ie = !1, $e = !1, We = !1, re;
+    re = Symbol.for("react.module.reference");
     function Ye(e) {
-      return !!(typeof e == "string" || typeof e == "function" || e === p || e === b || We || e === c || e === x || e === E || $e || e === k || Fe || Ae || Ie || typeof e == "object" && e !== null && (e.$$typeof === P || e.$$typeof === T || e.$$typeof === i || e.$$typeof === v || e.$$typeof === d || // This needs to include all possible module reference object
+      return !!(typeof e == "string" || typeof e == "function" || e === v || e === c || We || e === d || e === x || e === E || $e || e === k || Fe || Ae || Ie || typeof e == "object" && e !== null && (e.$$typeof === P || e.$$typeof === T || e.$$typeof === l || e.$$typeof === u || e.$$typeof === p || // 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 === ee || e.getModuleId !== void 0));
+      e.$$typeof === re || e.getModuleId !== void 0));
     }
     function Ve(e, r, t) {
       var n = e.displayName;
@@ -85,7 +85,7 @@ function Pr() {
       var s = r.displayName || r.name || "";
       return s !== "" ? t + "(" + s + ")" : t;
     }
-    function re(e) {
+    function te(e) {
       return e.displayName || "Context";
     }
     function w(e) {
@@ -96,13 +96,13 @@ function Pr() {
       if (typeof e == "string")
         return e;
       switch (e) {
-        case p:
+        case v:
           return "Fragment";
-        case l:
+        case f:
           return "Portal";
-        case b:
-          return "Profiler";
         case c:
+          return "Profiler";
+        case d:
           return "StrictMode";
         case x:
           return "Suspense";
@@ -111,21 +111,21 @@ function Pr() {
       }
       if (typeof e == "object")
         switch (e.$$typeof) {
-          case v:
+          case u:
             var r = e;
-            return re(r) + ".Consumer";
-          case i:
+            return te(r) + ".Consumer";
+          case l:
             var t = e;
-            return re(t._context) + ".Provider";
-          case d:
+            return te(t._context) + ".Provider";
+          case p:
             return Ve(e, e.render, "ForwardRef");
           case T:
             var n = e.displayName || null;
             return n !== null ? n : w(e.type) || "Memo";
           case P: {
-            var s = e, f = s._payload, u = s._init;
+            var s = e, b = s._payload, o = s._init;
             try {
-              return w(u(f));
+              return w(o(b));
             } catch {
               return null;
             }
@@ -133,18 +133,18 @@ function Pr() {
         }
       return null;
     }
-    var O = Object.assign, A = 0, te, ne, ae, ie, oe, ue, se;
-    function ce() {
+    var O = Object.assign, A = 0, ne, ae, ie, oe, ue, se, ce;
+    function le() {
     }
-    ce.__reactDisabledLog = !0;
+    le.__reactDisabledLog = !0;
     function Le() {
       {
         if (A === 0) {
-          te = console.log, ne = console.info, ae = console.warn, ie = console.error, oe = console.group, ue = console.groupCollapsed, se = console.groupEnd;
+          ne = console.log, ae = console.info, ie = console.warn, oe = console.error, ue = console.group, se = console.groupCollapsed, ce = console.groupEnd;
           var e = {
             configurable: !0,
             enumerable: !0,
-            value: ce,
+            value: le,
             writable: !0
           };
           Object.defineProperties(console, {
@@ -170,25 +170,25 @@ function Pr() {
           };
           Object.defineProperties(console, {
             log: O({}, e, {
-              value: te
+              value: ne
             }),
             info: O({}, e, {
-              value: ne
+              value: ae
             }),
             warn: O({}, e, {
-              value: ae
+              value: ie
             }),
             error: O({}, e, {
-              value: ie
+              value: oe
             }),
             group: O({}, e, {
-              value: oe
+              value: ue
             }),
             groupCollapsed: O({}, e, {
-              value: ue
+              value: se
             }),
             groupEnd: O({}, e, {
-              value: se
+              value: ce
             })
           });
         }
@@ -214,7 +214,7 @@ function Pr() {
       var Ue = typeof WeakMap == "function" ? WeakMap : Map;
       L = new Ue();
     }
-    function le(e, r) {
+    function fe(e, r) {
       if (!e || J)
         return "";
       {
@@ -226,31 +226,31 @@ function Pr() {
       J = !0;
       var s = Error.prepareStackTrace;
       Error.prepareStackTrace = void 0;
-      var f;
-      f = N.current, N.current = null, Le();
+      var b;
+      b = N.current, N.current = null, Le();
       try {
         if (r) {
-          var u = function() {
+          var o = function() {
             throw Error();
           };
-          if (Object.defineProperty(u.prototype, "props", {
+          if (Object.defineProperty(o.prototype, "props", {
             set: function() {
               throw Error();
             }
           }), typeof Reflect == "object" && Reflect.construct) {
             try {
-              Reflect.construct(u, []);
+              Reflect.construct(o, []);
             } catch (R) {
               n = R;
             }
-            Reflect.construct(e, [], u);
+            Reflect.construct(e, [], o);
           } else {
             try {
-              u.call();
+              o.call();
             } catch (R) {
               n = R;
             }
-            e.call(u.prototype);
+            e.call(o.prototype);
           }
         } else {
           try {
@@ -262,17 +262,17 @@ function Pr() {
         }
       } catch (R) {
         if (R && n && typeof R.stack == "string") {
-          for (var o = R.stack.split(`
+          for (var i = R.stack.split(`
 `), _ = n.stack.split(`
-`), y = o.length - 1, m = _.length - 1; y >= 1 && m >= 0 && o[y] !== _[m]; )
+`), y = i.length - 1, m = _.length - 1; y >= 1 && m >= 0 && i[y] !== _[m]; )
             m--;
           for (; y >= 1 && m >= 0; y--, m--)
-            if (o[y] !== _[m]) {
+            if (i[y] !== _[m]) {
               if (y !== 1 || m !== 1)
                 do
-                  if (y--, m--, m < 0 || o[y] !== _[m]) {
+                  if (y--, m--, m < 0 || i[y] !== _[m]) {
                     var S = `
-` + o[y].replace(" at new ", " at ");
+` + i[y].replace(" at new ", " at ");
                     return e.displayName && S.includes("<anonymous>") && (S = S.replace("<anonymous>", e.displayName)), typeof e == "function" && L.set(e, S), S;
                   }
                 while (y >= 1 && m >= 0);
@@ -280,13 +280,13 @@ function Pr() {
             }
         }
       } finally {
-        J = !1, N.current = f, Me(), Error.prepareStackTrace = s;
+        J = !1, N.current = b, Me(), Error.prepareStackTrace = s;
       }
       var F = e ? e.displayName || e.name : "", C = F ? V(F) : "";
       return typeof e == "function" && L.set(e, C), C;
     }
     function Ne(e, r, t) {
-      return le(e, !1);
+      return fe(e, !1);
     }
     function Be(e) {
       var r = e.prototype;
@@ -296,7 +296,7 @@ function Pr() {
       if (e == null)
         return "";
       if (typeof e == "function")
-        return le(e, Be(e));
+        return fe(e, Be(e));
       if (typeof e == "string")
         return V(e);
       switch (e) {
@@ -307,44 +307,44 @@ function Pr() {
       }
       if (typeof e == "object")
         switch (e.$$typeof) {
-          case d:
+          case p:
             return Ne(e.render);
           case T:
             return M(e.type, r, t);
           case P: {
-            var n = e, s = n._payload, f = n._init;
+            var n = e, s = n._payload, b = n._init;
             try {
-              return M(f(s), r, t);
+              return M(b(s), r, t);
             } catch {
             }
           }
         }
       return "";
     }
-    var I = Object.prototype.hasOwnProperty, fe = {}, ve = j.ReactDebugCurrentFrame;
+    var I = Object.prototype.hasOwnProperty, ve = {}, de = j.ReactDebugCurrentFrame;
     function U(e) {
       if (e) {
         var r = e._owner, t = M(e.type, e._source, r ? r.type : null);
-        ve.setExtraStackFrame(t);
+        de.setExtraStackFrame(t);
       } else
-        ve.setExtraStackFrame(null);
+        de.setExtraStackFrame(null);
     }
     function Je(e, r, t, n, s) {
       {
-        var f = Function.call.bind(I);
-        for (var u in e)
-          if (f(e, u)) {
-            var o = void 0;
+        var b = Function.call.bind(I);
+        for (var o in e)
+          if (b(e, o)) {
+            var i = void 0;
             try {
-              if (typeof e[u] != "function") {
-                var _ = Error((n || "React class") + ": " + t + " type `" + u + "` is invalid; it must be a function, usually from the `prop-types` package, but received `" + typeof e[u] + "`.This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`.");
+              if (typeof e[o] != "function") {
+                var _ = 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 _.name = "Invariant Violation", _;
               }
-              o = e[u](r, u, n, t, null, "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED");
+              i = e[o](r, o, n, t, null, "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED");
             } catch (y) {
-              o = y;
+              i = y;
             }
-            o && !(o instanceof Error) && (U(s), g("%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, u, typeof o), U(null)), o instanceof Error && !(o.message in fe) && (fe[o.message] = !0, U(s), g("Failed %s type: %s", t, o.message), U(null));
+            i && !(i instanceof Error) && (U(s), g("%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 i), U(null)), i instanceof Error && !(i.message in ve) && (ve[i.message] = !0, U(s), g("Failed %s type: %s", t, i.message), U(null));
           }
       }
     }
@@ -360,24 +360,24 @@ function Pr() {
     }
     function Ge(e) {
       try {
-        return de(e), !1;
+        return pe(e), !1;
       } catch {
         return !0;
       }
     }
-    function de(e) {
+    function pe(e) {
       return "" + e;
     }
-    function pe(e) {
+    function be(e) {
       if (Ge(e))
-        return g("The provided key is an unsupported type %s. This value must be coerced to a string before before using it here.", Ke(e)), de(e);
+        return g("The provided key is an unsupported type %s. This value must be coerced to a string before before using it here.", Ke(e)), pe(e);
     }
-    var be = j.ReactCurrentOwner, ze = {
+    var he = j.ReactCurrentOwner, ze = {
       key: !0,
       ref: !0,
       __self: !0,
       __source: !0
-    }, he, ye;
+    }, ye, me;
     function He(e) {
       if (I.call(e, "ref")) {
         var r = Object.getOwnPropertyDescriptor(e, "ref").get;
@@ -395,12 +395,12 @@ function Pr() {
       return e.key !== void 0;
     }
     function Ze(e, r) {
-      typeof e.ref == "string" && be.current;
+      typeof e.ref == "string" && he.current;
     }
     function Qe(e, r) {
       {
         var t = function() {
-          he || (he = !0, g("%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));
+          ye || (ye = !0, g("%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,
@@ -411,7 +411,7 @@ function Pr() {
     function er(e, r) {
       {
         var t = function() {
-          ye || (ye = !0, g("%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));
+          me || (me = !0, g("%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,
@@ -419,67 +419,67 @@ function Pr() {
         });
       }
     }
-    var rr = function(e, r, t, n, s, f, u) {
-      var o = {
+    var rr = function(e, r, t, n, s, b, o) {
+      var i = {
         // This tag allows us to uniquely identify this as a React Element
         $$typeof: a,
         // Built-in properties that belong on the element
         type: e,
         key: r,
         ref: t,
-        props: u,
+        props: o,
         // Record the component responsible for creating this element.
-        _owner: f
+        _owner: b
       };
-      return o._store = {}, Object.defineProperty(o._store, "validated", {
+      return i._store = {}, Object.defineProperty(i._store, "validated", {
         configurable: !1,
         enumerable: !1,
         writable: !0,
         value: !1
-      }), Object.defineProperty(o, "_self", {
+      }), Object.defineProperty(i, "_self", {
         configurable: !1,
         enumerable: !1,
         writable: !1,
         value: n
-      }), Object.defineProperty(o, "_source", {
+      }), Object.defineProperty(i, "_source", {
         configurable: !1,
         enumerable: !1,
         writable: !1,
         value: s
-      }), Object.freeze && (Object.freeze(o.props), Object.freeze(o)), o;
+      }), Object.freeze && (Object.freeze(i.props), Object.freeze(i)), i;
     };
     function tr(e, r, t, n, s) {
       {
-        var f, u = {}, o = null, _ = null;
-        t !== void 0 && (pe(t), o = "" + t), Xe(r) && (pe(r.key), o = "" + r.key), He(r) && (_ = r.ref, Ze(r, s));
-        for (f in r)
-          I.call(r, f) && !ze.hasOwnProperty(f) && (u[f] = r[f]);
+        var b, o = {}, i = null, _ = null;
+        t !== void 0 && (be(t), i = "" + t), Xe(r) && (be(r.key), i = "" + r.key), He(r) && (_ = r.ref, Ze(r, s));
+        for (b in r)
+          I.call(r, b) && !ze.hasOwnProperty(b) && (o[b] = r[b]);
         if (e && e.defaultProps) {
           var y = e.defaultProps;
-          for (f in y)
-            u[f] === void 0 && (u[f] = y[f]);
+          for (b in y)
+            o[b] === void 0 && (o[b] = y[b]);
         }
-        if (o || _) {
+        if (i || _) {
           var m = typeof e == "function" ? e.displayName || e.name || "Unknown" : e;
-          o && Qe(u, m), _ && er(u, m);
+          i && Qe(o, m), _ && er(o, m);
         }
-        return rr(e, o, _, s, n, be.current, u);
+        return rr(e, i, _, s, n, he.current, o);
       }
     }
-    var K = j.ReactCurrentOwner, me = j.ReactDebugCurrentFrame;
+    var K = j.ReactCurrentOwner, Ee = j.ReactDebugCurrentFrame;
     function D(e) {
       if (e) {
         var r = e._owner, t = M(e.type, e._source, r ? r.type : null);
-        me.setExtraStackFrame(t);
+        Ee.setExtraStackFrame(t);
       } else
-        me.setExtraStackFrame(null);
+        Ee.setExtraStackFrame(null);
     }
     var G;
     G = !1;
     function z(e) {
       return typeof e == "object" && e !== null && e.$$typeof === a;
     }
-    function Ee() {
+    function ge() {
       {
         if (K.current) {
           var e = w(K.current.type);
@@ -494,10 +494,10 @@ Check the render method of \`` + e + "`.";
     function nr(e) {
       return "";
     }
-    var ge = {};
+    var _e = {};
     function ar(e) {
       {
-        var r = Ee();
+        var r = ge();
         if (!r) {
           var t = typeof e == "string" ? e : e.displayName || e.name;
           t && (r = `
@@ -507,35 +507,35 @@ Check the top-level render call using <` + t + ">.");
         return r;
       }
     }
-    function _e(e, r) {
+    function Re(e, r) {
       {
         if (!e._store || e._store.validated || e.key != null)
           return;
         e._store.validated = !0;
         var t = ar(r);
-        if (ge[t])
+        if (_e[t])
           return;
-        ge[t] = !0;
+        _e[t] = !0;
         var n = "";
         e && e._owner && e._owner !== K.current && (n = " It was passed a child from " + w(e._owner.type) + "."), D(e), g('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), D(null);
       }
     }
-    function Re(e, r) {
+    function Te(e, r) {
       {
         if (typeof e != "object")
           return;
         if (q(e))
           for (var t = 0; t < e.length; t++) {
             var n = e[t];
-            z(n) && _e(n, r);
+            z(n) && Re(n, r);
           }
         else if (z(e))
           e._store && (e._store.validated = !0);
         else if (e) {
           var s = je(e);
           if (typeof s == "function" && s !== e.entries)
-            for (var f = s.call(e), u; !(u = f.next()).done; )
-              z(u.value) && _e(u.value, r);
+            for (var b = s.call(e), o; !(o = b.next()).done; )
+              z(o.value) && Re(o.value, r);
         }
       }
     }
@@ -547,7 +547,7 @@ Check the top-level render call using <` + t + ">.");
         var t;
         if (typeof r == "function")
           t = r.propTypes;
-        else if (typeof r == "object" && (r.$$typeof === d || // Note: Memo only checks outer props here.
+        else if (typeof r == "object" && (r.$$typeof === p || // Note: Memo only checks outer props here.
         // Inner props are checked in the reconciler.
         r.$$typeof === T))
           t = r.propTypes;
@@ -576,63 +576,63 @@ Check the top-level render call using <` + t + ">.");
         e.ref !== null && (D(e), g("Invalid attribute `ref` supplied to `React.Fragment`."), D(null));
       }
     }
-    var Te = {};
-    function Se(e, r, t, n, s, f) {
+    var Se = {};
+    function xe(e, r, t, n, s, b) {
       {
-        var u = Ye(e);
-        if (!u) {
-          var o = "";
-          (e === void 0 || typeof e == "object" && e !== null && Object.keys(e).length === 0) && (o += " 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 o = Ye(e);
+        if (!o) {
+          var i = "";
+          (e === void 0 || typeof e == "object" && e !== null && Object.keys(e).length === 0) && (i += " 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 _ = nr();
-          _ ? o += _ : o += Ee();
+          _ ? i += _ : i += ge();
           var y;
-          e === null ? y = "null" : q(e) ? y = "array" : e !== void 0 && e.$$typeof === a ? (y = "<" + (w(e.type) || "Unknown") + " />", o = " Did you accidentally export a JSX literal instead of a component?") : y = typeof e, g("React.jsx: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s", y, o);
+          e === null ? y = "null" : q(e) ? y = "array" : e !== void 0 && e.$$typeof === a ? (y = "<" + (w(e.type) || "Unknown") + " />", i = " Did you accidentally export a JSX literal instead of a component?") : y = typeof e, g("React.jsx: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s", y, i);
         }
-        var m = tr(e, r, t, s, f);
+        var m = tr(e, r, t, s, b);
         if (m == null)
           return m;
-        if (u) {
+        if (o) {
           var S = r.children;
           if (S !== void 0)
             if (n)
               if (q(S)) {
                 for (var F = 0; F < S.length; F++)
-                  Re(S[F], e);
+                  Te(S[F], e);
                 Object.freeze && Object.freeze(S);
               } else
                 g("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
-              Re(S, e);
+              Te(S, e);
         }
         if (I.call(r, "key")) {
           var C = w(e), R = Object.keys(r).filter(function(vr) {
             return vr !== "key";
           }), H = R.length > 0 ? "{key: someKey, " + R.join(": ..., ") + ": ...}" : "{key: someKey}";
-          if (!Te[C + H]) {
+          if (!Se[C + H]) {
             var fr = R.length > 0 ? "{" + R.join(": ..., ") + ": ...}" : "{}";
             g(`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} />`, H, C, fr, C), Te[C + H] = !0;
+  <%s key={someKey} {...props} />`, H, C, fr, C), Se[C + H] = !0;
           }
         }
-        return e === p ? or(m) : ir(m), m;
+        return e === v ? or(m) : ir(m), m;
       }
     }
     function ur(e, r, t) {
-      return Se(e, r, t, !0);
+      return xe(e, r, t, !0);
     }
     function sr(e, r, t) {
-      return Se(e, r, t, !1);
+      return xe(e, r, t, !1);
     }
     var cr = sr, lr = ur;
-    W.Fragment = p, W.jsx = cr, W.jsxs = lr;
+    W.Fragment = v, W.jsx = cr, W.jsxs = lr;
   }()), W;
 }
-process.env.NODE_ENV === "production" ? Z.exports = xr() : Z.exports = Pr();
-var wr = Z.exports;
+process.env.NODE_ENV === "production" ? Q.exports = xr() : Q.exports = Pr();
+var wr = Q.exports;
 function $r(h) {
   if (typeof Proxy > "u") throw new Error("Proxy is not supported in this environment.");
   const a = br(
@@ -642,128 +642,134 @@ function $r(h) {
 }
 function Or(h) {
   if (Array.isArray(h)) {
-    const [a, ...l] = h;
-    return (p, c, b) => {
-      if (p !== a) return !1;
-      let i = c, v = b;
-      for (const d of l)
-        i = i == null ? void 0 : i[d], v = v == null ? void 0 : v[d];
-      return i !== v;
+    const [a, ...f] = h;
+    return (v, d, c) => {
+      if (v !== a) return !1;
+      let l = d, u = c;
+      for (const p of f)
+        l = l == null ? void 0 : l[p], u = u == null ? void 0 : u[p];
+      return l !== u;
     };
   }
   return h;
 }
-class we {
+class Z {
   constructor(a) {
     X(this, "value");
     X(this, "changeSubscribers", {});
     this.set(a);
   }
-  subscribe(a, l, p) {
-    const c = _r();
-    return this.changeSubscribers[c] = {
-      id: c,
-      deps: p,
+  subscribe(a, f, v) {
+    const d = _r();
+    return this.changeSubscribers[d] = {
+      id: d,
+      deps: v,
       propCallback: a,
-      reinitCallback: l
-    }, c;
+      reinitCallback: f
+    }, d;
   }
   unsubscribe(a) {
     delete this.changeSubscribers[a];
   }
-  emitChange(a, l, p) {
-    Object.values(this.changeSubscribers).forEach((c) => {
-      var i;
-      const b = (i = c.deps) == null ? void 0 : i.map(Or);
-      (!b || b.includes(a) && p !== l || b.some(
-        (v) => Y(v) && v(a, l, p, this.value)
-      )) && c.propCallback(a, l, p);
+  emitChange(a, f, v) {
+    Object.values(this.changeSubscribers).forEach((d) => {
+      var l;
+      const c = (l = d.deps) == null ? void 0 : l.map(Or);
+      (!c || c.includes(a) && v !== f || c.some(
+        (u) => Y(u) && u(a, f, v, this.value)
+      )) && d.propCallback(a, f, v);
     });
   }
-  emitReinit(a, l) {
-    Object.values(this.changeSubscribers).forEach((p) => {
-      p.reinitCallback(a, l);
+  emitReinit(a, f, v = !1) {
+    Object.values(this.changeSubscribers).forEach((d) => {
+      d.reinitCallback(a, f, v);
     });
   }
   get() {
     return this.value;
   }
   set(a) {
-    const l = this;
+    const f = this;
     if (a !== this.value) {
-      const p = this.value;
+      const v = this.value;
       a != null ? this.value = new Proxy(a, {
-        get: function(c, b) {
-          const i = Reflect.get(c, b, a);
-          return Y(i) ? i.bind(l.value) : i;
+        get: function(d, c) {
+          const l = Reflect.get(d, c, a);
+          return Y(l) ? l.bind(f.value) : l;
         },
-        set: (c, b, i) => {
-          const v = b, d = c[v];
-          return Reflect.set(c, v, i, a), i = c[v], this.emitChange(v, i, d), !0;
+        set: (d, c, l) => {
+          const u = c, p = d[u];
+          return Reflect.set(d, u, l, a), l = d[u], this.emitChange(u, l, p), !0;
         }
-      }) : this.value = a, this.emitReinit(this.value, p);
+      }) : this.value = a, this.emitReinit(this.value, v);
     }
     return this.value;
   }
 }
-function Wr(h) {
+function Wr(h, a = (f) => f) {
   return Sr(
     ({
-      children: a,
-      value: l,
-      onChangeProp: p,
+      children: f,
+      value: v,
+      onChangeProp: d,
       onChangeReinit: c,
-      proxyRef: b
+      proxyRef: l
     }) => {
-      const i = Ce(void 0);
-      i.current === void 0 && (i.current = l instanceof we ? l : new we(l), c == null || c(i.current.get(), void 0));
-      const v = Rr();
-      return hr(b, () => i.current.get(), [i.current.get()]), yr(() => {
-        const d = i.current.subscribe(
-          p ?? (() => {
+      const u = Ce(void 0);
+      u.current === void 0 && (u.current = v instanceof Z ? v : new Z(a(v)), c == null || c(u.current.get(), v instanceof Z ? v.get() : void 0, !0));
+      const p = Rr();
+      return hr(l, () => u.current.get(), [u.current.get()]), yr(() => {
+        const x = u.current.subscribe(
+          d ?? (() => {
           }),
-          (...x) => {
-            Y(c) && c(...x), v();
+          (...E) => {
+            Y(c) && c(...E), p();
           },
           null
         );
         return () => {
-          i.current.unsubscribe(d);
+          u.current.unsubscribe(x);
         };
-      }, [p, c, v]), /* @__PURE__ */ wr.jsx(h.Provider, { value: i.current, children: a });
+      }, [d, c, p]), /* @__PURE__ */ wr.jsx(h.Provider, { value: u.current, children: f });
     },
     ["children", "onChangeProp", "onChangeReinit", "proxyRef"],
     h.name + ".Provider"
   );
 }
-function Yr(h, a = [], l, p, c = !0) {
-  const b = mr(h);
-  if (b === void 0)
+function Yr(...[
+  h,
+  a,
+  f,
+  v,
+  d = !0
+]) {
+  const c = mr(h);
+  if (c === void 0)
     throw new Error(`No ${h.name} provider found.`);
-  const i = Ce({ value: b }), v = Er((x) => {
-    const E = b.subscribe(
+  const l = Ce({ value: c }), u = Er((x) => {
+    const E = c.subscribe(
       (T, P, k) => {
-        i.current = { value: b }, x(), Y(l) && l(T, P, k);
+        l.current = { value: c }, x(), Y(f) && f(T, P, k);
       },
       (T, P) => {
-        c && (i.current = { value: b }, x()), Y(p) && p(T, P);
+        d && (l.current = { value: c }, x()), Y(v) && v(T, P);
       },
       a
     );
-    return () => b.unsubscribe(E);
-  }, [a, c, l, p, b]), d = gr(
-    v,
-    () => i.current,
-    () => i.current
+    return () => c.unsubscribe(E);
+  }, [a, d, f, v, c]), p = gr(
+    u,
+    () => l.current,
+    () => l.current
   );
   return new Tr(
     // The binding is necessary to fix a strange issue I'm having.
-    { value: d.value.get(), set: d.value.set.bind(d.value) },
+    { value: p.value.get(), set: p.value.set.bind(p.value) },
     ["value", "set"]
   );
 }
 export {
-  we as ProxyContextValueWrapper,
+  Z as ProxyContextValueWrapper,
   $r as createProxyContext,
   Wr as createProxyContextProvider,
   Or as evaluateDependency,

package/package.json

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