Fix functions returning Maybe string

ghcjs · Jun 11, 2018 · df2b83c · df2b83c
1 parent cf641a4
commit df2b83c
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/domconv-webkit-jsaddle.hs b/domconv-webkit-jsaddle.hs
@@ -1090,21 +1090,17 @@ returnType enums t ext Unsafe e =
               (mkVar "maybe")
               (H.HsParen (H.HsApp (mkVar "Prelude.error") (H.HsLit $ H.HsString "Nothing to return"))))
               (mkVar "return"))
-returnType _ (I.TyName "DOMString" Nothing) ext wrapType e
-    = H.HsInfixApp
-                    (H.HsParen e)
-                    (H.HsQVarOp (mkSymbol ">>="))
-                    (mkVar "fromJSValUnchecked")
-returnType _ (I.TyName "ByteString" Nothing) ext wrapType e
-    = H.HsInfixApp
-                    (H.HsParen e)
-                    (H.HsQVarOp (mkSymbol ">>="))
-                    (mkVar "fromJSValUnchecked")
-returnType _ (I.TyName "USVString" Nothing) ext wrapType e
-    = H.HsInfixApp
-                    (H.HsParen e)
-                    (H.HsQVarOp (mkSymbol ">>="))
-                    (mkVar "fromJSValUnchecked")
+returnType _ t ext wrapType e
+    | isOptionalStringType t && wrapType /= Unchecked =
+        H.HsInfixApp
+          (H.HsParen e)
+          (H.HsQVarOp (mkSymbol ">>="))
+          (mkVar "fromMaybeJSString")
+    | isStringType t =
+        H.HsInfixApp
+          (H.HsParen e)
+          (H.HsQVarOp (mkSymbol ">>="))
+          (mkVar "fromJSValUnchecked")
 returnType _ (I.TyName "DOMTimeStamp" Nothing) _ _ e = H.HsApp (H.HsApp (mkVar "round") (mkVar "<$>")) (H.HsParen (
     H.HsInfixApp
           (H.HsParen e)