From 090de3e05df57299096f8f698b8333103bf9d750 Mon Sep 17 00:00:00 2001 From: Milena-Czierlinski Date: Thu, 5 Mar 2026 14:04:13 +0100 Subject: [PATCH 01/10] refactor: move dtos in dtos folder in runtime-types --- .../src/{ => dtos}/consumption/AttributeTagCollectionDTO.ts | 0 packages/runtime-types/src/{ => dtos}/consumption/DraftDTO.ts | 0 .../src/{ => dtos}/consumption/IdentityMetadataDTO.ts | 0 .../src/{ => dtos}/consumption/LocalAttributeDTO.ts | 0 .../{ => dtos}/consumption/LocalAttributeDeletionInfoDTO.ts | 0 .../consumption/LocalAttributeForwardingDetailsDTO.ts | 0 .../src/{ => dtos}/consumption/LocalNotificationDTO.ts | 0 .../src/{ => dtos}/consumption/LocalRequestDTO.ts | 0 .../src/{ => dtos}/consumption/RequestValidationResultDTO.ts | 0 .../runtime-types/src/{ => dtos}/consumption/SettingDTO.ts | 0 packages/runtime-types/src/{ => dtos}/consumption/index.ts | 0 packages/runtime-types/src/dtos/index.ts | 2 ++ .../runtime-types/src/{ => dtos}/transport/AnnouncementDTO.ts | 0 .../runtime-types/src/{ => dtos}/transport/ChallengeDTO.ts | 0 packages/runtime-types/src/{ => dtos}/transport/DeviceDTO.ts | 0 .../src/{ => dtos}/transport/DeviceOnboardingInfoDTO.ts | 0 .../runtime-types/src/{ => dtos}/transport/EmptyTokenDTO.ts | 0 packages/runtime-types/src/{ => dtos}/transport/FileDTO.ts | 0 packages/runtime-types/src/{ => dtos}/transport/IdentityDTO.ts | 0 .../src/{ => dtos}/transport/IdentityDeletionProcessDTO.ts | 0 packages/runtime-types/src/{ => dtos}/transport/MessageDTO.ts | 0 .../src/{ => dtos}/transport/MessageWithAttachmentsDTO.ts | 0 .../src/{ => dtos}/transport/PasswordProtectionDTO.ts | 0 .../transport/PublicRelationshipTemplateReferenceDTO.ts | 0 .../runtime-types/src/{ => dtos}/transport/RecipientDTO.ts | 0 .../runtime-types/src/{ => dtos}/transport/RelationshipDTO.ts | 0 .../src/{ => dtos}/transport/RelationshipTemplateDTO.ts | 0 packages/runtime-types/src/{ => dtos}/transport/TokenDTO.ts | 0 packages/runtime-types/src/{ => dtos}/transport/index.ts | 0 packages/runtime-types/src/index.ts | 3 +-- 30 files changed, 3 insertions(+), 2 deletions(-) rename packages/runtime-types/src/{ => dtos}/consumption/AttributeTagCollectionDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/consumption/DraftDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/consumption/IdentityMetadataDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/consumption/LocalAttributeDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/consumption/LocalAttributeDeletionInfoDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/consumption/LocalAttributeForwardingDetailsDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/consumption/LocalNotificationDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/consumption/LocalRequestDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/consumption/RequestValidationResultDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/consumption/SettingDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/consumption/index.ts (100%) create mode 100644 packages/runtime-types/src/dtos/index.ts rename packages/runtime-types/src/{ => dtos}/transport/AnnouncementDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/ChallengeDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/DeviceDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/DeviceOnboardingInfoDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/EmptyTokenDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/FileDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/IdentityDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/IdentityDeletionProcessDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/MessageDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/MessageWithAttachmentsDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/PasswordProtectionDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/PublicRelationshipTemplateReferenceDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/RecipientDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/RelationshipDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/RelationshipTemplateDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/TokenDTO.ts (100%) rename packages/runtime-types/src/{ => dtos}/transport/index.ts (100%) diff --git a/packages/runtime-types/src/consumption/AttributeTagCollectionDTO.ts b/packages/runtime-types/src/dtos/consumption/AttributeTagCollectionDTO.ts similarity index 100% rename from packages/runtime-types/src/consumption/AttributeTagCollectionDTO.ts rename to packages/runtime-types/src/dtos/consumption/AttributeTagCollectionDTO.ts diff --git a/packages/runtime-types/src/consumption/DraftDTO.ts b/packages/runtime-types/src/dtos/consumption/DraftDTO.ts similarity index 100% rename from packages/runtime-types/src/consumption/DraftDTO.ts rename to packages/runtime-types/src/dtos/consumption/DraftDTO.ts diff --git a/packages/runtime-types/src/consumption/IdentityMetadataDTO.ts b/packages/runtime-types/src/dtos/consumption/IdentityMetadataDTO.ts similarity index 100% rename from packages/runtime-types/src/consumption/IdentityMetadataDTO.ts rename to packages/runtime-types/src/dtos/consumption/IdentityMetadataDTO.ts diff --git a/packages/runtime-types/src/consumption/LocalAttributeDTO.ts b/packages/runtime-types/src/dtos/consumption/LocalAttributeDTO.ts similarity index 100% rename from packages/runtime-types/src/consumption/LocalAttributeDTO.ts rename to packages/runtime-types/src/dtos/consumption/LocalAttributeDTO.ts diff --git a/packages/runtime-types/src/consumption/LocalAttributeDeletionInfoDTO.ts b/packages/runtime-types/src/dtos/consumption/LocalAttributeDeletionInfoDTO.ts similarity index 100% rename from packages/runtime-types/src/consumption/LocalAttributeDeletionInfoDTO.ts rename to packages/runtime-types/src/dtos/consumption/LocalAttributeDeletionInfoDTO.ts diff --git a/packages/runtime-types/src/consumption/LocalAttributeForwardingDetailsDTO.ts b/packages/runtime-types/src/dtos/consumption/LocalAttributeForwardingDetailsDTO.ts similarity index 100% rename from packages/runtime-types/src/consumption/LocalAttributeForwardingDetailsDTO.ts rename to packages/runtime-types/src/dtos/consumption/LocalAttributeForwardingDetailsDTO.ts diff --git a/packages/runtime-types/src/consumption/LocalNotificationDTO.ts b/packages/runtime-types/src/dtos/consumption/LocalNotificationDTO.ts similarity index 100% rename from packages/runtime-types/src/consumption/LocalNotificationDTO.ts rename to packages/runtime-types/src/dtos/consumption/LocalNotificationDTO.ts diff --git a/packages/runtime-types/src/consumption/LocalRequestDTO.ts b/packages/runtime-types/src/dtos/consumption/LocalRequestDTO.ts similarity index 100% rename from packages/runtime-types/src/consumption/LocalRequestDTO.ts rename to packages/runtime-types/src/dtos/consumption/LocalRequestDTO.ts diff --git a/packages/runtime-types/src/consumption/RequestValidationResultDTO.ts b/packages/runtime-types/src/dtos/consumption/RequestValidationResultDTO.ts similarity index 100% rename from packages/runtime-types/src/consumption/RequestValidationResultDTO.ts rename to packages/runtime-types/src/dtos/consumption/RequestValidationResultDTO.ts diff --git a/packages/runtime-types/src/consumption/SettingDTO.ts b/packages/runtime-types/src/dtos/consumption/SettingDTO.ts similarity index 100% rename from packages/runtime-types/src/consumption/SettingDTO.ts rename to packages/runtime-types/src/dtos/consumption/SettingDTO.ts diff --git a/packages/runtime-types/src/consumption/index.ts b/packages/runtime-types/src/dtos/consumption/index.ts similarity index 100% rename from packages/runtime-types/src/consumption/index.ts rename to packages/runtime-types/src/dtos/consumption/index.ts diff --git a/packages/runtime-types/src/dtos/index.ts b/packages/runtime-types/src/dtos/index.ts new file mode 100644 index 000000000..c947cd4d9 --- /dev/null +++ b/packages/runtime-types/src/dtos/index.ts @@ -0,0 +1,2 @@ +export * from "./consumption"; +export * from "./transport"; diff --git a/packages/runtime-types/src/transport/AnnouncementDTO.ts b/packages/runtime-types/src/dtos/transport/AnnouncementDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/AnnouncementDTO.ts rename to packages/runtime-types/src/dtos/transport/AnnouncementDTO.ts diff --git a/packages/runtime-types/src/transport/ChallengeDTO.ts b/packages/runtime-types/src/dtos/transport/ChallengeDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/ChallengeDTO.ts rename to packages/runtime-types/src/dtos/transport/ChallengeDTO.ts diff --git a/packages/runtime-types/src/transport/DeviceDTO.ts b/packages/runtime-types/src/dtos/transport/DeviceDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/DeviceDTO.ts rename to packages/runtime-types/src/dtos/transport/DeviceDTO.ts diff --git a/packages/runtime-types/src/transport/DeviceOnboardingInfoDTO.ts b/packages/runtime-types/src/dtos/transport/DeviceOnboardingInfoDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/DeviceOnboardingInfoDTO.ts rename to packages/runtime-types/src/dtos/transport/DeviceOnboardingInfoDTO.ts diff --git a/packages/runtime-types/src/transport/EmptyTokenDTO.ts b/packages/runtime-types/src/dtos/transport/EmptyTokenDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/EmptyTokenDTO.ts rename to packages/runtime-types/src/dtos/transport/EmptyTokenDTO.ts diff --git a/packages/runtime-types/src/transport/FileDTO.ts b/packages/runtime-types/src/dtos/transport/FileDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/FileDTO.ts rename to packages/runtime-types/src/dtos/transport/FileDTO.ts diff --git a/packages/runtime-types/src/transport/IdentityDTO.ts b/packages/runtime-types/src/dtos/transport/IdentityDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/IdentityDTO.ts rename to packages/runtime-types/src/dtos/transport/IdentityDTO.ts diff --git a/packages/runtime-types/src/transport/IdentityDeletionProcessDTO.ts b/packages/runtime-types/src/dtos/transport/IdentityDeletionProcessDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/IdentityDeletionProcessDTO.ts rename to packages/runtime-types/src/dtos/transport/IdentityDeletionProcessDTO.ts diff --git a/packages/runtime-types/src/transport/MessageDTO.ts b/packages/runtime-types/src/dtos/transport/MessageDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/MessageDTO.ts rename to packages/runtime-types/src/dtos/transport/MessageDTO.ts diff --git a/packages/runtime-types/src/transport/MessageWithAttachmentsDTO.ts b/packages/runtime-types/src/dtos/transport/MessageWithAttachmentsDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/MessageWithAttachmentsDTO.ts rename to packages/runtime-types/src/dtos/transport/MessageWithAttachmentsDTO.ts diff --git a/packages/runtime-types/src/transport/PasswordProtectionDTO.ts b/packages/runtime-types/src/dtos/transport/PasswordProtectionDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/PasswordProtectionDTO.ts rename to packages/runtime-types/src/dtos/transport/PasswordProtectionDTO.ts diff --git a/packages/runtime-types/src/transport/PublicRelationshipTemplateReferenceDTO.ts b/packages/runtime-types/src/dtos/transport/PublicRelationshipTemplateReferenceDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/PublicRelationshipTemplateReferenceDTO.ts rename to packages/runtime-types/src/dtos/transport/PublicRelationshipTemplateReferenceDTO.ts diff --git a/packages/runtime-types/src/transport/RecipientDTO.ts b/packages/runtime-types/src/dtos/transport/RecipientDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/RecipientDTO.ts rename to packages/runtime-types/src/dtos/transport/RecipientDTO.ts diff --git a/packages/runtime-types/src/transport/RelationshipDTO.ts b/packages/runtime-types/src/dtos/transport/RelationshipDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/RelationshipDTO.ts rename to packages/runtime-types/src/dtos/transport/RelationshipDTO.ts diff --git a/packages/runtime-types/src/transport/RelationshipTemplateDTO.ts b/packages/runtime-types/src/dtos/transport/RelationshipTemplateDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/RelationshipTemplateDTO.ts rename to packages/runtime-types/src/dtos/transport/RelationshipTemplateDTO.ts diff --git a/packages/runtime-types/src/transport/TokenDTO.ts b/packages/runtime-types/src/dtos/transport/TokenDTO.ts similarity index 100% rename from packages/runtime-types/src/transport/TokenDTO.ts rename to packages/runtime-types/src/dtos/transport/TokenDTO.ts diff --git a/packages/runtime-types/src/transport/index.ts b/packages/runtime-types/src/dtos/transport/index.ts similarity index 100% rename from packages/runtime-types/src/transport/index.ts rename to packages/runtime-types/src/dtos/transport/index.ts diff --git a/packages/runtime-types/src/index.ts b/packages/runtime-types/src/index.ts index 330fa3c56..4fef5ca48 100644 --- a/packages/runtime-types/src/index.ts +++ b/packages/runtime-types/src/index.ts @@ -1,3 +1,2 @@ -export * from "./consumption"; +export * from "./dtos"; export * from "./RuntimeHealth"; -export * from "./transport"; From fc8cd3096ba45c11d0dfb6583fc1bdaa2e0a02ae Mon Sep 17 00:00:00 2001 From: Milena-Czierlinski Date: Thu, 5 Mar 2026 14:23:24 +0100 Subject: [PATCH 02/10] feat: move runtime events to events folder in runtime-types --- .../src/events/DataEvent.ts | 0 .../consumption/AttributeCreatedEvent.ts | 0 .../consumption/AttributeDeletedEvent.ts | 0 .../AttributeForwardingDetailsChangedEvent.ts | 0 .../consumption/AttributeSucceededEvent.ts | 0 .../AttributeWasViewedAtChangedEvent.ts | 0 .../ForwardedAttributeDeletedByPeerEvent.ts | 0 .../IncomingRequestReceivedEvent.ts | 0 .../IncomingRequestStatusChangedEvent.ts | 0 .../events/consumption/MailReceivedEvent.ts | 0 .../consumption/MessageProcessedEvent.ts | 0 ...OutgoingRequestCreatedAndCompletedEvent.ts | 0 .../OutgoingRequestCreatedEvent.ts | 0 ...ionshipCreationCreatedAndCompletedEvent.ts | 0 .../OutgoingRequestStatusChangedEvent.ts | 0 .../OwnAttributeDeletedByOwnerEvent.ts | 0 ...RelationshipAttributeDeletedByPeerEvent.ts | 0 .../events/consumption/RelationshipEvent.ts | 0 .../RelationshipTemplateProcessedEvent.ts | 0 .../src/events/consumption/index.ts | 0 .../src/events/index.ts | 0 .../events/runtime/ModulesInitializedEvent.ts | 0 .../src/events/runtime/ModulesLoadedEvent.ts | 0 .../src/events/runtime/ModulesStartedEvent.ts | 0 .../events/runtime/RuntimeInitializedEvent.ts | 0 .../runtime/RuntimeInitializingEvent.ts | 0 .../src/events/runtime/index.ts | 0 .../transport/DatawalletSynchronizedEvent.ts | 2 +- .../transport/FileOwnershipClaimedEvent.ts | 2 +- .../transport/FileOwnershipLockedEvent.ts | 2 +- ...entityDeletionProcessStatusChangedEvent.ts | 2 +- .../events/transport/MessageDeliveredEvent.ts | 2 +- .../events/transport/MessageReceivedEvent.ts | 2 +- .../src/events/transport/MessageSentEvent.ts | 2 +- .../transport/MessageWasReadAtChangedEvent.ts | 2 +- .../src/events/transport/PeerDeletedEvent.ts | 2 +- .../transport/PeerDeletionCancelledEvent.ts | 2 +- .../PeerRelationshipTemplateLoadedEvent.ts | 2 +- .../events/transport/PeerToBeDeletedEvent.ts | 2 +- .../transport/RelationshipChangedEvent.ts | 2 +- .../RelationshipDecomposedBySelfEvent.ts | 2 +- .../RelationshipReactivationCompletedEvent.ts | 2 +- .../RelationshipReactivationRequestedEvent.ts | 2 +- ...onshipTemplateAllocationsExhaustedEvent.ts | 2 +- .../src/events/transport/index.ts | 0 packages/runtime-types/src/index.ts | 1 + packages/runtime/src/Runtime.ts | 2 +- packages/runtime/src/events/EventProxy.ts | 26 +++++++++---------- packages/runtime/src/index.ts | 1 - packages/runtime/src/modules/DeciderModule.ts | 2 +- packages/runtime/src/modules/MessageModule.ts | 2 +- .../runtime/src/modules/NotificationModule.ts | 2 +- packages/runtime/src/modules/RequestModule.ts | 2 +- 53 files changed, 35 insertions(+), 37 deletions(-) rename packages/{runtime => runtime-types}/src/events/DataEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/AttributeCreatedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/AttributeDeletedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/AttributeSucceededEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/AttributeWasViewedAtChangedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/IncomingRequestReceivedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/IncomingRequestStatusChangedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/MailReceivedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/MessageProcessedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/OutgoingRequestCreatedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/OutgoingRequestStatusChangedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/RelationshipEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/RelationshipTemplateProcessedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/consumption/index.ts (100%) rename packages/{runtime => runtime-types}/src/events/index.ts (100%) rename packages/{runtime => runtime-types}/src/events/runtime/ModulesInitializedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/runtime/ModulesLoadedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/runtime/ModulesStartedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/runtime/RuntimeInitializedEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/runtime/RuntimeInitializingEvent.ts (100%) rename packages/{runtime => runtime-types}/src/events/runtime/index.ts (100%) rename packages/{runtime => runtime-types}/src/events/transport/DatawalletSynchronizedEvent.ts (81%) rename packages/{runtime => runtime-types}/src/events/transport/FileOwnershipClaimedEvent.ts (82%) rename packages/{runtime => runtime-types}/src/events/transport/FileOwnershipLockedEvent.ts (82%) rename packages/{runtime => runtime-types}/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts (86%) rename packages/{runtime => runtime-types}/src/events/transport/MessageDeliveredEvent.ts (86%) rename packages/{runtime => runtime-types}/src/events/transport/MessageReceivedEvent.ts (82%) rename packages/{runtime => runtime-types}/src/events/transport/MessageSentEvent.ts (82%) rename packages/{runtime => runtime-types}/src/events/transport/MessageWasReadAtChangedEvent.ts (83%) rename packages/{runtime => runtime-types}/src/events/transport/PeerDeletedEvent.ts (82%) rename packages/{runtime => runtime-types}/src/events/transport/PeerDeletionCancelledEvent.ts (83%) rename packages/{runtime => runtime-types}/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts (85%) rename packages/{runtime => runtime-types}/src/events/transport/PeerToBeDeletedEvent.ts (83%) rename packages/{runtime => runtime-types}/src/events/transport/RelationshipChangedEvent.ts (83%) rename packages/{runtime => runtime-types}/src/events/transport/RelationshipDecomposedBySelfEvent.ts (86%) rename packages/{runtime => runtime-types}/src/events/transport/RelationshipReactivationCompletedEvent.ts (85%) rename packages/{runtime => runtime-types}/src/events/transport/RelationshipReactivationRequestedEvent.ts (85%) rename packages/{runtime => runtime-types}/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts (86%) rename packages/{runtime => runtime-types}/src/events/transport/index.ts (100%) diff --git a/packages/runtime/src/events/DataEvent.ts b/packages/runtime-types/src/events/DataEvent.ts similarity index 100% rename from packages/runtime/src/events/DataEvent.ts rename to packages/runtime-types/src/events/DataEvent.ts diff --git a/packages/runtime/src/events/consumption/AttributeCreatedEvent.ts b/packages/runtime-types/src/events/consumption/AttributeCreatedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/AttributeCreatedEvent.ts rename to packages/runtime-types/src/events/consumption/AttributeCreatedEvent.ts diff --git a/packages/runtime/src/events/consumption/AttributeDeletedEvent.ts b/packages/runtime-types/src/events/consumption/AttributeDeletedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/AttributeDeletedEvent.ts rename to packages/runtime-types/src/events/consumption/AttributeDeletedEvent.ts diff --git a/packages/runtime/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts b/packages/runtime-types/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts rename to packages/runtime-types/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts diff --git a/packages/runtime/src/events/consumption/AttributeSucceededEvent.ts b/packages/runtime-types/src/events/consumption/AttributeSucceededEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/AttributeSucceededEvent.ts rename to packages/runtime-types/src/events/consumption/AttributeSucceededEvent.ts diff --git a/packages/runtime/src/events/consumption/AttributeWasViewedAtChangedEvent.ts b/packages/runtime-types/src/events/consumption/AttributeWasViewedAtChangedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/AttributeWasViewedAtChangedEvent.ts rename to packages/runtime-types/src/events/consumption/AttributeWasViewedAtChangedEvent.ts diff --git a/packages/runtime/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts b/packages/runtime-types/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts rename to packages/runtime-types/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts diff --git a/packages/runtime/src/events/consumption/IncomingRequestReceivedEvent.ts b/packages/runtime-types/src/events/consumption/IncomingRequestReceivedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/IncomingRequestReceivedEvent.ts rename to packages/runtime-types/src/events/consumption/IncomingRequestReceivedEvent.ts diff --git a/packages/runtime/src/events/consumption/IncomingRequestStatusChangedEvent.ts b/packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/IncomingRequestStatusChangedEvent.ts rename to packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts diff --git a/packages/runtime/src/events/consumption/MailReceivedEvent.ts b/packages/runtime-types/src/events/consumption/MailReceivedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/MailReceivedEvent.ts rename to packages/runtime-types/src/events/consumption/MailReceivedEvent.ts diff --git a/packages/runtime/src/events/consumption/MessageProcessedEvent.ts b/packages/runtime-types/src/events/consumption/MessageProcessedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/MessageProcessedEvent.ts rename to packages/runtime-types/src/events/consumption/MessageProcessedEvent.ts diff --git a/packages/runtime/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts rename to packages/runtime-types/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts diff --git a/packages/runtime/src/events/consumption/OutgoingRequestCreatedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/OutgoingRequestCreatedEvent.ts rename to packages/runtime-types/src/events/consumption/OutgoingRequestCreatedEvent.ts diff --git a/packages/runtime/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts rename to packages/runtime-types/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts diff --git a/packages/runtime/src/events/consumption/OutgoingRequestStatusChangedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/OutgoingRequestStatusChangedEvent.ts rename to packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts diff --git a/packages/runtime/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts b/packages/runtime-types/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts rename to packages/runtime-types/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts diff --git a/packages/runtime/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts b/packages/runtime-types/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts rename to packages/runtime-types/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts diff --git a/packages/runtime/src/events/consumption/RelationshipEvent.ts b/packages/runtime-types/src/events/consumption/RelationshipEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/RelationshipEvent.ts rename to packages/runtime-types/src/events/consumption/RelationshipEvent.ts diff --git a/packages/runtime/src/events/consumption/RelationshipTemplateProcessedEvent.ts b/packages/runtime-types/src/events/consumption/RelationshipTemplateProcessedEvent.ts similarity index 100% rename from packages/runtime/src/events/consumption/RelationshipTemplateProcessedEvent.ts rename to packages/runtime-types/src/events/consumption/RelationshipTemplateProcessedEvent.ts diff --git a/packages/runtime/src/events/consumption/index.ts b/packages/runtime-types/src/events/consumption/index.ts similarity index 100% rename from packages/runtime/src/events/consumption/index.ts rename to packages/runtime-types/src/events/consumption/index.ts diff --git a/packages/runtime/src/events/index.ts b/packages/runtime-types/src/events/index.ts similarity index 100% rename from packages/runtime/src/events/index.ts rename to packages/runtime-types/src/events/index.ts diff --git a/packages/runtime/src/events/runtime/ModulesInitializedEvent.ts b/packages/runtime-types/src/events/runtime/ModulesInitializedEvent.ts similarity index 100% rename from packages/runtime/src/events/runtime/ModulesInitializedEvent.ts rename to packages/runtime-types/src/events/runtime/ModulesInitializedEvent.ts diff --git a/packages/runtime/src/events/runtime/ModulesLoadedEvent.ts b/packages/runtime-types/src/events/runtime/ModulesLoadedEvent.ts similarity index 100% rename from packages/runtime/src/events/runtime/ModulesLoadedEvent.ts rename to packages/runtime-types/src/events/runtime/ModulesLoadedEvent.ts diff --git a/packages/runtime/src/events/runtime/ModulesStartedEvent.ts b/packages/runtime-types/src/events/runtime/ModulesStartedEvent.ts similarity index 100% rename from packages/runtime/src/events/runtime/ModulesStartedEvent.ts rename to packages/runtime-types/src/events/runtime/ModulesStartedEvent.ts diff --git a/packages/runtime/src/events/runtime/RuntimeInitializedEvent.ts b/packages/runtime-types/src/events/runtime/RuntimeInitializedEvent.ts similarity index 100% rename from packages/runtime/src/events/runtime/RuntimeInitializedEvent.ts rename to packages/runtime-types/src/events/runtime/RuntimeInitializedEvent.ts diff --git a/packages/runtime/src/events/runtime/RuntimeInitializingEvent.ts b/packages/runtime-types/src/events/runtime/RuntimeInitializingEvent.ts similarity index 100% rename from packages/runtime/src/events/runtime/RuntimeInitializingEvent.ts rename to packages/runtime-types/src/events/runtime/RuntimeInitializingEvent.ts diff --git a/packages/runtime/src/events/runtime/index.ts b/packages/runtime-types/src/events/runtime/index.ts similarity index 100% rename from packages/runtime/src/events/runtime/index.ts rename to packages/runtime-types/src/events/runtime/index.ts diff --git a/packages/runtime/src/events/transport/DatawalletSynchronizedEvent.ts b/packages/runtime-types/src/events/transport/DatawalletSynchronizedEvent.ts similarity index 81% rename from packages/runtime/src/events/transport/DatawalletSynchronizedEvent.ts rename to packages/runtime-types/src/events/transport/DatawalletSynchronizedEvent.ts index 490398fa9..92f97de35 100644 --- a/packages/runtime/src/events/transport/DatawalletSynchronizedEvent.ts +++ b/packages/runtime-types/src/events/transport/DatawalletSynchronizedEvent.ts @@ -1,4 +1,4 @@ -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class DatawalletSynchronizedEvent extends DataEvent { public static readonly namespace: string = "transport.datawalletSynchronized"; diff --git a/packages/runtime/src/events/transport/FileOwnershipClaimedEvent.ts b/packages/runtime-types/src/events/transport/FileOwnershipClaimedEvent.ts similarity index 82% rename from packages/runtime/src/events/transport/FileOwnershipClaimedEvent.ts rename to packages/runtime-types/src/events/transport/FileOwnershipClaimedEvent.ts index 3d63cdd26..e930727fc 100644 --- a/packages/runtime/src/events/transport/FileOwnershipClaimedEvent.ts +++ b/packages/runtime-types/src/events/transport/FileOwnershipClaimedEvent.ts @@ -1,5 +1,5 @@ import { FileDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class FileOwnershipClaimedEvent extends DataEvent { public static readonly namespace = "transport.fileOwnershipClaimed"; diff --git a/packages/runtime/src/events/transport/FileOwnershipLockedEvent.ts b/packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts similarity index 82% rename from packages/runtime/src/events/transport/FileOwnershipLockedEvent.ts rename to packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts index e8fd9689c..415905c01 100644 --- a/packages/runtime/src/events/transport/FileOwnershipLockedEvent.ts +++ b/packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts @@ -1,5 +1,5 @@ import { FileDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class FileOwnershipLockedEvent extends DataEvent { public static readonly namespace = "transport.fileOwnershipLocked"; diff --git a/packages/runtime/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts b/packages/runtime-types/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts similarity index 86% rename from packages/runtime/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts rename to packages/runtime-types/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts index 3587f9522..68f5aec5a 100644 --- a/packages/runtime/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts +++ b/packages/runtime-types/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts @@ -1,5 +1,5 @@ import { IdentityDeletionProcessDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class IdentityDeletionProcessStatusChangedEvent extends DataEvent { public static readonly namespace = "transport.identityDeletionProcessStatusChanged"; diff --git a/packages/runtime/src/events/transport/MessageDeliveredEvent.ts b/packages/runtime-types/src/events/transport/MessageDeliveredEvent.ts similarity index 86% rename from packages/runtime/src/events/transport/MessageDeliveredEvent.ts rename to packages/runtime-types/src/events/transport/MessageDeliveredEvent.ts index a20d2f2e7..12e3b2e18 100644 --- a/packages/runtime/src/events/transport/MessageDeliveredEvent.ts +++ b/packages/runtime-types/src/events/transport/MessageDeliveredEvent.ts @@ -1,5 +1,5 @@ import { MessageDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; // This event is currently not triggered because it is disabled in the Backbone. (JSSNMSHDD-2372) export class MessageDeliveredEvent extends DataEvent { diff --git a/packages/runtime/src/events/transport/MessageReceivedEvent.ts b/packages/runtime-types/src/events/transport/MessageReceivedEvent.ts similarity index 82% rename from packages/runtime/src/events/transport/MessageReceivedEvent.ts rename to packages/runtime-types/src/events/transport/MessageReceivedEvent.ts index 1759735f9..a857107fb 100644 --- a/packages/runtime/src/events/transport/MessageReceivedEvent.ts +++ b/packages/runtime-types/src/events/transport/MessageReceivedEvent.ts @@ -1,5 +1,5 @@ import { MessageDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class MessageReceivedEvent extends DataEvent { public static readonly namespace = "transport.messageReceived"; diff --git a/packages/runtime/src/events/transport/MessageSentEvent.ts b/packages/runtime-types/src/events/transport/MessageSentEvent.ts similarity index 82% rename from packages/runtime/src/events/transport/MessageSentEvent.ts rename to packages/runtime-types/src/events/transport/MessageSentEvent.ts index ee6f68a8e..647173e9a 100644 --- a/packages/runtime/src/events/transport/MessageSentEvent.ts +++ b/packages/runtime-types/src/events/transport/MessageSentEvent.ts @@ -1,5 +1,5 @@ import { MessageDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class MessageSentEvent extends DataEvent { public static readonly namespace = "transport.messageSent"; diff --git a/packages/runtime/src/events/transport/MessageWasReadAtChangedEvent.ts b/packages/runtime-types/src/events/transport/MessageWasReadAtChangedEvent.ts similarity index 83% rename from packages/runtime/src/events/transport/MessageWasReadAtChangedEvent.ts rename to packages/runtime-types/src/events/transport/MessageWasReadAtChangedEvent.ts index 42142ea8e..cf6cd8de2 100644 --- a/packages/runtime/src/events/transport/MessageWasReadAtChangedEvent.ts +++ b/packages/runtime-types/src/events/transport/MessageWasReadAtChangedEvent.ts @@ -1,5 +1,5 @@ import { MessageDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class MessageWasReadAtChangedEvent extends DataEvent { public static readonly namespace = "transport.messageWasReadAtChanged"; diff --git a/packages/runtime/src/events/transport/PeerDeletedEvent.ts b/packages/runtime-types/src/events/transport/PeerDeletedEvent.ts similarity index 82% rename from packages/runtime/src/events/transport/PeerDeletedEvent.ts rename to packages/runtime-types/src/events/transport/PeerDeletedEvent.ts index 3887db15d..a8db7a76b 100644 --- a/packages/runtime/src/events/transport/PeerDeletedEvent.ts +++ b/packages/runtime-types/src/events/transport/PeerDeletedEvent.ts @@ -1,5 +1,5 @@ import { RelationshipDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class PeerDeletedEvent extends DataEvent { public static readonly namespace = "transport.peerDeleted"; diff --git a/packages/runtime/src/events/transport/PeerDeletionCancelledEvent.ts b/packages/runtime-types/src/events/transport/PeerDeletionCancelledEvent.ts similarity index 83% rename from packages/runtime/src/events/transport/PeerDeletionCancelledEvent.ts rename to packages/runtime-types/src/events/transport/PeerDeletionCancelledEvent.ts index 8c48f3afd..c0a7197ad 100644 --- a/packages/runtime/src/events/transport/PeerDeletionCancelledEvent.ts +++ b/packages/runtime-types/src/events/transport/PeerDeletionCancelledEvent.ts @@ -1,5 +1,5 @@ import { RelationshipDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class PeerDeletionCancelledEvent extends DataEvent { public static readonly namespace = "transport.peerDeletionCancelled"; diff --git a/packages/runtime/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts b/packages/runtime-types/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts similarity index 85% rename from packages/runtime/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts rename to packages/runtime-types/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts index 14fee707d..5851c0146 100644 --- a/packages/runtime/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts +++ b/packages/runtime-types/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts @@ -1,5 +1,5 @@ import { RelationshipTemplateDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class PeerRelationshipTemplateLoadedEvent extends DataEvent { public static readonly namespace = "transport.peerRelationshipTemplateLoaded"; diff --git a/packages/runtime/src/events/transport/PeerToBeDeletedEvent.ts b/packages/runtime-types/src/events/transport/PeerToBeDeletedEvent.ts similarity index 83% rename from packages/runtime/src/events/transport/PeerToBeDeletedEvent.ts rename to packages/runtime-types/src/events/transport/PeerToBeDeletedEvent.ts index c51fd1604..97aa6c489 100644 --- a/packages/runtime/src/events/transport/PeerToBeDeletedEvent.ts +++ b/packages/runtime-types/src/events/transport/PeerToBeDeletedEvent.ts @@ -1,5 +1,5 @@ import { RelationshipDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class PeerToBeDeletedEvent extends DataEvent { public static readonly namespace = "transport.peerToBeDeleted"; diff --git a/packages/runtime/src/events/transport/RelationshipChangedEvent.ts b/packages/runtime-types/src/events/transport/RelationshipChangedEvent.ts similarity index 83% rename from packages/runtime/src/events/transport/RelationshipChangedEvent.ts rename to packages/runtime-types/src/events/transport/RelationshipChangedEvent.ts index 676f1ecd7..7acfa897f 100644 --- a/packages/runtime/src/events/transport/RelationshipChangedEvent.ts +++ b/packages/runtime-types/src/events/transport/RelationshipChangedEvent.ts @@ -1,5 +1,5 @@ import { RelationshipDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class RelationshipChangedEvent extends DataEvent { public static readonly namespace = "transport.relationshipChanged"; diff --git a/packages/runtime/src/events/transport/RelationshipDecomposedBySelfEvent.ts b/packages/runtime-types/src/events/transport/RelationshipDecomposedBySelfEvent.ts similarity index 86% rename from packages/runtime/src/events/transport/RelationshipDecomposedBySelfEvent.ts rename to packages/runtime-types/src/events/transport/RelationshipDecomposedBySelfEvent.ts index 74acf0121..49c68436b 100644 --- a/packages/runtime/src/events/transport/RelationshipDecomposedBySelfEvent.ts +++ b/packages/runtime-types/src/events/transport/RelationshipDecomposedBySelfEvent.ts @@ -1,4 +1,4 @@ -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export interface RelationshipDecomposedBySelfEventData { relationshipId: string; diff --git a/packages/runtime/src/events/transport/RelationshipReactivationCompletedEvent.ts b/packages/runtime-types/src/events/transport/RelationshipReactivationCompletedEvent.ts similarity index 85% rename from packages/runtime/src/events/transport/RelationshipReactivationCompletedEvent.ts rename to packages/runtime-types/src/events/transport/RelationshipReactivationCompletedEvent.ts index 2b68d43c9..69e362a36 100644 --- a/packages/runtime/src/events/transport/RelationshipReactivationCompletedEvent.ts +++ b/packages/runtime-types/src/events/transport/RelationshipReactivationCompletedEvent.ts @@ -1,5 +1,5 @@ import { RelationshipDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class RelationshipReactivationCompletedEvent extends DataEvent { public static readonly namespace = "transport.relationshipReactivationCompleted"; diff --git a/packages/runtime/src/events/transport/RelationshipReactivationRequestedEvent.ts b/packages/runtime-types/src/events/transport/RelationshipReactivationRequestedEvent.ts similarity index 85% rename from packages/runtime/src/events/transport/RelationshipReactivationRequestedEvent.ts rename to packages/runtime-types/src/events/transport/RelationshipReactivationRequestedEvent.ts index da5180bf8..207cf679f 100644 --- a/packages/runtime/src/events/transport/RelationshipReactivationRequestedEvent.ts +++ b/packages/runtime-types/src/events/transport/RelationshipReactivationRequestedEvent.ts @@ -1,5 +1,5 @@ import { RelationshipDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class RelationshipReactivationRequestedEvent extends DataEvent { public static readonly namespace = "transport.relationshipReactivationRequested"; diff --git a/packages/runtime/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts b/packages/runtime-types/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts similarity index 86% rename from packages/runtime/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts rename to packages/runtime-types/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts index 0f69a49e6..4d1315d93 100644 --- a/packages/runtime/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts +++ b/packages/runtime-types/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts @@ -1,5 +1,5 @@ import { RelationshipTemplateDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "../DataEvent"; +import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; export class RelationshipTemplateAllocationsExhaustedEvent extends DataEvent { public static readonly namespace = "transport.relationshipTemplateAllocationsExhausted"; diff --git a/packages/runtime/src/events/transport/index.ts b/packages/runtime-types/src/events/transport/index.ts similarity index 100% rename from packages/runtime/src/events/transport/index.ts rename to packages/runtime-types/src/events/transport/index.ts diff --git a/packages/runtime-types/src/index.ts b/packages/runtime-types/src/index.ts index 4fef5ca48..699f02314 100644 --- a/packages/runtime-types/src/index.ts +++ b/packages/runtime-types/src/index.ts @@ -1,2 +1,3 @@ export * from "./dtos"; +export * from "./events"; export * from "./RuntimeHealth"; diff --git a/packages/runtime/src/Runtime.ts b/packages/runtime/src/Runtime.ts index b240d61b1..f4ede753f 100644 --- a/packages/runtime/src/Runtime.ts +++ b/packages/runtime/src/Runtime.ts @@ -13,6 +13,7 @@ import { } from "@nmshd/consumption"; import { ICoreAddress } from "@nmshd/core-types"; import { RuntimeHealth } from "@nmshd/runtime-types"; +import { ModulesInitializedEvent, ModulesLoadedEvent, ModulesStartedEvent, RuntimeInitializedEvent, RuntimeInitializingEvent } from "@nmshd/runtime-types/src/events"; import { AccountController, AnnouncementController, @@ -38,7 +39,6 @@ import { buildInformation } from "./buildInformation"; import { ConfigHolder } from "./ConfigHolder"; import { DatabaseSchemaUpgrader } from "./DatabaseSchemaUpgrader"; import { DataViewExpander } from "./dataViews"; -import { ModulesInitializedEvent, ModulesLoadedEvent, ModulesStartedEvent, RuntimeInitializedEvent, RuntimeInitializingEvent } from "./events"; import { EventProxy } from "./events/EventProxy"; import { AnonymousServices, ConsumptionServices, ModuleConfiguration, RuntimeModuleRegistry, TransportServices } from "./extensibility"; import { DeciderModule, MessageModule, NotificationModule, RequestModule } from "./modules"; diff --git a/packages/runtime/src/events/EventProxy.ts b/packages/runtime/src/events/EventProxy.ts index ed9ecfc4b..9559d0a32 100644 --- a/packages/runtime/src/events/EventProxy.ts +++ b/packages/runtime/src/events/EventProxy.ts @@ -1,34 +1,30 @@ import { EventBus, EventHandler, SubscriptionTarget } from "@js-soft/ts-utils"; import * as consumption from "@nmshd/consumption"; -import * as transport from "@nmshd/transport"; -import { AttributeMapper, FileMapper, IdentityDeletionProcessMapper, MessageMapper, RelationshipMapper, RelationshipTemplateMapper, RequestMapper } from "../useCases"; import { AttributeCreatedEvent, AttributeDeletedEvent, AttributeForwardingDetailsChangedEvent, AttributeSucceededEvent, AttributeWasViewedAtChangedEvent, - ForwardedAttributeDeletedByPeerEvent, - IncomingRequestReceivedEvent, - IncomingRequestStatusChangedEvent, - OutgoingRequestCreatedAndCompletedEvent, - OutgoingRequestCreatedEvent, - OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent, - OutgoingRequestStatusChangedEvent, - OwnAttributeDeletedByOwnerEvent, - PeerRelationshipAttributeDeletedByPeerEvent -} from "./consumption"; -import { DatawalletSynchronizedEvent, FileOwnershipClaimedEvent, FileOwnershipLockedEvent, + ForwardedAttributeDeletedByPeerEvent, IdentityDeletionProcessStatusChangedEvent, + IncomingRequestReceivedEvent, + IncomingRequestStatusChangedEvent, MessageDeliveredEvent, MessageReceivedEvent, MessageSentEvent, MessageWasReadAtChangedEvent, + OutgoingRequestCreatedAndCompletedEvent, + OutgoingRequestCreatedEvent, + OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent, + OutgoingRequestStatusChangedEvent, + OwnAttributeDeletedByOwnerEvent, PeerDeletedEvent, PeerDeletionCancelledEvent, + PeerRelationshipAttributeDeletedByPeerEvent, PeerRelationshipTemplateLoadedEvent, PeerToBeDeletedEvent, RelationshipChangedEvent, @@ -36,7 +32,9 @@ import { RelationshipReactivationCompletedEvent, RelationshipReactivationRequestedEvent, RelationshipTemplateAllocationsExhaustedEvent -} from "./transport"; +} from "@nmshd/runtime-types/src/events"; +import * as transport from "@nmshd/transport"; +import { AttributeMapper, FileMapper, IdentityDeletionProcessMapper, MessageMapper, RelationshipMapper, RelationshipTemplateMapper, RequestMapper } from "../useCases"; export class EventProxy { private readonly subscriptionIds: number[] = []; diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts index bb607e1dd..09ed29b75 100644 --- a/packages/runtime/src/index.ts +++ b/packages/runtime/src/index.ts @@ -1,7 +1,6 @@ export * from "@nmshd/runtime-types"; export * from "./buildInformation"; export * from "./dataViews"; -export * from "./events"; export * from "./extensibility"; export * from "./modules"; export * from "./Runtime"; diff --git a/packages/runtime/src/modules/DeciderModule.ts b/packages/runtime/src/modules/DeciderModule.ts index b42cca3bf..b82f9ea0b 100644 --- a/packages/runtime/src/modules/DeciderModule.ts +++ b/packages/runtime/src/modules/DeciderModule.ts @@ -9,7 +9,7 @@ import { MessageProcessedResult, RelationshipTemplateProcessedEvent, RelationshipTemplateProcessedResult -} from "../events"; +} from "@nmshd/runtime-types/src/events"; import { ModuleConfiguration, RuntimeModule } from "../extensibility"; import { RuntimeServices } from "../Runtime"; import { RuntimeErrors } from "../useCases/common/RuntimeErrors"; diff --git a/packages/runtime/src/modules/MessageModule.ts b/packages/runtime/src/modules/MessageModule.ts index a06f68c81..1b9beb95b 100644 --- a/packages/runtime/src/modules/MessageModule.ts +++ b/packages/runtime/src/modules/MessageModule.ts @@ -1,6 +1,6 @@ import { Event } from "@js-soft/ts-utils"; import { Mail, MailJSON } from "@nmshd/content"; -import { MailReceivedEvent, MessageReceivedEvent, RelationshipEvent } from "../events"; +import { MailReceivedEvent, MessageReceivedEvent, RelationshipEvent } from "@nmshd/runtime-types/src/events"; import { ModuleConfiguration, RuntimeModule } from "../extensibility/modules/RuntimeModule"; export interface MessageModuleConfiguration extends ModuleConfiguration {} diff --git a/packages/runtime/src/modules/NotificationModule.ts b/packages/runtime/src/modules/NotificationModule.ts index 923a7380a..43c168b2f 100644 --- a/packages/runtime/src/modules/NotificationModule.ts +++ b/packages/runtime/src/modules/NotificationModule.ts @@ -1,4 +1,4 @@ -import { MessageReceivedEvent, MessageSentEvent } from "../events"; +import { MessageReceivedEvent, MessageSentEvent } from "@nmshd/runtime-types/src/events"; import { RuntimeModule } from "../extensibility/modules/RuntimeModule"; export class NotificationModule extends RuntimeModule { diff --git a/packages/runtime/src/modules/RequestModule.ts b/packages/runtime/src/modules/RequestModule.ts index 24e6ac912..a1ea0b694 100644 --- a/packages/runtime/src/modules/RequestModule.ts +++ b/packages/runtime/src/modules/RequestModule.ts @@ -10,7 +10,7 @@ import { MessageSentEvent, PeerRelationshipTemplateLoadedEvent, RelationshipChangedEvent -} from "../events"; +} from "@nmshd/runtime-types/src/events"; import { RelationshipTemplateProcessedEvent, RelationshipTemplateProcessedResult } from "../events/consumption/RelationshipTemplateProcessedEvent"; import { RuntimeModule } from "../extensibility/modules/RuntimeModule"; import { RuntimeServices } from "../Runtime"; From a272fa3ffc249d1c1d50440e8921b5cf1deaa5cf Mon Sep 17 00:00:00 2001 From: Milena-Czierlinski Date: Thu, 5 Mar 2026 14:49:18 +0100 Subject: [PATCH 03/10] refactor: fix imports --- .../src/events/consumption/AttributeCreatedEvent.ts | 2 +- .../src/events/consumption/AttributeDeletedEvent.ts | 2 +- .../consumption/AttributeForwardingDetailsChangedEvent.ts | 2 +- .../src/events/consumption/AttributeSucceededEvent.ts | 2 +- .../events/consumption/AttributeWasViewedAtChangedEvent.ts | 2 +- .../consumption/ForwardedAttributeDeletedByPeerEvent.ts | 2 +- .../src/events/consumption/IncomingRequestReceivedEvent.ts | 2 +- .../events/consumption/IncomingRequestStatusChangedEvent.ts | 2 +- .../src/events/consumption/MailReceivedEvent.ts | 2 +- .../src/events/consumption/MessageProcessedEvent.ts | 2 +- .../consumption/OutgoingRequestCreatedAndCompletedEvent.ts | 2 +- .../src/events/consumption/OutgoingRequestCreatedEvent.ts | 2 +- ...equestFromRelationshipCreationCreatedAndCompletedEvent.ts | 2 +- .../events/consumption/OutgoingRequestStatusChangedEvent.ts | 2 +- .../events/consumption/OwnAttributeDeletedByOwnerEvent.ts | 2 +- .../PeerRelationshipAttributeDeletedByPeerEvent.ts | 2 +- .../src/events/consumption/RelationshipEvent.ts | 2 +- .../events/consumption/RelationshipTemplateProcessedEvent.ts | 2 +- .../src/events/transport/DatawalletSynchronizedEvent.ts | 2 +- .../src/events/transport/FileOwnershipClaimedEvent.ts | 4 ++-- .../src/events/transport/FileOwnershipLockedEvent.ts | 5 ++--- .../transport/IdentityDeletionProcessStatusChangedEvent.ts | 4 ++-- .../src/events/transport/MessageDeliveredEvent.ts | 4 ++-- .../src/events/transport/MessageReceivedEvent.ts | 4 ++-- .../runtime-types/src/events/transport/MessageSentEvent.ts | 4 ++-- .../src/events/transport/MessageWasReadAtChangedEvent.ts | 4 ++-- .../runtime-types/src/events/transport/PeerDeletedEvent.ts | 4 ++-- .../src/events/transport/PeerDeletionCancelledEvent.ts | 4 ++-- .../events/transport/PeerRelationshipTemplateLoadedEvent.ts | 4 ++-- .../src/events/transport/PeerToBeDeletedEvent.ts | 4 ++-- .../src/events/transport/RelationshipChangedEvent.ts | 4 ++-- .../events/transport/RelationshipDecomposedBySelfEvent.ts | 2 +- .../transport/RelationshipReactivationCompletedEvent.ts | 4 ++-- .../transport/RelationshipReactivationRequestedEvent.ts | 4 ++-- .../RelationshipTemplateAllocationsExhaustedEvent.ts | 4 ++-- 35 files changed, 50 insertions(+), 51 deletions(-) diff --git a/packages/runtime-types/src/events/consumption/AttributeCreatedEvent.ts b/packages/runtime-types/src/events/consumption/AttributeCreatedEvent.ts index c12f384bf..53e87b014 100644 --- a/packages/runtime-types/src/events/consumption/AttributeCreatedEvent.ts +++ b/packages/runtime-types/src/events/consumption/AttributeCreatedEvent.ts @@ -1,4 +1,4 @@ -import { LocalAttributeDTO } from "@nmshd/runtime-types"; +import { LocalAttributeDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class AttributeCreatedEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/AttributeDeletedEvent.ts b/packages/runtime-types/src/events/consumption/AttributeDeletedEvent.ts index 9df4c5344..b2a9977ab 100644 --- a/packages/runtime-types/src/events/consumption/AttributeDeletedEvent.ts +++ b/packages/runtime-types/src/events/consumption/AttributeDeletedEvent.ts @@ -1,4 +1,4 @@ -import { LocalAttributeDTO } from "@nmshd/runtime-types"; +import { LocalAttributeDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class AttributeDeletedEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts b/packages/runtime-types/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts index 49e0a9f9d..437fd3161 100644 --- a/packages/runtime-types/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts +++ b/packages/runtime-types/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts @@ -1,4 +1,4 @@ -import { LocalAttributeDTO } from "@nmshd/runtime-types"; +import { LocalAttributeDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class AttributeForwardingDetailsChangedEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/AttributeSucceededEvent.ts b/packages/runtime-types/src/events/consumption/AttributeSucceededEvent.ts index c2903593a..d70ff3a56 100644 --- a/packages/runtime-types/src/events/consumption/AttributeSucceededEvent.ts +++ b/packages/runtime-types/src/events/consumption/AttributeSucceededEvent.ts @@ -1,4 +1,4 @@ -import { LocalAttributeDTO } from "@nmshd/runtime-types"; +import { LocalAttributeDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export interface AttributeSucceededEventData { diff --git a/packages/runtime-types/src/events/consumption/AttributeWasViewedAtChangedEvent.ts b/packages/runtime-types/src/events/consumption/AttributeWasViewedAtChangedEvent.ts index 7018b07f7..95374c304 100644 --- a/packages/runtime-types/src/events/consumption/AttributeWasViewedAtChangedEvent.ts +++ b/packages/runtime-types/src/events/consumption/AttributeWasViewedAtChangedEvent.ts @@ -1,4 +1,4 @@ -import { LocalAttributeDTO } from "@nmshd/runtime-types"; +import { LocalAttributeDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class AttributeWasViewedAtChangedEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts b/packages/runtime-types/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts index c1d444572..2f75b040e 100644 --- a/packages/runtime-types/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts +++ b/packages/runtime-types/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts @@ -1,4 +1,4 @@ -import { LocalAttributeDTO } from "@nmshd/runtime-types"; +import { LocalAttributeDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class ForwardedAttributeDeletedByPeerEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/IncomingRequestReceivedEvent.ts b/packages/runtime-types/src/events/consumption/IncomingRequestReceivedEvent.ts index 5a597b07f..6a135761e 100644 --- a/packages/runtime-types/src/events/consumption/IncomingRequestReceivedEvent.ts +++ b/packages/runtime-types/src/events/consumption/IncomingRequestReceivedEvent.ts @@ -1,4 +1,4 @@ -import { LocalRequestDTO } from "@nmshd/runtime-types"; +import { LocalRequestDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class IncomingRequestReceivedEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts b/packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts index 259e998b0..8a3ab572d 100644 --- a/packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts +++ b/packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts @@ -1,5 +1,5 @@ import { LocalRequestStatus } from "@nmshd/consumption"; -import { LocalRequestDTO } from "@nmshd/runtime-types"; +import { LocalRequestDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export interface IncomingRequestStatusChangedEventData { diff --git a/packages/runtime-types/src/events/consumption/MailReceivedEvent.ts b/packages/runtime-types/src/events/consumption/MailReceivedEvent.ts index aa75888d2..083feabe2 100644 --- a/packages/runtime-types/src/events/consumption/MailReceivedEvent.ts +++ b/packages/runtime-types/src/events/consumption/MailReceivedEvent.ts @@ -1,5 +1,5 @@ import { Mail } from "@nmshd/content"; -import { MessageDTO } from "@nmshd/runtime-types"; +import { MessageDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class MailReceivedEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/MessageProcessedEvent.ts b/packages/runtime-types/src/events/consumption/MessageProcessedEvent.ts index 3c6627c8a..0ef277d32 100644 --- a/packages/runtime-types/src/events/consumption/MessageProcessedEvent.ts +++ b/packages/runtime-types/src/events/consumption/MessageProcessedEvent.ts @@ -1,4 +1,4 @@ -import { MessageDTO } from "@nmshd/runtime-types"; +import { MessageDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class MessageProcessedEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts index 7a4cc6490..222c69813 100644 --- a/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts +++ b/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts @@ -1,4 +1,4 @@ -import { LocalRequestDTO } from "@nmshd/runtime-types"; +import { LocalRequestDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class OutgoingRequestCreatedAndCompletedEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedEvent.ts index 86a7d78a6..4c5b36c17 100644 --- a/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedEvent.ts +++ b/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedEvent.ts @@ -1,4 +1,4 @@ -import { LocalRequestDTO } from "@nmshd/runtime-types"; +import { LocalRequestDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class OutgoingRequestCreatedEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts index 8ef257daa..73483401f 100644 --- a/packages/runtime-types/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts +++ b/packages/runtime-types/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts @@ -1,4 +1,4 @@ -import { LocalRequestDTO } from "@nmshd/runtime-types"; +import { LocalRequestDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts index b523184d8..64517fba1 100644 --- a/packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts +++ b/packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts @@ -1,5 +1,5 @@ import { LocalRequestStatus } from "@nmshd/consumption"; -import { LocalRequestDTO } from "@nmshd/runtime-types"; +import { LocalRequestDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export interface OutgoingRequestStatusChangedEventData { diff --git a/packages/runtime-types/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts b/packages/runtime-types/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts index ea9336141..4835c1caa 100644 --- a/packages/runtime-types/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts +++ b/packages/runtime-types/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts @@ -1,4 +1,4 @@ -import { LocalAttributeDTO } from "@nmshd/runtime-types"; +import { LocalAttributeDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class OwnAttributeDeletedByOwnerEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts b/packages/runtime-types/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts index 63252c626..c00c32c23 100644 --- a/packages/runtime-types/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts +++ b/packages/runtime-types/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts @@ -1,4 +1,4 @@ -import { LocalAttributeDTO } from "@nmshd/runtime-types"; +import { LocalAttributeDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class PeerRelationshipAttributeDeletedByPeerEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/RelationshipEvent.ts b/packages/runtime-types/src/events/consumption/RelationshipEvent.ts index e75cb6b83..f754502fc 100644 --- a/packages/runtime-types/src/events/consumption/RelationshipEvent.ts +++ b/packages/runtime-types/src/events/consumption/RelationshipEvent.ts @@ -1,5 +1,5 @@ import { Event } from "@js-soft/ts-utils"; -import { RelationshipDTO } from "@nmshd/runtime-types"; +import { RelationshipDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class RelationshipEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/consumption/RelationshipTemplateProcessedEvent.ts b/packages/runtime-types/src/events/consumption/RelationshipTemplateProcessedEvent.ts index 152ade1c5..3c827274e 100644 --- a/packages/runtime-types/src/events/consumption/RelationshipTemplateProcessedEvent.ts +++ b/packages/runtime-types/src/events/consumption/RelationshipTemplateProcessedEvent.ts @@ -1,4 +1,4 @@ -import { RelationshipTemplateDTO } from "@nmshd/runtime-types"; +import { RelationshipTemplateDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; export class RelationshipTemplateProcessedEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/transport/DatawalletSynchronizedEvent.ts b/packages/runtime-types/src/events/transport/DatawalletSynchronizedEvent.ts index 92f97de35..490398fa9 100644 --- a/packages/runtime-types/src/events/transport/DatawalletSynchronizedEvent.ts +++ b/packages/runtime-types/src/events/transport/DatawalletSynchronizedEvent.ts @@ -1,4 +1,4 @@ -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { DataEvent } from "../DataEvent"; export class DatawalletSynchronizedEvent extends DataEvent { public static readonly namespace: string = "transport.datawalletSynchronized"; diff --git a/packages/runtime-types/src/events/transport/FileOwnershipClaimedEvent.ts b/packages/runtime-types/src/events/transport/FileOwnershipClaimedEvent.ts index e930727fc..6771401fe 100644 --- a/packages/runtime-types/src/events/transport/FileOwnershipClaimedEvent.ts +++ b/packages/runtime-types/src/events/transport/FileOwnershipClaimedEvent.ts @@ -1,5 +1,5 @@ -import { FileDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { FileDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class FileOwnershipClaimedEvent extends DataEvent { public static readonly namespace = "transport.fileOwnershipClaimed"; diff --git a/packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts b/packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts index 415905c01..d915714e7 100644 --- a/packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts +++ b/packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts @@ -1,6 +1,5 @@ -import { FileDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; - +import { FileDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class FileOwnershipLockedEvent extends DataEvent { public static readonly namespace = "transport.fileOwnershipLocked"; diff --git a/packages/runtime-types/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts b/packages/runtime-types/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts index 68f5aec5a..1cdbc2dfc 100644 --- a/packages/runtime-types/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts +++ b/packages/runtime-types/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts @@ -1,5 +1,5 @@ -import { IdentityDeletionProcessDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { IdentityDeletionProcessDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class IdentityDeletionProcessStatusChangedEvent extends DataEvent { public static readonly namespace = "transport.identityDeletionProcessStatusChanged"; diff --git a/packages/runtime-types/src/events/transport/MessageDeliveredEvent.ts b/packages/runtime-types/src/events/transport/MessageDeliveredEvent.ts index 12e3b2e18..d6569bfa7 100644 --- a/packages/runtime-types/src/events/transport/MessageDeliveredEvent.ts +++ b/packages/runtime-types/src/events/transport/MessageDeliveredEvent.ts @@ -1,5 +1,5 @@ -import { MessageDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { MessageDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; // This event is currently not triggered because it is disabled in the Backbone. (JSSNMSHDD-2372) export class MessageDeliveredEvent extends DataEvent { diff --git a/packages/runtime-types/src/events/transport/MessageReceivedEvent.ts b/packages/runtime-types/src/events/transport/MessageReceivedEvent.ts index a857107fb..deeb23efb 100644 --- a/packages/runtime-types/src/events/transport/MessageReceivedEvent.ts +++ b/packages/runtime-types/src/events/transport/MessageReceivedEvent.ts @@ -1,5 +1,5 @@ -import { MessageDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { MessageDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class MessageReceivedEvent extends DataEvent { public static readonly namespace = "transport.messageReceived"; diff --git a/packages/runtime-types/src/events/transport/MessageSentEvent.ts b/packages/runtime-types/src/events/transport/MessageSentEvent.ts index 647173e9a..80a028097 100644 --- a/packages/runtime-types/src/events/transport/MessageSentEvent.ts +++ b/packages/runtime-types/src/events/transport/MessageSentEvent.ts @@ -1,5 +1,5 @@ -import { MessageDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { MessageDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class MessageSentEvent extends DataEvent { public static readonly namespace = "transport.messageSent"; diff --git a/packages/runtime-types/src/events/transport/MessageWasReadAtChangedEvent.ts b/packages/runtime-types/src/events/transport/MessageWasReadAtChangedEvent.ts index cf6cd8de2..8ddc16e64 100644 --- a/packages/runtime-types/src/events/transport/MessageWasReadAtChangedEvent.ts +++ b/packages/runtime-types/src/events/transport/MessageWasReadAtChangedEvent.ts @@ -1,5 +1,5 @@ -import { MessageDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { MessageDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class MessageWasReadAtChangedEvent extends DataEvent { public static readonly namespace = "transport.messageWasReadAtChanged"; diff --git a/packages/runtime-types/src/events/transport/PeerDeletedEvent.ts b/packages/runtime-types/src/events/transport/PeerDeletedEvent.ts index a8db7a76b..b5843d4ec 100644 --- a/packages/runtime-types/src/events/transport/PeerDeletedEvent.ts +++ b/packages/runtime-types/src/events/transport/PeerDeletedEvent.ts @@ -1,5 +1,5 @@ -import { RelationshipDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { RelationshipDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class PeerDeletedEvent extends DataEvent { public static readonly namespace = "transport.peerDeleted"; diff --git a/packages/runtime-types/src/events/transport/PeerDeletionCancelledEvent.ts b/packages/runtime-types/src/events/transport/PeerDeletionCancelledEvent.ts index c0a7197ad..80762e0d1 100644 --- a/packages/runtime-types/src/events/transport/PeerDeletionCancelledEvent.ts +++ b/packages/runtime-types/src/events/transport/PeerDeletionCancelledEvent.ts @@ -1,5 +1,5 @@ -import { RelationshipDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { RelationshipDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class PeerDeletionCancelledEvent extends DataEvent { public static readonly namespace = "transport.peerDeletionCancelled"; diff --git a/packages/runtime-types/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts b/packages/runtime-types/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts index 5851c0146..efc6285e9 100644 --- a/packages/runtime-types/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts +++ b/packages/runtime-types/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts @@ -1,5 +1,5 @@ -import { RelationshipTemplateDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { RelationshipTemplateDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class PeerRelationshipTemplateLoadedEvent extends DataEvent { public static readonly namespace = "transport.peerRelationshipTemplateLoaded"; diff --git a/packages/runtime-types/src/events/transport/PeerToBeDeletedEvent.ts b/packages/runtime-types/src/events/transport/PeerToBeDeletedEvent.ts index 97aa6c489..6999e86e5 100644 --- a/packages/runtime-types/src/events/transport/PeerToBeDeletedEvent.ts +++ b/packages/runtime-types/src/events/transport/PeerToBeDeletedEvent.ts @@ -1,5 +1,5 @@ -import { RelationshipDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { RelationshipDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class PeerToBeDeletedEvent extends DataEvent { public static readonly namespace = "transport.peerToBeDeleted"; diff --git a/packages/runtime-types/src/events/transport/RelationshipChangedEvent.ts b/packages/runtime-types/src/events/transport/RelationshipChangedEvent.ts index 7acfa897f..a3483b1f9 100644 --- a/packages/runtime-types/src/events/transport/RelationshipChangedEvent.ts +++ b/packages/runtime-types/src/events/transport/RelationshipChangedEvent.ts @@ -1,5 +1,5 @@ -import { RelationshipDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { RelationshipDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class RelationshipChangedEvent extends DataEvent { public static readonly namespace = "transport.relationshipChanged"; diff --git a/packages/runtime-types/src/events/transport/RelationshipDecomposedBySelfEvent.ts b/packages/runtime-types/src/events/transport/RelationshipDecomposedBySelfEvent.ts index 49c68436b..74acf0121 100644 --- a/packages/runtime-types/src/events/transport/RelationshipDecomposedBySelfEvent.ts +++ b/packages/runtime-types/src/events/transport/RelationshipDecomposedBySelfEvent.ts @@ -1,4 +1,4 @@ -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { DataEvent } from "../DataEvent"; export interface RelationshipDecomposedBySelfEventData { relationshipId: string; diff --git a/packages/runtime-types/src/events/transport/RelationshipReactivationCompletedEvent.ts b/packages/runtime-types/src/events/transport/RelationshipReactivationCompletedEvent.ts index 69e362a36..8402ef721 100644 --- a/packages/runtime-types/src/events/transport/RelationshipReactivationCompletedEvent.ts +++ b/packages/runtime-types/src/events/transport/RelationshipReactivationCompletedEvent.ts @@ -1,5 +1,5 @@ -import { RelationshipDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { RelationshipDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class RelationshipReactivationCompletedEvent extends DataEvent { public static readonly namespace = "transport.relationshipReactivationCompleted"; diff --git a/packages/runtime-types/src/events/transport/RelationshipReactivationRequestedEvent.ts b/packages/runtime-types/src/events/transport/RelationshipReactivationRequestedEvent.ts index 207cf679f..49a4180b8 100644 --- a/packages/runtime-types/src/events/transport/RelationshipReactivationRequestedEvent.ts +++ b/packages/runtime-types/src/events/transport/RelationshipReactivationRequestedEvent.ts @@ -1,5 +1,5 @@ -import { RelationshipDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { RelationshipDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class RelationshipReactivationRequestedEvent extends DataEvent { public static readonly namespace = "transport.relationshipReactivationRequested"; diff --git a/packages/runtime-types/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts b/packages/runtime-types/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts index 4d1315d93..eb1e1cfef 100644 --- a/packages/runtime-types/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts +++ b/packages/runtime-types/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts @@ -1,5 +1,5 @@ -import { RelationshipTemplateDTO } from "@nmshd/runtime-types"; -import { DataEvent } from "@nmshd/runtime-types/src/events/DataEvent"; +import { RelationshipTemplateDTO } from "../../dtos"; +import { DataEvent } from "../DataEvent"; export class RelationshipTemplateAllocationsExhaustedEvent extends DataEvent { public static readonly namespace = "transport.relationshipTemplateAllocationsExhausted"; From efa664977eef771da3c3eba15ca590d696c9468f Mon Sep 17 00:00:00 2001 From: Milena-Czierlinski Date: Thu, 5 Mar 2026 15:05:43 +0100 Subject: [PATCH 04/10] chore: fix more imports --- packages/runtime/src/Runtime.ts | 3 +-- packages/runtime/src/events/EventProxy.ts | 2 +- packages/runtime/src/modules/DeciderModule.ts | 4 ++-- packages/runtime/src/modules/MessageModule.ts | 2 +- packages/runtime/src/modules/NotificationModule.ts | 2 +- packages/runtime/src/modules/RequestModule.ts | 10 ++++++---- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/runtime/src/Runtime.ts b/packages/runtime/src/Runtime.ts index f4ede753f..f8b11a409 100644 --- a/packages/runtime/src/Runtime.ts +++ b/packages/runtime/src/Runtime.ts @@ -12,8 +12,7 @@ import { SettingsController } from "@nmshd/consumption"; import { ICoreAddress } from "@nmshd/core-types"; -import { RuntimeHealth } from "@nmshd/runtime-types"; -import { ModulesInitializedEvent, ModulesLoadedEvent, ModulesStartedEvent, RuntimeInitializedEvent, RuntimeInitializingEvent } from "@nmshd/runtime-types/src/events"; +import { ModulesInitializedEvent, ModulesLoadedEvent, ModulesStartedEvent, RuntimeHealth, RuntimeInitializedEvent, RuntimeInitializingEvent } from "@nmshd/runtime-types"; import { AccountController, AnnouncementController, diff --git a/packages/runtime/src/events/EventProxy.ts b/packages/runtime/src/events/EventProxy.ts index 9559d0a32..b4302f9de 100644 --- a/packages/runtime/src/events/EventProxy.ts +++ b/packages/runtime/src/events/EventProxy.ts @@ -32,7 +32,7 @@ import { RelationshipReactivationCompletedEvent, RelationshipReactivationRequestedEvent, RelationshipTemplateAllocationsExhaustedEvent -} from "@nmshd/runtime-types/src/events"; +} from "@nmshd/runtime-types"; import * as transport from "@nmshd/transport"; import { AttributeMapper, FileMapper, IdentityDeletionProcessMapper, MessageMapper, RelationshipMapper, RelationshipTemplateMapper, RequestMapper } from "../useCases"; diff --git a/packages/runtime/src/modules/DeciderModule.ts b/packages/runtime/src/modules/DeciderModule.ts index b82f9ea0b..99e34555e 100644 --- a/packages/runtime/src/modules/DeciderModule.ts +++ b/packages/runtime/src/modules/DeciderModule.ts @@ -2,14 +2,14 @@ import { ApplicationError } from "@js-soft/ts-utils"; import { DecideRequestItemGroupParametersJSON, DecideRequestItemParametersJSON, LocalRequestStatus } from "@nmshd/consumption"; import { isRequestItemDerivation, RequestItemGroupJSON, RequestItemJSONDerivations } from "@nmshd/content"; import { CoreDate } from "@nmshd/core-types"; -import { LocalRequestDTO } from "@nmshd/runtime-types"; import { IncomingRequestStatusChangedEvent, + LocalRequestDTO, MessageProcessedEvent, MessageProcessedResult, RelationshipTemplateProcessedEvent, RelationshipTemplateProcessedResult -} from "@nmshd/runtime-types/src/events"; +} from "@nmshd/runtime-types"; import { ModuleConfiguration, RuntimeModule } from "../extensibility"; import { RuntimeServices } from "../Runtime"; import { RuntimeErrors } from "../useCases/common/RuntimeErrors"; diff --git a/packages/runtime/src/modules/MessageModule.ts b/packages/runtime/src/modules/MessageModule.ts index 1b9beb95b..2cbeac3db 100644 --- a/packages/runtime/src/modules/MessageModule.ts +++ b/packages/runtime/src/modules/MessageModule.ts @@ -1,6 +1,6 @@ import { Event } from "@js-soft/ts-utils"; import { Mail, MailJSON } from "@nmshd/content"; -import { MailReceivedEvent, MessageReceivedEvent, RelationshipEvent } from "@nmshd/runtime-types/src/events"; +import { MailReceivedEvent, MessageReceivedEvent, RelationshipEvent } from "@nmshd/runtime-types"; import { ModuleConfiguration, RuntimeModule } from "../extensibility/modules/RuntimeModule"; export interface MessageModuleConfiguration extends ModuleConfiguration {} diff --git a/packages/runtime/src/modules/NotificationModule.ts b/packages/runtime/src/modules/NotificationModule.ts index 43c168b2f..8af530500 100644 --- a/packages/runtime/src/modules/NotificationModule.ts +++ b/packages/runtime/src/modules/NotificationModule.ts @@ -1,4 +1,4 @@ -import { MessageReceivedEvent, MessageSentEvent } from "@nmshd/runtime-types/src/events"; +import { MessageReceivedEvent, MessageSentEvent } from "@nmshd/runtime-types"; import { RuntimeModule } from "../extensibility/modules/RuntimeModule"; export class NotificationModule extends RuntimeModule { diff --git a/packages/runtime/src/modules/RequestModule.ts b/packages/runtime/src/modules/RequestModule.ts index a1ea0b694..0a3dadcc0 100644 --- a/packages/runtime/src/modules/RequestModule.ts +++ b/packages/runtime/src/modules/RequestModule.ts @@ -1,17 +1,19 @@ import { LocalRequestStatus } from "@nmshd/consumption"; import { RelationshipCreationContent, RequestJSON, ResponseJSON, ResponseResult, ResponseWrapper } from "@nmshd/content"; import { CoreDate } from "@nmshd/core-types"; -import { LocalRequestDTO, RelationshipStatus } from "@nmshd/runtime-types"; import { IncomingRequestStatusChangedEvent, + LocalRequestDTO, MessageProcessedEvent, MessageProcessedResult, MessageReceivedEvent, MessageSentEvent, PeerRelationshipTemplateLoadedEvent, - RelationshipChangedEvent -} from "@nmshd/runtime-types/src/events"; -import { RelationshipTemplateProcessedEvent, RelationshipTemplateProcessedResult } from "../events/consumption/RelationshipTemplateProcessedEvent"; + RelationshipChangedEvent, + RelationshipStatus, + RelationshipTemplateProcessedEvent, + RelationshipTemplateProcessedResult +} from "@nmshd/runtime-types"; import { RuntimeModule } from "../extensibility/modules/RuntimeModule"; import { RuntimeServices } from "../Runtime"; From 2b779615c889b8d377fc07b04335a8cde28caa8b Mon Sep 17 00:00:00 2001 From: Milena-Czierlinski Date: Thu, 5 Mar 2026 15:06:05 +0100 Subject: [PATCH 05/10] chore: add dependencies to package.json of runtime-types --- packages/runtime-types/package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/runtime-types/package.json b/packages/runtime-types/package.json index 3e175c24a..8beaa7d1d 100644 --- a/packages/runtime-types/package.json +++ b/packages/runtime-types/package.json @@ -20,7 +20,11 @@ "cdep": "tsc && madge --circular dist", "lint:tsc": "tsc --noEmit" }, - "dependencies": {}, + "dependencies": { + "@js-soft/ts-utils": "2.3.5", + "@nmshd/content": "*", + "@nmshd/consumption": "*" + }, "devDependencies": {}, "publishConfig": { "access": "public", From 96732612e477eb92cad1629693c4a7738cfaf14b Mon Sep 17 00:00:00 2001 From: Milena-Czierlinski Date: Thu, 5 Mar 2026 15:06:29 +0100 Subject: [PATCH 06/10] chore: add paths to tsconfigs --- packages/app-runtime/tsconfig.json | 2 +- packages/runtime-types/tsconfig.json | 2 +- packages/runtime/tsconfig.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app-runtime/tsconfig.json b/packages/app-runtime/tsconfig.json index 4abdec300..81f477751 100644 --- a/packages/app-runtime/tsconfig.json +++ b/packages/app-runtime/tsconfig.json @@ -6,5 +6,5 @@ }, "include": ["src/**/*.ts"], "exclude": [], - "references": [{ "path": "../runtime" }] + "references": [{ "path": "../runtime-types" }, { "path": "../runtime" }] } diff --git a/packages/runtime-types/tsconfig.json b/packages/runtime-types/tsconfig.json index a0c1fcab3..e8f8255f8 100644 --- a/packages/runtime-types/tsconfig.json +++ b/packages/runtime-types/tsconfig.json @@ -6,5 +6,5 @@ }, "include": ["src/**/*.ts"], "exclude": [], - "references": [] + "references": [{ "path": "../content" }, { "path": "../consumption" }] } diff --git a/packages/runtime/tsconfig.json b/packages/runtime/tsconfig.json index cb7f37b00..8f55001d1 100644 --- a/packages/runtime/tsconfig.json +++ b/packages/runtime/tsconfig.json @@ -6,5 +6,5 @@ }, "include": ["src/**/*.ts"], "exclude": [], - "references": [{ "path": "../transport" }, { "path": "../content" }, { "path": "../consumption" }] + "references": [{ "path": "../transport" }, { "path": "../content" }, { "path": "../consumption" }, { "path": "../runtime-types" }] } From 64f6d9327f5b317063e3cb33c5102c2073cd2046 Mon Sep 17 00:00:00 2001 From: Milena-Czierlinski Date: Thu, 5 Mar 2026 15:08:48 +0100 Subject: [PATCH 07/10] refactor: add deleted empty line again --- .../src/events/transport/FileOwnershipLockedEvent.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts b/packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts index d915714e7..81d011c49 100644 --- a/packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts +++ b/packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts @@ -1,5 +1,6 @@ import { FileDTO } from "../../dtos"; import { DataEvent } from "../DataEvent"; + export class FileOwnershipLockedEvent extends DataEvent { public static readonly namespace = "transport.fileOwnershipLocked"; From 454a87fadca8666bebf3ce51ad4fdcb913296fab Mon Sep 17 00:00:00 2001 From: Milena-Czierlinski Date: Thu, 5 Mar 2026 15:23:49 +0100 Subject: [PATCH 08/10] test: adjust imports --- packages/runtime/test/consumption/iqlQuery.test.ts | 3 ++- packages/runtime/test/consumption/requests.test.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/runtime/test/consumption/iqlQuery.test.ts b/packages/runtime/test/consumption/iqlQuery.test.ts index 2e6e5a5c9..709f1e8ba 100644 --- a/packages/runtime/test/consumption/iqlQuery.test.ts +++ b/packages/runtime/test/consumption/iqlQuery.test.ts @@ -4,13 +4,14 @@ import { DateTime } from "luxon"; import { ConsumptionServices, CreateOutgoingRequestRequest, + IncomingRequestReceivedEvent, + IncomingRequestStatusChangedEvent, LocalAttributeDTO, LocalRequestStatus, OutgoingRequestCreatedEvent, OutgoingRequestStatusChangedEvent, TransportServices } from "../../src"; -import { IncomingRequestReceivedEvent, IncomingRequestStatusChangedEvent } from "../../src/events"; import { RuntimeServiceProvider, TestRuntimeServices, establishRelationship, exchangeMessageWithRequest, sendMessageWithRequest } from "../lib"; import { exchangeMessageWithRequestAndRequireManualDecision, exchangeMessageWithRequestAndSendResponse } from "../lib/testUtilsWithInactiveModules"; diff --git a/packages/runtime/test/consumption/requests.test.ts b/packages/runtime/test/consumption/requests.test.ts index 946438294..d19413f3b 100644 --- a/packages/runtime/test/consumption/requests.test.ts +++ b/packages/runtime/test/consumption/requests.test.ts @@ -5,12 +5,13 @@ import { DateTime } from "luxon"; import { ConsumptionServices, CreateOutgoingRequestRequest, + IncomingRequestReceivedEvent, + IncomingRequestStatusChangedEvent, LocalRequestStatus, OutgoingRequestCreatedEvent, OutgoingRequestStatusChangedEvent, TransportServices } from "../../src"; -import { IncomingRequestReceivedEvent, IncomingRequestStatusChangedEvent } from "../../src/events"; import { establishRelationship, exchangeMessageWithRequest, From c268a734f0824224cf6ed9994ce534465b28f1ef Mon Sep 17 00:00:00 2001 From: Milena-Czierlinski Date: Fri, 6 Mar 2026 12:22:48 +0100 Subject: [PATCH 09/10] refactor: don't depend on consumption in runtime-types --- package-lock.json | 4 ++++ packages/runtime-types/package.json | 3 +-- .../events/consumption/IncomingRequestStatusChangedEvent.ts | 3 +-- .../events/consumption/OutgoingRequestStatusChangedEvent.ts | 3 +-- packages/runtime-types/tsconfig.json | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index e1a52c42b..b26208e98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11539,6 +11539,10 @@ "packages/runtime-types": { "name": "@nmshd/runtime-types", "license": "AGPL-3.0-or-later", + "dependencies": { + "@js-soft/ts-utils": "2.3.5", + "@nmshd/content": "*" + }, "devDependencies": {} }, "packages/runtime/node_modules/ajv": { diff --git a/packages/runtime-types/package.json b/packages/runtime-types/package.json index 8beaa7d1d..bc7e81faa 100644 --- a/packages/runtime-types/package.json +++ b/packages/runtime-types/package.json @@ -22,8 +22,7 @@ }, "dependencies": { "@js-soft/ts-utils": "2.3.5", - "@nmshd/content": "*", - "@nmshd/consumption": "*" + "@nmshd/content": "*" }, "devDependencies": {}, "publishConfig": { diff --git a/packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts b/packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts index 8a3ab572d..c6357bf72 100644 --- a/packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts +++ b/packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts @@ -1,5 +1,4 @@ -import { LocalRequestStatus } from "@nmshd/consumption"; -import { LocalRequestDTO } from "../../dtos"; +import { LocalRequestDTO, LocalRequestStatus } from "../../dtos"; import { DataEvent } from "../DataEvent"; export interface IncomingRequestStatusChangedEventData { diff --git a/packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts index 64517fba1..03b46c21d 100644 --- a/packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts +++ b/packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts @@ -1,5 +1,4 @@ -import { LocalRequestStatus } from "@nmshd/consumption"; -import { LocalRequestDTO } from "../../dtos"; +import { LocalRequestDTO, LocalRequestStatus } from "../../dtos"; import { DataEvent } from "../DataEvent"; export interface OutgoingRequestStatusChangedEventData { diff --git a/packages/runtime-types/tsconfig.json b/packages/runtime-types/tsconfig.json index e8f8255f8..748e37916 100644 --- a/packages/runtime-types/tsconfig.json +++ b/packages/runtime-types/tsconfig.json @@ -6,5 +6,5 @@ }, "include": ["src/**/*.ts"], "exclude": [], - "references": [{ "path": "../content" }, { "path": "../consumption" }] + "references": [{ "path": "../content" }] } From 4d3bae0479b88655fc5fc23085e1499a0279e88d Mon Sep 17 00:00:00 2001 From: Milena-Czierlinski Date: Fri, 6 Mar 2026 13:49:18 +0100 Subject: [PATCH 10/10] chore: undo tsconfig app-runtime change since it is not necessary --- packages/app-runtime/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app-runtime/tsconfig.json b/packages/app-runtime/tsconfig.json index 81f477751..4abdec300 100644 --- a/packages/app-runtime/tsconfig.json +++ b/packages/app-runtime/tsconfig.json @@ -6,5 +6,5 @@ }, "include": ["src/**/*.ts"], "exclude": [], - "references": [{ "path": "../runtime-types" }, { "path": "../runtime" }] + "references": [{ "path": "../runtime" }] }