@nmshd/consumption 2.0.0-alpha.22 → 2.0.0-alpha.26

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.22",
-    build: "41",
-    date: "2022-06-28T10:52:46+00:00",
-    commit: "08cce66412e885c884342f669400097d11956402",
+    version: "2.0.0-alpha.26",
+    build: "46",
+    date: "2022-07-06T13:53:17+00:00",
+    commit: "b07ccf5a6db88a9deae7622e1b57a00d3dc5f21b",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.0.1","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -306,6 +306,7 @@ __exportStar(__webpack_require__(/*! ./modules */ "./dist/modules/index.js"), ex
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.LocalAttributesController = void 0;
+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");
@@ -387,17 +388,15 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
         const items = await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
         return this.filterCurrent(items);
     }
-    async executeRelationshipAttributeQuery(params) {
-        const queryWithType = params.query;
-        queryWithType["attributeType"] = "RelationshipAttribute";
-        const dbQuery = QueryTranslator_1.relationshipQueryTranslator.parse(queryWithType);
+    async executeRelationshipAttributeQuery(query) {
+        const parsedQuery = content_1.RelationshipAttributeQuery.from(query);
+        const dbQuery = QueryTranslator_1.RelationshipAttributeQueryTranslator.translate(parsedQuery);
         const attributes = await this.attributes.find(dbQuery);
         return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
     }
-    async executeIdentityAttributeQuery(params) {
-        const queryWithType = params.query;
-        queryWithType["attributeType"] = "IdentityAttribute";
-        const dbQuery = QueryTranslator_1.identityQueryTranslator.parse(queryWithType);
+    async executeIdentityAttributeQuery(query) {
+        const parsedQuery = content_1.IdentityAttributeQuery.from(query);
+        const dbQuery = QueryTranslator_1.IdentityAttributeQueryTranslator.translate(parsedQuery);
         const attributes = await this.attributes.find(dbQuery);
         return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
     }
@@ -615,78 +614,6 @@ exports.CreateSharedLocalAttributeCopyParams = CreateSharedLocalAttributeCopyPar
 
 /***/ }),
 
-/***/ "./dist/modules/attributes/local/GetIdentityAttributesParams.js":
-/*!**********************************************************************!*\
-  !*** ./dist/modules/attributes/local/GetIdentityAttributesParams.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.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");
-class GetIdentityAttributesParams 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", content_1.IdentityAttributeQuery)
-], GetIdentityAttributesParams.prototype, "query", void 0);
-exports.GetIdentityAttributesParams = GetIdentityAttributesParams;
-//# sourceMappingURL=GetIdentityAttributesParams.js.map
-
-/***/ }),
-
-/***/ "./dist/modules/attributes/local/GetRelationshipAttributesParams.js":
-/*!**************************************************************************!*\
-  !*** ./dist/modules/attributes/local/GetRelationshipAttributesParams.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.GetRelationshipAttributesParams = 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 {
-    static from(value) {
-        return this.fromAny(value);
-    }
-}
-__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/local/LocalAttribute.js":
 /*!*********************************************************!*\
   !*** ./dist/modules/attributes/local/LocalAttribute.js ***!
@@ -825,11 +752,17 @@ exports.LocalAttributeShareInfo = LocalAttributeShareInfo;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.relationshipQueryTranslator = exports.identityQueryTranslator = void 0;
+exports.RelationshipAttributeQueryTranslator = exports.IdentityAttributeQueryTranslator = void 0;
 const docdb_querytranslator_1 = __webpack_require__(/*! @js-soft/docdb-querytranslator */ "./node_modules/@js-soft/docdb-querytranslator/dist/index.js");
 const luxon_1 = __webpack_require__(/*! luxon */ "./node_modules/luxon/build/cjs-browser/luxon.js");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
