Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .dev/compose.backbone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ services:
azure-storage-emulator:
container_name: azure-storage-emulator
hostname: azurite
image: mcr.microsoft.com/azure-storage/azurite:3.35.0@sha256:647c63a91102a9d8e8000aab803436e1fc85fbb285e7ce830a82ee5d6661cf37
image: mcr.microsoft.com/azure-storage/azurite:3.36.0@sha256:37493d0f2e764467421ffe16eb3caa39277e5fa7f6adea18eb5bbfb3c5247f98
pull_policy: always
command: azurite -d /data/debug.log -l /data --blobHost "0.0.0.0" --queueHost "0.0.0.0" --skipApiVersionCheck

Expand Down
56 changes: 33 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
"@types/node": "24.13.3",
"dependency-cruiser": "17.4.3",
"enhanced-publish": "1.1.9",
"eslint": "10.4.1",
"eslint": "10.7.0",
"jest": "30.4.2",
"jest-expect-message": "1.1.3",
"npm-check-updates": "22.2.9",
"patch-package": "8.0.1",
"prettier": "3.8.4",
"prettier": "3.9.5",
"ts-jest": "29.4.11",
"ts-node": "10.9.2",
"tsconfig-paths": "4.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"lodash": "^4.18.1"
},
"devDependencies": {
"@eudiplo/sdk-core": "4.4.0",
"@eudiplo/sdk-core": "4.5.0",
"@js-soft/node-logger": "1.2.5",
"@types/lodash": "4.17.24",
"@types/lokijs": "1.5.14",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,7 @@ export class DeleteAttributeRequestItemProcessor extends GenericRequestItemProce
_requestInfo: LocalRequestInfo
): Promise<DeleteAttributeAcceptResponseItem | AcceptResponseItem> {
const attribute = (await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId)) as
| PeerIdentityAttribute
| PeerRelationshipAttribute
| ThirdPartyRelationshipAttribute
| undefined;
PeerIdentityAttribute | PeerRelationshipAttribute | ThirdPartyRelationshipAttribute | undefined;
if (!attribute) return AcceptResponseItem.from({ result: ResponseItemResult.Accepted });

const deletionDate = CoreDate.from(params.deletionDate);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ export interface AcceptProposeAttributeRequestItemParametersWithNewAttributeJSON
}

export type AcceptProposeAttributeRequestItemParametersJSON =
| AcceptProposeAttributeRequestItemParametersWithExistingAttributeJSON
| AcceptProposeAttributeRequestItemParametersWithNewAttributeJSON;
AcceptProposeAttributeRequestItemParametersWithExistingAttributeJSON | AcceptProposeAttributeRequestItemParametersWithNewAttributeJSON;

@type("AcceptProposeAttributeRequestItemParameters")
export class AcceptProposeAttributeRequestItemParameters extends Serializable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ export interface AcceptReadAttributeRequestItemParametersWithNewAttributeJSON ex
}

export type AcceptReadAttributeRequestItemParametersJSON =
| AcceptReadAttributeRequestItemParametersWithExistingAttributeJSON
| AcceptReadAttributeRequestItemParametersWithNewAttributeJSON;
AcceptReadAttributeRequestItemParametersWithExistingAttributeJSON | AcceptReadAttributeRequestItemParametersWithNewAttributeJSON;

@type("AcceptReadAttributeRequestItemParameters")
export class AcceptReadAttributeRequestItemParameters extends Serializable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,11 @@ export class ReadAttributeRequestItemProcessor extends GenericRequestItemProcess
return ValidationResult.error(TransportCoreErrors.general.recordNotFound(LocalAttribute, parsedParams.existingAttributeId.toString()));
}

