@trenskow/custom-promise 0.11.0 → 0.13.0

package/eslint.config.js

@@ -0,0 +1,46 @@
+import globals from 'globals';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import js from '@eslint/js';
+import { FlatCompat } from '@eslint/eslintrc';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+	baseDirectory: __dirname,
+	recommendedConfig: js.configs.recommended,
+	allConfig: js.configs.all
+});
+
+export default [...compat.extends('eslint:recommended'), {
+	languageOptions: {
+		globals: {
+			...globals.node,
+			...globals.mocha,
+		},
+
+		ecmaVersion: 'latest',
+		sourceType: 'module',
+	},
+
+	rules: {
+		indent: ['error', 'tab'],
+		'linebreak-style': ['error', 'unix'],
+		quotes: ['error', 'single'],
+		semi: ['error', 'always'],
+
+		'no-console': ['error', {
+			allow: ['warn', 'error', 'info'],
+		}],
+
+		'no-unused-vars': ['error', {
+			argsIgnorePattern: '^_',
+		}],
+
+		'no-empty': ['error', {
+			allowEmptyCatch: true,
+		}],
+
+		'require-atomic-updates': 'off',
+	},
+}];

package/index.js

@@ -1,20 +1,20 @@
-'use strict';
-
 class CustomPromise {
 
 	constructor() {
 		this._state = 'pending';
 		this._result = undefined;
-		this._resolveCallback = undefined;
-		this._rejectCallback = undefined;
 		this._finalizers = [];
+		this._onFulfilled = [];
+		this._onRejected = [];
 	}
 
 	_resolve(result) {
 		if (this._state !== 'pending') return;
 		this._state = 'fulfilled';
 		this._result = result;
-		this._resolveCallback?.(result);
+		this._onFulfilled
+			.filter((onFulfilled) => typeof onFulfilled === 'function')
+			.forEach((onFulfilled) => onFulfilled(result));
 		this._finalizers.splice(0).forEach((onFinally) => onFinally());
 	}
 
@@ -22,63 +22,25 @@ class CustomPromise {
 		if (this._state !== 'pending') return;
 		this._state = 'rejected';
 		this._error = error;
-		this._rejectCallback?.(error);
+		this._onRejected
+			.filter((onRejected) => typeof onRejected === 'function')
+			.forEach((onRejected) => onRejected(error));
 		this._finalizers.splice(0).forEach((onFinally) => onFinally());
 	}
 
 	then(onFulfilled, onRejected) {
-		return new Promise((resolve, reject) => {
-
-			const resolveWrapper = (value) => {
-				try {
-
-					if (typeof onFulfilled !== 'function') {
-						return resolve(value);
-					}
-
-					const result = onFulfilled(value);
-
-					if (typeof result?.then === 'function') {
-						return result.then(resolve, reject);
-					}
-
-					resolve(result);
-
-				} catch (error) {
-					reject(error);
-				}
-			};
 
-			const rejectedWrapper = (error) => {
-				try {
-
-					if (typeof onRejected !== 'function') {
-						return reject(error);
-					}
-
-					const result = onRejected(error);
-
-					if (typeof result?.then === 'function') {
-						return result.then(resolve, reject);
-					}
-
-					reject(result);
-
-				} catch (error) {
-					reject(error);
-				}
-			};
+		if (this._state === 'fulfilled') {
+			onFulfilled?.(this._result);
+		} else if (this._state === 'rejected') {
+			onRejected?.(this._error);
+		} else {
+			this._onFulfilled.push(onFulfilled);
+			this._onRejected.push(onRejected);
+		}
 
-			if (this._state === 'fulfilled') {
-				resolveWrapper(this._result);
-			} else if (this._state === 'rejected') {
-				rejectedWrapper(this._error);
-			} else {
-				this._resolveCallback = resolveWrapper;
-				this._rejectCallback = rejectedWrapper;
-			}
+		return this;
 
-		});
 	}
 
 	finally(onFinally) {
@@ -91,4 +53,4 @@ class CustomPromise {
 
 }
 
-exports = module.exports = CustomPromise;
+export default CustomPromise;

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@trenskow/custom-promise",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "description": "A extendable class for making custom promises.",
   "main": "index.js",
+  "type": "module",
   "directories": {
     "test": "test"
   },
@@ -22,5 +23,11 @@
   "bugs": {
     "url": "https://github.com/trenskow/custom-promise/issues"
   },
-  "homepage": "https://github.com/trenskow/custom-promise#readme"
+  "homepage": "https://github.com/trenskow/custom-promise#readme",
+  "devDependencies": {
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.13.0",
+    "eslint": "^9.13.0",
+    "globals": "^15.11.0"
+  }
 }

package/.eslintrc.js

@@ -1,49 +0,0 @@
-module.exports = {
-	'env': {
-		'es6': true,
-		'node': true,
-		'mocha': true
-	},
-	'parserOptions': {
-		'ecmaVersion': 2017
-	},
-	'extends': 'eslint:recommended',
-	'rules': {
-		'indent': [
-			'error',
-			'tab'
-		],
-		'linebreak-style': [
-			'error',
-			'unix'
-		],
-		'quotes': [
-			'error',
-			'single'
-		],
-		'semi': [
-			'error',
-			'always'
-		],
-		'no-console': [
-			'error', {
-				'allow': [
-					'warn',
-					'error',
-					'info'
-				]
-			}
-		],
-		'no-unused-vars': [
-			'error', {
-				'argsIgnorePattern': '^_'
-			}
-		],
-		'no-empty': [
-			'error', {
-				'allowEmptyCatch': true
-			}
-		],
-		'require-atomic-updates': 'off'
-	}
-};