Merge pull request #248 from rescript-lang/issue-243-media-device

refactor: simplify media and device module surfaces

Author: jderochervlk

src/NotificationAPI/Notification.res

@@ -1,12 +1,30 @@
 open NotificationTypes
 
+type t = notification = {...notification}
+
+type notificationDirection = NotificationTypes.notificationDirection
+type notificationPermission = NotificationTypes.notificationPermission
+type notificationAction = NotificationTypes.notificationAction = {
+  ...NotificationTypes.notificationAction,
+}
+type notificationOptions = NotificationTypes.notificationOptions = {
+  ...NotificationTypes.notificationOptions,
+}
+type getNotificationOptions = NotificationTypes.getNotificationOptions = {
+  ...NotificationTypes.getNotificationOptions,
+}
+type notificationPermissionCallback = NotificationTypes.notificationPermissionCallback
+type notificationEvent = NotificationTypes.notificationEvent = {
+  ...NotificationTypes.notificationEvent,
+}
+
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Notification)
 */
 @new
-external make: (~title: string, ~options: notificationOptions=?) => notification = "Notification"
+external make: (~title: string, ~options: notificationOptions=?) => t = "Notification"
 
-include EventTarget.Impl({type t = notification})
+include EventTarget.Impl({type t = t})
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Notification/requestPermission_static)
@@ -20,7 +38,7 @@ external requestPermission: (
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Notification/close)
 */
 @send
-external close: notification => unit = "close"
+external close: t => unit = "close"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/en-US/docs/Web/API/Notification/permission_static)

src/PictureInPicture.res

@@ -0,0 +1,5 @@
+open PictureInPictureTypes
+
+type t = pictureInPictureWindow = {...pictureInPictureWindow}
+
+include EventTarget.Impl({type t = t})

src/WebAudioAPI/AudioContext.res

@@ -2,55 +2,62 @@ open WebAudioTypes
 open DOMTypes
 open MediaCaptureAndStreamsTypes
 
-include BaseAudioContext.Impl({type t = audioContext})
+type t = audioContext = {...audioContext}
+type baseAudioContext = WebAudioTypes.baseAudioContext = {...WebAudioTypes.baseAudioContext}
+type audioContextOptions = WebAudioTypes.audioContextOptions = {
+  ...WebAudioTypes.audioContextOptions,
+}
+type audioTimestamp = WebAudioTypes.audioTimestamp = {...WebAudioTypes.audioTimestamp}
+
+include BaseAudioContext.Impl({type t = t})
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/AudioContext)
 */
 @new
-external make: (~contextOptions: audioContextOptions=?) => audioContext = "AudioContext"
+external make: (~contextOptions: audioContextOptions=?) => t = "AudioContext"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/AudioContext/getOutputTimestamp)
 */
 @send
-external getOutputTimestamp: audioContext => audioTimestamp = "getOutputTimestamp"
+external getOutputTimestamp: t => audioTimestamp = "getOutputTimestamp"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/AudioContext/resume)
 */
 @send
-external resume: audioContext => promise<unit> = "resume"
+external resume: t => promise<unit> = "resume"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/AudioContext/suspend)
 */
 @send
-external suspend: audioContext => promise<unit> = "suspend"
+external suspend: t => promise<unit> = "suspend"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/AudioContext/close)
 */
 @send
-external close: audioContext => promise<unit> = "close"
+external close: t => promise<unit> = "close"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/AudioContext/createMediaElementSource)
 */
 @send
-external createMediaElementSource: (audioContext, htmlMediaElement) => mediaElementAudioSourceNode =
+external createMediaElementSource: (t, htmlMediaElement) => mediaElementAudioSourceNode =
   "createMediaElementSource"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/AudioContext/createMediaStreamSource)
 */
 @send
-external createMediaStreamSource: (audioContext, mediaStream) => mediaStreamAudioSourceNode =
+external createMediaStreamSource: (t, mediaStream) => mediaStreamAudioSourceNode =
   "createMediaStreamSource"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/AudioContext/createMediaStreamDestination)
 */
 @send
