refactor(system): inline startTrackEffects, endTrackEffects to effect scope

Author: johnsoncodehk

src/effect.ts

@@ -1,3 +1,4 @@
+import { activeEffectScope } from './effectScope.js';
 import { Dependency, DirtyLevels, IEffect, Link, Subscriber, System } from './system.js';
 
 export function effect(fn: () => void) {
@@ -28,9 +29,11 @@ export class Effect<T = any> implements IEffect {
 			Dependency.linkSubscriber(this, System.activeSub!);
 			return;
 		}
-		const activeEffectScopeTrackId = System.activeEffectScopeTrackId;
-		if (activeEffectScopeTrackId !== 0) {
-			Dependency.linkSubscriber(this, System.activeEffectScope!);
+		if (activeEffectScope !== undefined) {
+			const subsTail = this.subsTail;
+			if (subsTail === undefined || subsTail.trackId !== activeEffectScope.trackId) {
+				Dependency.linkSubscriber(this, activeEffectScope);
+			}
 		}
 	}
 

src/effectScope.ts

@@ -1,20 +1,16 @@
-import { DirtyLevels, IEffect, Link, Subscriber } from './system.js';
+import { DirtyLevels, Link, Subscriber, System } from './system.js';
+
+export let activeEffectScope: EffectScope | undefined = undefined;
 
 export function effectScope() {
 	return new EffectScope();
 }
 
-export class EffectScope implements IEffect {
-	nextNotify: IEffect | undefined = undefined;
-
-	// Dependency
-	subs: Link | undefined = undefined;
-	subsTail: Link | undefined = undefined;
-
+export class EffectScope implements Subscriber {
 	// Subscriber
 	deps: Link | undefined = undefined;
 	depsTail: Link | undefined = undefined;
-	trackId = 0;
+	trackId = -(++System.lastTrackId);
 	dirtyLevel = DirtyLevels.None;
 	canPropagate = false;
 
@@ -26,11 +22,18 @@ export class EffectScope implements IEffect {
 	}
 
 	run<T>(fn: () => T) {
-		const prevSub = Subscriber.startTrackEffects(this);
+		const prevSub = activeEffectScope;
+		activeEffectScope = this;
+		this.trackId = Math.abs(this.trackId);
 		try {
 			return fn();
 		} finally {
-			Subscriber.endTrackEffects(this, prevSub);
+			if (prevSub !== undefined) {
+				activeEffectScope = prevSub;
+			} else {
+				activeEffectScope = undefined;
+			}
+			this.trackId = -Math.abs(this.trackId);
 		}
 	}
 

src/system.ts

@@ -22,7 +22,7 @@ export interface Subscriber {
 
 export interface Link {
 	dep: Dependency | IComputed | IEffect;
-	sub: IComputed | IEffect;
+	sub: Subscriber | IComputed | IEffect;
 	trackId: number;
 	// Also used as prev update
 	prevSub: Link | undefined;
@@ -41,9 +41,7 @@ export const enum DirtyLevels {
 
 export namespace System {
 	export let activeSub: IComputed | IEffect | undefined = undefined;
-	export let activeEffectScope: IEffect | undefined = undefined;
 	export let activeTrackId = 0;
-	export let activeEffectScopeTrackId = 0;
 	export let batchDepth = 0;
 	export let lastTrackId = 0;
 	export let queuedEffects: IEffect | undefined = undefined;
@@ -395,15 +393,15 @@ export namespace Subscriber {
 	}
 
 	export function startTrackDependencies(sub: IComputed | IEffect) {
-		const newVersion = system.lastTrackId + 1;
+		const newTrackId = system.lastTrackId + 1;
 		const prevSub = system.activeSub;
 
 		system.activeSub = sub;
-		system.activeTrackId = newVersion;
-		system.lastTrackId = newVersion;
+		system.activeTrackId = newTrackId;
+		system.lastTrackId = newTrackId;
 
 		sub.depsTail = undefined;
-		sub.trackId = newVersion;
+		sub.trackId = newTrackId;
 		sub.dirtyLevel = DirtyLevels.None;
 
 		return prevSub;
@@ -431,43 +429,6 @@ export namespace Subscriber {
 		sub.trackId = -sub.trackId;
 	}
 
-	export function startTrackEffects(sub: IEffect) {
-		const newVersion = system.lastTrackId + 1;
-		const prevSub = system.activeEffectScope;
-
-		system.activeEffectScope = sub;
-		system.activeEffectScopeTrackId = newVersion;
-		system.lastTrackId = newVersion;
-
-		sub.depsTail = undefined;
-		sub.trackId = newVersion;
-		sub.dirtyLevel = DirtyLevels.None;
-
-		return prevSub;
-	}
-
-	export function endTrackEffects(sub: IEffect, prevSub: IEffect | undefined) {
-		if (prevSub !== undefined) {
-			system.activeEffectScope = prevSub;
-			system.activeEffectScopeTrackId = prevSub.trackId;
-		} else {
-			system.activeEffectScope = undefined;
-			system.activeEffectScopeTrackId = 0;
-		}
-
-		const depsTail = sub.depsTail;
-		if (depsTail !== undefined) {
-			if (depsTail.nextDep !== undefined) {
-				clearTrack(depsTail.nextDep);
-				depsTail.nextDep = undefined;
-			}
-		} else if (sub.deps !== undefined) {
-			clearTrack(sub.deps);
-			sub.deps = undefined;
-		}
-		sub.trackId = -sub.trackId;
-	}
-
 	export function clearTrack(link: Link) {
 		do {
 			const dep = link.dep;