@oscarpalmer/atoms 0.47.0 → 0.48.0

package/dist/js/index.js

@@ -859,9 +859,9 @@ function isWhen(value) {
   return is3(value, /^when$/) && typeof value.then === "function";
 }
 function repeat(callback, options) {
-  return timer("repeat", callback, options ?? {}).start();
+  return timer("repeat", callback, options ?? {}, true);
 }
-var timer = function(type, callback, partial) {
+var timer = function(type, callback, partial, start) {
   const isRepeated2 = type === "repeat";
   const options = {
     afterCallback: partial.afterCallback,
@@ -872,7 +872,8 @@ var timer = function(type, callback, partial) {
   };
   const state = {
     callback,
-    active: false
+    active: false,
+    minimum: options.interval - options.interval % milliseconds / 2
   };
   const instance = Object.create({
     continue() {
@@ -903,17 +904,20 @@ var timer = function(type, callback, partial) {
       }
     }
   });
+  if (start) {
+    instance.start();
+  }
   return instance;
 };
 function wait(callback, options) {
   return timer("wait", callback, options == null || typeof options === "number" ? {
     interval: options
-  } : options).start();
+  } : options, true);
 }
 function when(condition, options) {
   let rejecter;
   let resolver;
-  const repeated = repeat(() => {
+  const repeated = timer("repeat", () => {
     if (condition()) {
       repeated.stop();
       resolver?.();
@@ -925,7 +929,7 @@ function when(condition, options) {
     count: options?.count,
     interval: options?.interval,
     timeout: options?.timeout
-  });
+  }, false);
   const promise = new Promise((resolve, reject) => {
     resolver = resolve;
     rejecter = reject;
@@ -967,6 +971,7 @@ var work2 = function(type, timer2, state, options, isRepeated2) {
     return timer2;
   }
   const { count, interval, timeout } = options;
+  const { minimum } = state;
   if (["pause", "stop"].includes(type)) {
     activeTimers.delete(timer2);
     cancelAnimationFrame(state.frame);
@@ -985,7 +990,7 @@ var work2 = function(type, timer2, state, options, isRepeated2) {
   let index = type === "continue" ? +(state.index ?? 0) : 0;
   state.elapsed = elapsed;
   state.index = index;
-  const total = (count === Number.POSITIVE_INFINITY ? timeout : (count - index) * (interval > 0 ? interval : 62.5)) - elapsed;
+  const total = (count === Number.POSITIVE_INFINITY ? Number.POSITIVE_INFINITY : (count - index) * (interval > 0 ? interval : milliseconds)) - elapsed;
   let current;
   let start;
   function finish(finished, error) {
@@ -1008,7 +1013,7 @@ var work2 = function(type, timer2, state, options, isRepeated2) {
     const time2 = timestamp - current;
     state.elapsed = elapsed + (current - start);
     const finished = time2 - elapsed >= total;
-    if (finished || time2 - 2 < interval && interval < time2 + 2) {
+    if (finished || time2 >= minimum) {
       if (state.active) {
         state.callback(isRepeated2 ? index : undefined);
       }
@@ -1034,6 +1039,7 @@ var work2 = function(type, timer2, state, options, isRepeated2) {
 };
 var activeTimers = new Set;
 var hiddenTimers = new Set;
+var milliseconds = 16.666666666666668;
 document.addEventListener("visibilitychange", () => {
   if (document.hidden) {
     for (const timer2 of activeTimers) {

package/dist/js/timer.js

@@ -18,9 +18,9 @@ function isWhen(value) {
   return is(value, /^when$/) && typeof value.then === "function";
 }
 function repeat(callback, options) {
-  return timer("repeat", callback, options ?? {}).start();
+  return timer("repeat", callback, options ?? {}, true);
 }
-var timer = function(type, callback, partial) {
+var timer = function(type, callback, partial, start) {
   const isRepeated2 = type === "repeat";
   const options = {
     afterCallback: partial.afterCallback,
@@ -31,7 +31,8 @@ var timer = function(type, callback, partial) {
   };
   const state = {
     callback,
-    active: false
+    active: false,
+    minimum: options.interval - options.interval % milliseconds / 2
   };
   const instance = Object.create({
     continue() {
@@ -62,17 +63,20 @@ var timer = function(type, callback, partial) {
       }
     }
   });
+  if (start) {
+    instance.start();
+  }
   return instance;
 };
 function wait(callback, options) {
   return timer("wait", callback, options == null || typeof options === "number" ? {
     interval: options
-  } : options).start();
+  } : options, true);
 }
 function when(condition, options) {
   let rejecter;
   let resolver;
-  const repeated = repeat(() => {
+  const repeated = timer("repeat", () => {
     if (condition()) {
       repeated.stop();
       resolver?.();
@@ -84,7 +88,7 @@ function when(condition, options) {
     count: options?.count,
     interval: options?.interval,
     timeout: options?.timeout
-  });
+  }, false);
   const promise = new Promise((resolve, reject) => {
     resolver = resolve;
     rejecter = reject;
@@ -126,6 +130,7 @@ var work = function(type, timer2, state, options, isRepeated2) {
     return timer2;
   }
   const { count, interval, timeout } = options;
+  const { minimum } = state;
   if (["pause", "stop"].includes(type)) {
     activeTimers.delete(timer2);
     cancelAnimationFrame(state.frame);
@@ -144,7 +149,7 @@ var work = function(type, timer2, state, options, isRepeated2) {
   let index = type === "continue" ? +(state.index ?? 0) : 0;
   state.elapsed = elapsed;
   state.index = index;
-  const total = (count === Number.POSITIVE_INFINITY ? timeout : (count - index) * (interval > 0 ? interval : 62.5)) - elapsed;
+  const total = (count === Number.POSITIVE_INFINITY ? Number.POSITIVE_INFINITY : (count - index) * (interval > 0 ? interval : milliseconds)) - elapsed;
   let current;
   let start;
   function finish(finished, error) {
@@ -167,7 +172,7 @@ var work = function(type, timer2, state, options, isRepeated2) {
     const time = timestamp - current;
     state.elapsed = elapsed + (current - start);
     const finished = time - elapsed >= total;
-    if (finished || time - 2 < interval && interval < time + 2) {
+    if (finished || time >= minimum) {
       if (state.active) {
         state.callback(isRepeated2 ? index : undefined);
       }
@@ -193,6 +198,7 @@ var work = function(type, timer2, state, options, isRepeated2) {
 };
 var activeTimers = new Set;
 var hiddenTimers = new Set;
+var milliseconds = 16.666666666666668;
 document.addEventListener("visibilitychange", () => {
   if (document.hidden) {
     for (const timer2 of activeTimers) {

package/dist/js/timer.mjs

@@ -18,9 +18,9 @@ function isWhen(value) {
   return is(value, /^when$/) && typeof value.then === "function";
 }
 function repeat(callback, options) {
-  return timer("repeat", callback, options ?? {}).start();
+  return timer("repeat", callback, options ?? {}, true);
 }
-var timer = function(type, callback, partial) {
+var timer = function(type, callback, partial, start) {
   const isRepeated2 = type === "repeat";
   const options = {
     afterCallback: partial.afterCallback,
@@ -31,7 +31,8 @@ var timer = function(type, callback, partial) {
   };
   const state = {
     callback,
-    active: false
+    active: false,
+    minimum: options.interval - options.interval % milliseconds / 2
   };
   const instance = Object.create({
     continue() {
@@ -62,17 +63,20 @@ var timer = function(type, callback, partial) {
       }
     }
   });
+  if (start) {
+    instance.start();
+  }
   return instance;
 };
 function wait(callback, options) {
   return timer("wait", callback, options == null || typeof options === "number" ? {
     interval: options
-  } : options).start();
+  } : options, true);
 }
 function when(condition, options) {
   let rejecter;
   let resolver;
-  const repeated = repeat(() => {
+  const repeated = timer("repeat", () => {
     if (condition()) {
       repeated.stop();
       resolver?.();
@@ -84,7 +88,7 @@ function when(condition, options) {
     count: options?.count,
     interval: options?.interval,
     timeout: options?.timeout
-  });
+  }, false);
   const promise = new Promise((resolve, reject) => {
     resolver = resolve;
     rejecter = reject;
@@ -126,6 +130,7 @@ var work = function(type, timer2, state, options, isRepeated2) {
     return timer2;
   }
   const { count, interval, timeout } = options;
+  const { minimum } = state;
   if (["pause", "stop"].includes(type)) {
     activeTimers.delete(timer2);
     cancelAnimationFrame(state.frame);
@@ -144,7 +149,7 @@ var work = function(type, timer2, state, options, isRepeated2) {
   let index = type === "continue" ? +(state.index ?? 0) : 0;
   state.elapsed = elapsed;
   state.index = index;
-  const total = (count === Number.POSITIVE_INFINITY ? timeout : (count - index) * (interval > 0 ? interval : 62.5)) - elapsed;
+  const total = (count === Number.POSITIVE_INFINITY ? Number.POSITIVE_INFINITY : (count - index) * (interval > 0 ? interval : milliseconds)) - elapsed;
   let current;
   let start;
   function finish(finished, error) {
@@ -167,7 +172,7 @@ var work = function(type, timer2, state, options, isRepeated2) {
     const time = timestamp - current;
     state.elapsed = elapsed + (current - start);
     const finished = time - elapsed >= total;
-    if (finished || time - 2 < interval && interval < time + 2) {
+    if (finished || time >= minimum) {
       if (state.active) {
         state.callback(isRepeated2 ? index : undefined);
       }
@@ -193,6 +198,7 @@ var work = function(type, timer2, state, options, isRepeated2) {
 };
 var activeTimers = new Set;
 var hiddenTimers = new Set;
+var milliseconds = 16.666666666666668;
 document.addEventListener("visibilitychange", () => {
   if (document.hidden) {
     for (const timer2 of activeTimers) {

package/package.json

@@ -127,5 +127,5 @@
 	},
 	"type": "module",
 	"types": "./types/index.d.ts",
-	"version": "0.47.0"
+	"version": "0.48.0"
 }

package/src/js/timer.ts

@@ -61,6 +61,7 @@ type State = {
 	elapsed?: number;
 	frame?: number;
 	index?: number;
+	minimum: number;
 };
 
 /**
@@ -119,9 +120,21 @@ type WhenOptions = {} & OptionsWithCount;
 
 type WorkType = 'continue' | 'pause' | 'restart' | 'start' | 'stop';
 
+/**
+ * A set of all active timers
+ */
 const activeTimers = new Set<Timer>();
+
+/**
+ * A set of timers that were paused due to the document being hidden
+ */
 const hiddenTimers = new Set<Timer>();
 
+/**
+ * Milliseconds in a frame, probably ;-)
+ */
+const milliseconds = 1_000 / 60;
+
 function getValueOrDefault(value: unknown, defaultValue: number): number {
 	return typeof value === 'number' && value > 0 ? value : defaultValue;
 }
@@ -171,13 +184,14 @@ export function repeat(
 	callback: IndexedCallback,
 	options?: Partial<RepeatOptions>,
 ): Timer {
-	return timer('repeat', callback, options ?? {}).start();
+	return timer('repeat', callback, options ?? {}, true);
 }
 
 function timer(
 	type: 'repeat' | 'wait',
 	callback: AnyCallback,
 	partial: Partial<TimerOptions>,
+	start: boolean,
 ): Timer {
 	const isRepeated = type === 'repeat';
 
@@ -198,6 +212,7 @@ function timer(
 	const state: State = {
 		callback,
 		active: false,
+		minimum: options.interval - (options.interval % milliseconds) / 2,
 	};
 
 	const instance = Object.create({
@@ -231,6 +246,10 @@ function timer(
 		},
 	});
 
+	if (start) {
+		instance.start();
+	}
+
 	return instance;
 }
 
@@ -266,7 +285,8 @@ export function wait(
 					interval: options,
 				}
 			: options,
-	).start();
+		true,
+	);
 }
 
 /**
@@ -280,7 +300,8 @@ export function when(
 	let rejecter: () => void;
 	let resolver: () => void;
 
-	const repeated = repeat(
+	const repeated = timer(
+		'repeat',
 		() => {
 			if (condition()) {
 				repeated.stop();
@@ -296,6 +317,7 @@ export function when(
 			interval: options?.interval,
 			timeout: options?.timeout,
 		},
+		false,
 	);
 
 	const promise = new Promise<void>((resolve, reject) => {
@@ -356,6 +378,7 @@ function work(
 	}
 
 	const {count, interval, timeout} = options;
+	const {minimum} = state;
 
 	if (['pause', 'stop'].includes(type)) {
 		activeTimers.delete(timer);
@@ -387,8 +410,8 @@ function work(
 
 	const total =
 		(count === Number.POSITIVE_INFINITY
-			? timeout
-			: (count - index) * (interval > 0 ? interval : 1000 / 16)) - elapsed;
+			? Number.POSITIVE_INFINITY
+			: (count - index) * (interval > 0 ? interval : milliseconds)) - elapsed;
 
 	let current: DOMHighResTimeStamp | null;
 	let start: DOMHighResTimeStamp | null;
@@ -422,7 +445,7 @@ function work(
 
 		const finished = time - elapsed >= total;
 
-		if (finished || (time - 2 < interval && interval < time + 2)) {
+		if (finished || time >= minimum) {
 			if (state.active) {
 				state.callback((isRepeated ? index : undefined) as never);
 			}