Skip to content

fix(core): Allow to return a new hook context in basic hooks #2462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daffl merged 2 commits into from
Oct 5, 2021
Merged

fix(core): Allow to return a new hook context in basic hooks #2462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19af065
fix(core): Allow to return and expand the hook context in basic hooks
daffl Oct 5, 2021
2c3058b
Make things more DRY
daffl Oct 5, 2021
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
32 changes: 22 additions & 10 deletions packages/feathers/src/hooks/legacy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,37 @@ import { _ } from '../dependencies';
import { LegacyHookFunction } from '../declarations';

const { each } = _;
const mergeContext = (context: any) => (res: any) => {
if (res && res !== context) {
Object.assign(context, res);
}
return res;
}

export function fromBeforeHook (hook: LegacyHookFunction) {
return (context: any, next: any) => {
context.type = 'before';

return Promise.resolve(hook.call(context.self, context)).then(() => {
context.type = null;
return next();
});
return Promise.resolve(hook.call(context.self, context))
.then(mergeContext(context))
.then(() => {
context.type = null;
return next();
});
};
}

export function fromAfterHook (hook: LegacyHookFunction) {
return (context: any, next: any) => {
return next().then(() => {
context.type = 'after';
return hook.call(context.self, context)
}).then(() => {
context.type = null;
});
return next()
.then(() => {
context.type = 'after';
return hook.call(context.self, context)
})
.then(mergeContext(context))
.then(() => {
context.type = null;
});
}
}

Expand All @@ -38,6 +49,7 @@ export function fromErrorHooks (hooks: LegacyHookFunction[]) {

for (const hook of hooks) {
promise = promise.then(() => hook.call(context.self, context))
.then(mergeContext(context))
}

return promise.then(() => {
Expand Down
38 changes: 38 additions & 0 deletions packages/feathers/test/hooks/hooks.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,4 +354,42 @@ describe('hooks basics', () => {
params: {}
});
});

it('allows to return new context in basic hooks (#2451)', async () => {
const app = feathers().use('/dummy', {
async get () {
return {};
}
});
const service = app.service('dummy');

service.hooks({
before: {
get: [
context => {
return {
...context,
value: 'something'
};
},
context => {
assert.strictEqual(context.value, 'something');
}
]
},
after: {
get: [context => {
context.result = {
value: context.value
}
}]
}
});

const data = await service.get(10);

assert.deepStrictEqual(data, {
value: 'something'
});
});
});