@trenskow/custom-promise 0.10.3 → 0.12.0

package/index.js

@@ -4,19 +4,19 @@ class CustomPromise {
 
 	constructor() {
 		this._state = 'pending';
-		this._awaiters = [];
+		this._result = undefined;
 		this._finalizers = [];
-	}
-
-	_reset() {
-		this._state = 'pending';
+		this._onFulfilled = [];
+		this._onRejected = [];
 	}
 
 	_resolve(result) {
 		if (this._state !== 'pending') return;
 		this._state = 'fulfilled';
 		this._result = result;
-		this._awaiters.splice(0).forEach(([onFulfilled]) => onFulfilled(result));
+		this._onFulfilled
+			.filter((onFulfilled) => typeof onFulfilled === 'function')
+			.forEach((onFulfilled) => onFulfilled(result));
 		this._finalizers.splice(0).forEach((onFinally) => onFinally());
 	}
 
@@ -24,25 +24,25 @@ class CustomPromise {
 		if (this._state !== 'pending') return;
 		this._state = 'rejected';
 		this._error = error;
-		this._awaiters.splice(0).forEach(([, onRejected]) => onRejected(error));
+		this._onRejected
+			.filter((onRejected) => typeof onRejected === 'function')
+			.forEach((onRejected) => onRejected(error));
 		this._finalizers.splice(0).forEach((onFinally) => onFinally());
 	}
 
 	then(onFulfilled, onRejected) {
 
-		if (onFulfilled && typeof onFulfilled !== 'function') throw new TypeError('fulfilled must be a function.');
-		if (onRejected && typeof onRejected !== 'function') throw new TypeError('rejected must be a function.');
-
 		if (this._state === 'fulfilled') {
-			if (onFulfilled) onFulfilled(this._result);
-		}
-		else if (this._state === 'rejected') {
-			if (onRejected) onRejected(this._error);
+			onFulfilled?.(this._result);
+		} else if (this._state === 'rejected') {
+			onRejected?.(this._error);
+		} else {
+			this._onFulfilled.push(onFulfilled);
+			this._onRejected.push(onRejected);
 		}
-		else {
-			this._awaiters.push([onFulfilled, onRejected]);
-		}
-		
+
+		return this;
+
 	}
 
 	finally(onFinally) {
@@ -50,6 +50,7 @@ class CustomPromise {
 		else {
 			this._finalizers.push(onFinally);
 		}
+		return this;
 	}
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/custom-promise",
-  "version": "0.10.3",
+  "version": "0.12.0",
   "description": "A extendable class for making custom promises.",
   "main": "index.js",
   "directories": {