@oscarpalmer/timer 0.49.0 → 0.50.0

package/dist/index.mjs

@@ -194,7 +194,7 @@ var TimerTrace = class extends Error {
 //#endregion
 //#region src/timer.ts
 function Timer(name, state, options, start) {
-	Object.defineProperty(this, SYMBOL, { value: {
+	this[SYMBOL] = {
 		...state,
 		name,
 		options,
@@ -206,30 +206,27 @@ function Timer(name, state, options, start) {
 		paused: false,
 		timer: void 0,
 		total: 0
-	} });
+	};
 	if (start) startTimer.call(this);
 }
+Timer.prototype.continue = continueTimer;
+Timer.prototype.pause = pauseTimer;
+Timer.prototype.restart = restartTimer;
+Timer.prototype.start = startTimer;
+Timer.prototype.stop = stopTimer;
 Object.defineProperties(Timer.prototype, {
 	active: {
 		enumerable: true,
-		get() {
-			return isActiveTimer.call(this);
-		}
+		get: getTimerActive
 	},
-	continue: { value: continueTimer },
-	pause: { value: pauseTimer },
 	paused: {
 		enumerable: true,
-		get() {
-			return isPausedTimer.call(this);
-		}
+		get: getTimerPaused
 	},
-	restart: { value: restartTimer },
-	start: { value: startTimer },
-	stop: { value: stopTimer },
-	trace: { get() {
-		return getTimerTrace.call(this);
-	} }
+	trace: {
+		enumerable: true,
+		get: getTimerTrace
+	}
 });
 function continueTimer() {
 	return work(WORK_CONTINUE, this[SYMBOL]);
@@ -237,15 +234,15 @@ function continueTimer() {
 function createTimer(name, state, options, start) {
 	return new Timer(name, state, options, start);
 }
-function getTimerTrace() {
-	return globalThis._oscarpalmer_timer_debug ?? false ? this[SYMBOL].trace : void 0;
-}
-function isActiveTimer() {
+function getTimerActive() {
 	return this[SYMBOL].active && !this[SYMBOL].paused;
 }
-function isPausedTimer() {
+function getTimerPaused() {
 	return this[SYMBOL].paused;
 }
+function getTimerTrace() {
+	return globalThis._oscarpalmer_timer_debug ?? false ? this[SYMBOL].trace : void 0;
+}
 function pauseTimer() {
 	return work(WORK_PAUSE, this[SYMBOL]);
 }
@@ -310,7 +307,7 @@ function When(condition, options) {
 		started: false,
 		timer: void 0
 	};
-	Object.defineProperty(this, SYMBOL, { value: state });
+	this[SYMBOL] = state;
 	state.promise = new Promise((resolve, reject) => {
 		state.resolver = resolve;
 		state.rejecter = reject;
@@ -324,20 +321,14 @@ function When(condition, options) {
 		onError: () => state.rejecter?.()
 	}, false);
 }
+When.prototype.continue = continueWhen;
+When.prototype.pause = pauseWhen;
+When.prototype.start = startWhen;
+When.prototype.stop = stopWhen;
 Object.defineProperties(When.prototype, {
-	active: { get() {
-		return isActiveWhen.call(this);
-	} },
-	continue: { value: continueWhen },
-	pause: { value: pauseWhen },
-	paused: { get() {
-		return isPausedWhen.call(this);
-	} },
-	start: { value: startWhen },
-	stop: { value: stopWhen },
-	trace: { get() {
-		return getWhenTrace.call(this);
-	} }
+	active: { get: getWhenActive },
+	paused: { get: getWhenPaused },
+	trace: { get: getWhenTrace }
 });
 function continueWhen() {
 	return onWhen(WORK_CONTINUE, this, this[SYMBOL]);
@@ -350,15 +341,15 @@ function getWhenOptions(input) {
 		timeout: getValidTimeout(options?.timeout)
 	};
 }
-function getWhenTrace() {
-	return globalThis._oscarpalmer_timer_debug ?? false ? this[SYMBOL].timer?.trace : void 0;
-}
-function isActiveWhen() {
+function getWhenActive() {
 	return this[SYMBOL].timer.active;
 }
-function isPausedWhen() {
+function getWhenPaused() {
 	return this[SYMBOL].timer.paused;
 }
+function getWhenTrace() {
+	return globalThis._oscarpalmer_timer_debug ?? false ? this[SYMBOL].timer?.trace : void 0;
+}
 function onAfter(state) {
 	if (state.result) state.resolver?.();
 	else state.rejecter?.();

package/dist/timer.mjs

@@ -2,7 +2,7 @@ import { SYMBOL, WORK_CONTINUE, WORK_PAUSE, WORK_RESTART, WORK_START, WORK_STOP
 import { work } from "./work.mjs";
 //#region src/timer.ts
 function Timer(name, state, options, start) {
-	Object.defineProperty(this, SYMBOL, { value: {
+	this[SYMBOL] = {
 		...state,
 		name,
 		options,
@@ -14,30 +14,27 @@ function Timer(name, state, options, start) {
 		paused: false,
 		timer: void 0,
 		total: 0
-	} });
+	};
 	if (start) startTimer.call(this);
 }
+Timer.prototype.continue = continueTimer;
+Timer.prototype.pause = pauseTimer;
+Timer.prototype.restart = restartTimer;
+Timer.prototype.start = startTimer;
+Timer.prototype.stop = stopTimer;
 Object.defineProperties(Timer.prototype, {
 	active: {
 		enumerable: true,
-		get() {
-			return isActiveTimer.call(this);
-		}
+		get: getTimerActive
 	},
-	continue: { value: continueTimer },
-	pause: { value: pauseTimer },
 	paused: {
 		enumerable: true,
-		get() {
-			return isPausedTimer.call(this);
-		}
+		get: getTimerPaused
 	},
-	restart: { value: restartTimer },
-	start: { value: startTimer },
-	stop: { value: stopTimer },
-	trace: { get() {
-		return getTimerTrace.call(this);
-	} }
+	trace: {
+		enumerable: true,
+		get: getTimerTrace
+	}
 });
 function continueTimer() {
 	return work(WORK_CONTINUE, this[SYMBOL]);
@@ -45,15 +42,15 @@ function continueTimer() {
 function createTimer(name, state, options, start) {
 	return new Timer(name, state, options, start);
 }
-function getTimerTrace() {
-	return globalThis._oscarpalmer_timer_debug ?? false ? this[SYMBOL].trace : void 0;
-}
-function isActiveTimer() {
+function getTimerActive() {
 	return this[SYMBOL].active && !this[SYMBOL].paused;
 }
-function isPausedTimer() {
+function getTimerPaused() {
 	return this[SYMBOL].paused;
 }
+function getTimerTrace() {
+	return globalThis._oscarpalmer_timer_debug ?? false ? this[SYMBOL].trace : void 0;
+}
 function pauseTimer() {
 	return work(WORK_PAUSE, this[SYMBOL]);
 }

package/dist/when.mjs

@@ -12,7 +12,7 @@ function When(condition, options) {
 		started: false,
 		timer: void 0
 	};
-	Object.defineProperty(this, SYMBOL, { value: state });
+	this[SYMBOL] = state;
 	state.promise = new Promise((resolve, reject) => {
 		state.resolver = resolve;
 		state.rejecter = reject;
@@ -26,20 +26,14 @@ function When(condition, options) {
 		onError: () => state.rejecter?.()
 	}, false);
 }
+When.prototype.continue = continueWhen;
+When.prototype.pause = pauseWhen;
+When.prototype.start = startWhen;
+When.prototype.stop = stopWhen;
 Object.defineProperties(When.prototype, {
-	active: { get() {
-		return isActiveWhen.call(this);
-	} },
-	continue: { value: continueWhen },
-	pause: { value: pauseWhen },
-	paused: { get() {
-		return isPausedWhen.call(this);
-	} },
-	start: { value: startWhen },
-	stop: { value: stopWhen },
-	trace: { get() {
-		return getWhenTrace.call(this);
-	} }
+	active: { get: getWhenActive },
+	paused: { get: getWhenPaused },
+	trace: { get: getWhenTrace }
 });
 function continueWhen() {
 	return onWhen(WORK_CONTINUE, this, this[SYMBOL]);
@@ -52,15 +46,15 @@ function getWhenOptions(input) {
 		timeout: getValidTimeout(options?.timeout)
 	};
 }
-function getWhenTrace() {
-	return globalThis._oscarpalmer_timer_debug ?? false ? this[SYMBOL].timer?.trace : void 0;
-}
-function isActiveWhen() {
+function getWhenActive() {
 	return this[SYMBOL].timer.active;
 }
-function isPausedWhen() {
+function getWhenPaused() {
 	return this[SYMBOL].timer.paused;
 }
+function getWhenTrace() {
+	return globalThis._oscarpalmer_timer_debug ?? false ? this[SYMBOL].timer?.trace : void 0;
+}
 function onAfter(state) {
 	if (state.result) state.resolver?.();
 	else state.rejecter?.();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oscarpalmer/timer",
-	"version": "0.49.0",
+	"version": "0.50.0",
 	"description": "A better solution for timeout- and interval-based timers.",
 	"keywords": [
 		"requestAnimationFrame",
@@ -60,13 +60,13 @@
 		"watch": "npx vite build --watch"
 	},
 	"dependencies": {
-		"@oscarpalmer/atoms": "^0.203"
+		"@oscarpalmer/atoms": "^0.204"
 	},
 	"devDependencies": {
-		"@oxlint/plugins": "^1.82",
+		"@oxlint/plugins": "^1.83",
 		"@types/node": "^26.5",
 		"@vitest/coverage-istanbul": "^4.1",
-		"jsdom": "^30",
+		"jsdom": "^30.1",
 		"tsdown": "^0.23",
 		"typescript": "^6",
 		"vite": "npm:@voidzero-dev/vite-plus-core@latest",

package/src/timer.ts

@@ -19,59 +19,43 @@ function Timer(
 	options: TimerOptions,
 	start: boolean,
 ) {
-	Object.defineProperty(this, SYMBOL, {
-		value: {
-			...state,
-			name,
-			options,
-			active: false,
-			destroyed: false,
-			elapsed: 0,
-			frame: undefined,
-			index: 0,
-			paused: false,
-			timer: undefined as never,
-			total: 0,
-		},
-	});
+	this[SYMBOL] = {
+		...state,
+		name,
+		options,
+		active: false,
+		destroyed: false,
+		elapsed: 0,
+		frame: undefined,
+		index: 0,
+		paused: false,
+		timer: undefined as never,
+		total: 0,
+	};
 
 	if (start) {
 		startTimer.call(this);
 	}
 }
 
+Timer.prototype.continue = continueTimer;
+Timer.prototype.pause = pauseTimer;
+Timer.prototype.restart = restartTimer;
+Timer.prototype.start = startTimer;
+Timer.prototype.stop = stopTimer;
+
 Object.defineProperties(Timer.prototype, {
 	active: {
 		enumerable: true,
-		get() {
-			return isActiveTimer.call(this);
-		},
-	},
-	continue: {
-		value: continueTimer,
-	},
-	pause: {
-		value: pauseTimer,
+		get: getTimerActive,
 	},
 	paused: {
 		enumerable: true,
-		get() {
-			return isPausedTimer.call(this);
-		},
-	},
-	restart: {
-		value: restartTimer,
-	},
-	start: {
-		value: startTimer,
-	},
-	stop: {
-		value: stopTimer,
+		get: getTimerPaused,
 	},
 	trace: {
-		get() {
-			return getTimerTrace.call(this);
-		},
+		enumerable: true,
+		get: getTimerTrace,
 	},
 });
 
@@ -93,18 +77,18 @@ export function createTimer(
 	return new Timer(name, state, options, start);
 }
 
-function getTimerTrace(this: InternalTimer): string | undefined {
-	return (globalThis._oscarpalmer_timer_debug ?? false) ? this[SYMBOL].trace : undefined;
-}
-
-function isActiveTimer(this: InternalTimer): boolean {
+function getTimerActive(this: InternalTimer): boolean {
 	return this[SYMBOL].active && !this[SYMBOL].paused;
 }
 
-function isPausedTimer(this: InternalTimer): boolean {
+function getTimerPaused(this: InternalTimer): boolean {
 	return this[SYMBOL].paused;
 }
 
+function getTimerTrace(this: InternalTimer): string | undefined {
+	return (globalThis._oscarpalmer_timer_debug ?? false) ? this[SYMBOL].trace : undefined;
+}
+
 function pauseTimer(this: InternalTimer): Timer {
 	return work(WORK_PAUSE, this[SYMBOL]);
 }

package/src/when.ts

@@ -36,9 +36,7 @@ function When(this: any, condition: () => boolean, options: WhenOptions) {
 		timer: undefined as never,
 	};
 
-	Object.defineProperty(this, SYMBOL, {
-		value: state,
-	});
+	this[SYMBOL] = state;
 
 	state.promise = new Promise<void>((resolve, reject) => {
 		state.resolver = resolve;
@@ -60,33 +58,20 @@ function When(this: any, condition: () => boolean, options: WhenOptions) {
 	);
 }
 
+When.prototype.continue = continueWhen;
+When.prototype.pause = pauseWhen;
+When.prototype.start = startWhen;
+When.prototype.stop = stopWhen;
+
 Object.defineProperties(When.prototype, {
 	active: {
-		get() {
-			return isActiveWhen.call(this);
-		},
-	},
-	continue: {
-		value: continueWhen,
-	},
-	pause: {
-		value: pauseWhen,
+		get: getWhenActive,
 	},
 	paused: {
-		get() {
-			return isPausedWhen.call(this);
-		},
-	},
-	start: {
-		value: startWhen,
-	},
-	stop: {
-		value: stopWhen,
+		get: getWhenPaused,
 	},
 	trace: {
-		get() {
-			return getWhenTrace.call(this);
-		},
+		get: getWhenTrace,
 	},
 });
 
@@ -109,18 +94,18 @@ function getWhenOptions(input: unknown): WhenOptions {
 	};
 }
 
-function getWhenTrace(this: InternalWhen): string | undefined {
-	return (globalThis._oscarpalmer_timer_debug ?? false) ? this[SYMBOL].timer?.trace : undefined;
-}
-
-function isActiveWhen(this: InternalWhen): boolean {
+function getWhenActive(this: InternalWhen): boolean {
 	return this[SYMBOL].timer.active;
 }
 
-function isPausedWhen(this: InternalWhen): boolean {
+function getWhenPaused(this: InternalWhen): boolean {
 	return this[SYMBOL].timer.paused;
 }
 
+function getWhenTrace(this: InternalWhen): string | undefined {
+	return (globalThis._oscarpalmer_timer_debug ?? false) ? this[SYMBOL].timer?.trace : undefined;
+}
+
 function onAfter(state: WhenState): void {
 	if (state.result) {
 		state.resolver?.();