2c317aa..master · jsaddle

.travis.yml+1−1

since splitsnapshots

unifiedsplit

@@ -43,5 +43,5 @@ script:

43

44notifications:

45 irc:

46− channels: "irc.freenode.net#gtk2hs"

46+ channels: "irc.freenode.net#ghcjs"

47 email: true

README.md+3−3

@@ -137,7 +137,7 @@ The first five keys `[0..4]` are

137these values. Both the Haskell code and `jsaddle.js` can allocate new `JSVal` keys. The Haskell code allocates negative

138keys and `jsaddle.js` allocates positive keys to avoid clashing.

139

140−The haskell code will not know the value of the to go with the key, but it will include it in commands to the server

140+The haskell code will not know the value to go with the key, but it will include it in commands to the server

141that are sort of "hey call this function and put the result in the map with this key"). This allows for the

142lazy execution of the JSaddle code.

143

@@ -146,7 +146,7 @@ when the JSVal is no longer reachable. The `jsaddle.js` code then deletes the k

146

147### JSStrings

148

149−These are haskell `Text` type and so reside on the native side of the WebSocket. If you want to make avoid transferring large string values over the WebSocket use `toJSVal` to convert it to a `JSVal`.

149+These are haskell `Text` type and so reside on the native side of the WebSocket. If you want to avoid transferring large string values over the WebSocket use `toJSVal` to convert it to a `JSVal`.

150

151### Lazy Execution

152

@@ -213,7 +213,7 @@ JSaddle does not support exceptions well. When compiled with GHCJS an exception

213at the point the exception is thrown.

214

215When using GHC the Haskell executions will probably continue for a while before the exception is received at all by the Haskell code

216−(because the lazy execution of the JS code). The exception will be thrown when the the next synchronous command is executed.

216+(because the lazy execution of the JS code). The exception will be thrown when the next synchronous command is executed.

217When it reaches the synchronous command a haskell type JSException will be thrown (this may not be the thread that initiated the

218command that caused the exception). You can use `syncPoint` and `syncAfter` to force the exception to be thrown.

219There are `JSM` versions of `catch` and `bracket` that also include a `syncPoint` call.

cabal.project+1−8

@@ -2,16 +2,9 @@ packages:

2 jsaddle/

3 jsaddle-warp/

4 jsaddle-wkwebview/

5−-- jsaddle-webkitgtk/

6 jsaddle-webkit2gtk/

5 jsaddle-webkit2gtk/

7 jsaddle-clib/

6 jsaddle-clib/

8

7

9constraints: haskell-gi-overloading == 0.0

8constraints: haskell-gi-overloading == 0.0

10

9

11−write-ghc-environment-files: never

10+allow-newer: websockets:random, splitmix:time, *:time, *:unix, *:process, stm:base

12−

13−source-repository-package

14− type: git

15− location: https://github.com/gtk2hs/webkit-javascriptcore

16− tag: 5868624d0ea1db6e6279c301f7f56adb808a85bf

17− --sha256: 0aj0cvcbnzrdi1ynahpb4034vadfrs99n5qa8dar1srhijv55g8b

default.nixdeleted−28

@@ -1,28 +0,0 @@

1−{ pkgs ? import nixpkgs (haskellNixpkgsArgs // (if system == null then {} else { inherit system; }) //

2− { overlays = haskellNixpkgsArgs.overlays ++ [(self: super: {

3− inherit (self.haskell-nix.haskellPackages) alex happy;

4− })];})

5−, nixpkgs ? haskellNixSrc + "/nixpkgs"

6−, haskellNixpkgsArgs ? import haskellNixSrc

7−, haskellNixSrc ? builtins.fetchTarball {

8− url = "https://github.com/input-output-hk/haskell.nix/archive/1dd6951d6a56115fd368c5b37b8dab47a90ec45c.tar.gz";

9− sha256 = "02nhjy90xwg9wrp81cnlczndxags966c71wlbz6n91423a13mc99";

10− }

11−, haskellCompiler ? "ghc881"

12−, system ? null

13−}:

14−let

