@nmshd/consumption 2.0.0-alpha.20 → 2.0.0-alpha.21

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-alpha.20",
-    build: "38",
-    date: "2022-06-03T14:09:16+00:00",
-    commit: "217c674042d281ad67bd13607f6307b9ecebfee9",
+    version: "2.0.0-alpha.21",
+    build: "40",
+    date: "2022-06-27T07:10:09+00:00",
+    commit: "26615e613c315ca69ebb76ab528cc8cabec673a9",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.0.1","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -78,6 +78,8 @@ exports.ConsumptionBaseController = ConsumptionBaseController;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ConsumptionController = void 0;
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
+const modules_1 = __webpack_require__(/*! ../modules */ "./dist/modules/index.js");
 const ConsumptionAttributesController_1 = __webpack_require__(/*! ../modules/attributes/ConsumptionAttributesController */ "./dist/modules/attributes/ConsumptionAttributesController.js");
 const DraftsController_1 = __webpack_require__(/*! ../modules/drafts/DraftsController */ "./dist/modules/drafts/DraftsController.js");
 const IncomingRequestsController_1 = __webpack_require__(/*! ../modules/requests/incoming/IncomingRequestsController */ "./dist/modules/requests/incoming/IncomingRequestsController.js");
@@ -104,15 +106,26 @@ class ConsumptionController {
     get settings() {
         return this._settings;
     }
-    async init(requestItemProcessors = []) {
+    async init(requestItemProcessorOverrides = new Map()) {
         this._attributes = await new ConsumptionAttributesController_1.ConsumptionAttributesController(this).init();
         this._drafts = await new DraftsController_1.DraftsController(this).init();
-        const processorRegistry = new RequestItemProcessorRegistry_1.RequestItemProcessorRegistry(this, requestItemProcessors);
+        const processorRegistry = new RequestItemProcessorRegistry_1.RequestItemProcessorRegistry(this, this.getDefaultProcessors());
+        for (const [itemConstructor, processorConstructor] of requestItemProcessorOverrides) {
+            processorRegistry.registerOrReplaceProcessor(itemConstructor, processorConstructor);
+        }
         this._outgoingRequests = await new OutgoingRequestsController_1.OutgoingRequestsController(await this.accountController.getSynchronizedCollection("Requests"), processorRegistry, this).init();
         this._incomingRequests = await new IncomingRequestsController_1.IncomingRequestsController(await this.accountController.getSynchronizedCollection("Requests"), processorRegistry, this).init();
         this._settings = await new SettingsController_1.SettingsController(this).init();
         return this;
     }
+    getDefaultProcessors() {
+        return new Map([
+            [content_1.CreateAttributeRequestItem, modules_1.CreateAttributeRequestItemProcessor],
+            [content_1.ReadAttributeRequestItem, modules_1.ReadAttributeRequestItemProcessor],
+            [content_1.ProposeAttributeRequestItem, modules_1.ProposeAttributeRequestItemProcessor],
+            [content_1.ShareAttributeRequestItem, modules_1.ShareAttributeRequestItemProcessor]
+        ]);
+    }
 }
 exports.ConsumptionController = ConsumptionController;
 //# sourceMappingURL=ConsumptionController.js.map
@@ -171,11 +184,8 @@ class Requests {
     unexpectedErrorDuringRequestItemProcessing(error) {
         return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Unknown error: '${JSON.stringify(e)'");
     }
-    cannotSendCreateAttributeRequestItemsWithIdentityAttributes() {
-        return new transport_1.CoreError("error.consumption.requests.cannotSendCreateAttributeRequestItemsWithIdentityAttributes", "You cannot send a CreateAttributeRequestItem with an Identity Attribute. Consider using a ProposeAttributeRequestItem instead.");
-    }
-    canOnlyShareOwnAttributes() {
-        return new transport_1.CoreError("error.consumption.requests.canOnlyShareOwnAttributes", "The given Attribute belongs to someone else. You can only share own Attributes.");
+    invalidRequestItem(message) {
+        return new transport_1.CoreError("error.consumption.requests.invalidRequestItem", message);
     }
 }
 class RelationshipInfo {
@@ -299,12 +309,11 @@ exports.ConsumptionAttributesController = void 0;
 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");
-const CreateRelationshipAttributeParams_1 = __webpack_require__(/*! ./CreateRelationshipAttributeParams */ "./dist/modules/attributes/CreateRelationshipAttributeParams.js");
-const CreateSharedConsumptionAttributeCopyParams_1 = __webpack_require__(/*! ./CreateSharedConsumptionAttributeCopyParams */ "./dist/modules/attributes/CreateSharedConsumptionAttributeCopyParams.js");
 const ConsumptionAttribute_1 = __webpack_require__(/*! ./local/ConsumptionAttribute */ "./dist/modules/attributes/local/ConsumptionAttribute.js");
 const ConsumptionAttributeShareInfo_1 = __webpack_require__(/*! ./local/ConsumptionAttributeShareInfo */ "./dist/modules/attributes/local/ConsumptionAttributeShareInfo.js");
+const CreateSharedConsumptionAttributeCopyParams_1 = __webpack_require__(/*! ./local/CreateSharedConsumptionAttributeCopyParams */ "./dist/modules/attributes/local/CreateSharedConsumptionAttributeCopyParams.js");
 const QueryTranslator_1 = __webpack_require__(/*! ./local/QueryTranslator */ "./dist/modules/attributes/local/QueryTranslator.js");
-const SucceedConsumptionAttributeParams_1 = __webpack_require__(/*! ./SucceedConsumptionAttributeParams */ "./dist/modules/attributes/SucceedConsumptionAttributeParams.js");
+const SucceedConsumptionAttributeParams_1 = __webpack_require__(/*! ./local/SucceedConsumptionAttributeParams */ "./dist/modules/attributes/local/SucceedConsumptionAttributeParams.js");
 class ConsumptionAttributesController extends consumption_1.ConsumptionBaseController {
     constructor(parent) {
         super(consumption_1.ConsumptionControllerName.ConsumptionAttributesController, parent);
@@ -416,16 +425,6 @@ class ConsumptionAttributesController extends consumption_1.ConsumptionBaseContr
         await this.attributes.create(successor);
         return successor;
     }
-    async createRelationshipAttribute(params) {
-        const parsedParams = CreateRelationshipAttributeParams_1.CreateRelationshipAttributeParams.from(params);
-        const shareInfo = ConsumptionAttributeShareInfo_1.ConsumptionAttributeShareInfo.from({
-            peer: parsedParams.peer,
-            requestReference: parsedParams.requestReference
-        });
-        const sharedConsumptionAttribute = await ConsumptionAttribute_1.ConsumptionAttribute.fromAttribute(params.content, undefined, shareInfo);
-        await this.attributes.create(sharedConsumptionAttribute);
-        return sharedConsumptionAttribute;
-    }
     async createSharedConsumptionAttributeCopy(params) {
         const parsedParams = CreateSharedConsumptionAttributeCopyParams_1.CreateSharedConsumptionAttributeCopyParams.from(params);
         const sourceAttribute = await this.getConsumptionAttribute(parsedParams.attributeId);
@@ -447,7 +446,7 @@ class ConsumptionAttributesController extends consumption_1.ConsumptionBaseContr
             requestReference: params.requestReference
         });
         const peerConsumptionAttribute = ConsumptionAttribute_1.ConsumptionAttribute.from({
-            id: params.id,
+            id: params.id ?? (await consumption_1.ConsumptionIds.attribute.generate()),
             content: params.content,
             shareInfo: shareInfo,
             createdAt: transport_1.CoreDate.utc()
@@ -482,46 +481,10 @@ exports.ConsumptionAttributesController = ConsumptionAttributesController;
 
 /***/ }),
 
-/***/ "./dist/modules/attributes/CreateConsumptionAttributeParams.js":
-/*!*********************************************************************!*\
-  !*** ./dist/modules/attributes/CreateConsumptionAttributeParams.js ***!
-  \*********************************************************************/
-/***/ (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.CreateConsumptionAttributeParams = 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");
-class CreateConsumptionAttributeParams extends ts_serval_1.Serializable {
-    static from(value) {
-        return this.fromAny(value);
-    }
-}
-__decorate([
-    (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttribute, content_1.RelationshipAttribute] }),
-    (0, ts_serval_1.validate)(),
-    __metadata("design:type", Object)
-], CreateConsumptionAttributeParams.prototype, "content", void 0);
-exports.CreateConsumptionAttributeParams = CreateConsumptionAttributeParams;
-//# sourceMappingURL=CreateConsumptionAttributeParams.js.map
-
-/***/ }),
-
-/***/ "./dist/modules/attributes/CreatePeerConsumptionAttributeParams.js":
-/*!*************************************************************************!*\
-  !*** ./dist/modules/attributes/CreatePeerConsumptionAttributeParams.js ***!
-  \*************************************************************************/
+/***/ "./dist/modules/attributes/local/ConsumptionAttribute.js":
+/*!***************************************************************!*\
+  !*** ./dist/modules/attributes/local/ConsumptionAttribute.js ***!
+  \***************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -536,94 +499,75 @@ 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.CreatePeerConsumptionAttributeParams = void 0;
+exports.ConsumptionAttribute = 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");
-class CreatePeerConsumptionAttributeParams extends ts_serval_1.Serializable {
+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");
+const ConsumptionAttributeShareInfo_1 = __webpack_require__(/*! ./ConsumptionAttributeShareInfo */ "./dist/modules/attributes/local/ConsumptionAttributeShareInfo.js");
+let ConsumptionAttribute = class ConsumptionAttribute extends transport_1.CoreSynchronizable {
+    constructor() {
+        super(...arguments);
+        this.technicalProperties = [
+            "@type",
+            "@context",
+            (0, ts_simple_nameof_1.nameof)((r) => r.createdAt),
+            (0, ts_simple_nameof_1.nameof)((r) => r.succeeds),
+            (0, ts_simple_nameof_1.nameof)((r) => r.createdAt)
+        ];
+        this.userdataProperties = [(0, ts_simple_nameof_1.nameof)((r) => r.content)];
+    }
     static from(value) {
         return this.fromAny(value);
     }
-}
+    static async fromAttribute(attribute, succeeds, shareInfo) {
+        return this.from({
+            content: attribute,
+            id: await consumption_1.ConsumptionIds.attribute.generate(),
+            createdAt: transport_1.CoreDate.utc(),
+            succeeds: succeeds,
+            shareInfo: shareInfo
+        });
+    }
+};
 __decorate([
-    (0, ts_serval_1.serialize)(),
     (0, ts_serval_1.validate)(),
-    __metadata("design:type", transport_1.CoreId)
-], CreatePeerConsumptionAttributeParams.prototype, "id", void 0);
-__decorate([
     (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttribute, content_1.RelationshipAttribute] }),
