Use as const

#5089

16 files changed, 239 insertions, 269 deletions

diff --git a/src/services/chart/charts/schemas/active-users.ts b/src/services/chart/charts/schemas/active-users.ts
index f10393bc36..6e26bb4698 100644
--- a/src/services/chart/charts/schemas/active-users.ts
+++ b/src/services/chart/charts/schemas/active-users.ts
@@ -1,12 +1,10 @@
-import { types, bool } from '../../../../misc/schema';
-
 export const logSchema = {
 	/**
 	 * アクティブユーザー数
 	 */
 	count: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: 'アクティブユーザー数',
 	},
 };
@@ -15,17 +13,17 @@ export const logSchema = {
  * アクティブユーザーに関するチャート
  */
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		local: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 		remote: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 	}
diff --git a/src/services/chart/charts/schemas/drive.ts b/src/services/chart/charts/schemas/drive.ts
index 3327950635..dcc50df8cf 100644
--- a/src/services/chart/charts/schemas/drive.ts
+++ b/src/services/chart/charts/schemas/drive.ts
@@ -1,12 +1,10 @@
-import { types, bool } from '../../../../misc/schema';
-
 const logSchema = {
 	/**
 	 * 集計期間時点での、全ドライブファイル数
 	 */
 	totalCount: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '集計期間時点での、全ドライブファイル数'
 	},
 
@@ -14,8 +12,8 @@ const logSchema = {
 	 * 集計期間時点での、全ドライブファイルの合計サイズ
 	 */
 	totalSize: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '集計期間時点での、全ドライブファイルの合計サイズ'
 	},
 
@@ -23,8 +21,8 @@ const logSchema = {
 	 * 増加したドライブファイル数
 	 */
 	incCount: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '増加したドライブファイル数'
 	},
 
@@ -32,8 +30,8 @@ const logSchema = {
 	 * 増加したドライブ使用量
 	 */
 	incSize: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '増加したドライブ使用量'
 	},
 
@@ -41,8 +39,8 @@ const logSchema = {
 	 * 減少したドライブファイル数
 	 */
 	decCount: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '減少したドライブファイル数'
 	},
 
@@ -50,24 +48,24 @@ const logSchema = {
 	 * 減少したドライブ使用量
 	 */
 	decSize: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '減少したドライブ使用量'
 	},
 };
 
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		local: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 		remote: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 	}
diff --git a/src/services/chart/charts/schemas/federation.ts b/src/services/chart/charts/schemas/federation.ts
index 41ae977cbd..2f2d22c0d3 100644
--- a/src/services/chart/charts/schemas/federation.ts
+++ b/src/services/chart/charts/schemas/federation.ts
@@ -1,29 +1,27 @@
-import { types, bool } from '../../../../misc/schema';
-
 /**
  * フェデレーションに関するチャート
  */
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		instance: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: {
 				total: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: 'インスタンス数の合計'
 				},
 				inc: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '増加インスタンス数'
 				},
 				dec: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '減少インスタンス数'
 				},
 			}
diff --git a/src/services/chart/charts/schemas/hashtag.ts b/src/services/chart/charts/schemas/hashtag.ts
index 918242f66e..4dfd61c97f 100644
--- a/src/services/chart/charts/schemas/hashtag.ts
+++ b/src/services/chart/charts/schemas/hashtag.ts
@@ -1,12 +1,10 @@
-import { types, bool } from '../../../../misc/schema';
-
 export const logSchema = {
 	/**
 	 * 投稿された数
 	 */
 	count: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '投稿された数',
 	},
 };
