Use 0.9.1 features

Relax `BooleanAlgebra` constrain to `HeytingAlgebra`.
Use single quote instead of `P`.

Author: joneshf

README.md

@@ -50,7 +50,7 @@ E.g. the `Left` side of an `Either`, or the `Nothing` side of a `Maybe`.
 
 For almost all of the types provided there are simple versions and more general versions. Using `Lens` as the example.
 
-`LensP s a` is the simple type when you don't need to change the type of your structure.
+`Lens' s a` is the simple type when you don't need to change the type of your structure.
 
 `Lens s t a b` is the type when you may want to change the type of your structure.
 
@@ -59,7 +59,7 @@ For example:
 ```purescript
 data Foo = Bar String Number Boolean
 
-fooNum :: LensP Foo Number
+fooNum :: Lens' Foo Number
 fooNum = lens (\(Bar _ n _) -> n) (\(Bar s _ b) n -> Bar s n b)
 ```
 
@@ -79,10 +79,10 @@ So, what are the type synonyms? Some examples are:
 
 ```purescript
 type Lens s t a b = forall f. (Functor f) => (a -> f b) -> s -> f t
-type LensP s a = Lens s s a a
+type Lens' s a = Lens s s a a
 
 type Prism s t a b = forall f p. (Applicative f, Choice p) => p a (f b) -> p s (f t)
-type PrismP s a = Prism s s a a
+type Prism' s a = Prism s s a a
 ```
 
 These might seem scary, especially `Prism`, but if you squint at them properly, they look very familiar.
@@ -116,11 +116,11 @@ If you can define a lens for `Foo`, you can do just that
 ```purescript
 module Foo where
 
-  import Optic.Core ((*~), LensP())
+  import Optic.Core ((*~), Lens'())
 
   data Foo = Foo Number
 
-  _Foo :: LensP Foo Number -- forall f. (Functor f) => (Number -> f Number) -> Foo -> f Foo
+  _Foo :: Lens' Foo Number -- forall f. (Functor f) => (Number -> f Number) -> Foo -> f Foo
   _Foo f (Foo n) = Foo <$> f n
 
   doubleFoo :: Foo -> Foo

docs/Optic/Core.md

@@ -87,13 +87,13 @@ prism :: forall f p s t a b. (Applicative f, Choice p) => (b -> t) -> (s -> Eith
 #### `only`
 
 ``` purescript
-only :: forall a. Eq a => a -> PrismP a Unit
+only :: forall a. Eq a => a -> Prism' a Unit
 ```
 
 #### `nearly`
 
 ``` purescript
-nearly :: forall a. a -> (a -> Boolean) -> PrismP a Unit
+nearly :: forall a. a -> (a -> Boolean) -> Prism' a Unit
 ```
 
 #### `matching`
@@ -143,7 +143,7 @@ setJust :: forall s t a b. ASetter s t a (Maybe b) -> b -> s -> t
 #### `set'`
 
 ``` purescript
-set' :: forall s a. ASetterP s a -> a -> s -> s
+set' :: forall s a. ASetter' s a -> a -> s -> s
 ```
 
 #### `set`
@@ -161,7 +161,7 @@ over :: forall p s t a b. Profunctor p => Setting p s t a b -> p a b -> s -> t
 #### `or`
 
 ``` purescript
-or :: forall s t a. BooleanAlgebra a => ASetter s t a a -> a -> s -> t
+or :: forall s t a. HeytingAlgebra a => ASetter s t a a -> a -> s -> t
 ```
 
 #### `mul`
@@ -203,7 +203,7 @@ argument :: forall p r a b. Profunctor p => Setter (p b r) (p a r) a b
 #### `and`
 
 ``` purescript
-and :: forall s t a. BooleanAlgebra a => ASetter s t a a -> a -> s -> t
+and :: forall s t a. HeytingAlgebra a => ASetter s t a a -> a -> s -> t
 ```
 
 #### `add`
@@ -274,10 +274,10 @@ infixr 4 over as %~
 
 ### Re-exported from Optic.Types:
 
-#### `SettingP`
+#### `Setting'`
 
 ``` purescript
-type SettingP p s a = Setting p s s a a
+type Setting' p s a = Setting p s s a a
 ```
 
 #### `Setting`
@@ -286,10 +286,10 @@ type SettingP p s a = Setting p s s a a
 type Setting p s t a b = p a (Identity b) -> s -> Identity t
 ```
 
-#### `SetterP`
+#### `Setter'`
 
 ``` purescript
-type SetterP s a = Setter s s a a
+type Setter' s a = Setter s s a a
 ```
 
 #### `Setter`
@@ -298,10 +298,10 @@ type SetterP s a = Setter s s a a
 type Setter s t a b = forall f. Settable f => (a -> f b) -> s -> f t
 ```
 
-#### `PrismP`
+#### `Prism'`
 
 ``` purescript
-type PrismP s a = Prism s s a a
+type Prism' s a = Prism s s a a
 ```
 
 #### `Prism`