-    (0, ts_serval_1.validate)(),
     __metadata("design:type", Object)
-], CreatePeerConsumptionAttributeParams.prototype, "content", void 0);
+], ConsumptionAttribute.prototype, "content", void 0);
 __decorate([
-    (0, ts_serval_1.serialize)(),
     (0, ts_serval_1.validate)(),
-    __metadata("design:type", transport_1.CoreId)
-], CreatePeerConsumptionAttributeParams.prototype, "requestReference", void 0);
-__decorate([
     (0, ts_serval_1.serialize)(),
-    (0, ts_serval_1.validate)(),
-    __metadata("design:type", transport_1.CoreAddress)
-], CreatePeerConsumptionAttributeParams.prototype, "peer", void 0);
-exports.CreatePeerConsumptionAttributeParams = CreatePeerConsumptionAttributeParams;
-//# sourceMappingURL=CreatePeerConsumptionAttributeParams.js.map
-
-/***/ }),
-
-/***/ "./dist/modules/attributes/CreateRelationshipAttributeParams.js":
-/*!**********************************************************************!*\
-  !*** ./dist/modules/attributes/CreateRelationshipAttributeParams.js ***!
-  \**********************************************************************/
-/***/ (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.CreateRelationshipAttributeParams = 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");
-let CreateRelationshipAttributeParams = class CreateRelationshipAttributeParams extends ts_serval_1.Serializable {
-    static from(value) {
-        return this.fromAny(value);
-    }
-};
+    __metadata("design:type", transport_1.CoreDate)
+], ConsumptionAttribute.prototype, "createdAt", void 0);
 __decorate([
+    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
-    (0, ts_serval_1.validate)(),
-    __metadata("design:type", content_1.RelationshipAttribute)
-], CreateRelationshipAttributeParams.prototype, "content", void 0);
+    __metadata("design:type", transport_1.CoreId)
+], ConsumptionAttribute.prototype, "succeeds", void 0);
 __decorate([
+    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
-    (0, ts_serval_1.validate)(),
-    __metadata("design:type", transport_1.CoreAddress)
-], CreateRelationshipAttributeParams.prototype, "peer", void 0);
+    __metadata("design:type", transport_1.CoreId)
+], ConsumptionAttribute.prototype, "succeededBy", void 0);
 __decorate([
+    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
-    (0, ts_serval_1.validate)(),
-    __metadata("design:type", transport_1.CoreId)
-], CreateRelationshipAttributeParams.prototype, "requestReference", void 0);
-CreateRelationshipAttributeParams = __decorate([
-    (0, ts_serval_1.type)("CreateRelationshipAttributeParams")
-], CreateRelationshipAttributeParams);
-exports.CreateRelationshipAttributeParams = CreateRelationshipAttributeParams;
-//# sourceMappingURL=CreateRelationshipAttributeParams.js.map
+    __metadata("design:type", ConsumptionAttributeShareInfo_1.ConsumptionAttributeShareInfo)
+], ConsumptionAttribute.prototype, "shareInfo", void 0);
+ConsumptionAttribute = __decorate([
+    (0, ts_serval_1.type)("ConsumptionAttribute")
+], ConsumptionAttribute);
+exports.ConsumptionAttribute = ConsumptionAttribute;
+//# sourceMappingURL=ConsumptionAttribute.js.map
 
 /***/ }),
 
-/***/ "./dist/modules/attributes/CreateSharedConsumptionAttributeCopyParams.js":
-/*!*******************************************************************************!*\
-  !*** ./dist/modules/attributes/CreateSharedConsumptionAttributeCopyParams.js ***!
-  \*******************************************************************************/
+/***/ "./dist/modules/attributes/local/ConsumptionAttributeShareInfo.js":
+/*!************************************************************************!*\
+  !*** ./dist/modules/attributes/local/ConsumptionAttributeShareInfo.js ***!
+  \************************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -638,38 +582,38 @@ 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.CreateSharedConsumptionAttributeCopyParams = void 0;
+exports.ConsumptionAttributeShareInfo = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
-class CreateSharedConsumptionAttributeCopyParams extends ts_serval_1.Serializable {
+class ConsumptionAttributeShareInfo extends transport_1.CoreSerializable {
     static from(value) {
-        return this.fromAny(value);
+        return super.fromAny(value);
     }
 }
 __decorate([
-    (0, ts_serval_1.serialize)(),
     (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
     __metadata("design:type", transport_1.CoreId)
-], CreateSharedConsumptionAttributeCopyParams.prototype, "attributeId", void 0);
+], ConsumptionAttributeShareInfo.prototype, "requestReference", void 0);
 __decorate([
-    (0, ts_serval_1.serialize)(),
     (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
     __metadata("design:type", transport_1.CoreAddress)
-], CreateSharedConsumptionAttributeCopyParams.prototype, "peer", void 0);
+], ConsumptionAttributeShareInfo.prototype, "peer", void 0);
 __decorate([
+    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
-    (0, ts_serval_1.validate)(),
     __metadata("design:type", transport_1.CoreId)
-], CreateSharedConsumptionAttributeCopyParams.prototype, "requestReference", void 0);
-exports.CreateSharedConsumptionAttributeCopyParams = CreateSharedConsumptionAttributeCopyParams;
-//# sourceMappingURL=CreateSharedConsumptionAttributeCopyParams.js.map
+], ConsumptionAttributeShareInfo.prototype, "sourceAttribute", void 0);
+exports.ConsumptionAttributeShareInfo = ConsumptionAttributeShareInfo;
+//# sourceMappingURL=ConsumptionAttributeShareInfo.js.map
 
 /***/ }),
 
-/***/ "./dist/modules/attributes/GetIdentityAttributesParams.js":
-/*!****************************************************************!*\
-  !*** ./dist/modules/attributes/GetIdentityAttributesParams.js ***!
-  \****************************************************************/
+/***/ "./dist/modules/attributes/local/CreateConsumptionAttributeParams.js":
+/*!***************************************************************************!*\
+  !*** ./dist/modules/attributes/local/CreateConsumptionAttributeParams.js ***!
+  \***************************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -684,28 +628,28 @@ 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.GetIdentityAttributesParams = void 0;
+exports.CreateConsumptionAttributeParams = 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");
-class GetIdentityAttributesParams extends ts_serval_1.Serializable {
+class CreateConsumptionAttributeParams extends ts_serval_1.Serializable {
     static from(value) {
         return this.fromAny(value);
     }
 }
 __decorate([
-    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttribute, content_1.RelationshipAttribute] }),
     (0, ts_serval_1.validate)(),
-    __metadata("design:type", content_1.IdentityAttributeQuery)
-], GetIdentityAttributesParams.prototype, "query", void 0);
-exports.GetIdentityAttributesParams = GetIdentityAttributesParams;
-//# sourceMappingURL=GetIdentityAttributesParams.js.map
+    __metadata("design:type", Object)
+], CreateConsumptionAttributeParams.prototype, "content", void 0);
+exports.CreateConsumptionAttributeParams = CreateConsumptionAttributeParams;
+//# sourceMappingURL=CreateConsumptionAttributeParams.js.map
 
 /***/ }),
 
-/***/ "./dist/modules/attributes/GetRelationshipAttributesParams.js":
-/*!********************************************************************!*\
-  !*** ./dist/modules/attributes/GetRelationshipAttributesParams.js ***!
-  \********************************************************************/
+/***/ "./dist/modules/attributes/local/CreatePeerConsumptionAttributeParams.js":
+/*!*******************************************************************************!*\
+  !*** ./dist/modules/attributes/local/CreatePeerConsumptionAttributeParams.js ***!
+  \*******************************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -720,10 +664,11 @@ 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.GetRelationshipAttributesParams = void 0;
+exports.CreatePeerConsumptionAttributeParams = 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");
-class GetRelationshipAttributesParams extends ts_serval_1.Serializable {
+const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+class CreatePeerConsumptionAttributeParams extends ts_serval_1.Serializable {
     static from(value) {
         return this.fromAny(value);
     }
@@ -731,59 +676,32 @@ class GetRelationshipAttributesParams extends ts_serval_1.Serializable {
 __decorate([
     (0, ts_serval_1.serialize)(),
     (0, ts_serval_1.validate)(),
-    __metadata("design:type", content_1.RelationshipAttributeQuery)
-], GetRelationshipAttributesParams.prototype, "query", void 0);
-exports.GetRelationshipAttributesParams = GetRelationshipAttributesParams;
-//# sourceMappingURL=GetRelationshipAttributesParams.js.map
-
-/***/ }),
-
-/***/ "./dist/modules/attributes/SucceedConsumptionAttributeParams.js":
-/*!**********************************************************************!*\
-  !*** ./dist/modules/attributes/SucceedConsumptionAttributeParams.js ***!
-  \**********************************************************************/
-/***/ (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.SucceedConsumptionAttributeParams = 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");
-class SucceedConsumptionAttributeParams extends ts_serval_1.Serializable {
-    static from(value) {
-        return this.fromAny(value);
-    }
-}
+    __metadata("design:type", transport_1.CoreId)
+], CreatePeerConsumptionAttributeParams.prototype, "id", void 0);
 __decorate([
     (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttribute, content_1.RelationshipAttribute] }),
     (0, ts_serval_1.validate)(),
     __metadata("design:type", Object)
