@oscarpalmer/timer 0.35.0 → 0.37.0

package/dist/delay.cjs

@@ -6,7 +6,7 @@ function delay(time) {
 		let start;
 		function step(now) {
 			start ??= now;
-			if (interval === require_constants.milliseconds || now - start >= interval - require_constants.intervalBuffer) resolve();
+			if (interval === require_constants.milliseconds || now - start >= interval - 5) resolve();
 			else requestAnimationFrame(step);
 		}
 		requestAnimationFrame(step);

package/dist/delay.js

@@ -6,7 +6,7 @@ function delay(time) {
 		let start;
 		function step(now) {
 			start ??= now;
-			if (interval === milliseconds || now - start >= interval - intervalBuffer) resolve();
+			if (interval === milliseconds || now - start >= interval - 5) resolve();
 			else requestAnimationFrame(step);
 		}
 		requestAnimationFrame(step);

package/dist/get.cjs

@@ -1,10 +1,17 @@
 const require_rolldown_runtime = require("./rolldown_runtime.cjs");
-const __oscarpalmer_atoms_function = require_rolldown_runtime.__toESM(require("@oscarpalmer/atoms/function"));
+const require_constants = require("./constants.cjs");
+let __oscarpalmer_atoms_function = require("@oscarpalmer/atoms/function");
+__oscarpalmer_atoms_function = require_rolldown_runtime.__toESM(__oscarpalmer_atoms_function);
 function getCallback(value) {
 	return typeof value === "function" ? value : __oscarpalmer_atoms_function.noop;
 }
+function getValidTimeout(value) {
+	return typeof value === "number" && value > 0 ? value : require_constants.defaultTimeout;
+}
 function getValidNumber(value, defaultValue) {
-	return typeof value === "number" ? value > 0 ? value : 0 : defaultValue ?? 0;
+	const actualDefault = defaultValue ?? 0;
+	return typeof value === "number" && value > actualDefault ? value : actualDefault;
 }
 exports.getCallback = getCallback;
 exports.getValidNumber = getValidNumber;
+exports.getValidTimeout = getValidTimeout;

package/dist/get.js

@@ -1,8 +1,13 @@
+import { defaultTimeout } from "./constants.js";
 import { noop } from "@oscarpalmer/atoms/function";
 function getCallback(value) {
 	return typeof value === "function" ? value : noop;
 }
+function getValidTimeout(value) {
+	return typeof value === "number" && value > 0 ? value : defaultTimeout;
+}
 function getValidNumber(value, defaultValue) {
-	return typeof value === "number" ? value > 0 ? value : 0 : defaultValue ?? 0;
+	const actualDefault = defaultValue ?? 0;
+	return typeof value === "number" && value > actualDefault ? value : actualDefault;
 }
-export { getCallback, getValidNumber };
+export { getCallback, getValidNumber, getValidTimeout };

package/dist/global.cjs

@@ -2,6 +2,7 @@ const require_constants = require("./constants.cjs");
 if (globalThis._oscarpalmer_timers == null) Object.defineProperty(globalThis, "_oscarpalmer_timers", { get() {
 	return globalThis._oscarpalmer_timer_debug ? [...require_constants.activeTimers] : [];
 } });
+/* istanbul ignore next */
 document.addEventListener("visibilitychange", () => {
 	const from = document.hidden ? require_constants.activeTimers : require_constants.hiddenTimers;
 	const method = document.hidden ? require_constants.WORK_PAUSE : require_constants.WORK_CONTINUE;

package/dist/global.js

@@ -2,6 +2,7 @@ import { WORK_CONTINUE, WORK_PAUSE, activeTimers, hiddenTimers } from "./constan
 if (globalThis._oscarpalmer_timers == null) Object.defineProperty(globalThis, "_oscarpalmer_timers", { get() {
 	return globalThis._oscarpalmer_timer_debug ? [...activeTimers] : [];
 } });
+/* istanbul ignore next */
 document.addEventListener("visibilitychange", () => {
 	const from = document.hidden ? activeTimers : hiddenTimers;
 	const method = document.hidden ? WORK_PAUSE : WORK_CONTINUE;

package/dist/is.cjs

@@ -12,7 +12,7 @@ function isWaited(value) {
 	return is([require_constants.TYPE_WAIT], value);
 }
 function isWhen(value) {
-	return is([require_constants.TYPE_WHEN], value) && typeof value.then === "function";
+	return is(["when"], value) && typeof value.then === "function";
 }
 exports.isRepeated = isRepeated;
 exports.isTimer = isTimer;

package/dist/is.js

@@ -12,6 +12,6 @@ function isWaited(value) {
 	return is([TYPE_WAIT], value);
 }
 function isWhen(value) {
-	return is([TYPE_WHEN], value) && typeof value.then === "function";
+	return is(["when"], value) && typeof value.then === "function";
 }
 export { isRepeated, isTimer, isWaited, isWhen };

package/dist/repeat.cjs

@@ -9,10 +9,10 @@ function repeat(callback, options) {
 		trace: new require_models.TimerTrace().stack
 	}, {
 		onAfter: require_get.getCallback(options?.onAfter),
-		onError: void 0,
+		onError: require_get.getCallback(options?.onTimeout),
 		count: require_get.getValidNumber(options?.count),
 		interval: require_get.getValidNumber(options?.interval, require_constants.milliseconds),
-		timeout: 0
+		timeout: require_get.getValidNumber(options?.timeout)
 	}, true);
 }
 exports.repeat = repeat;

package/dist/repeat.js

@@ -9,10 +9,10 @@ function repeat(callback, options) {
 		trace: new TimerTrace().stack
 	}, {
 		onAfter: getCallback(options?.onAfter),
-		onError: void 0,
+		onError: getCallback(options?.onTimeout),
 		count: getValidNumber(options?.count),
 		interval: getValidNumber(options?.interval, milliseconds),
-		timeout: 0
+		timeout: getValidNumber(options?.timeout)
 	}, true);
 }
 export { repeat };

package/dist/timer.cjs

@@ -1,7 +1,8 @@
 const require_rolldown_runtime = require("./rolldown_runtime.cjs");
 const require_constants = require("./constants.cjs");
 const require_work = require("./work.cjs");
-const __oscarpalmer_atoms_function = require_rolldown_runtime.__toESM(require("@oscarpalmer/atoms/function"));
+let __oscarpalmer_atoms_function = require("@oscarpalmer/atoms/function");
+__oscarpalmer_atoms_function = require_rolldown_runtime.__toESM(__oscarpalmer_atoms_function);
 var Timer = class {
 	state;
 	get active() {

package/dist/timer.full.js

@@ -68,6 +68,7 @@ if (globalThis._oscarpalmer_timers == null) {
         },
     });
 }
+/* istanbul ignore next */
 document.addEventListener('visibilitychange', () => {
     const from = document.hidden ? activeTimers : hiddenTimers;
     const method = document.hidden ? WORK_PAUSE : WORK_CONTINUE;
@@ -85,7 +86,8 @@ function calculate() {
 		let last;
 		function step(now) {
 			if (last != null) values.push(now - last);
-			if (last = now, values.length >= 10) {
+			last = now;
+			if (values.length >= 10) {
 				const median = values.sort().slice(2, -2).reduce((first, second) => first + second, 0) / (values.length - 4);
 				resolve(median);
 			} else requestAnimationFrame(step);
@@ -100,12 +102,14 @@ calculate().then((value) => {
 function getCallback(value) {
     return typeof value === 'function' ? value : noop;
 }
+function getValidTimeout(value) {
+    return typeof value === 'number' && value > 0 ? value : defaultTimeout;
+}
 function getValidNumber(value, defaultValue) {
-    return typeof value === 'number'
-        ? value > 0
-            ? value
-            : 0
-        : (defaultValue ?? 0);
+    const actualDefault = defaultValue ?? 0;
+    return typeof value === 'number' && value > actualDefault
+        ? value
+        : actualDefault;
 }
 
 /**
@@ -370,10 +374,10 @@ function repeat(callback, options) {
         trace: new TimerTrace().stack,
     }, {
         onAfter: getCallback(options?.onAfter),
-        onError: undefined,
+        onError: getCallback(options?.onTimeout),
         count: getValidNumber(options?.count),
         interval: getValidNumber(options?.interval, milliseconds),
-        timeout: 0,
+        timeout: getValidNumber(options?.timeout),
     }, true);
 }
 
@@ -466,7 +470,7 @@ class When {
             },
             count: getValidNumber(options?.count),
             interval: getValidNumber(options?.interval, milliseconds),
-            timeout: getValidNumber(options?.timeout, defaultTimeout),
+            timeout: getValidTimeout(options?.timeout),
         }, false);
     }
     /**

package/dist/when.cjs

@@ -4,7 +4,8 @@ const require_get = require("./get.cjs");
 require("./global.cjs");
 const require_models = require("./models.cjs");
 const require_timer = require("./timer.cjs");
-const __oscarpalmer_atoms_function = require_rolldown_runtime.__toESM(require("@oscarpalmer/atoms/function"));
+let __oscarpalmer_atoms_function = require("@oscarpalmer/atoms/function");
+__oscarpalmer_atoms_function = require_rolldown_runtime.__toESM(__oscarpalmer_atoms_function);
 var When = class {
 	$timer = require_constants.TYPE_WHEN;
 	state = {
@@ -57,7 +58,7 @@ var When = class {
 			},
 			count: require_get.getValidNumber(options?.count),
 			interval: require_get.getValidNumber(options?.interval, require_constants.milliseconds),
-			timeout: require_get.getValidNumber(options?.timeout, require_constants.defaultTimeout)
+			timeout: require_get.getValidTimeout(options?.timeout)
 		}, false);
 	}
 	continue() {

package/dist/when.js

@@ -1,5 +1,5 @@
-import { TYPE_WHEN, defaultTimeout, destroyedMessage, milliseconds, startedMessage } from "./constants.js";
-import { getValidNumber } from "./get.js";
+import { TYPE_WHEN, destroyedMessage, milliseconds, startedMessage } from "./constants.js";
+import { getValidNumber, getValidTimeout } from "./get.js";
 import "./global.js";
 import { TimerTrace } from "./models.js";
 import { Timer } from "./timer.js";
@@ -56,7 +56,7 @@ var When = class {
 			},
 			count: getValidNumber(options?.count),
 			interval: getValidNumber(options?.interval, milliseconds),
-			timeout: getValidNumber(options?.timeout, defaultTimeout)
+			timeout: getValidTimeout(options?.timeout)
 		}, false);
 	}
 	continue() {

package/dist/work.cjs

@@ -5,13 +5,13 @@ function finish(timer, state, options, success) {
 	state.active = false;
 	state.elapsed = 0;
 	state.frame = void 0;
-	if (timer.type === require_constants.TYPE_WAIT) state.callback();
+	if (timer.type === "wait") state.callback();
 	else options.onAfter?.(success);
 }
 function ignore(type, state) {
 	if (state.destroyed) return type !== require_constants.WORK_STOP;
-	if (state.paused) return type === require_constants.WORK_PAUSE || type === require_constants.WORK_START;
-	return state.active && type === require_constants.WORK_START;
+	if (state.paused) return type === "pause" || type === "start";
+	return state.active && type === "start";
 }
 function pause(timer, state) {
 	cancelAnimationFrame(state.frame);
@@ -34,7 +34,7 @@ function run(timer, state, options) {
 			finish(timer, state, options, false);
 			return;
 		}
-		if (options.interval === require_constants.milliseconds || state.elapsed >= options.interval - require_constants.intervalBuffer) {
+		if (options.interval === require_constants.milliseconds || state.elapsed >= options.interval - 5) {
 			if (options.count > -1) state.callback(state.index);
 			start = now;
 			state.elapsed = 0;
@@ -48,7 +48,7 @@ function run(timer, state, options) {
 	};
 }
 function setState(type, state) {
-	const pausable = type === require_constants.WORK_CONTINUE || type === require_constants.WORK_PAUSE;
+	const pausable = type === "continue" || type === "pause";
 	state.elapsed = pausable ? state.elapsed : 0;
 	state.index = pausable ? state.index : 0;
 	state.total = pausable ? state.total : 0;
@@ -65,8 +65,8 @@ function stop(timer, state, options) {
 function work(type, timer, state, options) {
 	if (ignore(type, state)) return timer.instance;
 	setState(type, state);
-	if (type === require_constants.WORK_STOP) return stop(timer, state, options);
-	if (type === require_constants.WORK_PAUSE || type === require_constants.WORK_RESTART) {
+	if (type === "stop") return stop(timer, state, options);
+	if (type === "pause" || type === "restart") {
 		cancelAnimationFrame(state.frame);
 		state.frame = void 0;
 	}

package/dist/work.js

@@ -5,13 +5,13 @@ function finish(timer, state, options, success) {
 	state.active = false;
 	state.elapsed = 0;
 	state.frame = void 0;
-	if (timer.type === TYPE_WAIT) state.callback();
+	if (timer.type === "wait") state.callback();
 	else options.onAfter?.(success);
 }
 function ignore(type, state) {
 	if (state.destroyed) return type !== WORK_STOP;
-	if (state.paused) return type === WORK_PAUSE || type === WORK_START;
-	return state.active && type === WORK_START;
+	if (state.paused) return type === "pause" || type === "start";
+	return state.active && type === "start";
 }
 function pause(timer, state) {
 	cancelAnimationFrame(state.frame);
@@ -34,7 +34,7 @@ function run(timer, state, options) {
 			finish(timer, state, options, false);
 			return;
 		}
-		if (options.interval === milliseconds || state.elapsed >= options.interval - intervalBuffer) {
+		if (options.interval === milliseconds || state.elapsed >= options.interval - 5) {
 			if (options.count > -1) state.callback(state.index);
 			start = now;
 			state.elapsed = 0;
@@ -48,7 +48,7 @@ function run(timer, state, options) {
 	};
 }
 function setState(type, state) {
-	const pausable = type === WORK_CONTINUE || type === WORK_PAUSE;
+	const pausable = type === "continue" || type === "pause";
 	state.elapsed = pausable ? state.elapsed : 0;
 	state.index = pausable ? state.index : 0;
 	state.total = pausable ? state.total : 0;
@@ -65,8 +65,8 @@ function stop(timer, state, options) {
 function work(type, timer, state, options) {
 	if (ignore(type, state)) return timer.instance;
 	setState(type, state);
-	if (type === WORK_STOP) return stop(timer, state, options);
-	if (type === WORK_PAUSE || type === WORK_RESTART) {
+	if (type === "stop") return stop(timer, state, options);
+	if (type === "pause" || type === "restart") {
 		cancelAnimationFrame(state.frame);
 		state.frame = void 0;
 	}

package/package.json

@@ -4,80 +4,57 @@
 		"url": "https://oscarpalmer.se"
 	},
 	"dependencies": {
-		"@oscarpalmer/atoms": "^0.106"
+		"@oscarpalmer/atoms": "^0.109"
 	},
 	"description": "A better solution for timeout- and interval-based timers.",
 	"devDependencies": {
 		"@biomejs/biome": "^2.2",
 		"@rollup/plugin-node-resolve": "^16",
 		"@rollup/plugin-typescript": "^12.1",
-		"@types/node": "^24.3",
+		"@types/node": "^24.5",
 		"@vitest/coverage-istanbul": "^3.2",
-		"dts-bundle-generator": "^9.5",
-		"glob": "^11",
-		"jsdom": "^26.1",
-		"rollup": "^4.49",
+		"jsdom": "^27",
+		"rollup": "^4.50",
 		"tslib": "^2.8",
 		"typescript": "^5.9",
 		"vite": "npm:rolldown-vite@latest",
 		"vitest": "^3.2"
 	},
 	"exports": {
+		"./package.json": "./package.json",
 		".": {
-			"import": {
-				"types": "./types/index.d.ts",
-				"default": "./dist/index.js"
-			},
-			"require": {
-				"types": "./types/index.d.cts",
-				"default": "./dist/index.cjs"
-			}
+			"types": "./types/index.d.ts",
+			"default": "./dist/index.js"
 		},
 		"./delay": {
-			"import": {
-				"types": "./types/delay.d.ts",
-				"default": "./dist/delay.js"
-			},
-			"require": {
-				"types": "./types/delay.d.cts",
-				"default": "./dist/delay.cjs"
-			}
+			"types": "./types/delay.d.ts",
+			"default": "./dist/delay.js"
 		},
 		"./repeat": {
-			"import": {
-				"types": "./types/repeat.d.ts",
-				"default": "./dist/repeat.js"
-			},
-			"require": {
-				"types": "./types/repeat.d.cts",
-				"default": "./dist/repeat.cjs"
-			}
+			"types": "./types/repeat.d.ts",
+			"default": "./dist/repeat.js"
 		},
 		"./wait": {
-			"import": {
-				"types": "./types/wait.d.ts",
-				"default": "./dist/wait.js"
-			},
-			"require": {
-				"types": "./types/wait.d.cts",
-				"default": "./dist/wait.cjs"
-			}
+			"types": "./types/wait.d.ts",
+			"default": "./dist/wait.js"
 		},
 		"./when": {
-			"import": {
-				"types": "./types/when.d.ts",
-				"default": "./dist/when.js"
-			},
-			"require": {
-				"types": "./types/when.d.cts",
-				"default": "./dist/when.cjs"
-			}
+			"types": "./types/when.d.ts",
+			"default": "./dist/when.js"
 		}
 	},
-	"files": ["dist", "src", "types"],
-	"keywords": ["timer", "setTimeout", "setInterval", "requestAnimationFrame"],
+	"files": [
+		"dist",
+		"src",
+		"types"
+	],
+	"keywords": [
+		"timer",
+		"setTimeout",
+		"setInterval",
+		"requestAnimationFrame"
+	],
 	"license": "MIT",
-	"main": "dist/index.cjs",
 	"module": "dist/index.js",
 	"name": "@oscarpalmer/timer",
 	"repository": {
@@ -85,15 +62,16 @@
 		"url": "git+https://github.com/oscarpalmer/timer.git"
 	},
 	"scripts": {
-		"build": "npm run clean && npm run build:js && npm run rollup && npm run types",
+		"build": "npm run clean && npm run build:js && npm run rollup:build && npx tsc",
 		"build:js": "npx vite build",
 		"clean": "rm -rf ./dist && rm -rf ./types && rm -f ./tsconfig.tsbuildinfo",
-		"rollup": "npx rollup -c",
+		"rollup:build": "npx rollup -c",
+		"rollup:watch": "npx rollup -c --watch",
 		"test": "npx vitest --coverage",
 		"types": "npx tsc && npx dts-bundle-generator --config ./dts.config.cts --silent",
 		"watch": "npx vite build --watch"
 	},
 	"type": "module",
-	"types": "types/index.d.cts",
-	"version": "0.35.0"
-}
+	"types": "types/index.d.ts",
+	"version": "0.37.0"
+}

package/src/get.ts

@@ -1,14 +1,19 @@
+import type {GenericCallback} from '@oscarpalmer/atoms';
 import {noop} from '@oscarpalmer/atoms/function';
-import type {GenericCallback} from '@oscarpalmer/atoms/models';
+import {defaultTimeout} from './constants';
 
 export function getCallback(value: unknown): GenericCallback {
 	return typeof value === 'function' ? (value as GenericCallback) : noop;
 }
 
+export function getValidTimeout(value: unknown): number {
+	return typeof value === 'number' && value > 0 ? value : defaultTimeout;
+}
+
 export function getValidNumber(value: unknown, defaultValue?: number): number {
-	return typeof value === 'number'
-		? value > 0
-			? value
-			: 0
-		: (defaultValue ?? 0);
+	const actualDefault = defaultValue ?? 0;
+
+	return typeof value === 'number' && value > actualDefault
+		? value
+		: actualDefault;
 }

package/src/global.ts

@@ -19,6 +19,7 @@ if (globalThis._oscarpalmer_timers == null) {
 	});
 }
 
+/* istanbul ignore next */
 document.addEventListener('visibilitychange', () => {
 	const from = document.hidden ? activeTimers : hiddenTimers;
 	const method = document.hidden ? WORK_PAUSE : WORK_CONTINUE;

package/src/is.ts

@@ -1,4 +1,4 @@
-import type {PlainObject} from '@oscarpalmer/atoms/models';
+import type {PlainObject} from '@oscarpalmer/atoms';
 import {TYPE_REPEAT, TYPE_WAIT, TYPE_WHEN} from './constants';
 import type {Timer} from './timer';
 import type {When} from './when';

package/src/models.ts

@@ -4,19 +4,27 @@ import type {Timer} from './timer';
  * Options for a repeating timer
  */
 export type RepeatOptions = {
-	/**
-	 * Callback to be called when the timer has stopped, either manually or by completing its work
-	 */
-	onAfter: ((finished: boolean) => void) | undefined;
-	/**
-	 * How many times the timer should repeat
-	 */
-	count: number;
-	/**
-	 * The interval between each repeat
-	 */
-	interval: number;
-};
+		/**
+		 * Callback to be called when the timer has stopped, either manually or by completing its work
+		 */
+		onAfter: (finished: boolean) => void;
+		/**
+		 * Callback to be called after the timer has timed out
+		 */
+		onTimeout: () => void;
+		/**
+		 * How many times the timer should repeat
+		 */
+		count: number;
+		/**
+		 * The interval between each repeat
+		 */
+		interval: number;
+		/**
+		 * The timeout for the timer _(any value above `0` will enable the timeout)_
+		 */
+		timeout: number;
+	};
 
 export type TimerOptions = {
 	onAfter: ((finished: boolean) => void) | undefined;
@@ -52,19 +60,19 @@ export type TimerType = 'repeat' | 'wait' | 'when';
  * Options for a conditional timer
  */
 export type WhenOptions = {
-	/**
-	 * How many times the timer should check the condition
-	 */
-	count: number;
-	/**
-	 * Then interval between each condtional check
-	 */
-	interval: number;
-	/**
-	 * The timeout for the timer
-	 */
-	timeout: number;
-};
+		/**
+		 * How many times the timer should check the condition
+		 */
+		count: number;
+		/**
+		 * Then interval between each condtional check
+		 */
+		interval: number;
+		/**
+		 * The timeout for the timer _(any value above `0` will enable the timeout)_
+		 */
+		timeout: number;
+	};
 
 export type WhenState = {
 	promise: Promise<void>;

package/src/repeat.ts

@@ -19,10 +19,10 @@ export function repeat(
 		},
 		{
 			onAfter: getCallback(options?.onAfter),
-			onError: undefined,
+			onError: getCallback(options?.onTimeout),
 			count: getValidNumber(options?.count),
 			interval: getValidNumber(options?.interval, milliseconds),
-			timeout: 0,
+			timeout: getValidNumber(options?.timeout),
 		},
 		true,
 	);

package/src/when.ts

@@ -1,12 +1,11 @@
 import {noop} from '@oscarpalmer/atoms/function';
 import {
-	defaultTimeout,
 	destroyedMessage,
 	milliseconds,
 	startedMessage,
 	TYPE_WHEN,
 } from './constants';
-import {getValidNumber} from './get';
+import {getValidNumber, getValidTimeout} from './get';
 import './global';
 import {TimerTrace, type WhenOptions, type WhenState} from './models';
 import {Timer} from './timer';
@@ -95,7 +94,7 @@ class When {
 				},
 				count: getValidNumber(options?.count),
 				interval: getValidNumber(options?.interval, milliseconds),
-				timeout: getValidNumber(options?.timeout, defaultTimeout),
+				timeout: getValidTimeout(options?.timeout),
 			},
 			false,
 		);

package/types/get.d.ts

@@ -1,3 +1,4 @@
-import type { GenericCallback } from '@oscarpalmer/atoms/models';
+import type { GenericCallback } from '@oscarpalmer/atoms';
 export declare function getCallback(value: unknown): GenericCallback;
+export declare function getValidTimeout(value: unknown): number;
 export declare function getValidNumber(value: unknown, defaultValue?: number): number;

package/types/models.d.ts

@@ -6,7 +6,11 @@ export type RepeatOptions = {
     /**
      * Callback to be called when the timer has stopped, either manually or by completing its work
      */
-    onAfter: ((finished: boolean) => void) | undefined;
+    onAfter: (finished: boolean) => void;
+    /**
+     * Callback to be called after the timer has timed out
+     */
+    onTimeout: () => void;
     /**
      * How many times the timer should repeat
      */
@@ -15,6 +19,10 @@ export type RepeatOptions = {
      * The interval between each repeat
      */
     interval: number;
+    /**
+     * The timeout for the timer _(any value above `0` will enable the timeout)_
+     */
+    timeout: number;
 };
 export type TimerOptions = {
     onAfter: ((finished: boolean) => void) | undefined;
@@ -51,7 +59,7 @@ export type WhenOptions = {
      */
     interval: number;
     /**
-     * The timeout for the timer
+     * The timeout for the timer _(any value above `0` will enable the timeout)_
      */
     timeout: number;
 };