Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix result resolver if result contains a paginated result object inst…
…ead of only an array
  • Loading branch information
idaho committed Apr 7, 2022
commit 505b0823269eb1039d329626e6dfac849e134d4d
18 changes: 10 additions & 8 deletions packages/schema/src/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,18 @@ export const resolveResult = <T> (resolver: Resolver<T, HookContext>) =>

const ctx = getContext(context);
const status = context.params.resolve;
const data = context.method === 'find' && context.result.data
? context.result.data
: context.result;

if (Array.isArray(data)) {
context.result = await Promise.all(data.map(current =>
resolver.resolve(current, ctx, status)
));
const isPaginated = context.method === 'find' && context.result.data;
const data = isPaginated ? context.result.data : context.result;

const result = Array.isArray(data) ?
await Promise.all(data.map(async current => resolver.resolve(current, ctx, status))) :
await resolver.resolve(data, ctx, status);

if (isPaginated) {
context.result.data = result;
} else {
context.result = await resolver.resolve(data, ctx, status);
context.result = result;
}
};

Expand Down