Finish another refactor

cabal.project

@@ -12,9 +12,15 @@ source-repository-package
   tag: 60093b23ad22302da6ff8e83863a1ee759b229d4
 packages:
   yaifl/yaifl.cabal
-  yaifl-rogue/yaifl-rogue.cabal
-  roguefunctor/roguefunctor.cabal
-  yaifl-discord/yaifl-discord.cabal
+  yaifl-core/yaifl-core.cabal
+  yaifl-objects/yaifl-objects.cabal
+  yaifl-rules/yaifl-rules.cabal
+  yaifl-actions/yaifl-actions.cabal
+  yaifl/yaifl.cabal
+  yaifl-examples/yaifl-examples.cabal
+  -- yaifl-rogue/yaifl-rogue.cabal
+  -- roguefunctor/roguefunctor.cabal
+  -- yaifl-discord/yaifl-discord.cabal
 
 -- documentation: true
 haddock-all: true

yaifl-city/src/Main.hs → old stuff/yaifl-city/src/Main.hs

@@ -2,21 +2,21 @@ module Main where
 
 import Yaifl.Prelude
 import Yaifl
-import Yaifl.Core.Action
-import Yaifl.Core.Rules.Rulebook
+import Yaifl.Action
+import Yaifl.Rulebook
 import Yaifl.Text.ResponseCollection
 import Breadcrumbs
 
-import Yaifl.Core.Effects
-import Yaifl.Text.Print
-import Yaifl.Core.Rules.Run
+import Yaifl.Effects.ObjectQuery
+import Yaifl.Effects.Print
+import Yaifl.Rule
 import Yaifl.Text.SayQQ
 import Yaifl.Std.Create.Rule
-import Yaifl.Core.Rules.RuleEffects
+import Yaifl.Effects.RuleEffects
 import Yaifl.Text.SayableValue
 import Yaifl.Gen.Plan
 import Yaifl.Gen.City.ApartmentTower
-import Yaifl.Std.Kinds.Direction
+import Yaifl.Direction.Kind
 
 data ConstructionOptions wm = ConstructionOptions
   { activityCollectionBuilder :: ActivityCollection wm -> ActivityCollector wm

yaifl-city/src/Yaifl/Gen/City/Apartment.hs → old stuff/yaifl-city/src/Yaifl/Gen/City/Apartment.hs

@@ -7,11 +7,11 @@ module Yaifl.Gen.City.Apartment
 import Yaifl.Prelude
 import Yaifl.Gen.Plan
 import Control.Placeholder
-import Yaifl.Core.WorldModel
-import Yaifl.Std.Kinds.Region
+import Yaifl.WorldModel
+import Yaifl.Region.Kind
 import Yaifl.Std.Create
-import Yaifl.Core.Entity
-import Yaifl.Core.Rules.Rulebook
+import Yaifl.Entity
+import Yaifl.Rulebook
 import Yaifl.Gen.City.Building
 
 data RoomType = LivingRoom | Kitchen | Bathroom | Bedroom | Study

yaifl-city/src/Yaifl/Gen/City/ApartmentTower.hs → old stuff/yaifl-city/src/Yaifl/Gen/City/ApartmentTower.hs

@@ -6,19 +6,19 @@ module Yaifl.Gen.City.ApartmentTower
   ) where
 
 import Yaifl.Prelude hiding (State, Down)
-import Yaifl.Std.Create.Object
-import Yaifl.Core.WorldModel
-import Yaifl.Std.Kinds.Direction
-import Yaifl.Std.Create.RoomConnection
+import Yaifl.Object.Create
+import Yaifl.WorldModel
+import Yaifl.Direction.Kind
+import Yaifl.Room.Connection
 import Yaifl.Gen.City.Building
 import Yaifl.Text.DynamicText
-import Yaifl.Core.Entity
-import Yaifl.Core.Rules.Rulebook
+import Yaifl.Entity
+import Yaifl.Rulebook
 import System.Random.Stateful
 import Yaifl.Text.AdaptiveNarrative
-import Yaifl.Core.Query.Object
-import Yaifl.Std.Kinds.Door
-import Yaifl.Core.Tag
+import Yaifl.Object.Query
+import Yaifl.Door.Kind
+import Yaifl.Tag
 import Data.Text (toLower)
 import Yaifl.Std.Create
 import Yaifl

yaifl-city/src/Yaifl/Gen/City/Building.hs → old stuff/yaifl-city/src/Yaifl/Gen/City/Building.hs

@@ -6,18 +6,18 @@ module Yaifl.Gen.City.Building
 ) where
 
 import Yaifl.Prelude
-import Yaifl.Core.Entity
-import Yaifl.Std.Kinds.Region
-import Yaifl.Core.WorldModel
-import Yaifl.Core.Effects
-import Yaifl.Core.Rules.Rulebook
-import Yaifl.Core.HasProperty
+import Yaifl.Entity
+import Yaifl.Region.Kind
+import Yaifl.WorldModel
+import Yaifl.Effects.ObjectQuery
+import Yaifl.Rulebook
+import Yaifl.Property.Has
 import Yaifl.Std.Create