@@ -310,10 +310,10 @@ type PrismP s a = Prism s s a a
 type Prism s t a b = forall f p. (Applicative f, Choice p) => p a (f b) -> p s (f t)
 ```
 
-#### `OpticalP`
+#### `Optical'`
 
 ``` purescript
-type OpticalP p q f s a = Optical p q f s s a a
+type Optical' p q f s a = Optical p q f s s a a
 ```
 
 #### `Optical`
@@ -322,10 +322,10 @@ type OpticalP p q f s a = Optical p q f s s a a
 type Optical p q f s t a b = p a (f b) -> q s (f t)
 ```
 
-#### `LensP`
+#### `Lens'`
 
 ``` purescript
-type LensP s a = Lens s s a a
+type Lens' s a = Lens s s a a
 ```
 
 #### `Lens`
@@ -352,10 +352,10 @@ type Getter s a = forall f. (Contravariant f, Functor f) => (a -> f a) -> s -> f
 type Accessing p m s a = p a (Const m a) -> s -> Const m s
 ```
 
-#### `ASetterP`
+#### `ASetter'`
 
 ``` purescript
-type ASetterP s a = ASetter s s a a
+type ASetter' s a = ASetter s s a a
 ```
 
 #### `ASetter`
@@ -364,10 +364,10 @@ type ASetterP s a = ASetter s s a a
 type ASetter s t a b = (a -> Identity b) -> s -> Identity t
 ```
 
-#### `APrismP`
+#### `APrism'`
 
 ``` purescript
-type APrismP s a = APrism s s a a
+type APrism' s a = APrism s s a a
 ```
 
 #### `APrism`

docs/Optic/Internal/Prism.md

@@ -14,10 +14,10 @@ Profunctor (Market a b)
 Choice (Market a b)
 ```
 
-#### `MarketP`
+#### `Market'`
 
 ``` purescript
-type MarketP a = Market a a
+type Market' a = Market a a
 ```
 
 

docs/Optic/Laws/Lens.md

@@ -5,15 +5,15 @@ Valid `Lens`es should satisfy three laws.
 #### `validLens`
 
 ``` purescript
-validLens :: forall s a. (Eq a, Eq s) => LensP s a -> s -> a -> a -> a -> Boolean
+validLens :: forall s a. (Eq a, Eq s) => Lens' s a -> s -> a -> a -> a -> Boolean
 ```
 
 A valid `Lens` satisfies all three of the following laws.
 
 #### `getSet`
 
 ``` purescript
-getSet :: forall s a. Eq s => LensP s a -> s -> Boolean
+getSet :: forall s a. Eq s => Lens' s a -> s -> Boolean
 ```
 
 If you get a value out, and then set it immediately back,
@@ -22,7 +22,7 @@ nothing should change.
 #### `setGet`
 
 ``` purescript
-setGet :: forall s a. Eq a => LensP s a -> s -> a -> Boolean
+setGet :: forall s a. Eq a => Lens' s a -> s -> a -> Boolean
 ```
 
 If you set a value, and them get it immediately out,

docs/Optic/Prism.md

@@ -27,13 +27,13 @@ matching :: forall s t a b. APrism s t a b -> s -> Either t a
 #### `nearly`
 
 ``` purescript
-nearly :: forall a. a -> (a -> Boolean) -> PrismP a Unit
+nearly :: forall a. a -> (a -> Boolean) -> Prism' a Unit
 ```
 
 #### `only`
 
 ``` purescript
-only :: forall a. Eq a => a -> PrismP a Unit
+only :: forall a. Eq a => a -> Prism' a Unit
 ```
 
 #### `prism`

docs/Optic/Setter.md

@@ -93,7 +93,7 @@ set :: forall s t a b. ASetter s t a b -> b -> s -> t
 #### `set'`
 
 ``` purescript
-set' :: forall s a. ASetterP s a -> a -> s -> s
+set' :: forall s a. ASetter' s a -> a -> s -> s
 ```
 
 #### `sets`
@@ -129,13 +129,13 @@ div :: forall s t a. EuclideanRing a => ASetter s t a a -> a -> s -> t
 #### `or`
 
 ``` purescript
-or :: forall s t a. BooleanAlgebra a => ASetter s t a a -> a -> s -> t
+or :: forall s t a. HeytingAlgebra a => ASetter s t a a -> a -> s -> t
 ```
 
 #### `and`
 
 ``` purescript
-and :: forall s t a. BooleanAlgebra a => ASetter s t a a -> a -> s -> t
+and :: forall s t a. HeytingAlgebra a => ASetter s t a a -> a -> s -> t
 ```
 
 #### `concat`

docs/Optic/Types.md

