@nmshd/consumption 2.0.0-alpha.1 → 2.0.0-alpha.10

package/dist/buildInformation.js

@@ -6,10 +6,10 @@ const content_1 = require("@nmshd/content");
 const crypto_1 = require("@nmshd/crypto");
 const transport_1 = require("@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-alpha.1",
-    build: "19",
-    date: "2022-04-22T11:52:27+00:00",
-    commit: "012b8a9a2b885dd7d176deb14a13034e1202c045",
+    version: "2.0.0-alpha.10",
+    build: "28",
+    date: "2022-05-11T12:01:34+00:00",
+    commit: "892eabe38da61c385212b8462e7aa05e81a38719",
     dependencies: {},
     libraries: {
         transport: transport_1.buildInformation,

package/dist/consumption/ConsumptionBaseController.d.ts

@@ -1,5 +1,5 @@
 import { ILogger } from "@js-soft/logging-abstractions";
-import { Serializable, SerializableAsync } from "@js-soft/ts-serval";
+import { CoreSerializable } from "@nmshd/transport";
 import { ConsumptionController } from "./ConsumptionController";
 import { ConsumptionControllerName } from "./ConsumptionControllerName";
 export declare class ConsumptionBaseController {
@@ -8,7 +8,6 @@ export declare class ConsumptionBaseController {
     get log(): ILogger;
     get parent(): ConsumptionController;
     constructor(controllerName: ConsumptionControllerName, _parent: ConsumptionController);
-    init(): Promise<ConsumptionBaseController>;
-    protected parseObject<T extends SerializableAsync | Serializable>(value: Object, type: new () => T): Promise<T>;
-    protected parseArray<T extends SerializableAsync | Serializable>(value: Object[], type: new () => T, contentProperty?: string): Promise<T[]>;
+    init(): Promise<this>;
+    protected parseArray<T extends CoreSerializable | CoreSerializable>(values: Object[], type: new () => T): Promise<T[]>;
 }

package/dist/consumption/ConsumptionBaseController.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsumptionBaseController = void 0;
-const ts_serval_1 = require("@js-soft/ts-serval");
 const transport_1 = require("@nmshd/transport");
 class ConsumptionBaseController {
     constructor(controllerName, _parent) {
@@ -17,28 +16,9 @@ class ConsumptionBaseController {
     init() {
         return Promise.resolve(this);
     }
-    async parseObject(value, type) {
-        return await ts_serval_1.SerializableAsync.fromT(value, type);
-    }
-    async parseArray(value, type, contentProperty) {
-        const parsingPromises = [];
-        for (let i = 0, l = value.length; i < l; i++) {
-            if (contentProperty) {
-                const item = value[i];
-                if (item[contentProperty]) {
-                    parsingPromises.push(this.parseObject(item[contentProperty], type));
-                }
-                else {
-                    const error = transport_1.TransportErrors.controller.contentPropertyUndefined(contentProperty);
-                    this._log.error(error);
-                    throw error;
-                }
-            }
-            else {
-                parsingPromises.push(this.parseObject(value[i], type));
-            }
-        }
-        return await Promise.all(parsingPromises);
+    async parseArray(values, type) {
+        const parsePromises = values.map((v) => type.from(v));
+        return await Promise.all(parsePromises);
     }
 }
 exports.ConsumptionBaseController = ConsumptionBaseController;

package/dist/consumption/ConsumptionBaseController.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConsumptionBaseController.js","sourceRoot":"","sources":["../../src/consumption/ConsumptionBaseController.ts"],"names":[],"mappings":";;;AACA,kDAAoE;AACpE,gDAA0E;AAI1E,MAAa,yBAAyB;IAUlC,YAAmB,cAAyC,EAAY,OAA8B;QAA9B,YAAO,GAAP,OAAO,CAAuB;QAClG,IAAI,CAAC,IAAI,GAAG,kCAAsB,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;IAChE,CAAC;IAVD,IAAW,GAAG;QACV,OAAO,IAAI,CAAC,IAAI,CAAA;IACpB,CAAC;IAED,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAMM,IAAI;QACP,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAES,KAAK,CAAC,WAAW,CACvB,KAAa,EACb,IAAiB;QAEjB,OAAO,MAAM,6BAAiB,CAAC,KAAK,CAAI,KAAK,EAAE,IAAI,CAAC,CAAA;IACxD,CAAC;IAES,KAAK,CAAC,UAAU,CACtB,KAAe,EACf,IAAiB,EACjB,eAAwB;QAExB,MAAM,eAAe,GAAiB,EAAE,CAAA;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1C,IAAI,eAAe,EAAE;gBACjB,MAAM,IAAI,GAAQ,KAAK,CAAC,CAAC,CAAC,CAAA;gBAC1B,IAAI,IAAI,CAAC,eAAe,CAAC,EAAE;oBACvB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;iBACtE;qBAAM;oBACH,MAAM,KAAK,GAAG,2BAAe,CAAC,UAAU,CAAC,wBAAwB,CAAC,eAAe,CAAC,CAAA;oBAClF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;oBACtB,MAAM,KAAK,CAAA;iBACd;aACJ;iBAAM;gBACH,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;aACzD;SACJ;QACD,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAC7C,CAAC;CACJ;AA/CD,8DA+CC"}
+{"version":3,"file":"ConsumptionBaseController.js","sourceRoot":"","sources":["../../src/consumption/ConsumptionBaseController.ts"],"names":[],"mappings":";;;AACA,gDAA2E;AAI3E,MAAa,yBAAyB;IAUlC,YAAmB,cAAyC,EAAY,OAA8B;QAA9B,YAAO,GAAP,OAAO,CAAuB;QAClG,IAAI,CAAC,IAAI,GAAG,kCAAsB,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;IAChE,CAAC;IAVD,IAAW,GAAG;QACV,OAAO,IAAI,CAAC,IAAI,CAAA;IACpB,CAAC;IAED,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAMM,IAAI;QACP,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAES,KAAK,CAAC,UAAU,CACtB,MAAgB,EAChB,IAAiB;QAEjB,MAAM,aAAa,GAAiB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,IAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QAC5E,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;CACJ;AAzBD,8DAyBC"}

package/dist/consumption/ConsumptionController.d.ts

@@ -1,5 +1,5 @@
 import { AccountController, Transport } from "@nmshd/transport";
-import { ConsumptionAttributesController, DraftsController, OutgoingRequestsController, RelationshipInfoController, SettingsController, SharedItemsController } from "../modules";
+import { ConsumptionAttributesController, DraftsController, OutgoingRequestsController, ProcessorConstructor, RequestItemConstructor, SettingsController } from "../modules";
 import { IncomingRequestsController } from "../modules/requests/incoming/IncomingRequestsController";
 export declare class ConsumptionController {
     readonly transport: Transport;
@@ -15,9 +15,8 @@ export declare class ConsumptionController {
     get incomingRequests(): IncomingRequestsController;
     private _settings;
     get settings(): SettingsController;
-    private _sharedItems;
-    get sharedItems(): SharedItemsController;
-    private _relationshipInfo;
-    get relationshipInfo(): RelationshipInfoController;
-    init(): Promise<ConsumptionController>;
+    init(requestItemProcessors?: {
+        processorConstructor: ProcessorConstructor;
+        itemConstructor: RequestItemConstructor;
+    }[]): Promise<ConsumptionController>;
 }

package/dist/consumption/ConsumptionController.js

@@ -23,21 +23,13 @@ class ConsumptionController {
     get settings() {
         return this._settings;
     }
-    get sharedItems() {
-        return this._sharedItems;
-    }
-    get relationshipInfo() {
-        return this._relationshipInfo;
-    }
-    async init() {
+    async init(requestItemProcessors = []) {
         this._attributes = await new modules_1.ConsumptionAttributesController(this).init();
         this._drafts = await new modules_1.DraftsController(this).init();
-        const processorRegistry = new modules_1.RequestItemProcessorRegistry();
-        this._outgoingRequests = await new modules_1.OutgoingRequestsController(this, processorRegistry).init();
-        this._incomingRequests = await new IncomingRequestsController_1.IncomingRequestsController(this, processorRegistry).init();
+        const processorRegistry = new modules_1.RequestItemProcessorRegistry(requestItemProcessors);
+        this._outgoingRequests = await new modules_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 modules_1.SettingsController(this).init();
-        this._sharedItems = await new modules_1.SharedItemsController(this).init();
-        this._relationshipInfo = await new modules_1.RelationshipInfoController(this).init();
         return this;
     }
 }

package/dist/consumption/ConsumptionController.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConsumptionController.js","sourceRoot":"","sources":["../../src/consumption/ConsumptionController.ts"],"names":[],"mappings":";;;AACA,wCAQmB;AACnB,wGAAoG;AAEpG,MAAa,qBAAqB;IAC9B,YAAmC,SAAoB,EAAkB,iBAAoC;QAA1E,cAAS,GAAT,SAAS,CAAW;QAAkB,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAGjH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAA;IAC3B,CAAC;IAGD,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAGD,IAAW,gBAAgB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAA;IACjC,CAAC;IAGD,IAAW,gBAAgB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAA;IACjC,CAAC;IAGD,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,CAAC;IAGD,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,YAAY,CAAA;IAC5B,CAAC;IAGD,IAAW,gBAAgB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAA;IACjC,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,yCAA+B,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;QACzE,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,0BAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;QACtD,MAAM,iBAAiB,GAAG,IAAI,sCAA4B,EAAE,CAAA;QAC5D,IAAI,CAAC,iBAAiB,GAAG,MAAM,IAAI,oCAA0B,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,IAAI,EAAE,CAAA;QAC7F,IAAI,CAAC,iBAAiB,GAAG,MAAM,IAAI,uDAA0B,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,IAAI,EAAE,CAAA;QAC7F,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,4BAAkB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;QAC1D,IAAI,CAAC,YAAY,GAAG,MAAM,IAAI,+BAAqB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;QAChE,IAAI,CAAC,iBAAiB,GAAG,MAAM,IAAI,oCAA0B,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;QAC1E,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;AAjDD,sDAiDC"}
+{"version":3,"file":"ConsumptionController.js","sourceRoot":"","sources":["../../src/consumption/ConsumptionController.ts"],"names":[],"mappings":";;;AACA,wCAQmB;AACnB,wGAAoG;AAEpG,MAAa,qBAAqB;IAC9B,YAAmC,SAAoB,EAAkB,iBAAoC;QAA1E,cAAS,GAAT,SAAS,CAAW;QAAkB,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAGjH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAA;IAC3B,CAAC;IAGD,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAGD,IAAW,gBAAgB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAA;IACjC,CAAC;IAGD,IAAW,gBAAgB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAA;IACjC,CAAC;IAGD,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,CAAC;IAEM,KAAK,CAAC,IAAI,CACb,wBAGM,EAAE;QAER,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,yCAA+B,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;QACzE,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,0BAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;QACtD,MAAM,iBAAiB,GAAG,IAAI,sCAA4B,CAAC,qBAAqB,CAAC,CAAA;QACjF,IAAI,CAAC,iBAAiB,GAAG,MAAM,IAAI,oCAA0B,CACzD,MAAM,IAAI,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,UAAU,CAAC,EAClE,iBAAiB,EACjB,IAAI,CACP,CAAC,IAAI,EAAE,CAAA;QACR,IAAI,CAAC,iBAAiB,GAAG,MAAM,IAAI,uDAA0B,CACzD,MAAM,IAAI,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,UAAU,CAAC,EAClE,iBAAiB,EACjB,IAAI,CACP,CAAC,IAAI,EAAE,CAAA;QACR,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,4BAAkB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;QAC1D,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;AAlDD,sDAkDC"}

package/dist/consumption/ConsumptionIds.d.ts

@@ -1,10 +1,7 @@
 import { CoreIdHelper } from "@nmshd/transport";
 export declare class ConsumptionIds {
-    static readonly attribute: CoreIdHelper;
     static readonly draft: CoreIdHelper;
-    static readonly relationshipInfo: CoreIdHelper;
-    static readonly sharedItem: CoreIdHelper;
-    static readonly response: CoreIdHelper;
-    static readonly request: CoreIdHelper;
     static readonly setting: CoreIdHelper;
+    static readonly attribute: CoreIdHelper;
+    static readonly request: CoreIdHelper;
 }

package/dist/consumption/ConsumptionIds.js

@@ -5,11 +5,8 @@ const transport_1 = require("@nmshd/transport");
 class ConsumptionIds {
 }
 exports.ConsumptionIds = ConsumptionIds;
-ConsumptionIds.attribute = new transport_1.CoreIdHelper("CNSATT");
-ConsumptionIds.draft = new transport_1.CoreIdHelper("CNSDRF");
-ConsumptionIds.relationshipInfo = new transport_1.CoreIdHelper("CNSRIN");
-ConsumptionIds.sharedItem = new transport_1.CoreIdHelper("CNSSIT");
-ConsumptionIds.response = new transport_1.CoreIdHelper("CNSRES");
-ConsumptionIds.request = new transport_1.CoreIdHelper("CNSREQ");
-ConsumptionIds.setting = new transport_1.CoreIdHelper("CNSSET");
+ConsumptionIds.draft = new transport_1.CoreIdHelper("LCLDRF");
+ConsumptionIds.setting = new transport_1.CoreIdHelper("LCLSET");
+ConsumptionIds.attribute = new transport_1.CoreIdHelper("ATT");
+ConsumptionIds.request = new transport_1.CoreIdHelper("REQ");
 //# sourceMappingURL=ConsumptionIds.js.map

package/dist/consumption/ConsumptionIds.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConsumptionIds.js","sourceRoot":"","sources":["../../src/consumption/ConsumptionIds.ts"],"names":[],"mappings":";;;AAAA,gDAA+C;AAE/C,MAAa,cAAc;;AAA3B,wCAQC;AAP0B,wBAAS,GAAG,IAAI,wBAAY,CAAC,QAAQ,CAAC,CAAA;AACtC,oBAAK,GAAG,IAAI,wBAAY,CAAC,QAAQ,CAAC,CAAA;AAClC,+BAAgB,GAAG,IAAI,wBAAY,CAAC,QAAQ,CAAC,CAAA;AAC7C,yBAAU,GAAG,IAAI,wBAAY,CAAC,QAAQ,CAAC,CAAA;AACvC,uBAAQ,GAAG,IAAI,wBAAY,CAAC,QAAQ,CAAC,CAAA;AACrC,sBAAO,GAAG,IAAI,wBAAY,CAAC,QAAQ,CAAC,CAAA;AACpC,sBAAO,GAAG,IAAI,wBAAY,CAAC,QAAQ,CAAC,CAAA"}
+{"version":3,"file":"ConsumptionIds.js","sourceRoot":"","sources":["../../src/consumption/ConsumptionIds.ts"],"names":[],"mappings":";;;AAAA,gDAA+C;AAE/C,MAAa,cAAc;;AAA3B,wCAMC;AAL0B,oBAAK,GAAG,IAAI,wBAAY,CAAC,QAAQ,CAAC,CAAA;AAClC,sBAAO,GAAG,IAAI,wBAAY,CAAC,QAAQ,CAAC,CAAA;AAEpC,wBAAS,GAAG,IAAI,wBAAY,CAAC,KAAK,CAAC,CAAA;AACnC,sBAAO,GAAG,IAAI,wBAAY,CAAC,KAAK,CAAC,CAAA"}

package/dist/modules/attributes/ConsumptionAttributesController.d.ts

@@ -5,7 +5,7 @@ import { ConsumptionAttribute } from "./local/ConsumptionAttribute";
 export declare class ConsumptionAttributesController extends ConsumptionBaseController {
     private attributes;
     constructor(parent: ConsumptionController);
-    init(): Promise<ConsumptionAttributesController>;
+    init(): Promise<this>;
     checkValid(attribute: ConsumptionAttribute): boolean;
     findCurrent(attributes: ConsumptionAttribute[]): ConsumptionAttribute | undefined;
     filterCurrent(attributes: ConsumptionAttribute[]): ConsumptionAttribute[];

package/dist/modules/attributes/local/ConsumptionAttribute.d.ts

@@ -14,6 +14,6 @@ export declare class ConsumptionAttribute extends CoreSynchronizable implements
     createdAt: CoreDate;
     metadata?: any;
     metadataModifiedAt?: CoreDate;
-    static from(value: IConsumptionAttribute): Promise<ConsumptionAttribute>;
+    static from(value: IConsumptionAttribute): ConsumptionAttribute;
     static fromAttribute(attribute: IAttribute): Promise<ConsumptionAttribute>;
 }

package/dist/modules/attributes/local/ConsumptionAttribute.js

@@ -8,7 +8,6 @@ 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 ConsumptionAttribute_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsumptionAttribute = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
@@ -16,7 +15,7 @@ const content_1 = require("@nmshd/content");
 const transport_1 = require("@nmshd/transport");
 const ts_simple_nameof_1 = require("ts-simple-nameof");
 const consumption_1 = require("../../../consumption");
-let ConsumptionAttribute = ConsumptionAttribute_1 = class ConsumptionAttribute extends transport_1.CoreSynchronizable {
+let ConsumptionAttribute = class ConsumptionAttribute extends transport_1.CoreSynchronizable {
     constructor() {
         super(...arguments);
         this.technicalProperties = [
@@ -30,11 +29,11 @@ let ConsumptionAttribute = ConsumptionAttribute_1 = class ConsumptionAttribute e
             (0, ts_simple_nameof_1.nameof)((r) => r.metadataModifiedAt)
         ];
     }
-    static async from(value) {
-        return (await super.from(value, ConsumptionAttribute_1));
+    static from(value) {
+        return this.fromAny(value);
     }
     static async fromAttribute(attribute) {
-        return await this.from({
+        return this.from({
             content: content_1.Attribute.from(attribute),
             id: await consumption_1.ConsumptionIds.attribute.generate(),
             createdAt: transport_1.CoreDate.utc()
@@ -61,7 +60,7 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", transport_1.CoreDate)
 ], ConsumptionAttribute.prototype, "metadataModifiedAt", void 0);
-ConsumptionAttribute = ConsumptionAttribute_1 = __decorate([
+ConsumptionAttribute = __decorate([
     (0, ts_serval_1.type)("ConsumptionAttribute")
 ], ConsumptionAttribute);
 exports.ConsumptionAttribute = ConsumptionAttribute;

package/dist/modules/attributes/local/ConsumptionAttribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConsumptionAttribute.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/ConsumptionAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA8D;AAC9D,4CAAsD;AACtD,gDAA+F;AAC/F,uDAAyC;AACzC,sDAAqD;AAUrD,IAAa,oBAAoB,4BAAjC,MAAa,oBAAqB,SAAQ,8BAAkB;IAA5D;;QAC6B,wBAAmB,GAAG;YAC3C,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;SACnD,CAAA;QAEwB,uBAAkB,GAAG,CAAC,IAAA,yBAAM,EAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;QAErE,uBAAkB,GAAG;YAC1C,IAAA,yBAAM,EAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YAC/C,IAAA,yBAAM,EAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC;SAC5D,CAAA;IA6BL,CAAC;IAXU,MAAM,CAAU,KAAK,CAAC,IAAI,CAAC,KAA4B;QAC1D,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,sBAAoB,CAAC,CAAyB,CAAA;IAClF,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,SAAqB;QACnD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACnB,OAAO,EAAE,mBAAS,CAAC,IAAI,CAAC,SAAS,CAAC;YAClC,EAAE,EAAE,MAAM,4BAAc,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC7C,SAAS,EAAE,oBAAQ,CAAC,GAAG,EAAE;SAC5B,CAAC,CAAA;IACN,CAAC;CACJ,CAAA;AAzBG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,EAAC,EAAE,IAAI,EAAE,mBAAS,EAAE,CAAC;8BACf,mBAAS;qDAAA;AAIzB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,oBAAQ;uDAAA;AAI1B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,EAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;;sDACJ;AAIrB;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACgB,oBAAQ;gEAAA;AA5B3B,oBAAoB;IADhC,IAAA,gBAAI,EAAC,sBAAsB,CAAC;GAChB,oBAAoB,CAyChC;AAzCY,oDAAoB"}
+{"version":3,"file":"ConsumptionAttribute.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/ConsumptionAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAC9D,4CAAsD;AACtD,gDAA+F;AAC/F,uDAAyC;AACzC,sDAAqD;AAUrD,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,8BAAkB;IAA5D;;QAC6B,wBAAmB,GAAG;YAC3C,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;SACnD,CAAA;QAEwB,uBAAkB,GAAG,CAAC,IAAA,yBAAM,EAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;QAErE,uBAAkB,GAAG;YAC1C,IAAA,yBAAM,EAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YAC/C,IAAA,yBAAM,EAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC;SAC5D,CAAA;IA6BL,CAAC;IAXU,MAAM,CAAC,IAAI,CAAC,KAA4B;QAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,SAAqB;QACnD,OAAO,IAAI,CAAC,IAAI,CAAC;YACb,OAAO,EAAE,mBAAS,CAAC,IAAI,CAAC,SAAS,CAAC;YAClC,EAAE,EAAE,MAAM,4BAAc,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC7C,SAAS,EAAE,oBAAQ,CAAC,GAAG,EAAE;SAC5B,CAAC,CAAA;IACN,CAAC;CACJ,CAAA;AAzBG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,EAAC,EAAE,IAAI,EAAE,mBAAS,EAAE,CAAC;8BACf,mBAAS;qDAAA;AAIzB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,oBAAQ;uDAAA;AAI1B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,EAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;;sDACJ;AAIrB;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACgB,oBAAQ;gEAAA;AA5B3B,oBAAoB;IADhC,IAAA,gBAAI,EAAC,sBAAsB,CAAC;GAChB,oBAAoB,CAyChC;AAzCY,oDAAoB"}

package/dist/modules/drafts/DraftsController.d.ts

@@ -1,4 +1,4 @@
-import { SerializableAsync } from "@js-soft/ts-serval";
+import { Serializable } from "@js-soft/ts-serval";
 import { CoreId } from "@nmshd/transport";
 import { ConsumptionBaseController } from "../../consumption";
 import { ConsumptionController } from "../../consumption/ConsumptionController";
@@ -6,10 +6,10 @@ import { Draft } from "./local/Draft";
 export declare class DraftsController extends ConsumptionBaseController {
     private drafts;
     constructor(parent: ConsumptionController);
-    init(): Promise<DraftsController>;
+    init(): Promise<this>;
     getDraft(id: CoreId): Promise<Draft | undefined>;
     getDrafts(query?: any): Promise<Draft[]>;
-    createDraft(content: SerializableAsync, type?: string): Promise<Draft>;
+    createDraft(content: Serializable, type?: string): Promise<Draft>;
     updateDraft(draft: Draft): Promise<void>;
     deleteDraft(draft: Draft): Promise<void>;
 }

package/dist/modules/drafts/DraftsController.js

@@ -15,14 +15,14 @@ class DraftsController extends consumption_1.ConsumptionBaseController {
     }
     async getDraft(id) {
         const result = await this.drafts.read(id.toString());
-        return result ? await Draft_1.Draft.from(result) : undefined;
+        return result ? Draft_1.Draft.from(result) : undefined;
     }
     async getDrafts(query) {
         const items = await this.drafts.find(query);
         return await this.parseArray(items, Draft_1.Draft);
     }
     async createDraft(content, type = "") {
-        const draft = await Draft_1.Draft.from({
+        const draft = Draft_1.Draft.from({
             id: await consumption_1.ConsumptionIds.draft.generate(),
             content: content,
             createdAt: new transport_1.CoreDate(),

package/dist/modules/drafts/DraftsController.js.map

@@ -1 +1 @@
-{"version":3,"file":"DraftsController.js","sourceRoot":"","sources":["../../../src/modules/drafts/DraftsController.ts"],"names":[],"mappings":";;;AACA,gDAA2E;AAC3E,mDAAwG;AAExG,yCAAqC;AAErC,MAAa,gBAAiB,SAAQ,uCAAyB;IAG3D,YAAmB,MAA6B;QAC5C,KAAK,CAAC,uCAAyB,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAA;IAC7D,CAAC;IAEe,KAAK,CAAC,IAAI;QACtB,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAElB,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAA;QACrF,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,EAAU;QAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QACpD,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,aAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACxD,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,KAAW;QAC9B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC3C,OAAO,MAAM,IAAI,CAAC,UAAU,CAAQ,KAAK,EAAE,aAAK,CAAC,CAAA;IACrD,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,OAA0B,EAAE,IAAI,GAAG,EAAE;QAC1D,MAAM,KAAK,GAAG,MAAM,aAAK,CAAC,IAAI,CAAC;YAC3B,EAAE,EAAE,MAAM,4BAAc,CAAC,KAAK,CAAC,QAAQ,EAAE;YACzC,OAAO,EAAE,OAAO;YAChB,SAAS,EAAE,IAAI,oBAAQ,EAAE;YACzB,cAAc,EAAE,IAAI,oBAAQ,EAAE;YAC9B,IAAI,EAAE,IAAI;SACb,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC/B,OAAO,KAAK,CAAA;IAChB,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,KAAY;QACjC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC5D,IAAI,CAAC,QAAQ,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;SACrC;QACD,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;IAC7C,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,KAAY;QACjC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACnC,CAAC;CACJ;AA/CD,4CA+CC"}
+{"version":3,"file":"DraftsController.js","sourceRoot":"","sources":["../../../src/modules/drafts/DraftsController.ts"],"names":[],"mappings":";;;AACA,gDAA2E;AAC3E,mDAAwG;AAExG,yCAAqC;AAErC,MAAa,gBAAiB,SAAQ,uCAAyB;IAG3D,YAAmB,MAA6B;QAC5C,KAAK,CAAC,uCAAyB,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAA;IAC7D,CAAC;IAEe,KAAK,CAAC,IAAI;QACtB,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAElB,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAA;QACrF,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,EAAU;QAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QACpD,OAAO,MAAM,CAAC,CAAC,CAAC,aAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAClD,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,KAAW;QAC9B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC3C,OAAO,MAAM,IAAI,CAAC,UAAU,CAAQ,KAAK,EAAE,aAAK,CAAC,CAAA;IACrD,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,OAAqB,EAAE,IAAI,GAAG,EAAE;QACrD,MAAM,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC;YACrB,EAAE,EAAE,MAAM,4BAAc,CAAC,KAAK,CAAC,QAAQ,EAAE;YACzC,OAAO,EAAE,OAAO;YAChB,SAAS,EAAE,IAAI,oBAAQ,EAAE;YACzB,cAAc,EAAE,IAAI,oBAAQ,EAAE;YAC9B,IAAI,EAAE,IAAI;SACb,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC/B,OAAO,KAAK,CAAA;IAChB,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,KAAY;QACjC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC5D,IAAI,CAAC,QAAQ,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;SACrC;QACD,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;IAC7C,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,KAAY;QACjC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACnC,CAAC;CACJ;AA/CD,4CA+CC"}

package/dist/modules/drafts/local/Draft.d.ts

@@ -1,10 +1,10 @@
-import { ISerializableAsync, SerializableAsync } from "@js-soft/ts-serval";
+import { ISerializable, Serializable } from "@js-soft/ts-serval";
 import { CoreDate, CoreSynchronizable, ICoreDate, ICoreSynchronizable } from "@nmshd/transport";
 export interface IDraft extends ICoreSynchronizable {
     type: string;
     createdAt: ICoreDate;
     lastModifiedAt: ICoreDate;
-    content: ISerializableAsync;
+    content: ISerializable;
     metadata?: any;
     metadataModifiedAt?: ICoreDate;
 }
@@ -15,8 +15,8 @@ export declare class Draft extends CoreSynchronizable implements IDraft {
     type: string;
     createdAt: CoreDate;
     lastModifiedAt: CoreDate;
-    content: SerializableAsync;
+    content: Serializable;
     metadata?: any;
     metadataModifiedAt?: CoreDate;
-    static from(value: IDraft | Draft): Promise<Draft>;
+    static from(value: IDraft | Draft): Draft;
 }

package/dist/modules/drafts/local/Draft.js

@@ -8,13 +8,12 @@ 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 Draft_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Draft = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const transport_1 = require("@nmshd/transport");
 const ts_simple_nameof_1 = require("ts-simple-nameof");
-let Draft = Draft_1 = class Draft extends transport_1.CoreSynchronizable {
+let Draft = class Draft extends transport_1.CoreSynchronizable {
     constructor() {
         super(...arguments);
         this.technicalProperties = [
@@ -30,8 +29,8 @@ let Draft = Draft_1 = class Draft extends transport_1.CoreSynchronizable {
             (0, ts_simple_nameof_1.nameof)((r) => r.metadataModifiedAt)
         ];
     }
-    static async from(value) {
-        return (await super.from(value, Draft_1));
+    static from(value) {
+        return this.fromAny(value);
     }
 };
 __decorate([
@@ -52,7 +51,7 @@ __decorate([
 __decorate([
     (0, ts_serval_1.validate)(),
     (0, ts_serval_1.serialize)(),
-    __metadata("design:type", ts_serval_1.SerializableAsync)
+    __metadata("design:type", ts_serval_1.Serializable)
 ], Draft.prototype, "content", void 0);
 __decorate([
     (0, ts_serval_1.validate)({ nullable: true }),
@@ -64,7 +63,7 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", transport_1.CoreDate)
 ], Draft.prototype, "metadataModifiedAt", void 0);
-Draft = Draft_1 = __decorate([
+Draft = __decorate([
     (0, ts_serval_1.type)("Draft")
 ], Draft);
 exports.Draft = Draft;

package/dist/modules/drafts/local/Draft.js.map

@@ -1 +1 @@
-{"version":3,"file":"Draft.js","sourceRoot":"","sources":["../../../../src/modules/drafts/local/Draft.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAqG;AACrG,gDAA+F;AAC/F,uDAAyC;AAYzC,IAAa,KAAK,aAAlB,MAAa,KAAM,SAAQ,8BAAkB;IAA7C;;QAC6B,wBAAmB,GAAG;YAC3C,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5B,IAAA,yBAAM,EAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACjC,IAAA,yBAAM,EAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC;SACzC,CAAA;QAEwB,uBAAkB,GAAG,CAAC,IAAA,yBAAM,EAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;QAEtD,uBAAkB,GAAG;YAC1C,IAAA,yBAAM,EAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YAChC,IAAA,yBAAM,EAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC;SAC7C,CAAA;IA6BL,CAAC;IAHU,MAAM,CAAU,KAAK,CAAC,IAAI,CAAC,KAAqB;QACnD,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,OAAK,CAAC,CAAU,CAAA;IACpD,CAAC;CACJ,CAAA;AAzBG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;mCACO;AAInB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,oBAAQ;wCAAA;AAI1B;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACW,oBAAQ;6CAAA;AAI/B;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACI,6BAAiB;sCAAA;AAIjC;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,EAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;;uCACJ;AAIrB;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACgB,oBAAQ;iDAAA;AAtC3B,KAAK;IADjB,IAAA,gBAAI,EAAC,OAAO,CAAC;GACD,KAAK,CA2CjB;AA3CY,sBAAK"}
+{"version":3,"file":"Draft.js","sourceRoot":"","sources":["../../../../src/modules/drafts/local/Draft.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA2F;AAC3F,gDAA+F;AAC/F,uDAAyC;AAYzC,IAAa,KAAK,GAAlB,MAAa,KAAM,SAAQ,8BAAkB;IAA7C;;QAC6B,wBAAmB,GAAG;YAC3C,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5B,IAAA,yBAAM,EAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACjC,IAAA,yBAAM,EAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC;SACzC,CAAA;QAEwB,uBAAkB,GAAG,CAAC,IAAA,yBAAM,EAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;QAEtD,uBAAkB,GAAG;YAC1C,IAAA,yBAAM,EAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YAChC,IAAA,yBAAM,EAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC;SAC7C,CAAA;IA6BL,CAAC;IAHU,MAAM,CAAC,IAAI,CAAC,KAAqB;QACpC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ,CAAA;AAzBG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;mCACO;AAInB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,oBAAQ;wCAAA;AAI1B;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACW,oBAAQ;6CAAA;AAI/B;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACI,wBAAY;sCAAA;AAI5B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,EAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;;uCACJ;AAIrB;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACgB,oBAAQ;iDAAA;AAtC3B,KAAK;IADjB,IAAA,gBAAI,EAAC,OAAO,CAAC;GACD,KAAK,CA2CjB;AA3CY,sBAAK"}

package/dist/modules/index.d.ts

@@ -2,24 +2,20 @@ export * from "./attributes/ConsumptionAttributesController";
 export * from "./attributes/local/ConsumptionAttribute";
 export * from "./drafts/DraftsController";
 export * from "./drafts/local/Draft";
-export * from "./relationships/local/RelationshipAttribute";
-export * from "./relationships/local/RelationshipInfo";
-export * from "./relationships/local/RelationshipTheme";
-export * from "./relationships/RelationshipInfoController";
 export * from "./requests/incoming/checkPrerequisites/CheckPrerequisitesOfIncomingRequestParameters";
 export * from "./requests/incoming/complete/CompleteIncomingRequestParameters";
 export * from "./requests/incoming/decide/AcceptRequestItemParameters";
-export * from "./requests/incoming/decide/AcceptRequestParameters";
 export * from "./requests/incoming/decide/DecideRequestItemGroupParameters";
 export * from "./requests/incoming/decide/DecideRequestItemParameters";
 export * from "./requests/incoming/decide/DecideRequestParameters";
 export * from "./requests/incoming/decide/RejectRequestItemParameters";
-export * from "./requests/incoming/decide/RejectRequestParameters";
 export * from "./requests/incoming/DecideRequestParametersValidator";
 export * from "./requests/incoming/IncomingRequestsController";
 export * from "./requests/incoming/received/ReceivedIncomingRequestParameters";
 export * from "./requests/incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters";
 export * from "./requests/itemProcessors/GenericRequestItemProcessor";
+export * from "./requests/itemProcessors/ProcessorConstructor";
+export * from "./requests/itemProcessors/RequestItemConstructor";
 export * from "./requests/itemProcessors/RequestItemProcessorRegistry";
 export * from "./requests/itemProcessors/ValidationResult";
 export * from "./requests/local/ConsumptionRequest";
@@ -33,7 +29,5 @@ export * from "./requests/outgoing/OutgoingRequestsController";
 export * from "./requests/outgoing/sentOutgoingRequest/SentOutgoingRequestParameters";
 export * from "./settings/local/Setting";
 export * from "./settings/SettingsController";
-export * from "./sharedItems/local/SharedItem";
-export * from "./sharedItems/SharedItemsController";
 export * from "./signatures/Signature";
 export * from "./signatures/SignatureContent";

package/dist/modules/index.js

@@ -18,24 +18,20 @@ __exportStar(require("./attributes/ConsumptionAttributesController"), exports);
 __exportStar(require("./attributes/local/ConsumptionAttribute"), exports);
 __exportStar(require("./drafts/DraftsController"), exports);
 __exportStar(require("./drafts/local/Draft"), exports);
-__exportStar(require("./relationships/local/RelationshipAttribute"), exports);
-__exportStar(require("./relationships/local/RelationshipInfo"), exports);
-__exportStar(require("./relationships/local/RelationshipTheme"), exports);
-__exportStar(require("./relationships/RelationshipInfoController"), exports);
 __exportStar(require("./requests/incoming/checkPrerequisites/CheckPrerequisitesOfIncomingRequestParameters"), exports);
 __exportStar(require("./requests/incoming/complete/CompleteIncomingRequestParameters"), exports);
 __exportStar(require("./requests/incoming/decide/AcceptRequestItemParameters"), exports);
-__exportStar(require("./requests/incoming/decide/AcceptRequestParameters"), exports);
 __exportStar(require("./requests/incoming/decide/DecideRequestItemGroupParameters"), exports);
 __exportStar(require("./requests/incoming/decide/DecideRequestItemParameters"), exports);
 __exportStar(require("./requests/incoming/decide/DecideRequestParameters"), exports);
 __exportStar(require("./requests/incoming/decide/RejectRequestItemParameters"), exports);
-__exportStar(require("./requests/incoming/decide/RejectRequestParameters"), exports);
 __exportStar(require("./requests/incoming/DecideRequestParametersValidator"), exports);
 __exportStar(require("./requests/incoming/IncomingRequestsController"), exports);
 __exportStar(require("./requests/incoming/received/ReceivedIncomingRequestParameters"), exports);
 __exportStar(require("./requests/incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters"), exports);
 __exportStar(require("./requests/itemProcessors/GenericRequestItemProcessor"), exports);
+__exportStar(require("./requests/itemProcessors/ProcessorConstructor"), exports);
+__exportStar(require("./requests/itemProcessors/RequestItemConstructor"), exports);
 __exportStar(require("./requests/itemProcessors/RequestItemProcessorRegistry"), exports);
 __exportStar(require("./requests/itemProcessors/ValidationResult"), exports);
 __exportStar(require("./requests/local/ConsumptionRequest"), exports);
@@ -49,8 +45,6 @@ __exportStar(require("./requests/outgoing/OutgoingRequestsController"), exports)
 __exportStar(require("./requests/outgoing/sentOutgoingRequest/SentOutgoingRequestParameters"), exports);
 __exportStar(require("./settings/local/Setting"), exports);
 __exportStar(require("./settings/SettingsController"), exports);
-__exportStar(require("./sharedItems/local/SharedItem"), exports);
-__exportStar(require("./sharedItems/SharedItemsController"), exports);
 __exportStar(require("./signatures/Signature"), exports);
 __exportStar(require("./signatures/SignatureContent"), exports);
 //# sourceMappingURL=index.js.map

package/dist/modules/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/modules/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+EAA4D;AAC5D,0EAAuD;AACvD,4DAAyC;AACzC,uDAAoC;AACpC,8EAA2D;AAC3D,yEAAsD;AACtD,0EAAuD;AACvD,6EAA0D;AAC1D,uHAAoG;AACpG,iGAA8E;AAC9E,yFAAsE;AACtE,qFAAkE;AAClE,8FAA2E;AAC3E,yFAAsE;AACtE,qFAAkE;AAClE,yFAAsE;AACtE,qFAAkE;AAClE,uFAAoE;AACpE,iFAA8D;AAC9D,iGAA8E;AAC9E,6HAA0G;AAC1G,wFAAqE;AACrE,yFAAsE;AACtE,6EAA0D;AAC1D,sEAAmD;AACnD,4EAAyD;AACzD,oFAAiE;AACjE,uEAAoD;AACpD,gHAA6F;AAC7F,yJAAsI;AACtI,4GAAyF;AACzF,iFAA8D;AAC9D,wGAAqF;AACrF,2DAAwC;AACxC,gEAA6C;AAC7C,iEAA8C;AAC9C,sEAAmD;AACnD,yDAAsC;AACtC,gEAA6C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/modules/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+EAA4D;AAC5D,0EAAuD;AACvD,4DAAyC;AACzC,uDAAoC;AACpC,uHAAoG;AACpG,iGAA8E;AAC9E,yFAAsE;AACtE,8FAA2E;AAC3E,yFAAsE;AACtE,qFAAkE;AAClE,yFAAsE;AACtE,uFAAoE;AACpE,iFAA8D;AAC9D,iGAA8E;AAC9E,6HAA0G;AAC1G,wFAAqE;AACrE,iFAA8D;AAC9D,mFAAgE;AAChE,yFAAsE;AACtE,6EAA0D;AAC1D,sEAAmD;AACnD,4EAAyD;AACzD,oFAAiE;AACjE,uEAAoD;AACpD,gHAA6F;AAC7F,yJAAsI;AACtI,4GAAyF;AACzF,iFAA8D;AAC9D,wGAAqF;AACrF,2DAAwC;AACxC,gEAA6C;AAC7C,yDAAsC;AACtC,gEAA6C"}

package/dist/modules/requests/incoming/DecideRequestParametersValidator.d.ts

@@ -1,6 +1,10 @@
 import { Result } from "@js-soft/ts-utils";
 import { ConsumptionRequest } from "../local/ConsumptionRequest";
-import { IDecideRequestParameters } from "./decide/DecideRequestParameters";
+import { InternalDecideRequestParametersJSON } from "./decide/InternalDecideRequestParameters";
 export declare class DecideRequestParametersValidator {
-    validate(params: IDecideRequestParameters, request: ConsumptionRequest): Result<undefined>;
+    validate(params: InternalDecideRequestParametersJSON, request: ConsumptionRequest): Result<void>;
+    private checkItemOrGroup;
+    private checkItem;
+    private checkItemGroup;
+    private invalidNumberOfItemsError;
 }

package/dist/modules/requests/incoming/DecideRequestParametersValidator.js

@@ -2,13 +2,67 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DecideRequestParametersValidator = void 0;
 const ts_utils_1 = require("@js-soft/ts-utils");
+const content_1 = require("@nmshd/content");
+const transport_1 = require("@nmshd/transport");
+const DecideRequestItemGroupParameters_1 = require("./decide/DecideRequestItemGroupParameters");
+const DecideRequestItemParameters_1 = require("./decide/DecideRequestItemParameters");
 class DecideRequestParametersValidator {
     validate(params, request) {
+        if (!request.id.equals(transport_1.CoreId.from(params.requestId))) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidRequestId", "The id of the request does not match the id of the response"));
+        }
         if (params.items.length !== request.content.items.length) {
-            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("invalidNumberOfItems", "Number of items in Request and Response do not match"));
+            return ts_utils_1.Result.fail(this.invalidNumberOfItemsError("Number of items in Request and Response do not match"));
+        }
+        for (let i = 0; i < params.items.length; i++) {
+            const validationResult = this.checkItemOrGroup(request.content.items[i], params.items[i], i.toString(), params.accept);
+            if (validationResult.isError)
+                return validationResult;
+        }
+        return ts_utils_1.Result.ok(undefined);
+    }
+    checkItemOrGroup(requestItem, responseItem, index, isParentAccepted) {
+        if (requestItem instanceof content_1.RequestItem) {
+            return this.checkItem(requestItem, responseItem, index, isParentAccepted);
+        }
+        return this.checkItemGroup(requestItem, responseItem, index, isParentAccepted);
+    }
+    checkItem(requestItem, response, index, isParentAccepted) {
+        if ((0, DecideRequestItemGroupParameters_1.isDecideRequestItemGroupParametersJSON)(response)) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItem with index '${index}' was answered as a RequestItemGroup.`));
+        }
+        if (!isParentAccepted && response.accept) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItem with index '${index}' was accepted, but the parent was not accepted.`));
+        }
+        if (isParentAccepted && requestItem.mustBeAccepted && !response.accept) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItem with index '${index}', which is flagged as 'mustBeAccepted', was not accepted.`));
         }
         return ts_utils_1.Result.ok(undefined);
     }
+    checkItemGroup(requestItemGroup, responseItemGroup, index, isParentAccepted) {
+        if ((0, DecideRequestItemParameters_1.isDecideRequestItemParametersJSON)(responseItemGroup)) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItemGroup with index '${index}' was answered as a RequestItem.`));
+        }
+        if (responseItemGroup.items.length !== requestItemGroup.items.length) {
+            return ts_utils_1.Result.fail(this.invalidNumberOfItemsError("Number of items in RequestItemGroup and ResponseItemGroup do not match"));
+        }
+        const isGroupAccepted = responseItemGroup.items.some((value) => value.accept);
+        if (!isParentAccepted && isGroupAccepted) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItemGroup with index '${index}' was accepted, but the parent was not accepted.`));
+        }
+        if (isParentAccepted && requestItemGroup.mustBeAccepted && !isGroupAccepted) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItemGroup with index '${index}', which is flagged as 'mustBeAccepted', was not accepted. Please accept all 'mustBeAccepted' items in this group.`));
+        }
+        for (let i = 0; i < responseItemGroup.items.length; i++) {
+            const validationResult = this.checkItem(requestItemGroup.items[i], responseItemGroup.items[i], `${index}.${i}`, isGroupAccepted);
+            if (validationResult.isError)
+                return validationResult;
+        }
+        return ts_utils_1.Result.ok(undefined);
+    }
+    invalidNumberOfItemsError(message) {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
+    }
 }
 exports.DecideRequestParametersValidator = DecideRequestParametersValidator;
 //# sourceMappingURL=DecideRequestParametersValidator.js.map

package/dist/modules/requests/incoming/DecideRequestParametersValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"DecideRequestParametersValidator.js","sourceRoot":"","sources":["../../../../src/modules/requests/incoming/DecideRequestParametersValidator.ts"],"names":[],"mappings":";;;AAAA,gDAA4D;AAI5D,MAAa,gCAAgC;IAClC,QAAQ,CAAC,MAAgC,EAAE,OAA2B;QACzE,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE;YACtD,OAAO,iBAAM,CAAC,IAAI,CACd,IAAI,2BAAgB,CAAC,sBAAsB,EAAE,sDAAsD,CAAC,CACvG,CAAA;SACJ;QACD,OAAO,iBAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;IAC/B,CAAC;CACJ;AATD,4EASC"}
+{"version":3,"file":"DecideRequestParametersValidator.js","sourceRoot":"","sources":["../../../../src/modules/requests/incoming/DecideRequestParametersValidator.ts"],"names":[],"mappings":"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"}

package/dist/modules/requests/incoming/IncomingRequestsController.d.ts

@@ -1,4 +1,4 @@
-import { ICoreId } from "@nmshd/transport";
+import { ICoreId, SynchronizedCollection } from "@nmshd/transport";
 import { ConsumptionBaseController } from "../../../consumption";
 import { ConsumptionController } from "../../../consumption/ConsumptionController";
 import { RequestItemProcessorRegistry } from "../itemProcessors/RequestItemProcessorRegistry";
@@ -6,37 +6,36 @@ import { ValidationResult } from "../itemProcessors/ValidationResult";
 import { ConsumptionRequest } from "../local/ConsumptionRequest";
 import { ICheckPrerequisitesOfIncomingRequestParameters } from "./checkPrerequisites/CheckPrerequisitesOfIncomingRequestParameters";
 import { ICompleteIncomingRequestParameters } from "./complete/CompleteIncomingRequestParameters";
-import { IAcceptRequestParameters } from "./decide/AcceptRequestParameters";
-import { IRejectRequestParameters } from "./decide/RejectRequestParameters";
+import { DecideRequestParametersJSON } from "./decide/DecideRequestParameters";
 import { IReceivedIncomingRequestParameters } from "./received/ReceivedIncomingRequestParameters";
 import { IRequireManualDecisionOfIncomingRequestParameters } from "./requireManualDecision/RequireManualDecisionOfIncomingRequestParameters";
 export declare class IncomingRequestsController extends ConsumptionBaseController {
-    readonly processorRegistry: RequestItemProcessorRegistry;
-    private consumptionRequests;
+    private readonly consumptionRequests;
+    private readonly processorRegistry;
     private readonly decideRequestParamsValidator;
-    constructor(parent: ConsumptionController, processorRegistry: RequestItemProcessorRegistry);
-    init(): Promise<IncomingRequestsController>;
+    constructor(consumptionRequests: SynchronizedCollection, processorRegistry: RequestItemProcessorRegistry, parent: ConsumptionController);
     received(params: IReceivedIncomingRequestParameters): Promise<ConsumptionRequest>;
     private extractInfoFromSource;
     private extractInfoFromMessage;
     private extractInfoFromRelationshipTemplate;
     checkPrerequisites(params: ICheckPrerequisitesOfIncomingRequestParameters): Promise<ConsumptionRequest>;
     requireManualDecision(params: IRequireManualDecisionOfIncomingRequestParameters): Promise<ConsumptionRequest>;
-    canAccept(params: IAcceptRequestParameters): Promise<ValidationResult>;
-    canReject(params: IRejectRequestParameters): Promise<ValidationResult>;
+    canAccept(params: DecideRequestParametersJSON): Promise<ValidationResult>;
+    canReject(params: DecideRequestParametersJSON): Promise<ValidationResult>;
     private canDecide;
     private canDecideGroup;
     private canDecideItems;
     private canDecideItem;
-    accept(params: IAcceptRequestParameters): Promise<ConsumptionRequest>;
-    reject(params: IRejectRequestParameters): Promise<ConsumptionRequest>;
+    accept(params: DecideRequestParametersJSON): Promise<ConsumptionRequest>;
+    reject(params: DecideRequestParametersJSON): Promise<ConsumptionRequest>;
     private decide;
     private createConsumptionResponse;
     private decideGroup;
     private decideItems;
     private decideItem;
     complete(params: ICompleteIncomingRequestParameters): Promise<ConsumptionRequest>;
-    get(id: ICoreId): Promise<ConsumptionRequest | undefined>;
+    getIncomingRequests(query?: any): Promise<ConsumptionRequest[]>;
+    getIncomingRequest(idIncomingRequest: ICoreId): Promise<ConsumptionRequest | undefined>;
     private getOrThrow;
     private update;
     private assertRequestStatus;