diff --git a/packages/dandi/common/index.ts b/packages/dandi/common/index.ts index bcca2f5c..ab51d27b 100644 --- a/packages/dandi/common/index.ts +++ b/packages/dandi/common/index.ts @@ -10,6 +10,7 @@ export * from './src/metadata' export * from './src/method.target' export * from './src/package.global.symbol' export * from './src/primitive' +export * from './src/promise' export * from './src/type.helpers' export * from './src/url' export * from './src/uuid' diff --git a/packages/dandi/common/src/disposable.ts b/packages/dandi/common/src/disposable.ts index e137f632..747283a1 100644 --- a/packages/dandi/common/src/disposable.ts +++ b/packages/dandi/common/src/disposable.ts @@ -1,5 +1,6 @@ import { AppError } from './app.error' import { globalSymbol } from './global.symbol' +import { isPromise } from './promise' export type DisposeFn = (reason: string) => void @@ -109,16 +110,17 @@ export class Disposable { } public static async useAsync( - obj: T, + obj: T | Promise, use: (obj: T) => Promise, ): Promise { + const resolvedObj = isPromise(obj) ? await obj : obj try { - return await use(obj) + return await use(resolvedObj) } catch (err) { throw err } finally { - if (Disposable.isDisposable(obj)) { - await obj.dispose('after Disposable.useAsync()') + if (Disposable.isDisposable(resolvedObj)) { + await resolvedObj.dispose('after Disposable.useAsync()') } } } diff --git a/packages/dandi/common/src/promise.ts b/packages/dandi/common/src/promise.ts new file mode 100644 index 00000000..7a643636 --- /dev/null +++ b/packages/dandi/common/src/promise.ts @@ -0,0 +1,3 @@ +export function isPromise(obj: any | Promise): obj is Promise { + return obj instanceof Promise || (obj && typeof obj.then === 'function') +}