Merge pull request #5 from purescript-contrib/profunctor-lenses

Switch from optic to profunctor-lenses

Author: cryogenian

.travis.yml

@@ -5,10 +5,6 @@ node_js:
 env:
   - PATH=$HOME/purescript:$PATH
 install:
-  - 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 bower gulp -g
   - npm install
   - bower install --production

bower.json

@@ -22,9 +22,9 @@
   "license": "MIT",
   "dependencies": {
     "purescript-argonaut-codecs": "^0.3.0",
-    "purescript-optic": "^0.8.0"
+    "purescript-profunctor-lenses": "^0.3.3"
   },
   "devDependencies": {
-    "purescript-strongcheck": "^0.12.1"
+    "purescript-strongcheck": "^0.14.3"
   }
 }

package.json

@@ -4,7 +4,8 @@
   "license": "MIT",
   "devDependencies": {
     "gulp": "^3.9.0",
-    "gulp-purescript": "^0.5.0",
-    "gulp-run": "^1.6.8"
+    "gulp-purescript": "^0.7.0",
+    "gulp-run": "^1.6.8",
+    "purescript": "^0.7.5-rc.3"
   }
 }

src/Data/Argonaut/JCursor.purs

@@ -3,19 +3,19 @@ module Data.Argonaut.JCursor where
 import Prelude
 
 import Data.Argonaut.Core
-import Data.Argonaut.Encode
 import Data.Argonaut.Decode
-import Data.Maybe (Maybe(..), fromMaybe, maybe)
-import Data.List (List(), zipWith, range, head, singleton, toList)
+import Data.Argonaut.Encode
 import Data.Either (Either(..))
+import Data.Foldable (foldl)
+import Data.List (List(), zipWith, range, head, singleton, toList)
+import Data.Maybe (Maybe(..), fromMaybe, maybe)
 import Data.Monoid (Monoid, mempty)
 import Data.Tuple (Tuple(..), fst, snd)
-import Data.Foldable (foldl)
 
-import qualified Data.Int as I
 import qualified Data.Array as A
-import qualified Data.StrMap as M
+import qualified Data.Int as I
 import qualified Data.Maybe.Unsafe as MU
+import qualified Data.StrMap as M
 
 data JCursor
   = JCursorTop
@@ -58,7 +58,7 @@ insideOut (JIndex i c) = downIndex i (insideOut c)
 downField :: String -> JCursor -> JCursor
 downField i = downField' where
   downField' JCursorTop = JField i JCursorTop
-  downField' (JField i' c) = JField i' (downField' c) 
+  downField' (JField i' c) = JField i' (downField' c)
   downField' (JIndex i' c) = JIndex i' (downField' c)
 
 downIndex :: Int -> JCursor -> JCursor
@@ -83,7 +83,7 @@ cursorSet :: JCursor -> Json -> Json -> Maybe Json
 cursorSet JCursorTop v = pure <<< const v
 cursorSet (JField i c) v = foldJsonObject defaultObj mergeObjs
   where
-  defaultObj :: Maybe Json 
+  defaultObj :: Maybe Json
   defaultObj = fromObject <<< M.singleton i <$> cursorSet c v (inferEmpty c)
 
   mergeObjs :: JObject -> Maybe Json
@@ -94,7 +94,7 @@ cursorSet (JIndex i c) v = foldJsonArray defaultArr mergeArrs
   where
   defaultArr :: Maybe Json
   defaultArr = fromArray <<< MU.fromJust <<<
-                 flip (A.updateAt i) (A.replicate (i + 1) jsonNull) <$> 
+                 flip (A.updateAt i) (A.replicate (i + 1) jsonNull) <$>
                  cursorSet c v (inferEmpty c)
 
   mergeArrs :: JArray -> Maybe Json
@@ -108,14 +108,14 @@ cursorSet (JIndex i c) v = foldJsonArray defaultArr mergeArrs
        else if i >= len
             then setArr (xs <> (A.replicate (i - len + 1) jsonNull)) i v
             else Just <<< fromArray <<< MU.fromJust $ A.updateAt i v xs
-     
+
 
 toPrims :: Json -> List (Tuple JCursor JsonPrim)
 toPrims = foldJson nullFn boolFn numFn strFn arrFn objFn
   where
   mkTop :: JsonPrim -> List (Tuple JCursor JsonPrim)
   mkTop p = singleton $ Tuple JCursorTop p
-    
+
   nullFn :: JNull -> List (Tuple JCursor JsonPrim)
   nullFn _ = mkTop primNull
 
@@ -139,7 +139,7 @@ toPrims = foldJson nullFn boolFn numFn strFn arrFn objFn
   arrFn' (Tuple i j) = toList ((\t -> Tuple (JIndex i (fst t)) (snd t))
                                <$> toPrims j)
 
-  
+
   objFn :: JObject -> List (Tuple JCursor JsonPrim)
   objFn obj =
     let f :: Tuple String Json -> List (Tuple JCursor JsonPrim)
@@ -197,7 +197,7 @@ instance encodeJsonJCursor :: EncodeJson JCursor where
     loop (JIndex i c) = [encodeJson i] <> loop c
 
 fail :: forall a b. (Show a) => a -> Either String b
-fail x = Left $ "Expected String or Number but found: " ++ show x            
+fail x = Left $ "Expected String or Number but found: " ++ show x
 
 instance decodeJsonJCursor :: DecodeJson JCursor where
   decodeJson j = decodeJson j >>= loop
@@ -220,4 +220,4 @@ instance decodeJsonJCursor :: DecodeJson JCursor where
 
 
 
-  
+

src/Data/Argonaut/Prisms.purs

@@ -1,8 +1,7 @@
 module Data.Argonaut.Prisms where
 
-import Optic.Types (PrismP())
-import Optic.Prism (prism')
-import Data.Argonaut.Core 
+import Data.Argonaut.Core
+import Data.Lens (PrismP(), prism')
 
 _Null :: PrismP Json JNull
 _Null = prism' fromNull toNull

src/Data/Argonaut/Traversals.purs

@@ -1,9 +1,8 @@
 module Data.Argonaut.Traversals where
 
+import Data.Argonaut.Core
+import Data.Lens (TraversalP(), filtered)
 import Prelude ((<<<), id)
-import Optic.Fold (filtered)
-import Optic.Extended (TraversalP())
-import Data.Argonaut.Core 
 
 _JsonNull :: TraversalP Json Json
 _JsonNull = id <<< filtered isNull