@oscarpalmer/timer 0.45.0 → 0.46.0

package/dist/index.mjs

@@ -35,15 +35,13 @@ function finish(state, success) {
 }
 function ignore(type, state) {
 	if (state.paused) return type === "pause" || type === "start";
-	return state.active && type === "start";
+	return state.active && (type === "continue" || type === "start");
 }
 function run(state) {
 	let last;
-	let start;
 	return function step(now) {
 		if (!state.active) return;
 		last ??= now;
-		start ??= now;
 		const difference = now - last;
 		state.elapsed += difference;
 		state.total += difference;
@@ -55,7 +53,6 @@ function run(state) {
 		}
 		if (state.options.interval === 0 || state.elapsed >= state.options.interval - 5) {
 			if (state.options.count > -1) state.callback(state.index);
-			start = now;
 			state.elapsed = 0;
 			state.index += 1;
 			if (state.options.count === -1 || state.options.count > 0 && state.index >= state.options.count) {
@@ -91,7 +88,7 @@ function work(type, state, hide) {
 	}
 	state.active = true;
 	state.paused = type === WORK_PAUSE;
-	updateStates(state, state.paused ? hide ?? false ? "hidden" : void 0 : "active");
+	updateStates(state, state.paused ? hide : false);
 	if (state.paused) return state.timer;
 	const runner = run(state);
 	state.frame = requestAnimationFrame(runner);
@@ -115,17 +112,20 @@ function onVisibilityChange() {
 	const type = document.hidden ? WORK_PAUSE : WORK_CONTINUE;
 	for (const stored of from) {
 		const state = stored instanceof WeakRef ? stored.deref() : stored;
-		if (state != null) work(type, state, true);
+		if (state == null) from.delete(stored);
+		else work(type, state, true);
 	}
 }
-function updateStates(state, key) {
+function updateStates(state, hide) {
 	STATES.active.delete(state);
-	const hidden = [...STATES.hidden].find((stored) => stored.deref() === state);
 	/* istanbul ignore next */
-	if (hidden != null) STATES.hidden.delete(hidden);
-	if (key != null)
- /* istanbul ignore next */
-	STATES[key].add(key === "hidden" ? new WeakRef(state) : state);
+	STATES.hidden.delete(state.reference);
+	if (hide == null) return;
+	/* istanbul ignore if */
+	if (hide) {
+		state.reference ??= new WeakRef(state);
+		STATES.hidden.add(state.reference);
+	} else STATES.active.add(state);
 }
 //#endregion
 //#region src/global.ts
@@ -209,7 +209,7 @@ function createTimer(name, pick, options, start) {
 		},
 		active: {
 			enumerable: true,
-			get: () => state.active
+			get: () => state.active && !state.paused
 		},
 		destroyed: {
 			enumerable: true,

package/dist/misc.d.mts

@@ -1,10 +1,10 @@
-import { TimerState, TimerStates } from "./models.mjs";
+import { TimerState } from "./models.mjs";
 import { GenericCallback } from "@oscarpalmer/atoms/models";
 //#region src/misc.d.ts
 declare function getCallback(value: unknown): GenericCallback;
 declare function getValidNumber(value: unknown, defaultValue?: number): number;
 declare function getValidTimeout(value: unknown): number;
 declare function onVisibilityChange(): void;
-declare function updateStates(state: TimerState, key?: keyof TimerStates): void;
+declare function updateStates(state: TimerState, hide?: boolean): void;
 //#endregion
 export { getCallback, getValidNumber, getValidTimeout, onVisibilityChange, updateStates };

package/dist/misc.mjs

@@ -18,17 +18,20 @@ function onVisibilityChange() {
 	const type = document.hidden ? WORK_PAUSE : WORK_CONTINUE;
 	for (const stored of from) {
 		const state = stored instanceof WeakRef ? stored.deref() : stored;
-		if (state != null) work(type, state, true);
+		if (state == null) from.delete(stored);
+		else work(type, state, true);
 	}
 }
-function updateStates(state, key) {
+function updateStates(state, hide) {
 	STATES.active.delete(state);
-	const hidden = [...STATES.hidden].find((stored) => stored.deref() === state);
 	/* istanbul ignore next */
-	if (hidden != null) STATES.hidden.delete(hidden);
-	if (key != null)
- /* istanbul ignore next */
-	STATES[key].add(key === "hidden" ? new WeakRef(state) : state);
+	STATES.hidden.delete(state.reference);
+	if (hide == null) return;
+	/* istanbul ignore if */
+	if (hide) {
+		state.reference ??= new WeakRef(state);
+		STATES.hidden.add(state.reference);
+	} else STATES.active.add(state);
 }
 //#endregion
 export { getCallback, getValidNumber, getValidTimeout, onVisibilityChange, updateStates };

package/dist/models.d.mts

@@ -88,6 +88,7 @@ type TimerState = {
   name: TimerName;
   options: TimerOptions;
   paused: boolean;
+  reference?: WeakRef<TimerState>;
   timer: Timer;
   total: number;
   trace?: string;

package/dist/timer.mjs

@@ -31,7 +31,7 @@ function createTimer(name, pick, options, start) {
 		},
 		active: {
 			enumerable: true,
-			get: () => state.active
+			get: () => state.active && !state.paused
 		},
 		destroyed: {
 			enumerable: true,

package/dist/work.mjs

@@ -12,15 +12,13 @@ function finish(state, success) {
 }
 function ignore(type, state) {
 	if (state.paused) return type === "pause" || type === "start";
-	return state.active && type === "start";
+	return state.active && (type === "continue" || type === "start");
 }
 function run(state) {
 	let last;
-	let start;
 	return function step(now) {
 		if (!state.active) return;
 		last ??= now;
-		start ??= now;
 		const difference = now - last;
 		state.elapsed += difference;
 		state.total += difference;
@@ -32,7 +30,6 @@ function run(state) {
 		}
 		if (state.options.interval === 0 || state.elapsed >= state.options.interval - 5) {
 			if (state.options.count > -1) state.callback(state.index);
-			start = now;
 			state.elapsed = 0;
 			state.index += 1;
 			if (state.options.count === -1 || state.options.count > 0 && state.index >= state.options.count) {
@@ -68,7 +65,7 @@ function work(type, state, hide) {
 	}
 	state.active = true;
 	state.paused = type === WORK_PAUSE;
-	updateStates(state, state.paused ? hide ?? false ? "hidden" : void 0 : "active");
+	updateStates(state, state.paused ? hide : false);
 	if (state.paused) return state.timer;
 	const runner = run(state);
 	state.frame = requestAnimationFrame(runner);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oscarpalmer/timer",
-	"version": "0.45.0",
+	"version": "0.46.0",
 	"description": "A better solution for timeout- and interval-based timers.",
 	"keywords": [
 		"requestAnimationFrame",

package/src/misc.ts

@@ -1,7 +1,7 @@
 import {noop} from '@oscarpalmer/atoms/function';
 import type {GenericCallback} from '@oscarpalmer/atoms/models';
 import {DEFAULT_TIMEOUT, STATES, WORK_CONTINUE, WORK_PAUSE} from './constants';
-import type {TimerStates, TimerState} from './models';
+import type {TimerState} from './models';
 import {work} from './work';
 
 export function getCallback(value: unknown): GenericCallback {
@@ -26,24 +26,30 @@ export function onVisibilityChange(): void {
 	for (const stored of from) {
 		const state = stored instanceof WeakRef ? stored.deref() : stored;
 
-		if (state != null) {
+		if (state == null) {
+			from.delete(stored as never);
+		} else {
 			work(type, state, true);
 		}
 	}
 }
 
-export function updateStates(state: TimerState, key?: keyof TimerStates): void {
+export function updateStates(state: TimerState, hide?: boolean): void {
 	STATES.active.delete(state);
 
-	const hidden = [...STATES.hidden].find(stored => stored.deref() === state);
-
 	/* istanbul ignore next */
-	if (hidden != null) {
-		STATES.hidden.delete(hidden);
+	STATES.hidden.delete(state.reference!);
+
+	if (hide == null) {
+		return;
 	}
 
-	if (key != null) {
-		/* istanbul ignore next */
-		STATES[key].add((key === 'hidden' ? new WeakRef(state) : state) as never);
+	/* istanbul ignore if */
+	if (hide) {
+		state.reference ??= new WeakRef(state);
+
+		STATES.hidden.add(state.reference);
+	} else {
+		STATES.active.add(state);
 	}
 }

package/src/models.ts

@@ -100,6 +100,7 @@ export type TimerState = {
 	name: TimerName;
 	options: TimerOptions;
 	paused: boolean;
+	reference?: WeakRef<TimerState>;
 	timer: Timer;
 	total: number;
 	trace?: string;

package/src/timer.ts

@@ -39,7 +39,7 @@ export function createTimer(
 		},
 		active: {
 			enumerable: true,
-			get: () => state.active,
+			get: () => state.active && !state.paused,
 		},
 		destroyed: {
 			enumerable: true,

package/src/work.ts

@@ -31,12 +31,11 @@ function ignore(type: WorkHandlerType, state: TimerState): boolean {
 		return type === WORK_PAUSE || type === WORK_START;
 	}
 
-	return state.active && type === WORK_START;
+	return state.active && (type === WORK_CONTINUE || type === WORK_START);
 }
 
 function run(state: TimerState): (now: DOMHighResTimeStamp) => void {
 	let last: DOMHighResTimeStamp | undefined;
-	let start: DOMHighResTimeStamp | undefined;
 
 	return function step(now: DOMHighResTimeStamp): void {
 		if (!state.active) {
@@ -44,7 +43,6 @@ function run(state: TimerState): (now: DOMHighResTimeStamp) => void {
 		}
 
 		last ??= now;
-		start ??= now;
 
 		const difference = now - last;
 
@@ -66,8 +64,6 @@ function run(state: TimerState): (now: DOMHighResTimeStamp) => void {
 				(state.callback as (index: number) => void)(state.index);
 			}
 
-			start = now;
-
 			state.elapsed = 0;
 			state.index += 1;
 
@@ -127,7 +123,7 @@ export function work(type: WorkHandlerType, state: TimerState, hide?: boolean):
 	state.active = true;
 	state.paused = type === WORK_PAUSE;
 
-	updateStates(state, state.paused ? ((hide ?? false) ? 'hidden' : undefined) : 'active');
+	updateStates(state, state.paused ? hide : false);
 
 	if (state.paused) {
 		return state.timer;