@nmshd/consumption 2.0.0-beta.23 → 2.0.0-beta.25

package/lib-web/nmshd.consumption.js

@@ -17,10 +17,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-beta.23",
-    build: "75",
-    date: "2022-09-22T07:26:01+00:00",
-    commit: "d236f8080e45bc388cbf4bb982d662e47bfe96e7",
+    version: "2.0.0-beta.25",
+    build: "77",
+    date: "2022-09-28T14:12:31+00:00",
+    commit: "e8e386a6e1fd88031567c4cacd35a1f6905fe686",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -159,22 +159,59 @@ var ConsumptionControllerName;
 
 /***/ }),
 
-/***/ "./dist/consumption/ConsumptionErrors.js":
-/*!***********************************************!*\
-  !*** ./dist/consumption/ConsumptionErrors.js ***!
-  \***********************************************/
+/***/ "./dist/consumption/ConsumptionError.js":
+/*!**********************************************!*\
+  !*** ./dist/consumption/ConsumptionError.js ***!
+  \**********************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ConsumptionError = void 0;
+class ConsumptionError extends Error {
+}
+exports.ConsumptionError = ConsumptionError;
+//# sourceMappingURL=ConsumptionError.js.map
+
+/***/ }),
+
+/***/ "./dist/consumption/ConsumptionIds.js":
+/*!********************************************!*\
+  !*** ./dist/consumption/ConsumptionIds.js ***!
+  \********************************************/
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.ConsumptionErrors = void 0;
+exports.ConsumptionIds = void 0;
+const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+class ConsumptionIds {
+}
+exports.ConsumptionIds = ConsumptionIds;
+ConsumptionIds.draft = new transport_1.CoreIdHelper("LCLDRF");
+ConsumptionIds.setting = new transport_1.CoreIdHelper("LCLSET");
+ConsumptionIds.attribute = new transport_1.CoreIdHelper("ATT");
+ConsumptionIds.request = new transport_1.CoreIdHelper("REQ");
+ConsumptionIds.attributeListener = new transport_1.CoreIdHelper("ATL");
+//# sourceMappingURL=ConsumptionIds.js.map
+
+/***/ }),
+
+/***/ "./dist/consumption/CoreErrors.js":
+/*!****************************************!*\
+  !*** ./dist/consumption/CoreErrors.js ***!
+  \****************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CoreErrors = void 0;
 const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 class Attributes {
-    attributeExists(id) {
-        return new transport_1.CoreError("error.consumption.attributes.attributeExists", `Attribute with id '${id}' already exists. Please use succeed instead.`);
-    }
     predecessorNotFound(id) {
         return new transport_1.CoreError("error.consumption.attributes.predecessorNotFound", `Attribute with id '${id}' does not exist. Please use create instead.`);
     }
@@ -186,14 +223,11 @@ class Requests {
     constructor() {
         this.decideValidation = new Requests._decideValidation();
     }
-    requestExists(id) {
-        return new transport_1.CoreError("error.consumption.requests.requestExists", `Request with id ${id} already exists and can't be created.`);
-    }
     unexpectedErrorDuringRequestItemProcessing(error) {
-        return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Unknown error: '${JSON.stringify(e)'", undefined, undefined, error);
+        return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : `Unknown error: '${JSON.stringify(error)}'`, undefined, undefined, error);
     }
     servalErrorDuringRequestItemProcessing(error) {
-        return new transport_1.CoreError("error.consumption.requests.servalErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Serval error: '${JSON.stringify(e)'", undefined, undefined, error);
+        return new transport_1.CoreError("error.consumption.requests.servalErrorDuringRequestItemProcessing", error instanceof Error ? error.message : `Serval error: '${JSON.stringify(error)}'`, undefined, undefined, error);
     }
     invalidRequestItem(message) {
         return new transport_1.CoreError("error.consumption.requests.invalidRequestItem", message);
@@ -219,50 +253,12 @@ Requests._decideValidation = class {
         return new ts_utils_1.ApplicationError("error.requests.decide.validation.requestItemGroupAnsweredAsRequestItem", "The RequestItemGroup was answered as a RequestItem.");
     }
 };
-class RelationshipInfo {
-    relationshipInfoExists(relationshipId) {
-        return new transport_1.CoreError("error.consumption.relationshipInfos.relationshipInfoExists", `RelationshipInfo for Relationship ${relationshipId} already exists.`);
-    }
-}
-class Onboarding {
-    attributeNotSet(attributeName) {
-        return new transport_1.CoreError("error.consumption.onboarding.attributeNotSet", `No attribute with name ${attributeName} set but was required to be shared.`);
-    }
-    wrongTemplate() {
-        return new transport_1.CoreError("error.consumption.onboarding.wrongTemplate", "The given template is in the wrong format.");
-    }
-}
-class ConsumptionErrors {
-}
-exports.ConsumptionErrors = ConsumptionErrors;
-ConsumptionErrors.attributes = new Attributes();
-ConsumptionErrors.requests = new Requests();
-ConsumptionErrors.relationshipInfo = new RelationshipInfo();
-ConsumptionErrors.onboarding = new Onboarding();
-//# sourceMappingURL=ConsumptionErrors.js.map
-
-/***/ }),
-
-/***/ "./dist/consumption/ConsumptionIds.js":
-/*!********************************************!*\
-  !*** ./dist/consumption/ConsumptionIds.js ***!
-  \********************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.ConsumptionIds = void 0;
-const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
-class ConsumptionIds {
+class CoreErrors {
 }
-exports.ConsumptionIds = ConsumptionIds;
-ConsumptionIds.draft = new transport_1.CoreIdHelper("LCLDRF");
-ConsumptionIds.setting = new transport_1.CoreIdHelper("LCLSET");
-ConsumptionIds.attribute = new transport_1.CoreIdHelper("ATT");
-ConsumptionIds.request = new transport_1.CoreIdHelper("REQ");
-ConsumptionIds.attributeListener = new transport_1.CoreIdHelper("ATL");
-//# sourceMappingURL=ConsumptionIds.js.map
+exports.CoreErrors = CoreErrors;
+CoreErrors.attributes = new Attributes();
+CoreErrors.requests = new Requests();
+//# sourceMappingURL=CoreErrors.js.map
 
 /***/ }),
 
