-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixed bug: cannot mutate while not being observed
- Loading branch information
1 parent
6551a6b
commit 2788165
Showing
2 changed files
with
136 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,108 +1,149 @@ | ||
import { | ||
action, | ||
makeObservable, | ||
observable, | ||
reaction, | ||
onBecomeUnobserved, | ||
onBecomeObserved, | ||
computed, | ||
} from "mobx"; | ||
import { | ||
QueryClient, | ||
MutationObserver, | ||
MutationObserverResult, | ||
DefaultError, | ||
MutationObserverOptions, | ||
MutateOptions, | ||
} from "@tanstack/query-core"; | ||
class MobxMutation< | ||
action, | ||
makeObservable, | ||
observable, | ||
reaction, | ||
onBecomeUnobserved, | ||
onBecomeObserved, | ||
computed, | ||
} from 'mobx'; | ||
import { | ||
QueryClient, | ||
MutationObserver, | ||
MutationObserverResult, | ||
DefaultError, | ||
MutationObserverOptions, | ||
MutateOptions, | ||
} from '@tanstack/query-core'; | ||
class MobxMutation< | ||
TData = unknown, | ||
TError = DefaultError, | ||
TVariables = void, | ||
TContext = unknown, | ||
> { | ||
private mutation: _MobxMutation<TData, TError, TVariables, TContext>; | ||
constructor(queryClient: QueryClient, mutationOptions: () => MutationObserverOptions<TData, TError, TVariables, TContext>) { | ||
this.mutation = new _MobxMutation(queryClient, mutationOptions); | ||
makeObservable(this, { | ||
// @ts-expect-error Mobx can see it don't worry | ||
mutation: observable.ref, | ||
}); | ||
onBecomeObserved(this, "mutation", () => { | ||
this.mutation.setupDispoables(); | ||
}); | ||
onBecomeUnobserved(this, "mutation", () => { | ||
this.mutation.dispose(); | ||
}); | ||
this.mutation; | ||
} | ||
get state() { | ||
return this.mutation.state; | ||
private mutation: _MobxMutation<TData, TError, TVariables, TContext>; | ||
private isObserved = false; | ||
constructor( | ||
queryClient: QueryClient, | ||
mutationOptions: () => MutationObserverOptions< | ||
TData, | ||
TError, | ||
TVariables, | ||
TContext | ||
>, | ||
) { | ||
this.mutation = new _MobxMutation(queryClient, mutationOptions); | ||
makeObservable(this, { | ||
// @ts-expect-error Mobx can see it don't worry | ||
mutation: observable.ref, | ||
}); | ||
onBecomeObserved(this, 'mutation', () => { | ||
this.isObserved = true; | ||
this.mutation.setupDispoables(); | ||
}); | ||
onBecomeUnobserved(this, 'mutation', () => { | ||
this.isObserved = false; | ||
this.mutation.dispose(); | ||
}); | ||
this.mutation; | ||
} | ||
get state() { | ||
return this.mutation.state; | ||
} | ||
mutate( | ||
variables: TVariables, | ||
options?: MutateOptions<TData, TError, TVariables, TContext> | undefined, | ||
) { | ||
if (!this.isObserved) { | ||
this.mutation.setupDispoables(); | ||
this.mutation.mutate(variables, options); | ||
this.mutation.dispose(); | ||
return; | ||
} | ||
mutate(variables: TVariables, options?: MutateOptions<TData, TError, TVariables, TContext> | undefined ) { | ||
this.mutation.mutate(variables, options); | ||
} | ||
updateOptions(options: () => MutationObserverOptions<TData, TError, TVariables, TContext>) { | ||
this.mutation.updateOptions(options); | ||
} | ||
this.mutation.mutate(variables, options); | ||
} | ||
updateOptions( | ||
options: () => MutationObserverOptions<TData, TError, TVariables, TContext>, | ||
) { | ||
this.mutation.updateOptions(options); | ||
} | ||
class _MobxMutation< | ||
} | ||
class _MobxMutation< | ||
TData = unknown, | ||
TError = DefaultError, | ||
TVariables = void, | ||
TContext = unknown, | ||
> { | ||
queryClient: QueryClient; | ||
_queryOptions: () => MutationObserverOptions<TData, TError, TVariables, TContext>; | ||
mObserver!: MutationObserver<TData, TError, TVariables, TContext>; | ||
public state!:MutationObserverResult<TData, TError, TVariables, TContext>; | ||
private dispoables: (() => void)[] = []; | ||
constructor(queryClient: QueryClient, mutationOptions: () => MutationObserverOptions<TData, TError, TVariables, TContext>) { | ||
makeObservable(this, { | ||
state: observable.ref, | ||
update: action, | ||
mutationOptions: computed, | ||
mutate: action, | ||
_updateOptions: action.bound, | ||
}); | ||
this.queryClient = queryClient; | ||
this._queryOptions = mutationOptions; | ||
} | ||
get mutationOptions() { | ||
return this._queryOptions(); | ||
} | ||
setupDispoables() { | ||
this.mObserver = new MutationObserver(this.queryClient, this.mutationOptions); | ||
this.dispoables.push( | ||
...[ | ||
this.mObserver.subscribe((e) => { | ||
this.update(e); | ||
}), | ||
reaction(() => this.mutationOptions, this._updateOptions), | ||
() => { | ||
this.mObserver.reset(); | ||
|
||
}, | ||
], | ||
); | ||
} | ||
mutate(variables: TVariables, options?: MutateOptions<TData, TError, TVariables, TContext> | undefined ) { | ||
this.mObserver.mutate(variables, options) | ||
} | ||
update(state: MutationObserverResult<TData, TError, TVariables, TContext>) { | ||
this.state = state; | ||
} | ||
updateOptions(options: () => MutationObserverOptions<TData, TError, TVariables, TContext>) { | ||
this._queryOptions = options; | ||
} | ||
_updateOptions() { | ||
this.mObserver.setOptions(this.mutationOptions); | ||
} | ||
|
||
dispose() { | ||
this.dispoables.forEach((fn) => fn()); | ||
} | ||
queryClient: QueryClient; | ||
_queryOptions: () => MutationObserverOptions< | ||
TData, | ||
TError, | ||
TVariables, | ||
TContext | ||
>; | ||
mObserver!: MutationObserver<TData, TError, TVariables, TContext>; | ||
public state!: MutationObserverResult<TData, TError, TVariables, TContext>; | ||
private dispoables: (() => void)[] = []; | ||
constructor( | ||
queryClient: QueryClient, | ||
mutationOptions: () => MutationObserverOptions< | ||
TData, | ||
TError, | ||
TVariables, | ||
TContext | ||
>, | ||
) { | ||
makeObservable(this, { | ||
state: observable.ref, | ||
update: action, | ||
mutationOptions: computed, | ||
mutate: action, | ||
_updateOptions: action.bound, | ||
}); | ||
this.queryClient = queryClient; | ||
this._queryOptions = mutationOptions; | ||
} | ||
get mutationOptions() { | ||
return this._queryOptions(); | ||
} | ||
setupDispoables() { | ||
this.mObserver = new MutationObserver( | ||
this.queryClient, | ||
this.mutationOptions, | ||
); | ||
this.dispoables.push( | ||
...[ | ||
this.mObserver.subscribe((e) => { | ||
this.update(e); | ||
}), | ||
reaction(() => this.mutationOptions, this._updateOptions), | ||
() => { | ||
this.mObserver.reset(); | ||
}, | ||
], | ||
); | ||
} | ||
mutate( | ||
variables: TVariables, | ||
options?: MutateOptions<TData, TError, TVariables, TContext> | undefined, | ||
) { | ||
this.mObserver.mutate(variables, options); | ||
} | ||
update(state: MutationObserverResult<TData, TError, TVariables, TContext>) { | ||
this.state = state; | ||
} | ||
updateOptions( | ||
options: () => MutationObserverOptions<TData, TError, TVariables, TContext>, | ||
) { | ||
this._queryOptions = options; | ||
} | ||
_updateOptions() { | ||
this.mObserver.setOptions(this.mutationOptions); | ||
} | ||
|
||
dispose() { | ||
this.dispoables.forEach((fn) => fn()); | ||
} | ||
export { MobxMutation }; | ||
} | ||
|
||
export { MobxMutation }; |