@@ -15,17 +13,17 @@ export const logSchema = {
  * ハッシュタグに関するチャート
  */
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		local: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 		remote: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 	}
diff --git a/src/services/chart/charts/schemas/instance.ts b/src/services/chart/charts/schemas/instance.ts
index d97f49ea72..d2152a4ae7 100644
--- a/src/services/chart/charts/schemas/instance.ts
+++ b/src/services/chart/charts/schemas/instance.ts
@@ -1,73 +1,71 @@
-import { types, bool } from '../../../../misc/schema';
-
 /**
  * インスタンスごとのチャート
  */
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		requests: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: {
 				failed: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '失敗したリクエスト数'
 				},
 				succeeded: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '成功したリクエスト数'
 				},
 				received: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '受信したリクエスト数'
 				},
 			}
 		},
 
 		notes: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: {
 				total: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '集計期間時点での、全投稿数'
 				},
 				inc: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '増加した投稿数'
 				},
 				dec: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '減少した投稿数'
 				},
 
 				diffs: {
-					type: types.object,
-					optional: bool.false, nullable: bool.false,
+					type: 'object' as const,
+					optional: false as const, nullable: false as const,
 					properties: {
 						normal: {
-							type: types.number,
-							optional: bool.false, nullable: bool.false,
+							type: 'number' as const,
+							optional: false as const, nullable: false as const,
 							description: '通常の投稿数の差分'
 						},
 
 						reply: {
-							type: types.number,
-							optional: bool.false, nullable: bool.false,
+							type: 'number' as const,
+							optional: false as const, nullable: false as const,
 							description: 'リプライの投稿数の差分'
 						},
 
 						renote: {
-							type: types.number,
-							optional: bool.false, nullable: bool.false,
+							type: 'number' as const,
+							optional: false as const, nullable: false as const,
 							description: 'Renoteの投稿数の差分'
 						},
 					}
@@ -76,103 +74,103 @@ export const schema = {
 		},
 
 		users: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: {
 				total: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '集計期間時点での、全ユーザー数'
 				},
 				inc: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '増加したユーザー数'
 				},
 				dec: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '減少したユーザー数'
 				},
 			}
 		},
 
 		following: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: {
 				total: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '集計期間時点での、全フォロー数'
 				},
 				inc: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '増加したフォロー数'
 				},
 				dec: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '減少したフォロー数'
 				},
 			}
 		},
 
 		followers: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: {
 				total: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '集計期間時点での、全フォロワー数'
 				},
 				inc: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '増加したフォロワー数'
 				},
 				dec: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '減少したフォロワー数'
 				},
 			}
 		},
 
 		drive: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: {
 				totalFiles: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '集計期間時点での、全ドライブファイル数'
 				},
 				totalUsage: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '集計期間時点での、全ドライブファイルの合計サイズ'
 				},
 				incFiles: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '増加したドライブファイル数'
 				},
 				incUsage: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '増加したドライブ使用量'
 				},
 				decFiles: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '減少したドライブファイル数'
 				},
 				decUsage: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '減少したドライブ使用量'
 				},
 			}
diff --git a/src/services/chart/charts/schemas/network.ts b/src/services/chart/charts/schemas/network.ts
index 819e2a145e..30123c5d90 100644
--- a/src/services/chart/charts/schemas/network.ts
+++ b/src/services/chart/charts/schemas/network.ts
@@ -1,35 +1,33 @@
-import { types, bool } from '../../../../misc/schema';
-
 /**
  * ネットワークに関するチャート
  */
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		incomingRequests: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '受信したリクエスト数'
 		},
 		outgoingRequests: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '送信したリクエスト数'
 		},
 		totalTime: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '応答時間の合計' // TIP: (totalTime / incomingRequests) でひとつのリクエストに平均でどれくらいの時間がかかったか知れる
 		},
 		incomingBytes: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '合計受信データ量'
 		},
 		outgoingBytes: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '合計送信データ量'
 		},
 	}
diff --git a/src/services/chart/charts/schemas/notes.ts b/src/services/chart/charts/schemas/notes.ts
index aabe49edd9..6dbf321b7c 100644
--- a/src/services/chart/charts/schemas/notes.ts
+++ b/src/services/chart/charts/schemas/notes.ts
@@ -1,43 +1,41 @@
-import { types, bool } from '../../../../misc/schema';
-
 const logSchema = {
 	total: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '集計期間時点での、全投稿数'
 	},
 
 	inc: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '増加した投稿数'
 	},
 
 	dec: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '減少した投稿数'
 	},
 
 	diffs: {
-		type: types.object,
-		optional: bool.false, nullable: bool.false,
+		type: 'object' as const,
+		optional: false as const, nullable: false as const,
 		properties: {
 			normal: {
-				type: types.number,
-				optional: bool.false, nullable: bool.false,
+				type: 'number' as const,
+				optional: false as const, nullable: false as const,
 				description: '通常の投稿数の差分'
 			},
 
 			reply: {
-				type: types.number,
-				optional: bool.false, nullable: bool.false,
+				type: 'number' as const,
+				optional: false as const, nullable: false as const,
 				description: 'リプライの投稿数の差分'
 			},
 
 			renote: {
-				type: types.number,
-				optional: bool.false, nullable: bool.false,
+				type: 'number' as const,
+				optional: false as const, nullable: false as const,
 				description: 'Renoteの投稿数の差分'
 			},
 		}
@@ -45,17 +43,17 @@ const logSchema = {
 };
 
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		local: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 		remote: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 	}
diff --git a/src/services/chart/charts/schemas/per-user-drive.ts b/src/services/chart/charts/schemas/per-user-drive.ts
index 62e7795167..21312e82d8 100644
--- a/src/services/chart/charts/schemas/per-user-drive.ts
+++ b/src/services/chart/charts/schemas/per-user-drive.ts
@@ -1,15 +1,13 @@
-import { types, bool } from '../../../../misc/schema';
-
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		/**
 		 * 集計期間時点での、全ドライブファイル数
 		 */
 		totalCount: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '集計期間時点での、全ドライブファイル数'
 		},
 
