From 194947383325fa3d896a73c2e0613f517d236bcd Mon Sep 17 00:00:00 2001
From: SieR-VR <nwh040512@gmail.com>
Date: Tue, 27 Sep 2022 00:04:16 +0900
Subject: [PATCH] Reflect review

---
 src/async.ts    | 9 ++++-----
 src/pipeline.ts | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/async.ts b/src/async.ts
index 06ac627..73f55ef 100644
--- a/src/async.ts
+++ b/src/async.ts
@@ -16,7 +16,7 @@ export type ListFactoryFunc<T, K extends keyof T, U = T> = keyof T extends K
   : (count: number, item: RecPartial<T> & Omit<T, K>) => Promise<U[]>;
 
 function isPromise<T>(t: T | Promise<T>): t is Promise<T> {
-  return typeof (t as any)["then"] === "function";
+  return !!t && typeof (t as any)["then"] === "function";
 }
 
 export function lift<T>(t: T | Promise<T>): Promise<T> {
@@ -272,14 +272,13 @@ async function buildBase<T, K extends keyof T>(
   seqNum: number,
   builder: Builder<T, K> | Promise<Builder<T, K>>
 ): Promise<BaseBuild<T>> {
-  if (isPromise(builder))
-    builder = await builder;
+  const resolvedBuilder = await lift(builder);
 
   const t: { [key: string]: any } = {};
-  const keys = Object.getOwnPropertyNames(builder);
+  const keys = Object.getOwnPropertyNames(resolvedBuilder);
   const derived: BaseDerived[] = [];
   for (const key of keys) {
-    const v = (builder as any)[key];
+    const v = (resolvedBuilder as any)[key];
     let value = v;
     if (!!v && typeof v === "object") {
       if (isPromise(v)) {
diff --git a/src/pipeline.ts b/src/pipeline.ts
index 3fcb500..8d65c22 100644
--- a/src/pipeline.ts
+++ b/src/pipeline.ts
@@ -93,6 +93,6 @@ export class Pipeline<P extends Record<string, unknown> = {}> implements Promise
   }
 
   toFactory(): Async.Factory<P> {
-    return Async.makeFactory(this.current as Promise<Async.Builder<P, keyof P>>);
+    return Async.makeFactory(this.current as Promise<Async.Builder<P>>);
   }
 }
\ No newline at end of file