-exports.identityQueryTranslator = new docdb_querytranslator_1.QueryTranslator({
+class IdentityAttributeQueryTranslator {
+    static translate(query) {
+        return this.translator.parse({ ...query.toJSON(), attributeType: "IdentityAttribute" });
+    }
+}
+exports.IdentityAttributeQueryTranslator = IdentityAttributeQueryTranslator;
+IdentityAttributeQueryTranslator.translator = new docdb_querytranslator_1.QueryTranslator({
     whitelist: {
         [(0, ts_simple_nameof_1.nameof)((x) => x.tags)]: true,
         [(0, ts_simple_nameof_1.nameof)((x) => x.valueType)]: true,
@@ -848,16 +781,17 @@ exports.identityQueryTranslator = new docdb_querytranslator_1.QueryTranslator({
     custom: {
         // tags
         [(0, ts_simple_nameof_1.nameof)((x) => x.tags)]: (query, input) => {
-            const allowedTags = [];
-            for (const tag of input) {
-                const tagQuery = {
-                    [`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.tags)}`]: {
-                        $contains: tag
-                    }
-                };
-                allowedTags.push(tagQuery);
+            if (!input)
+                return;
+            if (!Array.isArray(input)) {
+                throw new Error("Invalid input: 'tags' must be an array");
             }
-            query["$or"] = allowedTags;
+            const inputAsArray = input;
+            query["$or"] = inputAsArray.map((t) => ({
+                [`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.tags)}`]: {
+                    $contains: t
+                }
+            }));
         },
         // validFrom
         [(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)]: (query, input) => {
@@ -865,10 +799,9 @@ exports.identityQueryTranslator = new docdb_querytranslator_1.QueryTranslator({
                 return;
             }
             const validFromUtcString = luxon_1.DateTime.fromISO(input).toUTC().toString();
-            query[`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)}`] =
-                {
-                    $gte: validFromUtcString
-                };
+            query[`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)}`] = {
+                $gte: validFromUtcString
+            };
         },
         // validTo
         [(0, ts_simple_nameof_1.nameof)((x) => x.validTo)]: (query, input) => {
@@ -882,7 +815,13 @@ exports.identityQueryTranslator = new docdb_querytranslator_1.QueryTranslator({
         }
     }
 });
-exports.relationshipQueryTranslator = new docdb_querytranslator_1.QueryTranslator({
+class RelationshipAttributeQueryTranslator {
+    static translate(query) {
+        return this.translator.parse({ ...query.toJSON(), attributeType: "RelationshipAttribute" });
+    }
+}
+exports.RelationshipAttributeQueryTranslator = RelationshipAttributeQueryTranslator;
+RelationshipAttributeQueryTranslator.translator = new docdb_querytranslator_1.QueryTranslator({
     whitelist: {
         [(0, ts_simple_nameof_1.nameof)((x) => x.key)]: true,
         [(0, ts_simple_nameof_1.nameof)((x) => x.valueType)]: true,
@@ -919,10 +858,9 @@ exports.relationshipQueryTranslator = new docdb_querytranslator_1.QueryTranslato
                 return;
             }
             const validFromUtcString = luxon_1.DateTime.fromISO(input).toUTC().toString();
-            query[`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)}`] =
-                {
-                    $gte: validFromUtcString
-                };
+            query[`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)}`] = {
+                $gte: validFromUtcString
+            };
         },
         // validTo
         [(0, ts_simple_nameof_1.nameof)((x) => x.validTo)]: (query, input) => {
@@ -1187,8 +1125,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./attributes/local/CreateLocalAttributeParams */ "./dist/modules/attributes/local/CreateLocalAttributeParams.js"), exports);
 __exportStar(__webpack_require__(/*! ./attributes/local/CreatePeerLocalAttributeParams */ "./dist/modules/attributes/local/CreatePeerLocalAttributeParams.js"), exports);
 __exportStar(__webpack_require__(/*! ./attributes/local/CreateSharedLocalAttributeCopyParams */ "./dist/modules/attributes/local/CreateSharedLocalAttributeCopyParams.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/LocalAttribute */ "./dist/modules/attributes/local/LocalAttribute.js"), exports);
 __exportStar(__webpack_require__(/*! ./attributes/local/LocalAttributeShareInfo */ "./dist/modules/attributes/local/LocalAttributeShareInfo.js"), exports);
 __exportStar(__webpack_require__(/*! ./attributes/local/SucceedLocalAttributeParams */ "./dist/modules/attributes/local/SucceedLocalAttributeParams.js"), exports);
@@ -1215,7 +1151,6 @@ __exportStar(__webpack_require__(/*! ./requests/itemProcessors/IRequestItemProce
 __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);
@@ -1513,10 +1448,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
     }
     async decideGroup(groupItemParam, requestItemGroup, request) {
         const items = (await this.decideItems(groupItemParam.items, requestItemGroup.items, request));
-        const group = content_1.ResponseItemGroup.from({
-            items: items,
-            metadata: requestItemGroup.responseMetadata
-        });
+        const group = content_1.ResponseItemGroup.from({ items: items });
         return group;
     }
     async decideItems(params, requestItems, request) {
@@ -1943,16 +1875,10 @@ class GenericRequestItemProcessor extends AbstractRequestItemProcessor_1.Abstrac
         return ValidationResult_1.ValidationResult.success();
     }
     accept(requestItem, params, requestInfo) {
-        return content_1.AcceptResponseItem.from({
-            result: content_1.ResponseItemResult.Accepted,
-            metadata: requestItem.responseMetadata
-        });
+        return content_1.AcceptResponseItem.from({ result: content_1.ResponseItemResult.Accepted });
     }
     reject(requestItem, params, requestInfo) {
-        return content_1.RejectResponseItem.from({
-            result: content_1.ResponseItemResult.Rejected,
-            metadata: requestItem.responseMetadata
-        });
+        return content_1.RejectResponseItem.from({ result: content_1.ResponseItemResult.Rejected });
     }
     canCreateOutgoingRequestItem(requestItem, request, recipient) {
         return ValidationResult_1.ValidationResult.success();
@@ -2169,8 +2095,7 @@ class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.
         });
         return content_1.CreateAttributeAcceptResponseItem.from({
             attributeId: peerLocalAttribute.id,
-            result: content_1.ResponseItemResult.Accepted,
-            metadata: requestItem.responseMetadata
+            result: content_1.ResponseItemResult.Accepted
         });
     }
     async applyIncomingResponseItem(responseItem, requestItem, requestInfo) {
@@ -2371,16 +2296,23 @@ 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 AcceptReadAttributeRequestItemParameters = AcceptReadAttributeRequestItemParameters_1 = class AcceptReadAttributeRequestItemParameters extends ts_serval_1.Serializable {
+    isWithExistingAttribute() {
+        return this.attributeId !== undefined;
+    }
+    isWithNewAttribute() {
+        return this.newAttributeValue !== undefined;
+    }
     static from(value) {
         return this.fromAny(value);
     }
     static postFrom(value) {
-        const typedValue = value;
-        if (typedValue.attributeId && typedValue.attribute) {
-            throw new ts_serval_1.ValidationError(AcceptReadAttributeRequestItemParameters_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 (!(value instanceof AcceptReadAttributeRequestItemParameters_1))
+            throw new Error("this should never happen");
+        if (value.attributeId && value.newAttributeValue) {
+            throw new ts_serval_1.ValidationError(AcceptReadAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.newAttributeValue), `You cannot specify both ${(0, ts_simple_nameof_1.nameof)((x) => x.newAttributeValue)} and ${(0, ts_simple_nameof_1.nameof)((x) => x.attributeId)}.`);
         }
-        if (!typedValue.attributeId && !typedValue.attribute) {
-            throw new ts_serval_1.ValidationError(AcceptReadAttributeRequestItemParameters_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)}.`);
+        if (!value.attributeId && !value.newAttributeValue) {
+            throw new ts_serval_1.ValidationError(AcceptReadAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.newAttributeValue), `You have to specify either ${(0, ts_simple_nameof_1.nameof)((x) => x.newAttributeValue)} or ${(0, ts_simple_nameof_1.nameof)((x) => x.attributeId)}.`);
         }
         return value;
     }
@@ -2394,7 +2326,7 @@ __decorate([
     (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttribute, content_1.RelationshipAttribute] }),
     (0, ts_serval_1.validate)({ nullable: true }),
     __metadata("design:type", Object)
-], AcceptReadAttributeRequestItemParameters.prototype, "attribute", void 0);
+], AcceptReadAttributeRequestItemParameters.prototype, "newAttributeValue", void 0);
 AcceptReadAttributeRequestItemParameters = AcceptReadAttributeRequestItemParameters_1 = __decorate([
     (0, ts_serval_1.type)("AcceptReadAttributeRequestItemParameters")
 ], AcceptReadAttributeRequestItemParameters);
@@ -2434,7 +2366,7 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
     }
     async canAccept(_requestItem, params, requestInfo) {
         const parsedParams = AcceptReadAttributeRequestItemParameters_1.AcceptReadAttributeRequestItemParameters.from(params);
-        if (parsedParams.attributeId) {
+        if (parsedParams.isWithExistingAttribute()) {
             const foundAttribute = await this.consumptionController.attributes.getLocalAttribute(parsedParams.attributeId);
             if (!foundAttribute) {
                 return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, requestInfo.id.toString()));
@@ -2448,11 +2380,11 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
     async accept(_requestItem, params, requestInfo) {
         const parsedParams = AcceptReadAttributeRequestItemParameters_1.AcceptReadAttributeRequestItemParameters.from(params);
         let sharedLocalAttribute;
-        if (parsedParams.attributeId) {
+        if (parsedParams.isWithExistingAttribute()) {
             sharedLocalAttribute = await this.copyExistingAttribute(parsedParams.attributeId, requestInfo);
         }
         else {
-            sharedLocalAttribute = await this.createNewAttribute(parsedParams.attribute, requestInfo);
+            sharedLocalAttribute = await this.createNewAttribute(parsedParams.newAttributeValue, requestInfo);
         }
         return content_1.ReadAttributeAcceptResponseItem.from({
             result: content_1.ResponseItemResult.Accepted,