@@ -17,8 +15,8 @@ export const schema = {
 		 * 集計期間時点での、全ドライブファイルの合計サイズ
 		 */
 		totalSize: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '集計期間時点での、全ドライブファイルの合計サイズ'
 		},
 
@@ -26,8 +24,8 @@ export const schema = {
 		 * 増加したドライブファイル数
 		 */
 		incCount: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '増加したドライブファイル数'
 		},
 
@@ -35,8 +33,8 @@ export const schema = {
 		 * 増加したドライブ使用量
 		 */
 		incSize: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '増加したドライブ使用量'
 		},
 
@@ -44,8 +42,8 @@ export const schema = {
 		 * 減少したドライブファイル数
 		 */
 		decCount: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '減少したドライブファイル数'
 		},
 
@@ -53,8 +51,8 @@ export const schema = {
 		 * 減少したドライブ使用量
 		 */
 		decSize: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '減少したドライブ使用量'
 		},
 	}
diff --git a/src/services/chart/charts/schemas/per-user-following.ts b/src/services/chart/charts/schemas/per-user-following.ts
index e57869e79a..dffd9c2572 100644
--- a/src/services/chart/charts/schemas/per-user-following.ts
+++ b/src/services/chart/charts/schemas/per-user-following.ts
@@ -1,19 +1,17 @@
-import { types, bool } from '../../../../misc/schema';
-
 export const logSchema = {
 	/**
 	 * フォローしている
 	 */
 	followings: {
-		type: types.object,
-		optional: bool.false, nullable: bool.false,
+		type: 'object' as const,
+		optional: false as const, nullable: false as const,
 		properties: {
 			/**
 			 * フォローしている合計
 			 */
 			total: {
-				type: types.number,
-				optional: bool.false, nullable: bool.false,
+				type: 'number' as const,
+				optional: false as const, nullable: false as const,
 				description: 'フォローしている合計',
 			},
 
@@ -21,8 +19,8 @@ export const logSchema = {
 			 * フォローした数
 			 */
 			inc: {
-				type: types.number,
-				optional: bool.false, nullable: bool.false,
+				type: 'number' as const,
+				optional: false as const, nullable: false as const,
 				description: 'フォローした数',
 			},
 
@@ -30,8 +28,8 @@ export const logSchema = {
 			 * フォロー解除した数
 			 */
 			dec: {
-				type: types.number,
-				optional: bool.false, nullable: bool.false,
+				type: 'number' as const,
+				optional: false as const, nullable: false as const,
 				description: 'フォロー解除した数',
 			},
 		}
@@ -41,15 +39,15 @@ export const logSchema = {
 	 * フォローされている
 	 */
 	followers: {
-		type: types.object,
-		optional: bool.false, nullable: bool.false,
+		type: 'object' as const,
+		optional: false as const, nullable: false as const,
 		properties: {
 			/**
 			 * フォローされている合計
 			 */
 			total: {
-				type: types.number,
-				optional: bool.false, nullable: bool.false,
+				type: 'number' as const,
+				optional: false as const, nullable: false as const,
 				description: 'フォローされている合計',
 			},
 
@@ -57,8 +55,8 @@ export const logSchema = {
 			 * フォローされた数
 			 */
 			inc: {
-				type: types.number,
-				optional: bool.false, nullable: bool.false,
+				type: 'number' as const,
+				optional: false as const, nullable: false as const,
 				description: 'フォローされた数',
 			},
 
@@ -66,8 +64,8 @@ export const logSchema = {
 			 * フォロー解除された数
 			 */
 			dec: {
-				type: types.number,
-				optional: bool.false, nullable: bool.false,
+				type: 'number' as const,
+				optional: false as const, nullable: false as const,
 				description: 'フォロー解除された数',
 			},
 		}
@@ -75,17 +73,17 @@ export const logSchema = {
 };
 
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		local: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 		remote: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 	}
diff --git a/src/services/chart/charts/schemas/per-user-notes.ts b/src/services/chart/charts/schemas/per-user-notes.ts
index 7632450073..778f498c6e 100644
--- a/src/services/chart/charts/schemas/per-user-notes.ts
+++ b/src/services/chart/charts/schemas/per-user-notes.ts
@@ -1,46 +1,44 @@
-import { types, bool } from '../../../../misc/schema';
-
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		total: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '集計期間時点での、全投稿数'
 		},
 
 		inc: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '増加した投稿数'
 		},
 
 		dec: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: '減少した投稿数'
 		},
 
 		diffs: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: {
 				normal: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: '通常の投稿数の差分'
 				},
 
 				reply: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: 'リプライの投稿数の差分'
 				},
 
 				renote: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: 'Renoteの投稿数の差分'
 				},
 			}
diff --git a/src/services/chart/charts/schemas/per-user-reactions.ts b/src/services/chart/charts/schemas/per-user-reactions.ts
index df7d5a6dbb..d103124ccb 100644
--- a/src/services/chart/charts/schemas/per-user-reactions.ts
+++ b/src/services/chart/charts/schemas/per-user-reactions.ts
@@ -1,12 +1,10 @@
-import { types, bool } from '../../../../misc/schema';
-
 export const logSchema = {
 	/**
 	 * フォローしている合計
 	 */
 	count: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: 'リアクションされた数',
 	},
 };
