Fix typings

dolanmiu · dolanmiu · commit b2d6593674fe · 2018-01-19T02:09:02.000Z
diff --git a/my-typings/avs/audio-player/play.directive.d.ts b/my-typings/avs/audio-player/play.directive.d.ts
@@ -1,23 +1,21 @@
 // https://developer.amazon.com/docs/alexa-voice-service/audioplayer.html#play
 declare namespace AVS {
     namespace AudioPlayer {
-        interface PlayDirective extends AVS.DirectiveMetadata {
-            payload: {
-                playBehavior: string;
-                audioItem: {
-                    audioItemId: string;
-                    stream: {
-                        url: string;
-                        streamFormat: "AUDIO_MPEG";
-                        offsetInMilliseconds: number;
-                        expiryTime: string;
-                        progressReport: {
-                            progressReportDelayInMilliseconds: number;
-                            progressReportIntervalInMilliseconds: number;
-                        };
-                        token: string;
-                        expectedPreviousToken: string;
+        interface PlayDirective {
+            playBehavior: string;
+            audioItem: {
+                audioItemId: string;
+                stream: {
+                    url: string;
+                    streamFormat: "AUDIO_MPEG";
+                    offsetInMilliseconds: number;
+                    expiryTime: string;
+                    progressReport: {
+                        progressReportDelayInMilliseconds: number;
+                        progressReportIntervalInMilliseconds: number;
                     };
+                    token: string;
+                    expectedPreviousToken: string;
                 };
             };
         }
diff --git a/my-typings/avs/audio-player/playback-nearly-finished.event.d.ts b/my-typings/avs/audio-player/playback-nearly-finished.event.d.ts
@@ -1,11 +1,9 @@
 // https://developer.amazon.com/docs/alexa-voice-service/audioplayer.html#playbacknearlyfinished
 declare namespace AVS {
     namespace AudioPlayer {
-        interface PlaybackNearlyFinishedEvent extends AVS.EventMetadata {
-            payload: {
-                token: string;
-                offsetInMilliseconds: number;
-            };
+        interface PlaybackNearlyFinishedEvent {
+            token: string;
+            offsetInMilliseconds: number;
         }
     }
 }
diff --git a/my-typings/avs/audio-player/playback-started.event.d.ts b/my-typings/avs/audio-player/playback-started.event.d.ts
@@ -1,11 +1,9 @@
 // https://developer.amazon.com/docs/alexa-voice-service/audioplayer.html#playbackstarted
 declare namespace AVS {
     namespace AudioPlayer {
-        interface PlaybackStartedEvent extends AVS.EventMetadata {
-            payload: {
-                token: string;
-                offsetInMilliseconds: number;
-            };
+        interface PlaybackStartedEvent {
+            token: string;
+            offsetInMilliseconds: number;
         }
     }
 }
diff --git a/my-typings/avs/audio-player/progress-report-delay-elapsed.event.d.ts b/my-typings/avs/audio-player/progress-report-delay-elapsed.event.d.ts
@@ -1,11 +1,9 @@
 // https://developer.amazon.com/docs/alexa-voice-service/audioplayer.html#progressreportdelayelapsed
 declare namespace AVS {
     namespace AudioPlayer {
-        interface ProgressReportDelayElapsedEvent extends AVS.EventMetadata {
-            payload: {
-                token: string;
-                offsetInMilliseconds: number;
-            };
+        interface ProgressReportDelayElapsedEvent {
+            token: string;
+            offsetInMilliseconds: number;
         }
     }
 }
diff --git a/my-typings/avs/meta-data.d.ts b/my-typings/avs/meta-data.d.ts
@@ -1,5 +1,5 @@
 declare namespace AVS {
-    interface EventMetadata {
+    interface EventMetadata<T> {
         context?: AVS.ContextItem[];
         event: {
             header: {
@@ -8,17 +8,19 @@ declare namespace AVS {
                 messageId: string;
                 dialogRequestId?: string;
             };
+            payload: T;
         };
     }
 
-    interface DirectiveMetadata {
+    interface DirectiveMetadata<T> {
         directive: {
             header: {
                 namespace: string;
                 name: string;
                 messageId: string;
                 dialogRequestId?: string;
             };
+            payload: T;
         };
     }
 }
diff --git a/my-typings/avs/speech-recognizer/expect-speech-timeout.event.d.ts b/my-typings/avs/speech-recognizer/expect-speech-timeout.event.d.ts
@@ -1,7 +1,3 @@
 declare namespace AVS {
-    namespace SpeechRecognizer {
-        interface ExpectSpeechTimedOutEvent extends AVS.EventMetadata {
-            payload: {};
-        }
-    }
+    namespace SpeechRecognizer { interface ExpectSpeechTimedOutEvent {} }
 }
diff --git a/my-typings/avs/speech-recognizer/expect-speech.directive.d.ts b/my-typings/avs/speech-recognizer/expect-speech.directive.d.ts
@@ -1,10 +1,8 @@
 declare namespace AVS {
     namespace SpeechRecognizer {
-        interface ExpectSpeechDirective extends AVS.DirectiveMetadata {
-            payload: {
-                timeoutInMilliseconds: number;
-                initiator: string;
-            };
+        interface ExpectSpeechDirective {
+            timeoutInMilliseconds: number;
+            initiator: string;
         }
     }
 }
diff --git a/my-typings/avs/speech-recognizer/recognize.event.d.ts b/my-typings/avs/speech-recognizer/recognize.event.d.ts
@@ -1,16 +1,14 @@
 declare namespace AVS {
     namespace SpeechRecognizer {
-        interface RecognizeEvent extends AVS.EventMetadata {
-            payload: {
-                profile: string;
-                format: string;
-                initiator: {
-                    type: string;
-                    payload?: {
-                        wakeWordIndices: {
-                            startIndexInSamples: number;
-                            endIndexInSamples: number;
-                        };
+        interface RecognizeEvent {
+            profile: string;
+            format: string;
+            initiator: {
+                type: string;
+                payload?: {
+                    wakeWordIndices: {
+                        startIndexInSamples: number;
+                        endIndexInSamples: number;
                     };
                 };
             };
diff --git a/my-typings/avs/speech-recognizer/stop-capture.directive.d.ts b/my-typings/avs/speech-recognizer/stop-capture.directive.d.ts
@@ -1,7 +1,3 @@
 declare namespace AVS {
-    namespace SpeechRecognizer {
-        interface StopCaptureDirective extends AVS.DirectiveMetadata {
-            payload: {};
-        }
-    }
+    namespace SpeechRecognizer { interface StopCaptureDirective {} }
 }
diff --git a/my-typings/avs/speech-synthesizer/speech-finished.event.d.ts b/my-typings/avs/speech-synthesizer/speech-finished.event.d.ts
@@ -1,10 +1,8 @@
 // https://developer.amazon.com/docs/alexa-voice-service/speechsynthesizer.html#speechfinished
 declare namespace AVS {
     namespace SpeechSynthesizer {
-        interface SpeechFinishedEvent extends AVS.EventMetadata {
-            payload: {
-                token: string;
-            };
+        interface SpeechFinishedEvent {
+            token: string;
         }
     }
 }
diff --git a/my-typings/avs/speech-synthesizer/speech-started.event.d.ts b/my-typings/avs/speech-synthesizer/speech-started.event.d.ts
@@ -1,10 +1,8 @@
 // https://developer.amazon.com/docs/alexa-voice-service/speechsynthesizer.html#speechstarted
 declare namespace AVS {
     namespace SpeechSynthesizer {
-        interface SpeechStartedEvent extends AVS.EventMetadata {
-            payload: {
-                token: string;
-            };
+        interface SpeechStartedEvent {
+            token: string;
         }
     }
 }
diff --git a/my-typings/avs/speech-synthesizer/speech.directive.d.ts b/my-typings/avs/speech-synthesizer/speech.directive.d.ts
@@ -1,12 +1,10 @@
 // https://developer.amazon.com/docs/alexa-voice-service/speechsynthesizer.html#speak
 declare namespace AVS {
     namespace SpeechSynthesizer {
-        interface SpeechDirective extends AVS.DirectiveMetadata {
-            payload: {
-                url: string;
-                format: string;
-                token: string;
-            };
+        interface SpeechDirective {
+            url: string;
+            format: string;
+            token: string;
         }
     }
 }
diff --git a/my-typings/avs/system/synchronize-state.d.ts b/my-typings/avs/system/synchronize-state.d.ts
@@ -0,0 +1,7 @@
+declare namespace AVS {
+    namespace System {
+        interface SynchronizeStateEvent {}
+
+        interface SynchronizeStateMetadata extends AVS.EventMetadata<SynchronizeStateEvent> {}
+    }
+}
diff --git a/src/system.ts b/src/system.ts
@@ -27,7 +27,7 @@ export default class System {
         //     }
         // });
 
-        const f = this.http2Utility.createMetadata({
+        const f = this.http2Utility.createMetadata<AVS.System.SynchronizeStateMetadata>({
             context: context,
             event: {
                 header: {

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,9 @@`
`1`	`1`	`// https://developer.amazon.com/docs/alexa-voice-service/audioplayer.html#playbacknearlyfinished`
`2`	`2`	`declare namespace AVS {`
`3`	`3`	`namespace AudioPlayer {`
`4`		`- interface PlaybackNearlyFinishedEvent extends AVS.EventMetadata {`
`5`		`- payload: {`
`6`		`- token: string;`
`7`		`- offsetInMilliseconds: number;`
`8`		`- };`
	`4`	`+ interface PlaybackNearlyFinishedEvent {`
	`5`	`+ token: string;`
	`6`	`+ offsetInMilliseconds: number;`
`9`	`7`	`}`
`10`	`8`	`}`
`11`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,3 @@`
`1`	`1`	`declare namespace AVS {`
`2`		`- namespace SpeechRecognizer {`
`3`		`- interface ExpectSpeechTimedOutEvent extends AVS.EventMetadata {`
`4`		`- payload: {};`
`5`		`- }`
`6`		`- }`
	`2`	`+ namespace SpeechRecognizer { interface ExpectSpeechTimedOutEvent {} }`
`7`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`declare namespace AVS {`
`2`	`2`	`namespace SpeechRecognizer {`
`3`		`- interface ExpectSpeechDirective extends AVS.DirectiveMetadata {`
`4`		`- payload: {`
`5`		`- timeoutInMilliseconds: number;`
`6`		`- initiator: string;`
`7`		`- };`
	`3`	`+ interface ExpectSpeechDirective {`
	`4`	`+ timeoutInMilliseconds: number;`
	`5`	`+ initiator: string;`
`8`	`6`	`}`
`9`	`7`	`}`
`10`	`8`	`}`