refactor(system): remove IEffectScope

Author: johnsoncodehk

src/effectScope.ts

@@ -1,11 +1,15 @@
-import { DirtyLevels, IEffectScope, Link, Subscriber } from './system.js';
+import { DirtyLevels, IEffect, Link, Subscriber } from './system.js';
 
 export function effectScope() {
 	return new EffectScope();
 }
 
-export class EffectScope implements IEffectScope {
-	nextNotify: IEffectScope | undefined = undefined;
+export class EffectScope implements IEffect {
+	nextNotify: IEffect | undefined = undefined;
+
+	// Dependency
+	subs: Link | undefined = undefined;
+	subsTail: Link | undefined = undefined;
 
 	// Subscriber
 	deps: Link | undefined = undefined;

src/system.ts

@@ -1,10 +1,8 @@
-export interface IEffectScope extends Subscriber {
-	nextNotify: IEffectScope | undefined;
+export interface IEffect extends Dependency, Subscriber {
+	nextNotify: IEffect | undefined;
 	notify(): void;
 }
 
-export interface IEffect extends Dependency, IEffectScope { }
-
 export interface IComputed extends Dependency, Subscriber {
 	update(): void;
 }
@@ -24,7 +22,7 @@ export interface Subscriber {
 
 export interface Link {
 	dep: Dependency | IComputed | IEffect;
-	sub: IComputed | IEffect | IEffectScope;
+	sub: IComputed | IEffect;
 	trackId: number;
 	// Also used as prev update
 	prevSub: Link | undefined;
@@ -43,13 +41,13 @@ export const enum DirtyLevels {
 
 export namespace System {
 	export let activeSub: IComputed | IEffect | undefined = undefined;
-	export let activeEffectScope: IEffectScope | 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: IEffectScope | undefined = undefined;
-	export let queuedEffectsTail: IEffectScope | undefined = undefined;
+	export let queuedEffects: IEffect | undefined = undefined;
+	export let queuedEffectsTail: IEffect | undefined = undefined;
 }
 
 export function startBatch() {
@@ -433,7 +431,7 @@ export namespace Subscriber {
 		sub.trackId = -sub.trackId;
 	}
 
-	export function startTrackEffects(sub: IEffectScope) {
+	export function startTrackEffects(sub: IEffect) {
 		const newVersion = system.lastTrackId + 1;
 		const prevSub = system.activeEffectScope;
 
@@ -448,7 +446,7 @@ export namespace Subscriber {
 		return prevSub;
 	}
 
-	export function endTrackEffects(sub: IEffectScope, prevSub: IEffectScope | undefined) {
+	export function endTrackEffects(sub: IEffect, prevSub: IEffect | undefined) {
 		if (prevSub !== undefined) {
 			system.activeEffectScope = prevSub;
 			system.activeEffectScopeTrackId = prevSub.trackId;