Merge branch 'compiler/0.12' into patch-1

garyb · garyb · commit 5e02a1b0af16 · 2018-05-22T15:50:43.000+01:00
diff --git a/bower.json b/bower.json
@@ -21,16 +21,16 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-arrays": "^4.0.0",
-    "purescript-either": "^3.0.0",
-    "purescript-foldable-traversable": "^3.0.0",
-    "purescript-functions": "^3.0.0",
-    "purescript-integers": "^3.0.0",
-    "purescript-lists": "^4.0.0",
-    "purescript-strings": "^3.0.0",
-    "purescript-transformers": "^3.0.0"
+    "purescript-arrays": "#compiler/0.12",
+    "purescript-either": "#compiler/0.12",
+    "purescript-foldable-traversable": "#compiler/0.12",
+    "purescript-functions": "#compiler/0.12",
+    "purescript-integers": "#compiler/0.12",
+    "purescript-lists": "#compiler/0.12",
+    "purescript-strings": "#compiler/0.12",
+    "purescript-transformers": "#compiler/0.12"
   },
   "devDependencies": {
-    "purescript-console": "^3.0.0"
+    "purescript-console": "#compiler/0.12"
   }
 }
diff --git a/examples/Applicative.purs b/examples/Applicative.purs
@@ -6,8 +6,8 @@ import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Console (CONSOLE, logShow)
 import Control.Monad.Except (runExcept)
 
-import Data.Foreign (F, Foreign, readNumber)
-import Data.Foreign.Index ((!))
+import Foreign (F, Foreign, readNumber)
+import Foreign.Index ((!))
 
 import Example.Util.Value (foreignValue)
 
diff --git a/examples/Arrays.purs b/examples/Arrays.purs
@@ -6,7 +6,7 @@ import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Console (CONSOLE, logShow)
 import Control.Monad.Except (runExcept)
 
-import Data.Foreign (readArray, readNumber, readString)
+import Foreign (readArray, readNumber, readString)
 import Data.Traversable (traverse)
 
 import Example.Util.Value (foreignValue)
diff --git a/examples/Complex.purs b/examples/Complex.purs
@@ -6,8 +6,8 @@ import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Console (CONSOLE, logShow)
 import Control.Monad.Except (runExcept)
 
-import Data.Foreign (F, Foreign, readArray, readBoolean, readNumber, readString, readNullOrUndefined)
-import Data.Foreign.Index ((!))
+import Foreign (F, Foreign, readArray, readBoolean, readNumber, readString, readNullOrUndefined)
+import Foreign.Index ((!))
 import Data.Traversable (traverse)
 import Data.Maybe (Maybe)
 
diff --git a/examples/MaybeNullable.purs b/examples/MaybeNullable.purs
@@ -6,7 +6,7 @@ import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Console (CONSOLE, logShow)
 import Control.Monad.Except (runExcept)
 
-import Data.Foreign (readBoolean, readNull)
+import Foreign (readBoolean, readNull)
 import Data.Traversable (traverse)
 
 import Example.Util.Value (foreignValue)
diff --git a/examples/Nested.purs b/examples/Nested.purs
@@ -6,8 +6,8 @@ import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Console (CONSOLE, logShow)
 import Control.Monad.Except (runExcept)
 
-import Data.Foreign (F, Foreign, readNumber, readString)
-import Data.Foreign.Index ((!))
+import Foreign (F, Foreign, readNumber, readString)
+import Foreign.Index ((!))
 
 import Example.Util.Value (foreignValue)
 
diff --git a/examples/Objects.purs b/examples/Objects.purs
@@ -6,8 +6,8 @@ import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Console (CONSOLE, logShow)
 import Control.Monad.Except (runExcept)
 
-import Data.Foreign (F, Foreign, readNumber)
-import Data.Foreign.Index ((!))
+import Foreign (F, Foreign, readNumber)
+import Foreign.Index ((!))
 
 import Example.Util.Value (foreignValue)
 
diff --git a/examples/ParseErrors.purs b/examples/ParseErrors.purs
@@ -6,8 +6,8 @@ import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Console (CONSOLE, logShow)
 import Control.Monad.Except (runExcept)
 
-import Data.Foreign (F, Foreign, readArray, readBoolean, readNumber, readString)
-import Data.Foreign.Index ((!))
+import Foreign (F, Foreign, readArray, readBoolean, readNumber, readString)
+import Foreign.Index ((!))
 import Data.Traversable (traverse)
 
 import Example.Util.Value (foreignValue)
diff --git a/examples/SimpleTypes.purs b/examples/SimpleTypes.purs
@@ -6,7 +6,7 @@ import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Console (CONSOLE, logShow)
 import Control.Monad.Except (runExcept)
 
-import Data.Foreign (readString, readNumber, readBoolean)
+import Foreign (readString, readNumber, readBoolean)
 
 import Example.Util.Value (foreignValue)
 
diff --git a/examples/Union.purs b/examples/Union.purs
@@ -6,8 +6,8 @@ import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Console (CONSOLE, logShow)
 import Control.Monad.Except (runExcept)
 
-import Data.Foreign (F, Foreign, readBoolean, readString)
-import Data.Foreign.Index ((!))
+import Foreign (F, Foreign, readBoolean, readString)
+import Foreign.Index ((!))
 
 import Example.Util.Value (foreignValue)
 
diff --git a/examples/Util/Value.purs b/examples/Util/Value.purs
@@ -4,7 +4,7 @@ import Prelude
 
 import Data.Function.Uncurried (Fn3, runFn3)
 
-import Data.Foreign (F, Foreign, ForeignError(..), fail)
+import Foreign (F, Foreign, ForeignError(..), fail)
 
 foreign import foreignValueImpl :: forall r. Fn3 (String -> r) (Foreign -> r) String r
 
