Restructure the library

flex-tasks/flex-tasks.cabal

@@ -12,23 +12,24 @@ extra-source-files:
 
 library
   exposed-modules:
-      FlexTask.ConvertForm
-      FlexTask.DefaultConfig
-      FlexTask.FormHelpers
-      FlexTask.FormUtil
-      FlexTask.Generic.Form
-      FlexTask.Generic.Parse
+      FlexTask.Config.Default
+      FlexTask.Config.Types
+      FlexTask.Form
+      FlexTask.Form.Helpers
+      FlexTask.Form.ToHtml
+      FlexTask.Form.Types
+      FlexTask.Form.Util
       FlexTask.GenUtil
+      FlexTask.InputTypes
       FlexTask.Interpreter.EvaluationHelper
       FlexTask.Interpreter.GenerationHelper
       FlexTask.Interpreter
-      FlexTask.Types
-      FlexTask.YesodConfig
+      FlexTask.Parser
   other-modules:
-      FlexTask.Generic.FormInternal
-      FlexTask.Generic.ParseInternal
-      FlexTask.Styling
-      FlexTask.Widgets
+      FlexTask.Form.Internal
+      FlexTask.Form.Styling
+      FlexTask.Form.Widgets
+      FlexTask.Parser.Internal
       Paths_flex_tasks
   hs-source-dirs:
       src
@@ -130,12 +131,12 @@ test-suite flex-tasks-test
   type: exitcode-stdio-1.0
   main-is: Spec.hs
   other-modules:
-      FlexTask.DefaultConfigSpec
-      FlexTask.FormUtilSpec
-      FlexTask.Generic.FormSpec
-      FlexTask.Generic.ParseSpec
+      FlexTask.Config.DefaultSpec
+      FlexTask.Config.TypesSpec
+      FlexTask.Form.UtilSpec
+      FlexTask.FormSpec
+      FlexTask.ParserSpec
       FlexTask.TestUtil
-      FlexTask.TypesSpec
       Paths_flex_tasks
   hs-source-dirs:
       test

flex-tasks/package.yaml

@@ -45,18 +45,19 @@ default-extensions:
 library:
   source-dirs: src
   exposed-modules:
-    - FlexTask.ConvertForm
-    - FlexTask.DefaultConfig
-    - FlexTask.FormHelpers
-    - FlexTask.FormUtil
-    - FlexTask.Generic.Form
-    - FlexTask.Generic.Parse
+    - FlexTask.Config.Default
+    - FlexTask.Config.Types
+    - FlexTask.Form
+    - FlexTask.Form.Helpers
+    - FlexTask.Form.ToHtml
+    - FlexTask.Form.Types
+    - FlexTask.Form.Util
     - FlexTask.GenUtil
+    - FlexTask.InputTypes
     - FlexTask.Interpreter.EvaluationHelper
     - FlexTask.Interpreter.GenerationHelper
     - FlexTask.Interpreter
-    - FlexTask.Types
-    - FlexTask.YesodConfig
+    - FlexTask.Parser
   ghc-options:
     - -Wall
     - -Widentities

flex-tasks/src/FlexTask/DefaultConfig.hs → flex-tasks/src/FlexTask/Config/Default.hs

@@ -2,14 +2,14 @@
 {-# Language TemplateHaskell #-}
 {-# OPTIONS -fforce-recomp #-}
 
-module FlexTask.DefaultConfig (defaultConfig) where
+module FlexTask.Config.Default (defaultConfig) where
 
 
 import Data.ByteString.UTF8 (toString)
 import Data.FileEmbed (embedFileRelative)
 import Text.Parsec (parse)
 
-import FlexTask.Types (FlexConf, parseFlexConfig)
+import FlexTask.Config.Types (FlexConf, parseFlexConfig)
 
 
 

flex-tasks/src/FlexTask/Types.hs → flex-tasks/src/FlexTask/Config/Types.hs

@@ -7,7 +7,7 @@
 FlexTask configuration and task instance types.
 -}
 
-module FlexTask.Types
+module FlexTask.Config.Types
   ( HtmlDict
   , CommonModules(..)
   , FlexInst(..)

flex-tasks/src/FlexTask/Generic/Form.hs → flex-tasks/src/FlexTask/Form.hs

@@ -7,29 +7,17 @@
 Generic `Yesod` input form generation and related utility functions.
 -}
 
-module FlexTask.Generic.Form (
+module FlexTask.Form (
   -- * Data Types
     Alignment(..)
   , FieldInfo
-  , SingleChoiceSelection
-  , MultipleChoiceSelection
-  , Hidden(..)
-  , SingleInputList(..)
+
     -- * Type Classes
   , BaseForm(..)
   , Formify(..)
   , formify
   , formifyComponents
   , formifyComponentsFlat
-    -- * Anonymous Enum Type Builders and Accessors.
-  , getAnswer
-  , getAnswerAsIndex
-  , getAnswers
-  , getAnswersAsIndices
-  , multipleChoiceAnswer
-  , multipleChoiceEmpty
-  , singleChoiceAnswer
-  , singleChoiceEmpty
 
     -- * Field Builders
   , buttons
@@ -53,7 +41,7 @@ module FlexTask.Generic.Form (
 
 import GHC.TypeLits (TypeError, ErrorMessage(Text,(:$$:)))
 
-import FlexTask.Generic.FormInternal
+import FlexTask.Form.Internal
 
 
 instance {-# Overlappable #-} TypeError (

flex-tasks/src/FlexTask/FormHelpers.hs → flex-tasks/src/FlexTask/Form/Helpers.hs

@@ -4,7 +4,7 @@
 Helpers for commonly used form patterns.
 -}
 
-module FlexTask.FormHelpers (
+module FlexTask.Form.Helpers (
   anonymousRadioButtons,
   labeledRadioButtons,
   labeledCheckboxes,
@@ -13,15 +13,17 @@ module FlexTask.FormHelpers (
 
 import Yesod                            (FieldSettings, SomeMessage)
 
-import FlexTask.FormUtil                (showToUniversalLabel, universalLabel)
-import FlexTask.Generic.Form (
-  Alignment,
+import FlexTask.InputTypes (
   MultipleChoiceSelection,
   SingleChoiceSelection,
+  )
+import FlexTask.Form.Internal (
+  Alignment,
   buttons,
   formify,
   )
-import FlexTask.YesodConfig             (FlexForm, Rendered, Widget)
+import FlexTask.Form.Types              (FlexForm, Rendered, Widget)
+import FlexTask.Form.Util               (showToUniversalLabel, universalLabel)