@oscarpalmer/timer 0.14.0 → 0.16.0

package/dist/timer.cjs

@@ -2,7 +2,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,10 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 
 // src/index.js
 var src_exports = {};
@@ -68,6 +63,12 @@ function run(timed) {
   timed.state.frame = request(step);
 }
 var Timed = class {
+  get active() {
+    return this.state.active;
+  }
+  get finished() {
+    return !this.active && this.state.finished;
+  }
   /**
    * @param {RepeatedCallback} callback
    * @param {number} time
@@ -75,34 +76,25 @@ var Timed = class {
    * @param {AfterCallback|undefined} afterCallback
    */
   constructor(callback, time, count, afterCallback) {
-    /**
-     * @readonly
-     * @type {{after: AfterCallback | undefined; default: RepeatedCallback}}
-     */
-    __publicField(this, "callbacks");
-    /**
-     * @readonly
-     * @type {{count: number; time: number}}
-     */
-    __publicField(this, "configuration");
-    /**
-     * @readonly
-     * @type {{active: boolean; finished: boolean; frame?: DOMHighResTimeStamp}}
-     */
-    __publicField(this, "state");
     const isRepeated = this instanceof Repeated;
     const type = isRepeated ? "repeated" : "waited";
     if (typeof callback !== "function") {
       throw new TypeError(`A ${type} timer must have a callback function`);
     }
     if (typeof time !== "number" || time < 0) {
-      throw new TypeError(`A ${type} timer must have a non-negative number as its time`);
+      throw new TypeError(
+        `A ${type} timer must have a non-negative number as its time`
+      );
     }
     if (isRepeated && (typeof count !== "number" || count < 2)) {
-      throw new TypeError("A repeated timer must have a number above 1 as its repeat count");
+      throw new TypeError(
+        "A repeated timer must have a number above 1 as its repeat count"
+      );
     }
     if (isRepeated && afterCallback !== void 0 && typeof afterCallback !== "function") {
-      throw new TypeError("A repeated timer's after-callback must be a function");
+      throw new TypeError(
+        "A repeated timer's after-callback must be a function"
+      );
     }
     this.configuration = { count, time };
     this.callbacks = {
@@ -115,13 +107,6 @@ var Timed = class {
       frame: null
     };
   }
-  /** */
-  get active() {
-    return this.state.active;
-  }
-  get finished() {
-    return !this.active && this.state.finished;
-  }
   restart() {
     this.stop();
     run(this);

package/dist/timer.iife.js

@@ -1 +1 @@
-var Timer=(()=>{var u=Object.defineProperty;var w=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var g=Object.prototype.hasOwnProperty;var y=(t,e,s)=>e in t?u(t,e,{enumerable:!0,configurable:!0,writable:!0,value:s}):t[e]=s;var x=(t,e)=>{for(var s in e)u(t,s,{get:e[s],enumerable:!0})},T=(t,e,s,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let a of b(e))!g.call(t,a)&&a!==s&&u(t,a,{get:()=>e[a],enumerable:!(n=w(e,a))||n.enumerable});return t};var A=t=>T(u({},"__esModule",{value:!0}),t);var f=(t,e,s)=>(y(t,typeof e!="symbol"?e+"":e,s),s);var M={};x(M,{Repeated:()=>r,Waited:()=>h,repeat:()=>E,wait:()=>k});var l=Math.round(16.666666666666668),p=globalThis.requestAnimationFrame??function(t){return setTimeout?.(()=>{t(Date.now())},l)};function d(t){t.state.active=!0,t.state.finished=!1;let e=t instanceof r,s=0,n;function a(i){if(!t.state.active)return;n??(n=i);let o=i-n,m=o-l,v=o+l;if(m<t.configuration.time&&t.configuration.time<v)if(t.state.active&&t.callbacks.default(e?s:void 0),s+=1,e&&s<t.configuration.count)n=void 0;else{t.state.finished=!0,t.stop();return}t.state.frame=p(a)}t.state.frame=p(a)}var c=class{constructor(e,s,n,a){f(this,"callbacks");f(this,"configuration");f(this,"state");let i=this instanceof r,o=i?"repeated":"waited";if(typeof e!="function")throw new TypeError(`A ${o} timer must have a callback function`);if(typeof s!="number"||s<0)throw new TypeError(`A ${o} timer must have a non-negative number as its time`);if(i&&(typeof n!="number"||n<2))throw new TypeError("A repeated timer must have a number above 1 as its repeat count");if(i&&a!==void 0&&typeof a!="function")throw new TypeError("A repeated timer's after-callback must be a function");this.configuration={count:n,time:s},this.callbacks={after:a,default:e},this.state={active:!1,finished:!1,frame:null}}get active(){return this.state.active}get finished(){return!this.active&&this.state.finished}restart(){return this.stop(),d(this),this}start(){return this.state.active||d(this),this}stop(){return this.state.active=!1,this.state.frame===void 0?this:((globalThis.cancelAnimationFrame??clearTimeout)?.(this.state.frame),this.callbacks.after?.(this.finished),this.state.frame=void 0,this)}},r=class extends c{},h=class extends c{constructor(e,s){super(e,s,1,null)}};function E(t,e,s,n){return new r(t,e,s,n).start()}function k(t,e){return new h(t,e).start()}return A(M);})();
+var Timer=(()=>{var c=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var b=Object.prototype.hasOwnProperty;var g=(t,e)=>{for(var s in e)c(t,s,{get:e[s],enumerable:!0})},y=(t,e,s,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of w(e))!b.call(t,i)&&i!==s&&c(t,i,{get:()=>e[i],enumerable:!(n=v(e,i))||n.enumerable});return t};var x=t=>y(c({},"__esModule",{value:!0}),t);var E={};g(E,{Repeated:()=>r,Waited:()=>f,repeat:()=>T,wait:()=>A});var h=Math.round(16.666666666666668),l=globalThis.requestAnimationFrame??function(t){return setTimeout?.(()=>{t(Date.now())},h)};function p(t){t.state.active=!0,t.state.finished=!1;let e=t instanceof r,s=0,n;function i(a){if(!t.state.active)return;n??(n=a);let o=a-n,d=o-h,m=o+h;if(d<t.configuration.time&&t.configuration.time<m)if(t.state.active&&t.callbacks.default(e?s:void 0),s+=1,e&&s<t.configuration.count)n=void 0;else{t.state.finished=!0,t.stop();return}t.state.frame=l(i)}t.state.frame=l(i)}var u=class{get active(){return this.state.active}get finished(){return!this.active&&this.state.finished}constructor(e,s,n,i){let a=this instanceof r,o=a?"repeated":"waited";if(typeof e!="function")throw new TypeError(`A ${o} timer must have a callback function`);if(typeof s!="number"||s<0)throw new TypeError(`A ${o} timer must have a non-negative number as its time`);if(a&&(typeof n!="number"||n<2))throw new TypeError("A repeated timer must have a number above 1 as its repeat count");if(a&&i!==void 0&&typeof i!="function")throw new TypeError("A repeated timer's after-callback must be a function");this.configuration={count:n,time:s},this.callbacks={after:i,default:e},this.state={active:!1,finished:!1,frame:null}}restart(){return this.stop(),p(this),this}start(){return this.state.active||p(this),this}stop(){return this.state.active=!1,this.state.frame===void 0?this:((globalThis.cancelAnimationFrame??clearTimeout)?.(this.state.frame),this.callbacks.after?.(this.finished),this.state.frame=void 0,this)}},r=class extends u{},f=class extends u{constructor(e,s){super(e,s,1,null)}};function T(t,e,s,n){return new r(t,e,s,n).start()}function A(t,e){return new f(t,e).start()}return x(E);})();

package/dist/timer.js

@@ -1,10 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-
 // src/index.js
 var milliseconds = Math.round(1e3 / 60);
 var request = globalThis.requestAnimationFrame ?? function(callback) {
@@ -44,6 +37,12 @@ function run(timed) {
   timed.state.frame = request(step);
 }
 var Timed = class {
+  get active() {
+    return this.state.active;
+  }
+  get finished() {
+    return !this.active && this.state.finished;
+  }
   /**
    * @param {RepeatedCallback} callback
    * @param {number} time
@@ -51,34 +50,25 @@ var Timed = class {
    * @param {AfterCallback|undefined} afterCallback
    */
   constructor(callback, time, count, afterCallback) {
-    /**
-     * @readonly
-     * @type {{after: AfterCallback | undefined; default: RepeatedCallback}}
-     */
-    __publicField(this, "callbacks");
-    /**
-     * @readonly
-     * @type {{count: number; time: number}}
-     */
-    __publicField(this, "configuration");
-    /**
-     * @readonly
-     * @type {{active: boolean; finished: boolean; frame?: DOMHighResTimeStamp}}
-     */
-    __publicField(this, "state");
     const isRepeated = this instanceof Repeated;
     const type = isRepeated ? "repeated" : "waited";
     if (typeof callback !== "function") {
       throw new TypeError(`A ${type} timer must have a callback function`);
     }
     if (typeof time !== "number" || time < 0) {
-      throw new TypeError(`A ${type} timer must have a non-negative number as its time`);
+      throw new TypeError(
+        `A ${type} timer must have a non-negative number as its time`
+      );
     }
     if (isRepeated && (typeof count !== "number" || count < 2)) {
-      throw new TypeError("A repeated timer must have a number above 1 as its repeat count");
+      throw new TypeError(
+        "A repeated timer must have a number above 1 as its repeat count"
+      );
     }
     if (isRepeated && afterCallback !== void 0 && typeof afterCallback !== "function") {
-      throw new TypeError("A repeated timer's after-callback must be a function");
+      throw new TypeError(
+        "A repeated timer's after-callback must be a function"
+      );
     }
     this.configuration = { count, time };
     this.callbacks = {
@@ -91,13 +81,6 @@ var Timed = class {
       frame: null
     };
   }
-  /** */
-  get active() {
-    return this.state.active;
-  }
-  get finished() {
-    return !this.active && this.state.finished;
-  }
   restart() {
     this.stop();
     run(this);

package/package.json

@@ -7,20 +7,23 @@
 	"description": "A better solution for timeout- and interval-based timers.",
 	"devDependencies": {
 		"esbuild": "^0.17",
-		"typescript": "^5.0",
 		"xo": "^0.54"
 	},
 	"exports": {
 		".": {
 			"types": "./src/index.d.ts",
-      "browser": "./dist/timer.iife.js",
-      "module": "./dist/timer.js",
-      "import": "./dist/timer.js",
-      "require": "./dist/timer.cjs"
+			"browser": "./dist/timer.iife.js",
+			"module": "./dist/timer.js",
+			"import": "./dist/timer.js",
+			"require": "./dist/timer.cjs",
+			"default": "./dist/timer.js"
 		},
 		"./package.json": "./package.json"
 	},
-	"files": ["dist", "src"],
+	"files": [
+		"dist",
+		"src"
+	],
 	"jsdelivr": "dist/timer.iife.js",
 	"keywords": [
 		"timer",
@@ -41,10 +44,11 @@
 		"build:cjs": "esbuild ./src/index.js --bundle --format=cjs --outfile=./dist/timer.cjs --target=es2020",
 		"build:esm": "esbuild ./src/index.js --bundle --format=esm --outfile=./dist/timer.js --target=es2020",
 		"build:iife": "esbuild ./src/index.js --bundle --minify --format=iife --global-name=Timer --outfile=./dist/timer.iife.js --target=es2020",
-		"types": "./node_modules/.bin/tsc ./src/index.js --allowJs --declaration --emitDeclarationOnly --removeComments"
+		"types": "./node_modules/.bin/tsc ./src/index.js --allowJs --declaration --emitDeclarationOnly --removeComments",
+		"xo": "./node_modules/.bin/xo ./src/*.js --env browser"
 	},
 	"type": "module",
 	"types": "src/index.d.ts",
 	"unpkg": "dist/timer.iife.js",
-	"version": "0.14.0"
+	"version": "0.16.0"
 }

package/src/index.d.ts

@@ -9,21 +9,21 @@ export type AfterCallback = (finished: boolean) => void;
 export type RepeatedCallback = (index: number) => void;
 declare class Timed {
     constructor(callback: RepeatedCallback, time: number, count: number, afterCallback: AfterCallback | undefined);
-    readonly callbacks: {
-        after: AfterCallback | undefined;
-        default: RepeatedCallback;
-    };
+    get active(): boolean;
+    get finished(): boolean;
     readonly configuration: {
         count: number;
         time: number;
     };
+    readonly callbacks: {
+        after: AfterCallback | undefined;
+        default: RepeatedCallback;
+    };
     readonly state: {
         active: boolean;
         finished: boolean;
         frame?: DOMHighResTimeStamp;
     };
-    get active(): boolean;
-    get finished(): boolean;
     restart(): Timed;
     start(): Timed;
     stop(): Timed;

package/src/index.js

@@ -12,11 +12,12 @@
 
 const milliseconds = Math.round(1000 / 60);
 
-const request = globalThis.requestAnimationFrame ?? function (callback) {
-	return setTimeout?.(() => {
-		callback(Date.now());
-	}, milliseconds);
-};
+const request = globalThis.requestAnimationFrame
+	?? function (callback) {
+		return setTimeout?.(() => {
+			callback(Date.now());
+		}, milliseconds);
+	};
 
 /**
  * @param {Timed} timed
@@ -43,7 +44,10 @@ function run(timed) {
 		const elapsedMinimum = elapsed - milliseconds;
 		const elapsedMaximum = elapsed + milliseconds;
 
-		if (elapsedMinimum < timed.configuration.time && timed.configuration.time < elapsedMaximum) {
+		if (
+			elapsedMinimum < timed.configuration.time
+			&& timed.configuration.time < elapsedMaximum
+		) {
 			if (timed.state.active) {
 				timed.callbacks.default(isRepeated ? index : undefined);
 			}
@@ -68,26 +72,6 @@ function run(timed) {
 }
 
 class Timed {
-	/**
-	 * @readonly
-	 * @type {{after: AfterCallback | undefined; default: RepeatedCallback}}
-	 */
-	callbacks;
-
-	/**
-	 * @readonly
-	 * @type {{count: number; time: number}}
-	 */
-	configuration;
-
-	/**
-	 * @readonly
-	 * @type {{active: boolean; finished: boolean; frame?: DOMHighResTimeStamp}}
-	 */
-	state;
-
-	/** */
-
 	get active() {
 		return this.state.active;
 	}
@@ -105,33 +89,53 @@ class Timed {
 	constructor(callback, time, count, afterCallback) {
 		const isRepeated = this instanceof Repeated;
 
-		const type = isRepeated
-			? 'repeated'
-			: 'waited';
+		const type = isRepeated ? 'repeated' : 'waited';
 
 		if (typeof callback !== 'function') {
 			throw new TypeError(`A ${type} timer must have a callback function`);
 		}
 
 		if (typeof time !== 'number' || time < 0) {
-			throw new TypeError(`A ${type} timer must have a non-negative number as its time`);
+			throw new TypeError(
+				`A ${type} timer must have a non-negative number as its time`,
+			);
 		}
 
 		if (isRepeated && (typeof count !== 'number' || count < 2)) {
-			throw new TypeError('A repeated timer must have a number above 1 as its repeat count');
+			throw new TypeError(
+				'A repeated timer must have a number above 1 as its repeat count',
+			);
 		}
 
-		if (isRepeated && afterCallback !== undefined && typeof afterCallback !== 'function') {
-			throw new TypeError('A repeated timer\'s after-callback must be a function');
+		if (
+			isRepeated
+			&& afterCallback !== undefined
+			&& typeof afterCallback !== 'function'
+		) {
+			throw new TypeError(
+				'A repeated timer\'s after-callback must be a function',
+			);
 		}
 
+		/**
+		 * @readonly
+		 * @type {{count: number; time: number}}
+		 */
 		this.configuration = {count, time};
 
+		/**
+		 * @readonly
+		 * @type {{after: AfterCallback | undefined; default: RepeatedCallback}}
+		 */
 		this.callbacks = {
 			after: afterCallback,
 			default: callback,
 		};
 
+		/**
+		 * @readonly
+		 * @type {{active: boolean; finished: boolean; frame?: DOMHighResTimeStamp}}
+		 */
 		this.state = {
 			active: false,
 			finished: false,
@@ -192,7 +196,7 @@ export class Waited extends Timed {
  * @return {Repeated} A repeated timer
  */
 export function repeat(callback, time, count, afterCallback) {
-	return (new Repeated(callback, time, count, afterCallback)).start();
+	return new Repeated(callback, time, count, afterCallback).start();
 }
 
 /**
@@ -201,5 +205,5 @@ export function repeat(callback, time, count, afterCallback) {
  * @return {Waited} A waited timer
  */
 export function wait(callback, time) {
-	return (new Waited(callback, time)).start();
+	return new Waited(callback, time).start();
 }