@@ -12,10 +12,10 @@ type Accessing p m s a = p a (Const m a) -> s -> Const m s
 type APrism s t a b = Market a b a (Identity b) -> Market a b s (Identity t)
 ```
 
-#### `APrismP`
+#### `APrism'`
 
 ``` purescript
-type APrismP s a = APrism s s a a
+type APrism' s a = APrism s s a a
 ```
 
 #### `ASetter`
@@ -24,10 +24,10 @@ type APrismP s a = APrism s s a a
 type ASetter s t a b = (a -> Identity b) -> s -> Identity t
 ```
 
-#### `ASetterP`
+#### `ASetter'`
 
 ``` purescript
-type ASetterP s a = ASetter s s a a
+type ASetter' s a = ASetter s s a a
 ```
 
 #### `Getting`
@@ -48,10 +48,10 @@ type Getter s a = forall f. (Contravariant f, Functor f) => (a -> f a) -> s -> f
 type Lens s t a b = forall f. Functor f => (a -> f b) -> s -> f t
 ```
 
-#### `LensP`
+#### `Lens'`
 
 ``` purescript
-type LensP s a = Lens s s a a
+type Lens' s a = Lens s s a a
 ```
 
 #### `Optical`
@@ -60,10 +60,10 @@ type LensP s a = Lens s s a a
 type Optical p q f s t a b = p a (f b) -> q s (f t)
 ```
 
-#### `OpticalP`
+#### `Optical'`
 
 ``` purescript
-type OpticalP p q f s a = Optical p q f s s a a
+type Optical' p q f s a = Optical p q f s s a a
 ```
 
 #### `Prism`
@@ -72,10 +72,10 @@ type OpticalP p q f s a = Optical p q f s s a a
 type Prism s t a b = forall f p. (Applicative f, Choice p) => p a (f b) -> p s (f t)
 ```
 
-#### `PrismP`
+#### `Prism'`
 
 ``` purescript
-type PrismP s a = Prism s s a a
+type Prism' s a = Prism s s a a
 ```
 
 #### `Setter`
@@ -84,10 +84,10 @@ type PrismP s a = Prism s s a a
 type Setter s t a b = forall f. Settable f => (a -> f b) -> s -> f t
 ```
 
-#### `SetterP`
+#### `Setter'`
 
 ``` purescript
-type SetterP s a = Setter s s a a
+type Setter' s a = Setter s s a a
 ```
 
 #### `Setting`
@@ -96,10 +96,10 @@ type SetterP s a = Setter s s a a
 type Setting p s t a b = p a (Identity b) -> s -> Identity t
 ```
 
-#### `SettingP`
+#### `Setting'`
 
 ``` purescript
-type SettingP p s a = Setting p s s a a
+type Setting' p s a = Setting p s s a a
 ```
 
 

package.json

@@ -18,6 +18,7 @@
   },
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
+    "docs": "pulp docs",
     "build": "pulp build --censor-lib --strict",
     "test": "pulp test"
   },

src/Optic/Core.purs

@@ -12,7 +12,7 @@ module Optic.Core
   import Optic.Lens (flip', lens, (??))
   import Optic.Prism (clonePrism, is, isn't, matching, nearly, only, prism, prism', withPrism)
   import Optic.Setter (add, and, argument, concat, contramapped, div, mapped, mul, or, over, set, set', setJust, sets, sub, (%~), (&&~), (*~), (+~), (-~), (.~), (/~), (<>~), (?~), (||~))
-  import Optic.Types (APrism, APrismP, ASetter, ASetterP, Accessing, Getter, Getting, Lens, LensP, Optical, OpticalP, Prism, PrismP, Setter, SetterP, Setting, SettingP)
+  import Optic.Types (APrism, APrism', ASetter, ASetter', Accessing, Getter, Getting, Lens, Lens', Optical, Optical', Prism, Prism', Setter, Setter', Setting, Setting')
 
 
   import Prelude (class Semigroupoid, (<<<))

src/Optic/Getter.purs

@@ -6,12 +6,12 @@ module Optic.Getter
   ) where
 
   import Data.Const (getConst, Const(..))
-  import Data.Functor.Contravariant ((>$<), class Contravariant)
-  import Data.Profunctor (dimap, class Profunctor)
+  import Data.Functor.Contravariant (class Contravariant, coerce)
+  import Data.Profunctor (class Profunctor, dimap)
 
   import Optic.Types (Getting())
 
-  import Prelude (class Functor, (<$>), flip)
+  import Prelude (class Functor, flip)
 
   infixl 8 weiv as ^.
 
@@ -23,12 +23,3 @@ module Optic.Getter
 
   weiv :: forall s a. s -> Getting a s a -> a
   weiv = flip view
-
-  newtype Void = Void Void
-
-  coerce :: forall f a b. (Contravariant f, Functor f) => f a -> f b
-  coerce a = absurd <$> (absurd >$< a)
-
-  absurd :: forall a. Void -> a
-  absurd a = spin a
-    where spin (Void b) = spin b