-], SucceedConsumptionAttributeParams.prototype, "successorContent", void 0);
+], CreatePeerConsumptionAttributeParams.prototype, "content", void 0);
 __decorate([
     (0, ts_serval_1.serialize)(),
     (0, ts_serval_1.validate)(),
     __metadata("design:type", transport_1.CoreId)
-], SucceedConsumptionAttributeParams.prototype, "succeeds", void 0);
-exports.SucceedConsumptionAttributeParams = SucceedConsumptionAttributeParams;
-//# sourceMappingURL=SucceedConsumptionAttributeParams.js.map
+], CreatePeerConsumptionAttributeParams.prototype, "requestReference", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", transport_1.CoreAddress)
+], CreatePeerConsumptionAttributeParams.prototype, "peer", void 0);
+exports.CreatePeerConsumptionAttributeParams = CreatePeerConsumptionAttributeParams;
+//# sourceMappingURL=CreatePeerConsumptionAttributeParams.js.map
 
 /***/ }),
 
-/***/ "./dist/modules/attributes/UpdateConsumptionAttributeParams.js":
-/*!*********************************************************************!*\
-  !*** ./dist/modules/attributes/UpdateConsumptionAttributeParams.js ***!
-  \*********************************************************************/
+/***/ "./dist/modules/attributes/local/CreateSharedConsumptionAttributeCopyParams.js":
+/*!*************************************************************************************!*\
+  !*** ./dist/modules/attributes/local/CreateSharedConsumptionAttributeCopyParams.js ***!
+  \*************************************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -798,11 +716,10 @@ 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.UpdateConsumptionAttributeParams = void 0;
+exports.CreateSharedConsumptionAttributeCopyParams = 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");
-class UpdateConsumptionAttributeParams extends ts_serval_1.Serializable {
+class CreateSharedConsumptionAttributeCopyParams extends ts_serval_1.Serializable {
     static from(value) {
         return this.fromAny(value);
     }
@@ -811,21 +728,26 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     (0, ts_serval_1.validate)(),
     __metadata("design:type", transport_1.CoreId)
-], UpdateConsumptionAttributeParams.prototype, "id", void 0);
+], CreateSharedConsumptionAttributeCopyParams.prototype, "attributeId", void 0);
 __decorate([
-    (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttribute, content_1.RelationshipAttribute] }),
+    (0, ts_serval_1.serialize)(),
     (0, ts_serval_1.validate)(),
-    __metadata("design:type", Object)
-], UpdateConsumptionAttributeParams.prototype, "content", void 0);
-exports.UpdateConsumptionAttributeParams = UpdateConsumptionAttributeParams;
-//# sourceMappingURL=UpdateConsumptionAttributeParams.js.map
+    __metadata("design:type", transport_1.CoreAddress)
+], CreateSharedConsumptionAttributeCopyParams.prototype, "peer", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", transport_1.CoreId)
+], CreateSharedConsumptionAttributeCopyParams.prototype, "requestReference", void 0);
+exports.CreateSharedConsumptionAttributeCopyParams = CreateSharedConsumptionAttributeCopyParams;
+//# sourceMappingURL=CreateSharedConsumptionAttributeCopyParams.js.map
 
 /***/ }),
 
-/***/ "./dist/modules/attributes/local/ConsumptionAttribute.js":
-/*!***************************************************************!*\
-  !*** ./dist/modules/attributes/local/ConsumptionAttribute.js ***!
-  \***************************************************************/
+/***/ "./dist/modules/attributes/local/GetIdentityAttributesParams.js":
+/*!**********************************************************************!*\
+  !*** ./dist/modules/attributes/local/GetIdentityAttributesParams.js ***!
+  \**********************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -840,75 +762,28 @@ 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.ConsumptionAttribute = void 0;
+exports.GetIdentityAttributesParams = 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 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");
-const ConsumptionAttributeShareInfo_1 = __webpack_require__(/*! ./ConsumptionAttributeShareInfo */ "./dist/modules/attributes/local/ConsumptionAttributeShareInfo.js");
-let ConsumptionAttribute = class ConsumptionAttribute extends transport_1.CoreSynchronizable {
-    constructor() {
-        super(...arguments);
-        this.technicalProperties = [
-            "@type",
-            "@context",
-            (0, ts_simple_nameof_1.nameof)((r) => r.createdAt),
-            (0, ts_simple_nameof_1.nameof)((r) => r.succeeds),
-            (0, ts_simple_nameof_1.nameof)((r) => r.createdAt)
-        ];
-        this.userdataProperties = [(0, ts_simple_nameof_1.nameof)((r) => r.content)];
-    }
+class GetIdentityAttributesParams extends ts_serval_1.Serializable {
     static from(value) {
         return this.fromAny(value);
     }
-    static async fromAttribute(attribute, succeeds, shareInfo) {
-        return this.from({
-            content: attribute,
-            id: await consumption_1.ConsumptionIds.attribute.generate(),
-            createdAt: transport_1.CoreDate.utc(),
-            succeeds: succeeds,
-            shareInfo: shareInfo
-        });
-    }
-};
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttribute, content_1.RelationshipAttribute] }),
-    __metadata("design:type", Object)
-], ConsumptionAttribute.prototype, "content", void 0);
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", transport_1.CoreDate)
-], ConsumptionAttribute.prototype, "createdAt", void 0);
-__decorate([
-    (0, ts_serval_1.validate)({ nullable: true }),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", transport_1.CoreId)
-], ConsumptionAttribute.prototype, "succeeds", void 0);
-__decorate([
-    (0, ts_serval_1.validate)({ nullable: true }),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", transport_1.CoreId)
-], ConsumptionAttribute.prototype, "succeededBy", void 0);
+}
 __decorate([
-    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
-    __metadata("design:type", ConsumptionAttributeShareInfo_1.ConsumptionAttributeShareInfo)
-], ConsumptionAttribute.prototype, "shareInfo", void 0);
-ConsumptionAttribute = __decorate([
-    (0, ts_serval_1.type)("ConsumptionAttribute")
-], ConsumptionAttribute);
-exports.ConsumptionAttribute = ConsumptionAttribute;
-//# sourceMappingURL=ConsumptionAttribute.js.map
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", content_1.IdentityAttributeQuery)
+], GetIdentityAttributesParams.prototype, "query", void 0);
+exports.GetIdentityAttributesParams = GetIdentityAttributesParams;
+//# sourceMappingURL=GetIdentityAttributesParams.js.map
 
 /***/ }),
 
-/***/ "./dist/modules/attributes/local/ConsumptionAttributeShareInfo.js":
-/*!************************************************************************!*\
-  !*** ./dist/modules/attributes/local/ConsumptionAttributeShareInfo.js ***!
-  \************************************************************************/
+/***/ "./dist/modules/attributes/local/GetRelationshipAttributesParams.js":
+/*!**************************************************************************!*\
+  !*** ./dist/modules/attributes/local/GetRelationshipAttributesParams.js ***!
+  \**************************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -923,31 +798,21 @@ 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.ConsumptionAttributeShareInfo = void 0;
+exports.GetRelationshipAttributesParams = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
-const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
-class ConsumptionAttributeShareInfo extends transport_1.CoreSerializable {
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
+class GetRelationshipAttributesParams extends ts_serval_1.Serializable {
     static from(value) {
-        return super.fromAny(value);
+        return this.fromAny(value);
     }
 }
 __decorate([
-    (0, ts_serval_1.validate)(),
     (0, ts_serval_1.serialize)(),
-    __metadata("design:type", transport_1.CoreId)
-], ConsumptionAttributeShareInfo.prototype, "requestReference", void 0);
-__decorate([
     (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", transport_1.CoreAddress)
-], ConsumptionAttributeShareInfo.prototype, "peer", void 0);
-__decorate([
-    (0, ts_serval_1.validate)({ nullable: true }),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", transport_1.CoreId)
-], ConsumptionAttributeShareInfo.prototype, "sourceAttribute", void 0);
-exports.ConsumptionAttributeShareInfo = ConsumptionAttributeShareInfo;
-//# sourceMappingURL=ConsumptionAttributeShareInfo.js.map
+    __metadata("design:type", content_1.RelationshipAttributeQuery)
+], GetRelationshipAttributesParams.prototype, "query", void 0);
+exports.GetRelationshipAttributesParams = GetRelationshipAttributesParams;
+//# sourceMappingURL=GetRelationshipAttributesParams.js.map
 
 /***/ }),
 
@@ -1066,8 +931,92 @@ exports.relationshipQueryTranslator = new docdb_querytranslator_1.QueryTranslato
             };
         }
     }
