[Bug] Version 0.1.1 does not support resolving a promise with a promi…

…se properly. #18 (#19)
nevware21 · Feb 13, 2023 · 4e62da4 · 4e62da4
1 parent 96db7e3
commit 4e62da4
Show file tree

Hide file tree

Showing 16 changed files with 774 additions and 209 deletions.
diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json
diff --git a/lib/src/index.ts b/lib/src/index.ts
@@ -22,7 +22,7 @@ export {
 } from "./promise/syncPromise";
 export {
     createIdlePromise, createIdleAllPromise, createIdleResolvedPromise, createIdleRejectedPromise,
-    setDetaultIdlePromiseTimeout as setDetaultIdleTimeout
+    setDetaultIdleTimeout
 } from "./promise/idlePromise";
 export {
     createAsyncPromise, createAsyncAllPromise, createAsyncResolvedPromise, createAsyncRejectedPromise

diff --git a/lib/src/internal/state.ts b/lib/src/internal/state.ts
@@ -12,14 +12,15 @@
  */
 export const enum ePromiseState {
     Pending = 0,
-    Resolved = 1,
-    Rejected = 2
+    Resolving = 1,
+    Resolved = 2,
+    Rejected = 3
 }
 
 /**
  * @ignore -- Don't include in the generated documentation
  * @internal
  */
 export const STRING_STATES: string[] = [
-    "pending", "resolved", "rejected"
+    "pending", "resolving", "resolved", "rejected"
 ];
diff --git a/lib/src/promise/await.ts b/lib/src/promise/await.ts
@@ -16,17 +16,17 @@ import { FinallyPromiseHandler, RejectedPromiseHandler, ResolvedPromiseHandler }
  * @param value - The value or promise like value to wait for
  * @param cb - The callback to call with the response of the promise as an IAwaitResponse object.
  */
-export function doAwaitResponse<T, TResult1 = T, TResult2 = never>(value: T | Promise<T>, cb: (response: AwaitResponse<T>) => void): Promise<T | TResult1 | TResult2>;
-export function doAwaitResponse<T, TResult1 = T, TResult2 = never>(value: T | PromiseLike<T>, cb: (response: AwaitResponse<T>) => void): PromiseLike<T | TResult1 | TResult2>;
-export function doAwaitResponse<T, TResult1 = T, TResult2 = never>(value: T | IPromise<T>, cb: (response: AwaitResponse<T>) => void): IPromise<T | TResult1 | TResult2> {
+export function doAwaitResponse<T, TResult1 = T, TResult2 = never>(value: T | Promise<T>, cb: (response: AwaitResponse<T>) => void): T | Promise<T | TResult1 | TResult2>;
+export function doAwaitResponse<T, TResult1 = T, TResult2 = never>(value: T | PromiseLike<T>, cb: (response: AwaitResponse<T>) => void): T | PromiseLike<T | TResult1 | TResult2>;
+export function doAwaitResponse<T, TResult1 = T, TResult2 = never>(value: T | IPromise<T>, cb: (response: AwaitResponse<T>) => void): T | IPromise<T | TResult1 | TResult2> {
     return doAwait(value as any, (value) => {
-        cb({
+        cb && cb({
             value: value,
             rejected: false
         });
     },
     (reason) => {
-        cb({
+        cb && cb({
             rejected: true,
             reason: reason
         });
@@ -63,17 +63,17 @@ export function doAwait<T, TResult1 = T, TResult2 = never>(value: T | PromiseLik
  */
 export function doAwait<T, TResult1 = T, TResult2 = never>(value: T | IPromise<T>, resolveFn: ResolvedPromiseHandler<T, TResult1>, rejectFn?: RejectedPromiseHandler<TResult2>, finallyFn?: FinallyPromiseHandler): T | IPromise<T | TResult1 | TResult2> {
     let result = value;
-    let chainedPromise = value;
+
     if (isPromiseLike<T>(value)) {
         if (resolveFn || rejectFn) {
-            chainedPromise = value.then(resolveFn, rejectFn) as any;
+            result = value.then(resolveFn, rejectFn) as any;
         }
     } else {
-        resolveFn(value as T);
+        resolveFn && resolveFn(value as T);
     }
 
     if (finallyFn) {
-        result = doFinally(chainedPromise as any, finallyFn);
+        result = doFinally(result as any, finallyFn);
     }
 
     return result as any;