15− frameworks = pkgs.lib.optionals pkgs.stdenv.isDarwin (

16− with pkgs.darwin.apple_sdk.frameworks; [ Cocoa Carbon CoreGraphics ]);

17− project = pkgs.haskell-nix.cabalProject' {

18− src = pkgs.haskell-nix.haskellLib.cleanGit { src = ./.; };

19− ghc = pkgs.buildPackages.pkgs.haskell-nix.compiler.${haskellCompiler};

20− modules = [

21− ({ config, ...}: {

22− packages.gi-gtk.components.setup.frameworks = frameworks;

23− packages.vault.components.library.doHaddock = false;

24− })

25− ];

26− };

27−in

28− project

jsaddle-clib/jsaddle-clib.cabal+2−2

@@ -1,5 +1,5 @@

1name: jsaddle-clib

2−version: 0.9.7.0

2+version: 0.9.8.0

3cabal-version: >=1.10

4build-type: Simple

5license: MIT

@@ -21,7 +21,7 @@ library

21 Language.Javascript.JSaddle.CLib

22 Language.Javascript.JSaddle.CLib.Internal

23 build-depends:

24− aeson >=0.8.0.2 && <1.5,

24+ aeson >=0.8.0.2 && <1.6,

25 base <5,

26 base-compat >=0.9.0 && <0.12,

27 bytestring >=0.10.6.0 && <0.11,

jsaddle-warp/jsaddle-warp.cabal+6−6

@@ -1,5 +1,5 @@

1name: jsaddle-warp

2−version: 0.9.7.0

2+version: 0.9.8.0

3cabal-version: >=1.10

4build-type: Simple

5license: MIT

@@ -27,7 +27,7 @@ library

27 other-modules:

28 Language.Javascript.JSaddle.WebSockets.Compat

29 build-depends:

30− aeson >=0.8.0.2 && <1.5,

30+ aeson >=0.8.0.2 && <1.6,

31 bytestring >=0.10.6.0 && <0.11,

32 containers >=0.5.6.2 && <0.7,

33 foreign-store >=0.2 && <0.3,

@@ -35,11 +35,11 @@ library

35 jsaddle >=0.9.4.0 && <0.10,

36 stm >=2.4.4 && <2.6,

37 text >=1.2.1.3 && <1.3,

38− time >=1.5.0.1 && <1.10,

38+ time >=1.5.0.1 && <1.11,

39 transformers >=0.4.2.0 && <0.6,

40 wai >=3.0.3.0 && <3.3,

41 wai-websockets >=3.0.0.6 && <3.1,

42− warp >=3.1.2 && <3.3,

42+ warp >=3.1.2 && <3.4,

43 websockets >=0.9.5.0 && <0.13

44 exposed-modules:

45 Language.Javascript.JSaddle.Warp

@@ -59,7 +59,7 @@ test-suite test-tool

59 bytestring -any,

60 containers -any,

61 deepseq -any,

62− doctest >=0.10.1 && <0.17,

62+ doctest >=0.10.1 && <0.19,

63 exceptions -any,

64 filepath >=1.4.0.0 && <1.5,

65 foreign-store -any,

@@ -81,7 +81,7 @@ test-suite test-tool

81 wai -any,

82 wai-websockets -any,

83 warp -any,

84− webdriver >=0.8.4 && <1.0,

84+ webdriver >=0.8.4 && <0.10,

85 websockets -any

86 type: exitcode-stdio-1.0

87 main-is: DocTest.hs

jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+3−3

@@ -1,5 +1,5 @@

1name: jsaddle-webkit2gtk

2−version: 0.9.7.0

2+version: 0.9.8.0

3cabal-version: >=1.10

4build-type: Simple

5license: MIT

@@ -26,7 +26,7 @@ library

26 base <5

27 if !impl(ghcjs -any)

28 build-depends:

29− aeson >=0.8.0.2 && <1.5,

29+ aeson >=0.8.0.2 && <1.6,

30 base <5,

31 bytestring >=0.10.6.0 && <0.11,

32 directory >=1.0.0.2 && <1.4,

