@oscarpalmer/timer 0.32.0 → 0.34.0

package/src/work.ts

@@ -1,11 +1,13 @@
 import {
 	activeTimers,
-	beginTypes,
-	endOrRestartTypes,
-	endTypes,
 	intervalBuffer,
 	milliseconds,
-	pauseTypes,
+	TYPE_WAIT,
+	WORK_CONTINUE,
+	WORK_PAUSE,
+	WORK_RESTART,
+	WORK_START,
+	WORK_STOP,
 } from './constants';
 import type {
 	TimerOptions,
@@ -15,40 +17,21 @@ import type {
 } from './models';
 import type {Timer} from './timer';
 
-function endOrRestart(
-	type: WorkHandlerType,
-	timer: WorkHandlerTimer,
-	state: TimerState,
-	options: TimerOptions,
-): Timer {
-	cancelAnimationFrame(state.frame as never);
-
-	if (type === 'stop') {
-		options.onAfter?.(false);
-	}
-
-	state.active = false;
-	state.frame = undefined;
-	state.paused = type === 'pause';
-
-	return type === 'restart'
-		? work('start', timer, state, options)
-		: timer.instance;
-}
-
 function finish(
 	timer: WorkHandlerTimer,
 	state: TimerState,
 	options: TimerOptions,
 	success: boolean,
 ): void {
+	cancelAnimationFrame(state.frame as never);
+
 	activeTimers.delete(timer.instance);
 
 	state.active = false;
 	state.elapsed = 0;
 	state.frame = undefined;
 
-	if (timer.type === 'wait') {
+	if (timer.type === TYPE_WAIT) {
 		state.callback();
 	} else {
 		options.onAfter?.(success);
@@ -56,10 +39,23 @@ function finish(
 }
 
 function ignore(type: WorkHandlerType, state: TimerState): boolean {
-	return (
-		(state.destroyed && type !== 'stop') ||
-		(state.active ? beginTypes.has(type) : endTypes.has(type))
-	);
+	if (state.destroyed) {
+		return type !== WORK_STOP;
+	}
+
+	if (state.paused) {
+		return type === WORK_PAUSE || type === WORK_START;
+	}
+
+	return state.active && type === WORK_START;
+}
+
+function pause(timer: WorkHandlerTimer, state: TimerState): Timer {
+	cancelAnimationFrame(state.frame as never);
+
+	state.frame = undefined;
+
+	return timer.instance;
 }
 
 function run(
@@ -67,6 +63,7 @@ function run(
 	state: TimerState,
 	options: TimerOptions,
 ): (now: DOMHighResTimeStamp) => void {
+	let last: DOMHighResTimeStamp | undefined;
 	let start: DOMHighResTimeStamp | undefined;
 
 	return function step(now: DOMHighResTimeStamp): void {
@@ -74,13 +71,16 @@ function run(
 			return;
 		}
 
+		last ??= now;
 		start ??= now;
 
-		const difference = now - start;
+		const difference = now - last;
 
 		state.elapsed += difference;
 		state.total += difference;
 
+		last = now;
+
 		if (options.timeout > 0 && state.total >= options.timeout) {
 			options.onError?.();
 
@@ -117,7 +117,7 @@ function run(
 }
 
 function setState(type: WorkHandlerType, state: TimerState): void {
-	const pausable = pauseTypes.has(type);
+	const pausable = type === WORK_CONTINUE || type === WORK_PAUSE;
 
 	state.elapsed = pausable ? state.elapsed : 0;
 	state.index = pausable ? state.index : 0;
@@ -125,12 +125,22 @@ function setState(type: WorkHandlerType, state: TimerState): void {
 }
 
 export function stop(
-	timer: WorkHandlerTimer,
-	state: TimerState,
-	options: TimerOptions,
-): void {
-	endOrRestart('stop', timer, state, options);
-}
+		timer: WorkHandlerTimer,
+		state: TimerState,
+		options: TimerOptions,
+	): Timer {
+		cancelAnimationFrame(state.frame as never);
+
+		activeTimers.delete(timer.instance);
+
+		options.onAfter?.(false);
+
+		state.active = !stop;
+		state.frame = undefined;
+		state.paused = false;
+
+		return timer.instance;
+	}
 
 export function work(
 	type: WorkHandlerType,
@@ -144,12 +154,22 @@ export function work(
 
 	setState(type, state);
 
-	if (endOrRestartTypes.has(type)) {
-		return endOrRestart(type, timer, state, options);
+	if (type === WORK_STOP) {
+		return stop(timer, state, options);
+	}
+
+	if (type === WORK_PAUSE || type === WORK_RESTART) {
+		cancelAnimationFrame(state.frame as never);
+
+		state.frame = undefined;
 	}
 
 	state.active = true;
-	state.paused = false;
+	state.paused = type === WORK_PAUSE;
+
+	if (state.paused) {
+		return pause(timer, state);
+	}
 
 	activeTimers.add(timer.instance);
 

package/types/constants.d.cts

@@ -71,10 +71,6 @@ export type WorkHandlerType = "continue" | "pause" | "restart" | "start" | "stop
  * A set of all active timers
  */
 export declare const activeTimers: Set<Timer>;
-/**
- * A set of types that allow work to begin
- */
-export declare const beginTypes: Set<WorkHandlerType>;
 /**
  * Buffer value to use when evaluating if a specific time is within a certain range
  */
@@ -83,23 +79,22 @@ export declare const intervalBuffer = 5;
  * Message to show when a when-timer is destroyed
  */
 export declare const destroyedMessage = "Timer has already been destroyed";
-/**
- * A set of types that allow work to end
- */
-export declare const endTypes: Set<WorkHandlerType>;
-/**
- * A set of types that allow work to end or restart
- */
-export declare const endOrRestartTypes: Set<WorkHandlerType>;
 /**
  * A set of timers that were paused due to the document being hidden
  */
 export declare const hiddenTimers: Set<Timer>;
-export declare const pauseTypes: Set<WorkHandlerType>;
 /**
  * Message to show when a when-timer is started
  */
 export declare const startedMessage = "Timer has already been started";
+export declare const TYPE_REPEAT: TimerType;
+export declare const TYPE_WAIT: TimerType;
+export declare const TYPE_WHEN: TimerType;
+export declare const WORK_CONTINUE: WorkHandlerType;
+export declare const WORK_PAUSE: WorkHandlerType;
+export declare const WORK_RESTART: WorkHandlerType;
+export declare const WORK_START: WorkHandlerType;
+export declare const WORK_STOP: WorkHandlerType;
 /**
  * A calculated average of the refresh rate of the display _(in milliseconds)_
  */

package/types/constants.d.ts

@@ -1,13 +1,9 @@
-import type { WorkHandlerType } from './models';
+import type { TimerType, WorkHandlerType } from './models';
 import type { Timer } from './timer';
 /**
  * A set of all active timers
  */
 export declare const activeTimers: Set<Timer>;
-/**
- * A set of types that allow work to begin
- */
-export declare const beginTypes: Set<WorkHandlerType>;
 /**
  * Buffer value to use when evaluating if a specific time is within a certain range
  */
@@ -16,23 +12,22 @@ export declare const intervalBuffer = 5;
  * Message to show when a when-timer is destroyed
  */
 export declare const destroyedMessage = "Timer has already been destroyed";
-/**
- * A set of types that allow work to end
- */
-export declare const endTypes: Set<WorkHandlerType>;
-/**
- * A set of types that allow work to end or restart
- */
-export declare const endOrRestartTypes: Set<WorkHandlerType>;
 /**
  * A set of timers that were paused due to the document being hidden
  */
 export declare const hiddenTimers: Set<Timer>;
-export declare const pauseTypes: Set<WorkHandlerType>;
 /**
  * Message to show when a when-timer is started
  */
 export declare const startedMessage = "Timer has already been started";
+export declare const TYPE_REPEAT: TimerType;
+export declare const TYPE_WAIT: TimerType;
+export declare const TYPE_WHEN: TimerType;
+export declare const WORK_CONTINUE: WorkHandlerType;
+export declare const WORK_PAUSE: WorkHandlerType;
+export declare const WORK_RESTART: WorkHandlerType;
+export declare const WORK_START: WorkHandlerType;
+export declare const WORK_STOP: WorkHandlerType;
 /**
  * A calculated average of the refresh rate of the display _(in milliseconds)_
  */

package/types/get.d.cts

@@ -1,5 +1,8 @@
 // Generated by dts-bundle-generator v9.5.1
 
+/**
+ * A generic callback function
+ */
 export type GenericCallback = (...args: any[]) => any;
 export declare function getCallback(value: unknown): GenericCallback;
 export declare function getValidNumber(value: unknown, defaultValue?: number): number;

package/types/work.d.cts

@@ -71,7 +71,7 @@ export type WorkHandlerTimer = {
 	type: TimerType;
 };
 export type WorkHandlerType = "continue" | "pause" | "restart" | "start" | "stop";
-declare function stop$1(timer: WorkHandlerTimer, state: TimerState, options: TimerOptions): void;
+declare function stop$1(timer: WorkHandlerTimer, state: TimerState, options: TimerOptions): Timer;
 export declare function work(type: WorkHandlerType, timer: WorkHandlerTimer, state: TimerState, options: TimerOptions): Timer;
 
 export {

package/types/work.d.ts

@@ -1,4 +1,4 @@
 import type { TimerOptions, TimerState, WorkHandlerTimer, WorkHandlerType } from './models';
 import type { Timer } from './timer';
-export declare function stop(timer: WorkHandlerTimer, state: TimerState, options: TimerOptions): void;
+export declare function stop(timer: WorkHandlerTimer, state: TimerState, options: TimerOptions): Timer;
 export declare function work(type: WorkHandlerType, timer: WorkHandlerTimer, state: TimerState, options: TimerOptions): Timer;