diff --git a/package.json b/package.json
@@ -6,9 +6,9 @@
     "test": "pulp build -I examples -- --censor-lib --strict"
   },
   "devDependencies": {
-    "eslint": "^3.17.1",
-    "pulp": "^10.0.4",
-    "purescript-psa": "^0.5.0-rc.1",
-    "rimraf": "^2.6.1"
+    "eslint": "^4.19.1",
+    "pulp": "^12.0.1",
+    "purescript-psa": "^0.6.0",
+    "rimraf": "^2.6.2"
   }
 }
diff --git a/src/Foreign.js b/src/Foreign.js
@@ -1,6 +1,6 @@
 "use strict";
 
-exports.toForeign = function (value) {
+exports.unsafeToForeign = function (value) {
   return value;
 };
 
diff --git a/src/Foreign.purs b/src/Foreign.purs
@@ -1,13 +1,13 @@
 -- | This module defines types and functions for working with _foreign_
 -- | data.
 
-module Data.Foreign
+module Foreign
   ( Foreign
   , ForeignError(..)
   , MultipleErrors(..)
   , F
   , renderForeignError
-  , toForeign
+  , unsafeToForeign
   , unsafeFromForeign
   , unsafeReadTagged
   , typeOf
@@ -36,7 +36,7 @@ import Data.Int as Int
 import Data.List.NonEmpty (NonEmptyList)
 import Data.List.NonEmpty as NEL
 import Data.Maybe (Maybe(..), maybe)
-import Data.String (toChar)
+import Data.String.CodeUnits (toChar)
 
 -- | A type for _foreign data_.
 -- |
@@ -56,7 +56,6 @@ data ForeignError
   | TypeMismatch String String
   | ErrorAtIndex Int ForeignError
   | ErrorAtProperty String ForeignError
-  | JSONError String
 
 derive instance eqForeignError :: Eq ForeignError
 derive instance ordForeignError :: Ord ForeignError
@@ -65,7 +64,6 @@ instance showForeignError :: Show ForeignError where
   show (ForeignError msg) = "(ForeignError " <> show msg <> ")"
   show (ErrorAtIndex i e) = "(ErrorAtIndex " <> show i <> " " <> show e <> ")"
   show (ErrorAtProperty prop e) = "(ErrorAtProperty " <> show prop <> " " <> show e <> ")"
-  show (JSONError s) = "(JSONError " <> show s <> ")"
   show (TypeMismatch exps act) = "(TypeMismatch " <> show exps <> " " <> show act <> ")"
 
 -- | A type for accumulating multiple `ForeignError`s.
@@ -74,8 +72,7 @@ type MultipleErrors = NonEmptyList ForeignError
 renderForeignError :: ForeignError -> String
 renderForeignError (ForeignError msg) = msg
 renderForeignError (ErrorAtIndex i e) = "Error at array index " <> show i <> ": " <> renderForeignError e
-renderForeignError (ErrorAtProperty prop e) = "Error at property " <> prop <> ": " <> renderForeignError e
-renderForeignError (JSONError s) = "JSON error: " <> s
+renderForeignError (ErrorAtProperty prop e) = "Error at property " <> show prop <> ": " <> renderForeignError e
 renderForeignError (TypeMismatch exp act) = "Type mismatch: expected " <> exp <> ", found " <> act
 
 -- | An error monad, used in this library to encode possible failures when
@@ -86,7 +83,12 @@ renderForeignError (TypeMismatch exp act) = "Type mismatch: expected " <> exp <>
 type F = Except MultipleErrors
 
 -- | Coerce any value to the a `Foreign` value.
-foreign import toForeign :: forall a. a -> Foreign
+-- |
+-- | This is considered unsafe as it's only intended to be used on primitive
+-- | JavaScript types, rather than PureScript types. Exporting PureScript values
+-- | via the FFI can be dangerous as they can be mutated by code outside the
+-- | PureScript program, resulting in difficult to diagnose problems elsewhere.
+foreign import unsafeToForeign :: forall a. a -> Foreign
 
 -- | Unsafely coerce a `Foreign` value.
 foreign import unsafeFromForeign :: forall a. Foreign -> a
diff --git a/src/Foreign/Index.js b/src/Foreign/Index.js
diff --git a/src/Foreign/Index.purs b/src/Foreign/Index.purs
@@ -1,7 +1,7 @@
 -- | This module defines a type class for types which act like
 -- | _property indices_.
 
-module Data.Foreign.Index
+module Foreign.Index
   ( class Index
   , class Indexable
   , readProp
@@ -17,7 +17,7 @@ import Prelude
 
 import Control.Monad.Except.Trans (ExceptT)
 
-import Data.Foreign (Foreign, F, ForeignError(..), typeOf, isUndefined, isNull, fail)
+import Foreign (Foreign, F, ForeignError(..), typeOf, isUndefined, isNull, fail)
 import Data.Function.Uncurried (Fn2, runFn2, Fn4, runFn4)
 import Data.Identity (Identity)
 import Data.List.NonEmpty (NonEmptyList)
diff --git a/src/Foreign/Keys.js b/src/Foreign/Keys.js
diff --git a/src/Foreign/Keys.purs b/src/Foreign/Keys.purs
@@ -1,13 +1,13 @@
 -- | This module provides functions for working with object properties
 -- | of Javascript objects.
 
-module Data.Foreign.Keys
+module Foreign.Keys
   ( keys
   ) where
 
 import Prelude
 
-import Data.Foreign (F, Foreign, ForeignError(..), typeOf, isUndefined, isNull, fail)
+import Foreign (F, Foreign, ForeignError(..), typeOf, isUndefined, isNull, fail)
 
 foreign import unsafeKeys :: Foreign -> Array String
 
