Merge pull request #15 from ryohey/refactor

Release

Author: ryohey

.vscode/settings.json

@@ -5,6 +5,6 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "editor.codeActionsOnSave": {
-    "source.organizeImports": true
+    "source.organizeImports": "explicit"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "midifile-ts",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/event.ts

@@ -49,7 +49,7 @@ export interface PortPrefixEvent extends MetaEvent<"portPrefix"> {
   port: number
 }
 
-export interface EndOfTrackEvent extends MetaEvent<"endOfTrack"> { }
+export interface EndOfTrackEvent extends MetaEvent<"endOfTrack"> {}
 
 export interface SetTempoEvent extends MetaEvent<"setTempo"> {
   microsecondsPerBeat: number
@@ -139,64 +139,47 @@ export interface SysExEvent extends Event<"sysEx"> {
 export interface DividedSysExEvent extends Event<"dividedSysEx"> {
   data: number[]
 }
-// System Common Events
-export interface TimeCodeQuarterFrameEvent {
-  deltaTime: number;
-  type: "system";
-  subtype: "timeCodeQuarterFrame";
-  data: number;
-}
 
-export interface SongPositionPointerEvent {
-  deltaTime: number;
-  type: "system";
-  subtype: "songPositionPointer";
-  value: number; // 14-bit value
-}
+/* System Common Events */
 
-export interface SongSelectEvent {
-  deltaTime: number;
-  type: "system";
-  subtype: "songSelect";
-  songNumber: number;
+export interface SystemEvent<T extends string> extends Event<"system"> {
+  subtype: T
 }
 
-export interface TuneRequestEvent {
-  deltaTime: number;
-  type: "system";
-  subtype: "tuneRequest";
+export interface TimeCodeQuarterFrameEvent
+  extends SystemEvent<"timeCodeQuarterFrame"> {
+  data: number
 }
 
-// Real-Time Events
-export interface TimingClockEvent {
-  deltaTime: number;
-  type: "system";
-  subtype: "timingClock";
+export interface SongPositionPointerEvent
+  extends SystemEvent<"songPositionPointer"> {
+  value: number // 14-bit value
 }
 
-export interface StartEvent {
-  deltaTime: number;
-  type: "system";
-  subtype: "start";
+export interface SongPositionPointerEvent
+  extends SystemEvent<"songPositionPointer"> {
+  value: number // 14-bit value
 }
 
-export interface ContinueEvent {
-  deltaTime: number;
-  type: "system";
-  subtype: "continue";
+export interface SongSelectEvent extends SystemEvent<"songSelect"> {
+  songNumber: number
 }
 
-export interface StopEvent {
-  deltaTime: number;
-  type: "system";
-  subtype: "stop";
+export interface TuneRequestEvent extends SystemEvent<"tuneRequest"> {
+  data: number[]
 }
 
-export interface ActiveSensingEvent {
-  deltaTime: number;
-  type: "system";
-  subtype: "activeSensing";
-}
+/* Real-Time Events */
+
+export interface TimingClockEvent extends SystemEvent<"timingClock"> {}
+
+export interface StartEvent extends SystemEvent<"start"> {}
+
+export interface ContinueEvent extends SystemEvent<"continue"> {}
+
+export interface StopEvent extends SystemEvent<"stop"> {}
+
+export interface ActiveSensingEvent extends SystemEvent<"activeSensing"> {}
 
 export type AnyMetaEvent =
   | SequenceNumberEvent
@@ -227,6 +210,17 @@ export type AnyChannelEvent =
   | UnknownChannelEvent
   | ControllerEvent
 
-export type AnySysExEvent = SysExEvent | DividedSysExEvent | TimeCodeQuarterFrameEvent | SongPositionPointerEvent | SongSelectEvent | TuneRequestEvent | TimingClockEvent | StartEvent | ContinueEvent | StopEvent | ActiveSensingEvent
+export type AnySysExEvent =
+  | SysExEvent
+  | DividedSysExEvent
+  | TimeCodeQuarterFrameEvent
+  | SongPositionPointerEvent
+  | SongSelectEvent
+  | TuneRequestEvent
+  | TimingClockEvent
+  | StartEvent
+  | ContinueEvent
+  | StopEvent
+  | ActiveSensingEvent
 
 export type AnyEvent = AnyMetaEvent | AnySysExEvent | AnyChannelEvent