@@ -35,7 +35,7 @@ library

35 gi-gtk >=3.0.17 && <3.1,

36 gi-webkit2 >=4.0.14 && <4.1,

37 gi-javascriptcore >=4.0.14 && <4.1,

38− haskell-gi-base >=0.20 && <0.24,

38+ haskell-gi-base >=0.20 && <0.26,

39 haskell-gi-overloading >=0.0 && < 2.0,

40 jsaddle >=0.9.4.0 && <0.10,

41 text >=1.2.1.3 && <1.3,

jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+8−2

@@ -55,11 +55,11 @@ import GI.GLib (timeoutAdd, idleAdd, pattern PRIORITY_HIGH, pattern PRIORITY_DEF

55import qualified GI.Gtk as Gtk (main, init)

56import GI.Gtk

57 (windowSetPosition, windowSetDefaultSize, windowNew,

58− scrolledWindowNew, noAdjustment, containerAdd,

58+ scrolledWindowNew, Adjustment, containerAdd,

59 WindowType(..), WindowPosition(..), widgetDestroy,

60 widgetGetToplevel, widgetShowAll, onWidgetDestroy,

61 mainQuit)

62−import GI.Gio (noCancellable)

62+import GI.Gio (Cancellable)

63import GI.JavaScriptCore (valueToString)

64import GI.WebKit2

65 (scriptDialogPromptSetText, scriptDialogPromptGetDefaultText,

@@ -82,6 +82,12 @@ import Language.Javascript.JSaddle (JSM, Results, Batch)

82import Language.Javascript.JSaddle.Run (runJavaScript)

83import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers)

84

85+noAdjustment :: Maybe Adjustment

86+noAdjustment = Nothing

87+

88+noCancellable :: Maybe Cancellable

89+noCancellable = Nothing

90+

85quitWebView :: WebView -> IO ()

91quitWebView :: WebView -> IO ()

86quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync?

92quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync?

87 widgetDestroy w

93 widgetDestroy w

jsaddle-wkwebview/cbits-uikit/AppDelegate.m+12

@@ -5,6 +5,7 @@

5

6extern void callIO(HsStablePtr);

7extern void callWithCString(const char * _Nonnull, HsStablePtr);

8+extern void callWithCIntCString(int n, const char * _Nonnull, HsStablePtr);

8

9

9@interface AppDelegate ()

10@interface AppDelegate ()

10

11

@@ -20,6 +21,7 @@ HsStablePtr global_applicationWillEnterForeground = 0;

20HsStablePtr global_applicationWillTerminate = 0;

21HsStablePtr global_applicationWillTerminate = 0;

21HsStablePtr global_applicationSignificantTimeChange = 0;

22HsStablePtr global_applicationSignificantTimeChange = 0;

22HsStablePtr global_applicationUniversalLink = 0;

23HsStablePtr global_applicationUniversalLink = 0;

24+HsStablePtr global_applicationDidReceiveRemoteNotification = 0;

23uint64_t global_requestAuthorizationWithOptions = 0;

25uint64_t global_requestAuthorizationWithOptions = 0;

24uint64_t global_requestAuthorizationOptionBadge = 0;

26uint64_t global_requestAuthorizationOptionBadge = 0;

25uint64_t global_requestAuthorizationOptionSound = 0;

27uint64_t global_requestAuthorizationOptionSound = 0;

@@ -115,6 +117,14 @@ HsStablePtr global_didFailToRegisterForRemoteNotificationsWithError = 0;

115 if ([userInfo valueForKeyPath:@"aps.badge"] != nil) {

117 if ([userInfo valueForKeyPath:@"aps.badge"] != nil) {

116 [UIApplication sharedApplication].applicationIconBadgeNumber=[[[userInfo objectForKey:@"aps"] objectForKey:@"badge"] intValue];

118 [UIApplication sharedApplication].applicationIconBadgeNumber=[[[userInfo objectForKey:@"aps"] objectForKey:@"badge"] intValue];

117 }

119 }

120+ NSError *error;

121+ NSData *jsonData = [NSJSONSerialization dataWithJSONObject:userInfo options:0 error:&error];

122+ if (jsonData) {

123+ NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];

124+ callWithCIntCString((int) application.applicationState, [jsonString UTF8String], global_applicationDidReceiveRemoteNotification);

125+ } else {

126+ NSLog(@"jsaddle-wkwebview didReceiveRemoteNotification handler: error while serialising push notification as JSON");

127+ }