-});
-//# sourceMappingURL=QueryTranslator.js.map
+});
+//# sourceMappingURL=QueryTranslator.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/attributes/local/SucceedConsumptionAttributeParams.js":
+/*!****************************************************************************!*\
+  !*** ./dist/modules/attributes/local/SucceedConsumptionAttributeParams.js ***!
+  \****************************************************************************/
+/***/ (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.SucceedConsumptionAttributeParams = 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");
+class SucceedConsumptionAttributeParams extends ts_serval_1.Serializable {
+    static from(value) {
+        return this.fromAny(value);
+    }
+}
+__decorate([
+    (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttribute, content_1.RelationshipAttribute] }),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", Object)
+], SucceedConsumptionAttributeParams.prototype, "successorContent", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", transport_1.CoreId)
+], SucceedConsumptionAttributeParams.prototype, "succeeds", void 0);
+exports.SucceedConsumptionAttributeParams = SucceedConsumptionAttributeParams;
+//# sourceMappingURL=SucceedConsumptionAttributeParams.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/attributes/local/UpdateConsumptionAttributeParams.js":
+/*!***************************************************************************!*\
+  !*** ./dist/modules/attributes/local/UpdateConsumptionAttributeParams.js ***!
+  \***************************************************************************/
+/***/ (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.UpdateConsumptionAttributeParams = 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");
+class UpdateConsumptionAttributeParams extends ts_serval_1.Serializable {
+    static from(value) {
+        return this.fromAny(value);
+    }
+}
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", transport_1.CoreId)
+], UpdateConsumptionAttributeParams.prototype, "id", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttribute, content_1.RelationshipAttribute] }),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", Object)
+], UpdateConsumptionAttributeParams.prototype, "content", void 0);
+exports.UpdateConsumptionAttributeParams = UpdateConsumptionAttributeParams;
+//# sourceMappingURL=UpdateConsumptionAttributeParams.js.map
 
 /***/ }),
 
@@ -1232,15 +1181,15 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./attributes/ConsumptionAttributesController */ "./dist/modules/attributes/ConsumptionAttributesController.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/CreateConsumptionAttributeParams */ "./dist/modules/attributes/CreateConsumptionAttributeParams.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/CreatePeerConsumptionAttributeParams */ "./dist/modules/attributes/CreatePeerConsumptionAttributeParams.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/CreateSharedConsumptionAttributeCopyParams */ "./dist/modules/attributes/CreateSharedConsumptionAttributeCopyParams.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/GetIdentityAttributesParams */ "./dist/modules/attributes/GetIdentityAttributesParams.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/GetRelationshipAttributesParams */ "./dist/modules/attributes/GetRelationshipAttributesParams.js"), exports);
 __exportStar(__webpack_require__(/*! ./attributes/local/ConsumptionAttribute */ "./dist/modules/attributes/local/ConsumptionAttribute.js"), exports);
 __exportStar(__webpack_require__(/*! ./attributes/local/ConsumptionAttributeShareInfo */ "./dist/modules/attributes/local/ConsumptionAttributeShareInfo.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/SucceedConsumptionAttributeParams */ "./dist/modules/attributes/SucceedConsumptionAttributeParams.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/UpdateConsumptionAttributeParams */ "./dist/modules/attributes/UpdateConsumptionAttributeParams.js"), exports);
