From 58e77832beee0fc16701f2d623b8d0b99733c532 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Mon, 17 Sep 2018 08:32:51 -0700 Subject: [PATCH] Format types.ts --- js/types.ts | 130 +++++++++++++++++++++++++++++++-------------------- package.json | 3 +- 2 files changed, 81 insertions(+), 52 deletions(-) diff --git a/js/types.ts b/js/types.ts index 71faddc3..136b7246 100644 --- a/js/types.ts +++ b/js/types.ts @@ -3,33 +3,32 @@ type Skin = { name: string; }; - type Band = null; // TODO: Use a real type here. // TODO: Use a type to ensure these keys mirror the CURSORS constant in // skinParser.js -type Cursors = {[cursor: string]: string} +type Cursors = { [cursor: string]: string }; -type GenLetterWidths = {[letter: string]: number}; +type GenLetterWidths = { [letter: string]: number }; // TODO: Use a type to ensure the keys are one of the known values in PLEDIT.txt -type PlaylistStyle = {[state: string]: string}; +type PlaylistStyle = { [state: string]: string }; // TODO: Type these keys. -type SkinImages = {[sprite: string]: string}; +type SkinImages = { [sprite: string]: string }; // TODO: type these keys -type SkinRegion = {[windowName: string]: string[]} +type SkinRegion = { [windowName: string]: string[] }; // TODO: Fill these out once we actually use them. type SkinData = { - skinImages: SkinImages; - skinColors: string[]; - skinPlaylistStyle: PlaylistStyle; - skinCursors: Cursors; - skinRegion: SkinRegion; - skinGenLetterWidths: GenLetterWidths; - } + skinImages: SkinImages; + skinColors: string[]; + skinPlaylistStyle: PlaylistStyle; + skinCursors: Cursors; + skinRegion: SkinRegion; + skinGenLetterWidths: GenLetterWidths; +}; export type Action = | { @@ -41,98 +40,127 @@ export type Action = | { type: "SET_AVAILABLE_SKINS"; skins: Array; - } + } | { type: "PLAY"; - } + } | { type: "IS_PLAYING"; - } + } | { type: "PAUSE"; - } + } | { type: "STOP"; - } + } | { type: "IS_STOPPED"; - } + } | { type: "CHANNEL_COUNT_CHANGED"; channels: number; - } | { + } + | { type: "TOGGLE_TIME_MODE"; - } | { + } + | { type: "UPDATE_TIME_ELAPSED"; elapsed: number; - } | { + } + | { type: "ADD_TRACK_FROM_URL"; - } | { + } + | { type: "SET_MEDIA"; length: number; kbps: number; khz: number; channels: number; - } | { + } + | { type: "SET_VOLUME"; volume: number; - } | { + } + | { type: "SET_BALANCE"; balance: number; - } | { + } + | { type: "TOGGLE_REPEAT"; - } | { + } + | { type: "TOGGLE_SHUFFLE"; - } | { + } + | { type: "SET_FOCUS"; input: string; - } | { + } + | { type: "SET_BAND_FOCUS"; input: string; bandFocused: Band; - } | { + } + | { type: "UNSET_FOCUS"; - } | { + } + | { type: "SET_SCRUB_POSITION"; position: number; - } | { + } + | { type: "SET_USER_MESSAGE"; message: string; - } | { + } + | { type: "UNSET_USER_MESSAGE"; - } | { + } + | { type: "TOGGLE_DOUBLESIZE_MODE"; - } | { + } + | { type: "TOGGLE_LLAMA_MODE"; - } | { + } + | { type: "STEP_MARQUEE"; - } | { + } + | { type: "DISABLE_MARQUEE"; - } | { + } + | { type: "STOP_WORKING"; - } | { + } + | { type: "START_WORKING"; - } | { + } + | { type: "CLOSE_WINAMP"; - } | { + } + | { type: "LOADING"; - } | { + } + | { type: "LOADED"; - } | { + } + | { type: "SET_SKIN_DATA"; data: SkinData; - } | { + } + | { type: "TOGGLE_VISUALIZER_STYLE"; - } | { + } + | { type: "REGISTER_VISUALIZER"; id: string; - } | { + } + | { type: "SET_PLAYLIST_SCROLL_POSITION"; position: number; - } | { + } + | { type: "SET_Z_INDEX"; zIndex: number; - } | { + } + | { type: "SET_DUMMY_VIZ_DATA"; data: null; }; @@ -149,7 +177,7 @@ export interface MediaState { timeMode: string; // TODO: Convert this to an enum timeElapsed: number; length: number | null; - kbps: number| null; + kbps: number | null; khz: number | null; volume: number; balance: number; @@ -183,6 +211,6 @@ export interface DisplayState { closed: boolean; loading: boolean; playlistScrollPosition: number; - zIndex: number + zIndex: number; dummyVizData: null; // TODO: Figure out what kind of data this actually is. -} \ No newline at end of file +} diff --git a/package.json b/package.json index 6050b760..064a7182 100644 --- a/package.json +++ b/package.json @@ -126,5 +126,6 @@ "projects": [ "config/jest.*.js" ] - } + }, + "prettier": {} }