Drop fromMaybe undefined approach to handling options

Author: JordanMartinez

src/Node/Http2/Client.purs

@@ -4,12 +4,12 @@ module Node.Http2.Client
   , connect'
   ) where
 
-import Data.Maybe (Maybe(..), fromMaybe)
 import Effect (Effect)
 import Effect.Uncurried (EffectFn1, EffectFn2, runEffectFn1, runEffectFn2)
 import Node.Buffer.Immutable (ImmutableBuffer)
 import Node.Http2.Types (Client, Http2Session, Settings, TlsSecureContextOptions)
 import Node.Net.Socket (Socket)
+import Prim.Row as Row
 import Type.Row (type (+))
 
 connect :: String -> Effect (Http2Session Client)
@@ -86,127 +86,14 @@ type TcpConnectOptions f r =
   )
 
 connect'
-  :: String
-  -> ({ | ConnectOptions Maybe + TlsConnectOptions Maybe + TlsSecureContextOptions Maybe + TcpConnectOptions Maybe + () } -> { | ConnectOptions Maybe + TlsConnectOptions Maybe + TlsSecureContextOptions Maybe + TcpConnectOptions Maybe + () })
+  :: forall rec trash
+   . Row.Union rec trash (ConnectOptions Unlift + TlsConnectOptions Unlift + TlsSecureContextOptions Unlift + TcpConnectOptions Unlift + ())
+  => String
+  -> { | rec }
   -> Effect (Http2Session Client)
-connect' authority buildOptions = do
-  let
-    o = buildOptions
-      { maxDeflateDynamicTableSize: Nothing
-      , maxSettings: Nothing
-      , maxSessionMemory: Nothing
-      , maxHeaderListPairs: Nothing
-      , maxOutstandingPings: Nothing
-      , maxReservedRemoteStreams: Nothing
-      , maxSendHeaderBlockLength: Nothing
-      , paddingStrategy: Nothing
-      , peerMaxConcurrentStreams: Nothing
-      , protocol: Nothing
-      , settings: Nothing
-      , unknownProtocolTimeout: Nothing
-      -- TlsConnect
-      , enableTrace: Nothing
-      , socket: Nothing
-      , allowHalfOpen: Nothing
-      , rejectUnauthorized: Nothing
-      , "ALPNProtocols": Nothing
-      , servername: Nothing
-      , session: Nothing
-      , minDHSize: Nothing
-      , highWaterMark: Nothing
-      -- TlsSecureContext
-      , ca: Nothing
-      , cert: Nothing
-      , sigalgs: Nothing
-      , ciphers: Nothing
-      , clientCertEngine: Nothing
-      , crl: Nothing
-      , dhparam: Nothing
-      , ecdhCurve: Nothing
-      , honorCipherOrder: Nothing
-      , key: Nothing
-      , privateKeyEngine: Nothing
-      , privateKeyIdentifier: Nothing
-      , maxVersion: Nothing
-      , minVersion: Nothing
-      , passphrase: Nothing
-      , pfx: Nothing
-      , secureOptions: Nothing
-      , secureProtocol: Nothing
-      , sessionIdContext: Nothing
-      , ticketKeys: Nothing
-      , sessionTimeout: Nothing
-      -- TcpConnect
-      , port: Nothing
-      , host: Nothing
-      , localAddress: Nothing
-      , localPort: Nothing
-      , family: Nothing
-      , noDelay: Nothing
-      , keepAlive: Nothing
-      , keepAliveInitialDelay: Nothing
-      }
+connect' authority rec = runEffectFn2 connectAuthOptionsImpl authority rec
 
