Fixed builds

Author: ferdikoomen

package-lock.json

@@ -107,7 +107,7 @@
         "glob": "10.0.0",
         "jest": "29.5.0",
         "jest-cli": "29.5.0",
-        "node-fetch": "3.3.1",
+        "node-fetch": "2.6.9",
         "prettier": "2.8.7",
         "puppeteer": "19.8.5",
         "qs": "6.11.1",
@@ -117,11 +117,12 @@
         "rxjs": "7.8.0",
         "ts-node": "10.9.1",
         "tslib": "2.5.0",
-        "typescript": "5.0.4",
+        "typescript": "4.9.5",
         "zone.js": "0.13.0"
     },
     "overrides" : {
+        "node-fetch": "2.6.9",
         "rollup": "3.20.2",
-        "typescript": "5.0.4"
+        "typescript": "4.9.5"
     }
 }

package.json

@@ -36,47 +36,47 @@ export class CancelablePromise<T> implements Promise<T> {
 			onCancel: OnCancel
 		) => void
 	) {
-		this._isResolved = false;
-		this._isRejected = false;
-		this._isCancelled = false;
-		this._cancelHandlers = [];
-		this._promise = new Promise<T>((resolve, reject) => {
-			this._resolve = resolve;
-			this._reject = reject;
+		this.#isResolved = false;
+		this.#isRejected = false;
+		this.#isCancelled = false;
+		this.#cancelHandlers = [];
+		this.#promise = new Promise<T>((resolve, reject) => {
+			this.#resolve = resolve;
+			this.#reject = reject;
 
 			const onResolve = (value: T | PromiseLike<T>): void => {
-				if (this._isResolved || this._isRejected || this._isCancelled) {
+				if (this.#isResolved || this.#isRejected || this.#isCancelled) {
 					return;
 				}
-				this._isResolved = true;
-				this._resolve?.(value);
+				this.#isResolved = true;
+				this.#resolve?.(value);
 			};
 
 			const onReject = (reason?: any): void => {
-				if (this._isResolved || this._isRejected || this._isCancelled) {
+				if (this.#isResolved || this.#isRejected || this.#isCancelled) {
 					return;
 				}
-				this._isRejected = true;
-				this._reject?.(reason);
+				this.#isRejected = true;
+				this.#reject?.(reason);
 			};
 
 			const onCancel = (cancelHandler: () => void): void => {
-				if (this._isResolved || this._isRejected || this._isCancelled) {
+				if (this.#isResolved || this.#isRejected || this.#isCancelled) {
 					return;
 				}
-				this._cancelHandlers.push(cancelHandler);
+				this.#cancelHandlers.push(cancelHandler);
 			};
 
 			Object.defineProperty(onCancel, 'isResolved', {
-				get: (): boolean => this._isResolved,
+				get: (): boolean => this.#isResolved,
 			});
 
 			Object.defineProperty(onCancel, 'isRejected', {
-				get: (): boolean => this._isRejected,
+				get: (): boolean => this.#isRejected,
 			});
 
 			Object.defineProperty(onCancel, 'isCancelled', {
-				get: (): boolean => this._isCancelled,
+				get: (): boolean => this.#isCancelled,
 			});
 
 			return executor(onResolve, onReject, onCancel as OnCancel);
@@ -91,39 +91,39 @@ export class CancelablePromise<T> implements Promise<T> {
 		onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
 		onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null
 	): Promise<TResult1 | TResult2> {
-		return this._promise.then(onFulfilled, onRejected);
+		return this.#promise.then(onFulfilled, onRejected);
 	}
 
 	public catch<TResult = never>(
 		onRejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null
 	): Promise<T | TResult> {
-		return this._promise.catch(onRejected);
+		return this.#promise.catch(onRejected);
 	}
 
 	public finally(onFinally?: (() => void) | null): Promise<T> {
-		return this._promise.finally(onFinally);
+		return this.#promise.finally(onFinally);
 	}
 
 	public cancel(): void {
-		if (this._isResolved || this._isRejected || this._isCancelled) {
+		if (this.#isResolved || this.#isRejected || this.#isCancelled) {
 			return;
 		}
-		this._isCancelled = true;
-		if (this._cancelHandlers.length) {
+		this.#isCancelled = true;
+		if (this.#cancelHandlers.length) {
 			try {
-				for (const cancelHandler of this._cancelHandlers) {
+				for (const cancelHandler of this.#cancelHandlers) {
 					cancelHandler();
 				}
 			} catch (error) {
 				console.warn('Cancellation threw an error', error);
 				return;
 			}
 		}
-		this._cancelHandlers.length = 0;
-		this._reject?.(new CancelError('Request aborted'));
+		this.#cancelHandlers.length = 0;
+		this.#reject?.(new CancelError('Request aborted'));
 	}
 
 	public get isCancelled(): boolean {
-		return this._isCancelled;
+		return this.#isCancelled;
 	}
 }