118 completionHandler(UIBackgroundFetchResultNewData);

128 completionHandler(UIBackgroundFetchResultNewData);

119}

129}

120

130

@@ -152,6 +162,7 @@ void runInWKWebView(HsStablePtr handler,

152 HsStablePtr hs_applicationWillTerminate,

162 HsStablePtr hs_applicationWillTerminate,

153 HsStablePtr hs_applicationSignificantTimeChange,

163 HsStablePtr hs_applicationSignificantTimeChange,

154 HsStablePtr hs_applicationUniversalLink,

164 HsStablePtr hs_applicationUniversalLink,

165+ HsStablePtr hs_applicationDidReceiveRemoteNotification,

155 const uint64_t hs_requestAuthorizationWithOptions,

166 const uint64_t hs_requestAuthorizationWithOptions,

156 const uint64_t hs_requestAuthorizationOptionBadge,

167 const uint64_t hs_requestAuthorizationOptionBadge,

157 const uint64_t hs_requestAuthorizationOptionSound,

168 const uint64_t hs_requestAuthorizationOptionSound,

@@ -172,6 +183,7 @@ void runInWKWebView(HsStablePtr handler,

172 global_applicationWillTerminate = hs_applicationWillTerminate;

183 global_applicationWillTerminate = hs_applicationWillTerminate;

173 global_applicationSignificantTimeChange = hs_applicationSignificantTimeChange;

184 global_applicationSignificantTimeChange = hs_applicationSignificantTimeChange;

174 global_applicationUniversalLink = hs_applicationUniversalLink;

185 global_applicationUniversalLink = hs_applicationUniversalLink;

186+ global_applicationDidReceiveRemoteNotification = hs_applicationDidReceiveRemoteNotification;

175 global_requestAuthorizationWithOptions = hs_requestAuthorizationWithOptions;

187 global_requestAuthorizationWithOptions = hs_requestAuthorizationWithOptions;

176 global_requestAuthorizationOptionBadge = hs_requestAuthorizationOptionBadge;

188 global_requestAuthorizationOptionBadge = hs_requestAuthorizationOptionBadge;

177 global_requestAuthorizationOptionSound = hs_requestAuthorizationOptionSound;

189 global_requestAuthorizationOptionSound = hs_requestAuthorizationOptionSound;

jsaddle-wkwebview/default.nixnew file+14

@@ -0,0 +1,14 @@

1+{ filterSource ? (x: x) }:

2+self: super:

3+let

4+ pkgs = self.callPackage ({pkgs}: pkgs) {};

5+ inherit (pkgs) lib;

6+in

7+with pkgs.haskell.lib;

8+overrideCabal (self.callCabal2nix "jsaddle-wkwebview" (filterSource ./.) {}) (drv: {

9+ libraryFrameworkDepends = (drv.libraryFrameworkDepends or []) ++

10+ (if pkgs.stdenv.hostPlatform.useiOSPrebuilt then [

11+ "${pkgs.buildPackages.darwin.xcode}/Contents/Developer/Platforms/${pkgs.stdenv.hostPlatform.xcodePlatform}.platform/Developer/SDKs/${pkgs.stdenv.hostPlatform.xcodePlatform}.sdk/System"

12+ ] else (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ Cocoa WebKit ]));

13+ buildDepends = lib.optional (!pkgs.stdenv.hostPlatform.useiOSPrebuilt) [ pkgs.buildPackages.darwin.cf-private ];

14+})

jsaddle-wkwebview/jsaddle-wkwebview.cabal+5−3

@@ -1,5 +1,5 @@

1name: jsaddle-wkwebview

2−version: 0.9.7.0

2+version: 0.9.8.0

3cabal-version: >=1.10

4build-type: Simple

5license: MIT

@@ -29,13 +29,15 @@ library

29 base <5

30 default-language: Haskell2010

31 hs-source-dirs: src

32− frameworks: Foundation, WebKit

33 ghc-options: -ferror-spans -Wall

32 ghc-options: -ferror-spans -Wall

33+ if os(linux)

34+ buildable: False

34 if impl(ghcjs)

35 if impl(ghcjs)

35 hs-source-dirs: src-ghcjs

36 hs-source-dirs: src-ghcjs

36 else

37 else

38+ frameworks: Foundation, WebKit

37 build-depends:

39 build-depends:

38− aeson >=0.8.0.2 && <1.5,

40+ aeson >=0.8.0.2 && <1.6,

39 bytestring >=0.10.6.0 && <0.11,

41 bytestring >=0.10.6.0 && <0.11,

40 directory,

42 directory,

41 jsaddle >= 0.9.4.0 && <0.10,

43 jsaddle >= 0.9.4.0 && <0.10,

jsaddle-wkwebview/src-ghc/Language/Javascript/JSaddle/WKWebView.hs+23−1

@@ -9,6 +9,7 @@ module Language.Javascript.JSaddle.WKWebView

9 , runHTMLWithBaseURL

10 , runFile

11 , mainBundleResourcePath

12+ , ApplicationState (..)

12 , AppDelegateConfig (..)

13 , AppDelegateConfig (..)

13 , AppDelegateNotificationConfig (..)

14 , AppDelegateNotificationConfig (..)

14 , AuthorizationOption (..)

15 , AuthorizationOption (..)

@@ -24,7 +25,7 @@ import Language.Javascript.JSaddle.WKWebView.Internal

24 (jsaddleMain, jsaddleMainHTMLWithBaseURL, jsaddleMainFile, WKWebView(..), mainBundleResourcePath)

25 (jsaddleMain, jsaddleMainHTMLWithBaseURL, jsaddleMainFile, WKWebView(..), mainBundleResourcePath)

25import System.Environment (getProgName)

26import System.Environment (getProgName)

26import Foreign.C.String (CString, withCString)

27import Foreign.C.String (CString, withCString)

27−import Foreign.C.Types (CBool)

28+import Foreign.C.Types (CBool, CInt)

28import Foreign.StablePtr (StablePtr, newStablePtr)

29import Foreign.StablePtr (StablePtr, newStablePtr)

29import Language.Javascript.JSaddle (JSM)

30import Language.Javascript.JSaddle (JSM)

30

31

@@ -40,6 +41,7 @@ foreign import ccall runInWKWebView

40 -> StablePtr (IO ()) -- applicationWillTerminate

41 -> StablePtr (IO ()) -- applicationWillTerminate

41 -> StablePtr (IO ()) -- applicationSignificantTimeChange

42 -> StablePtr (IO ()) -- applicationSignificantTimeChange

42 -> StablePtr (CString -> IO ()) -- applicationUniversalLink

43 -> StablePtr (CString -> IO ()) -- applicationUniversalLink

44+ -> StablePtr (CInt -> CString -> IO ()) -- applicationDidReceiveRemoteNotification

43 -> Word64 -- whether to run requestAuthorizationWithOptions

45 -> Word64 -- whether to run requestAuthorizationWithOptions

44 -> Word64 -- Ask for Badge authorization

46 -> Word64 -- Ask for Badge authorization

45 -> Word64 -- Ask for Sound authorization

47 -> Word64 -- Ask for Sound authorization

@@ -66,6 +68,11 @@ data AppDelegateConfig = AppDelegateConfig

66 --

68 --

67 -- The Core Foundation plist key CFBundleURLTypes controls which URL schemes

69 -- The Core Foundation plist key CFBundleURLTypes controls which URL schemes

68 -- the app should respond to.

70 -- the app should respond to.

71+ , _appDelegateConfig_applicationDidReceiveRemoteNotification :: ApplicationState -> CString -> IO ()

72+ -- ^ Called when the application receives a remote notification.

73+ -- 'ApplicationState' is the current state of the app.

74+ -- The 'CString' JSON-encoded user info contained in the notification.

75+ -- For more information see https://developer.apple.com/documentation/uikit/uiapplicationdelegate/1623117-application?language=objc

69 , _appDelegateConfig_appDelegateNotificationConfig :: AppDelegateNotificationConfig

76 , _appDelegateConfig_appDelegateNotificationConfig :: AppDelegateNotificationConfig

70 , _appDelegateConfig_developerExtrasEnabled :: Bool

77 , _appDelegateConfig_developerExtrasEnabled :: Bool

71 -- ^ Allow devtools in the app. Defaults to 'True'

78 -- ^ Allow devtools in the app. Defaults to 'True'

@@ -89,6 +96,7 @@ instance Default AppDelegateConfig where

89 , _appDelegateConfig_applicationWillTerminate = return ()

96 , _appDelegateConfig_applicationWillTerminate = return ()

90 , _appDelegateConfig_applicationSignificantTimeChange = return ()

97 , _appDelegateConfig_applicationSignificantTimeChange = return ()

91 , _appDelegateConfig_applicationUniversalLink = \_ -> return ()

98 , _appDelegateConfig_applicationUniversalLink = \_ -> return ()

99+ , _appDelegateConfig_applicationDidReceiveRemoteNotification = \_ _ -> return ()

92 , _appDelegateConfig_appDelegateNotificationConfig = def

100 , _appDelegateConfig_appDelegateNotificationConfig = def

93 , _appDelegateConfig_developerExtrasEnabled = True

101 , _appDelegateConfig_developerExtrasEnabled = True

94 , _appDelegateConfig_applicationOpenFile = \_ -> return False

102 , _appDelegateConfig_applicationOpenFile = \_ -> return False

@@ -100,6 +108,12 @@ data AuthorizationOption = AuthorizationOption_Badge

100 | AuthorizationOption_CarPlay

108 | AuthorizationOption_CarPlay

101 deriving (Show, Read, Eq, Ord)

109 deriving (Show, Read, Eq, Ord)

102

110

111+data ApplicationState = ApplicationState_Active

112+ | ApplicationState_Inactive

113+ | ApplicationState_Background

114+ | ApplicationState_Unknown CInt

115+ deriving (Show, Read, Eq, Ord)

116+

103data AppDelegateNotificationConfig = AppDelegateNotificationConfig

117data AppDelegateNotificationConfig = AppDelegateNotificationConfig

104 { _appDelegateNotificationConfig_requestAuthorizationWithOptions :: Maybe (Set AuthorizationOption)

118 { _appDelegateNotificationConfig_requestAuthorizationWithOptions :: Maybe (Set AuthorizationOption)

105 , _appDelegateNotificationConfig_registerForRemoteNotifications :: Bool

119 , _appDelegateNotificationConfig_registerForRemoteNotifications :: Bool

@@ -162,6 +176,13 @@ run' cfg main = do

162 applicationWillTerminate <- newStablePtr $ _appDelegateConfig_applicationWillTerminate cfg

176 applicationWillTerminate <- newStablePtr $ _appDelegateConfig_applicationWillTerminate cfg

163 applicationSignificantTimeChange <- newStablePtr $ _appDelegateConfig_applicationSignificantTimeChange cfg

177 applicationSignificantTimeChange <- newStablePtr $ _appDelegateConfig_applicationSignificantTimeChange cfg

164 applicationUniversalLink <- newStablePtr $ _appDelegateConfig_applicationUniversalLink cfg

178 applicationUniversalLink <- newStablePtr $ _appDelegateConfig_applicationUniversalLink cfg

179+ applicationDidReceiveRemoteNotification <- newStablePtr $ \n s -> do

180+ let appState = case n of

181+ 0 -> ApplicationState_Active

182+ 1 -> ApplicationState_Inactive

183+ 2 -> ApplicationState_Background

184+ _ -> ApplicationState_Unknown n

185+ _appDelegateConfig_applicationDidReceiveRemoteNotification cfg appState s

165 applicationOpenFile <- newStablePtr $ fmap fromBool . _appDelegateConfig_applicationOpenFile cfg

186 applicationOpenFile <- newStablePtr $ fmap fromBool . _appDelegateConfig_applicationOpenFile cfg

166

187

167 -- AppDelegate notification configuration

188 -- AppDelegate notification configuration

@@ -185,6 +206,7 @@ run' cfg main = do

185 applicationWillTerminate

206 applicationWillTerminate

186 applicationSignificantTimeChange

207 applicationSignificantTimeChange

187 applicationUniversalLink

208 applicationUniversalLink

209+ applicationDidReceiveRemoteNotification

188 (fromBool requestAuthorizationWithOptions)

210 (fromBool requestAuthorizationWithOptions)

189 (fromBool $ Set.member AuthorizationOption_Badge authorizationOptions)

211 (fromBool $ Set.member AuthorizationOption_Badge authorizationOptions)

190 (fromBool $ Set.member AuthorizationOption_Sound authorizationOptions)

212 (fromBool $ Set.member AuthorizationOption_Sound authorizationOptions)

jsaddle-wkwebview/src/Language/Javascript/JSaddle/WKWebView/Internal.hs+7−1

@@ -20,7 +20,7 @@ import qualified Data.Text as T (pack)

20import Data.Text.Encoding (encodeUtf8)

21

22import Foreign.C.String (CString)

23−import Foreign.C.Types (CBool(..))

23+import Foreign.C.Types (CBool(..), CInt(..))

24import Foreign.Ptr (Ptr, nullPtr)

25import Foreign.StablePtr (StablePtr, newStablePtr, deRefStablePtr)

26

@@ -37,6 +37,7 @@ foreign export ccall jsaddleStart :: StablePtr (IO ()) -> IO ()

37foreign export ccall jsaddleResult :: StablePtr (Results -> IO ()) -> CString -> IO ()

38foreign export ccall jsaddleSyncResult :: StablePtr (Results -> IO Batch) -> JSaddleHandler -> CString -> IO ()

39foreign export ccall callWithWebView :: WKWebView -> StablePtr (WKWebView -> IO ()) -> IO ()

40+foreign export ccall callWithCIntCString :: CInt -> CString -> StablePtr (CInt -> CString -> IO ()) -> IO ()

40foreign export ccall callWithCString :: CString -> StablePtr (CString -> IO ()) -> IO ()

41foreign export ccall callWithCString :: CString -> StablePtr (CString -> IO ()) -> IO ()

41foreign export ccall callWithCStringReturningBool :: CString -> StablePtr (CString -> IO CBool) -> IO CBool

42foreign export ccall callWithCStringReturningBool :: CString -> StablePtr (CString -> IO CBool) -> IO CBool

42foreign export ccall callIO :: StablePtr (IO ()) -> IO ()

43foreign export ccall callIO :: StablePtr (IO ()) -> IO ()

@@ -128,6 +129,11 @@ callWithCString c fptr = do

128 f <- deRefStablePtr fptr

129 f <- deRefStablePtr fptr

129 f c

130 f c

130

131

132+callWithCIntCString :: CInt -> CString -> StablePtr (CInt -> CString -> IO ()) -> IO ()

133+callWithCIntCString n s fptr = do

134+ f <- deRefStablePtr fptr

135+ f n s

136+

131callWithCStringReturningBool :: CString -> StablePtr (CString -> IO CBool) -> IO CBool

137callWithCStringReturningBool :: CString -> StablePtr (CString -> IO CBool) -> IO CBool

132callWithCStringReturningBool c fptr = do

138callWithCStringReturningBool c fptr = do

133 f <- deRefStablePtr fptr

139 f <- deRefStablePtr fptr

jsaddle/jsaddle.cabal+8−8

@@ -1,5 +1,5 @@

1name: jsaddle

2−version: 0.9.7.0

2+version: 0.9.8.0

3cabal-version: >=1.10

4build-type: Simple

5license: MIT

@@ -10,7 +10,7 @@ description:

10 This package provides an EDSL for calling JavaScript that

11 can be used both from GHCJS and GHC. When using GHC

12 the application is run using Warp and WebSockets to

13− drive a small JavaScipt helper.

13+ drive a small JavaScript helper.

14category: Web, Javascript

15author: Hamish Mackenzie

16

@@ -42,14 +42,14 @@ library

42 ghc-prim,

43 http-types >=0.8.6 && <0.13,

44 process >=1.2.3.0 && <1.7,

45− random >= 1.1 && < 1.2,

45+ random >= 1.1 && < 1.3,

46 ref-tf >=0.4.0.1 && <0.5,

47 scientific >=0.3 && <0.4,

48 stm >=2.4.4 && <2.6,

49− time >=1.5.0.1 && <1.10,

49+ time >=1.5.0.1 && <1.11,

50 unordered-containers >=0.2 && <0.3,

51 vector >=0.10 && <0.13,

52− unliftio-core >=0.1 && < 0.2

52+ unliftio-core >=0.1 && < 0.3

53 exposed-modules:

54 Data.JSString

55 Data.JSString.Internal

@@ -107,13 +107,13 @@ library

107 Language.Javascript.JSaddle.Value

108 Language.Javascript.JSaddle.Types

109 build-depends:

110− aeson >=0.8.0.2 && <1.5,

110+ aeson >=0.11.3.0 && <1.6,

111 base >=4.9 && <5,

112 base-compat >=0.9.0 && <0.12,

113− base64-bytestring >=1.0.0.1 && <1.1,

113+ base64-bytestring >=1.0.0.1 && <1.2,

114 bytestring >=0.10.6.0 && <0.11,

115 exceptions >=0.8 && <0.11,

116− lens >=3.8.5 && <4.19,

116+ lens >=3.8.5 && <5.1,

117 primitive >=0.6.1.0 && <0.8,

118 text >=1.2.1.3 && <1.3,

119 transformers >=0.4.2.0 && <0.6

jsaddle/src/Language/Javascript/JSaddle/Object.hs+3−4

@@ -526,12 +526,11 @@ array args = do

526 Object . coerce <$> fromListIO rargs

527

528-- | JavaScript's global object

529−global :: Object

530#ifdef ghcjs_HOST_OS

529#ifdef ghcjs_HOST_OS

531−global = js_window

532−foreign import javascript unsafe "$r = window"

530+foreign import javascript unsafe "$r = globalThis"

533− js_window :: Object

531+ global :: Object

534#else

532#else

533+global :: Object

535global = Object . JSVal . unsafePerformIO $ newIORef 4

534global = Object . JSVal . unsafePerformIO $ newIORef 4

536#endif

535#endif

537

536

jsaddle/src/Language/Javascript/JSaddle/Run/Files.hs+1−1

@@ -41,7 +41,7 @@ initState = "\

41 \ jsaddle_values.set(1, undefined);\n\

42 \ jsaddle_values.set(2, false);\n\

43 \ jsaddle_values.set(3, true);\n\

44− \ jsaddle_values.set(4, window);\n\

44+ \ jsaddle_values.set(4, globalThis);\n\

45 \ var jsaddle_index = 100;\n\

46 \ var expectedBatch = 1;\n\

47 \ var lastResults = [0, {\"tag\": \"Success\", \"contents\": [[], []]}];\n\

nix/hix.nixnew file+8

@@ -0,0 +1,8 @@

1+{pkgs, ...}:

2+{ modules = [({pkgs, ...}: {

3+ packages.webkit2gtk3-javascriptcore.components.library.doHaddock = false;

4+ })];

5+ shell.buildInputs = [ pkgs.nodejs ];

6+ shell.tools.cabal = {};

7+ shell.crossPlatforms = p: [ p.ghcjs ];

8+}

shell.nixdeleted−3

@@ -1,3 +0,0 @@

1−{ haskellCompiler ? "ghc881" }:

2−(import ./. { inherit haskellCompiler; }).hsPkgs.shellFor {}

3−