@nmshd/content 2.0.0-alpha.33 → 2.0.0-alpha.34

package/dist/buildInformation.js

@@ -5,10 +5,10 @@ const ts_serval_1 = require("@js-soft/ts-serval");
 const crypto_1 = require("@nmshd/crypto");
 const transport_1 = require("@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-alpha.33",
-    build: "63",
-    date: "2022-06-07T13:00:13+00:00",
-    commit: "5de28c400ead3ef3ca61ca44c7d6063044692350",
+    version: "2.0.0-alpha.34",
+    build: "64",
+    date: "2022-06-10T13:31:36+00:00",
+    commit: "9b6c65f0648fc110c4b010147ad54f59d972436d",
     dependencies: {"@js-soft/logging-abstractions":"^1.0.0"},
     libraries: {
         serval: ts_serval_1.buildInformation,

package/dist/requests/items/proposeAttribute/ProposeAttributeRequestItem.d.ts

@@ -1,3 +1,4 @@
+import { Serializable } from "@js-soft/ts-serval";
 import { IdentityAttribute, IdentityAttributeJSON, IdentityAttributeQuery, IdentityAttributeQueryJSON, IIdentityAttribute, IIdentityAttributeQuery, IRelationshipAttribute, IRelationshipAttributeQuery, RelationshipAttribute, RelationshipAttributeJSON, RelationshipAttributeQuery, RelationshipAttributeQueryJSON } from "../../../attributes";
 import { IRequestItem, RequestItem, RequestItemJSON } from "../../RequestItem";
 export interface ProposeAttributeRequestItemJSON extends RequestItemJSON {
@@ -12,4 +13,5 @@ export declare class ProposeAttributeRequestItem extends RequestItem implements
     query: IdentityAttributeQuery | RelationshipAttributeQuery;
     attribute: IdentityAttribute | RelationshipAttribute;
     static from(value: IProposeAttributeRequestItem): ProposeAttributeRequestItem;
+    protected static postFrom<T extends Serializable>(value: T): T;
 }

package/dist/requests/items/proposeAttribute/ProposeAttributeRequestItem.js

@@ -8,15 +8,33 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var ProposeAttributeRequestItem_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProposeAttributeRequestItem = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
+const ts_simple_nameof_1 = require("ts-simple-nameof");
 const attributes_1 = require("../../../attributes");
 const RequestItem_1 = require("../../RequestItem");
-let ProposeAttributeRequestItem = class ProposeAttributeRequestItem extends RequestItem_1.RequestItem {
+let ProposeAttributeRequestItem = ProposeAttributeRequestItem_1 = class ProposeAttributeRequestItem extends RequestItem_1.RequestItem {
     static from(value) {
         return this.fromAny(value);
     }
+    static postFrom(value) {
+        if (!(value instanceof ProposeAttributeRequestItem_1))
+            throw new Error("this should never happen");
+        const attributeValueType = value.attribute.value.toJSON()["@type"];
+        const queryValueType = value.query.valueType;
+        if (attributeValueType !== queryValueType) {
+            throw new ts_serval_1.ValidationError(ProposeAttributeRequestItem_1.name, `${(0, ts_simple_nameof_1.nameof)((x) => x.query)}.${(0, ts_simple_nameof_1.nameof)((x) => x.valueType)}`, `You cannot propose an Attribute whose type of the value ('${attributeValueType}') is different from the value type of the query ('${queryValueType}').`);
+        }
+        if (value.attribute instanceof attributes_1.RelationshipAttribute && !(value.query instanceof attributes_1.RelationshipAttributeQuery)) {
+            throw new ts_serval_1.ValidationError(ProposeAttributeRequestItem_1.name, "", "When proposing a RelationshipAttribute, the corresponding query has to be a RelationshipAttributeQuery.");
+        }
+        if (value.attribute instanceof attributes_1.IdentityAttribute && !(value.query instanceof attributes_1.IdentityAttributeQuery)) {
+            throw new ts_serval_1.ValidationError(ProposeAttributeRequestItem_1.name, "", "When proposing an IdentityAttribute, the corresponding query has to be a IdentityAttributeQuery.");
+        }
+        return value;
+    }
 };
 __decorate([
     (0, ts_serval_1.serialize)({ unionTypes: [attributes_1.IdentityAttributeQuery, attributes_1.RelationshipAttributeQuery] }),
@@ -28,7 +46,7 @@ __decorate([
     (0, ts_serval_1.validate)(),
     __metadata("design:type", Object)
 ], ProposeAttributeRequestItem.prototype, "attribute", void 0);
-ProposeAttributeRequestItem = __decorate([
+ProposeAttributeRequestItem = ProposeAttributeRequestItem_1 = __decorate([
     (0, ts_serval_1.type)("ProposeAttributeRequestItem")
 ], ProposeAttributeRequestItem);
 exports.ProposeAttributeRequestItem = ProposeAttributeRequestItem;

package/dist/requests/items/proposeAttribute/ProposeAttributeRequestItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProposeAttributeRequestItem.js","sourceRoot":"","sources":["../../../../src/requests/items/proposeAttribute/ProposeAttributeRequestItem.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAC9D,oDAa4B;AAC5B,mDAA8E;AAY9E,IAAa,2BAA2B,GAAxC,MAAa,2BAA4B,SAAQ,yBAAW;IASjD,MAAM,CAAC,IAAI,CAAC,KAAmC;QAClD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ,CAAA;AATG;IAFC,IAAA,qBAAS,EAAC,EAAE,UAAU,EAAE,CAAC,mCAAsB,EAAE,uCAA0B,CAAC,EAAE,CAAC;IAC/E,IAAA,oBAAQ,GAAE;;0DACsD;AAIjE;IAFC,IAAA,qBAAS,EAAC,EAAE,UAAU,EAAE,CAAC,8BAAiB,EAAE,kCAAqB,CAAC,EAAE,CAAC;IACrE,IAAA,oBAAQ,GAAE;;8DACgD;AAPlD,2BAA2B;IADvC,IAAA,gBAAI,EAAC,6BAA6B,CAAC;GACvB,2BAA2B,CAYvC;AAZY,kEAA2B"}
+{"version":3,"file":"ProposeAttributeRequestItem.js","sourceRoot":"","sources":["../../../../src/requests/items/proposeAttribute/ProposeAttributeRequestItem.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA6F;AAC7F,uDAAyC;AACzC,oDAc4B;AAC5B,mDAA8E;AAa9E,IAAa,2BAA2B,mCAAxC,MAAa,2BAA4B,SAAQ,yBAAW;IASjD,MAAM,CAAC,IAAI,CAAC,KAAmC;QAClD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IAES,MAAM,CAAU,QAAQ,CAAyB,KAAQ;QAC/D,IAAI,CAAC,CAAC,KAAK,YAAY,6BAA2B,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;QAEhG,MAAM,kBAAkB,GAAI,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAU,CAAC,OAAO,CAAC,CAAA;QAC3E,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAA;QAE5C,IAAI,kBAAkB,KAAK,cAAc,EAAE;YACvC,MAAM,IAAI,2BAAe,CACrB,6BAA2B,CAAC,IAAI,EAChC,GAAG,IAAA,yBAAM,EAA8B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAM,EAC5D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CACrB,EAAE,EACH,6DAA6D,kBAAkB,sDAAsD,cAAc,KAAK,CAC3J,CAAA;SACJ;QAED,IAAI,KAAK,CAAC,SAAS,YAAY,kCAAqB,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,YAAY,uCAA0B,CAAC,EAAE;YAC1G,MAAM,IAAI,2BAAe,CACrB,6BAA2B,CAAC,IAAI,EAChC,EAAE,EACF,yGAAyG,CAC5G,CAAA;SACJ;QAED,IAAI,KAAK,CAAC,SAAS,YAAY,8BAAiB,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,YAAY,mCAAsB,CAAC,EAAE;YAClG,MAAM,IAAI,2BAAe,CACrB,6BAA2B,CAAC,IAAI,EAChC,EAAE,EACF,kGAAkG,CACrG,CAAA;SACJ;QAED,OAAO,KAAK,CAAA;IAChB,CAAC;CACJ,CAAA;AA5CG;IAFC,IAAA,qBAAS,EAAC,EAAE,UAAU,EAAE,CAAC,mCAAsB,EAAE,uCAA0B,CAAC,EAAE,CAAC;IAC/E,IAAA,oBAAQ,GAAE;;0DACsD;AAIjE;IAFC,IAAA,qBAAS,EAAC,EAAE,UAAU,EAAE,CAAC,8BAAiB,EAAE,kCAAqB,CAAC,EAAE,CAAC;IACrE,IAAA,oBAAQ,GAAE;;8DACgD;AAPlD,2BAA2B;IADvC,IAAA,gBAAI,EAAC,6BAA6B,CAAC;GACvB,2BAA2B,CA+CvC;AA/CY,kEAA2B"}

package/lib-web/nmshd.content.js

@@ -4929,10 +4929,10 @@ const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-s
 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.33",
-    build: "63",
-    date: "2022-06-07T13:00:13+00:00",
-    commit: "5de28c400ead3ef3ca61ca44c7d6063044692350",
+    version: "2.0.0-alpha.34",
+    build: "64",
+    date: "2022-06-10T13:31:36+00:00",
+    commit: "9b6c65f0648fc110c4b010147ad54f59d972436d",
     dependencies: {"@js-soft/logging-abstractions":"^1.0.0"},
     libraries: {
         serval: ts_serval_1.buildInformation,
@@ -6025,15 +6025,33 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var ProposeAttributeRequestItem_1;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ProposeAttributeRequestItem = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
+const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
 const attributes_1 = __webpack_require__(/*! ../../../attributes */ "./dist/attributes/index.js");
 const RequestItem_1 = __webpack_require__(/*! ../../RequestItem */ "./dist/requests/RequestItem.js");
-let ProposeAttributeRequestItem = class ProposeAttributeRequestItem extends RequestItem_1.RequestItem {
+let ProposeAttributeRequestItem = ProposeAttributeRequestItem_1 = class ProposeAttributeRequestItem extends RequestItem_1.RequestItem {
     static from(value) {
         return this.fromAny(value);
     }
+    static postFrom(value) {
+        if (!(value instanceof ProposeAttributeRequestItem_1))
+            throw new Error("this should never happen");
+        const attributeValueType = value.attribute.value.toJSON()["@type"];
+        const queryValueType = value.query.valueType;
+        if (attributeValueType !== queryValueType) {
+            throw new ts_serval_1.ValidationError(ProposeAttributeRequestItem_1.name, `${(0, ts_simple_nameof_1.nameof)((x) => x.query)}.${(0, ts_simple_nameof_1.nameof)((x) => x.valueType)}`, `You cannot propose an Attribute whose type of the value ('${attributeValueType}') is different from the value type of the query ('${queryValueType}').`);
+        }
+        if (value.attribute instanceof attributes_1.RelationshipAttribute && !(value.query instanceof attributes_1.RelationshipAttributeQuery)) {
+            throw new ts_serval_1.ValidationError(ProposeAttributeRequestItem_1.name, "", "When proposing a RelationshipAttribute, the corresponding query has to be a RelationshipAttributeQuery.");
+        }
+        if (value.attribute instanceof attributes_1.IdentityAttribute && !(value.query instanceof attributes_1.IdentityAttributeQuery)) {
+            throw new ts_serval_1.ValidationError(ProposeAttributeRequestItem_1.name, "", "When proposing an IdentityAttribute, the corresponding query has to be a IdentityAttributeQuery.");
+        }
+        return value;
+    }
 };
 __decorate([
     (0, ts_serval_1.serialize)({ unionTypes: [attributes_1.IdentityAttributeQuery, attributes_1.RelationshipAttributeQuery] }),
@@ -6045,7 +6063,7 @@ __decorate([
     (0, ts_serval_1.validate)(),
     __metadata("design:type", Object)
 ], ProposeAttributeRequestItem.prototype, "attribute", void 0);
-ProposeAttributeRequestItem = __decorate([
+ProposeAttributeRequestItem = ProposeAttributeRequestItem_1 = __decorate([
     (0, ts_serval_1.type)("ProposeAttributeRequestItem")
 ], ProposeAttributeRequestItem);
 exports.ProposeAttributeRequestItem = ProposeAttributeRequestItem;