Skip to content

Updates for purescript-aff-4.0.0 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 23, 2017
Merged

Updates for purescript-aff-4.0.0 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb3decc
Updates for purescript-aff-4.0.0
Sep 20, 2017
bc5f5a7
Fixed npm buid script.
Sep 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"purescript-semirings": "^4.0.0",
"purescript-tuples": "^4.0.0",
"purescript-validation": "^3.0.0",
"purescript-aff": "^3.0.0",
"purescript-aff": "^4.0.0",
"purescript-control": "^3.0.0",
"purescript-console": "^3.0.0",
"purescript-integers": "^3.0.0"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"private": true,
"scripts": {
"clean": "rimraf output && rimraf .pulp-cache",
"build": "pulp build --censor-lib --strict",
"build": "pulp build -- --censor-lib --strict",
"test": "pulp test"
},
"devDependencies": {
Expand Down
17 changes: 8 additions & 9 deletions src/Routing.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@ module Routing (
matchesAff'
) where

import Prelude (Unit, unit, pure, const, ($))
import Control.Monad.Eff (Eff())
import Control.Monad.Aff (Aff(), makeAff)
import Data.Maybe (Maybe(..))
import Control.Monad.Aff (Aff, makeAff, nonCanceler)
import Control.Monad.Eff (Eff)
import Data.Either (Either(..), either)
import Data.Tuple (Tuple(..))
import Data.Maybe (Maybe(..))
import Data.String.Regex as R
import Data.String.Regex.Flags as RF

import Routing.Parser (parse)
import Data.Tuple (Tuple(..))
import Prelude (Unit, const, pure, unit, ($), (<$))
import Routing.Match (Match, runMatch)
import Routing.Parser (parse)


foreign import decodeURIComponent :: String -> String
Expand Down Expand Up @@ -53,9 +52,9 @@ matches' decoder routing cb = hashes $ \old new ->
matchesAff' :: forall e a. (String -> String) ->
Match a -> Aff e (Tuple (Maybe a) a)
matchesAff' decoder routing =
makeAff \_ k -> do
makeAff \k -> nonCanceler <$
matches' decoder routing \old new ->
k $ Tuple old new
k $ Right $ Tuple old new

matchesAff :: forall e a. Match a -> Aff e (Tuple (Maybe a) a)
matchesAff = matchesAff' decodeURIComponent
Expand Down