Replace ad-hoc optics with microlens-pro

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Revision history for aws-arn
 
+## 0.3.2.0 -- 2024-08-20
+
+* Use prisms and isos from `microlens-pro`.
+
 ## 0.3.1.0 -- 2023-03-01
 
 * Add `Network.AWS.ARN.S3` with support for S3 bucket and object ARNs.

README.md

@@ -55,8 +55,7 @@ add a new resource:
    `test/Network/AWS/ARN/SomeAWSService/Test.hs`
 
 4. Define a `_Foo` `Prism'` that combines the parsing/unparsing
-   functions above. Use the local definitions of prisms in
-   `Network.AWS.ARN.Internal.Lens`:
+   functions above:
 
    ```haskell
    _Function :: Prism' Text Function

aws-arn.cabal

@@ -1,6 +1,6 @@
 cabal-version:      2.2
 name:               aws-arn
-version:            0.3.1.0
+version:            0.3.2.0
 synopsis:
   Types and optics for manipulating Amazon Resource Names (ARNs)
 
@@ -53,15 +53,15 @@ common deps
   build-depends:
     , base             >=4.12   && <4.21
     , deriving-compat  >=0.5.10 && <0.7
+    , microlens-pro    ^>=0.2
     , profunctors      >=5.0    && <5.7
     , tagged           ^>=0.8
-    , text             ^>=1.2.3 || >=2.0 && <2.1 || ^>=2.1
+    , text             ^>=1.2.3 || ^>=2.0 || ^>=2.1
 
 library
   import:          opts, deps
   exposed-modules:
     Network.AWS.ARN
-    Network.AWS.ARN.Internal.Lens
     Network.AWS.ARN.Lambda
     Network.AWS.ARN.S3
 
@@ -81,7 +81,7 @@ test-suite spec
   ghc-options:        -threaded
   build-depends:
     , aws-arn
-    , tasty        >=1.4.0.2   && <1.5 || ^>=1.5
+    , tasty        ^>=1.4.0.2  || ^>=1.5
     , tasty-hunit  ^>=0.10.0.3
 
   build-tool-depends: tasty-discover:tasty-discover >=4.2.2 && <5.1

src/Network/AWS/ARN.hs

@@ -64,13 +64,13 @@ import Data.Ord.Deriving (deriveOrd1)
 import Data.Text (Text)
 import qualified Data.Text as T
 import GHC.Generics (Generic, Generic1)
-import Network.AWS.ARN.Internal.Lens (Iso', Prism', iso, prism')
+import Lens.Micro.Pro (Iso', Prism', iso, prism')
 import Text.Show.Deriving (deriveShow1)
 
 -- $setup
 -- >>> :set -XOverloadedStrings
 -- >>> import Data.Function ((&))
--- >>> import Network.AWS.ARN.Internal.Lens (from, ix, (.~), (^.), (^?))
+-- >>> Lens.Micro.Pro (from, ix, (.~), (^.), (^?))
 
 -- | A parsed ARN. Either use the '_ARN' 'Prism'', or the 'parseARN' and
 -- 'renderARN' functions to convert @'Text' \<-\> 'ARN'@.  The

src/Network/AWS/ARN/Lambda.hs

@@ -26,11 +26,11 @@ import Data.Maybe (maybeToList)
 import Data.Text (Text)
 import qualified Data.Text as T
 import GHC.Generics (Generic)
-import Network.AWS.ARN.Internal.Lens (Prism', prism')
+import Lens.Micro.Pro (Prism', prism')
 
 -- $setup
 -- >>> :set -XOverloadedStrings
--- >>> import Network.AWS.ARN.Internal.Lens ((^?))
+-- >>> import Lens.Micro.Pro ((^?))
 
 -- | An AWS Lambda function name, and optional alias/version qualifier.
 --

src/Network/AWS/ARN/S3.hs

@@ -34,11 +34,11 @@ import Data.Hashable (Hashable)
 import Data.Text (Text)
 import qualified Data.Text as T
 import GHC.Generics (Generic)
-import Network.AWS.ARN.Internal.Lens (Prism', prism')
+import Lens.Micro.Pro (Prism', prism')
 
 -- $setup
 -- >>> :set -XOverloadedStrings
--- >>> import Network.AWS.ARN.Internal.Lens ((^?))
+-- >>> Lens.Micro.Pro ((^?))
 
 -- | An AWS S3 object, made of a bucket and an object key.
 --

test/Network/AWS/ARN/Lambda/Test.hs

@@ -4,7 +4,7 @@
 module Network.AWS.ARN.Lambda.Test where
 
 import Data.Text (Text)
-import Network.AWS.ARN.Internal.Lens (Lens', set, (^?))
+import Lens.Micro.Pro (Lens', set, (^?))
 import Network.AWS.ARN.Lambda
 import Test.Tasty
 import Test.Tasty.HUnit

test/Network/AWS/ARN/S3/Test.hs

@@ -4,7 +4,7 @@
 module Network.AWS.ARN.S3.Test where
 
 import Data.Text (Text)
-import Network.AWS.ARN.Internal.Lens (Lens', set, (^?))
+import Lens.Micro.Pro (Lens', set, (^?))
 import Network.AWS.ARN.S3
 import Test.Tasty
 import Test.Tasty.HUnit
@@ -28,8 +28,8 @@ test_all =
                 set (_Object . rObjectKey) "my/other/object" "bucket-name/my/object"
                   @?= "bucket-name/my/other/object"
             ]
-        ]
-    , testGroup
+        ],
+      testGroup
         "S3 bucket"
         [ testGroup
             "parsing"

test/Network/AWS/ARN/Test.hs

@@ -5,8 +5,8 @@ module Network.AWS.ARN.Test where
 
 import Data.List.NonEmpty (NonEmpty (..))
 import Data.Text (Text)
+import Lens.Micro.Pro (Lens', over, preview, review)
 import Network.AWS.ARN
-import Network.AWS.ARN.Internal.Lens (Lens', over, preview, review)
 import Test.Tasty
 import Test.Tasty.HUnit