@@ -291,8 +287,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./ConsumptionBaseController */ "./dist/consumption/ConsumptionBaseController.js"), exports);
 __exportStar(__webpack_require__(/*! ./ConsumptionControllerName */ "./dist/consumption/ConsumptionControllerName.js"), exports);
-__exportStar(__webpack_require__(/*! ./ConsumptionErrors */ "./dist/consumption/ConsumptionErrors.js"), exports);
+__exportStar(__webpack_require__(/*! ./ConsumptionError */ "./dist/consumption/ConsumptionError.js"), exports);
 __exportStar(__webpack_require__(/*! ./ConsumptionIds */ "./dist/consumption/ConsumptionIds.js"), exports);
+__exportStar(__webpack_require__(/*! ./CoreErrors */ "./dist/consumption/CoreErrors.js"), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -700,12 +697,9 @@ class AttributesController extends consumption_1.ConsumptionBaseController {
     }
     async createLocalAttributesForNestedAttributeValues(localAttribute) {
         if (!(localAttribute.content instanceof content_1.IdentityAttribute)) {
-            throw new Error("Only Identity Attributes are allowed here");
+            throw new consumption_1.ConsumptionError("Only Identity Attributes are allowed here");
         }
-        const attributeValueAsAny = localAttribute.content.value;
-        const nestedAttributeValues = Object.keys(localAttribute.content.value)
-            .map((k) => attributeValueAsAny[k])
-            .filter((p) => p instanceof content_1.AbstractAttributeValue);
+        const nestedAttributeValues = Object.values(localAttribute.content.value).filter((p) => p instanceof content_1.AbstractAttributeValue);
         for (const propertyValue of nestedAttributeValues) {
             const nestedAttribute = content_1.IdentityAttribute.from({
                 ...localAttribute.content.toJSON(),
@@ -721,10 +715,10 @@ class AttributesController extends consumption_1.ConsumptionBaseController {
         });
         const currentAttribute = LocalAttribute_1.LocalAttribute.from(currentAttributeDoc);
         if (currentAttribute.parentId) {
-            throw consumption_1.ConsumptionErrors.attributes.cannotSucceedAttributesWithAParent(parsedParams.succeeds.toString());
+            throw consumption_1.CoreErrors.attributes.cannotSucceedAttributesWithAParent(parsedParams.succeeds.toString());
         }
         if (!currentAttributeDoc) {
-            throw consumption_1.ConsumptionErrors.attributes.predecessorNotFound(parsedParams.succeeds.toString());
+            throw consumption_1.CoreErrors.attributes.predecessorNotFound(parsedParams.succeeds.toString());
         }
         if (!parsedParams.successorContent.validFrom) {
             parsedParams.successorContent.validFrom = transport_1.CoreDate.utc();
@@ -741,7 +735,7 @@ class AttributesController extends consumption_1.ConsumptionBaseController {
         const parsedParams = CreateSharedLocalAttributeCopyParams_1.CreateSharedLocalAttributeCopyParams.from(params);
         const sourceAttribute = await this.getLocalAttribute(parsedParams.sourceAttributeId);
         if (!sourceAttribute) {
-            throw consumption_1.ConsumptionErrors.attributes.predecessorNotFound(parsedParams.sourceAttributeId.toString());
+            throw consumption_1.CoreErrors.attributes.predecessorNotFound(parsedParams.sourceAttributeId.toString());
         }
         const shareInfo = LocalAttributeShareInfo_1.LocalAttributeShareInfo.from({
             peer: parsedParams.peer,
@@ -1289,6 +1283,7 @@ exports.ThirdPartyRelationshipAttributeQueryTranslator = exports.RelationshipAtt
 const docdb_querytranslator_1 = __webpack_require__(/*! @js-soft/docdb-querytranslator */ "./node_modules/@js-soft/docdb-querytranslator/dist/index.js");
 const luxon_1 = __webpack_require__(/*! luxon */ "./node_modules/luxon/build/node/luxon.js");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class IdentityAttributeQueryTranslator {
     static translate(query) {
         return this.translator.parse({ ...query.toJSON(), attributeType: "IdentityAttribute" });
@@ -1317,7 +1312,7 @@ IdentityAttributeQueryTranslator.translator = new docdb_querytranslator_1.QueryT
             if (!input)
                 return;
             if (!Array.isArray(input)) {
-                throw new Error("Invalid input: 'tags' must be an array");
+                throw new consumption_1.ConsumptionError("Invalid input: 'tags' must be an array");
             }
             const inputAsArray = input;
             query["$or"] = inputAsArray.map((t) => ({
@@ -1583,7 +1578,7 @@ class DraftsController extends consumption_1.ConsumptionBaseController {
     async updateDraft(draft) {
         const oldDraft = await this.drafts.read(draft.id.toString());
         if (!oldDraft) {
-            throw new Error("Draft Not Found");
+            throw new consumption_1.ConsumptionError("Draft Not Found");
         }
         await this.drafts.update(oldDraft, draft);
     }
@@ -1748,11 +1743,12 @@ __exportStar(__webpack_require__(/*! ./settings */ "./dist/modules/settings/inde
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.IncomingRequestReceivedEvent = void 0;
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class IncomingRequestReceivedEvent extends transport_1.TransportDataEvent {
     constructor(eventTargetAddress, data) {
         super(IncomingRequestReceivedEvent.namespace, eventTargetAddress, data);
         if (data.isOwn)
-            throw new Error("Cannot create this event for an outgoing Request");
+            throw new consumption_1.ConsumptionError("Cannot create this event for an outgoing Request");
     }
 }
 exports.IncomingRequestReceivedEvent = IncomingRequestReceivedEvent;
@@ -1772,11 +1768,12 @@ IncomingRequestReceivedEvent.namespace = "consumption.incomingRequestReceived";
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.IncomingRequestStatusChangedEvent = void 0;
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class IncomingRequestStatusChangedEvent extends transport_1.TransportDataEvent {
     constructor(eventTargetAddress, data) {
         super(IncomingRequestStatusChangedEvent.namespace, eventTargetAddress, data);
         if (data.request.isOwn)
-            throw new Error("Cannot create this event for an outgoing Request");
+            throw new consumption_1.ConsumptionError("Cannot create this event for an outgoing Request");
     }
 }
 exports.IncomingRequestStatusChangedEvent = IncomingRequestStatusChangedEvent;
@@ -1796,11 +1793,12 @@ IncomingRequestStatusChangedEvent.namespace = "consumption.incomingRequestStatus
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OutgoingRequestCreatedEvent = void 0;
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class OutgoingRequestCreatedEvent extends transport_1.TransportDataEvent {
     constructor(eventTargetAddress, data) {
         super(OutgoingRequestCreatedEvent.namespace, eventTargetAddress, data);
         if (!data.isOwn)
-            throw new Error("Cannot create this event for an incoming Request");
+            throw new consumption_1.ConsumptionError("Cannot create this event for an incoming Request");
     }
 }
 exports.OutgoingRequestCreatedEvent = OutgoingRequestCreatedEvent;
@@ -1820,11 +1818,12 @@ OutgoingRequestCreatedEvent.namespace = "consumption.outgoingRequestCreated";
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent = void 0;
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent extends transport_1.TransportDataEvent {
     constructor(eventTargetAddress, data) {
         super(OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent.namespace, eventTargetAddress, data);
         if (!data.isOwn)
-            throw new Error("Cannot create this event for an incoming Request");
+            throw new consumption_1.ConsumptionError("Cannot create this event for an incoming Request");
     }
 }
 exports.OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent = OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent;
@@ -1844,11 +1843,12 @@ OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent.namespace
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OutgoingRequestStatusChangedEvent = void 0;
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class OutgoingRequestStatusChangedEvent extends transport_1.TransportDataEvent {
     constructor(eventTargetAddress, data) {
         super(OutgoingRequestStatusChangedEvent.namespace, eventTargetAddress, data);
         if (!data.request.isOwn)
-            throw new Error("Cannot create this event for an incoming Request");
+            throw new consumption_1.ConsumptionError("Cannot create this event for an incoming Request");
     }
 }
 exports.OutgoingRequestStatusChangedEvent = OutgoingRequestStatusChangedEvent;
@@ -1908,10 +1908,10 @@ const DecideRequestItemParameters_1 = __webpack_require__(/*! ./decide/DecideReq
 class DecideRequestParametersValidator {
     validate(params, request) {
         if (!request.id.equals(transport_1.CoreId.from(params.requestId))) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidRequestId());
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.invalidRequestId());
         }
         if (params.items.length !== request.content.items.length) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidNumberOfItems("Number of items in Request and Response do not match"));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.invalidNumberOfItems("Number of items in Request and Response do not match"));
         }
         const validationResults = request.content.items.map((requestItem, index) => this.checkItemOrGroup(requestItem, params.items[index], params.accept));
         return ValidationResult_1.ValidationResult.fromItems(validationResults);
@@ -1924,29 +1924,29 @@ class DecideRequestParametersValidator {
     }
     checkItem(requestItem, response, isParentAccepted) {
         if ((0, DecideRequestItemGroupParameters_1.isDecideRequestItemGroupParametersJSON)(response)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.requestItemAnsweredAsRequestItemGroup());
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.requestItemAnsweredAsRequestItemGroup());
         }
         if (!isParentAccepted && response.accept) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.itemAcceptedButParentNotAccepted("The RequestItem was accepted, but the parent was not accepted."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.itemAcceptedButParentNotAccepted("The RequestItem was accepted, but the parent was not accepted."));
         }
         if (isParentAccepted && requestItem.mustBeAccepted && !response.accept) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.mustBeAcceptedItemNotAccepted("The RequestItem is flagged as 'mustBeAccepted', but it was not accepted."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.mustBeAcceptedItemNotAccepted("The RequestItem is flagged as 'mustBeAccepted', but it was not accepted."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
     checkItemGroup(requestItemGroup, responseItemGroup, isParentAccepted) {
         if ((0, DecideRequestItemParameters_1.isDecideRequestItemParametersJSON)(responseItemGroup)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.requestItemGroupAnsweredAsRequestItem());
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.requestItemGroupAnsweredAsRequestItem());
         }
         if (responseItemGroup.items.length !== requestItemGroup.items.length) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidNumberOfItems("Number of items in RequestItemGroup and ResponseItemGroup do not match"));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.invalidNumberOfItems("Number of items in RequestItemGroup and ResponseItemGroup do not match"));
         }
         const isGroupAccepted = responseItemGroup.items.some((value) => value.accept);
         if (!isParentAccepted && isGroupAccepted) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.itemAcceptedButParentNotAccepted("The RequestItemGroup was accepted, but the parent was not accepted."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.itemAcceptedButParentNotAccepted("The RequestItemGroup was accepted, but the parent was not accepted."));
         }
         if (isParentAccepted && requestItemGroup.mustBeAccepted && !isGroupAccepted) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.mustBeAcceptedItemNotAccepted("The RequestItemGroup is flagged as 'mustBeAccepted', but it was not accepted. Please accept all 'mustBeAccepted' items in this group."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.mustBeAcceptedItemNotAccepted("The RequestItemGroup is flagged as 'mustBeAccepted', but it was not accepted. Please accept all 'mustBeAccepted' items in this group."));
         }
         const validationResults = requestItemGroup.items.map((requestItem, index) => this.checkItem(requestItem, responseItemGroup.items[index], isGroupAccepted));
         return ValidationResult_1.ValidationResult.fromItems(validationResults);
@@ -2016,7 +2016,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
     }
     extractInfoFromMessage(message) {
         if (message.isOwn)
-            throw new Error("Cannot create incoming Request from own Message");
+            throw new consumption_1.ConsumptionError("Cannot create incoming Request from own Message");
         return {
             peer: message.cache.createdBy,
             source: {
@@ -2027,7 +2027,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
     }
     extractInfoFromRelationshipTemplate(template) {
         if (template.isOwn)
-            throw new Error("Cannot create incoming Request from own Relationship Template");
+            throw new consumption_1.ConsumptionError("Cannot create incoming Request from own Relationship Template");
         return {
             peer: template.cache.createdBy,
             source: {
@@ -2126,22 +2126,22 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
         }
         catch (e) {
             if (e instanceof ts_serval_1.ServalError) {
-                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.servalErrorDuringRequestItemProcessing(e));
+                return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.servalErrorDuringRequestItemProcessing(e));
             }
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.unexpectedErrorDuringRequestItemProcessing(e));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.unexpectedErrorDuringRequestItemProcessing(e));
         }
     }
     async accept(params) {
         const canAccept = await this.canAccept(params);
         if (!canAccept.isSuccess()) {
-            throw new Error("Cannot accept the Request with the given parameters. Call 'canAccept' to get more information.");
+            throw new consumption_1.ConsumptionError("Cannot accept the Request with the given parameters. Call 'canAccept' to get more information.");
         }
         return await this.decide({ ...params, accept: true });
     }
     async reject(params) {
         const canReject = await this.canReject(params);
         if (!canReject.isSuccess()) {
-            throw new Error("Cannot reject the Request with the given parameters. Call 'canReject' to get more information.");
+            throw new consumption_1.ConsumptionError("Cannot reject the Request with the given parameters. Call 'canReject' to get more information.");
         }
         return await this.decide({ ...params, accept: false });
     }
@@ -2206,14 +2206,14 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
             if (e instanceof Error) {
                 details = ` Details: ${e.message}`;
             }
-            throw new Error(`An error occurred while processing a '${requestItem.constructor.name}'. You should contact the developer of this RequestItem.${details}}`);
+            throw new consumption_1.ConsumptionError(`An error occurred while processing a '${requestItem.constructor.name}'. You should contact the developer of this RequestItem.${details}}`);
         }
     }
     async complete(params) {
         const parsedParams = CompleteIncomingRequestParameters_1.CompleteIncomingRequestParameters.from(params);
         const request = await this.getOrThrow(parsedParams.requestId);
         if (request.isOwn) {
-            throw new Error("Cannot decide own Request");
+            throw new consumption_1.ConsumptionError("Cannot decide own Request");
         }
         this.assertRequestStatus(request, LocalRequestStatus_1.LocalRequestStatus.Decided);
         const requestIsRejected = request.response.content.result === content_1.ResponseResult.Rejected;
@@ -2225,7 +2225,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
             });
         }
         else if (!requestIsRejected || !requestIsFromTemplate) {
-            throw new Error("A Request can only be completed without a responseSource if the Request is rejected and the Request is from a Relationship Template");
+            throw new consumption_1.ConsumptionError("A Request can only be completed without a responseSource if the Request is rejected and the Request is from a Relationship Template");
         }
         request.changeStatus(LocalRequestStatus_1.LocalRequestStatus.Completed);
         await this.update(request);
@@ -2267,7 +2267,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
     }
     assertRequestStatus(request, ...status) {
         if (!status.includes(request.status)) {
-            throw new Error(`Local Request has to be in status '${status.join("/")}'.`);
+            throw new consumption_1.ConsumptionError(`Local Request has to be in status '${status.join("/")}'.`);
         }
     }
     async updateRequestExpiry(request) {
@@ -2741,12 +2741,13 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 /*!******************************************************************************!*\
   !*** ./dist/modules/requests/itemProcessors/RequestItemProcessorRegistry.js ***!
   \******************************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RequestItemProcessorRegistry = void 0;
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class RequestItemProcessorRegistry {
     constructor(consumptionController, processors = new Map()) {
         this.consumptionController = consumptionController;
@@ -2754,7 +2755,7 @@ class RequestItemProcessorRegistry {
     }
     registerProcessor(itemConstructor, processorConstructor) {
         if (this.processors.has(itemConstructor)) {
-            throw new Error(`There is already a processor registered for '${itemConstructor.name}''. Use 'replaceProcessorForType' if you want to replace it.`);
+            throw new consumption_1.ConsumptionError(`There is already a processor registered for '${itemConstructor.name}''. Use 'replaceProcessorForType' if you want to replace it.`);
         }
         this.processors.set(itemConstructor, processorConstructor);
     }
@@ -2764,7 +2765,7 @@ class RequestItemProcessorRegistry {
     getProcessorForItem(item) {
         const constructor = this.processors.get(item.constructor);
         if (!constructor) {
-            throw new Error(`There was no processor registered for '${item.constructor.name}'.`);
+            throw new consumption_1.ConsumptionError(`There was no processor registered for '${item.constructor.name}'.`);
         }
         return new constructor(this.consumptionController);
     }
@@ -2876,17 +2877,17 @@ class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.
         const ownerIsEmptyString = requestItem.attribute.owner.toString() === "";
         if (requestItem.attribute instanceof content_1.IdentityAttribute) {
             if (senderIsAttributeOwner) {
-                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot create own Attributes with a CreateAttributeRequestItem. Use a ShareAttributeRequestItem instead."));
+                return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot create own Attributes with a CreateAttributeRequestItem. Use a ShareAttributeRequestItem instead."));
             }
             if (recipientIsAttributeOwner || ownerIsEmptyString || recipient === undefined) {
                 return ValidationResult_1.ValidationResult.success();
             }
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be the recipient's address or an empty string. The latter will default to the recipient's address."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be the recipient's address or an empty string. The latter will default to the recipient's address."));
         }
         if (recipientIsAttributeOwner || senderIsAttributeOwner || ownerIsEmptyString || recipient === undefined) {
             return ValidationResult_1.ValidationResult.success();
         }
-        return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given 'attribute' can only be the sender's address, the recipient's address or an empty string. The latter will default to the recipient's address."));
+        return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The owner of the given 'attribute' can only be the sender's address, the recipient's address or an empty string. The latter will default to the recipient's address."));
     }
     async accept(requestItem, _params, requestInfo) {
         if (requestItem.attribute.owner.toString() === "") {
@@ -3027,7 +3028,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
     }
     validateAttribute(attribute) {
         if (attribute.owner.toString() !== "") {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be an empty string. This is because you can only propose Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be an empty string. This is because you can only propose Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
@@ -3037,7 +3038,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
             return commonQueryValidationResult;
         }
         if (requestItem.query instanceof content_1.RelationshipAttributeQuery && requestItem.query.owner.toString() !== "") {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `query` can only be an empty string. This is because you can only propose Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The owner of the given `query` can only be an empty string. This is because you can only propose Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
@@ -3052,7 +3053,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
             attribute = localAttribute.content;
         }
         if (!attribute.owner.equals(this.currentIdentityAddress)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The given Attribute belongs to someone else. You can only share own Attributes."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The given Attribute belongs to someone else. You can only share own Attributes."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
@@ -3136,6 +3137,7 @@ const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-s
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
+const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist/consumption/index.js");
 let AcceptReadAttributeRequestItemParameters = AcceptReadAttributeRequestItemParameters_1 = class AcceptReadAttributeRequestItemParameters extends ts_serval_1.Serializable {
     isWithExistingAttribute() {
         return this.existingAttributeId !== undefined;
@@ -3147,8 +3149,9 @@ let AcceptReadAttributeRequestItemParameters = AcceptReadAttributeRequestItemPar
         return this.fromAny(value);
     }
     static postFrom(value) {
-        if (!(value instanceof AcceptReadAttributeRequestItemParameters_1))
-            throw new Error("this should never happen");
+        if (!(value instanceof AcceptReadAttributeRequestItemParameters_1)) {
+            throw new consumption_1.ConsumptionError("this should never happen");
+        }
         if (value.existingAttributeId && value.newAttribute) {
             throw new ts_serval_1.ValidationError(AcceptReadAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.newAttribute), `You cannot specify both ${(0, ts_simple_nameof_1.nameof)((x) => x.newAttribute)} and ${(0, ts_simple_nameof_1.nameof)((x) => x.existingAttributeId)}.`);
         }
@@ -3214,7 +3217,7 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
             }
             const ownerIsCurrentIdentity = this.accountController.identity.isMe(foundAttribute.content.owner);
             if (!ownerIsCurrentIdentity) {
-                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The given Attribute belongs to someone else. You can only share own Attributes."));
+                return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The given Attribute belongs to someone else. You can only share own Attributes."));
             }
         }
         return ValidationResult_1.ValidationResult.success();
@@ -3359,13 +3362,13 @@ class ShareAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.G
         const ownerIsEmpty = requestItem.attribute.owner.toString() === "";
         const ownerIsCurrentIdentity = requestItem.attribute.owner.equals(this.currentIdentityAddress);
         if (!ownerIsEmpty && !ownerIsCurrentIdentity) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be an empty string. This is because you can only send Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be an empty string. This is because you can only send Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
     canCreateWithRelationshipAttribute(attribute) {
         if (attribute.confidentiality === content_1.RelationshipAttributeConfidentiality.Private) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The confidentiality of the given `attribute` is private. Therefore you are not allowed to share it."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The confidentiality of the given `attribute` is private. Therefore you are not allowed to share it."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
@@ -3415,13 +3418,13 @@ const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dis
 function validateQuery(query, sender, recipient) {
     if (query instanceof content_1.ThirdPartyRelationshipAttributeQuery) {
         if (query.thirdParty.equals(sender)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query an Attribute with the own address as third party."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query an Attribute with the own address as third party."));
         }
         if (query.thirdParty.equals(recipient)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query an Attribute with the recipient's address as third party."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query an Attribute with the recipient's address as third party."));
         }
         if (query.owner.equals(sender)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query own Attributes from a third party."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query own Attributes from a third party."));
         }
     }
     return ValidationResult_1.ValidationResult.success();
@@ -3453,6 +3456,7 @@ exports.LocalRequest = exports.LocalRequestSource = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 const LocalRequestStatus_1 = __webpack_require__(/*! ./LocalRequestStatus */ "./dist/modules/requests/local/LocalRequestStatus.js");
 const LocalRequestStatusLogEntry_1 = __webpack_require__(/*! ./LocalRequestStatusLogEntry */ "./dist/modules/requests/local/LocalRequestStatusLogEntry.js");
 const LocalResponse_1 = __webpack_require__(/*! ./LocalResponse */ "./dist/modules/requests/local/LocalResponse.js");
@@ -3478,7 +3482,7 @@ exports.LocalRequestSource = LocalRequestSource;
 let LocalRequest = class LocalRequest extends transport_1.CoreSynchronizable {
     changeStatus(newStatus) {
         if (this.status === newStatus)
-            throw new Error("cannot change status to the same status");
+            throw new consumption_1.ConsumptionError("cannot change status to the same status");
         const logEntry = LocalRequestStatusLogEntry_1.LocalRequestStatusLogEntry.from({
             createdAt: transport_1.CoreDate.utc(),
             oldStatus: this.status,
@@ -3489,7 +3493,7 @@ let LocalRequest = class LocalRequest extends transport_1.CoreSynchronizable {
     }
     sent(source) {
         if (this.status !== LocalRequestStatus_1.LocalRequestStatus.Draft) {
-            throw new Error("Local Request has to be in status 'Draft'.");
+            throw new consumption_1.ConsumptionError("Local Request has to be in status 'Draft'.");
         }
         this.source = source;
         this.changeStatus(LocalRequestStatus_1.LocalRequestStatus.Open);
@@ -3810,13 +3814,13 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
         const peer = parsedParams.creationChange.request.createdBy;
         const requestBody = parsedParams.creationChange.request.content;
         if (!(requestBody instanceof content_1.RelationshipCreationChangeRequestBody)) {
-            throw new Error("the body of the request is not supported as is is not type of RelationshipCreationChangeRequestBody");
+            throw new consumption_1.ConsumptionError("the body of the request is not supported as is is not type of RelationshipCreationChangeRequestBody");
         }
         const receivedResponse = requestBody.response;
         const id = receivedResponse.requestId;
         const templateContent = parsedParams.template.cache.content;
         if (!(templateContent instanceof content_1.RelationshipTemplateBody)) {
-            throw new Error("the body of the template is not supported as is is not type of RelationshipTemplateBody");
+            throw new consumption_1.ConsumptionError("the body of the template is not supported as is is not type of RelationshipTemplateBody");
         }
         // TODO: is this the correct request (=> could be RelationshipTemplateBody#existingRelationshipRequest)
         await this._create(id, templateContent.onNewRelationship, peer);
@@ -3849,17 +3853,17 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
     getSourceType(sourceObject) {
         if (sourceObject instanceof transport_1.Message) {
             if (!sourceObject.isOwn) {
-                throw new Error("Cannot create outgoing Request from a peer Message");
+                throw new consumption_1.ConsumptionError("Cannot create outgoing Request from a peer Message");
             }
             return "Message";
         }
         else if (sourceObject instanceof transport_1.RelationshipTemplate) {
             if (!sourceObject.isOwn) {
-                throw new Error("Cannot create outgoing Request from a peer Relationship Template");
+                throw new consumption_1.ConsumptionError("Cannot create outgoing Request from a peer Relationship Template");
             }
             return "RelationshipTemplate";
         }
-        throw new Error("The given sourceObject is not of a valid type. Valid types are 'Message' and 'RelationshipTemplate'.");
+        throw new consumption_1.ConsumptionError("The given sourceObject is not of a valid type. Valid types are 'Message' and 'RelationshipTemplate'.");
     }
     async complete(params) {
         const parsedParams = CompleteOutgoingRequestParameters_1.CompleteOugoingRequestParameters.from(params);
@@ -3878,7 +3882,7 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
             ? responseSourceObject.cache.createdAt
             : responseSourceObject.request.createdAt;
         if (request.status === LocalRequestStatus_1.LocalRequestStatus.Expired && request.isExpired(responseSourceObjectCreationDate)) {
-            throw new Error("Cannot complete an expired request with a response that was created before the expiration date");
+            throw new consumption_1.ConsumptionError("Cannot complete an expired request with a response that was created before the expiration date");
         }
         const canComplete = await this.canComplete(request, receivedResponse);
         if (canComplete.isError()) {
@@ -3893,7 +3897,7 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
             responseSource = "RelationshipChange";
         }
         else {
-            throw new Error("Invalid responseSourceObject");
+            throw new consumption_1.ConsumptionError("Invalid responseSourceObject");
         }
         const localResponse = LocalResponse_1.LocalResponse.from({
             content: receivedResponse,
@@ -3984,7 +3988,7 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
     }
     assertRequestStatus(request, ...status) {
         if (!status.includes(request.status)) {
-            throw new Error(`Local Request has to be in status '${status.join("/")}'.`);
+            throw new consumption_1.ConsumptionError(`Local Request has to be in status '${status.join("/")}'.`);
         }
     }
     async updateRequestExpiry(request) {
@@ -4231,12 +4235,22 @@ exports.SentOutgoingRequestParameters = SentOutgoingRequestParameters;
 /*!*****************************************************!*\
   !*** ./dist/modules/settings/SettingsController.js ***!
   \*****************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
 
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SettingsController = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const consumption_1 = __webpack_require__(/*! ../../consumption */ "./dist/consumption/index.js");
 const Setting_1 = __webpack_require__(/*! ./local/Setting */ "./dist/modules/settings/local/Setting.js");
@@ -4273,15 +4287,20 @@ class SettingsController extends consumption_1.ConsumptionBaseController {
     }
     async updateSetting(setting) {
         const oldSetting = await this.settings.read(setting.id.toString());
-        if (!oldSetting) {
-            throw transport_1.TransportErrors.general.recordNotFound(Setting_1.Setting, setting.id.toString()).logWith(this._log);
-        }
+        if (!oldSetting)
+            throw transport_1.TransportErrors.general.recordNotFound(Setting_1.Setting, setting.id.toString());
         await this.settings.update(oldSetting, setting);
     }
     async deleteSetting(setting) {
         await this.settings.delete(setting);
     }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Setting_1.Setting]),
+    __metadata("design:returntype", Promise)
+], SettingsController.prototype, "updateSetting", null);
 exports.SettingsController = SettingsController;
 //# sourceMappingURL=SettingsController.js.map
 
@@ -4986,29 +5005,50 @@ __exportStar(__webpack_require__(/*! ./sleep */ "./node_modules/@js-soft/ts-util
 /*!*************************************************************!*\
   !*** ./node_modules/@js-soft/ts-utils/dist/logDecorator.js ***!
   \*************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
 
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.log = void 0;
-/* eslint-disable no-console */
-function log(_target, propertyName, propertyDesciptor) {
-    const method = propertyDesciptor.value;
-    propertyDesciptor.value = function (...args) {
-        const params = args.map((a) => JSON.stringify(a)).join();
-        try {
-            const result = method.apply(this, args);
-            const r = JSON.stringify(result);
-            console.log(`Call: ${propertyName}(${params}) => ${r}`);
-            return result;
-        }
-        catch (error) {
-            console.log(error);
-            throw error;
-        }
+const json_stringify_safe_1 = __importDefault(__webpack_require__(/*! json-stringify-safe */ "./node_modules/json-stringify-safe/stringify.js"));
+function log(params) {
+    return function (_target, propertyName, propertyDescriptorDoNotChangeMyNamePlease) {
+        const method = propertyDescriptorDoNotChangeMyNamePlease.value;
+        propertyDescriptorDoNotChangeMyNamePlease.value = function (...args) {
+            const thisT = this;
+            try {
+                if (params?.logParams) {
+                    thisT.log.trace(`Calling ${propertyName}(${args.map((a) => (0, json_stringify_safe_1.default)(a)).join(", ")})`);
+                }
+                else {
+                    thisT.log.trace(`Calling ${propertyName}`);
+                }
+                const returnValue = method.apply(this, args);
+                if (params?.logReturnValue) {
+                    thisT.log.trace(`Returning from ${propertyName} with: ${(0, json_stringify_safe_1.default)(returnValue)}`);
+                }
+                else {
+                    thisT.log.trace(`Returning from ${propertyName}`);
+                }
+                return returnValue;
+            }
+            catch (error) {
+                if (error instanceof Error && error.stack) {
+                    error.stack = error.stack
+                        .split("\n")
+                        .filter((s) => !s.includes(".propertyDescriptorDoNotChangeMyNamePlease.value"))
+                        .join("\n");
+                }
+                thisT.log.error(`Error in ${propertyName}:`, error);
+                throw error;
+            }
+        };
+        return propertyDescriptorDoNotChangeMyNamePlease;
     };
-    return propertyDesciptor;
 }
 exports.log = log;
 //# sourceMappingURL=logDecorator.js.map
@@ -6829,6 +6869,43 @@ var __WEBPACK_AMD_DEFINE_RESULT__;/*!
 }();
 
 
+/***/ }),
+
+/***/ "./node_modules/json-stringify-safe/stringify.js":
+/*!*******************************************************!*\
+  !*** ./node_modules/json-stringify-safe/stringify.js ***!
+  \*******************************************************/
+/***/ ((module, exports) => {
+
+exports = module.exports = stringify
+exports.getSerialize = serializer
+
+function stringify(obj, replacer, spaces, cycleReplacer) {
+  return JSON.stringify(obj, serializer(replacer, cycleReplacer), spaces)
+}
+
+function serializer(replacer, cycleReplacer) {
+  var stack = [], keys = []
+
+  if (cycleReplacer == null) cycleReplacer = function(key, value) {
+    if (stack[0] === value) return "[Circular ~]"
+    return "[Circular ~." + keys.slice(0, stack.indexOf(value)).join(".") + "]"
+  }
+
+  return function(key, value) {
+    if (stack.length > 0) {
+      var thisPos = stack.indexOf(this)
+      ~thisPos ? stack.splice(thisPos + 1) : stack.push(this)
+      ~thisPos ? keys.splice(thisPos, Infinity, key) : keys.push(key)
+      if (~stack.indexOf(value)) value = cycleReplacer.call(this, key, value)
+    }
+    else stack.push(value)
+
+    return replacer == null ? value : replacer.call(this, key, value)
+  }
+}
+
+
 /***/ }),
 
 /***/ "./node_modules/luxon/build/node/luxon.js":
@@ -11192,7 +11269,7 @@ function dayDiff(earlier, later) {
 }
 
 function highOrderDiffs(cursor, later, units) {
-  const differs = [["years", (a, b) => b.year - a.year], ["quarters", (a, b) => b.quarter - a.quarter], ["months", (a, b) => b.month - a.month + (b.year - a.year) * 12], ["weeks", (a, b) => {
+  const differs = [["years", (a, b) => b.year - a.year], ["quarters", (a, b) => b.quarter - a.quarter + (b.year - a.year) * 4], ["months", (a, b) => b.month - a.month + (b.year - a.year) * 12], ["weeks", (a, b) => {
     const days = dayDiff(a, b);
     return (days - days % 7) / 7;
   }], ["days", dayDiff]];
@@ -14381,7 +14458,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-const VERSION = "3.0.3";
+const VERSION = "3.0.4";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;