diff --git a/bindings/haskell/benchmark/Main.hs b/bindings/haskell/benchmark/Main.hs index b866ad8..930f12d 100644 --- a/bindings/haskell/benchmark/Main.hs +++ b/bindings/haskell/benchmark/Main.hs @@ -17,14 +17,14 @@ import Data.Maybe (Maybe (..)) import Data.Text qualified as Text import Data.Unrestricted.Linear (Ur) import Data.Word (Word64) -import EventSorcery.Engine ( +import Event.Sorcery.Engine ( EngineError, OpenOptions (OpenOptions), Store, closeStore, openStore, ) -import EventSorcery.Job ( +import Event.Sorcery.Job ( ClaimBudget (ClaimBudget), ClaimedJob, JobClaimDetails, @@ -43,7 +43,7 @@ import EventSorcery.Job ( mkJobId, settlementToken, ) -import EventSorcery.Stream ( +import Event.Sorcery.Stream ( AggregateId (AggregateId), AggregateType (AggregateType), EventType (EventType), diff --git a/bindings/haskell/event-sorcery.cabal b/bindings/haskell/event-sorcery.cabal index f073c4a..c8e50f2 100644 --- a/bindings/haskell/event-sorcery.cabal +++ b/bindings/haskell/event-sorcery.cabal @@ -47,33 +47,33 @@ common strict library acquisition import: strict hs-source-dirs: src - exposed-modules: EventSorcery.Engine.Acquisition + exposed-modules: Event.Sorcery.Engine.Acquisition build-depends: base >=4.18 && <5 library import: strict hs-source-dirs: src exposed-modules: - EventSorcery.Aggregate - EventSorcery.Dispatch - EventSorcery.Dispatch.TestSupport - EventSorcery.Dispatch.Worker - EventSorcery.Engine - EventSorcery.Engine.Internal.FFI - EventSorcery.Job - EventSorcery.Job.Execution - EventSorcery.Job.Worker - EventSorcery.Snapshot - EventSorcery.Store - EventSorcery.Stream + Event.Sorcery.Aggregate + Event.Sorcery.Dispatch + Event.Sorcery.Dispatch.TestSupport + Event.Sorcery.Dispatch.Worker + Event.Sorcery.Engine + Event.Sorcery.Engine.Internal.FFI + Event.Sorcery.Job + Event.Sorcery.Job.Execution + Event.Sorcery.Job.Worker + Event.Sorcery.Snapshot + Event.Sorcery.Store + Event.Sorcery.Stream other-modules: - EventSorcery.Dispatch.Internal - EventSorcery.Engine.Acquisition - EventSorcery.Engine.Internal - EventSorcery.Job.Definition - EventSorcery.Job.Worker.Definition - EventSorcery.Job.Worker.Internal + Event.Sorcery.Dispatch.Internal + Event.Sorcery.Engine.Acquisition + Event.Sorcery.Engine.Internal + Event.Sorcery.Job.Definition + Event.Sorcery.Job.Worker.Definition + Event.Sorcery.Job.Worker.Internal extra-libraries: event_sorcery_ffi build-depends: @@ -106,7 +106,7 @@ test-suite engine-spec type: exitcode-stdio-1.0 hs-source-dirs: test main-is: EngineSpec.hs - other-modules: EventSorcery.Engine.AcquisitionSpec + other-modules: Event.Sorcery.Engine.AcquisitionSpec ghc-options: -threaded -with-rtsopts=-N build-depends: , base >=4.18 && <5 diff --git a/bindings/haskell/src/EventSorcery/Aggregate.hs b/bindings/haskell/src/Event/Sorcery/Aggregate.hs similarity index 95% rename from bindings/haskell/src/EventSorcery/Aggregate.hs rename to bindings/haskell/src/Event/Sorcery/Aggregate.hs index 898a101..ff3952a 100644 --- a/bindings/haskell/src/EventSorcery/Aggregate.hs +++ b/bindings/haskell/src/Event/Sorcery/Aggregate.hs @@ -1,6 +1,6 @@ {-# LANGUAGE FunctionalDependencies #-} -module EventSorcery.Aggregate ( +module Event.Sorcery.Aggregate ( DecodeCause (..), DispatchIntent, Dispatches (..), @@ -21,8 +21,8 @@ import Data.Proxy (Proxy) import Data.Text (Text) import Data.Type.Equality (type (~)) import Data.Word (Word16) -import EventSorcery.Dispatch (DispatchOutcome, JobDispatch) -import EventSorcery.Job.Definition ( +import Event.Sorcery.Dispatch (DispatchOutcome, JobDispatch) +import Event.Sorcery.Job.Definition ( Job (..), JobId, ) diff --git a/bindings/haskell/src/EventSorcery/Dispatch.hs b/bindings/haskell/src/Event/Sorcery/Dispatch.hs similarity index 92% rename from bindings/haskell/src/EventSorcery/Dispatch.hs rename to bindings/haskell/src/Event/Sorcery/Dispatch.hs index dc5cb95..20f03b0 100644 --- a/bindings/haskell/src/EventSorcery/Dispatch.hs +++ b/bindings/haskell/src/Event/Sorcery/Dispatch.hs @@ -1,4 +1,4 @@ -module EventSorcery.Dispatch ( +module Event.Sorcery.Dispatch ( DispatchEvent (..), DispatchFailure (..), DispatchOutcome, @@ -23,7 +23,7 @@ module EventSorcery.Dispatch ( ) where import Data.Word (Word32) -import EventSorcery.Dispatch.Internal ( +import Event.Sorcery.Dispatch.Internal ( DispatchEvent (..), DispatchFailure (..), DispatchOutcome, @@ -39,7 +39,7 @@ import EventSorcery.Dispatch.Internal ( originateDispatch, settleDispatch, ) -import EventSorcery.Job.Definition (JobId) +import Event.Sorcery.Job.Definition (JobId) dispatchJob :: JobDispatch job -> job diff --git a/bindings/haskell/src/EventSorcery/Dispatch/Internal.hs b/bindings/haskell/src/Event/Sorcery/Dispatch/Internal.hs similarity index 98% rename from bindings/haskell/src/EventSorcery/Dispatch/Internal.hs rename to bindings/haskell/src/Event/Sorcery/Dispatch/Internal.hs index 01f7e4e..ee60c28 100644 --- a/bindings/haskell/src/EventSorcery/Dispatch/Internal.hs +++ b/bindings/haskell/src/Event/Sorcery/Dispatch/Internal.hs @@ -1,4 +1,4 @@ -module EventSorcery.Dispatch.Internal ( +module Event.Sorcery.Dispatch.Internal ( DispatchEvent (..), DispatchFailure (..), DispatchOutcome (..), @@ -19,7 +19,7 @@ module EventSorcery.Dispatch.Internal ( import Data.Text (Text) import Data.Word (Word32) -import EventSorcery.Job.Definition ( +import Event.Sorcery.Job.Definition ( DeadReason, Job (JobError, JobOutput), JobId, diff --git a/bindings/haskell/src/EventSorcery/Dispatch/TestSupport.hs b/bindings/haskell/src/Event/Sorcery/Dispatch/TestSupport.hs similarity index 69% rename from bindings/haskell/src/EventSorcery/Dispatch/TestSupport.hs rename to bindings/haskell/src/Event/Sorcery/Dispatch/TestSupport.hs index e27ddce..183c472 100644 --- a/bindings/haskell/src/EventSorcery/Dispatch/TestSupport.hs +++ b/bindings/haskell/src/Event/Sorcery/Dispatch/TestSupport.hs @@ -1,15 +1,15 @@ -module EventSorcery.Dispatch.TestSupport ( +module Event.Sorcery.Dispatch.TestSupport ( confirmedOutcome, failedOutcome, ) where import Data.Word (Word32) -import EventSorcery.Dispatch.Internal ( +import Event.Sorcery.Dispatch.Internal ( DispatchFailure, DispatchOutcome, ) -import EventSorcery.Dispatch.Internal qualified as Internal -import EventSorcery.Job.Definition ( +import Event.Sorcery.Dispatch.Internal qualified as Internal +import Event.Sorcery.Job.Definition ( Job (JobError, JobOutput), JobId, ) diff --git a/bindings/haskell/src/EventSorcery/Dispatch/Worker.hs b/bindings/haskell/src/Event/Sorcery/Dispatch/Worker.hs similarity index 92% rename from bindings/haskell/src/EventSorcery/Dispatch/Worker.hs rename to bindings/haskell/src/Event/Sorcery/Dispatch/Worker.hs index 9f9c139..4030fe8 100644 --- a/bindings/haskell/src/EventSorcery/Dispatch/Worker.hs +++ b/bindings/haskell/src/Event/Sorcery/Dispatch/Worker.hs @@ -1,4 +1,4 @@ -module EventSorcery.Dispatch.Worker ( +module Event.Sorcery.Dispatch.Worker ( DeliveryPolicy, DispatchWorker, OriginDeliveryError (..), @@ -12,38 +12,38 @@ module EventSorcery.Dispatch.Worker ( ) where import Data.Word (Word32) -import EventSorcery.Aggregate ( +import Event.Sorcery.Aggregate ( Dispatches (injectDispatchOutcome), EventSourced, ) -import EventSorcery.Dispatch (DispatchFailure (..), DispatchOutcome) -import EventSorcery.Dispatch.Internal qualified as Dispatch -import EventSorcery.Job ( +import Event.Sorcery.Dispatch (DispatchFailure (..), DispatchOutcome) +import Event.Sorcery.Dispatch.Internal qualified as Dispatch +import Event.Sorcery.Job ( DeadReason (RetriesExhausted), Job (JobError, JobOutput), JobId, JobInstant, ) -import EventSorcery.Job.Execution ( +import Event.Sorcery.Job.Execution ( DurableJob (renderJobError), JobAttempt (JobAttempt), ) -import EventSorcery.Job.Worker ( +import Event.Sorcery.Job.Worker ( JobRunError, JobRunResult, JobWorker, ) -import EventSorcery.Job.Worker.Internal ( +import Event.Sorcery.Job.Worker.Internal ( SettlementStrategy (..), VerdictDelivery (..), runJobOnceWith, ) -import EventSorcery.Store ( +import Event.Sorcery.Store ( Store, StoreError (..), executeCommand, ) -import EventSorcery.Stream (StreamKey) +import Event.Sorcery.Stream (StreamKey) import Prelude (Either (..), IO, pure) diff --git a/bindings/haskell/src/EventSorcery/Engine.hs b/bindings/haskell/src/Event/Sorcery/Engine.hs similarity index 88% rename from bindings/haskell/src/EventSorcery/Engine.hs rename to bindings/haskell/src/Event/Sorcery/Engine.hs index dd2883d..58cd372 100644 --- a/bindings/haskell/src/EventSorcery/Engine.hs +++ b/bindings/haskell/src/Event/Sorcery/Engine.hs @@ -1,9 +1,9 @@ -- | The engine feature: opening a store, closing it, and the ABI it speaks. -- -- The lifecycle plumbing and the call marshalling stay in --- "EventSorcery.Engine.Internal"; this module is the consumer-facing half of +-- "Event.Sorcery.Engine.Internal"; this module is the consumer-facing half of -- the feature, including the error vocabulary every engine call answers with. -module EventSorcery.Engine ( +module Event.Sorcery.Engine ( AbiVersionDetail (..), AggregateId (..), AggregateType (..), @@ -29,7 +29,7 @@ module EventSorcery.Engine ( supportedAbiMajor, ) where -import EventSorcery.Engine.Internal ( +import Event.Sorcery.Engine.Internal ( AbiVersionDetail (..), AggregateId (..), AggregateType (..), diff --git a/bindings/haskell/src/EventSorcery/Engine/Acquisition.hs b/bindings/haskell/src/Event/Sorcery/Engine/Acquisition.hs similarity index 96% rename from bindings/haskell/src/EventSorcery/Engine/Acquisition.hs rename to bindings/haskell/src/Event/Sorcery/Engine/Acquisition.hs index 1673bb9..7fa4d0b 100644 --- a/bindings/haskell/src/EventSorcery/Engine/Acquisition.hs +++ b/bindings/haskell/src/Event/Sorcery/Engine/Acquisition.hs @@ -1,4 +1,4 @@ -module EventSorcery.Engine.Acquisition ( +module Event.Sorcery.Engine.Acquisition ( StoreAcquisition (..), acquireStore, ) where diff --git a/bindings/haskell/src/EventSorcery/Engine/Internal.hs b/bindings/haskell/src/Event/Sorcery/Engine/Internal.hs similarity index 98% rename from bindings/haskell/src/EventSorcery/Engine/Internal.hs rename to bindings/haskell/src/Event/Sorcery/Engine/Internal.hs index b2f684d..eb88e9b 100644 --- a/bindings/haskell/src/EventSorcery/Engine/Internal.hs +++ b/bindings/haskell/src/Event/Sorcery/Engine/Internal.hs @@ -1,10 +1,10 @@ -- | The engine feature: the store handle, its lifecycle, and the ABI it speaks. -- --- "EventSorcery.Engine" re-exports the consumer-facing half of this module. +-- "Event.Sorcery.Engine" re-exports the consumer-facing half of this module. -- The call marshalling and the errors every call can answer with stay here so -- the stream and job features can issue engine calls without republishing the -- ABI plumbing to consumers. -module EventSorcery.Engine.Internal ( +module Event.Sorcery.Engine.Internal ( AbiVersionDetail (..), AggregateId (..), AggregateType (..), @@ -67,11 +67,11 @@ import Data.ByteString.Unsafe (unsafeUseAsCStringLen) import Data.Text (Text) import Data.Text qualified as Text import Data.Word (Word32, Word64, Word8) -import EventSorcery.Engine.Acquisition ( +import Event.Sorcery.Engine.Acquisition ( StoreAcquisition (..), acquireStore, ) -import EventSorcery.Engine.Internal.FFI ( +import Event.Sorcery.Engine.Internal.FFI ( EsBuf (..), EsStore, esAbiVersion, @@ -79,7 +79,7 @@ import EventSorcery.Engine.Internal.FFI ( esClose, esOpen, ) -import EventSorcery.Job.Definition (JobId (..)) +import Event.Sorcery.Job.Definition (JobId (..)) import Foreign.C.Types (CInt, CSize) import Foreign.Concurrent qualified as Foreign import Foreign.ForeignPtr (ForeignPtr, withForeignPtr) diff --git a/bindings/haskell/src/EventSorcery/Engine/Internal/FFI.hs b/bindings/haskell/src/Event/Sorcery/Engine/Internal/FFI.hs similarity index 98% rename from bindings/haskell/src/EventSorcery/Engine/Internal/FFI.hs rename to bindings/haskell/src/Event/Sorcery/Engine/Internal/FFI.hs index 6d4563a..d03bdde 100644 --- a/bindings/haskell/src/EventSorcery/Engine/Internal/FFI.hs +++ b/bindings/haskell/src/Event/Sorcery/Engine/Internal/FFI.hs @@ -1,4 +1,4 @@ -module EventSorcery.Engine.Internal.FFI ( +module Event.Sorcery.Engine.Internal.FFI ( EsBuf (..), EsStore, esAbiVersion, diff --git a/bindings/haskell/src/EventSorcery/Job.hs b/bindings/haskell/src/Event/Sorcery/Job.hs similarity index 98% rename from bindings/haskell/src/EventSorcery/Job.hs rename to bindings/haskell/src/Event/Sorcery/Job.hs index 30d5db1..ba53950 100644 --- a/bindings/haskell/src/EventSorcery/Job.hs +++ b/bindings/haskell/src/Event/Sorcery/Job.hs @@ -4,13 +4,13 @@ -- Everything a consumer needs to enqueue a job, take a claim on it and settle -- that claim is here, down to the wire codecs the engine and this binding -- agree on. The engine handle and the errors every call can answer with belong --- to "EventSorcery.Engine" and are re-exported so a job worker needs this one +-- to "Event.Sorcery.Engine" and are re-exported so a job worker needs this one -- import. -- -- Committing events together with a job intent belongs to this feature rather -- than to the stream: what the caller is buying is that the events and the -- intent land in one transaction, and the intent is the half a job can refuse. -module EventSorcery.Job ( +module Event.Sorcery.Job ( AbiVersionDetail (..), AggregateId (..), AggregateType (..), @@ -101,7 +101,7 @@ import Data.List.NonEmpty qualified as NonEmpty import Data.Text (Text) import Data.Unrestricted.Linear (Ur (Ur)) import Data.Word (Word32, Word64, Word8) -import EventSorcery.Engine.Internal ( +import Event.Sorcery.Engine.Internal ( AbiVersionDetail (..), AggregateId (..), AggregateType (..), @@ -123,7 +123,7 @@ import EventSorcery.Engine.Internal ( withInputBuffer, withOpenStore, ) -import EventSorcery.Engine.Internal.FFI ( +import Event.Sorcery.Engine.Internal.FFI ( EsBuf, EsStore, esCommitWithJob, @@ -136,7 +136,7 @@ import EventSorcery.Engine.Internal.FFI ( esJobRenew, esJobRetry, ) -import EventSorcery.Job.Definition ( +import Event.Sorcery.Job.Definition ( DeadReason (..), Job (..), JobDecodeError (..), @@ -144,7 +144,7 @@ import EventSorcery.Job.Definition ( jobType, mkJobId, ) -import EventSorcery.Stream ( +import Event.Sorcery.Stream ( ProposedEvent, StreamIdentity, encodeProposedEvent, diff --git a/bindings/haskell/src/EventSorcery/Job/Definition.hs b/bindings/haskell/src/Event/Sorcery/Job/Definition.hs similarity index 97% rename from bindings/haskell/src/EventSorcery/Job/Definition.hs rename to bindings/haskell/src/Event/Sorcery/Job/Definition.hs index fbed93e..d1cbeeb 100644 --- a/bindings/haskell/src/EventSorcery/Job/Definition.hs +++ b/bindings/haskell/src/Event/Sorcery/Job/Definition.hs @@ -1,6 +1,6 @@ {-# LANGUAGE AllowAmbiguousTypes #-} -module EventSorcery.Job.Definition ( +module Event.Sorcery.Job.Definition ( DeadReason (..), Job (..), JobDecodeError (..), diff --git a/bindings/haskell/src/EventSorcery/Job/Execution.hs b/bindings/haskell/src/Event/Sorcery/Job/Execution.hs similarity index 96% rename from bindings/haskell/src/EventSorcery/Job/Execution.hs rename to bindings/haskell/src/Event/Sorcery/Job/Execution.hs index fda3455..436359e 100644 --- a/bindings/haskell/src/EventSorcery/Job/Execution.hs +++ b/bindings/haskell/src/Event/Sorcery/Job/Execution.hs @@ -1,4 +1,4 @@ -module EventSorcery.Job.Execution ( +module Event.Sorcery.Job.Execution ( DurableJob (..), JobAttempt (..), JobContext (..), @@ -11,7 +11,7 @@ module EventSorcery.Job.Execution ( import Data.Kind (Type) import Data.Text (Text) import Data.Word (Word32) -import EventSorcery.Job ( +import Event.Sorcery.Job ( Job (JobError, JobOutput), JobExecutionRoute (ReconcileExecution, SubmitExecution), JobId, diff --git a/bindings/haskell/src/EventSorcery/Job/Worker.hs b/bindings/haskell/src/Event/Sorcery/Job/Worker.hs similarity index 72% rename from bindings/haskell/src/EventSorcery/Job/Worker.hs rename to bindings/haskell/src/Event/Sorcery/Job/Worker.hs index a5b3206..7088bd2 100644 --- a/bindings/haskell/src/EventSorcery/Job/Worker.hs +++ b/bindings/haskell/src/Event/Sorcery/Job/Worker.hs @@ -1,4 +1,4 @@ -module EventSorcery.Job.Worker ( +module Event.Sorcery.Job.Worker ( AttemptLimit, JobRunError (..), JobRunResult (..), @@ -11,9 +11,9 @@ module EventSorcery.Job.Worker ( runJobOnce, ) where -import EventSorcery.Job (Job (JobError, JobOutput), JobId, JobInstant) -import EventSorcery.Job.Execution (DurableJob) -import EventSorcery.Job.Worker.Definition ( +import Event.Sorcery.Job (Job (JobError, JobOutput), JobId, JobInstant) +import Event.Sorcery.Job.Execution (DurableJob) +import Event.Sorcery.Job.Worker.Definition ( AttemptLimit, JobRunError (..), JobRunResult (..), @@ -24,7 +24,7 @@ import EventSorcery.Job.Worker.Definition ( renewalSchedule, renewingJobWorker, ) -import EventSorcery.Job.Worker.Internal ( +import Event.Sorcery.Job.Worker.Internal ( genericSettlement, runJobOnceWith, ) diff --git a/bindings/haskell/src/EventSorcery/Job/Worker/Definition.hs b/bindings/haskell/src/Event/Sorcery/Job/Worker/Definition.hs similarity index 93% rename from bindings/haskell/src/EventSorcery/Job/Worker/Definition.hs rename to bindings/haskell/src/Event/Sorcery/Job/Worker/Definition.hs index 9042c96..b49ee78 100644 --- a/bindings/haskell/src/EventSorcery/Job/Worker/Definition.hs +++ b/bindings/haskell/src/Event/Sorcery/Job/Worker/Definition.hs @@ -1,4 +1,4 @@ -module EventSorcery.Job.Worker.Definition ( +module Event.Sorcery.Job.Worker.Definition ( AttemptLimit (AttemptLimit), JobRunError (..), JobRunResult (..), @@ -12,8 +12,8 @@ module EventSorcery.Job.Worker.Definition ( import Data.Maybe (Maybe (..)) import Data.Word (Word32) -import EventSorcery.Engine (EngineError, Store) -import EventSorcery.Job ( +import Event.Sorcery.Engine (EngineError, Store) +import Event.Sorcery.Job ( ClaimBudget, JobDecodeError, JobId, @@ -21,7 +21,7 @@ import EventSorcery.Job ( LeaseDuration, WorkerId, ) -import EventSorcery.Job.Execution ( +import Event.Sorcery.Job.Execution ( DurableJob (JobInput), JobAttempt, ) diff --git a/bindings/haskell/src/EventSorcery/Job/Worker/Internal.hs b/bindings/haskell/src/Event/Sorcery/Job/Worker/Internal.hs similarity index 97% rename from bindings/haskell/src/EventSorcery/Job/Worker/Internal.hs rename to bindings/haskell/src/Event/Sorcery/Job/Worker/Internal.hs index ebe366d..018e5a1 100644 --- a/bindings/haskell/src/EventSorcery/Job/Worker/Internal.hs +++ b/bindings/haskell/src/Event/Sorcery/Job/Worker/Internal.hs @@ -1,4 +1,4 @@ -module EventSorcery.Job.Worker.Internal ( +module Event.Sorcery.Job.Worker.Internal ( SettlementStrategy (..), VerdictDelivery (..), genericSettlement, @@ -14,8 +14,8 @@ import Control.Concurrent.MVar ( ) import Data.Maybe (Maybe (..)) import Data.Unrestricted.Linear (Ur (Ur)) -import EventSorcery.Engine (EngineError) -import EventSorcery.Job ( +import Event.Sorcery.Engine (EngineError) +import Event.Sorcery.Job ( ClaimedJob, DeadReason (..), Job (JobError, JobOutput, decodeJob), @@ -36,7 +36,7 @@ import EventSorcery.Job ( retryJob, settlementToken, ) -import EventSorcery.Job.Execution ( +import Event.Sorcery.Job.Execution ( DurableJob (renderJobError), JobAttempt (JobAttempt), JobContext (JobContext), @@ -44,7 +44,7 @@ import EventSorcery.Job.Execution ( JobOutcome (..), executeDurableJob, ) -import EventSorcery.Job.Worker.Definition ( +import Event.Sorcery.Job.Worker.Definition ( AttemptLimit (AttemptLimit), JobRunError (..), JobRunResult (..), diff --git a/bindings/haskell/src/EventSorcery/Snapshot.hs b/bindings/haskell/src/Event/Sorcery/Snapshot.hs similarity index 95% rename from bindings/haskell/src/EventSorcery/Snapshot.hs rename to bindings/haskell/src/Event/Sorcery/Snapshot.hs index e6ac487..546b711 100644 --- a/bindings/haskell/src/EventSorcery/Snapshot.hs +++ b/bindings/haskell/src/Event/Sorcery/Snapshot.hs @@ -1,4 +1,4 @@ -module EventSorcery.Snapshot ( +module Event.Sorcery.Snapshot ( SnapshotVersion (..), SnapshotWrite, StoredSnapshot (..), @@ -31,21 +31,21 @@ import Data.ByteString (ByteString) import Data.ByteString.Lazy qualified as LazyByteString import Data.Unrestricted.Linear (Ur (Ur)) import Data.Word (Word64) -import EventSorcery.Engine (EngineError) -import EventSorcery.Engine qualified as Engine -import EventSorcery.Engine.Internal ( +import Event.Sorcery.Engine (EngineError) +import Event.Sorcery.Engine qualified as Engine +import Event.Sorcery.Engine.Internal ( callWithOutput, callWithoutOutput, decodeResponse, withInputBuffer, withOpenStore, ) -import EventSorcery.Engine.Internal.FFI ( +import Event.Sorcery.Engine.Internal.FFI ( esSnapshotDiscard, esSnapshotLoad, esSnapshotStore, ) -import EventSorcery.Stream ( +import Event.Sorcery.Stream ( AggregateId (AggregateId), AggregateType (AggregateType), StreamIdentity (StreamIdentity), diff --git a/bindings/haskell/src/EventSorcery/Store.hs b/bindings/haskell/src/Event/Sorcery/Store.hs similarity index 94% rename from bindings/haskell/src/EventSorcery/Store.hs rename to bindings/haskell/src/Event/Sorcery/Store.hs index 633b0af..17d836b 100644 --- a/bindings/haskell/src/EventSorcery/Store.hs +++ b/bindings/haskell/src/Event/Sorcery/Store.hs @@ -1,4 +1,4 @@ -module EventSorcery.Store ( +module Event.Sorcery.Store ( Store, StoreError (..), executeCommand, @@ -14,12 +14,12 @@ import Data.List.NonEmpty (NonEmpty ((:|))) import Data.List.NonEmpty qualified as NonEmpty import Data.Unrestricted.Linear (Ur (Ur)) import Data.Word (Word64) -import EventSorcery.Aggregate (Effect (..), EventSourced) -import EventSorcery.Aggregate qualified as Aggregate -import EventSorcery.Dispatch (dispatchJob) -import EventSorcery.Engine (EngineError) -import EventSorcery.Engine qualified as Engine -import EventSorcery.Job ( +import Event.Sorcery.Aggregate (Effect (..), EventSourced) +import Event.Sorcery.Aggregate qualified as Aggregate +import Event.Sorcery.Dispatch (dispatchJob) +import Event.Sorcery.Engine (EngineError) +import Event.Sorcery.Engine qualified as Engine +import Event.Sorcery.Job ( Job (encodeJob), JobId, JobInstant (JobInstant), @@ -28,9 +28,9 @@ import EventSorcery.Job ( commitWithJob, jobType, ) -import EventSorcery.Snapshot (StoredSnapshot (StoredSnapshot)) -import EventSorcery.Snapshot qualified as Snapshot -import EventSorcery.Stream ( +import Event.Sorcery.Snapshot (StoredSnapshot (StoredSnapshot)) +import Event.Sorcery.Snapshot qualified as Snapshot +import Event.Sorcery.Stream ( EventType (EventType), ProposedEvent (ProposedEvent), ReplayError, diff --git a/bindings/haskell/src/EventSorcery/Stream.hs b/bindings/haskell/src/Event/Sorcery/Stream.hs similarity index 98% rename from bindings/haskell/src/EventSorcery/Stream.hs rename to bindings/haskell/src/Event/Sorcery/Stream.hs index 56a1bd5..2ee70d8 100644 --- a/bindings/haskell/src/EventSorcery/Stream.hs +++ b/bindings/haskell/src/Event/Sorcery/Stream.hs @@ -2,9 +2,9 @@ -- -- Everything a consumer needs to read and append to a stream is here, down to -- the wire codecs the engine and this binding agree on. The engine handle and --- the errors every call can answer with belong to "EventSorcery.Engine" and +-- the errors every call can answer with belong to "Event.Sorcery.Engine" and -- are re-exported so a stream handler needs this one import. -module EventSorcery.Stream ( +module Event.Sorcery.Stream ( AbiVersionDetail (..), ActualSequence (..), AggregateId (..), @@ -74,13 +74,13 @@ import Data.Maybe (fromMaybe, maybe) import Data.Proxy (Proxy (Proxy)) import Data.Text (Text) import Data.Word (Word64) -import EventSorcery.Aggregate ( +import Event.Sorcery.Aggregate ( DecodeCause, EventSourced, EventVersion (..), ) -import EventSorcery.Aggregate qualified as Aggregate -import EventSorcery.Engine.Internal ( +import Event.Sorcery.Aggregate qualified as Aggregate +import Event.Sorcery.Engine.Internal ( AbiVersionDetail (..), AggregateId (..), AggregateType (..), @@ -98,7 +98,7 @@ import EventSorcery.Engine.Internal ( withInputBuffer, withOpenStore, ) -import EventSorcery.Engine.Internal.FFI ( +import Event.Sorcery.Engine.Internal.FFI ( esCommit, esCurrentVersion, esLoadStream, diff --git a/bindings/haskell/test/DispatchSpec.hs b/bindings/haskell/test/DispatchSpec.hs index 0ae70a4..4f01dda 100644 --- a/bindings/haskell/test/DispatchSpec.hs +++ b/bindings/haskell/test/DispatchSpec.hs @@ -2,7 +2,7 @@ module Main (main) where import Data.ByteString qualified as ByteString import Data.Text (Text) -import EventSorcery.Dispatch ( +import Event.Sorcery.Dispatch ( DispatchEvent (..), DispatchFailure (..), DispatchRefused (..), @@ -20,11 +20,11 @@ import EventSorcery.Dispatch ( settledJobId, settledOutput, ) -import EventSorcery.Dispatch.TestSupport ( +import Event.Sorcery.Dispatch.TestSupport ( confirmedOutcome, failedOutcome, ) -import EventSorcery.Job ( +import Event.Sorcery.Job ( DeadReason (RetriesExhausted), Job (..), JobId, diff --git a/bindings/haskell/test/DispatchWorkerSpec.hs b/bindings/haskell/test/DispatchWorkerSpec.hs index ff98155..309a1ee 100644 --- a/bindings/haskell/test/DispatchWorkerSpec.hs +++ b/bindings/haskell/test/DispatchWorkerSpec.hs @@ -4,7 +4,7 @@ import Data.ByteString qualified as ByteString import Data.IORef (IORef, modifyIORef', newIORef, readIORef) import Data.List.NonEmpty (NonEmpty ((:|))) import Data.Text (Text) -import EventSorcery.Aggregate ( +import Event.Sorcery.Aggregate ( DecodeCause (DecodeCause), Dispatches (..), Effect (..), @@ -14,7 +14,7 @@ import EventSorcery.Aggregate ( dispatchIntentJob, dispatchJobId, ) -import EventSorcery.Dispatch ( +import Event.Sorcery.Dispatch ( DispatchEvent (..), DispatchOutcome, DispatchRefused, @@ -25,8 +25,8 @@ import EventSorcery.Dispatch ( settleDispatch, settledOutput, ) -import EventSorcery.Dispatch.TestSupport (confirmedOutcome) -import EventSorcery.Dispatch.Worker ( +import Event.Sorcery.Dispatch.TestSupport (confirmedOutcome) +import Event.Sorcery.Dispatch.Worker ( DeliveryPolicy, OriginJob (..), deliveryPolicy, @@ -34,13 +34,13 @@ import EventSorcery.Dispatch.Worker ( runDispatchJobOnce, storeOriginPort, ) -import EventSorcery.Engine ( +import Event.Sorcery.Engine ( OpenOptions (OpenOptions), Store, closeStore, openStore, ) -import EventSorcery.Job ( +import Event.Sorcery.Job ( ClaimBudget (ClaimBudget), Job (..), JobDecodeError (JobDecodeError), @@ -50,25 +50,25 @@ import EventSorcery.Job ( WorkerId (WorkerId), mkJobId, ) -import EventSorcery.Job.Execution ( +import Event.Sorcery.Job.Execution ( DurableJob (..), JobAttempt, JobOutcome (JobDone), Reconciliation (Reconciled), ) -import EventSorcery.Job.Worker ( +import Event.Sorcery.Job.Worker ( AttemptLimit, JobRunResult (..), JobWorker, jobWorker, mkAttemptLimit, ) -import EventSorcery.Store ( +import Event.Sorcery.Store ( executeCommand, loadEntity, mkStore, ) -import EventSorcery.Stream (StreamKey, streamKey) +import Event.Sorcery.Stream (StreamKey, streamKey) import Prelude ( Bool (False, True), Either (Left, Right), diff --git a/bindings/haskell/test/DomainSpec.hs b/bindings/haskell/test/DomainSpec.hs index 11a9584..e9f7941 100644 --- a/bindings/haskell/test/DomainSpec.hs +++ b/bindings/haskell/test/DomainSpec.hs @@ -3,7 +3,7 @@ module Main (main) where import Data.ByteString qualified as ByteString import Data.List.NonEmpty (NonEmpty ((:|))) import Data.Text (Text) -import EventSorcery.Aggregate ( +import Event.Sorcery.Aggregate ( DecodeCause (DecodeCause), Dispatches (..), Effect (..), @@ -13,15 +13,15 @@ import EventSorcery.Aggregate ( dispatchIntent, dispatchJobId, ) -import EventSorcery.Dispatch (DispatchOutcome, kickoff) -import EventSorcery.Job ( +import Event.Sorcery.Dispatch (DispatchOutcome, kickoff) +import Event.Sorcery.Job ( Job (..), JobId, jobIdText, jobType, mkJobId, ) -import EventSorcery.Stream ( +import Event.Sorcery.Stream ( ActualSequence (ActualSequence), AggregateId (AggregateId), AggregateType (AggregateType), diff --git a/bindings/haskell/test/EngineSpec.hs b/bindings/haskell/test/EngineSpec.hs index c7e7a0b..7a96dcf 100644 --- a/bindings/haskell/test/EngineSpec.hs +++ b/bindings/haskell/test/EngineSpec.hs @@ -9,7 +9,7 @@ import Data.Foldable (traverse_) import Data.List.NonEmpty (NonEmpty (..)) import Data.Traversable (traverse) import Data.Word (Word64, Word8) -import EventSorcery.Engine ( +import Event.Sorcery.Engine ( AbiVersionDetail (..), AggregateId (..), AggregateType (..), @@ -24,9 +24,9 @@ import EventSorcery.Engine ( openStore, supportedAbiMajor, ) -import EventSorcery.Engine.AcquisitionSpec qualified as AcquisitionSpec -import EventSorcery.Engine.Internal.FFI (EsBuf (..)) -import EventSorcery.Stream ( +import Event.Sorcery.Engine.AcquisitionSpec qualified as AcquisitionSpec +import Event.Sorcery.Engine.Internal.FFI (EsBuf (..)) +import Event.Sorcery.Stream ( EventType (..), EventVersion (..), ProposedEvent (..), diff --git a/bindings/haskell/test/EventSorcery/Engine/AcquisitionSpec.hs b/bindings/haskell/test/Event/Sorcery/Engine/AcquisitionSpec.hs similarity index 96% rename from bindings/haskell/test/EventSorcery/Engine/AcquisitionSpec.hs rename to bindings/haskell/test/Event/Sorcery/Engine/AcquisitionSpec.hs index baed86f..b86a3b2 100644 --- a/bindings/haskell/test/EventSorcery/Engine/AcquisitionSpec.hs +++ b/bindings/haskell/test/Event/Sorcery/Engine/AcquisitionSpec.hs @@ -1,9 +1,9 @@ -module EventSorcery.Engine.AcquisitionSpec (tests) where +module Event.Sorcery.Engine.AcquisitionSpec (tests) where import Control.Exception (IOException, try) import Control.Monad (join) import Data.IORef (IORef, modifyIORef', newIORef, readIORef, writeIORef) -import EventSorcery.Engine.Acquisition (StoreAcquisition (..), acquireStore) +import Event.Sorcery.Engine.Acquisition (StoreAcquisition (..), acquireStore) import Test.Tasty (TestTree, testGroup) import Test.Tasty.HUnit (assertFailure, testCase, (@?=)) import Prelude ( diff --git a/bindings/haskell/test/JobExecutionSpec.hs b/bindings/haskell/test/JobExecutionSpec.hs index 406f4f3..2506cb6 100644 --- a/bindings/haskell/test/JobExecutionSpec.hs +++ b/bindings/haskell/test/JobExecutionSpec.hs @@ -3,14 +3,14 @@ module Main (main) where import Data.ByteString qualified as ByteString import Data.IORef (IORef, modifyIORef', newIORef, readIORef) import Data.Text (Text) -import EventSorcery.Job ( +import Event.Sorcery.Job ( Job (..), JobExecutionRoute (ReconcileExecution, SubmitExecution), JobId, JobInstant (JobInstant), mkJobId, ) -import EventSorcery.Job.Execution ( +import Event.Sorcery.Job.Execution ( DurableJob (..), JobAttempt (JobAttempt), JobContext (JobContext), diff --git a/bindings/haskell/test/JobSpec.hs b/bindings/haskell/test/JobSpec.hs index 71e71e7..4f9a1ef 100644 --- a/bindings/haskell/test/JobSpec.hs +++ b/bindings/haskell/test/JobSpec.hs @@ -8,8 +8,8 @@ import Data.ByteString qualified as ByteString import Data.List.NonEmpty (NonEmpty (..)) import Data.Maybe (Maybe (Just, Nothing)) import Data.Unrestricted.Linear (Ur (Ur)) -import EventSorcery.Engine (OpenOptions (..), closeStore, openStore) -import EventSorcery.Job ( +import Event.Sorcery.Engine (OpenOptions (..), closeStore, openStore) +import Event.Sorcery.Job ( AggregateId (..), AggregateType (..), ClaimBudget (..), @@ -45,7 +45,7 @@ import EventSorcery.Job ( settlementToken, streamRunnableJobs, ) -import EventSorcery.Stream ( +import Event.Sorcery.Stream ( EventType (..), EventVersion (..), ProposedEvent (..), diff --git a/bindings/haskell/test/JobWorkerSpec.hs b/bindings/haskell/test/JobWorkerSpec.hs index 59edbba..e946f01 100644 --- a/bindings/haskell/test/JobWorkerSpec.hs +++ b/bindings/haskell/test/JobWorkerSpec.hs @@ -18,13 +18,13 @@ import Data.IORef ( ) import Data.Text (Text) import Data.Word (Word32) -import EventSorcery.Engine ( +import Event.Sorcery.Engine ( OpenOptions (OpenOptions), Store, closeStore, openStore, ) -import EventSorcery.Job ( +import Event.Sorcery.Job ( ClaimBudget (ClaimBudget), Job (..), JobDecodeError (JobDecodeError), @@ -37,14 +37,14 @@ import EventSorcery.Job ( enqueueJob, mkJobId, ) -import EventSorcery.Job.Execution ( +import Event.Sorcery.Job.Execution ( DurableJob (..), JobAttempt (JobAttempt), JobFailure (TerminalFailure, TransientFailure), JobOutcome (JobDone), Reconciliation (Reconciled), ) -import EventSorcery.Job.Worker ( +import Event.Sorcery.Job.Worker ( AttemptLimit, JobRunError (JobRunDecodeFailed), JobRunResult (..), diff --git a/bindings/haskell/test/StoreSpec.hs b/bindings/haskell/test/StoreSpec.hs index d4ccb4b..48abaaf 100644 --- a/bindings/haskell/test/StoreSpec.hs +++ b/bindings/haskell/test/StoreSpec.hs @@ -5,7 +5,7 @@ import Data.ByteString qualified as ByteString import Data.List.NonEmpty (NonEmpty ((:|))) import Data.Text.Encoding qualified as Text import Data.Word (Word8) -import EventSorcery.Aggregate ( +import Event.Sorcery.Aggregate ( DecodeCause (DecodeCause), Dispatches (..), Effect (..), @@ -14,13 +14,13 @@ import EventSorcery.Aggregate ( SchemaVersion (SchemaVersion), dispatchJobId, ) -import EventSorcery.Dispatch (DispatchOutcome, kickoff) -import EventSorcery.Engine ( +import Event.Sorcery.Dispatch (DispatchOutcome, kickoff) +import Event.Sorcery.Engine ( OpenOptions (OpenOptions), closeStore, openStore, ) -import EventSorcery.Job ( +import Event.Sorcery.Job ( Job (..), JobDecodeError (JobDecodeError), JobId, @@ -31,15 +31,15 @@ import EventSorcery.Job ( mkJobId, pollJobs, ) -import EventSorcery.Snapshot qualified as Snapshot -import EventSorcery.Store ( +import Event.Sorcery.Snapshot qualified as Snapshot +import Event.Sorcery.Store ( StoreError (..), executeCommand, loadEntity, mkStore, snapshotEntity, ) -import EventSorcery.Stream (streamKey, streamKeyIdentity) +import Event.Sorcery.Stream (streamKey, streamKeyIdentity) import Prelude ( Either (..), Eq, diff --git a/bindings/haskell/test/WireSpec.hs b/bindings/haskell/test/WireSpec.hs index e0378a2..fc4559b 100644 --- a/bindings/haskell/test/WireSpec.hs +++ b/bindings/haskell/test/WireSpec.hs @@ -6,7 +6,7 @@ import Data.Either (Either (Left, Right)) import Data.List (isInfixOf) import Data.List.NonEmpty (NonEmpty (..)) import Data.Word (Word64) -import EventSorcery.Engine ( +import Event.Sorcery.Engine ( ConflictDetail (..), EngineError (..), OpenOptions (..), @@ -15,7 +15,7 @@ import EventSorcery.Engine ( decodeEngineError, encodeOpenOptions, ) -import EventSorcery.Job ( +import Event.Sorcery.Job ( ClaimBudget (..), JobClaimDetails (..), JobClaimReference (..), @@ -39,7 +39,7 @@ import EventSorcery.Job ( encodeRenew, mkJobId, ) -import EventSorcery.Stream ( +import Event.Sorcery.Stream ( AggregateId (..), AggregateType (..), BindingFault (..),