-external createMediaStreamDestination: audioContext => mediaStreamAudioDestinationNode =
+external createMediaStreamDestination: t => mediaStreamAudioDestinationNode =
   "createMediaStreamDestination"

src/WebAudioAPI/AudioDestinationNode.res

@@ -1,3 +1,5 @@
 open WebAudioTypes
 
-include AudioNode.Impl({type t = audioDestinationNode})
+type t = audioDestinationNode = {...audioDestinationNode}
+
+include AudioNode.Impl({type t = t})

src/WebAudioAPI/AudioNode.res

@@ -1,5 +1,7 @@
 open WebAudioTypes
 
+type t = audioNode = {...audioNode}
+
 module Impl = (
   T: {
     type t
@@ -71,3 +73,5 @@ module Impl = (
   external disconnectParamOutput: (T.t, ~destinationParam: audioParam, ~output: int) => unit =
     "disconnect"
 }
+
+include Impl({type t = t})

src/WebAudioAPI/AudioScheduledSourceNode.res

@@ -1,5 +1,7 @@
 open WebAudioTypes
 
+type t = audioScheduledSourceNode = {...audioScheduledSourceNode}
+
 module Impl = (
   T: {
     type t
@@ -22,4 +24,4 @@ module Impl = (
   external stop: (T.t, ~when_: float=?) => unit = "stop"
 }
 
-include Impl({type t = audioScheduledSourceNode})
+include Impl({type t = t})

src/WebAudioAPI/GainNode.res

@@ -1,9 +1,12 @@
 open WebAudioTypes
 
-include AudioNode.Impl({type t = gainNode})
+type t = gainNode = {...gainNode}
+type gainOptions = WebAudioTypes.gainOptions = {...WebAudioTypes.gainOptions}
+
+include AudioNode.Impl({type t = t})
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/GainNode)
 */
 @new
-external make: (~context: baseAudioContext, ~options: gainOptions=?) => gainNode = "GainNode"
+external make: (~context: baseAudioContext, ~options: gainOptions=?) => t = "GainNode"

src/WebAudioAPI/OscillatorNode.res

@@ -1,16 +1,20 @@
 open WebAudioTypes
 
-include AudioScheduledSourceNode.Impl({type t = oscillatorNode})
+type t = oscillatorNode = {...oscillatorNode}
+type oscillatorOptions = WebAudioTypes.oscillatorOptions = {...WebAudioTypes.oscillatorOptions}
+type oscillatorType = WebAudioTypes.oscillatorType
+type periodicWave = WebAudioTypes.periodicWave = {...WebAudioTypes.periodicWave}
+
+include AudioScheduledSourceNode.Impl({type t = t})
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/OscillatorNode)
 */
 @new
-external make: (~context: baseAudioContext, ~options: oscillatorOptions=?) => oscillatorNode =
-  "OscillatorNode"
+external make: (~context: baseAudioContext, ~options: oscillatorOptions=?) => t = "OscillatorNode"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/OscillatorNode/setPeriodicWave)
 */
 @send
-external setPeriodicWave: (oscillatorNode, periodicWave) => unit = "setPeriodicWave"
+external setPeriodicWave: (t, periodicWave) => unit = "setPeriodicWave"

src/WebMIDI.res

@@ -0,0 +1,4 @@
+open WebMIDITypes
+
+type t = midiAccess = {...midiAccess}
+type midiOptions = WebMIDITypes.midiOptions = {...WebMIDITypes.midiOptions}

tests/NotificationsAPI/Notification__test.res

@@ -1,9 +1,9 @@
-open WebAPI.NotificationTypes
+let current: Notification.notificationPermission = Notification.permission
 
-let current = Notification.permission
+let _notification: Notification.t = Notification.make(~title="Testing notifications")
 
 Notification.requestPermission()
-->Promise.thenResolve(notificationPermission => {
+->Promise.thenResolve((notificationPermission: Notification.notificationPermission) => {
   switch notificationPermission {
   | Granted => Console.log("Permission granted")
   | Denied => Console.log("Permission denied")