Add from capability

src/EntityContext.php

@@ -24,6 +24,7 @@
 
 namespace Bottledcode\DurablePhp;
 
+use Bottledcode\DurablePhp\Events\Event;
 use Bottledcode\DurablePhp\Events\GiveOwnership;
 use Bottledcode\DurablePhp\Events\RaiseEvent;
 use Bottledcode\DurablePhp\Events\RevokeRole;
@@ -36,6 +37,7 @@
 use Bottledcode\DurablePhp\Events\TaskCompleted;
 use Bottledcode\DurablePhp\Events\WithDelay;
 use Bottledcode\DurablePhp\Events\WithEntity;
+use Bottledcode\DurablePhp\Events\WithFrom;
 use Bottledcode\DurablePhp\Events\WithOrchestration;
 use Bottledcode\DurablePhp\Exceptions\Unwind;
 use Bottledcode\DurablePhp\Glue\Provenance;
@@ -59,6 +61,8 @@ class EntityContext implements EntityContextInterface
 {
     private static ?EntityContextInterface $current = null;
 
+    private readonly StateId $from;
+
     public function __construct(
         private readonly EntityId $id,
         private readonly string $operation,
@@ -72,6 +76,7 @@ public function __construct(
         private readonly Provenance $user,
     ) {
         self::$current = $this;
+        $this->from = StateId::fromEntityId($this->id);
     }
 
     public static function current(): static
@@ -112,16 +117,23 @@ public function signalEntity(
         array $input = [],
         ?DateTimeImmutable $scheduledTime = null,
     ): void {
-        $event = WithEntity::forInstance(
-            StateId::fromEntityId($entityId),
-            RaiseEvent::forOperation($operation, $input),
+        $event = $this->addFrom(
+            WithEntity::forInstance(
+                StateId::fromEntityId($entityId),
+                RaiseEvent::forOperation($operation, $input),
+            ),
         );
         if ($scheduledTime) {
             $event = WithDelay::forEvent($scheduledTime, $event);
         }
         $this->eventDispatcher->fire($event);
     }
 
+    private function addFrom(Event $event): Event
+    {
+        return WithFrom::forEvent($this->from, $event);
+    }
+
     public function getId(): EntityId
     {
         return $this->id;
@@ -140,9 +152,11 @@ public function startNewOrchestration(string $orchestration, array $input = [],
 
         $instance = StateId::fromInstance(OrchestrationInstance($orchestration, $id));
         $this->eventDispatcher->fire(
-            WithOrchestration::forInstance(
-                $instance,
-                StartExecution::asParent($input, []),
+            $this->addFrom(
+                WithOrchestration::forInstance(
+                    $instance,
+                    StartExecution::asParent($input, []),
+                ),
             ),
         );
     }
@@ -184,9 +198,11 @@ public function delayUntil(
         DateTimeInterface $until = new DateTimeImmutable(),
     ): void {
         $this->eventDispatcher->fire(
-            WithDelay::forEvent(
-                $until,
-                WithEntity::forInstance(StateId::fromEntityId($this->id), RaiseEvent::forOperation($operation, $args)),
+            $this->addFrom(
+                WithDelay::forEvent(
+                    $until,
+                    WithEntity::forInstance(StateId::fromEntityId($this->id), RaiseEvent::forOperation($operation, $args)),
+                ),
             ),
         );
     }
@@ -199,59 +215,71 @@ public function currentUserId(): string
     public function shareOwnership(string $withUser): void
     {
         $this->eventDispatcher->fire(
-            WithEntity::forInstance(
-                StateId::fromEntityId($this->id),
-                ShareOwnership::withUser($withUser),
+            $this->addFrom(
+                WithEntity::forInstance(
+                    StateId::fromEntityId($this->id),
+                    ShareOwnership::withUser($withUser),
+                ),
             ),
         );
     }
 
     public function giveOwnership(string $withUser): void
     {
         $this->eventDispatcher->fire(
-            WithEntity::forInstance(
-                StateId::fromEntityId($this->id),
-                GiveOwnership::withUser($withUser),
+            $this->addFrom(
+                WithEntity::forInstance(
+                    StateId::fromEntityId($this->id),
+                    GiveOwnership::withUser($withUser),
+                ),
             ),
         );
     }
 
     public function grantUser(string $withUser, Operation ...$operation): void
     {
         $this->eventDispatcher->fire(
-            WithEntity::forInstance(
-                StateId::fromEntityId($this->id),
-                ShareWithUser::For($withUser, ...$operation),
+            $this->addFrom(
+                WithEntity::forInstance(
+                    StateId::fromEntityId($this->id),
+                    ShareWithUser::For($withUser, ...$operation),
+                ),
             ),
         );
     }
 
     public function grantRole(string $withRole, Operation ...$operation): void
     {
         $this->eventDispatcher->fire(
-            WithEntity::forInstance(
-                StateId::fromEntityId($this->id),
-                ShareWithRole::For($withRole, ...$operation),
+            $this->addFrom(
+                WithEntity::forInstance(
+                    StateId::fromEntityId($this->id),
+                    ShareWithRole::For($withRole, ...$operation),
+                ),
             ),
         );
     }
 
     public function revokeUser(string $user): void
     {
         $this->eventDispatcher->fire(
-            WithEntity::forInstance(
-                StateId::fromEntityId($this->id),
-                RevokeUser::completely($user),
+            $this->addFrom(
+                WithEntity::forInstance(
+                    StateId::fromEntityId($this->id),
+                    RevokeUser::completely($user),
+                ),
             ),
         );
     }
 
     public function revokeRole(string $role): void
     {
         $this->eventDispatcher->fire(
-            WithEntity::forInstance(
-                StateId::fromEntityId($this->id),
-                RevokeRole::completely($role),
+            $this->addFrom(
+                WithEntity::forInstance(
+                    StateId::fromEntityId($this->id),
+                    RevokeRole::completely($role),
+                ),
             ),
         );
     }

src/Events/Event.php

@@ -27,16 +27,26 @@
 use Bottledcode\DurablePhp\MonotonicClock;
 use Crell\fp\Evolvable;
 use Crell\Serde\Attributes\ClassNameTypeMap;
+use DateTimeImmutable;
 use Ramsey\Uuid\Uuid;
+use Stringable;
 
 #[ClassNameTypeMap(key: 'eventType')]
-abstract class Event implements \Stringable
+abstract class Event implements Stringable
 {
     use Evolvable;
 
-    public \DateTimeImmutable $timestamp;
+    public DateTimeImmutable $timestamp;
 
-    public function __construct(public string $eventId)
+    public function __construct(public string $eventId {
+        set(string $value) {
+            if ($this instanceof HasInnerEventInterface && ($this->innerEvent ?? null)) {
+                $this->innerEvent->eventId = $value;
+            }
+            $this->eventId = $value;
+        }
+        get => $this->eventId;
+    })
     {
         $this->eventId = $this->eventId ?: Uuid::uuid7();
         $this->timestamp = MonotonicClock::current()->now();

src/Events/HasInnerEventInterface.php

@@ -26,5 +26,7 @@
 
 interface HasInnerEventInterface
 {
+    public Event $innerEvent { get; }
+
     public function getInnerEvent(): Event;
 }

src/Events/RevokeUser.php

@@ -41,7 +41,7 @@ public static function completely(string $userId): self
         return new self($userId, null);
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return sprintf('Revoke(user: %s)', $this->userId);
     }

src/Events/ShareOwnership.php

@@ -24,8 +24,11 @@
 
 namespace Bottledcode\DurablePhp\Events;
 
+use Bottledcode\DurablePhp\Events\Shares\NeedsSource;
+use Bottledcode\DurablePhp\Events\Shares\Operation;
 use Ramsey\Uuid\Uuid;
 
+#[NeedsSource(Operation::Owner)]
 class ShareOwnership extends Event implements External
 {
     private function __construct(public string $userId)
@@ -38,7 +41,7 @@ public static function withUser(string $userId): self
         return new self($userId);
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return sprintf('ShareOwnership(%s)', $this->userId);
     }

src/Events/ShareWithRole.php

@@ -42,7 +42,7 @@ public static function For(string $role, Operation ...$allowedOperations): self
         return new self($role, $allowedOperations);
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return sprintf('Share(role: %s, %s)', $this->role, implode(', ', $this->allowedOperations));
     }

src/Events/ShareWithUser.php

@@ -42,7 +42,7 @@ public static function For(string $userId, Operation ...$allowedOperations): sel
         return new self($userId, $allowedOperations);
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return sprintf('Share(user: %s, %s)', $this->userId, implode(', ', $this->allowedOperations));
     }

src/Events/WithActivity.php

@@ -30,7 +30,7 @@
 
 class WithActivity extends Event implements HasInnerEventInterface, StateTargetInterface
 {
-    public function __construct(string $eventId, public StateId $target, private readonly Event $innerEvent)
+    public function __construct(string $eventId, public StateId $target, public Event $innerEvent)
     {
         parent::__construct($eventId);
     }

src/Events/WithDelay.php

@@ -24,16 +24,17 @@
 
 namespace Bottledcode\DurablePhp\Events;
 
+use DateTimeImmutable;
 use Ramsey\Uuid\Uuid;
 
 class WithDelay extends Event implements HasInnerEventInterface
 {
-    public function __construct(string $eventId, public \DateTimeImmutable $fireAt, public Event $innerEvent)
+    public function __construct(string $eventId, public DateTimeImmutable $fireAt, public Event $innerEvent)
     {
         parent::__construct($this->innerEvent ?: Uuid::uuid7());
     }
 
-    public static function forEvent(\DateTimeImmutable $fireAt, Event $innerEvent): static
+    public static function forEvent(DateTimeImmutable $fireAt, Event $innerEvent): static
     {
         return new static(
             $innerEvent->eventId,
@@ -44,7 +45,6 @@ public static function forEvent(\DateTimeImmutable $fireAt, Event $innerEvent):
 
     public function getInnerEvent(): Event
     {
-        $this->innerEvent->eventId = $this->eventId;
         return $this->innerEvent;
     }
 

src/Events/WithEntity.php

@@ -28,7 +28,7 @@
 
 class WithEntity extends Event implements HasInnerEventInterface, StateTargetInterface
 {
-    public function __construct(string $eventId, public StateId $target, private readonly Event $innerEvent)
+    public function __construct(string $eventId, public StateId $target, public Event $innerEvent)
     {
         parent::__construct($eventId);
     }

src/Events/WithFrom.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Bottledcode\DurablePhp\Events;
+
+use Bottledcode\DurablePhp\State\Ids\StateId;
+
+class WithFrom extends Event implements HasInnerEventInterface
+{
+    public function __construct(string $eventId, public StateId $from, public readonly Event $innerEvent)
+    {
+        parent::__construct($eventId);
+    }
+
+    public static function forEvent(StateId $from, Event $innerEvent): Event
+    {
+        return new self($innerEvent->eventId, $from, $innerEvent);
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('WithFrom(%s, %s)', $this->from, $this->innerEvent);
+    }
+
+    public function getInnerEvent(): Event
+    {
+        return $this->innerEvent;
+    }
+}

src/Events/WithOrchestration.php

@@ -32,7 +32,7 @@ class WithOrchestration extends Event implements HasInnerEventInterface, StateTa
     public function __construct(
         string $eventId,
         public StateId $target,
-        private readonly Event $innerEvent,
+        public readonly Event $innerEvent,
     ) {
         parent::__construct($this->innerEvent->eventId ?: Uuid::uuid7());
     }

src/Events/WithPriority.php

@@ -28,7 +28,7 @@
 
 class WithPriority extends Event implements HasInnerEventInterface
 {
-    private function __construct(public string $eventId, public int $priority, private Event $innerEvent)
+    private function __construct(public string $eventId, public int $priority, public Event $innerEvent)
     {
         parent::__construct($this->eventId ?? Uuid::uuid7()->toString());
     }
@@ -58,7 +58,8 @@ public function __toString(): string
         return sprintf('WithPriority(%d, %s)', $this->priority, $this->innerEvent);
     }
 
-    #[\Override] public function getInnerEvent(): Event
+    #[\Override]
+    public function getInnerEvent(): Event
     {
         return $this->innerEvent;
     }