@oscarpalmer/atoms 0.44.0 → 0.45.0

package/dist/js/index.js

@@ -840,6 +840,9 @@ function getRandomHex() {
   return "0123456789ABCDEF"[getRandomInteger(0, 16)];
 }
 // src/js/timer.ts
+var getValueOrDefault = function(value, defaultValue) {
+  return typeof value === "number" && value > 0 ? value : defaultValue;
+};
 var is3 = function(value, pattern) {
   return pattern.test(value?.$timer);
 };
@@ -856,20 +859,16 @@ function isWhen(value) {
   return is3(value, /^when$/) && typeof value.then === "function";
 }
 function repeat(callback, options) {
-  return timer("repeat", callback, {
-    ...options ?? {},
-    ...{
-      count: typeof options?.count === "number" ? options.count > 0 ? options.count : 1 : Number.POSITIVE_INFINITY
-    }
-  }).start();
-}
-var timer = function(type, callback, options) {
-  const extended = {
-    afterCallback: options.afterCallback,
-    count: typeof options.count === "number" && options.count > 0 ? options.count : 1,
-    errorCallback: options.errorCallback,
-    interval: typeof options.interval === "number" && options.interval >= 0 ? options.interval : 0,
-    timeout: typeof options.timeout === "number" && options.timeout > 0 ? options.timeout : 30000
+  return timer("repeat", callback, options ?? {}).start();
+}
+var timer = function(type, callback, partial) {
+  const isRepeated2 = type === "repeat";
+  const options = {
+    afterCallback: partial.afterCallback,
+    count: getValueOrDefault(partial.count, isRepeated2 ? Number.POSITIVE_INFINITY : 1),
+    errorCallback: partial.errorCallback,
+    interval: getValueOrDefault(partial.interval, 0),
+    timeout: getValueOrDefault(partial.timeout, isRepeated2 ? Number.POSITIVE_INFINITY : 30000)
   };
   const state = {
     callback,
@@ -877,13 +876,13 @@ var timer = function(type, callback, options) {
   };
   const instance = Object.create({
     restart() {
-      return work2("restart", this, state, extended);
+      return work2("restart", this, state, options, isRepeated2);
     },
     start() {
-      return work2("start", this, state, extended);
+      return work2("start", this, state, options, isRepeated2);
     },
     stop() {
-      return work2("stop", this, state, extended);
+      return work2("stop", this, state, options, isRepeated2);
     }
   });
   Object.defineProperties(instance, {
@@ -901,12 +900,9 @@ var timer = function(type, callback, options) {
   return instance;
 };
 function wait(callback, options) {
-  const optionsIsNumber = typeof options === "number";
-  return timer("wait", callback, {
-    count: 1,
-    errorCallback: optionsIsNumber ? undefined : options?.errorCallback,
-    interval: optionsIsNumber ? options : options?.interval ?? 0
-  }).start();
+  return timer("wait", callback, options == null || typeof options === "number" ? {
+    interval: options
+  } : options).start();
 }
 function when(condition, options) {
   let rejecter;
@@ -954,7 +950,7 @@ function when(condition, options) {
   });
   return instance;
 }
-var work2 = function(type, timer2, state, options) {
+var work2 = function(type, timer2, state, options, isRepeated2) {
   if (type === "start" && state.active || type === "stop" && !state.active) {
     return timer2;
   }
@@ -969,7 +965,7 @@ var work2 = function(type, timer2, state, options) {
     return timer2;
   }
   state.active = true;
-  const isRepeated2 = count > 0;
+  const canTimeout = timeout > 0 && timeout < Number.POSITIVE_INFINITY;
   const total = count === Number.POSITIVE_INFINITY ? timeout : count * (interval > 0 ? interval : 17);
   let current;
   let start;
@@ -996,7 +992,7 @@ var work2 = function(type, timer2, state, options) {
       }
       index += 1;
       switch (true) {
-        case (!finished && timestamp - start >= timeout):
+        case (canTimeout && !finished && timestamp - start >= timeout):
           finish(false, true);
           return;
         case (!finished && index < count):

package/dist/js/timer.js

@@ -1,4 +1,7 @@
 // src/js/timer.ts
+var getValueOrDefault = function(value, defaultValue) {
+  return typeof value === "number" && value > 0 ? value : defaultValue;
+};
 var is = function(value, pattern) {
   return pattern.test(value?.$timer);
 };
@@ -15,20 +18,16 @@ function isWhen(value) {
   return is(value, /^when$/) && typeof value.then === "function";
 }
 function repeat(callback, options) {
-  return timer("repeat", callback, {
-    ...options ?? {},
-    ...{
-      count: typeof options?.count === "number" ? options.count > 0 ? options.count : 1 : Number.POSITIVE_INFINITY
-    }
-  }).start();
+  return timer("repeat", callback, options ?? {}).start();
 }
-var timer = function(type, callback, options) {
-  const extended = {
-    afterCallback: options.afterCallback,
-    count: typeof options.count === "number" && options.count > 0 ? options.count : 1,
-    errorCallback: options.errorCallback,
-    interval: typeof options.interval === "number" && options.interval >= 0 ? options.interval : 0,
-    timeout: typeof options.timeout === "number" && options.timeout > 0 ? options.timeout : 30000
+var timer = function(type, callback, partial) {
+  const isRepeated2 = type === "repeat";
+  const options = {
+    afterCallback: partial.afterCallback,
+    count: getValueOrDefault(partial.count, isRepeated2 ? Number.POSITIVE_INFINITY : 1),
+    errorCallback: partial.errorCallback,
+    interval: getValueOrDefault(partial.interval, 0),
+    timeout: getValueOrDefault(partial.timeout, isRepeated2 ? Number.POSITIVE_INFINITY : 30000)
   };
   const state = {
     callback,
@@ -36,13 +35,13 @@ var timer = function(type, callback, options) {
   };
   const instance = Object.create({
     restart() {
-      return work("restart", this, state, extended);
+      return work("restart", this, state, options, isRepeated2);
     },
     start() {
-      return work("start", this, state, extended);
+      return work("start", this, state, options, isRepeated2);
     },
     stop() {
-      return work("stop", this, state, extended);
+      return work("stop", this, state, options, isRepeated2);
     }
   });
   Object.defineProperties(instance, {
@@ -60,12 +59,9 @@ var timer = function(type, callback, options) {
   return instance;
 };
 function wait(callback, options) {
-  const optionsIsNumber = typeof options === "number";
-  return timer("wait", callback, {
-    count: 1,
-    errorCallback: optionsIsNumber ? undefined : options?.errorCallback,
-    interval: optionsIsNumber ? options : options?.interval ?? 0
-  }).start();
+  return timer("wait", callback, options == null || typeof options === "number" ? {
+    interval: options
+  } : options).start();
 }
 function when(condition, options) {
   let rejecter;
@@ -113,7 +109,7 @@ function when(condition, options) {
   });
   return instance;
 }
-var work = function(type, timer2, state, options) {
+var work = function(type, timer2, state, options, isRepeated2) {
   if (type === "start" && state.active || type === "stop" && !state.active) {
     return timer2;
   }
@@ -128,7 +124,7 @@ var work = function(type, timer2, state, options) {
     return timer2;
   }
   state.active = true;
-  const isRepeated2 = count > 0;
+  const canTimeout = timeout > 0 && timeout < Number.POSITIVE_INFINITY;
   const total = count === Number.POSITIVE_INFINITY ? timeout : count * (interval > 0 ? interval : 17);
   let current;
   let start;
@@ -155,7 +151,7 @@ var work = function(type, timer2, state, options) {
       }
       index += 1;
       switch (true) {
-        case (!finished && timestamp - start >= timeout):
+        case (canTimeout && !finished && timestamp - start >= timeout):
           finish(false, true);
           return;
         case (!finished && index < count):

package/dist/js/timer.mjs

@@ -1,4 +1,7 @@
 // src/js/timer.ts
+var getValueOrDefault = function(value, defaultValue) {
+  return typeof value === "number" && value > 0 ? value : defaultValue;
+};
 var is = function(value, pattern) {
   return pattern.test(value?.$timer);
 };
@@ -15,20 +18,16 @@ function isWhen(value) {
   return is(value, /^when$/) && typeof value.then === "function";
 }
 function repeat(callback, options) {
-  return timer("repeat", callback, {
-    ...options ?? {},
-    ...{
-      count: typeof options?.count === "number" ? options.count > 0 ? options.count : 1 : Number.POSITIVE_INFINITY
-    }
-  }).start();
+  return timer("repeat", callback, options ?? {}).start();
 }
-var timer = function(type, callback, options) {
-  const extended = {
-    afterCallback: options.afterCallback,
-    count: typeof options.count === "number" && options.count > 0 ? options.count : 1,
-    errorCallback: options.errorCallback,
-    interval: typeof options.interval === "number" && options.interval >= 0 ? options.interval : 0,
-    timeout: typeof options.timeout === "number" && options.timeout > 0 ? options.timeout : 30000
+var timer = function(type, callback, partial) {
+  const isRepeated2 = type === "repeat";
+  const options = {
+    afterCallback: partial.afterCallback,
+    count: getValueOrDefault(partial.count, isRepeated2 ? Number.POSITIVE_INFINITY : 1),
+    errorCallback: partial.errorCallback,
+    interval: getValueOrDefault(partial.interval, 0),
+    timeout: getValueOrDefault(partial.timeout, isRepeated2 ? Number.POSITIVE_INFINITY : 30000)
   };
   const state = {
     callback,
@@ -36,13 +35,13 @@ var timer = function(type, callback, options) {
   };
   const instance = Object.create({
     restart() {
-      return work("restart", this, state, extended);
+      return work("restart", this, state, options, isRepeated2);
     },
     start() {
-      return work("start", this, state, extended);
+      return work("start", this, state, options, isRepeated2);
     },
     stop() {
-      return work("stop", this, state, extended);
+      return work("stop", this, state, options, isRepeated2);
     }
   });
   Object.defineProperties(instance, {
@@ -60,12 +59,9 @@ var timer = function(type, callback, options) {
   return instance;
 };
 function wait(callback, options) {
-  const optionsIsNumber = typeof options === "number";
-  return timer("wait", callback, {
-    count: 1,
-    errorCallback: optionsIsNumber ? undefined : options?.errorCallback,
-    interval: optionsIsNumber ? options : options?.interval ?? 0
-  }).start();
+  return timer("wait", callback, options == null || typeof options === "number" ? {
+    interval: options
+  } : options).start();
 }
 function when(condition, options) {
   let rejecter;
@@ -113,7 +109,7 @@ function when(condition, options) {
   });
   return instance;
 }
-var work = function(type, timer2, state, options) {
+var work = function(type, timer2, state, options, isRepeated2) {
   if (type === "start" && state.active || type === "stop" && !state.active) {
     return timer2;
   }
@@ -128,7 +124,7 @@ var work = function(type, timer2, state, options) {
     return timer2;
   }
   state.active = true;
-  const isRepeated2 = count > 0;
+  const canTimeout = timeout > 0 && timeout < Number.POSITIVE_INFINITY;
   const total = count === Number.POSITIVE_INFINITY ? timeout : count * (interval > 0 ? interval : 17);
   let current;
   let start;
@@ -155,7 +151,7 @@ var work = function(type, timer2, state, options) {
       }
       index += 1;
       switch (true) {
-        case (!finished && timestamp - start >= timeout):
+        case (canTimeout && !finished && timestamp - start >= timeout):
           finish(false, true);
           return;
         case (!finished && index < count):

package/package.json

@@ -120,9 +120,10 @@
 		"url": "git+https://github.com/oscarpalmer/atoms.git"
 	},
 	"scripts": {
-		"build": "bun run build:css && bun run build:js && bun run types",
+		"build": "bun run clean && bun run build:css && bun run build:js && bun run types",
 		"build:css": "bunx sass ./src/css:./dist/css --no-source-map",
 		"build:js": "bunx bun ./.bun.ts && bunx bun ./.bun.ts --mjs",
+		"clean": "rm -rf ./dist && rm -rf ./types && rm ./tsconfig.tsbuildinfo",
 		"test": "bun test",
 		"types": "bunx tsc -p ./tsconfig.json",
 		"watch:css": "bunx sass ./src/css:./dist/css --no-source-map --watch",
@@ -130,5 +131,5 @@
 	},
 	"type": "module",
 	"types": "./types/index.d.ts",
-	"version": "0.44.0"
+	"version": "0.45.0"
 }

package/src/js/timer.ts

@@ -80,27 +80,31 @@ type TimerOptions = {} & RepeatOptions;
 type WaitOptions = {} & BaseOptions & OptionsWithError;
 
 export type When = {
-		/**
-		 * Is the timer running?
-		 */
-		get active(): boolean;
-		/**
-		 * Stops the timer
-		 */
-		stop(): void;
-		/**
-		 * Starts the timer and returns a promise that resolves when the condition is met
-		 */
-		then(
-			resolve?: (() => void) | null,
-			reject?: (() => void) | null,
-		): Promise<void>;
-	};
+	/**
+	 * Is the timer running?
+	 */
+	get active(): boolean;
+	/**
+	 * Stops the timer
+	 */
+	stop(): void;
+	/**
+	 * Starts the timer and returns a promise that resolves when the condition is met
+	 */
+	then(
+		resolve?: (() => void) | null,
+		reject?: (() => void) | null,
+	): Promise<void>;
+};
 
 type WhenOptions = {} & OptionsWithCount;
 
 type WorkType = 'restart' | 'start' | 'stop';
 
+function getValueOrDefault(value: unknown, defaultValue: number): number {
+	return typeof value === 'number' && value > 0 ? value : defaultValue;
+}
+
 function is(value: unknown, pattern: RegExp) {
 	return pattern.test((value as PlainObject)?.$timer as string);
 }
@@ -138,47 +142,36 @@ export function isWhen(value: unknown): value is When {
  * - calls a callback after a certain amount of time...
  * - ... and repeats it a certain amount of times
  * ---
- * - `options.count` defaults to `Infinity` _(minimum `1`)_
+ * - `options.count` defaults to `Infinity`
  * - `options.interval` defaults to `0`
- * - `options.timeout` defaults to `30_000` _(30 seconds)_
+ * - `options.timeout` defaults to `Infinity`
  */
 export function repeat(
 	callback: IndexedCallback,
 	options?: Partial<RepeatOptions>,
 ): Timer {
-	return timer('repeat', callback, {
-		...(options ?? {}),
-		...{
-			count:
-				typeof options?.count === 'number'
-					? options.count > 0
-						? options.count
-						: 1
-					: Number.POSITIVE_INFINITY,
-		},
-	}).start();
+	return timer('repeat', callback, options ?? {}).start();
 }
 
 function timer(
 	type: 'repeat' | 'wait',
 	callback: AnyCallback,
-	options: Partial<TimerOptions>,
+	partial: Partial<TimerOptions>,
 ): Timer {
-	const extended: TimerOptions = {
-		afterCallback: options.afterCallback,
-		count:
-			typeof options.count === 'number' && options.count > 0
-				? options.count
-				: 1,
-		errorCallback: options.errorCallback,
-		interval:
-			typeof options.interval === 'number' && options.interval >= 0
-				? options.interval
-				: 0,
-		timeout:
-			typeof options.timeout === 'number' && options.timeout > 0
-				? options.timeout
-				: 30_000,
+	const isRepeated = type === 'repeat';
+
+	const options: TimerOptions = {
+		afterCallback: partial.afterCallback,
+		count: getValueOrDefault(
+			partial.count,
+			isRepeated ? Number.POSITIVE_INFINITY : 1,
+		),
+		errorCallback: partial.errorCallback,
+		interval: getValueOrDefault(partial.interval, 0),
+		timeout: getValueOrDefault(
+			partial.timeout,
+			isRepeated ? Number.POSITIVE_INFINITY : 30_000,
+		),
 	};
 
 	const state: State = {
@@ -188,13 +181,13 @@ function timer(
 
 	const instance = Object.create({
 		restart() {
-			return work('restart', this as Timer, state, extended);
+			return work('restart', this as Timer, state, options, isRepeated);
 		},
 		start() {
-			return work('start', this as Timer, state, extended);
+			return work('start', this as Timer, state, options, isRepeated);
 		},
 		stop() {
-			return work('stop', this as Timer, state, extended);
+			return work('stop', this as Timer, state, options, isRepeated);
 		},
 	});
 
@@ -238,13 +231,15 @@ export function wait(
 	callback: () => void,
 	options?: number | Partial<WaitOptions>,
 ): Timer {
-	const optionsIsNumber = typeof options === 'number';
-
-	return timer('wait', callback, {
-		count: 1,
-		errorCallback: optionsIsNumber ? undefined : options?.errorCallback,
-		interval: optionsIsNumber ? options : options?.interval ?? 0,
-	}).start();
+	return timer(
+		'wait',
+		callback,
+		options == null || typeof options === 'number'
+			? {
+					interval: options,
+				}
+			: options,
+	).start();
 }
 
 /**
@@ -318,6 +313,7 @@ function work(
 	timer: Timer,
 	state: State,
 	options: RepeatOptions,
+	isRepeated: boolean,
 ): Timer {
 	if (
 		(type === 'start' && state.active) ||
@@ -343,7 +339,7 @@ function work(
 
 	state.active = true;
 
-	const isRepeated = count > 0;
+	const canTimeout = timeout > 0 && timeout < Number.POSITIVE_INFINITY;
 
 	const total =
 		count === Number.POSITIVE_INFINITY
@@ -385,7 +381,7 @@ function work(
 			index += 1;
 
 			switch (true) {
-				case !finished && timestamp - start >= timeout:
+				case canTimeout && !finished && timestamp - start >= timeout:
 					finish(false, true);
 					return;
 

package/types/timer.d.ts

@@ -94,9 +94,9 @@ export declare function isWhen(value: unknown): value is When;
  * - calls a callback after a certain amount of time...
  * - ... and repeats it a certain amount of times
  * ---
- * - `options.count` defaults to `Infinity` _(minimum `1`)_
+ * - `options.count` defaults to `Infinity`
  * - `options.interval` defaults to `0`
- * - `options.timeout` defaults to `30_000` _(30 seconds)_
+ * - `options.timeout` defaults to `Infinity`
  */
 export declare function repeat(callback: IndexedCallback, options?: Partial<RepeatOptions>): Timer;
 /**