if (
!(
foundLocalAttribute instanceof OwnIdentityAttribute ||
foundLocalAttribute instanceof OwnRelationshipAttribute ||
foundLocalAttribute instanceof PeerRelationshipAttribute
)
) {
if (!(
foundLocalAttribute instanceof OwnIdentityAttribute ||
foundLocalAttribute instanceof OwnRelationshipAttribute ||
foundLocalAttribute instanceof PeerRelationshipAttribute
)) {
return ValidationResult.error(
ConsumptionCoreErrors.requests.invalidAcceptParameters(
"The selected Attribute is not an OwnIdentityAttribute, an OwnRelationshipAttribute or a PeerRelationshipAttribute. When accepting a ReadAttributeRequestItem with an existing Attribute it may only be such an Attribute."
Expand Down Expand Up @@ -276,13 +274,11 @@ export class ReadAttributeRequestItemProcessor extends GenericRequestItemProcess
throw TransportCoreErrors.general.recordNotFound(LocalAttribute, parsedParams.existingAttributeId.toString());
}

if (
!(
existingAttribute instanceof OwnIdentityAttribute ||
existingAttribute instanceof OwnRelationshipAttribute ||
existingAttribute instanceof PeerRelationshipAttribute
)
) {
if (!(
existingAttribute instanceof OwnIdentityAttribute ||
existingAttribute instanceof OwnRelationshipAttribute ||
existingAttribute instanceof PeerRelationshipAttribute
)) {
throw ConsumptionCoreErrors.requests.invalidAcceptParameters(
"The selected Attribute is not an OwnIdentityAttribute, an OwnRelationshipAttribute or a PeerRelationshipAttribute. When accepting a ReadAttributeRequestItem with an existing Attribute it may only be such an Attribute."
);
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"ts-simple-nameof": "^1.3.3"
},
"devDependencies": {
"@eudiplo/sdk-core": "4.4.0",
"@eudiplo/sdk-core": "4.5.0",
"@js-soft/docdb-access-loki": "1.4.2",
"@js-soft/docdb-access-mongo": "1.4.2",
"@js-soft/node-logger": "1.2.5",
Expand Down
16 changes: 7 additions & 9 deletions packages/runtime/src/dataViews/DataViewExpander.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1026,15 +1026,13 @@ export class DataViewExpander {
const valueType = attribute.content.value["@type"];
const localAttribute = await this.consumptionController.attributes.getLocalAttribute(CoreId.from(attribute.id));
if (!localAttribute) throw new Error("Attribute not found");
if (
!(
localAttribute instanceof OwnIdentityAttribute ||
localAttribute instanceof PeerIdentityAttribute ||
localAttribute instanceof OwnRelationshipAttribute ||
localAttribute instanceof PeerRelationshipAttribute ||
localAttribute instanceof ThirdPartyRelationshipAttribute
)
) {
if (!(
localAttribute instanceof OwnIdentityAttribute ||
localAttribute instanceof PeerIdentityAttribute ||
localAttribute instanceof OwnRelationshipAttribute ||
localAttribute instanceof PeerRelationshipAttribute ||
localAttribute instanceof ThirdPartyRelationshipAttribute
)) {
throw new Error("Attribute has unknown type");
}

Expand Down
5 changes: 1 addition & 4 deletions packages/runtime/src/modules/decide/ResponseConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ export function isReadAttributeWithNewAttributeAcceptResponseConfig(object: any)
}

export type AcceptResponseConfigDerivation =
| AcceptResponseConfig
| DeleteAttributeAcceptResponseConfig
| ProposeAttributeWithNewAttributeAcceptResponseConfig
| ReadAttributeWithNewAttributeAcceptResponseConfig;
AcceptResponseConfig | DeleteAttributeAcceptResponseConfig | ProposeAttributeWithNewAttributeAcceptResponseConfig | ReadAttributeWithNewAttributeAcceptResponseConfig;

export type ResponseConfig = AcceptResponseConfigDerivation | RejectResponseConfig;
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,13 @@ export class MessageMapper {
}

private static toMessageContent(content: Serializable) {
if (
!(
content instanceof Mail ||
content instanceof Request ||
content instanceof ResponseWrapper ||
content instanceof Notification ||
content instanceof ArbitraryMessageContent
)
) {
if (!(
content instanceof Mail ||
content instanceof Request ||
content instanceof ResponseWrapper ||
content instanceof Notification ||
content instanceof ArbitraryMessageContent
)) {
return ArbitraryMessageContent.from({ value: content }).toJSON();
}

Expand Down
16 changes: 7 additions & 9 deletions packages/runtime/src/useCases/transport/messages/SendMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,13 @@ export class SendMessageUseCase extends UseCase<SendMessageRequest, MessageDTO>

private async validateMessage(content: any, recipients: string[]) {
const transformedContent = Serializable.fromUnknown(content);
if (
!(
transformedContent instanceof Mail ||
transformedContent instanceof ResponseWrapper ||
transformedContent instanceof Notification ||
transformedContent instanceof ArbitraryMessageContent ||
transformedContent instanceof Request
)
) {
if (!(
transformedContent instanceof Mail ||
transformedContent instanceof ResponseWrapper ||
transformedContent instanceof Notification ||
transformedContent instanceof ArbitraryMessageContent ||
transformedContent instanceof Request
)) {
return RuntimeErrors.general.invalidPropertyValue(
"The content of a Message must either be a Mail, Request, ResponseWrapper, Notification or an ArbitraryMessageContent."
);
Expand Down
2 changes: 1 addition & 1 deletion packages/transport/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
}
},
"dependencies": {
"@js-soft/docdb-access-abstractions": "1.3.1",
"@js-soft/docdb-access-abstractions": "1.4.3",
"@js-soft/logging-abstractions": "^1.2.5",
"@js-soft/ts-utils": "^2.3.6",
"@nmshd/core-types": "*",
Expand Down