fix(shared): fix applyMiddleware can not catch error (#1952)

packages/antd/src/__builtins__/loading.ts

@@ -8,8 +8,10 @@ export const loading = async (
   let loading = setTimeout(() => {
     hide = message.loading(title)
   }, 100)
-  const results = await processor()
-  hide?.()
-  clearTimeout(loading)
-  return results
+  try {
+    return await processor()
+  } finally {
+    hide?.()
+    clearTimeout(loading)
+  }
 }

packages/element/src/__builtins__/shared/loading.ts

@@ -11,8 +11,10 @@ export const loading = async (
       background: 'transparent',
     })
   }, 100)
-  const results = await processor()
-  loadingInstance?.close()
-  clearTimeout(loading)
-  return results
+  try {
+    return await processor()
+  } finally {
+    loadingInstance?.close()
+    clearTimeout(loading)
+  }
 }

packages/next/src/__builtins__/loading.ts

@@ -7,8 +7,10 @@ export const loading = async (
   let loading = setTimeout(() => {
     Message.loading(title as any)
   }, 100)
-  const results = await processor()
-  Message.hide()
-  clearTimeout(loading)
-  return results
+  try {
+    return await processor()
+  } finally {
+    Message.hide()
+    clearTimeout(loading)
+  }
 }

packages/shared/src/__tests__/index.spec.ts

@@ -724,3 +724,15 @@ test('applyMiddleware', async () => {
   await sleep(16)
   expect(resolved).toBeCalledTimes(0)
 })
+
+test('applyMiddleware with error', async () => {
+  try {
+    await applyMiddleware(0, [
+      () => {
+        throw 'this is error'
+      },
+    ])
+  } catch (e) {
+    expect(e).toEqual('this is error')
+  }
+})

packages/shared/src/middleware.ts

@@ -3,20 +3,20 @@ export interface IMiddleware<Payload = any, Result = any> {
 }
 
 export const applyMiddleware = (payload: any, fns: IMiddleware[] = []) => {
-  const compose = (payload: any, fns: IMiddleware[]) => {
+  const compose = (payload: any, fns: IMiddleware[]): Promise<any> => {
     const prevPayload = payload
     return Promise.resolve(
       fns[0](payload, (payload) =>
         compose(payload ?? prevPayload, fns.slice(1))
       )
     )
   }
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     compose(
       payload,
       fns.concat((payload) => {
         resolve(payload)
       })
-    )
+    ).catch(reject)
   })
 }