-    finalOptions :: { | ConnectOptions Unlift + TlsConnectOptions Unlift + TlsSecureContextOptions Unlift + TcpConnectOptions Unlift + () }
-    finalOptions =
-      { maxDeflateDynamicTableSize: fromMaybe undefined o.maxDeflateDynamicTableSize
-      , maxSettings: fromMaybe undefined o.maxSettings
-      , maxSessionMemory: fromMaybe undefined o.maxSessionMemory
-      , maxHeaderListPairs: fromMaybe undefined o.maxHeaderListPairs
-      , maxOutstandingPings: fromMaybe undefined o.maxOutstandingPings
-      , maxReservedRemoteStreams: fromMaybe undefined o.maxReservedRemoteStreams
-      , maxSendHeaderBlockLength: fromMaybe undefined o.maxSendHeaderBlockLength
-      , paddingStrategy: fromMaybe undefined o.paddingStrategy
-      , peerMaxConcurrentStreams: fromMaybe undefined o.peerMaxConcurrentStreams
-      , protocol: fromMaybe undefined o.protocol
-      , settings: fromMaybe undefined o.settings
-      , unknownProtocolTimeout: fromMaybe undefined o.unknownProtocolTimeout
-      -- TlsConnect
-      , enableTrace: fromMaybe undefined o.enableTrace
-      , socket: fromMaybe undefined o.socket
-      , allowHalfOpen: fromMaybe undefined o.allowHalfOpen
-      , rejectUnauthorized: fromMaybe undefined o.rejectUnauthorized
-      , "ALPNProtocols": fromMaybe undefined o."ALPNProtocols"
-      , servername: fromMaybe undefined o.servername
-      , session: fromMaybe undefined o.session
-      , minDHSize: fromMaybe undefined o.minDHSize
-      , highWaterMark: fromMaybe undefined o.highWaterMark
-      -- TlsSecureContext
-      , ca: fromMaybe undefined o.ca
-      , cert: fromMaybe undefined o.cert
-      , sigalgs: fromMaybe undefined o.sigalgs
-      , ciphers: fromMaybe undefined o.ciphers
-      , clientCertEngine: fromMaybe undefined o.clientCertEngine
-      , crl: fromMaybe undefined o.crl
-      , dhparam: fromMaybe undefined o.dhparam
-      , ecdhCurve: fromMaybe undefined o.ecdhCurve
-      , honorCipherOrder: fromMaybe undefined o.honorCipherOrder
-      , key: fromMaybe undefined o.key
-      , privateKeyEngine: fromMaybe undefined o.privateKeyEngine
-      , privateKeyIdentifier: fromMaybe undefined o.privateKeyIdentifier
-      , maxVersion: fromMaybe undefined o.maxVersion
-      , minVersion: fromMaybe undefined o.minVersion
-      , passphrase: fromMaybe undefined o.passphrase
-      , pfx: fromMaybe undefined o.pfx
-      , secureOptions: fromMaybe undefined o.secureOptions
-      , secureProtocol: fromMaybe undefined o.secureProtocol
-      , sessionIdContext: fromMaybe undefined o.sessionIdContext
-      , ticketKeys: fromMaybe undefined o.ticketKeys
-      , sessionTimeout: fromMaybe undefined o.sessionTimeout
-      -- TcpConnect
-      , port: fromMaybe undefined o.port
-      , host: fromMaybe undefined o.host
-      , localAddress: fromMaybe undefined o.localAddress
-      , localPort: fromMaybe undefined o.localPort
-      , family: fromMaybe undefined o.family
-      , noDelay: fromMaybe undefined o.noDelay
-      , keepAlive: fromMaybe undefined o.keepAlive
-      , keepAliveInitialDelay: fromMaybe undefined o.keepAliveInitialDelay
-      }
-
-  runEffectFn2 connectAuthOptionsImpl authority finalOptions
-
-foreign import connectAuthOptionsImpl :: EffectFn2 (String) ({ | ConnectOptions Unlift + TlsConnectOptions Unlift + TlsSecureContextOptions Unlift + TcpConnectOptions Unlift + () }) (Http2Session Client)
+foreign import connectAuthOptionsImpl :: forall r. EffectFn2 (String) ({ | r }) (Http2Session Client)
 
 type Unlift :: Type -> Type
 type Unlift a = a

src/Node/Http2/Server.purs

@@ -20,13 +20,13 @@ module Node.Http2.Server
 
 import Prelude
 
-import Data.Maybe (Maybe(..), fromMaybe)
 import Data.Time.Duration (Milliseconds)
 import Effect (Effect)
 import Effect.Exception (Error)
 import Effect.Uncurried (EffectFn1, EffectFn2, EffectFn4, mkEffectFn1, mkEffectFn2, mkEffectFn4, runEffectFn1, runEffectFn2)
 import Node.Http2.Types (Headers, Http2SecureServer, Http2ServerRequest, Http2ServerResponse, Http2Session, Http2Stream, Server, Settings, TlsSecureContextOptions)
 import Node.Stream (Duplex)
+import Prim.Row as Row
 import Type.Row (type (+))
 
 -- | `allowHTTP1` <boolean> Incoming client connections that do not support HTTP/2 will be downgraded to HTTP/1.x when set to true. See the 'unknownProtocol' event. See ALPN negotiation. Default: false.
