@effect-rx/rx-react 0.11.3 → 0.12.0

package/dist/declarations/src/index.d.ts

@@ -71,20 +71,14 @@ export declare const useRx: <R, W>(rx: Rx.Writable<R, W>) => readonly [value: R,
  */
 export declare const useRxSuspense: <E, A>(rx: Rx.Rx<Result.Result<E, A>>, options?: {
     readonly suspendOnWaiting?: boolean;
-}) => {
-    readonly isWaiting: boolean;
-    readonly value: Result.Success<E, A> | Result.Failure<E, A>;
-};
+}) => Result.Success<E, A> | Result.Failure<E, A>;
 /**
  * @since 1.0.0
  * @category hooks
  */
 export declare const useRxSuspenseSuccess: <E, A>(rx: Rx.Rx<Result.Result<E, A>>, options?: {
     readonly suspendOnWaiting?: boolean;
-}) => {
-    readonly isWaiting: boolean;
-    readonly value: A;
-};
+}) => Result.Success<E, A>;
 /**
  * @since 1.0.0
  * @category hooks

package/dist/declarations/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"../../../src","sources":["index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,KAAK,KAAK,MAAM,qBAAqB,CAAA;AAEjD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAA;AAExC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B;;;GAGG;AACH,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD;;;GAGG;AACH,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C;;;GAGG;AACH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC;;;GAGG;AACH,OAAO,KAAK,KAAK,MAAM,qBAAqB,CAAA;AAE5C;;;GAGG;AACH,eAAO,MAAM,eAAe,kCAA0D,CAAA;AAmCtF;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE;IACvB,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACpB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;CAQxC,CAAA;AAmDD;;;GAGG;AACH,eAAO,MAAM,UAAU,uBAAsB,IAG5C,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,6DAA4D,IAIhF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,0FAK3B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,wCAAuC,MAAM,IAMrE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,8FAE4C,IAAI,CAMjE,CAAA;AA2CD;;;GAGG;AACH,eAAO,MAAM,aAAa,mDAEd;IAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE;wBAE7B,OAAO;;CAwB5B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,mDAErB;IAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE;wBAE7B,OAAO;;CAW5B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,iCAEZ,IAAI,YACP;IAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE,KACzC,IAMF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,qCAIpB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,2EAExB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"../../../src","sources":["index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,KAAK,KAAK,MAAM,qBAAqB,CAAA;AAEjD,OAAO,KAAK,KAAK,IAAI,MAAM,aAAa,CAAA;AAExC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B;;;GAGG;AACH,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD;;;GAGG;AACH,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C;;;GAGG;AACH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC;;;GAGG;AACH,OAAO,KAAK,KAAK,MAAM,qBAAqB,CAAA;AAE5C;;;GAGG;AACH,eAAO,MAAM,eAAe,kCAA0D,CAAA;AAmCtF;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE;IACvB,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACpB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;CAQxC,CAAA;AAmDD;;;GAGG;AACH,eAAO,MAAM,UAAU,uBAAsB,IAG5C,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,6DAA4D,IAIhF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,0FAK3B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,wCAAuC,MAAM,IAMrE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,8FAE4C,IAAI,CAMjE,CAAA;AAwCD;;;GAGG;AACH,eAAO,MAAM,aAAa,mDAEd;IAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,gDAuBlD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,mDAErB;IAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,yBAOlD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,iCAEZ,IAAI,YACP;IAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE,KACzC,IAMF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,qCAIpB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,2EAExB,CAAA"}

package/dist/effect-rx-rx-react.cjs.dev.js

@@ -171,23 +171,20 @@ const useRx = rx => {
 };
 const suspenseRx = /*#__PURE__*/Rx__namespace.family(rx => Rx__namespace.readable(get => {
   const result = get(rx);
-  const value = Result__namespace.noWaiting(result);
-  if (value._tag === "Initial") {
+  if (result._tag === "Initial") {
     return {
       _tag: "Suspended",
       promise: new Promise(resolve => get.addFinalizer(resolve))
     };
   }
-  const isWaiting = Result__namespace.isWaiting(result);
   return {
     _tag: "Value",
-    isWaiting,
-    value
+    value: result
   };
 }));
 const suspenseRxWaiting = /*#__PURE__*/Rx__namespace.family(rx => Rx__namespace.readable(get => {
   const result = get(rx);
-  if (result._tag === "Waiting" || result._tag === "Initial") {
+  if (result.waiting || result._tag === "Initial") {
     return {
       _tag: "Suspended",
       promise: new Promise(resolve => get.addFinalizer(resolve))
@@ -195,7 +192,6 @@ const suspenseRxWaiting = /*#__PURE__*/Rx__namespace.family(rx => Rx__namespace.
   }
   return {
     _tag: "Value",
-    isWaiting: false,
     value: result
   };
 }));
@@ -222,7 +218,7 @@ const useRxSuspense = (rx, options) => {
     }
     throw result.promise;
   }
-  return result;
+  return result.value;
 };
 
 /**
@@ -231,13 +227,10 @@ const useRxSuspense = (rx, options) => {
  */
 const useRxSuspenseSuccess = (rx, options) => {
   const result = useRxSuspense(rx, options);
-  if (result.value._tag === "Failure") {
-    throw Cause__namespace.squash(result.value.cause);
+  if (result._tag === "Failure") {
+    throw Cause__namespace.squash(result.cause);
   }
-  return {
-    isWaiting: result.isWaiting,
-    value: result.value.value
-  };
+  return result;
 };
 
 /**

package/dist/effect-rx-rx-react.cjs.prod.js

@@ -171,23 +171,20 @@ const useRx = rx => {
 };
 const suspenseRx = /*#__PURE__*/Rx__namespace.family(rx => Rx__namespace.readable(get => {
   const result = get(rx);
-  const value = Result__namespace.noWaiting(result);
-  if (value._tag === "Initial") {
+  if (result._tag === "Initial") {
     return {
       _tag: "Suspended",
       promise: new Promise(resolve => get.addFinalizer(resolve))
     };
   }
-  const isWaiting = Result__namespace.isWaiting(result);
   return {
     _tag: "Value",
-    isWaiting,
-    value
+    value: result
   };
 }));
 const suspenseRxWaiting = /*#__PURE__*/Rx__namespace.family(rx => Rx__namespace.readable(get => {
   const result = get(rx);
-  if (result._tag === "Waiting" || result._tag === "Initial") {
+  if (result.waiting || result._tag === "Initial") {
     return {
       _tag: "Suspended",
       promise: new Promise(resolve => get.addFinalizer(resolve))
@@ -195,7 +192,6 @@ const suspenseRxWaiting = /*#__PURE__*/Rx__namespace.family(rx => Rx__namespace.
   }
   return {
     _tag: "Value",
-    isWaiting: false,
     value: result
   };
 }));
@@ -222,7 +218,7 @@ const useRxSuspense = (rx, options) => {
     }
     throw result.promise;
   }
-  return result;
+  return result.value;
 };
 
 /**
@@ -231,13 +227,10 @@ const useRxSuspense = (rx, options) => {
  */
 const useRxSuspenseSuccess = (rx, options) => {
   const result = useRxSuspense(rx, options);
-  if (result.value._tag === "Failure") {
-    throw Cause__namespace.squash(result.value.cause);
+  if (result._tag === "Failure") {
+    throw Cause__namespace.squash(result.cause);
   }
-  return {
-    isWaiting: result.isWaiting,
-    value: result.value.value
-  };
+  return result;
 };
 
 /**

package/dist/effect-rx-rx-react.esm.js

@@ -146,23 +146,20 @@ const useRx = rx => {
 };
 const suspenseRx = /*#__PURE__*/Rx.family(rx => Rx.readable(get => {
   const result = get(rx);
-  const value = Result.noWaiting(result);
-  if (value._tag === "Initial") {
+  if (result._tag === "Initial") {
     return {
       _tag: "Suspended",
       promise: new Promise(resolve => get.addFinalizer(resolve))
     };
   }
-  const isWaiting = Result.isWaiting(result);
   return {
     _tag: "Value",
-    isWaiting,
-    value
+    value: result
   };
 }));
 const suspenseRxWaiting = /*#__PURE__*/Rx.family(rx => Rx.readable(get => {
   const result = get(rx);
-  if (result._tag === "Waiting" || result._tag === "Initial") {
+  if (result.waiting || result._tag === "Initial") {
     return {
       _tag: "Suspended",
       promise: new Promise(resolve => get.addFinalizer(resolve))
@@ -170,7 +167,6 @@ const suspenseRxWaiting = /*#__PURE__*/Rx.family(rx => Rx.readable(get => {
   }
   return {
     _tag: "Value",
-    isWaiting: false,
     value: result
   };
 }));
@@ -197,7 +193,7 @@ const useRxSuspense = (rx, options) => {
     }
     throw result.promise;
   }
-  return result;
+  return result.value;
 };
 
 /**
@@ -206,13 +202,10 @@ const useRxSuspense = (rx, options) => {
  */
 const useRxSuspenseSuccess = (rx, options) => {
   const result = useRxSuspense(rx, options);
-  if (result.value._tag === "Failure") {
-    throw Cause.squash(result.value.cause);
+  if (result._tag === "Failure") {
+    throw Cause.squash(result.cause);
   }
-  return {
-    isWaiting: result.isWaiting,
-    value: result.value.value
-  };
+  return result;
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-rx/rx-react",
-  "version": "0.11.3",
+  "version": "0.12.0",
   "description": "Reactive toolkit for Effect",
   "main": "dist/effect-rx-rx-react.cjs.js",
   "module": "dist/effect-rx-rx-react.esm.js",
@@ -38,7 +38,7 @@
     "react": "^18"
   },
   "dependencies": {
-    "@effect-rx/rx": "^0.11.3"
+    "@effect-rx/rx": "^0.12.0"
   },
   "files": [
     "src",

package/src/index.ts

@@ -198,35 +198,32 @@ type SuspenseResult<E, A> =
   }
   | {
     readonly _tag: "Value"
-    readonly isWaiting: boolean
     readonly value: Result.Success<E, A> | Result.Failure<E, A>
   }
 
 const suspenseRx = Rx.family((rx: Rx.Rx<Result.Result<any, any>>) =>
   Rx.readable((get): SuspenseResult<any, any> => {
     const result = get(rx)
-    const value = Result.noWaiting(result)
-    if (value._tag === "Initial") {
+    if (result._tag === "Initial") {
       return {
         _tag: "Suspended",
         promise: new Promise<void>((resolve) => get.addFinalizer(resolve))
       } as const
     }
-    const isWaiting = Result.isWaiting(result)
-    return { _tag: "Value", isWaiting, value } as const
+    return { _tag: "Value", value: result } as const
   })
 )
 
 const suspenseRxWaiting = Rx.family((rx: Rx.Rx<Result.Result<any, any>>) =>
   Rx.readable((get): SuspenseResult<any, any> => {
     const result = get(rx)
-    if (result._tag === "Waiting" || result._tag === "Initial") {
+    if (result.waiting || result._tag === "Initial") {
       return {
         _tag: "Suspended",
         promise: new Promise<void>((resolve) => get.addFinalizer(resolve))
       } as const
     }
-    return { _tag: "Value", isWaiting: false, value: result } as const
+    return { _tag: "Value", value: result } as const
   })
 )
 
@@ -239,10 +236,7 @@ const suspenseMounts = globalValue("@effect-rx/rx-react/suspenseMounts", () => n
 export const useRxSuspense = <E, A>(
   rx: Rx.Rx<Result.Result<E, A>>,
   options?: { readonly suspendOnWaiting?: boolean }
-): {
-  readonly isWaiting: boolean
-  readonly value: Result.Success<E, A> | Result.Failure<E, A>
-} => {
+): Result.Success<E, A> | Result.Failure<E, A> => {
   const registry = React.useContext(RegistryContext)
   const resultRx = React.useMemo(
     () => (options?.suspendOnWaiting ? suspenseRxWaiting(rx) : suspenseRx(rx)),
@@ -263,7 +257,7 @@ export const useRxSuspense = <E, A>(
     throw result.promise
   }
 
-  return result
+  return result.value
 }
 
 /**
@@ -273,18 +267,12 @@ export const useRxSuspense = <E, A>(
 export const useRxSuspenseSuccess = <E, A>(
   rx: Rx.Rx<Result.Result<E, A>>,
   options?: { readonly suspendOnWaiting?: boolean }
-): {
-  readonly isWaiting: boolean
-  readonly value: A
-} => {
+): Result.Success<E, A> => {
   const result = useRxSuspense(rx, options)
-  if (result.value._tag === "Failure") {
-    throw Cause.squash(result.value.cause)
-  }
-  return {
-    isWaiting: result.isWaiting,
-    value: result.value.value
+  if (result._tag === "Failure") {
+    throw Cause.squash(result.cause)
   }
+  return result
 }
 
 /**