trasa-form 0.4 → 0.4.1

raw patch · 2 files changed

+24/−7 lines, 2 filesdep ~trasadep ~trasa-server

Dependency ranges changed: trasa, trasa-server

Files

• src/Trasa/Form.hs +20/−3
• trasa-form.cabal +4/−4

@@ -6,6 +6,18 @@   , GeneralizedNewtypeDeriving   , LambdaCase   , StandaloneDeriving +  , RankNTypes+  , OverloadedStrings+  , LambdaCase+  , DataKinds+  , PolyKinds+  , GADTs+  , TypeOperators+  , TypeFamilies+  , RankNTypes+  , ScopedTypeVariables+  , DeriveFunctor+  , GeneralizedNewtypeDeriving #-}  {-# OPTIONS_GHC -fno-warn-orphans #-}@@ -30,6 +42,7 @@ import Control.Applicative (Alternative(..)) import Control.Monad.Except import Control.Monad.Reader+-- import Data.Functor.Identity import Data.String (IsString(..)) import Data.Text (Text) import Data.Bifunctor@@ -147,8 +160,11 @@  deriving instance Monad m => MonadReader FormType (TrasaFormT m) --- | a GET request, or a @POST@ request which may hav the untyped @FormData@-data FormType = Get | Post (Maybe (HM.HashMap Text [Text]))+-- | No environment, a GET request, or a @POST@ request which may hav the untyped @FormData@+data FormType +  = None+  | Get +  | Post (Maybe (HM.HashMap Text [Text]))  instance Monad m => Environment (TrasaFormT m) QueryParam where   environment formId = ask >>= \case@@ -164,6 +180,7 @@       case HM.lookup (encodeFormId formId) queryString of         Nothing -> pure Missing         Just x -> pure (Found x)+    None -> pure Default  -- | lift a TrasaT to a TrasaFormT liftToForm :: Monad m => TrasaT m a -> TrasaFormT m a@@ -174,5 +191,5 @@   => Text   -> Form (TrasaFormT m) QueryParam err view a   -> TrasaT m view-trasaFormView name form = flip runReaderT Get $ getTrasaFormT $ viewForm name form+trasaFormView name form = flip runReaderT None $ getTrasaFormT $ viewForm name form 

@@ -1,6 +1,6 @@ cabal-version: 2.0 name: trasa-form-version: 0.4+version: 0.4.1 synopsis: generate forms using lucid, ditto and trasa description: Formlets library for trasa using ditto as its backend.              Although trasa already has machinery for creating@@ -25,7 +25,7 @@   -- other-modules:   -- other-extensions:   ghc-options: -Wall-  build-depends: +  build-depends:       base < 5     , http-api-data     , cookie@@ -36,8 +36,8 @@     , ditto >= 0.4 && < 0.5     , ditto-lucid >= 0.4 && < 0.5     , text-    , trasa-    , trasa-server >= 0.5.3+    , trasa >= 0.4.1+    , trasa-server >= 0.5.4     , unordered-containers     , bytestring   hs-source-dirs: src