diff --git a/bower.json b/bower.json index 252070e..7a345e9 100644 --- a/bower.json +++ b/bower.json @@ -20,7 +20,7 @@ "purescript-pathy": "^3.0.2", "purescript-profunctor": "^2.0.0", "purescript-profunctor-lenses": "^2.6.0", - "purescript-ejson": "^6.0.0" + "purescript-ejson": "^7.0.0" }, "devDependencies": { "purescript-argonaut": "^2.0.0", diff --git a/package.json b/package.json index 7f6c3b1..57115c0 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "test": "pulp test -- --censor-lib --strict --stash" }, "dependencies": { - "pulp": "^10.0.1", + "pulp": "^10.0.4", "purescript": "^0.10.7", "purescript-psa": "^0.4.0" } diff --git a/src/SqlSquare/Constructors.purs b/src/SqlSquare/Constructors.purs index 07f33ff..a27fe74 100644 --- a/src/SqlSquare/Constructors.purs +++ b/src/SqlSquare/Constructors.purs @@ -4,7 +4,7 @@ import Prelude import Data.Array as Arr import Data.DateTime as DT -import Data.Json.Extended.Signature (EJsonF(..)) +import Data.Json.Extended.Signature (EJsonF(..), EJsonMap(..)) import Data.Foldable as F import Data.HugeNum as HN import Data.List as L @@ -55,7 +55,7 @@ array ∷ ∀ t f. (Corecursive t (SqlF EJsonF), F.Foldable f) ⇒ f t → t array l = embed $ Literal $ Array $ Arr.fromFoldable l map_ ∷ ∀ t. (Corecursive t (SqlF EJsonF), Ord t) ⇒ Map.Map t t → t -map_ m = embed $ Literal $ Map $ Arr.fromFoldable $ Map.toList m +map_ m = embed $ Literal $ Map ∘ EJsonMap $ Arr.fromFoldable $ Map.toList m splice ∷ ∀ t f. Corecursive t (SqlF f) ⇒ Maybe t → t splice m = embed $ Splice m diff --git a/src/SqlSquare/Lenses.purs b/src/SqlSquare/Lenses.purs index e8786b0..5395293 100644 --- a/src/SqlSquare/Lenses.purs +++ b/src/SqlSquare/Lenses.purs @@ -164,8 +164,8 @@ _MapLiteral ∷ ∀ t . (Recursive t (S.SqlF EJ.EJsonF), Corecursive t (S.SqlF EJ.EJsonF)) ⇒ Prism' t (Array (t × t)) -_MapLiteral = prism' (embed ∘ S.Literal ∘ EJ.Map) $ project ⋙ case _ of - S.Literal (EJ.Map tpls) → M.Just tpls +_MapLiteral = prism' (embed ∘ S.Literal ∘ EJ.Map ∘ EJ.EJsonMap) $ project ⋙ case _ of + S.Literal (EJ.Map (EJ.EJsonMap tpls)) → M.Just tpls _ → M.Nothing _Splice diff --git a/test/src/Search.purs b/test/src/Search.purs index e3e3062..5af332b 100644 --- a/test/src/Search.purs +++ b/test/src/Search.purs @@ -175,7 +175,7 @@ needDistinctF ∷ Algebra (S.SqlF EJ.EJsonF) Boolean needDistinctF = case _ of S.SetLiteral ns → F.or ns S.Literal (EJ.Array ns) → F.or ns - S.Literal (EJ.Map tpls) → F.any (\(a × b) → a || b) tpls + S.Literal (EJ.Map (EJ.EJsonMap tpls)) → F.any (\(a × b) → a || b) tpls S.Splice Nothing → false S.Splice (Just a) → a S.Binop { lhs, rhs } → lhs || rhs