refactor: Remove zonejs-related wrappers

Author: divdavem

angular/headless/angular.json

@@ -19,8 +19,6 @@
 					"builder": "@angular/build:unit-test",
 					"options": {
 						"include": ["src/**/*.spec.ts"],
-						"providersFile": "test-providers.ts",
-						"setupFiles": ["setup-test.ts"],
 						"buildTarget": ":build",
 						"browsers": ["ChromiumHeadless"]
 					},

angular/headless/setup-test.ts

@@ -1,27 +1,10 @@
 import {readable, writable} from '@amadeus-it-group/tansu';
-import {ChangeDetectionStrategy, Component, NgZone, effect} from '@angular/core';
+import {ChangeDetectionStrategy, Component, effect} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
-import {beforeEach, describe, expect, it} from 'vitest';
+import {describe, expect, it} from 'vitest';
 import {toAngularSignal, toAngularWritableSignal} from './stores';
 
 describe('toAngularSignals', () => {
-	let log: string[] = [];
-
-	beforeEach(() => {
-		log = [];
-	});
-
-	const createZoneCheckFn =
-		<T extends any[], R>(name: string, fn: (...args: T) => R) =>
-		(...args: T): R => {
-			log.push(`begin ${name}, ngZone = ${NgZone.isInAngularZone()}`);
-			try {
-				return fn(...args);
-			} finally {
-				log.push(`end ${name}, ngZone = ${NgZone.isInAngularZone()}`);
-			}
-		};
-
 	it('[toAngularSignal] works synchronously', () => {
 		const tansuStore = writable(1);
 		const signal = TestBed.runInInjectionContext(() => toAngularSignal(tansuStore));
@@ -33,51 +16,38 @@ describe('toAngularSignals', () => {
 		expect(signal()).toBe(2); // no change as the subscription was ended
 	});
 
+	it('[toAngularSignal] subscribes and unsubscribes', () => {
+		const log: string[] = [];
+		const tansuStore = readable(0 as number, {
+			onUse: (set) => {
+				log.push('onUse');
+				set(1);
+				return () => {
+					log.push('destroy');
+				};
+			},
+		});
+		const signal = TestBed.runInInjectionContext(() => toAngularSignal(tansuStore));
+		expect(signal()).toBe(1);
+		TestBed.resetTestingModule();
+		expect(log).toStrictEqual(['onUse', 'destroy']);
+	});
+
 	it('[toAngularWritableSignal] works synchronously', () => {
 		const tansuStore = writable(1);
 		const signal = TestBed.runInInjectionContext(() => toAngularWritableSignal(tansuStore));
 		expect(signal()).toBe(1);
 		tansuStore.set(2);
 		expect(signal()).toBe(2);
-		const ngZone = TestBed.inject(NgZone);
-		ngZone.run(() => {
-			signal.set(3);
-		});
+		signal.set(3);
 		expect(tansuStore.get()).toBe(3);
-		ngZone.run(() => {
-			signal.set(4);
-		});
+		signal.set(4);
 		expect(tansuStore.get()).toBe(4);
 		TestBed.resetTestingModule(); // this ends the subscription
 		tansuStore.set(5);
 		expect(signal()).toBe(4); // no change as the subscription was ended
 	});
 
-	it('[toAngularSignal] subscribes and unsubscribes outside Angular zone', () => {
-		const ngZone = TestBed.inject(NgZone);
-		const tansuStore = readable(0 as number, {
-			onUse: createZoneCheckFn('onUse', (set) => {
-				set(1);
-				return createZoneCheckFn('destroy', () => {});
-			}),
-		});
-		ngZone.run(
-			createZoneCheckFn('ngZone.run', () => {
-				const signal = TestBed.runInInjectionContext(() => toAngularSignal(tansuStore));
-				expect(signal()).toBe(1);
-				TestBed.resetTestingModule();
-			}),
-		);
-		expect(log).toStrictEqual([
-			'begin ngZone.run, ngZone = true',
-			'begin onUse, ngZone = false',
-			'end onUse, ngZone = false',
-			'begin destroy, ngZone = false',
-			'end destroy, ngZone = false',
-			'end ngZone.run, ngZone = true',
-		]);
-	});
-
 	@Component({
 		selector: '[auMyTestWithoutEffect]',
 		changeDetection: ChangeDetectionStrategy.OnPush,
@@ -107,50 +77,19 @@ describe('toAngularSignals', () => {
 	}
 
 	for (const MyComponent of [MyTestWithEffectComponent, MyTestWithoutEffectComponent]) {
-		it(`[toAngularSignal] works in ${MyComponent.name} (inside Angular zone)`, async () => {
-			TestBed.configureTestingModule({
-				imports: [MyComponent],
-			});
-			const fixture = TestBed.createComponent(MyComponent);
-			fixture.autoDetectChanges();
-			await fixture.whenStable();
-			expect(fixture.nativeElement.textContent).toBe('1');
-			if (MyComponent === MyTestWithEffectComponent) {
-				// eslint-disable-next-line vitest/no-conditional-expect
-				expect(fixture.componentInstance.changes).toStrictEqual([1]);
-			}
-			const zone = TestBed.inject(NgZone);
-			expect(NgZone.isInAngularZone()).toBeFalsy();
-			zone.run(() => {
-				expect(NgZone.isInAngularZone()).toBeTruthy();
-				fixture.componentInstance.myStore.set(2);
-				fixture.componentInstance.myStore.set(3);
-			});
-			await fixture.whenStable();
-			expect(fixture.nativeElement.textContent).toBe('3');
-			if (MyComponent === MyTestWithEffectComponent) {
-				// eslint-disable-next-line vitest/no-conditional-expect
-				expect(fixture.componentInstance.changes).toStrictEqual([1, 3]);
-			}
-			fixture.destroy();
-		});
-
-		it(`[toAngularSignal] works in ${MyComponent.name} (outside Angular zone)`, async () => {
+		it(`[toAngularSignal] works in ${MyComponent.name}`, async () => {
 			const fixture = TestBed.createComponent(MyComponent);
 			fixture.autoDetectChanges();
 			await fixture.whenStable();
 			expect(fixture.nativeElement.textContent).toBe('1');
 			if (MyComponent === MyTestWithEffectComponent) {
-				// eslint-disable-next-line vitest/no-conditional-expect
 				expect(fixture.componentInstance.changes).toStrictEqual([1]);
 			}
-			expect(NgZone.isInAngularZone()).toBeFalsy();
 			fixture.componentInstance.myStore.set(2);
 			fixture.componentInstance.myStore.set(3);
 			await fixture.whenStable();
 			expect(fixture.nativeElement.textContent).toBe('3');
 			if (MyComponent === MyTestWithEffectComponent) {
-				// eslint-disable-next-line vitest/no-conditional-expect
 				expect(fixture.componentInstance.changes).toStrictEqual([1, 3]);
 			}
 			fixture.destroy();

angular/headless/src/utils/stores.spec.ts

@@ -1,60 +1,53 @@
 import type {ReadableSignal, WritableSignal as TansuWritableSignal} from '@amadeus-it-group/tansu';
 import type {Signal, WritableSignal} from '@angular/core';
 import {DestroyRef, inject, signal} from '@angular/core';
-import {ZoneWrapper} from './zone';
 
 export * from '@agnos-ui/core/utils/stores';
 
 /**
  * Converts a Tansu `ReadableSignal` to an Angular `Signal`.
  *
- * This function wraps the provided Tansu signal in an Angular signal, ensuring that updates
- * are properly handled within Angular's zone. It subscribes to the Tansu signal and updates
- * the Angular signal with the received values. The equality function for the Angular signal
- * is set to always return false, ensuring that every new value from the Tansu signal triggers
- * an update.
+ * This function wraps the provided Tansu signal in an Angular signal. It subscribes to the
+ * Tansu signal and updates the Angular signal with the received values. The equality function
+ * for the Angular signal is set to always return false, ensuring that every new value from the
+ * Tansu signal triggers an update.
  *
  * @template T - The type of the value emitted by the signals.
  * @param tansuSignal - The Tansu signal to convert.
  * @returns - The resulting Angular signal.
  */
 export const toAngularSignal = <T>(tansuSignal: ReadableSignal<T>): Signal<T> => {
-	const zoneWrapper = inject(ZoneWrapper);
 	// The equality of objects from 2 sequential emissions is already checked in tansu signal.
 	// Here we'll always emit the value received from tansu signal, therefor the equality function
 	const res = signal(undefined as any as T, {equal: () => false});
-	const subscription = zoneWrapper.outsideNgZone(tansuSignal.subscribe)((value) => {
+	const subscription = tansuSignal.subscribe((value) => {
 		res.set(value);
-		zoneWrapper.planNgZoneRun();
 	});
-	inject(DestroyRef).onDestroy(zoneWrapper.outsideNgZone(subscription));
+	inject(DestroyRef).onDestroy(subscription);
 
 	return res.asReadonly();
 };
 
 /**
  * Converts a Tansu `WritableSignal` to an Angular `WritableSignal`.
  *
- * This function wraps the provided Tansu signal in an Angular signal, ensuring that updates
- * are properly handled within Angular's zone. It subscribes to the Tansu signal and updates
- * the Angular signal with the received values. The equality function for the Angular signal
- * is set to always return false, ensuring that every new value from the Tansu signal triggers
- * an update.
+ * This function wraps the provided Tansu signal in an Angular signal. It subscribes to the
+ * Tansu signal and updates the Angular signal with the received values. The equality function
+ * for the Angular signal is set to always return false, ensuring that every new value from the
+ * Tansu signal triggers an update.
  *
  * @template T - The type of the value emitted by the signals.
  * @param tansuSignal - The Tansu signal to convert.
  * @returns - The resulting Angular signal.
  */
 export const toAngularWritableSignal = <T>(tansuSignal: TansuWritableSignal<T>): WritableSignal<T> => {
-	const zoneWrapper = inject(ZoneWrapper);
 	const res = signal(undefined as any as T, {equal: () => false});
 	const set = res.set.bind(res);
-	const subscription = zoneWrapper.outsideNgZone(tansuSignal.subscribe)((value) => {
+	const subscription = tansuSignal.subscribe((value) => {
 		set(value);
-		zoneWrapper.planNgZoneRun();
 	});
-	inject(DestroyRef).onDestroy(zoneWrapper.outsideNgZone(subscription));
-	res.set = zoneWrapper.outsideNgZone(tansuSignal.set);
-	res.update = zoneWrapper.outsideNgZone(tansuSignal.update);
+	inject(DestroyRef).onDestroy(subscription);
+	res.set = tansuSignal.set;
+	res.update = tansuSignal.update;
 	return res;
 };