From 987168b863c52d0548050ffbac569782bb9a8cef Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 13 Apr 2019 01:43:22 +0900
Subject: strictNullChecks (#4666)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip
---
 src/server/api/define.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/server/api/define.ts')

diff --git a/src/server/api/define.ts b/src/server/api/define.ts
index a18419bcf6..990cbf2a86 100644
--- a/src/server/api/define.ts
+++ b/src/server/api/define.ts
@@ -5,9 +5,9 @@ import { ApiError } from './error';
 import { App } from '../../models/entities/app';
 
 type Params<T extends IEndpointMeta> = {
-	[P in keyof T['params']]: T['params'][P]['transform'] extends Function
-		? ReturnType<T['params'][P]['transform']>
-		: ReturnType<T['params'][P]['validator']['get']>[0];
+	[P in keyof T['params']]: NonNullable<T['params']>[P]['transform'] extends Function
+		? ReturnType<NonNullable<T['params']>[P]['transform']>
+		: ReturnType<NonNullable<T['params']>[P]['validator']['get']>[0];
 };
 
 export type Response = Record<string, any> | void;
@@ -34,11 +34,11 @@ export default function <T extends IEndpointMeta>(meta: T, cb: (params: Params<T
 	};
 }
 
-function getParams<T extends IEndpointMeta>(defs: T, params: any): [Params<T>, ApiError] {
+function getParams<T extends IEndpointMeta>(defs: T, params: any): [Params<T>, ApiError | null] {
 	if (defs.params == null) return [params, null];
 
 	const x: any = {};
-	let err: ApiError = null;
+	let err: ApiError | null = null;
 	Object.entries(defs.params).some(([k, def]) => {
 		const [v, e] = def.validator.get(params[k]);
 		if (e) {
-- 
cgit v1.2.3-freya