summaryrefslogtreecommitdiff
path: root/src/server/api/get-params.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-07-05 23:36:07 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-07-05 23:36:07 +0900
commit11439afde76015b80e8d2e680808161cbc1800d5 (patch)
tree8888a7c3f9a209b57ca2ebd327e624a69f0b2130 /src/server/api/get-params.ts
parentwip (diff)
downloadsharkey-11439afde76015b80e8d2e680808161cbc1800d5.tar.gz
sharkey-11439afde76015b80e8d2e680808161cbc1800d5.tar.bz2
sharkey-11439afde76015b80e8d2e680808161cbc1800d5.zip
wip
Diffstat (limited to 'src/server/api/get-params.ts')
-rw-r--r--src/server/api/get-params.ts15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/server/api/get-params.ts b/src/server/api/get-params.ts
index 6b047a28f4..e495e3ef3e 100644
--- a/src/server/api/get-params.ts
+++ b/src/server/api/get-params.ts
@@ -1,25 +1,22 @@
-import { Query } from 'cafy';
+import { Context } from 'cafy';
type Defs = {
- params: {[key: string]: {
- def: Query<any>;
- default?: any;
- }}
+ params: { [key: string]: Context<any> }
};
export default function <T extends Defs>(defs: T, params: any): [{
- [P in keyof T['params']]: ReturnType<T['params'][P]['def']['get']>[0];
+ [P in keyof T['params']]: ReturnType<T['params'][P]['get']>[0];
}, Error] {
const x: any = {};
let err: Error = null;
Object.keys(defs.params).some(k => {
- const [v, e] = defs.params[k].def.get(params[k]);
+ const [v, e] = defs.params[k].get(params[k]);
if (e) {
err = e;
return true;
} else {
- if (v === undefined && defs.params[k].default) {
- x[k] = defs.params[k].default;
+ if (v === undefined && defs.params[k].data.default) {
+ x[k] = defs.params[k].data.default;
} else {
x[k] = v;
}