variablelab/theatre
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Save prism effects in the prism scope, rather than a WeakMap

Browse source 
... for easier debugging, but there is a perf regression which I
can't yet quantify as the benchmark suit doesn't support comparisons.
This commit is contained in:
Aria Minaei 2022-11-26 19:22:23 +01:00
parent ae8be59366
commit 1c69cb7055
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
packages/dataverse/src/derivations/prism/prism.ts
View file

@ -107,6 +107,7 @@ export class PrismDerivation<V> extends AbstractDerivation<V> {
class PrismScope {
isPrismScope = true
private _subs: Record<string, PrismScope> = {}
readonly effects: Map<string, IEffect> = new Map()
sub(key: string) {
if (!this._subs[key]) {
@ -118,23 +119,20 @@ class PrismScope {
get subs() {
return this._subs
}
cleanupEffects() {
for (const effect of this.effects.values()) {
safelyRun(effect.cleanup, undefined)
}
this.effects.clear()
}
}
function cleanupScopeStack(scope: PrismScope) {
for (const sub of Object.values(scope.subs)) {
cleanupScopeStack(sub)
}
cleanupEffects(scope)
}
function cleanupEffects(scope: PrismScope) {
const effects = effectsWeakMap.get(scope)
if (effects) {
for (const effect of effects.values()) {
safelyRun(effect.cleanup, undefined)
}
}
effectsWeakMap.delete(scope)
scope.cleanupEffects()
}
function safelyRun<T, U>(
@ -160,7 +158,6 @@ const refsWeakMap = new WeakMap<PrismScope, Map<string, IRef<unknown>>>()
type IRef<T> = {
current: T
}
const effectsWeakMap = new WeakMap<PrismScope, Map<string, IEffect>>()
type IEffect = {
deps: undefined | unknown[]
@ -209,20 +206,14 @@ function effect(key: string, cb: () => () => void, deps?: unknown[]): void {
if (!scope) {
throw new Error(`prism.effect() is called outside of a prism() call.`)
}
let effects = effectsWeakMap.get(scope)
if (effects === undefined) {
effects = new Map()
effectsWeakMap.set(scope, effects)
}
let effect = effects.get(key)
let effect = scope.effects.get(key)
if (effect === undefined) {
effect = {
cleanup: voidFn,
deps: undefined,
}
effects.set(key, effect)
scope.effects.set(key, effect)
}
if (depsHaveChanged(effect.deps, deps)) {