-import Yaifl.Std.Kinds.MultiLocated
-import Yaifl.Core.Kinds.Enclosing
-import Yaifl.Std.Kinds.Door
+import Yaifl.MultiLocated.Kind
+import Yaifl.Enclosing.Kind
+import Yaifl.Door.Kind
 import Yaifl.Text.Say (WithPrintingNameOfSomething)
-import Yaifl.Std.Activities.ListingContents (WithListingContents)
+import Yaifl.Activities.ListingContents (WithListingContents)
 
 data Building wm = Building
   { name :: Text
@@ -55,7 +55,7 @@ type BuildingGeneration wm es =
   , RuleEffects wm es
   , WithPrintingNameOfSomething wm
   , WithListingContents wm
-  , NoMissingObjects wm es
+  , WithoutMissingObjects wm es
   , WMStdDirections wm
   , WMWithProperty wm MultiLocated
   , WMWithProperty wm Enclosing

yaifl-discord/app/ExampleUtils.hs → old stuff/yaifl-discord/app/ExampleUtils.hs

@@ -13,19 +13,19 @@ import Data.Char (isSpace)
 import Language.Haskell.TH
 import Language.Haskell.TH.Quote hiding (quoteExp)
 import Yaifl
-import Yaifl.Core.Rules.Run
+import Yaifl.Rule
 import Yaifl.Text.ResponseCollection
 
 import qualified Data.Text as T
 
-import Yaifl.Text.Print
+import Yaifl.Effects.Print
 import Yaifl.Text.Verb
 
-import Yaifl.Std.ObjectSpecifics
-import Yaifl.Core.Effects
+import Yaifl.ObjectSpecifics
+import Yaifl.Effects.ObjectQuery
 import Yaifl.Std.Rulebooks.ActionProcessing
-import Yaifl.Core.Rules.RuleEffects
-import Yaifl.Std.EffectHandlers
+import Yaifl.Effects.RuleEffects
+import Yaifl.Effects.Interpreters
 
 expQQ :: (String -> Q Exp) -> QuasiQuoter
 expQQ quoteExp = QuasiQuoter quoteExp notSupported notSupported notSupported where

yaifl-discord/app/Main.hs → old stuff/yaifl-discord/app/Main.hs

@@ -12,22 +12,22 @@ import Yaifl.Std.Rulebooks.ActionProcessing
 import Yaifl
 import Breadcrumbs
 import Yaifl.Std.Parser
-import Yaifl.Std.Kinds.Direction
-import Yaifl.Text.Print
-import Yaifl.Std.Actions.Collection
+import Yaifl.Direction.Kind
+import Yaifl.Effects.Print
+import Yaifl.Actions.Collection
 import Effectful.Error.Static (runError)
 
-import Yaifl.Std.Actions.Looking.Visibility
+import Yaifl.Visibility
 import Effectful.Provider.List (type (++))
-import Yaifl.Std.EffectHandlers
-import Yaifl.Core.Effects
-import Yaifl.Std.Actions.Imports
+import Yaifl.Effects.Interpreters
+import Yaifl.Effects.ObjectQuery
+import Yaifl.Actions.Imports
 import Yaifl.Std.Create
-import Yaifl.Std.Actions.Going
-import Yaifl.Core.ObjectLike
-import Yaifl.Core.Rules.Run
+import Yaifl.Actions.Going
+import Yaifl.ObjectLike
+import Yaifl.Rule
 import Yaifl.Text.ResponseCollection
-import Yaifl.Core.Rules.RuleEffects
+import Yaifl.Effects.RuleEffects
 import Discord.Internal.Rest
 import qualified Data.List as L
 import qualified Discord.Requests as R
@@ -39,10 +39,10 @@ import Effectful.Dispatch.Dynamic (interpret)
 import qualified Data.Text as T
 import Yaifl.Core.Query.Region
 import Data.Maybe (fromJust)
-import Yaifl.Core.Kinds.Object
-import Yaifl.Core.Tag
-import Yaifl.Std.Kinds.Supporter
-import Yaifl.Std.Kinds.Container
+import Yaifl.Object.Kind
+import Yaifl.Tag
+import Yaifl.Supporter.Kind
+import Yaifl.Container.Kind
 
 portRoyal3World :: Game PlainWorldModel ()
 portRoyal3World = do

yaifl-rogue/app/EffectStack.hs → old stuff/yaifl-rogue/app/EffectStack.hs

@@ -4,16 +4,16 @@ import Yaifl.Prelude hiding ( Reader, runReader )
 
 import Breadcrumbs
 import Yaifl.Std.Parser
-import Yaifl.Std.Kinds.Direction
-import Yaifl.Core.WorldModel
-import Yaifl.Text.Print
+import Yaifl.Direction.Kind
+import Yaifl.WorldModel
+import Yaifl.Effects.Print
 import Yaifl.Std.World
-import Yaifl.Std.Actions.Collection
+import Yaifl.Actions.Collection
 import Effectful.Error.Static (runError)
 
-import Yaifl.Std.Actions.Looking.Visibility
+import Yaifl.Visibility
 import Effectful.Provider.List (type (++))
-import Yaifl.Std.EffectHandlers
+import Yaifl.Effects.Interpreters
 import Gui
 
 convertStack ::

yaifl-rogue/app/Gui.hs → old stuff/yaifl-rogue/app/Gui.hs

@@ -10,25 +10,25 @@ import Rogue.Geometry.Rectangle
 import Rogue.Geometry.V2
 import Rogue.Rendering.Viewport
 import Yaifl
-import Yaifl.Core.Effects
-import Yaifl.Core.Rules.RuleEffects
-import Yaifl.Core.Rules.Run
+import Yaifl.Effects.ObjectQuery
+import Yaifl.Effects.RuleEffects
+import Yaifl.Rule
 import Yaifl.Prelude
 import Yaifl.Std.Create
-import Yaifl.Std.EffectHandlers
+import Yaifl.Effects.Interpreters
 import Yaifl.Std.Rulebooks.ActionProcessing
-import Yaifl.Text.Print
+import Yaifl.Effects.Print
 import Yaifl.Text.ResponseCollection
 import qualified Data.Text as T
 import MessageLog
 import Data.Char (isPrint)
-import Yaifl.Std.Actions.Collection
-import Yaifl.Std.Kinds.Person
-import Yaifl.Core.Query.Enclosing (getLocation)
+import Yaifl.Actions.Collection
+import Yaifl.Person.Kind
+import Yaifl.Enclosing.Query (getLocation)
 import Rooms
-import Yaifl.Core.Kinds.Object
+import Yaifl.Object.Kind
 import Rogue.Array2D.Boxed
-import Yaifl.Std.Actions.Imports
+import Yaifl.Actions.Imports
 import qualified Rogue.Colour as R
 import Yaifl.Rogue.PositionData
 
@@ -223,7 +223,7 @@ tile loc = lens (\w -> fromMaybe (error "") $ w ^? ix loc) (\w t -> w & ix loc .
 renderTopTerminal ::
   IOE :> es
   => RuleEffects SpatialWorldModel es
-  => NoMissingObjects SpatialWorldModel es
+  => WithoutMissingObjects SpatialWorldModel es
   => State GuiState :> es
   => Int
   -> Eff es ()

yaifl-rogue/app/Main.hs → old stuff/yaifl-rogue/app/Main.hs

@@ -13,7 +13,7 @@ import Yaifl.Std.Rulebooks.ActionProcessing
 import MessageLog
 import Gui
 import EffectStack
-import Yaifl.Std.Actions.Collection
+import Yaifl.Actions.Collection
 import Yaifl ()
 import Rooms
 

yaifl-rogue/app/MessageLog.hs → old stuff/yaifl-rogue/app/MessageLog.hs

@@ -2,7 +2,7 @@
 module MessageLog where
 
 import Yaifl.Prelude hiding (Reader)
-import Yaifl.Text.Print
+import Yaifl.Effects.Print
 import Prettyprinter
 import Rogue.Rendering.Viewport
 import qualified Data.Text.Lazy.Builder as TLB

yaifl-rogue/app/Rooms.hs → old stuff/yaifl-rogue/app/Rooms.hs

@@ -3,17 +3,17 @@ module Rooms where
 import Yaifl.Prelude
 import Yaifl
 import Yaifl.Std.Create
-import Yaifl.Std.Kinds.Direction
+import Yaifl.Direction.Kind
 import Yaifl.Text.ResponseCollection
 import Yaifl.Text.DynamicText
 import Yaifl.Rogue.PositionData
 
 
-import Yaifl.Std.Actions.Going
+import Yaifl.Actions.Going
 import Yaifl.Text.SayableValue
 import Yaifl.Text.Say
-import Yaifl.Core.ObjectLike
-import Yaifl.Core.Rules.Rulebook
+import Yaifl.ObjectLike
+import Yaifl.Rulebook
 import Rogue.Geometry.V2
 import Rogue.Array2D.Boxed
 import Rogue.Colour

yaifl-rogue/src/Yaifl/Rogue/RoomGenerator.hs → old stuff/yaifl-rogue/src/Yaifl/Rogue/RoomGenerator.hs

@@ -6,9 +6,9 @@ import Rogue.Array2D.Boxed
 import qualified Data.Vector as V
 import Rogue.Colour
 import Rogue.Geometry.Rectangle
-import Yaifl.Core.Kinds.Room
+import Yaifl.Room.Kind
 import Yaifl.Rogue.PositionData (RoomSpatialData(..))
-import Yaifl.Core.WorldModel
+import Yaifl.WorldModel
 
 
 digRectangle ::