+__exportStar(__webpack_require__(/*! ./attributes/local/CreateConsumptionAttributeParams */ "./dist/modules/attributes/local/CreateConsumptionAttributeParams.js"), exports);
+__exportStar(__webpack_require__(/*! ./attributes/local/CreatePeerConsumptionAttributeParams */ "./dist/modules/attributes/local/CreatePeerConsumptionAttributeParams.js"), exports);
+__exportStar(__webpack_require__(/*! ./attributes/local/CreateSharedConsumptionAttributeCopyParams */ "./dist/modules/attributes/local/CreateSharedConsumptionAttributeCopyParams.js"), exports);
+__exportStar(__webpack_require__(/*! ./attributes/local/GetIdentityAttributesParams */ "./dist/modules/attributes/local/GetIdentityAttributesParams.js"), exports);
+__exportStar(__webpack_require__(/*! ./attributes/local/GetRelationshipAttributesParams */ "./dist/modules/attributes/local/GetRelationshipAttributesParams.js"), exports);
+__exportStar(__webpack_require__(/*! ./attributes/local/SucceedConsumptionAttributeParams */ "./dist/modules/attributes/local/SucceedConsumptionAttributeParams.js"), exports);
+__exportStar(__webpack_require__(/*! ./attributes/local/UpdateConsumptionAttributeParams */ "./dist/modules/attributes/local/UpdateConsumptionAttributeParams.js"), exports);
 __exportStar(__webpack_require__(/*! ./drafts/DraftsController */ "./dist/modules/drafts/DraftsController.js"), exports);
 __exportStar(__webpack_require__(/*! ./drafts/local/Draft */ "./dist/modules/drafts/local/Draft.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/incoming/checkPrerequisites/CheckPrerequisitesOfIncomingRequestParameters */ "./dist/modules/requests/incoming/checkPrerequisites/CheckPrerequisitesOfIncomingRequestParameters.js"), exports);
@@ -1260,10 +1209,14 @@ __exportStar(__webpack_require__(/*! ./requests/itemProcessors/createAttribute/C
 __exportStar(__webpack_require__(/*! ./requests/itemProcessors/GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/itemProcessors/IRequestItemProcessor */ "./dist/modules/requests/itemProcessors/IRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/itemProcessors/ProcessorConstructor */ "./dist/modules/requests/itemProcessors/ProcessorConstructor.js"), exports);
+__exportStar(__webpack_require__(/*! ./requests/itemProcessors/proposeAttribute/AcceptProposeAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/proposeAttribute/AcceptProposeAttributeRequestItemParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/itemProcessors/readAttribute/AcceptReadAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/readAttribute/AcceptReadAttributeRequestItemParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/itemProcessors/RequestItemConstructor */ "./dist/modules/requests/itemProcessors/RequestItemConstructor.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/itemProcessors/RequestItemProcessorRegistry */ "./dist/modules/requests/itemProcessors/RequestItemProcessorRegistry.js"), exports);
+__exportStar(__webpack_require__(/*! ./requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/itemProcessors/ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/local/ConsumptionRequest */ "./dist/modules/requests/local/ConsumptionRequest.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/local/ConsumptionRequestStatus */ "./dist/modules/requests/local/ConsumptionRequestStatus.js"), exports);
@@ -1440,7 +1393,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
         for (const item of request.content.items) {
             if (item instanceof content_1.RequestItem) {
                 const processor = this.processorRegistry.getProcessorForItem(item);
-                const prerequisitesFulfilled = await processor.checkPrerequisitesOfIncomingRequestItem(item);
+                const prerequisitesFulfilled = await processor.checkPrerequisitesOfIncomingRequestItem(item, request);
                 if (!prerequisitesFulfilled) {
                     return request;
                 }
@@ -1448,7 +1401,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
             else {
                 for (const childItem of item.items) {
                     const processor = this.processorRegistry.getProcessorForItem(childItem);
-                    const prerequisitesFulfilled = await processor.checkPrerequisitesOfIncomingRequestItem(childItem);
+                    const prerequisitesFulfilled = await processor.checkPrerequisitesOfIncomingRequestItem(childItem, request);
                     if (!prerequisitesFulfilled) {
                         return request;
                     }
@@ -1952,6 +1905,8 @@ exports.AbstractRequestItemProcessor = void 0;
 class AbstractRequestItemProcessor {
     constructor(consumptionController) {
         this.consumptionController = consumptionController;
+        this.accountController = this.consumptionController.accountController;
+        this.currentIdentityAddress = this.accountController.identity.address;
     }
 }
 exports.AbstractRequestItemProcessor = AbstractRequestItemProcessor;
@@ -1974,34 +1929,34 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const AbstractRequestItemProcessor_1 = __webpack_require__(/*! ./AbstractRequestItemProcessor */ "./dist/modules/requests/itemProcessors/AbstractRequestItemProcessor.js");
 const ValidationResult_1 = __webpack_require__(/*! ./ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 class GenericRequestItemProcessor extends AbstractRequestItemProcessor_1.AbstractRequestItemProcessor {
-    checkPrerequisitesOfIncomingRequestItem(_requestItem) {
+    checkPrerequisitesOfIncomingRequestItem(requestItem, requestInfo) {
         return true;
     }
-    canAccept(requestItem, params, request) {
+    canAccept(requestItem, params, requestInfo) {
         return ValidationResult_1.ValidationResult.success();
     }
-    canReject(requestItem, params, request) {
+    canReject(requestItem, params, requestInfo) {
         return ValidationResult_1.ValidationResult.success();
     }
-    accept(requestItem, params, request) {
+    accept(requestItem, params, requestInfo) {
         return content_1.AcceptResponseItem.from({
             result: content_1.ResponseItemResult.Accepted,
             metadata: requestItem.responseMetadata
         });
     }
-    reject(requestItem, params, request) {
+    reject(requestItem, params, requestInfo) {
         return content_1.RejectResponseItem.from({
             result: content_1.ResponseItemResult.Rejected,
             metadata: requestItem.responseMetadata
         });
     }
-    canCreateOutgoingRequestItem(requestItem) {
+    canCreateOutgoingRequestItem(requestItem, request, recipient) {
         return ValidationResult_1.ValidationResult.success();
     }
-    canApplyIncomingResponseItem(responseItem, requestItem, request) {
+    canApplyIncomingResponseItem(responseItem, requestItem, requestInfo) {
         return ValidationResult_1.ValidationResult.success();
     }
-    applyIncomingResponseItem(responseItem, requestItem, request) {
+    applyIncomingResponseItem(responseItem, requestItem, requestInfo) {
         // do nothing
     }
 }
@@ -2060,24 +2015,21 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RequestItemProcessorRegistry = void 0;
 class RequestItemProcessorRegistry {
-    constructor(consumptionController, processors = []) {
+    constructor(consumptionController, processors = new Map()) {
         this.consumptionController = consumptionController;
-        this.registry = {};
-        for (const { itemConstructor, processorConstructor } of processors) {
-            this.registerProcessor(processorConstructor, itemConstructor);
-        }
+        this.processors = processors;
     }
-    registerProcessor(processorConstructor, itemConstructor) {
-        if (this.registry.hasOwnProperty(itemConstructor.name)) {
+    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.`);
         }
-        this.registry[itemConstructor.name] = processorConstructor;
+        this.processors.set(itemConstructor, processorConstructor);
     }
-    replaceProcessor(processorConstructor, itemConstructor) {
-        this.registry[itemConstructor.name] = processorConstructor;
+    registerOrReplaceProcessor(itemConstructor, processorConstructor) {
+        this.processors.set(itemConstructor, processorConstructor);
     }
     getProcessorForItem(item) {
-        const constructor = this.registry[item.constructor.name];
+        const constructor = this.processors.get(item.constructor);
         if (!constructor) {
             throw new Error(`There was no processor registered for '${item.constructor.name}'.`);
         }
@@ -2098,20 +2050,20 @@ exports.RequestItemProcessorRegistry = RequestItemProcessorRegistry;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.ErrorValidationResult = exports.SuccessfulValidatonResult = exports.ValidationResult = void 0;
+exports.ErrorValidationResult = exports.SuccessfulValidationResult = exports.ValidationResult = void 0;
 const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 class ValidationResult {
     constructor(items) {
         this.items = items;
     }
     isSuccess() {
-        return this instanceof SuccessfulValidatonResult;
+        return this instanceof SuccessfulValidationResult;
     }
     isError() {
         return this instanceof ErrorValidationResult;
     }
     static success(items = []) {
-        return new SuccessfulValidatonResult(items);
+        return new SuccessfulValidationResult(items);
     }
     static error(error, items = []) {
         return new ErrorValidationResult(error, items);
@@ -2123,12 +2075,12 @@ class ValidationResult {
     }
 }
 exports.ValidationResult = ValidationResult;
-class SuccessfulValidatonResult extends ValidationResult {
+class SuccessfulValidationResult extends ValidationResult {
     constructor(items) {
         super(items);
     }
 }
-exports.SuccessfulValidatonResult = SuccessfulValidatonResult;
+exports.SuccessfulValidationResult = SuccessfulValidationResult;
 class ErrorValidationResult extends ValidationResult {
     constructor(error, items) {
         super(items);
@@ -2185,41 +2137,48 @@ const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist
 const GenericRequestItemProcessor_1 = __webpack_require__(/*! ../GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js");
 const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
-    canCreateOutgoingRequestItem(requestItem) {
-        // TODO: remove the following if we for sure only allow RelationshipAttributes in a RequestItem
+    canCreateOutgoingRequestItem(requestItem, _request, _recipient) {
         if (requestItem.attribute instanceof content_1.IdentityAttribute) {
-            // It doesn't make sense to send a CreateAttributeRequestItem with an IdentityAttribute. E.g. the following cases would have to be handled:
-            // - The RequestItem contains an Attribute (e.g. GivenName) with the same value as an already existing Attribute
-            //  => Should the user reject the request? If not, do we save a new Attribute with the same value?
-            // - The RequestItem contains an Attribute (e.g. GivenName) with the a different value than an already existing Attribute
-            // - ...
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.cannotSendCreateAttributeRequestItemsWithIdentityAttributes());
+            return this.canCreateRequestItemWithIdentityAttribute(requestItem);
+        }
+        return this.canCreateRequestItemWithRelationshipAttribute(requestItem);
+    }
+    canCreateRequestItemWithIdentityAttribute(requestItem) {
+        const iAmOwnerOfTheAttribute = this.accountController.identity.isMe(requestItem.attribute.owner);
+        if (!iAmOwnerOfTheAttribute) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem(`Cannot send Identity Attributes of which you are not the owner via ${content_1.CreateAttributeRequestItem.name}. Consider using a ${content_1.ProposeAttributeRequestItem.name} instead.`));
         }
         return ValidationResult_1.ValidationResult.success();
     }
-    async accept(requestItem, _params, request) {
-        if (requestItem.attribute instanceof content_1.IdentityAttribute) {
-            throw new Error("IdentityAttribute not supported"); // TODO: allow only Relationship Attributes in RequestItem?
+    canCreateRequestItemWithRelationshipAttribute(requestItem) {
+        const iAmOwnerOfTheAttribute = this.accountController.identity.isMe(requestItem.attribute.owner);
+        if (!iAmOwnerOfTheAttribute) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot send Relationship Attributes of which you are not the owner."));
         }
-        const result = await this.consumptionController.attributes.createRelationshipAttribute({
+        return ValidationResult_1.ValidationResult.success();
+    }
+    async accept(requestItem, _params, requestInfo) {
+        const peerConsumptionAttribute = await this.consumptionController.attributes.createPeerConsumptionAttribute({
             content: requestItem.attribute,
-            peer: request.peer,
-            requestReference: request.id
+            peer: requestInfo.peer,
+            requestReference: requestInfo.id
         });
         return content_1.CreateAttributeAcceptResponseItem.from({
+            attributeId: peerConsumptionAttribute.id,
             result: content_1.ResponseItemResult.Accepted,
-            attributeId: result.id
+            metadata: requestItem.responseMetadata
         });
     }
-    async applyIncomingResponseItem(responseItem, requestItem, request) {
+    async applyIncomingResponseItem(responseItem, requestItem, requestInfo) {
         if (!(responseItem instanceof content_1.CreateAttributeAcceptResponseItem)) {
             return;
         }
+        /* TODO: in case of an own IdentityAttribute that was sent to the peer, we need to specify a source attribute; but currently we can't find the source attribute, because we don't know the id the user picked when sending the request */
         await this.consumptionController.attributes.createPeerConsumptionAttribute({
             id: responseItem.attributeId,
             content: requestItem.attribute,
-            peer: request.peer,
-            requestReference: request.id
+            peer: requestInfo.peer,
+            requestReference: requestInfo.id
         });
     }
 }
@@ -2228,6 +2187,161 @@ exports.CreateAttributeRequestItemProcessor = CreateAttributeRequestItemProcesso
 
 /***/ }),
 
+/***/ "./dist/modules/requests/itemProcessors/proposeAttribute/AcceptProposeAttributeRequestItemParameters.js":
+/*!**************************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/proposeAttribute/AcceptProposeAttributeRequestItemParameters.js ***!
+  \**************************************************************************************************************/
+/***/ (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);
+};
+var AcceptProposeAttributeRequestItemParameters_1;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AcceptProposeAttributeRequestItemParameters = 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 ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
+let AcceptProposeAttributeRequestItemParameters = AcceptProposeAttributeRequestItemParameters_1 = class AcceptProposeAttributeRequestItemParameters extends ts_serval_1.Serializable {
+    static from(value) {
+        return this.fromAny(value);
+    }
+    static postFrom(value) {
+        const typedValue = value;
+        if (typedValue.attributeId && typedValue.attribute) {
+            throw new ts_serval_1.ValidationError(AcceptProposeAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.attribute), `You cannot specify both ${(0, ts_simple_nameof_1.nameof)((x) => x.attribute)} and ${(0, ts_simple_nameof_1.nameof)((x) => x.attributeId)}.`);
+        }
+        if (!typedValue.attributeId && !typedValue.attribute) {
+            throw new ts_serval_1.ValidationError(AcceptProposeAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.attribute), `You have to specify either ${(0, ts_simple_nameof_1.nameof)((x) => x.attribute)} or ${(0, ts_simple_nameof_1.nameof)((x) => x.attributeId)}.`);
+        }
+        return value;
+    }
+};
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
+    __metadata("design:type", transport_1.CoreId)
+], AcceptProposeAttributeRequestItemParameters.prototype, "attributeId", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttribute, content_1.RelationshipAttribute] }),
+    (0, ts_serval_1.validate)({ nullable: true }),
+    __metadata("design:type", Object)
+], AcceptProposeAttributeRequestItemParameters.prototype, "attribute", void 0);
+AcceptProposeAttributeRequestItemParameters = AcceptProposeAttributeRequestItemParameters_1 = __decorate([
+    (0, ts_serval_1.type)("AcceptProposeAttributeRequestItemParameters")
+], AcceptProposeAttributeRequestItemParameters);
+exports.AcceptProposeAttributeRequestItemParameters = AcceptProposeAttributeRequestItemParameters;
+//# sourceMappingURL=AcceptProposeAttributeRequestItemParameters.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.js":
+/*!*******************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.js ***!
+  \*******************************************************************************************************/
+/***/ (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.ProposeAttributeRequestItemProcessor = void 0;
+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 ConsumptionAttribute_1 = __webpack_require__(/*! ../../../attributes/local/ConsumptionAttribute */ "./dist/modules/attributes/local/ConsumptionAttribute.js");
+const GenericRequestItemProcessor_1 = __webpack_require__(/*! ../GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js");
+const validateQuery_1 = __importDefault(__webpack_require__(/*! ../utility/validateQuery */ "./dist/modules/requests/itemProcessors/utility/validateQuery.js"));
+const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
+const AcceptProposeAttributeRequestItemParameters_1 = __webpack_require__(/*! ./AcceptProposeAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/proposeAttribute/AcceptProposeAttributeRequestItemParameters.js");
+class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
+    canCreateOutgoingRequestItem(requestItem, _request, recipient) {
+        const queryValidationResult = (0, validateQuery_1.default)(requestItem.query, this.currentIdentityAddress, recipient);
+        if (queryValidationResult.isError()) {
+            return queryValidationResult;
+        }
+        return ValidationResult_1.ValidationResult.success();
+    }
+    async canAccept(_requestItem, params, requestInfo) {
+        const parsedParams = AcceptProposeAttributeRequestItemParameters_1.AcceptProposeAttributeRequestItemParameters.from(params);
+        if (parsedParams.attributeId) {
+            const foundAttribute = await this.consumptionController.attributes.getConsumptionAttribute(parsedParams.attributeId);
+            if (!foundAttribute) {
+                return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(ConsumptionAttribute_1.ConsumptionAttribute, requestInfo.id.toString()));
+            }
+            if (!this.accountController.identity.isMe(foundAttribute.content.owner)) {
+                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.success();
+    }
+    async accept(_requestItem, params, requestInfo) {
+        const parsedParams = AcceptProposeAttributeRequestItemParameters_1.AcceptProposeAttributeRequestItemParameters.from(params);
+        let sharedConsumptionAttribute;
+        if (parsedParams.attributeId) {
+            sharedConsumptionAttribute = await this.copyExistingAttribute(parsedParams.attributeId, requestInfo);
+        }
+        else {
+            sharedConsumptionAttribute = await this.createNewAttribute(parsedParams.attribute, requestInfo);
+        }
+        return content_1.ProposeAttributeAcceptResponseItem.from({
+            result: content_1.ResponseItemResult.Accepted,
+            attributeId: sharedConsumptionAttribute.id,
+            attribute: sharedConsumptionAttribute.content
+        });
+    }
+    async copyExistingAttribute(attributeId, requestInfo) {
+        return await this.consumptionController.attributes.createSharedConsumptionAttributeCopy({
+            attributeId: transport_1.CoreId.from(attributeId),
+            peer: transport_1.CoreAddress.from(requestInfo.peer),
+            requestReference: transport_1.CoreId.from(requestInfo.id)
+        });
+    }
+    async createNewAttribute(attribute, requestInfo) {
+        if (attribute instanceof content_1.IdentityAttribute) {
+            const repositoryConsumptionAttribute = await this.consumptionController.attributes.createConsumptionAttribute({
+                content: attribute
+            });
+            return await this.consumptionController.attributes.createSharedConsumptionAttributeCopy({
+                attributeId: transport_1.CoreId.from(repositoryConsumptionAttribute.id),
+                peer: transport_1.CoreAddress.from(requestInfo.peer),
+                requestReference: transport_1.CoreId.from(requestInfo.id)
+            });
+        }
+        return await this.consumptionController.attributes.createPeerConsumptionAttribute({
+            content: attribute,
+            peer: requestInfo.peer,
+            requestReference: transport_1.CoreId.from(requestInfo.id)
+        });
+    }
+    async applyIncomingResponseItem(responseItem, _requestItem, requestInfo) {
+        if (!(responseItem instanceof content_1.ProposeAttributeAcceptResponseItem)) {
+            return;
+        }
+        await this.consumptionController.attributes.createPeerConsumptionAttribute({
+            id: responseItem.attributeId,
+            content: responseItem.attribute,
+            peer: requestInfo.peer,
+            requestReference: requestInfo.id
+        });
+    }
+}
+exports.ProposeAttributeRequestItemProcessor = ProposeAttributeRequestItemProcessor;
+//# sourceMappingURL=ProposeAttributeRequestItemProcessor.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/requests/itemProcessors/readAttribute/AcceptReadAttributeRequestItemParameters.js":
 /*!********************************************************************************************************!*\
   !*** ./dist/modules/requests/itemProcessors/readAttribute/AcceptReadAttributeRequestItemParameters.js ***!
@@ -2289,10 +2403,13 @@ exports.AcceptReadAttributeRequestItemParameters = AcceptReadAttributeRequestIte
 /*!*************************************************************************************************!*\
   !*** ./dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js ***!
   \*************************************************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (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.ReadAttributeRequestItemProcessor = void 0;
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
@@ -2300,30 +2417,38 @@ const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transpor
 const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist/consumption/index.js");
 const ConsumptionAttribute_1 = __webpack_require__(/*! ../../../attributes/local/ConsumptionAttribute */ "./dist/modules/attributes/local/ConsumptionAttribute.js");
 const GenericRequestItemProcessor_1 = __webpack_require__(/*! ../GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js");
+const validateQuery_1 = __importDefault(__webpack_require__(/*! ../utility/validateQuery */ "./dist/modules/requests/itemProcessors/utility/validateQuery.js"));
 const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 const AcceptReadAttributeRequestItemParameters_1 = __webpack_require__(/*! ./AcceptReadAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/readAttribute/AcceptReadAttributeRequestItemParameters.js");
 class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
-    async canAccept(_requestItem, params, request) {
+    canCreateOutgoingRequestItem(requestItem, _request, recipient) {
+        const queryValidationResult = (0, validateQuery_1.default)(requestItem.query, this.currentIdentityAddress, recipient);
+        if (queryValidationResult.isError()) {
+            return queryValidationResult;
+        }
+        return ValidationResult_1.ValidationResult.success();
+    }
+    async canAccept(_requestItem, params, requestInfo) {
         const parsedParams = AcceptReadAttributeRequestItemParameters_1.AcceptReadAttributeRequestItemParameters.from(params);
         if (parsedParams.attributeId) {
             const foundAttribute = await this.consumptionController.attributes.getConsumptionAttribute(parsedParams.attributeId);
             if (!foundAttribute) {
-                return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(ConsumptionAttribute_1.ConsumptionAttribute, request.id.toString()));
+                return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(ConsumptionAttribute_1.ConsumptionAttribute, requestInfo.id.toString()));
             }
-            if (!this.consumptionController.accountController.identity.isMe(foundAttribute.content.owner)) {
-                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.canOnlyShareOwnAttributes());
+            if (!this.accountController.identity.isMe(foundAttribute.content.owner)) {
+                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.success();
     }
-    async accept(_requestItem, params, request) {
+    async accept(_requestItem, params, requestInfo) {
         const parsedParams = AcceptReadAttributeRequestItemParameters_1.AcceptReadAttributeRequestItemParameters.from(params);
         let sharedConsumptionAttribute;
         if (parsedParams.attributeId) {
-            sharedConsumptionAttribute = await this.copyExistingAttribute(parsedParams.attributeId, request);
+            sharedConsumptionAttribute = await this.copyExistingAttribute(parsedParams.attributeId, requestInfo);
         }
         else {
-            sharedConsumptionAttribute = await this.createNewAttribute(parsedParams.attribute, request);
+            sharedConsumptionAttribute = await this.createNewAttribute(parsedParams.attribute, requestInfo);
         }
         return content_1.ReadAttributeAcceptResponseItem.from({
             result: content_1.ResponseItemResult.Accepted,
@@ -2331,39 +2456,39 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
             attribute: sharedConsumptionAttribute.content
         });
     }
-    async copyExistingAttribute(attributeId, request) {
+    async copyExistingAttribute(attributeId, requestInfo) {
         return await this.consumptionController.attributes.createSharedConsumptionAttributeCopy({
             attributeId: transport_1.CoreId.from(attributeId),
-            peer: transport_1.CoreAddress.from(request.peer),
-            requestReference: transport_1.CoreId.from(request.id)
+            peer: transport_1.CoreAddress.from(requestInfo.peer),
+            requestReference: transport_1.CoreId.from(requestInfo.id)
         });
     }
-    async createNewAttribute(attribute, request) {
+    async createNewAttribute(attribute, requestInfo) {
         if (attribute instanceof content_1.IdentityAttribute) {
             const repositoryConsumptionAttribute = await this.consumptionController.attributes.createConsumptionAttribute({
                 content: attribute
             });
             return await this.consumptionController.attributes.createSharedConsumptionAttributeCopy({
                 attributeId: transport_1.CoreId.from(repositoryConsumptionAttribute.id),
-                peer: transport_1.CoreAddress.from(request.peer),
-                requestReference: transport_1.CoreId.from(request.id)
+                peer: transport_1.CoreAddress.from(requestInfo.peer),
+                requestReference: transport_1.CoreId.from(requestInfo.id)
             });
         }
-        return await this.consumptionController.attributes.createRelationshipAttribute({
+        return await this.consumptionController.attributes.createPeerConsumptionAttribute({
             content: attribute,
-            peer: request.peer,
-            requestReference: transport_1.CoreId.from(request.id)
+            peer: requestInfo.peer,
+            requestReference: transport_1.CoreId.from(requestInfo.id)
         });
     }
-    async applyIncomingResponseItem(responseItem, _requestItem, request) {
+    async applyIncomingResponseItem(responseItem, _requestItem, requestInfo) {
         if (!(responseItem instanceof content_1.ReadAttributeAcceptResponseItem)) {
             return;
         }
         await this.consumptionController.attributes.createPeerConsumptionAttribute({
             id: responseItem.attributeId,
             content: responseItem.attribute,
-            peer: request.peer,
-            requestReference: request.id
+            peer: requestInfo.peer,
+            requestReference: requestInfo.id
         });
     }
 }
@@ -2372,6 +2497,170 @@ exports.ReadAttributeRequestItemProcessor = ReadAttributeRequestItemProcessor;
 
 /***/ }),
 