@@ -15,17 +13,17 @@ export const logSchema = {
  * ユーザーごとのリアクションに関するチャート
  */
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		local: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 		remote: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 	}
diff --git a/src/services/chart/charts/schemas/test-grouped.ts b/src/services/chart/charts/schemas/test-grouped.ts
index 893458e90a..163ec5bba3 100644
--- a/src/services/chart/charts/schemas/test-grouped.ts
+++ b/src/services/chart/charts/schemas/test-grouped.ts
@@ -1,28 +1,26 @@
-import { types, bool } from '../../../../misc/schema';
-
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		foo: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: {
 				total: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: ''
 				},
 
 				inc: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: ''
 				},
 
 				dec: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: ''
 				},
 			}
diff --git a/src/services/chart/charts/schemas/test-unique.ts b/src/services/chart/charts/schemas/test-unique.ts
index 2b3f445ff0..075a8092d9 100644
--- a/src/services/chart/charts/schemas/test-unique.ts
+++ b/src/services/chart/charts/schemas/test-unique.ts
@@ -1,12 +1,10 @@
-import { types, bool } from '../../../../misc/schema';
-
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		foo: {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 			description: ''
 		},
 	}
diff --git a/src/services/chart/charts/schemas/test.ts b/src/services/chart/charts/schemas/test.ts
index 9bdc05990b..6142434a89 100644
--- a/src/services/chart/charts/schemas/test.ts
+++ b/src/services/chart/charts/schemas/test.ts
@@ -1,28 +1,26 @@
-import { types, bool } from '../../../../misc/schema';
-
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		foo: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: {
 				total: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: ''
 				},
 
 				inc: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: ''
 				},
 
 				dec: {
-					type: types.number,
-					optional: bool.false, nullable: bool.false,
+					type: 'number' as const,
+					optional: false as const, nullable: false as const,
 					description: ''
 				},
 			}
diff --git a/src/services/chart/charts/schemas/users.ts b/src/services/chart/charts/schemas/users.ts
index 6ae6133350..1153369983 100644
--- a/src/services/chart/charts/schemas/users.ts
+++ b/src/services/chart/charts/schemas/users.ts
@@ -1,12 +1,10 @@
-import { types, bool } from '../../../../misc/schema';
-
 const logSchema = {
 	/**
 	 * 集計期間時点での、全ユーザー数
 	 */
 	total: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '集計期間時点での、全ユーザー数'
 	},
 
@@ -14,8 +12,8 @@ const logSchema = {
 	 * 増加したユーザー数
 	 */
 	inc: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '増加したユーザー数'
 	},
 
@@ -23,24 +21,24 @@ const logSchema = {
 	 * 減少したユーザー数
 	 */
 	dec: {
-		type: types.number,
-		optional: bool.false, nullable: bool.false,
+		type: 'number' as const,
+		optional: false as const, nullable: false as const,
 		description: '減少したユーザー数'
 	},
 };
 
 export const schema = {
-	type: types.object,
-	optional: bool.false, nullable: bool.false,
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
 	properties: {
 		local: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 		remote: {
-			type: types.object,
-			optional: bool.false, nullable: bool.false,
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
 			properties: logSchema
 		},
 	}
diff --git a/src/services/chart/core.ts b/src/services/chart/core.ts
index 6564ef7813..d5fd9a5c5c 100644
--- a/src/services/chart/core.ts
+++ b/src/services/chart/core.ts
@@ -8,7 +8,7 @@ import * as moment from 'moment';
 import * as nestedProperty from 'nested-property';
 import autobind from 'autobind-decorator';
 import Logger from '../logger';
-import { Schema, bool, types } from '../../misc/schema';
+import { Schema } from '../../misc/schema';
 import { EntitySchema, getRepository, Repository, LessThan, MoreThanOrEqual } from 'typeorm';
 import { isDuplicateKeyValueError } from '../../misc/is-duplicate-key-value-error';
 
@@ -462,8 +462,8 @@ export function convertLog(logSchema: Schema): Schema {
 	if (v.type === 'number') {
 		v.type = 'array';
 		v.items = {
-			type: types.number,
-			optional: bool.false, nullable: bool.false,
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
 		};
 	} else if (v.type === 'object') {
 		for (const k of Object.keys(v.properties!)) {