@effect-rx/rx-react 0.1.3 → 0.1.5

package/index.d.ts

@@ -21,20 +21,15 @@ export declare const useRxValue: <A>(rx: Rx.Rx<A>) => A;
  * @since 1.0.0
  * @category hooks
  */
-export declare const useSetRx: <R, W>(rx: Rx.Writeable<R, W>) => (_: W) => void;
+export declare const useSetRx: <R, W>(rx: Rx.Writeable<R, W>) => (_: W | ((_: R) => W)) => void;
 /**
  * @since 1.0.0
  * @category hooks
  */
-export declare const useUpdateRx: <R, W>(rx: Rx.Writeable<R, W>) => (f: (_: R) => W) => void;
+export declare const useRefreshRx: <A>(rx: Rx.Rx<A> & Rx.Refreshable) => () => void;
 /**
  * @since 1.0.0
  * @category hooks
  */
-export declare const useRx: <R, W>(rx: Rx.Writeable<R, W>) => readonly [R, (_: W) => void];
-/**
- * @since 1.0.0
- * @category hooks
- */
-export declare const useRxUpdate: <R, W>(rx: Rx.Writeable<R, W>) => readonly [R, (f: (_: R) => W) => void];
+export declare const useRx: <R, W>(rx: Rx.Writeable<R, W>) => readonly [value: R, setOrUpdate: (_: W | ((_: R) => W)) => void];
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["./src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAEtC;;;GAGG;AACH,eAAO,MAAM,eAAe,kCAA0D,CAAA;AAuBtF;;;GAGG;AACH,eAAO,MAAM,UAAU,wBAOtB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,8CAA6C,IAGjE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,wDAAuD,IAG9E,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,2DAA0D,IAAI,CAIpE,CAAA;AAEZ;;;GAGG;AACH,eAAO,MAAM,WAAW,qEAAoE,IAAI,CAIpF,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["./src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAEtC;;;GAGG;AACH,eAAO,MAAM,eAAe,kCAA0D,CAAA;AAwBtF;;;GAGG;AACH,eAAO,MAAM,UAAU,wBAOtB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,8DAA6D,IAUjF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,wCAAuC,MAAM,IAKrE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,+FAA8F,IAAI,CAIxG,CAAA"}

package/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useUpdateRx = exports.useSetRx = exports.useRxValue = exports.useRxUpdate = exports.useRx = exports.Rx = exports.Result = exports.RegistryContext = exports.Registry = void 0;
+exports.useSetRx = exports.useRxValue = exports.useRx = exports.useRefreshRx = exports.Rx = exports.Result = exports.RegistryContext = exports.Registry = void 0;
 var Registry = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect-rx/rx/Registry"));
 var Registry_1 = Registry;
 exports.Registry = Registry;
@@ -24,25 +24,24 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  */
 const RegistryContext = /*#__PURE__*/React.createContext( /*#__PURE__*/Registry.make());
 exports.RegistryContext = RegistryContext;
-class RxStore {
-  constructor(registry, rx) {
-    this.registry = registry;
-    this.rx = rx;
-    this.value = this.registry.get(this.rx);
-    this.init = false;
-    this.subscribe = f => {
-      if (this.init === true) {
-        this.value = this.registry.get(this.rx);
-      } else {
-        this.init = true;
-      }
-      return this.registry.subscribe(this.rx, a => {
-        this.value = a;
-        f();
-      });
-    };
-    this.snapshot = () => this.value;
+function makeStore(registry, rx) {
+  let getter = function () {
+    return registry.get(rx);
+  };
+  function subscribe(f) {
+    const [get, unmount] = registry.subscribeGetter(rx, f);
+    getter = get;
+    return unmount;
   }
+  function snapshot() {
+    return getter();
+  }
+  return {
+    rx,
+    registry,
+    subscribe,
+    snapshot
+  };
 }
 /**
  * @since 1.0.0
@@ -52,7 +51,7 @@ const useRxValue = rx => {
   const registry = React.useContext(RegistryContext);
   const store = React.useRef(undefined);
   if (store.current?.rx !== rx || store.current?.registry !== registry) {
-    store.current = new RxStore(registry, rx);
+    store.current = makeStore(registry, rx);
   }
   return React.useSyncExternalStore(store.current.subscribe, store.current.snapshot);
 };
@@ -63,28 +62,31 @@ const useRxValue = rx => {
 exports.useRxValue = useRxValue;
 const useSetRx = rx => {
   const registry = React.useContext(RegistryContext);
-  return React.useCallback(value => registry.set(rx, value), [registry, rx]);
+  return React.useCallback(value => {
+    if (typeof value === "function") {
+      registry.set(rx, value(registry.get(rx)));
+      return;
+    } else {
+      registry.set(rx, value);
+    }
+  }, [registry, rx]);
 };
 /**
  * @since 1.0.0
  * @category hooks
  */
 exports.useSetRx = useSetRx;
-const useUpdateRx = rx => {
+const useRefreshRx = rx => {
   const registry = React.useContext(RegistryContext);
-  return React.useCallback(f => registry.set(rx, f(registry.get(rx))), [registry, rx]);
+  return React.useCallback(() => {
+    registry.refresh(rx);
+  }, [registry, rx]);
 };
 /**
  * @since 1.0.0
  * @category hooks
  */
-exports.useUpdateRx = useUpdateRx;
+exports.useRefreshRx = useRefreshRx;
 const useRx = rx => [useRxValue(rx), useSetRx(rx)];
-/**
- * @since 1.0.0
- * @category hooks
- */
 exports.useRx = useRx;
-const useRxUpdate = rx => [useRxValue(rx), useUpdateRx(rx)];
-exports.useRxUpdate = useRxUpdate;
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["Registry","_interopRequireWildcard","require","Registry_1","exports","React","Result","Result_1","Rx","Rx_1","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","RegistryContext","createContext","make","RxStore","constructor","registry","rx","value","init","subscribe","f","a","snapshot","useRxValue","useContext","store","useRef","undefined","current","useSyncExternalStore","useSetRx","useCallback","useUpdateRx","useRx","useRxUpdate"],"sources":["./src/index.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"index.js","names":["Registry","_interopRequireWildcard","require","Registry_1","exports","React","Result","Result_1","Rx","Rx_1","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","RegistryContext","createContext","make","makeStore","registry","rx","getter","subscribe","f","unmount","subscribeGetter","snapshot","useRxValue","useContext","store","useRef","undefined","current","useSyncExternalStore","useSetRx","useCallback","value","useRefreshRx","refresh","useRx"],"sources":["./src/index.ts"],"sourcesContent":[null],"mappings":"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"}

package/mjs/index.mjs

@@ -14,25 +14,24 @@ export { Rx_1 as Rx };
  * @category context
  */
 export const RegistryContext = /*#__PURE__*/React.createContext( /*#__PURE__*/Registry.make());
-class RxStore {
-  constructor(registry, rx) {
-    this.registry = registry;
-    this.rx = rx;
-    this.value = this.registry.get(this.rx);
-    this.init = false;
-    this.subscribe = f => {
-      if (this.init === true) {
-        this.value = this.registry.get(this.rx);
-      } else {
-        this.init = true;
-      }
-      return this.registry.subscribe(this.rx, a => {
-        this.value = a;
-        f();
-      });
-    };
-    this.snapshot = () => this.value;
+function makeStore(registry, rx) {
+  let getter = function () {
+    return registry.get(rx);
+  };
+  function subscribe(f) {
+    const [get, unmount] = registry.subscribeGetter(rx, f);
+    getter = get;
+    return unmount;
   }
+  function snapshot() {
+    return getter();
+  }
+  return {
+    rx,
+    registry,
+    subscribe,
+    snapshot
+  };
 }
 /**
  * @since 1.0.0
@@ -42,7 +41,7 @@ export const useRxValue = rx => {
   const registry = React.useContext(RegistryContext);
   const store = React.useRef(undefined);
   if (store.current?.rx !== rx || store.current?.registry !== registry) {
-    store.current = new RxStore(registry, rx);
+    store.current = makeStore(registry, rx);
   }
   return React.useSyncExternalStore(store.current.subscribe, store.current.snapshot);
 };
@@ -52,24 +51,28 @@ export const useRxValue = rx => {
  */
 export const useSetRx = rx => {
   const registry = React.useContext(RegistryContext);
-  return React.useCallback(value => registry.set(rx, value), [registry, rx]);
+  return React.useCallback(value => {
+    if (typeof value === "function") {
+      registry.set(rx, value(registry.get(rx)));
+      return;
+    } else {
+      registry.set(rx, value);
+    }
+  }, [registry, rx]);
 };
 /**
  * @since 1.0.0
  * @category hooks
  */
-export const useUpdateRx = rx => {
+export const useRefreshRx = rx => {
   const registry = React.useContext(RegistryContext);
-  return React.useCallback(f => registry.set(rx, f(registry.get(rx))), [registry, rx]);
+  return React.useCallback(() => {
+    registry.refresh(rx);
+  }, [registry, rx]);
 };
 /**
  * @since 1.0.0
  * @category hooks
  */
 export const useRx = rx => [useRxValue(rx), useSetRx(rx)];
-/**
- * @since 1.0.0
- * @category hooks
- */
-export const useRxUpdate = rx => [useRxValue(rx), useUpdateRx(rx)];
 //# sourceMappingURL=index.mjs.map

package/mjs/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["Registry","React","Result","Rx","RegistryContext","createContext","make","RxStore","constructor","registry","rx","value","get","init","subscribe","f","a","snapshot","useRxValue","useContext","store","useRef","undefined","current","useSyncExternalStore","useSetRx","useCallback","set","useUpdateRx","useRx","useRxUpdate"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"index.mjs","names":["Registry","React","Result","Rx","RegistryContext","createContext","make","makeStore","registry","rx","getter","get","subscribe","f","unmount","subscribeGetter","snapshot","useRxValue","useContext","store","useRef","undefined","current","useSyncExternalStore","useSetRx","useCallback","value","set","useRefreshRx","refresh","useRx"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,QAAQ,MAAM,wBAAwB;AAElD,OAAO,KAAKC,KAAK,MAAM,OAAO;4BAEJ,wBAAwB;uBAAtCD,QAAQ;0BACI,sBAAsB;qBAAlCE,MAAM;sBACE,kBAAkB;iBAA1BC,EAAE;AAEd;;;;AAIA,OAAO,MAAMC,eAAe,gBAAGH,KAAK,CAACI,aAAa,eAAoBL,QAAQ,CAACM,IAAI,EAAE,CAAC;AAStF,SAASC,SAASA,CAAIC,QAA2B,EAAEC,EAAY;EAC7D,IAAIC,MAAM,GAAG,SAAAA,CAAA;IACX,OAAOF,QAAQ,CAACG,GAAG,CAACF,EAAE,CAAC;EACzB,CAAC;EACD,SAASG,SAASA,CAACC,CAAa;IAC9B,MAAM,CAACF,GAAG,EAAEG,OAAO,CAAC,GAAGN,QAAQ,CAACO,eAAe,CAACN,EAAE,EAAEI,CAAC,CAAC;IACtDH,MAAM,GAAGC,GAAG;IACZ,OAAOG,OAAO;EAChB;EACA,SAASE,QAAQA,CAAA;IACf,OAAON,MAAM,EAAE;EACjB;EACA,OAAO;IAAED,EAAE;IAAED,QAAQ;IAAEI,SAAS;IAAEI;EAAQ,CAAE;AAC9C;AAEA;;;;AAIA,OAAO,MAAMC,UAAU,GAAOR,EAAY,IAAO;EAC/C,MAAMD,QAAQ,GAAGP,KAAK,CAACiB,UAAU,CAACd,eAAe,CAAC;EAClD,MAAMe,KAAK,GAAGlB,KAAK,CAACmB,MAAM,CAAaC,SAAgB,CAAC;EACxD,IAAIF,KAAK,CAACG,OAAO,EAAEb,EAAE,KAAKA,EAAE,IAAIU,KAAK,CAACG,OAAO,EAAEd,QAAQ,KAAKA,QAAQ,EAAE;IACpEW,KAAK,CAACG,OAAO,GAAGf,SAAS,CAACC,QAAQ,EAAEC,EAAE,CAAC;;EAEzC,OAAOR,KAAK,CAACsB,oBAAoB,CAACJ,KAAK,CAACG,OAAO,CAACV,SAAS,EAAEO,KAAK,CAACG,OAAO,CAACN,QAAQ,CAAC;AACpF,CAAC;AAED;;;;AAIA,OAAO,MAAMQ,QAAQ,GAAUf,EAAsB,IAAoC;EACvF,MAAMD,QAAQ,GAAGP,KAAK,CAACiB,UAAU,CAACd,eAAe,CAAC;EAClD,OAAOH,KAAK,CAACwB,WAAW,CAAEC,KAAK,IAAI;IACjC,IAAI,OAAOA,KAAK,KAAK,UAAU,EAAE;MAC/BlB,QAAQ,CAACmB,GAAG,CAAClB,EAAE,EAAGiB,KAAa,CAAClB,QAAQ,CAACG,GAAG,CAACF,EAAE,CAAC,CAAC,CAAC;MAClD;KACD,MAAM;MACLD,QAAQ,CAACmB,GAAG,CAAClB,EAAE,EAAEiB,KAAK,CAAC;;EAE3B,CAAC,EAAE,CAAClB,QAAQ,EAAEC,EAAE,CAAC,CAAC;AACpB,CAAC;AAED;;;;AAIA,OAAO,MAAMmB,YAAY,GAAOnB,EAA6B,IAAgB;EAC3E,MAAMD,QAAQ,GAAGP,KAAK,CAACiB,UAAU,CAACd,eAAe,CAAC;EAClD,OAAOH,KAAK,CAACwB,WAAW,CAAC,MAAK;IAC5BjB,QAAQ,CAACqB,OAAO,CAACpB,EAAE,CAAC;EACtB,CAAC,EAAE,CAACD,QAAQ,EAAEC,EAAE,CAAC,CAAC;AACpB,CAAC;AAED;;;;AAIA,OAAO,MAAMqB,KAAK,GAAUrB,EAAsB,IAChD,CACEQ,UAAU,CAACR,EAAE,CAAC,EACde,QAAQ,CAACf,EAAE,CAAC,CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-rx/rx-react",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Reactive toolkit for Effect",
   "license": "MIT",
   "repository": {
@@ -35,7 +35,7 @@
   "sideEffects": [],
   "author": "Effect contributors",
   "dependencies": {
-    "@effect-rx/rx": "^0.1.3"
+    "@effect-rx/rx": "^0.1.5"
   },
   "peerDependencies": {
     "@effect/data": "^0.18.5",

package/src/index.ts

@@ -15,25 +15,26 @@ export * as Rx from "@effect-rx/rx/Rx"
  */
 export const RegistryContext = React.createContext<Registry.Registry>(Registry.make())
 
-class RxStore<A> {
-  constructor(
-    readonly registry: Registry.Registry,
-    readonly rx: Rx.Rx<A>
-  ) {}
-  value = this.registry.get(this.rx)
-  init = false
-  subscribe = (f: () => void): () => void => {
-    if (this.init === true) {
-      this.value = this.registry.get(this.rx)
-    } else {
-      this.init = true
-    }
-    return this.registry.subscribe(this.rx, (a) => {
-      this.value = a
-      f()
-    })
+interface RxStore<A> {
+  readonly rx: Rx.Rx<A>
+  readonly registry: Registry.Registry
+  readonly subscribe: (f: () => void) => () => void
+  readonly snapshot: () => A
+}
+
+function makeStore<A>(registry: Registry.Registry, rx: Rx.Rx<A>): RxStore<A> {
+  let getter = function() {
+    return registry.get(rx)
   }
-  snapshot = (): A => this.value
+  function subscribe(f: () => void): () => void {
+    const [get, unmount] = registry.subscribeGetter(rx, f)
+    getter = get
+    return unmount
+  }
+  function snapshot() {
+    return getter()
+  }
+  return { rx, registry, subscribe, snapshot }
 }
 
 /**
@@ -44,7 +45,7 @@ export const useRxValue = <A>(rx: Rx.Rx<A>): A => {
   const registry = React.useContext(RegistryContext)
   const store = React.useRef<RxStore<A>>(undefined as any)
   if (store.current?.rx !== rx || store.current?.registry !== registry) {
-    store.current = new RxStore(registry, rx)
+    store.current = makeStore(registry, rx)
   }
   return React.useSyncExternalStore(store.current.subscribe, store.current.snapshot)
 }
@@ -53,36 +54,35 @@ export const useRxValue = <A>(rx: Rx.Rx<A>): A => {
  * @since 1.0.0
  * @category hooks
  */
-export const useSetRx = <R, W>(rx: Rx.Writeable<R, W>): (_: W) => void => {
+export const useSetRx = <R, W>(rx: Rx.Writeable<R, W>): (_: W | ((_: R) => W)) => void => {
   const registry = React.useContext(RegistryContext)
-  return React.useCallback((value) => registry.set(rx, value), [registry, rx])
+  return React.useCallback((value) => {
+    if (typeof value === "function") {
+      registry.set(rx, (value as any)(registry.get(rx)))
+      return
+    } else {
+      registry.set(rx, value)
+    }
+  }, [registry, rx])
 }
 
 /**
  * @since 1.0.0
  * @category hooks
  */
-export const useUpdateRx = <R, W>(rx: Rx.Writeable<R, W>): (f: (_: R) => W) => void => {
+export const useRefreshRx = <A>(rx: Rx.Rx<A> & Rx.Refreshable): () => void => {
   const registry = React.useContext(RegistryContext)
-  return React.useCallback((f) => registry.set(rx, f(registry.get(rx))), [registry, rx])
+  return React.useCallback(() => {
+    registry.refresh(rx)
+  }, [registry, rx])
 }
 
 /**
  * @since 1.0.0
  * @category hooks
  */
-export const useRx = <R, W>(rx: Rx.Writeable<R, W>): readonly [R, (_: W) => void] =>
+export const useRx = <R, W>(rx: Rx.Writeable<R, W>): readonly [value: R, setOrUpdate: (_: W | ((_: R) => W)) => void] =>
   [
     useRxValue(rx),
     useSetRx(rx)
   ] as const
-
-/**
- * @since 1.0.0
- * @category hooks
- */
-export const useRxUpdate = <R, W>(rx: Rx.Writeable<R, W>): readonly [R, (f: (_: R) => W) => void] =>
-  [
-    useRxValue(rx),
-    useUpdateRx(rx)
-  ] as const