Skip to content

Commit

Permalink
update effect
Browse files Browse the repository at this point in the history
  • Loading branch information
tim-smart committed Feb 9, 2024
1 parent f420971 commit ec1b66e
Show file tree
Hide file tree
Showing 13 changed files with 370 additions and 343 deletions.
7 changes: 7 additions & 0 deletions .changeset/rare-teachers-swim.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@effect-rx/rx-react": minor
"@effect-rx/rx-vue": minor
"@effect-rx/rx": minor
---

swap type params for Result
7 changes: 7 additions & 0 deletions .changeset/red-apples-trade.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@effect-rx/rx-react": minor
"@effect-rx/rx-vue": minor
"@effect-rx/rx": minor
---

update effect
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
"@effect/docgen": "^0.3.8",
"@effect/eslint-plugin": "^0.1.2",
"@effect/language-service": "^0.1.0",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@vitest/coverage-v8": "^1.2.2",
"babel-plugin-annotate-pure-calls": "^0.4.0",
"eslint": "^8.56.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-codegen": "^0.23.0",
"eslint-plugin-deprecation": "^2.0.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-simple-import-sort": "^11.0.0",
"eslint-plugin-sort-destructure-keys": "^1.5.0",
"fast-check": "^3.15.1",
"glob": "^10.3.10",
Expand Down
6 changes: 3 additions & 3 deletions packages/rx-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
"license": "MIT",
"sideEffects": false,
"devDependencies": {
"@types/react": "^18.2.52",
"effect": "^2.2.3",
"@types/react": "^18.2.55",
"effect": "^2.3.0",
"react": "^18.2.0"
},
"peerDependencies": {
"effect": "^2.2.0",
"effect": "^2.3.0",
"react": "^18"
},
"dependencies": {
Expand Down
24 changes: 12 additions & 12 deletions packages/rx-react/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ function setRx<R, W>(registry: Registry.Registry, rx: Rx.Writable<R, W>): (_: W

function setRxPromise<E, A, W>(
registry: Registry.Registry,
rx: Rx.Writable<Result.Result<E, A>, W>
): (_: W) => Promise<Exit.Exit<E, A>> {
rx: Rx.Writable<Result.Result<A, E>, W>
): (_: W) => Promise<Exit.Exit<A, E>> {
const cancelRef = React.useRef<Set<() => void>>(undefined as any)
if (!cancelRef.current) {
cancelRef.current = new Set()
Expand Down Expand Up @@ -159,8 +159,8 @@ export const useRxSet = <R, W>(rx: Rx.Writable<R, W>): (_: W | ((_: R) => W)) =>
* @category hooks
*/
export const useRxSetPromise = <E, A, W>(
rx: Rx.Writable<Result.Result<E, A>, W>
): (_: W) => Promise<Exit.Exit<E, A>> => {
rx: Rx.Writable<Result.Result<A, E>, W>
): (_: W) => Promise<Exit.Exit<A, E>> => {
const registry = React.useContext(RegistryContext)
return setRxPromise(registry, rx)
}
Expand Down Expand Up @@ -191,14 +191,14 @@ export const useRx = <R, W>(
] as const
}

type SuspenseResult<E, A> =
type SuspenseResult<A, E> =
| {
readonly _tag: "Suspended"
readonly promise: Promise<void>
}
| {
readonly _tag: "Value"
readonly value: Result.Success<E, A> | Result.Failure<E, A>
readonly value: Result.Success<A, E> | Result.Failure<A, E>
}

const suspenseRx = Rx.family((rx: Rx.Rx<Result.Result<any, any>>) =>
Expand Down Expand Up @@ -233,10 +233,10 @@ const suspenseMounts = globalValue("@effect-rx/rx-react/suspenseMounts", () => n
* @since 1.0.0
* @category hooks
*/
export const useRxSuspense = <E, A>(
rx: Rx.Rx<Result.Result<E, A>>,
export const useRxSuspense = <A, E>(
rx: Rx.Rx<Result.Result<A, E>>,
options?: { readonly suspendOnWaiting?: boolean }
): Result.Success<E, A> | Result.Failure<E, A> => {
): Result.Success<A, E> | Result.Failure<A, E> => {
const registry = React.useContext(RegistryContext)
const resultRx = React.useMemo(
() => (options?.suspendOnWaiting ? suspenseRxWaiting(rx) : suspenseRx(rx)),
Expand Down Expand Up @@ -264,10 +264,10 @@ export const useRxSuspense = <E, A>(
* @since 1.0.0
* @category hooks
*/
export const useRxSuspenseSuccess = <E, A>(
rx: Rx.Rx<Result.Result<E, A>>,
export const useRxSuspenseSuccess = <A, E>(
rx: Rx.Rx<Result.Result<A, E>>,
options?: { readonly suspendOnWaiting?: boolean }
): Result.Success<E, A> => {
): Result.Success<A, E> => {
const result = useRxSuspense(rx, options)
if (result._tag === "Failure") {
throw Cause.squash(result.cause)
Expand Down
6 changes: 3 additions & 3 deletions packages/rx-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"license": "MIT",
"sideEffects": false,
"devDependencies": {
"effect": "^2.2.3",
"vue": "^3.4.15"
"effect": "^2.3.0",
"vue": "^3.4.18"
},
"peerDependencies": {
"effect": "^2.2.0",
"effect": "^2.3.0",
"vue": "^3.4"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/rx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"license": "MIT",
"sideEffects": false,
"devDependencies": {
"effect": "^2.2.3"
"effect": "^2.3.0"
},
"peerDependencies": {
"effect": "^2.2.0"
"effect": "^2.3.0"
}
}
Loading

0 comments on commit ec1b66e

Please sign in to comment.