Refactor typings to reduce/remove type casts (#131)

* avoid type casting

* prefer types over interfaces

* forgot one oops

* remove more type casting

* be a bit more explicit with return types

src/console/communication.ts

@@ -6,7 +6,7 @@ export enum CommunicationType {
   KEEP_ALIVE = 3,
 }
 
-export interface CommunicationMessage {
+export type CommunicationMessage = {
   type: CommunicationType;
   payload: {
     cursor: Uint8Array;
@@ -18,7 +18,7 @@ export interface CommunicationMessage {
     forcePos: boolean;
     nintendontVersion: string | null;
   };
-}
+};
 
 // This class is responsible for handling the communication protocol between the Wii and the
 // desktop app

src/console/types.ts

@@ -22,17 +22,17 @@ export enum Ports {
   RELAY_START = 53741,
 }
 
-export interface ConnectionDetails {
+export type ConnectionDetails = {
   consoleNick: string;
   gameDataCursor: number | Uint8Array;
   version: string;
   clientToken?: number;
-}
+};
 
-export interface ConnectionSettings {
+export type ConnectionSettings = {
   ipAddress: string;
   port: number;
-}
+};
 
 export interface Connection extends EventEmitter {
   getStatus(): ConnectionStatus;

src/melee/characterUtils.ts

@@ -3,12 +3,12 @@ import characters from "./characters.json";
 export type CharacterColor = string;
 const DEFAULT_COLOR: CharacterColor = "Default";
 
-export interface CharacterInfo {
+export type CharacterInfo = {
   id: number;
   name: string;
   shortName: string;
   colors: CharacterColor[];
-}
+};
 
 export const UnknownCharacter: CharacterInfo = {
   id: -1,

src/melee/moveUtils.ts

@@ -1,10 +1,10 @@
 import moveNames from "./moves.json";
 
-export interface Move {
+export type Move = {
   id: number;
   name: string;
   shortName: string;
-}
+};
 
 export const UnknownMove: Move = {
   id: -1,

src/melee/stageUtils.ts

@@ -1,9 +1,9 @@
 import stageNames from "./stages.json";
 
-export interface StageInfo {
+export type StageInfo = {
   id: number;
   name: string;
-}
+};
 
 export const UnknownStage: StageInfo = {
   id: -1,

src/stats/actions.ts

@@ -13,11 +13,11 @@ import type { StatComputer } from "./stats";
 // Frame pattern that indicates a dash dance turn was executed
 const dashDanceAnimations = [State.DASH, State.TURN, State.DASH];
 
-interface PlayerActionState {
+type PlayerActionState = {
   playerCounts: ActionCountsType;
   animations: number[];
   actionFrameCounters: number[];
-}
+};
 
 export class ActionsComputer implements StatComputer<ActionCountsType[]> {
   private playerPermutations = new Array<PlayerIndexedType>();

src/stats/combos.ts

@@ -23,13 +23,13 @@ export enum ComboEvent {
   COMBO_END = "COMBO_END",
 }
 
-interface ComboState {
+type ComboState = {
   combo: ComboType | null;
   move: MoveLandedType | null;
   resetCounter: number;
   lastHitAnimation: number | null;
   event: ComboEvent | null;
-}
+};
 
 export class ComboComputer extends EventEmitter implements StatComputer<ComboType[]> {
   private playerPermutations = new Array<PlayerIndexedType>();

src/stats/common.ts

@@ -1,6 +1,6 @@
 import type { GameStartType, PostFrameUpdateType } from "../types";
 
-export interface StatsType {
+export type StatsType = {
   gameComplete: boolean;
   lastFrame: number;
   playableFrameCount: number;
@@ -9,76 +9,78 @@ export interface StatsType {
   combos: ComboType[];
   actionCounts: ActionCountsType[];
   overall: OverallType[];
-}
+};
 
 export type StadiumStatsType = HomeRunContestResultType | TargetTestResultType;
 
-export interface TargetTestResultType {
+export type TargetTestResultType = {
   type: "target-test";
   targetBreaks: TargetBreakType[];
-}
+};
 
-export interface HomeRunContestResultType {
+export type HomeRunContestResultType = {
   type: "home-run-contest";
   distance: number;
   units: "feet" | "meters";
-}
+};
 
-export interface RatioType {
+export type RatioType = {
   count: number;
   total: number;
   ratio: number | null;
-}
+};
 
-export interface PlayerIndexedType {
+export type PlayerIndexedType = {
   playerIndex: number;
   opponentIndex: number;
-}
+};
 
-export interface DurationType {
+export type DurationType = {
   startFrame: number;
   endFrame?: number | null;
-}
+};
 
-export interface DamageType {
+export type DamageType = {
   startPercent: number;
   currentPercent: number;
   endPercent?: number | null;
-}
+};
 
-export interface StockType extends DurationType, DamageType {
-  playerIndex: number;
-  count: number;
-  deathAnimation?: number | null;
-}
+export type StockType = DurationType &
+  DamageType & {
+    playerIndex: number;
+    count: number;
+    deathAnimation?: number | null;
+  };
 
-export interface MoveLandedType {
+export type MoveLandedType = {
   playerIndex: number;
   frame: number;
   moveId: number;
   hitCount: number;
   damage: number;
-}
+};
 
-export interface ComboType extends DurationType, DamageType {
-  playerIndex: number;
-  moves: MoveLandedType[];
-  didKill: boolean;
-  lastHitBy: number | null;
-}
+export type ComboType = DurationType &
+  DamageType & {
+    playerIndex: number;
+    moves: MoveLandedType[];
+    didKill: boolean;
+    lastHitBy: number | null;
+  };
 
-export interface TargetBreakType {
+export type TargetBreakType = {
   spawnId: number;
   frameDestroyed: number | null;
   positionX: number;
   positionY: number;
-}
+};
 
-export interface ConversionType extends ComboType {
+export type ConversionType = ComboType & {
   openingType: string;
-}
+};
 
-export interface ActionCountsType {
+export type ActionCountsType = {
   playerIndex: number;
   wavedashCount: number;
   wavelandCount: number;
@@ -130,17 +132,17 @@ export interface ActionCountsType {
     success: number;
     fail: number;
   };
-}
+};
 
-export interface InputCountsType {
+export type InputCountsType = {
   buttons: number;
   triggers: number;
   joystick: number;
   cstick: number;
   total: number;
-}
+};
 
-export interface OverallType {
+export type OverallType = {
   playerIndex: number;
   inputCounts: InputCountsType;
   conversionCount: number;
@@ -154,7 +156,7 @@ export interface OverallType {
   neutralWinRatio: RatioType;
   counterHitRatio: RatioType;
   beneficialTradeRatio: RatioType;
-}
+};
 
 export enum State {
   // Animation ID ranges

src/stats/conversions.ts

@@ -19,18 +19,18 @@ import {
 } from "./common";
 import type { StatComputer } from "./stats";
 
-interface PlayerConversionState {
+type PlayerConversionState = {
   conversion: ConversionType | null;
   move: MoveLandedType | null;
   resetCounter: number;
   lastHitAnimation: number | null;
-}
+};
 
-interface MetadataType {
+type MetadataType = {
   lastEndFrameByOppIdx: {
     [oppIdx: number]: number;
   };
-}
+};
 
 export class ConversionComputer extends EventEmitter implements StatComputer<ConversionType[]> {
   private playerPermutations = new Array<PlayerIndexedType>();

src/stats/inputs.ts

@@ -16,15 +16,15 @@ enum JoystickRegion {
   W = 8,
 }
 
-export interface PlayerInput {
+export type PlayerInput = {
   playerIndex: number;
   opponentIndex: number;
   inputCount: number;
   joystickInputCount: number;
   cstickInputCount: number;
   buttonInputCount: number;
   triggerInputCount: number;
-}
+};
 
 export class InputComputer implements StatComputer<PlayerInput[]> {
   private state = new Map<PlayerIndexedType, PlayerInput>();

src/stats/overall.ts

@@ -11,11 +11,11 @@ import type { GameStartType } from "../types";
 import type { ConversionType, InputCountsType, OverallType, RatioType } from "./common";
 import type { PlayerInput } from "./inputs";
 
-interface ConversionsByPlayerByOpening {
+type ConversionsByPlayerByOpening = {
   [playerIndex: string]: {
     [openingType: string]: ConversionType[];
   };
-}
+};
 
 export function generateOverallStats({
   settings,

src/stats/stats.ts

@@ -9,9 +9,9 @@ export interface StatComputer<T> {
   fetch(): T;
 }
 
-export interface StatOptions {
+export type StatOptions = {
   processOnTheFly: boolean;
-}
+};
 
 const defaultOptions: StatOptions = {
   processOnTheFly: false,

src/stats/stocks.ts

@@ -3,9 +3,9 @@ import type { PlayerIndexedType, StockType } from "./common";
 import { didLoseStock, getSinglesPlayerPermutationsFromSettings, isDead } from "./common";
 import type { StatComputer } from "./stats";
 
-interface StockState {
+type StockState = {
   stock?: StockType | null;
-}
+};
 
 export class StockComputer implements StatComputer<StockType[]> {
   private state = new Map<PlayerIndexedType, StockState>();