@oscarpalmer/timer 0.27.0 → 0.28.0

package/dist/functions.cjs

@@ -4,19 +4,19 @@ const constants = require("./constants.cjs");
 function getOptions(options, isRepeated) {
   return {
     afterCallback: options.afterCallback,
-    count: getValueOrDefault(
+    count: getNumberOrDefault(
       options.count,
       isRepeated ? Number.POSITIVE_INFINITY : 1
     ),
     errorCallback: options.errorCallback,
-    interval: getValueOrDefault(options.interval, constants.milliseconds, constants.milliseconds),
-    timeout: getValueOrDefault(
+    interval: getNumberOrDefault(options.interval, constants.milliseconds, constants.milliseconds),
+    timeout: getNumberOrDefault(
       options.timeout,
       isRepeated ? Number.POSITIVE_INFINITY : 3e4
     )
   };
 }
-function getValueOrDefault(value, defaultValue, minimum) {
+function getNumberOrDefault(value, defaultValue, minimum) {
   return typeof value === "number" && value > (minimum ?? 0) ? value : defaultValue;
 }
 function work(type, timer, state, options) {
@@ -44,8 +44,8 @@ function work(type, timer, state, options) {
   }
   state.active = true;
   state.paused = false;
-  const elapsed = type === "continue" ? +(state.elapsed ?? 0) : 0;
-  let index = type === "continue" ? +(state.index ?? 0) : 0;
+  const elapsed = type === "continue" ? Number(state.elapsed ?? 0) : 0;
+  let index = type === "continue" ? Number(state.index ?? 0) : 0;
   state.elapsed = elapsed;
   state.index = index;
   const total = (count === Number.POSITIVE_INFINITY ? Number.POSITIVE_INFINITY : (count - index) * (interval > 0 ? interval : constants.milliseconds)) - elapsed;
@@ -96,5 +96,4 @@ function work(type, timer, state, options) {
   return timer;
 }
 exports.getOptions = getOptions;
-exports.getValueOrDefault = getValueOrDefault;
 exports.work = work;

package/dist/functions.js

@@ -2,19 +2,19 @@ import { beginTypes, endTypes, endOrRestartTypes, activeTimers, milliseconds } f
 function getOptions(options, isRepeated) {
   return {
     afterCallback: options.afterCallback,
-    count: getValueOrDefault(
+    count: getNumberOrDefault(
       options.count,
       isRepeated ? Number.POSITIVE_INFINITY : 1
     ),
     errorCallback: options.errorCallback,
-    interval: getValueOrDefault(options.interval, milliseconds, milliseconds),
-    timeout: getValueOrDefault(
+    interval: getNumberOrDefault(options.interval, milliseconds, milliseconds),
+    timeout: getNumberOrDefault(
       options.timeout,
       isRepeated ? Number.POSITIVE_INFINITY : 3e4
     )
   };
 }
-function getValueOrDefault(value, defaultValue, minimum) {
+function getNumberOrDefault(value, defaultValue, minimum) {
   return typeof value === "number" && value > (minimum ?? 0) ? value : defaultValue;
 }
 function work(type, timer, state, options) {
@@ -42,8 +42,8 @@ function work(type, timer, state, options) {
   }
   state.active = true;
   state.paused = false;
-  const elapsed = type === "continue" ? +(state.elapsed ?? 0) : 0;
-  let index = type === "continue" ? +(state.index ?? 0) : 0;
+  const elapsed = type === "continue" ? Number(state.elapsed ?? 0) : 0;
+  let index = type === "continue" ? Number(state.index ?? 0) : 0;
   state.elapsed = elapsed;
   state.index = index;
   const total = (count === Number.POSITIVE_INFINITY ? Number.POSITIVE_INFINITY : (count - index) * (interval > 0 ? interval : milliseconds)) - elapsed;
@@ -95,6 +95,5 @@ function work(type, timer, state, options) {
 }
 export {
   getOptions,
-  getValueOrDefault,
   work
 };

package/dist/index.cjs

@@ -8,15 +8,17 @@ const is = require("./is.cjs");
 const when = require("./when.cjs");
 function delay(time, timeout) {
   return new Promise((resolve, reject) => {
-    const delayed = timer.wait(
+    let delayed = timer.wait(
       () => {
-        delayed.destroy();
+        delayed == null ? void 0 : delayed.destroy();
+        delayed = null;
         (resolve ?? _function.noop)();
       },
       {
         timeout,
         errorCallback: () => {
-          delayed.destroy();
+          delayed == null ? void 0 : delayed.destroy();
+          delayed = null;
           (reject ?? _function.noop)();
         },
         interval: time

package/dist/index.js

@@ -7,15 +7,17 @@ import { isRepeated, isTimer, isWaited, isWhen } from "./is.js";
 import { when } from "./when.js";
 function delay(time, timeout) {
   return new Promise((resolve, reject) => {
-    const delayed = wait(
+    let delayed = wait(
       () => {
-        delayed.destroy();
+        delayed == null ? void 0 : delayed.destroy();
+        delayed = null;
         (resolve ?? noop)();
       },
       {
         timeout,
         errorCallback: () => {
-          delayed.destroy();
+          delayed == null ? void 0 : delayed.destroy();
+          delayed = null;
           (reject ?? noop)();
         },
         interval: time

package/dist/timer.iife.js

@@ -44,13 +44,13 @@ var Timer = (function (exports) {
   function getOptions(options, isRepeated) {
       return {
           afterCallback: options.afterCallback,
-          count: getValueOrDefault(options.count, isRepeated ? Number.POSITIVE_INFINITY : 1),
+          count: getNumberOrDefault(options.count, isRepeated ? Number.POSITIVE_INFINITY : 1),
           errorCallback: options.errorCallback,
-          interval: getValueOrDefault(options.interval, milliseconds, milliseconds),
-          timeout: getValueOrDefault(options.timeout, isRepeated ? Number.POSITIVE_INFINITY : 30_000),
+          interval: getNumberOrDefault(options.interval, milliseconds, milliseconds),
+          timeout: getNumberOrDefault(options.timeout, isRepeated ? Number.POSITIVE_INFINITY : 30_000),
       };
   }
-  function getValueOrDefault(value, defaultValue, minimum) {
+  function getNumberOrDefault(value, defaultValue, minimum) {
       return typeof value === 'number' && value > (minimum ?? 0)
           ? value
           : defaultValue;
@@ -81,8 +81,8 @@ var Timer = (function (exports) {
       }
       state.active = true;
       state.paused = false;
-      const elapsed = type === 'continue' ? +(state.elapsed ?? 0) : 0;
-      let index = type === 'continue' ? +(state.index ?? 0) : 0;
+      const elapsed = type === 'continue' ? Number(state.elapsed ?? 0) : 0;
+      let index = type === 'continue' ? Number(state.index ?? 0) : 0;
       state.elapsed = elapsed;
       state.index = index;
       const total = (count === Number.POSITIVE_INFINITY
@@ -387,13 +387,15 @@ var Timer = (function (exports) {
    */
   function delay(time, timeout) {
       return new Promise((resolve, reject) => {
-          const delayed = wait(() => {
-              delayed.destroy();
+          let delayed = wait(() => {
+              delayed?.destroy();
+              delayed = null;
               (resolve ?? noop)();
           }, {
               timeout,
               errorCallback: () => {
-                  delayed.destroy();
+                  delayed?.destroy();
+                  delayed = null;
                   (reject ?? noop)();
               },
               interval: time,

package/package.json

@@ -4,21 +4,22 @@
 		"url": "https://oscarpalmer.se"
 	},
 	"dependencies": {
-		"@oscarpalmer/atoms": "0.81.0"
+		"@oscarpalmer/atoms": "^0.82"
 	},
 	"description": "A better solution for timeout- and interval-based timers.",
 	"devDependencies": {
 		"@biomejs/biome": "^1.9",
 		"@rollup/plugin-node-resolve": "^16",
 		"@rollup/plugin-typescript": "^12.1",
-		"@types/node": "^22.10",
-		"@vitest/coverage-istanbul": "^2.1",
+		"@types/node": "^22.13",
+		"@vitest/coverage-istanbul": "^3",
 		"dts-bundle-generator": "^9.5",
-		"happy-dom": "^16.5",
+		"glob": "^11",
+		"happy-dom": "^16.8",
 		"tslib": "^2.8",
 		"typescript": "^5.7",
 		"vite": "^6",
-		"vitest": "^2.1"
+		"vitest": "^3"
 	},
 	"exports": {
 		".": {
@@ -48,10 +49,10 @@
 		"clean": "rm -rf ./dist && rm -rf ./types && rm -f ./tsconfig.tsbuildinfo",
 		"rollup": "npx rollup -c",
 		"test": "npx vitest --coverage",
-		"types": "npx tsc && npx dts-bundle-generator --config ./dts.config.ts",
+		"types": "npx tsc && npx dts-bundle-generator --config ./dts.config.cts",
 		"watch": "npx vite build --watch"
 	},
 	"type": "module",
 	"types": "types/index.d.cts",
-	"version": "0.27.0"
+	"version": "0.28.0"
 }

package/src/functions.ts

@@ -14,20 +14,20 @@ export function getOptions(
 ): TimerOptions {
 	return {
 		afterCallback: options.afterCallback,
-		count: getValueOrDefault(
+		count: getNumberOrDefault(
 			options.count,
 			isRepeated ? Number.POSITIVE_INFINITY : 1,
 		),
 		errorCallback: options.errorCallback,
-		interval: getValueOrDefault(options.interval, milliseconds, milliseconds),
-		timeout: getValueOrDefault(
+		interval: getNumberOrDefault(options.interval, milliseconds, milliseconds),
+		timeout: getNumberOrDefault(
 			options.timeout,
 			isRepeated ? Number.POSITIVE_INFINITY : 30_000,
 		),
 	};
 }
 
-export function getValueOrDefault(
+function getNumberOrDefault(
 	value: unknown,
 	defaultValue: number,
 	minimum?: number,
@@ -80,9 +80,9 @@ export function work(
 	state.active = true;
 	state.paused = false;
 
-	const elapsed = type === 'continue' ? +(state.elapsed ?? 0) : 0;
+	const elapsed = type === 'continue' ? Number(state.elapsed ?? 0) : 0;
 
-	let index = type === 'continue' ? +(state.index ?? 0) : 0;
+	let index = type === 'continue' ? Number(state.index ?? 0) : 0;
 
 	state.elapsed = elapsed;
 	state.index = index;

package/src/index.ts

@@ -1,23 +1,27 @@
 import {noop} from '@oscarpalmer/atoms/function';
 import {activeTimers, hiddenTimers} from './constants';
 import './global';
-import {wait} from './timer';
+import {type Timer, wait} from './timer';
 
 /**
  * Creates a delayed promise that resolves after a certain amount of time _(or rejects when timed out)_
  */
 export function delay(time: number, timeout?: number): Promise<void> {
 	return new Promise((resolve, reject) => {
-		const delayed = wait(
+		let delayed: Timer | null = wait(
 			() => {
-				delayed.destroy();
+				delayed?.destroy();
+
+				delayed = null;
 
 				(resolve ?? noop)();
 			},
 			{
 				timeout,
 				errorCallback: () => {
-					delayed.destroy();
+					delayed?.destroy();
+
+					delayed = null;
 
 					(reject ?? noop)();
 				},
@@ -45,4 +49,3 @@ document.addEventListener('visibilitychange', () => {
 export {isRepeated, isTimer, isWaited, isWhen} from './is';
 export {repeat, wait, type Timer} from './timer';
 export {when, type When} from './when';
-

package/types/functions.d.cts

@@ -108,7 +108,6 @@ export type TimerState = {
 };
 export type WorkType = "continue" | "pause" | "restart" | "start" | "stop";
 export declare function getOptions(options: Partial<TimerOptions>, isRepeated: boolean): TimerOptions;
-export declare function getValueOrDefault(value: unknown, defaultValue: number, minimum?: number): number;
 export declare function work(type: WorkType, timer: Timer, state: TimerState, options: TimerOptions): Timer;
 
 export {};

package/types/functions.d.ts

@@ -1,5 +1,4 @@
 import type { TimerOptions, TimerState, WorkType } from './models';
 import type { Timer } from './timer';
 export declare function getOptions(options: Partial<TimerOptions>, isRepeated: boolean): TimerOptions;
-export declare function getValueOrDefault(value: unknown, defaultValue: number, minimum?: number): number;
 export declare function work(type: WorkType, timer: Timer, state: TimerState, options: TimerOptions): Timer;