From f6f493536c8f8204a90f8933379c0d93d26b8fd0 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Tue, 4 Jun 2019 18:41:55 +0900
Subject: [PATCH] Use Theme type instead of any

---
 src/boot/master.ts                                    |  3 ++-
 src/boot/worker.ts                                    |  3 ++-
 .../app/common/views/components/settings/theme.vue    |  3 ++-
 src/client/app/mios.ts                                |  3 ++-
 src/client/app/theme.ts                               | 11 +----------
 src/pluginThemes.ts                                   |  6 ++++--
 src/plugins/featured-themes/main.ts                   |  3 ++-
 src/theme.ts                                          |  9 +++++++++
 8 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 src/theme.ts

diff --git a/src/boot/master.ts b/src/boot/master.ts
index 2e97e5fe1..29d1d6c4f 100644
--- a/src/boot/master.ts
+++ b/src/boot/master.ts
@@ -14,6 +14,7 @@ import { program } from '../argv';
 import { showMachineInfo } from '../misc/show-machine-info';
 import { initDb } from '../db/postgre';
 import Xev from 'xev';
+import { Theme } from '../theme';
 
 const logger = new Logger('core', 'cyan');
 const bootLogger = logger.createSubLogger('boot', 'magenta', false);
@@ -116,7 +117,7 @@ function showEnvironment(): void {
 }
 
 const pluginService = {
-	registerTheme(theme: any) {
+	registerTheme(theme: Theme) {
 		const ev = new Xev();
 		ev.emit('registerPluginTheme', theme);
 	}
diff --git a/src/boot/worker.ts b/src/boot/worker.ts
index d7b453d4c..2a0125ab8 100644
--- a/src/boot/worker.ts
+++ b/src/boot/worker.ts
@@ -2,6 +2,7 @@ import * as cluster from 'cluster';
 import { initDb } from '../db/postgre';
 import Xev from 'xev';
 import { registerTheme } from '../pluginThemes';
+import { Theme } from '../theme';
 
 const ev = new Xev();
 
@@ -21,7 +22,7 @@ export async function workerMain() {
 		// Send a 'ready' message to parent process
 		process.send!('ready');
 
-		ev.on('registerPluginTheme', theme => {
+		ev.on('registerPluginTheme', (theme: Theme) => {
 			registerTheme(theme);
 		});
 	}
diff --git a/src/client/app/common/views/components/settings/theme.vue b/src/client/app/common/views/components/settings/theme.vue
index 4de0b5345..342cbc0cc 100644
--- a/src/client/app/common/views/components/settings/theme.vue
+++ b/src/client/app/common/views/components/settings/theme.vue
@@ -123,7 +123,8 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../../i18n';
-import { lightTheme, darkTheme, applyTheme, Theme } from '../../../../theme';
+import { lightTheme, darkTheme, applyTheme } from '../../../../theme';
+import { Theme } from '../../../../../../theme';
 import { Chrome } from 'vue-color';
 import * as uuid from 'uuid';
 import * as tinycolor from 'tinycolor2';
diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts
index 1366f641d..06c7e5292 100644
--- a/src/client/app/mios.ts
+++ b/src/client/app/mios.ts
@@ -9,7 +9,8 @@ import Progress from './common/scripts/loading';
 
 import Err from './common/views/components/connect-failed.vue';
 import Stream from './common/scripts/stream';
-import { Theme, builtinThemes } from './theme';
+import { builtinThemes } from './theme';
+import { Theme } from '../../theme';
 import { concat } from '../../prelude/array';
 
 //#region api requests
diff --git a/src/client/app/theme.ts b/src/client/app/theme.ts
index 26c0cbf65..dba96d983 100644
--- a/src/client/app/theme.ts
+++ b/src/client/app/theme.ts
@@ -1,14 +1,5 @@
 import * as tinycolor from 'tinycolor2';
-
-export type Theme = {
-	id: string;
-	name: string;
-	author: string;
-	desc?: string;
-	base?: 'dark' | 'light';
-	vars: { [key: string]: string };
-	props: { [key: string]: string };
-};
+import { Theme } from '../../theme';
 
 export const lightTheme: Theme = require('../themes/light.json5');
 export const darkTheme: Theme = require('../themes/dark.json5');
diff --git a/src/pluginThemes.ts b/src/pluginThemes.ts
index 02ca8ca43..c2b5a3afc 100644
--- a/src/pluginThemes.ts
+++ b/src/pluginThemes.ts
@@ -1,6 +1,8 @@
-const themes: any[] = [];
+import { Theme } from './theme';
 
-export function registerTheme(theme: any) {
+const themes: Theme[] = [];
+
+export function registerTheme(theme: Theme) {
 	themes.push(theme);
 }
 
diff --git a/src/plugins/featured-themes/main.ts b/src/plugins/featured-themes/main.ts
index 2cd54a4b5..bcad9a5e7 100644
--- a/src/plugins/featured-themes/main.ts
+++ b/src/plugins/featured-themes/main.ts
@@ -1,12 +1,13 @@
 require('json5/lib/register');
 import * as fs from 'fs';
+import { Theme } from '../../theme';
 
 export function onActivate(service: any) {
 	const fileNames = fs.readdirSync(`${__dirname}/themes`)
 		.filter(f => fs.statSync(`${__dirname}/themes/${f}`).isFile());
 
 	for (const fileName of fileNames) {
-		const theme = require(`${__dirname}/themes/${fileName}`);
+		const theme = require(`${__dirname}/themes/${fileName}`) as Theme;
 		service.registerTheme(theme);
 	}
 }
diff --git a/src/theme.ts b/src/theme.ts
new file mode 100644
index 000000000..eac6abd68
--- /dev/null
+++ b/src/theme.ts
@@ -0,0 +1,9 @@
+export type Theme = {
+	id: string;
+	name: string;
+	author: string;
+	desc?: string;
+	base?: 'dark' | 'light';
+	vars: { [key: string]: string };
+	props: { [key: string]: string };
+};