refactor: rename getCurrentSub and setCurrentSub to getActiveSub and setActiveSub

Author: johnsoncodehk

src/index.ts

@@ -56,11 +56,11 @@ let notifyIndex = 0;
 let queuedEffectsLength = 0;
 let activeSub: ReactiveNode | undefined;
 
-export function getCurrentSub(): ReactiveNode | undefined {
+export function getActiveSub(): ReactiveNode | undefined {
 	return activeSub;
 }
 
-export function setCurrentSub(sub: ReactiveNode | undefined) {
+export function setActiveSub(sub: ReactiveNode | undefined) {
 	const prevSub = activeSub;
 	activeSub = sub;
 	return prevSub;
@@ -142,7 +142,7 @@ export function effect(fn: () => void): () => void {
 	if (sub !== undefined) {
 		link(e, sub, 0);
 	}
-	const prevSub = setCurrentSub(e);
+	const prevSub = setActiveSub(e);
 	try {
 		e.fn();
 	} finally {
@@ -163,7 +163,7 @@ export function effectScope(fn: () => void): () => void {
 	if (sub !== undefined) {
 		link(e, sub, 0);
 	}
-	const prevSub = setCurrentSub(e);
+	const prevSub = setActiveSub(e);
 	try {
 		fn();
 	} finally {
@@ -176,7 +176,7 @@ function updateComputed(c: Computed): boolean {
 	++cycle;
 	c.depsTail = undefined;
 	c.flags = 5 as (ReactiveFlags.Mutable | ReactiveFlags.RecursedCheck);
-	const prevSub = setCurrentSub(c);
+	const prevSub = setActiveSub(c);
 	try {
 		const oldValue = c.value;
 		return oldValue !== (c.value = c.getter(oldValue));
@@ -219,7 +219,7 @@ function run(e: Effect | EffectScope, flags: ReactiveFlags): void {
 		++cycle;
 		e.depsTail = undefined;
 		e.flags = 6 as (ReactiveFlags.Watching | ReactiveFlags.RecursedCheck);
-		const prevSub = setCurrentSub(e);
+		const prevSub = setActiveSub(e);
 		try {
 			(e as Effect).fn();
 		} finally {
@@ -270,7 +270,7 @@ function computedOper<T>(this: Computed<T>): T {
 		}
 	} else if (!flags) {
 		this.flags = 1 satisfies ReactiveFlags.Mutable;
-		const prevSub = setCurrentSub(this);
+		const prevSub = setActiveSub(this);
 		try {
 			this.value = this.getter();
 		} finally {

tests/build.spec.ts

@@ -7,14 +7,14 @@ test('build: cjs', () => {
 	const index = require('../cjs/index.cjs');
 	const system = require('../cjs/system.cjs');
 
-	expect(typeof index.getCurrentSub).toBe('function');
+	expect(typeof index.getActiveSub).toBe('function');
 	expect(typeof system.createReactiveSystem).toBe('function');
 });
 
 test('build: esm', async () => {
 	const index = await import('../esm/index.mjs');
 	const system = await import('../esm/system.mjs');
 
-	expect(typeof index.getCurrentSub).toBe('function');
+	expect(typeof index.getActiveSub).toBe('function');
 	expect(typeof system.createReactiveSystem).toBe('function');
 });

tests/effect.spec.ts

@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest';
-import { computed, effect, effectScope, endBatch, setCurrentSub, signal, startBatch } from '../src';
+import { computed, effect, effectScope, endBatch, setActiveSub, signal, startBatch } from '../src';
 
 test('should clear subscriptions when untracked by all subscribers', () => {
 	let bRunTimes = 0;
@@ -187,9 +187,9 @@ test('should duplicate subscribers do not affect the notify order', () => {
 
 	effect(() => {
 		order.push('a');
-		const currentSub = setCurrentSub(undefined);
+		const currentSub = setActiveSub(undefined);
 		const isOne = src2() === 1;
-		setCurrentSub(currentSub);
+		setActiveSub(currentSub);
 		if (isOne) {
 			src1();
 		}

tests/issue_48.spec.ts

@@ -1,5 +1,5 @@
 import { test } from 'vitest';
-import { computed, effect, setCurrentSub, signal } from '../src';
+import { computed, effect, setActiveSub, signal } from '../src';
 
 test('#48', () => {
 	const source = signal(0);
@@ -88,10 +88,10 @@ function reaction<T>(
 }
 
 function untracked<T>(callback: () => T): T {
-	const currentSub = setCurrentSub(undefined);
+	const currentSub = setActiveSub(undefined);
 	try {
 		return callback();
 	} finally {
-		setCurrentSub(currentSub);
+		setActiveSub(currentSub);
 	}
 }

tests/untrack.spec.ts

@@ -1,15 +1,15 @@
 import { expect, test } from 'vitest';
-import { computed, effect, effectScope, setCurrentSub, signal } from '../src';
+import { computed, effect, effectScope, setActiveSub, signal } from '../src';
 
 test('should pause tracking in computed', () => {
 	const src = signal(0);
 
 	let computedTriggerTimes = 0;
 	const c = computed(() => {
 		computedTriggerTimes++;
-		const currentSub = setCurrentSub(undefined);
+		const currentSub = setActiveSub(undefined);
 		const value = src();
-		setCurrentSub(currentSub);
+		setActiveSub(currentSub);
 		return value;
 	});
 
@@ -29,9 +29,9 @@ test('should pause tracking in effect', () => {
 	effect(() => {
 		effectTriggerTimes++;
 		if (is()) {
-			const currentSub = setCurrentSub(undefined);
+			const currentSub = setActiveSub(undefined);
 			src();
-			setCurrentSub(currentSub);
+			setActiveSub(currentSub);
 		}
 	});
 
@@ -63,9 +63,9 @@ test('should pause tracking in effect scope', () => {
 	effectScope(() => {
 		effect(() => {
 			effectTriggerTimes++;
-			const currentSub = setCurrentSub(undefined);
+			const currentSub = setActiveSub(undefined);
 			src();
-			setCurrentSub(currentSub);
+			setActiveSub(currentSub);
 		});
 	});