@@ -115,120 +115,13 @@ type NetCreateServerOptions f r =
 -- |   })
 -- | ```
 createSecureServer
-  :: ( { | Http2CreateSecureServerOptions Maybe + TlsCreateServerOptions Maybe + TlsSecureContextOptions Maybe + NetCreateServerOptions Maybe + () }
-       -> { | Http2CreateSecureServerOptions Maybe + TlsCreateServerOptions Maybe + TlsSecureContextOptions Maybe + NetCreateServerOptions Maybe + () }
-     )
+  :: forall rec trash
+   . Row.Union rec trash (Http2CreateSecureServerOptions Unlift + TlsCreateServerOptions Unlift + TlsSecureContextOptions Unlift + NetCreateServerOptions Unlift + ())
+  => { | rec }
   -> Effect Http2SecureServer
-createSecureServer buildOptions = do
-  let
-    o = buildOptions
-      { allowHTTP1: Nothing
-      , maxDeflateDynamicTableSize: Nothing
-      , maxSettings: Nothing
-      , maxSessionMemory: Nothing
-      , maxHeaderListPairs: Nothing
-      , maxOutstandingPings: Nothing
-      , maxSendHeaderBlockLength: Nothing
-      , paddingStrategy: Nothing
-      , peerMaxConcurrentStreams: Nothing
-      , maxSessionInvalidFrames: Nothing
-      , maxSessionRejectedStreams: Nothing
-      , settings: Nothing
-      , origins: Nothing
-      , unknownProtocolTimeout: Nothing
-      -- tls create server options
-      , "ALPNProtocols": Nothing
-      , enableTrace: Nothing
-      , handshakeTimeout: Nothing
-      , rejectUnauthorized: Nothing
-      , requestCert: Nothing
-      , pskIdentityHint: Nothing
-      -- tls secure context options
-      , ca: Nothing
-      , cert: Nothing
-      , sigalgs: Nothing
-      , ciphers: Nothing
-      , clientCertEngine: Nothing
-      , crl: Nothing
-      , dhparam: Nothing
-      , ecdhCurve: Nothing
-      , honorCipherOrder: Nothing
-      , key: Nothing
-      , privateKeyEngine: Nothing
-      , privateKeyIdentifier: Nothing
-      , maxVersion: Nothing
-      , minVersion: Nothing
-      , passphrase: Nothing
-      , pfx: Nothing
-      , secureOptions: Nothing
-      , secureProtocol: Nothing
-      , sessionIdContext: Nothing
-      , ticketKeys: Nothing
-      , sessionTimeout: Nothing
-      -- net create server options
-      , allowHalfOpen: Nothing
-      , pauseOnConnect: Nothing
-      , noDelay: Nothing
-      , keepAlive: Nothing
-      , keepAliveInitialDelay: Nothing
-      }
-
-    options' :: { | Http2CreateSecureServerOptions Unlift + TlsCreateServerOptions Unlift + TlsSecureContextOptions Unlift + NetCreateServerOptions Unlift + () }
-    options' =
-      -- Http2
-      { allowHTTP1: fromMaybe undefined o.allowHTTP1
-      , maxDeflateDynamicTableSize: fromMaybe undefined o.maxDeflateDynamicTableSize
-      , maxSettings: fromMaybe undefined o.maxSettings
-      , maxSessionMemory: fromMaybe undefined o.maxSessionMemory
-      , maxHeaderListPairs: fromMaybe undefined o.maxHeaderListPairs
-      , maxOutstandingPings: fromMaybe undefined o.maxOutstandingPings
-      , maxSendHeaderBlockLength: fromMaybe undefined o.maxSendHeaderBlockLength
-      , paddingStrategy: fromMaybe undefined o.paddingStrategy
-      , peerMaxConcurrentStreams: fromMaybe undefined o.peerMaxConcurrentStreams
-      , maxSessionInvalidFrames: fromMaybe undefined o.maxSessionInvalidFrames
-      , maxSessionRejectedStreams: fromMaybe undefined o.maxSessionRejectedStreams
-      , settings: fromMaybe undefined o.settings
-      , origins: fromMaybe undefined o.origins
-      , unknownProtocolTimeout: fromMaybe undefined o.unknownProtocolTimeout
-      -- tls create server options
-      , "ALPNProtocols": fromMaybe undefined o."ALPNProtocols"
-      , enableTrace: fromMaybe undefined o.enableTrace
-      , handshakeTimeout: fromMaybe undefined o.handshakeTimeout
-      , rejectUnauthorized: fromMaybe undefined o.rejectUnauthorized
-      , requestCert: fromMaybe undefined o.requestCert
-      , pskIdentityHint: fromMaybe undefined o.pskIdentityHint
-      -- tls secure context options
-      , ca: fromMaybe undefined o.ca
-      , cert: fromMaybe undefined o.cert
-      , sigalgs: fromMaybe undefined o.sigalgs
-      , ciphers: fromMaybe undefined o.ciphers
-      , clientCertEngine: fromMaybe undefined o.clientCertEngine
-      , crl: fromMaybe undefined o.crl
-      , dhparam: fromMaybe undefined o.dhparam
-      , ecdhCurve: fromMaybe undefined o.ecdhCurve
-      , honorCipherOrder: fromMaybe undefined o.honorCipherOrder
-      , key: fromMaybe undefined o.key
-      , privateKeyEngine: fromMaybe undefined o.privateKeyEngine
-      , privateKeyIdentifier: fromMaybe undefined o.privateKeyIdentifier
-      , maxVersion: fromMaybe undefined o.maxVersion
-      , minVersion: fromMaybe undefined o.minVersion
-      , passphrase: fromMaybe undefined o.passphrase
-      , pfx: fromMaybe undefined o.pfx
-      , secureOptions: fromMaybe undefined o.secureOptions
-      , secureProtocol: fromMaybe undefined o.secureProtocol
-      , sessionIdContext: fromMaybe undefined o.sessionIdContext
-      , ticketKeys: fromMaybe undefined o.ticketKeys
-      , sessionTimeout: fromMaybe undefined o.sessionTimeout
-      -- net create server options
-      , allowHalfOpen: fromMaybe undefined o.allowHalfOpen
-      , pauseOnConnect: fromMaybe undefined o.pauseOnConnect
-      , noDelay: fromMaybe undefined o.noDelay
-      , keepAlive: fromMaybe undefined o.keepAlive
-      , keepAliveInitialDelay: fromMaybe undefined o.keepAliveInitialDelay
-      }
-  runEffectFn1 createSecureServerImpl options'
-
-foreign import createSecureServerImpl :: EffectFn1 { | Http2CreateSecureServerOptions Unlift + TlsCreateServerOptions Unlift + TlsSecureContextOptions Unlift + NetCreateServerOptions Unlift + () } (Http2SecureServer)
+createSecureServer options = runEffectFn1 createSecureServerImpl options
+
+foreign import createSecureServerImpl :: forall r. EffectFn1 { | r } (Http2SecureServer)
 
 -- | `port` <number>
 -- | `host` <string>
@@ -238,42 +131,26 @@ foreign import createSecureServerImpl :: EffectFn1 { | Http2CreateSecureServerOp
 -- | `readableAll` <boolean> For IPC servers makes the pipe readable for all users. Default: false.
 -- | `writableAll` <boolean> For IPC servers makes the pipe writable for all users. Default: false.
 -- | `ipv6Only` <boolean> For TCP servers, setting ipv6Only to true will disable dual-stack support, i.e., binding to host :: won't make 0.0.0.0 be bound. Default: false.
-type ListenOptions f =
-  { port :: f Int
-  , host :: f String
-  , backlog :: f Number
-  , exclusive :: f Boolean
-  , readableAll :: f Boolean
-  , writableAll :: f Boolean
-  , ipv6Only :: f Boolean
-  }
-
-listen :: Http2SecureServer -> (ListenOptions Maybe -> ListenOptions Maybe) -> Effect Unit
-listen s buildOptions = do
-  let
-    o = buildOptions
-      { port: Nothing
-      , host: Nothing
-      , backlog: Nothing
-      , exclusive: Nothing
-      , readableAll: Nothing
-      , writableAll: Nothing
-      , ipv6Only: Nothing
-      }
-
-    finalOptions :: ListenOptions Unlift
-    finalOptions =
-      { port: fromMaybe undefined o.port
-      , host: fromMaybe undefined o.host
-      , backlog: fromMaybe undefined o.backlog
-      , exclusive: fromMaybe undefined o.exclusive
-      , readableAll: fromMaybe undefined o.readableAll
-      , writableAll: fromMaybe undefined o.writableAll
-      , ipv6Only: fromMaybe undefined o.ipv6Only
-      }
-  runEffectFn2 listenImpl s finalOptions
-
-foreign import listenImpl :: EffectFn2 (Http2SecureServer) (ListenOptions Unlift) (Unit)
+type ListenOptions r =
+  ( port :: Int
+  , host :: String
+  , backlog :: Number
+  , exclusive :: Boolean
+  , readableAll :: Boolean
+  , writableAll :: Boolean
+  , ipv6Only :: Boolean
+  | r
+  )
+
+listen
+  :: forall r trash
+   . Row.Union r trash (ListenOptions + ())
+  => Http2SecureServer
+  -> { | r }
+  -> Effect Unit
+listen s o = runEffectFn2 listenImpl s o
+
+foreign import listenImpl :: forall r. EffectFn2 (Http2SecureServer) { | r } (Unit)
 
 type Unlift :: Type -> Type
 type Unlift a = a