+/***/ "./dist/modules/requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters.js":
+/*!**********************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters.js ***!
+  \**********************************************************************************************************/
+/***/ (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;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AcceptShareAttributeRequestItemParameters = void 0;
+const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
+let AcceptShareAttributeRequestItemParameters = class AcceptShareAttributeRequestItemParameters extends ts_serval_1.Serializable {
+    static from(value) {
+        return this.fromAny(value);
+    }
+};
+AcceptShareAttributeRequestItemParameters = __decorate([
+    (0, ts_serval_1.type)("AcceptShareAttributeRequestItemParameters")
+], AcceptShareAttributeRequestItemParameters);
+exports.AcceptShareAttributeRequestItemParameters = AcceptShareAttributeRequestItemParameters;
+//# sourceMappingURL=AcceptShareAttributeRequestItemParameters.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.js":
+/*!***************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.js ***!
+  \***************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ShareAttributeRequestItemProcessor = void 0;
+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 GenericRequestItemProcessor_1 = __webpack_require__(/*! ../GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js");
+const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
+class ShareAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
+    async canCreateOutgoingRequestItem(requestItem, _request, recipient) {
+        const attribute = await this.consumptionController.attributes.getConsumptionAttribute(requestItem.attributeId);
+        if (!attribute) {
+            return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(content_1.Attribute, requestItem.attributeId.toString()));
+        }
+        const attributeOwnerValidationResult = this.validateAttributeOwner(attribute.content, this.currentIdentityAddress, recipient);
+        if (attributeOwnerValidationResult.isError()) {
+            return attributeOwnerValidationResult;
+        }
+        return ValidationResult_1.ValidationResult.success();
+    }
+    async checkPrerequisitesOfIncomingRequestItem(requestItem, requestInfo) {
+        const relationshipToShareWith = await this.accountController.relationships.getRelationshipToIdentity(requestItem.shareWith);
+        if (!relationshipToShareWith) {
+            return false; // Should the containing Request move to Error state?
+        }
+        const attribute = await this.consumptionController.attributes.getConsumptionAttribute(requestItem.attributeId);
+        if (!attribute) {
+            return false; // Should the containing Request move to Error state?
+        }
+        if (this.validateAttributeOwner(attribute.content, requestInfo.peer, this.currentIdentityAddress).isError()) {
+            return false;
+        }
+        return true;
+    }
+    validateAttributeOwner(attribute, sender, recipient) {
+        const attributeOwner = attribute.owner;
+        if (attribute instanceof content_1.IdentityAttribute) {
+            if (!attributeOwner.equals(recipient)) {
+                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Can only request sharing of identity attributes owned by the recipient."));
+            }
+        }
+        if (attribute instanceof content_1.RelationshipAttribute) {
+            if (!attributeOwner.equals(recipient) && !attributeOwner.equals(sender)) {
+                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot request sharing of relationship attributes not owned by recipient or sender."));
+            }
+        }
+        return ValidationResult_1.ValidationResult.success();
+    }
+    canAccept(_requestItem, _params, _requestInfo) {
+        return ValidationResult_1.ValidationResult.success();
+    }
+    async accept(requestItem, _params, _requestInfo) {
+        const attribute = await this.consumptionController.attributes.getConsumptionAttribute(requestItem.attributeId);
+        if (!(await this.isAttributeAlreadyShared(attribute, requestItem.shareWith))) {
+            await this.shareAttribute(attribute, requestItem.shareWith);
+        }
+        return content_1.AcceptResponseItem.from({ result: content_1.ResponseItemResult.Accepted });
+    }
+    async isAttributeAlreadyShared(attribute, shareWith) {
+        if (attribute.content instanceof content_1.IdentityAttribute) {
+            return ((await this.consumptionController.attributes.getConsumptionAttributes({
+                "shareInfo.sourceAttribute": attribute.shareInfo.sourceAttribute.toString(),
+                "shareInfo.peer": shareWith.toString() // eslint-disable-line @typescript-eslint/naming-convention
+            })).length > 0);
+        }
+        return ((await this.consumptionController.attributes.getConsumptionAttributes({
+            "shareInfo.sourceAttribute": attribute.id.toString(),
+            "shareInfo.peer": shareWith.toString() // eslint-disable-line @typescript-eslint/naming-convention
+        })).length > 0);
+    }
+    async shareAttribute(attribute, shareWith) {
+        const createAttributeRequestItem = content_1.CreateAttributeRequestItem.from({
+            attribute: attribute.content,
+            mustBeAccepted: true
+        });
+        const createAttributeRequest = await this.consumptionController.outgoingRequests.create({
+            peer: shareWith,
+            content: content_1.Request.from({
+                items: [createAttributeRequestItem]
+            })
+        });
+        const message = await this.accountController.messages.sendMessage({
+            recipients: [shareWith],
+            content: createAttributeRequest.content
+        });
+        await this.consumptionController.outgoingRequests.sent({
+            requestId: createAttributeRequest.id,
+            requestSourceObject: message
+        });
+    }
+}
+exports.ShareAttributeRequestItemProcessor = ShareAttributeRequestItemProcessor;
+//# sourceMappingURL=ShareAttributeRequestItemProcessor.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/requests/itemProcessors/utility/validateQuery.js":
+/*!***********************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/utility/validateQuery.js ***!
+  \***********************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
+const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist/consumption/index.js");
+const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
+function validateQuery(query, sender, recipient) {
+    if (query instanceof content_1.RelationshipAttributeQuery) {
+        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."));
+        }
+        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."));
+        }
+        if (query.owner.equals(sender) && query.thirdParty !== undefined) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query own Attributes from a third party."));
+        }
+    }
+    return ValidationResult_1.ValidationResult.success();
+}
+exports["default"] = validateQuery;
+//# sourceMappingURL=validateQuery.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/requests/local/ConsumptionRequest.js":
 /*!***********************************************************!*\
   !*** ./dist/modules/requests/local/ConsumptionRequest.js ***!
@@ -2666,32 +2955,32 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
     }
     async canCreate(params) {
         const parsedParams = CreateOutgoingRequestParameters_1.CreateOutgoingRequestParameters.from(params);
-        const innerResults = await this.canCreateItems(parsedParams.content.items);
+        const innerResults = await this.canCreateItems(parsedParams.content, parsedParams.peer);
         const result = ValidationResult_1.ValidationResult.fromItems(innerResults);
         return result;
     }
-    async canCreateItems(items) {
+    async canCreateItems(request, recipient) {
         const results = [];
-        for (const requestItem of items) {
+        for (const requestItem of request.items) {
             if (requestItem instanceof content_1.RequestItem) {
-                const canCreateItem = await this.canCreateItem(requestItem);
+                const canCreateItem = await this.canCreateItem(requestItem, request, recipient);
                 results.push(canCreateItem);
             }
             else {
-                const result = await this.canCreateItemGroup(requestItem);
+                const result = await this.canCreateItemGroup(requestItem, request, recipient);
                 results.push(result);
             }
         }
         return results;
     }
-    async canCreateItem(requestItem) {
+    async canCreateItem(requestItem, request, recipient) {
         const processor = this.processorRegistry.getProcessorForItem(requestItem);
-        return await processor.canCreateOutgoingRequestItem(requestItem);
+        return await processor.canCreateOutgoingRequestItem(requestItem, request, recipient);
     }
-    async canCreateItemGroup(requestItem) {
+    async canCreateItemGroup(requestItem, request, recipient) {
         const innerResults = [];
         for (const innerRequestItem of requestItem.items) {
-            const canCreateItem = await this.canCreateItem(innerRequestItem);
+            const canCreateItem = await this.canCreateItem(innerRequestItem, request, recipient);
             innerResults.push(canCreateItem);
         }
         const result = ValidationResult_1.ValidationResult.fromItems(innerResults);
@@ -6282,7 +6571,7 @@ function formatOffset(offset, format) {
 function timeObject(obj) {
   return pick(obj, ["hour", "minute", "second", "millisecond"]);
 }
-var ianaRegex = /[A-Za-z_+-]{1,256}(:?\/[A-Za-z0-9_+-]{1,256}(\/[A-Za-z0-9_+-]{1,256})?)?/;
+var ianaRegex = /[A-Za-z_+-]{1,256}(?::?\/[A-Za-z0-9_+-]{1,256}(?:\/[A-Za-z0-9_+-]{1,256})?)?/;
 
 /**
  * @private
@@ -7056,6 +7345,11 @@ var Zone = /*#__PURE__*/function () {
     get: function get() {
       throw new ZoneIsAbstractError();
     }
+  }, {
+    key: "ianaName",
+    get: function get() {
+      return this.name;
+    }
     /**
      * Returns whether the offset is known to be fixed for the whole year.
      * @abstract
@@ -7490,6 +7784,15 @@ var FixedOffsetZone = /*#__PURE__*/function (_Zone) {
     get: function get() {
       return this.fixed === 0 ? "UTC" : "UTC" + formatOffset(this.fixed, "narrow");
     }
+  }, {
+    key: "ianaName",
+    get: function get() {
+      if (this.fixed === 0) {
+        return "Etc/UTC";
+      } else {
+        return "Etc/GMT" + formatOffset(-this.fixed, "narrow");
+      }
+    }
   }, {
     key: "isUniversal",
     get: function get() {
@@ -8399,7 +8702,7 @@ function combineExtractors() {
           zone = _ex[1],
           next = _ex[2];
 
-      return [_extends({}, mergedVals, val), mergedZone || zone, next];
+      return [_extends({}, mergedVals, val), zone || mergedZone, next];
     }, [{}, null, 1]).slice(0, 2);
   };
 }
@@ -8445,19 +8748,20 @@ function simpleParse() {
 } // ISO and SQL parsing
 
 
-var offsetRegex = /(?:(Z)|([+-]\d\d)(?::?(\d\d))?)/,
-    isoTimeBaseRegex = /(\d\d)(?::?(\d\d)(?::?(\d\d)(?:[.,](\d{1,30}))?)?)?/,
-    isoTimeRegex = RegExp("" + isoTimeBaseRegex.source + offsetRegex.source + "?"),
-    isoTimeExtensionRegex = RegExp("(?:T" + isoTimeRegex.source + ")?"),
-    isoYmdRegex = /([+-]\d{6}|\d{4})(?:-?(\d\d)(?:-?(\d\d))?)?/,
-    isoWeekRegex = /(\d{4})-?W(\d\d)(?:-?(\d))?/,
-    isoOrdinalRegex = /(\d{4})-?(\d{3})/,
-    extractISOWeekData = simpleParse("weekYear", "weekNumber", "weekDay"),
-    extractISOOrdinalData = simpleParse("year", "ordinal"),
-    sqlYmdRegex = /(\d{4})-(\d\d)-(\d\d)/,
-    // dumbed-down version of the ISO one
-sqlTimeRegex = RegExp(isoTimeBaseRegex.source + " ?(?:" + offsetRegex.source + "|(" + ianaRegex.source + "))?"),
-    sqlTimeExtensionRegex = RegExp("(?: " + sqlTimeRegex.source + ")?");
+var offsetRegex = /(?:(Z)|([+-]\d\d)(?::?(\d\d))?)/;
+var isoExtendedZone = "(?:" + offsetRegex.source + "?(?:\\[(" + ianaRegex.source + ")\\])?)?";
+var isoTimeBaseRegex = /(\d\d)(?::?(\d\d)(?::?(\d\d)(?:[.,](\d{1,30}))?)?)?/;
+var isoTimeRegex = RegExp("" + isoTimeBaseRegex.source + isoExtendedZone);
+var isoTimeExtensionRegex = RegExp("(?:T" + isoTimeRegex.source + ")?");
+var isoYmdRegex = /([+-]\d{6}|\d{4})(?:-?(\d\d)(?:-?(\d\d))?)?/;
+var isoWeekRegex = /(\d{4})-?W(\d\d)(?:-?(\d))?/;
+var isoOrdinalRegex = /(\d{4})-?(\d{3})/;
+var extractISOWeekData = simpleParse("weekYear", "weekNumber", "weekDay");
+var extractISOOrdinalData = simpleParse("year", "ordinal");
+var sqlYmdRegex = /(\d{4})-(\d\d)-(\d\d)/; // dumbed-down version of the ISO one
+
+var sqlTimeRegex = RegExp(isoTimeBaseRegex.source + " ?(?:" + offsetRegex.source + "|(" + ianaRegex.source + "))?");
+var sqlTimeExtensionRegex = RegExp("(?: " + sqlTimeRegex.source + ")?");
 
 function int(match, pos, fallback) {
   var m = match[pos];
@@ -8632,11 +8936,11 @@ var isoYmdWithTimeExtensionRegex = combineRegexes(isoYmdRegex, isoTimeExtensionR
 var isoWeekWithTimeExtensionRegex = combineRegexes(isoWeekRegex, isoTimeExtensionRegex);
 var isoOrdinalWithTimeExtensionRegex = combineRegexes(isoOrdinalRegex, isoTimeExtensionRegex);
 var isoTimeCombinedRegex = combineRegexes(isoTimeRegex);
-var extractISOYmdTimeAndOffset = combineExtractors(extractISOYmd, extractISOTime, extractISOOffset);
-var extractISOWeekTimeAndOffset = combineExtractors(extractISOWeekData, extractISOTime, extractISOOffset);
-var extractISOOrdinalDateAndTime = combineExtractors(extractISOOrdinalData, extractISOTime, extractISOOffset);
-var extractISOTimeAndOffset = combineExtractors(extractISOTime, extractISOOffset);
-/**
+var extractISOYmdTimeAndOffset = combineExtractors(extractISOYmd, extractISOTime, extractISOOffset, extractIANAZone);
+var extractISOWeekTimeAndOffset = combineExtractors(extractISOWeekData, extractISOTime, extractISOOffset, extractIANAZone);
+var extractISOOrdinalDateAndTime = combineExtractors(extractISOOrdinalData, extractISOTime, extractISOOffset, extractIANAZone);
+var extractISOTimeAndOffset = combineExtractors(extractISOTime, extractISOOffset, extractIANAZone);
+/*
  * @private
  */
 
@@ -8658,10 +8962,9 @@ function parseISOTimeOnly(s) {
 }
 var sqlYmdWithTimeExtensionRegex = combineRegexes(sqlYmdRegex, sqlTimeExtensionRegex);
 var sqlTimeCombinedRegex = combineRegexes(sqlTimeRegex);
-var extractISOYmdTimeOffsetAndIANAZone = combineExtractors(extractISOYmd, extractISOTime, extractISOOffset, extractIANAZone);
 var extractISOTimeOffsetAndIANAZone = combineExtractors(extractISOTime, extractISOOffset, extractIANAZone);
 function parseSQL(s) {
-  return parse(s, [sqlYmdWithTimeExtensionRegex, extractISOYmdTimeOffsetAndIANAZone], [sqlTimeCombinedRegex, extractISOTimeOffsetAndIANAZone]);
+  return parse(s, [sqlYmdWithTimeExtensionRegex, extractISOYmdTimeAndOffset], [sqlTimeCombinedRegex, extractISOTimeOffsetAndIANAZone]);
 }
 
 var INVALID$2 = "Invalid Duration"; // unit conversion constants
@@ -10809,7 +11112,7 @@ function intUnit(regex, post) {
 }
 
 var NBSP = String.fromCharCode(160);
-var spaceOrNBSP = "( |" + NBSP + ")";
+var spaceOrNBSP = "[ " + NBSP + "]";
 var spaceOrNBSPRegExp = new RegExp(spaceOrNBSP, "g");
 
 function fixListRegex(s) {
@@ -11693,7 +11996,7 @@ function _toISODate(o, extended) {
   return c;
 }
 
-function _toISOTime(o, extended, suppressSeconds, suppressMilliseconds, includeOffset) {
+function _toISOTime(o, extended, suppressSeconds, suppressMilliseconds, includeOffset, extendedZone) {
   var c = padStart(o.c.hour);
 
   if (extended) {
@@ -11717,7 +12020,7 @@ function _toISOTime(o, extended, suppressSeconds, suppressMilliseconds, includeO
   }
 
   if (includeOffset) {
-    if (o.isOffsetFixed && o.offset === 0) {
+    if (o.isOffsetFixed && o.offset === 0 && !extendedZone) {
       c += "Z";
     } else if (o.o < 0) {
       c += "-";
@@ -11732,6 +12035,10 @@ function _toISOTime(o, extended, suppressSeconds, suppressMilliseconds, includeO
     }
   }
 
+  if (extendedZone) {
+    c += "[" + o.zone.ianaName + "]";
+  }
+
   return c;
 } // defaults for unspecified units in the supported calendars
 
@@ -12905,6 +13212,7 @@ var DateTime = /*#__PURE__*/function () {
    * @param {boolean} [opts.suppressMilliseconds=false] - exclude milliseconds from the format if they're 0
    * @param {boolean} [opts.suppressSeconds=false] - exclude seconds from the format if they're 0
    * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00'
+   * @param {boolean} [opts.extendedZone=true] - add the time zone format extension
    * @param {string} [opts.format='extended'] - choose between the basic and extended format
    * @example DateTime.utc(1983, 5, 25).toISO() //=> '1982-05-25T00:00:00.000Z'
    * @example DateTime.now().toISO() //=> '2017-04-22T20:47:05.335-04:00'
@@ -12923,7 +13231,9 @@ var DateTime = /*#__PURE__*/function () {
         _ref4$suppressMillise = _ref4.suppressMilliseconds,
         suppressMilliseconds = _ref4$suppressMillise === void 0 ? false : _ref4$suppressMillise,
         _ref4$includeOffset = _ref4.includeOffset,
-        includeOffset = _ref4$includeOffset === void 0 ? true : _ref4$includeOffset;
+        includeOffset = _ref4$includeOffset === void 0 ? true : _ref4$includeOffset,
+        _ref4$extendedZone = _ref4.extendedZone,
+        extendedZone = _ref4$extendedZone === void 0 ? false : _ref4$extendedZone;
 
     if (!this.isValid) {
       return null;
@@ -12934,7 +13244,7 @@ var DateTime = /*#__PURE__*/function () {
     var c = _toISODate(this, ext);
 
     c += "T";
-    c += _toISOTime(this, ext, suppressSeconds, suppressMilliseconds, includeOffset);
+    c += _toISOTime(this, ext, suppressSeconds, suppressMilliseconds, includeOffset, extendedZone);
     return c;
   }
   /**
@@ -12974,6 +13284,7 @@ var DateTime = /*#__PURE__*/function () {
    * @param {boolean} [opts.suppressMilliseconds=false] - exclude milliseconds from the format if they're 0
    * @param {boolean} [opts.suppressSeconds=false] - exclude seconds from the format if they're 0
    * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00'
+   * @param {boolean} [opts.extendedZone=true] - add the time zone format extension
    * @param {boolean} [opts.includePrefix=false] - include the `T` prefix
    * @param {string} [opts.format='extended'] - choose between the basic and extended format
    * @example DateTime.utc().set({ hour: 7, minute: 34 }).toISOTime() //=> '07:34:19.361Z'
@@ -12994,6 +13305,8 @@ var DateTime = /*#__PURE__*/function () {
         includeOffset = _ref6$includeOffset === void 0 ? true : _ref6$includeOffset,
         _ref6$includePrefix = _ref6.includePrefix,
         includePrefix = _ref6$includePrefix === void 0 ? false : _ref6$includePrefix,
+        _ref6$extendedZone = _ref6.extendedZone,
+        extendedZone = _ref6$extendedZone === void 0 ? false : _ref6$extendedZone,
         _ref6$format = _ref6.format,
         format = _ref6$format === void 0 ? "extended" : _ref6$format;
 
@@ -13002,7 +13315,7 @@ var DateTime = /*#__PURE__*/function () {
     }
 
     var c = includePrefix ? "T" : "";
-    return c + _toISOTime(this, format === "extended", suppressSeconds, suppressMilliseconds, includeOffset);
+    return c + _toISOTime(this, format === "extended", suppressSeconds, suppressMilliseconds, includeOffset, extendedZone);
   }
   /**
    * Returns an RFC 2822-compatible string representation of this DateTime
@@ -13809,7 +14122,8 @@ var DateTime = /*#__PURE__*/function () {
         return false;
       } else {
         return this.offset > this.set({
-          month: 1
+          month: 1,
+          day: 1
         }).offset || this.offset > this.set({
           month: 5
         }).offset;
@@ -14095,7 +14409,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-var VERSION = "2.3.2";
+var VERSION = "2.4.0";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;