Re-apply PR # 46

Author: newhoggy

.github/workflows/haskell.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10.7", "9.2.7", "9.6.1"]
+        ghc: ["8.10.7", "9.2.7", "9.6.3", "9.8.1"]
         os: [ubuntu-latest, macos-latest, windows-latest]
         cabal: ["3.10.1.0"]
 

hedgehog-extras.cabal

@@ -19,7 +19,7 @@ source-repository head
 common aeson                        { build-depends: aeson                            >= 2.1.0.0                  }
 common aeson-pretty                 { build-depends: aeson-pretty                     >= 0.8.5                    }
 common async                        { build-depends: async                                                        }
-common base                         { build-depends: base                             >= 4.12       && < 4.19     }
+common base                         { build-depends: base                             >= 4.12       && < 4.20     }
 common bytestring                   { build-depends: bytestring                                                   }
 common deepseq                      { build-depends: deepseq                                                      }
 common Diff                         { build-depends: Diff                                                         }
@@ -41,7 +41,6 @@ common text                         { build-depends: text
 common time                         { build-depends: time                             >= 1.9.1                    }
 common transformers                 { build-depends: transformers                                                 }
 common unliftio                     { build-depends: unliftio                                                     }
-common unordered-containers         { build-depends: unordered-containers                                         }
 common yaml                         { build-depends: yaml                                                         }
 common zlib                         { build-depends: zlib                                                         }
 
@@ -86,7 +85,6 @@ library
                         time,
                         transformers,
                         unliftio,
-                        unordered-containers,
                         Win32,
                         yaml,
                         zlib,

src/Hedgehog/Extras/Stock/Aeson.hs

@@ -1,12 +1,12 @@
+{-# LANGUAGE LambdaCase #-}
+
 module Hedgehog.Extras.Stock.Aeson
   ( rewriteObject
   , rewriteArrayElements
   ) where
 
 import           Data.Aeson
-import           Data.Functor
-import           Data.HashMap.Lazy
-import           Data.Text
+import           Data.Aeson.KeyMap (KeyMap)
 import           Prelude ((.), ($))
 
 import qualified HaskellWorks.Data.Aeson.Compat.Map as KM
@@ -21,6 +21,7 @@ rewriteObject _ v = v
 -- | Rewrite each element of a JSON array using the function 'f'.
 --
 -- All other JSON values are preserved.
-rewriteArrayElements :: (Value -> Value) -> Value -> Value
-rewriteArrayElements f (Array hm) = Array (fmap f hm)
-rewriteArrayElements _ v = v
+rewriteObject :: (KeyMap Value -> KeyMap Value) -> Value -> Value
+rewriteArrayElements f = \case
+  Array hm -> Array (fmap f hm)
+  v -> v