From 237c4aa0847160f39cbe2337e332cbfacab0fa7e Mon Sep 17 00:00:00 2001 From: Junyi Date: Sat, 3 Feb 2024 10:37:28 +0800 Subject: [PATCH] fix(server): fix messages in data-wrapping (#3485) --- .../server/src/middlewares/data-wrapping.ts | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/packages/core/server/src/middlewares/data-wrapping.ts b/packages/core/server/src/middlewares/data-wrapping.ts index 4e1bf11e7..3ce1f95cf 100644 --- a/packages/core/server/src/middlewares/data-wrapping.ts +++ b/packages/core/server/src/middlewares/data-wrapping.ts @@ -31,30 +31,29 @@ export function dataWrapping() { ctx.body = { data: ctx.body, }; - return; - } + } else { + if (ctx.body) { + const { rows, ...meta } = ctx.body; - if (ctx.body) { - const { rows, ...meta } = ctx.body; + if (rows) { + ctx.body = { + data: rows, + meta, + }; + } else { + ctx.body = { + data: ctx.body, + }; - if (rows) { - ctx.body = { - data: rows, - meta, - }; - } else { + if (ctx.bodyMeta) { + ctx.body.meta = ctx.bodyMeta; + } + } + } else if (ctx.action) { ctx.body = { data: ctx.body, }; - - if (ctx.bodyMeta) { - ctx.body.meta = ctx.bodyMeta; - } } - } else if (ctx.action) { - ctx.body = { - data: ctx.body, - }; } if (ctx.body && ctx.state.messages?.length) {