Merge pull request ferdikoomen#1627 from pitmullerIngka/fix/next-prom…

…ise-resolve fix: adjust promise resolve for next issue
talknagish · Jul 28, 2023 · beccf2d · beccf2d
2 parents 1095d07 + 11f84f5
commit beccf2d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/templates/core/CancelablePromise.hbs b/src/templates/core/CancelablePromise.hbs
@@ -49,15 +49,15 @@ export class CancelablePromise<T> implements Promise<T> {
 					return;
 				}
 				this.#isResolved = true;
-				this.#resolve?.(value);
+				if (this.#resolve) this.#resolve(value);
 			};
 
 			const onReject = (reason?: any): void => {
 				if (this.#isResolved || this.#isRejected || this.#isCancelled) {
 					return;
 				}
 				this.#isRejected = true;
-				this.#reject?.(reason);
+				if (this.#reject) this.#reject(reason);
 			};
 
 			const onCancel = (cancelHandler: () => void): void => {
@@ -120,7 +120,7 @@ export class CancelablePromise<T> implements Promise<T> {
 			}
 		}
 		this.#cancelHandlers.length = 0;
-		this.#reject?.(new CancelError('Request aborted'));
+		if (this.#reject) this.#reject(new CancelError('Request aborted'));
 	}
 
 	public get isCancelled(): boolean {

diff --git a/test/__snapshots__/index.spec.ts.snap b/test/__snapshots__/index.spec.ts.snap
@@ -119,15 +119,15 @@ export class CancelablePromise<T> implements Promise<T> {
                     return;
                 }
                 this.#isResolved = true;
-                this.#resolve?.(value);
+                if (this.#resolve) this.#resolve(value);
             };
 
             const onReject = (reason?: any): void => {
                 if (this.#isResolved || this.#isRejected || this.#isCancelled) {
                     return;
                 }
                 this.#isRejected = true;
-                this.#reject?.(reason);
+                if (this.#reject) this.#reject(reason);
             };
 
             const onCancel = (cancelHandler: () => void): void => {
@@ -3345,15 +3345,15 @@ export class CancelablePromise<T> implements Promise<T> {
                     return;
                 }
                 this.#isResolved = true;
-                this.#resolve?.(value);
+                if (this.#resolve) this.#resolve(value);
             };
 
             const onReject = (reason?: any): void => {
                 if (this.#isResolved || this.#isRejected || this.#isCancelled) {
                     return;
                 }
                 this.#isRejected = true;
-                this.#reject?.(reason);
+                if (this.#reject) this.#reject(reason);
             };
 
             const onCancel = (cancelHandler: () => void): void => {