Merge pull request #25 from purescript-contrib/compiler/0.12

Compiler/0.12

Author: garyb

.travis.yml

@@ -2,9 +2,17 @@ language: node_js
 dist: trusty
 sudo: required
 node_js: 6
+env:
+  - PATH=$HOME/purescript:$PATH
 install:
+  - npm install -g bower
+  - TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p')
+  - wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
+  - tar -xvf $HOME/purescript.tar.gz -C $HOME/
+  - chmod a+x $HOME/purescript
   - npm install -g bower
   - npm install
+  - bower install --production
 script:
   - bower install --production
   - npm run -s build

bower.json

@@ -1,29 +1,28 @@
 {
   "name": "purescript-options",
-  "homepage": "https://github.com/ethul/purescript-options",
+  "homepage": "https://github.com/purescript-contrib/purescript-options",
   "description": "PureScript Options",
   "keywords": [
     "purescript"
   ],
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git://github.com/ethul/purescript-options.git"
+    "url": "git://github.com/purescript-contrib/purescript-options.git"
   },
   "ignore": [
     "*",
     "!src/**/*",
     "!LICENSE"
   ],
   "dependencies": {
-    "purescript-foreign": "^4.0.0",
-    "purescript-maps": "^3.0.0",
-    "purescript-tuples": "^4.0.0",
-    "purescript-monoid": "^3.0.0",
-    "purescript-maybe": "^3.0.0",
-    "purescript-contravariant": "^3.0.0"
+    "purescript-foreign": "^5.0.0",
+    "purescript-foreign-object": "^1.0.0",
+    "purescript-tuples": "^5.0.0",
+    "purescript-maybe": "^4.0.0",
+    "purescript-contravariant": "^4.0.0"
   },
   "devDependencies": {
-    "purescript-console": "^3.0.0"
+    "purescript-console": "^4.1.0"
   }
 }

package.json

@@ -6,9 +6,8 @@
     "test": "pulp test"
   },
   "devDependencies": {
-    "pulp": "^11.0.0",
-    "purescript-psa": "^0.5.0",
-    "purescript": "^0.11.1",
-    "rimraf": "^2.5.4"
+    "pulp": "^12.2.0",
+    "purescript-psa": "^0.6.0",
+    "rimraf": "^2.6.2"
   }
 }

src/Data/Options.purs

@@ -97,13 +97,12 @@ module Data.Options
 
 import Prelude
 
-import Data.Foreign (toForeign, Foreign)
 import Data.Maybe (Maybe, maybe)
-import Data.Monoid (mempty, class Monoid)
 import Data.Newtype (class Newtype, unwrap)
 import Data.Op (Op(..))
-import Data.StrMap as StrMap
 import Data.Tuple (Tuple(..))
+import Foreign (Foreign, unsafeToForeign)
+import Foreign.Object as Object
 
 -- | The `Options` type represents a set of options. The type argument is a
 -- | phantom type, which is useful for ensuring that options for one particular
@@ -117,7 +116,7 @@ derive newtype instance monoidOptions ∷ Monoid (Options opt)
 -- | Convert an `Options` value into a JavaScript object, suitable for passing
 -- | to JavaScript APIs.
 options :: forall opt. Options opt -> Foreign
-options (Options os) = toForeign (StrMap.fromFoldable os)
+options (Options os) = unsafeToForeign (Object.fromFoldable os)
 
 -- | An `Option` represents an opportunity to configure a specific attribute
 -- | of a call to some API. This normally corresponds to one specific property
@@ -148,8 +147,8 @@ tag :: forall opt value. Option opt value -> value -> Option opt Unit
 tag o value = Op \_ -> o := value
 
 -- | The default method for turning a string property key into an
--- | `Option`. This function simply calls `toForeign` on the value. If
+-- | `Option`. This function simply calls `unsafeToForeign` on the value. If
 -- | you need some other behaviour, you can write your own function to replace
 -- | this one, and construct an `Option` yourself.
 defaultToOptions :: forall opt value. String -> value -> Options opt
-defaultToOptions k v = Options [Tuple k (toForeign v)]
+defaultToOptions k v = Options [Tuple k (unsafeToForeign v)]

test/Test/Main.purs

@@ -2,13 +2,12 @@ module Test.Main where
 
 import Prelude
 
-import Control.Monad.Eff (Eff)
-import Control.Monad.Eff.Console (CONSOLE, log)
-
-import Data.Foreign (Foreign)
 import Data.Functor.Contravariant (cmap)
 import Data.Maybe (Maybe(..))
 import Data.Options (Option, Options, optional, options, opt, (:=))
+import Effect (Effect)
+import Effect.Console (log)
+import Foreign (Foreign)
 
 data Shape = Circle | Square | Triangle
 
@@ -53,7 +52,7 @@ opts = foo := "aaa" <>
        buz := (\a b c -> a + b + c) <>
        fuz := [Square, Circle, Triangle]
 
-main :: forall eff. Eff (console :: CONSOLE | eff) Unit
+main :: Effect Unit
 main = log <<< showForeign <<< options $ opts
 
 foreign import showForeign :: Foreign -> String