Rename Object to Map

Author: garyb

src/Data/Json/Extended.purs

@@ -17,8 +17,8 @@ module Data.Json.Extended
   , time
   , interval
   , objectId
-  , object
-  , object'
+  , map
+  , map'
   , array
 
   , renderEJson
@@ -30,7 +30,9 @@ module Data.Json.Extended
   , getType
   ) where
 
-import Prelude
+import Prelude hiding (map)
+
+import Data.Functor as F
 
 import Control.Lazy as Lazy
 
@@ -79,15 +81,15 @@ roll
 roll =
   EJson
     <<< Mu.roll
-    <<< map getEJson
+    <<< F.map getEJson
 
 unroll
   ∷ EJson
   → Sig.EJsonF EJson
 unroll =
   getEJson
     >>> Mu.unroll
-    >>> map EJson
+    >>> F.map EJson
 
 head ∷ EJson → Sig.EJsonF (Mu.Mu Sig.EJsonF)
 head = Mu.unroll <<< getEJson
@@ -205,11 +207,11 @@ objectId = roll <<< Sig.ObjectId
 array ∷ Array EJson → EJson
 array = roll <<< Sig.Array
 
-object ∷ Map.Map EJson EJson → EJson
-object = roll <<< Sig.Object <<< A.fromFoldable <<< Map.toList
+map ∷ Map.Map EJson EJson → EJson
+map = roll <<< Sig.Map <<< A.fromFoldable <<< Map.toList
 
-object' ∷ SM.StrMap EJson → EJson
-object' = roll <<< Sig.Object <<< map go <<< A.fromFoldable <<< SM.toList
+map' ∷ SM.StrMap EJson → EJson
+map' = roll <<< Sig.Map <<< F.map go <<< A.fromFoldable <<< SM.toList
   where
     go (T.Tuple a b) = T.Tuple (string a) b
 

src/Data/Json/Extended/Signature/Core.purs

@@ -29,7 +29,7 @@ data EJsonF a
   | Interval String
   | ObjectId String
   | Array (Array a)
-  | Object (Array (Tuple a a))
+  | Map (Array (Tuple a a))
 
 instance functorEJsonF ∷ Functor EJsonF where
   map f x =
@@ -45,7 +45,7 @@ instance functorEJsonF ∷ Functor EJsonF where
       Interval i → Interval i
       ObjectId oid → ObjectId oid
       Array xs → Array $ f <$> xs
-      Object xs → Object $ BF.bimap f f <$> xs
+      Map xs → Map $ BF.bimap f f <$> xs
 
 instance eq1EJsonF ∷ Eq1 EJsonF where
   eq1 Null Null = true
@@ -61,7 +61,7 @@ instance eq1EJsonF ∷ Eq1 EJsonF where
   eq1 (Interval a) (Interval b) = a == b
   eq1 (ObjectId a) (ObjectId b) = a == b
   eq1 (Array xs) (Array ys) = xs == ys
-  eq1 (Object xs) (Object ys) =
+  eq1 (Map xs) (Map ys) =
     let
       xs' = L.fromFoldable xs
       ys' = L.fromFoldable ys
@@ -138,7 +138,7 @@ instance ord1EJsonF ∷ Ord1 EJsonF where
   compare1 _ (Array _) = GT
   compare1 (Array _) _ = LT
 
-  compare1 (Object a) (Object b) = compare (Map.fromFoldable a) (Map.fromFoldable b)
+  compare1 (Map a) (Map b) = compare (Map.fromFoldable a) (Map.fromFoldable b)
 
 getType ∷ ∀ a. EJsonF a → T.EJsonType
 getType = case _ of
@@ -153,4 +153,4 @@ getType = case _ of
   Interval _ → T.Interval
   ObjectId _ → T.ObjectId
   Array _ → T.Array
-  Object _ → T.Object
+  Map _ → T.Map

src/Data/Json/Extended/Signature/Gen.purs

@@ -39,7 +39,7 @@ arbitraryEJsonFWithKeyGen keyGen rec =
   Gen.oneOf (pure Null)
     [ arbitraryBaseEJsonF
     , Array <$> Gen.arrayOf rec
-    , Object <$> do
+    , Map <$> do
         keys ← distinctArrayOf keyGen
         vals ← Gen.vectorOf (A.length keys) rec
         pure $ A.zip keys vals

src/Data/Json/Extended/Signature/Json.purs

@@ -36,7 +36,7 @@ encodeJsonEJsonF rec asKey x =
     Interval str → JS.jsonSingletonObject "$interval" $ encodeJson str
     ObjectId str → JS.jsonSingletonObject "$oid" $ encodeJson str
     Array xs → encodeJson $ rec <$> xs
-    Object xs → JS.jsonSingletonObject "$obj" $ encodeJson $ asStrMap xs
+    Map xs → JS.jsonSingletonObject "$obj" $ encodeJson $ asStrMap xs
       where
         tuple
           ∷ T.Tuple a a
@@ -137,7 +137,7 @@ decodeJsonEJsonF rec makeKey =
       ∷ SM.StrMap a
       → EJsonF a
     strMapObject =
-      Object
+      Map
         <<< A.fromFoldable
         <<< map (\(T.Tuple k v) → T.Tuple (makeKey k) v)
         <<< SM.toList

src/Data/Json/Extended/Signature/Parse.purs

@@ -258,7 +258,7 @@ parseEJsonF rec =
     , Interval <$> taggedLiteral "INTERVAL"
     , ObjectId <$> taggedLiteral "OID"
     , Array <<< A.fromFoldable <$> squares (commaSep rec)
-    , Object <<< A.fromFoldable <$> braces (commaSep parseAssignment)
+    , Map <<< A.fromFoldable <$> braces (commaSep parseAssignment)
     ]
 
   where

src/Data/Json/Extended/Signature/Render.purs

@@ -31,7 +31,7 @@ renderEJsonF rec d =
     Interval str → tagged "INTERVAL" str
     ObjectId str → tagged "OID" str
     Array ds → squares $ commaSep ds
-    Object ds → braces $ renderPairs ds
+    Map ds → braces $ renderPairs ds
   where
     tagged
       ∷ String

src/Data/Json/Extended/Type.purs

@@ -14,7 +14,7 @@ data EJsonType
   | Interval
   | ObjectId
   | Array
-  | Object
+  | Map
 
 derive instance eqEJsonType ∷ Eq EJsonType
 derive instance ordEJsonType ∷ Ord EJsonType
@@ -31,4 +31,4 @@ instance showEJsonType ∷ Show EJsonType where
   show Interval = "Interval"
   show ObjectId = "ObjectId"
   show Array = "Array"
-  show Object = "Object"
+  show Map = "Map"