@nmshd/consumption 2.0.0-alpha.15 → 2.0.0-alpha.18

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nmshd/consumption",
-    "version": "2.0.0-alpha.15",
+    "version": "2.0.0-alpha.18",
     "description": "The consumption library extends the transport library.",
     "homepage": "https://enmeshed.eu",
     "repository": "github:nmshd/cns-consumption",
@@ -17,10 +17,6 @@
         "ui5.yaml"
     ],
     "scripts": {
-        "lint": "npm run lint:prettier && npm run lint:eslint && npm run lint:tsc",
-        "lint:prettier": "prettier --check .",
-        "lint:eslint": "eslint --ext ts ./src ./test",
-        "lint:tsc": "tsc --noEmit && tsc -p test/tsconfig.json --noEmit",
         "bt": "npm run test:node && npm run build:node && npm run build:test && npm run bundle && npm run test:web",
         "build": "npm run build:node && npm run build:test && npm run bundle",
         "build:ci": "npm run build:node && .ci/writeBuildInformation.sh && npm run build:test && npm run bundle",
@@ -31,19 +27,26 @@
         "bundle:min": "webpack --stats-all --config webpack.min.config.js",
         "bundle:test": "webpack --stats-all --config webpack.test.config.js",
         "cdep": "tsc && madge --circular dist",
+        "lint": "npm run lint:prettier && npm run lint:eslint && npm run lint:tsc",
+        "lint:eslint": "eslint --ext ts ./src ./test",
+        "lint:prettier": "prettier --check .",
+        "lint:tsc": "tsc --noEmit && tsc -p test/tsconfig.json --noEmit",
         "test": "npm run test:node && npm run test:web",
         "test:ci": "npm run test",
         "test:local": "npm run build && npm run test:local:node && npm run test:web",
         "test:local:node": ". ./scripts/testSetup.sh && npm run test:node",
-        "test:local:node:mongodb": ". ./scripts/testSetup.sh && npm run test:node:mongodb",
         "test:local:node:lokijs": "npm run test:node:lokijs",
+        "test:local:node:mongodb": ". ./scripts/testSetup.sh && npm run test:node:mongodb",
         "test:local:teardown": "docker-compose -f test/docker-compose.yml rm -fsv",
         "test:node": "mocha -r ts-node/register -r tsconfig-paths/register ./test/index.node.ts --project ./test/tsconfig.json --exit",
-        "test:node:mongodb": "mocha -r ts-node/register -r tsconfig-paths/register ./test/index.node.mongo.ts --project ./test/tsconfig.json --exit",
         "test:node:lokijs": "mocha -r ts-node/register -r tsconfig-paths/register ./test/index.node.loki.ts --project ./test/tsconfig.json --exit",
+        "test:node:mongodb": "mocha -r ts-node/register -r tsconfig-paths/register ./test/index.node.mongo.ts --project ./test/tsconfig.json --exit",
         "test:web": "browsertest-runner",
         "test:web:debug": "browsertest-runner-debug"
     },
+    "dependencies": {
+        "@js-soft/docdb-querytranslator": "^1.0.1"
+    },
     "devDependencies": {
         "@js-soft/docdb-access-loki": "1.0.2",
         "@js-soft/docdb-access-mongo": "1.0.5",
@@ -53,14 +56,14 @@
         "@js-soft/ts-serval": "2.0.3",
         "@js-soft/ts-utils": "1.1.2",
         "@js-soft/web-logger": "1.0.1",
-        "@nmshd/content": "2.0.0-alpha.20",
+        "@nmshd/content": "2.0.0-alpha.24",
         "@nmshd/crypto": "2.0.1",
         "@nmshd/transport": "2.0.0-alpha.1",
         "@types/chai": "^4.3.1",
         "@types/glob": "^7.2.0",
         "@types/luxon": "^2.3.2",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^17.0.35",
+        "@types/node": "^17.0.36",
         "bt-runner": "^2.0.5",
         "chai": "^4.3.6",
         "copy-webpack-plugin": "^11.0.0",
@@ -72,7 +75,7 @@
         "terser-webpack-plugin": "5.3.1",
         "ts-node": "^10.8.0",
         "tsconfig-paths": "^4.0.0",
-        "typescript": "^4.6.4",
+        "typescript": "^4.7.2",
         "webpack": "^5.72.1",
         "webpack-cli": "^4.9.2"
     },

package/dist/modules/attributes/SuccedConsumptionAttributeParams.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SuccedConsumptionAttributeParams.js","sourceRoot":"","sources":["../../../src/modules/attributes/SuccedConsumptionAttributeParams.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAqF;AACrF,4CAAqH;AACrH,gDAAkD;AAOlD,MAAa,iCAAkC,SAAQ,wBAAY;IASxD,MAAM,CAAC,IAAI,CAAC,KAAyC;QACxD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ;AATG;IAFC,IAAA,qBAAS,EAAC,EAAE,UAAU,EAAE,CAAC,2BAAiB,EAAE,+BAAqB,CAAC,EAAE,CAAC;IACrE,IAAA,oBAAQ,GAAE;;2EACuD;AAIlE;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACM,kBAAM;mEAAA;AAP3B,8EAYC"}

package/dist/modules/signatures/Signature.d.ts

@@ -1,16 +0,0 @@
-import { CryptoSignature, CryptoSignaturePublicKey } from "@nmshd/crypto";
-import { CoreSerializable, ICoreSerializable } from "@nmshd/transport";
-import { ISignatureContent, SignatureContent } from "./SignatureContent";
-export interface ISignature extends ICoreSerializable {
-    content: ISignatureContent;
-    signature: string;
-}
-export declare class Signature extends CoreSerializable {
-    content: SignatureContent;
-    signature: CryptoSignature;
-    protected static preFrom(value: any): any;
-    static from(value: ISignature): Signature;
-    verify(content: string, publicKey: CryptoSignaturePublicKey): Promise<boolean>;
-    toJSON(): object;
-    serialize(): string;
-}

package/dist/modules/signatures/Signature.js

@@ -1,56 +0,0 @@
-"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.Signature = void 0;
-const ts_serval_1 = require("@js-soft/ts-serval");
-const crypto_1 = require("@nmshd/crypto");
-const transport_1 = require("@nmshd/transport");
-const SignatureContent_1 = require("./SignatureContent");
-let Signature = class Signature extends transport_1.CoreSerializable {
-    static preFrom(value) {
-        if (value.signature instanceof crypto_1.CryptoSignature) {
-            value.signature = crypto_1.CryptoSignature.fromBase64(value.signature);
-        }
-        return value;
-    }
-    static from(value) {
-        return this.fromAny(value);
-    }
-    async verify(content, publicKey) {
-        const hash = await crypto_1.CryptoHash.hash(crypto_1.CoreBuffer.fromUtf8(content), this.content.hashAlgorithm);
-        if (hash.toBase64() !== this.content.hash.hash)
-            return false;
-        const str = this.content.serialize();
-        const correct = await transport_1.CoreCrypto.verify(crypto_1.CoreBuffer.fromUtf8(str), this.signature, publicKey);
-        return correct;
-    }
-    toJSON() {
-        return { content: this.content.toJSON(), signature: this.signature.toBase64() };
-    }
-    serialize() {
-        return JSON.stringify(this.toJSON());
-    }
-};
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", SignatureContent_1.SignatureContent)
-], Signature.prototype, "content", void 0);
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", crypto_1.CryptoSignature)
-], Signature.prototype, "signature", void 0);
-Signature = __decorate([
-    (0, ts_serval_1.type)("Signature")
-], Signature);
-exports.Signature = Signature;
-//# sourceMappingURL=Signature.js.map

package/dist/modules/signatures/Signature.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Signature.js","sourceRoot":"","sources":["../../../src/modules/signatures/Signature.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAC9D,0CAAiG;AACjG,gDAAkF;AAClF,yDAAwE;AAQxE,IAAa,SAAS,GAAtB,MAAa,SAAU,SAAQ,4BAAgB;IASjC,MAAM,CAAU,OAAO,CAAC,KAAU;QACxC,IAAI,KAAK,CAAC,SAAS,YAAY,wBAAe,EAAE;YAC5C,KAAK,CAAC,SAAS,GAAG,wBAAe,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;SAChE;QAED,OAAO,KAAK,CAAA;IAChB,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAAiB;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAAe,EAAE,SAAmC;QACpE,MAAM,IAAI,GAAG,MAAM,mBAAU,CAAC,IAAI,CAAC,mBAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QAC5F,IAAI,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAA;QAC5D,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAA;QACpC,MAAM,OAAO,GAAG,MAAM,sBAAU,CAAC,MAAM,CAAC,mBAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;QAC5F,OAAO,OAAO,CAAA;IAClB,CAAC;IAEe,MAAM;QAClB,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAA;IACnF,CAAC;IAEe,SAAS;QACrB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;IACxC,CAAC;CACJ,CAAA;AAjCG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACI,mCAAgB;0CAAA;AAIhC;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,wBAAe;4CAAA;AAPxB,SAAS;IADrB,IAAA,gBAAI,EAAC,WAAW,CAAC;GACL,SAAS,CAoCrB;AApCY,8BAAS"}

package/dist/modules/signatures/SignatureContent.d.ts

@@ -1,21 +0,0 @@
-import { CryptoHashAlgorithm, CryptoSignatureAlgorithm } from "@nmshd/crypto";
-import { CoreAddress, CoreDate, CoreHash, CoreId, CoreSerializable, ICoreSerializable } from "@nmshd/transport";
-export interface ISignatureContent extends ICoreSerializable {
-    version: number;
-    signatureAlgorithm: CryptoSignatureAlgorithm;
-    hashAlgorithm: CryptoHashAlgorithm;
-    signedAt: string;
-    signer: string;
-    keyId: string;
-    hash: string;
-}
-export declare class SignatureContent extends CoreSerializable {
-    version: number;
-    signatureAlgorithm: CryptoSignatureAlgorithm;
-    hashAlgorithm: CryptoHashAlgorithm;
-    signedAt: CoreDate;
-    signer: CoreAddress;
-    keyId: CoreId;
-    hash: CoreHash;
-    static from(value: ISignatureContent): SignatureContent;
-}

package/dist/modules/signatures/SignatureContent.js

@@ -1,59 +0,0 @@
-"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.SignatureContent = void 0;
-const ts_serval_1 = require("@js-soft/ts-serval");
-const transport_1 = require("@nmshd/transport");
-let SignatureContent = class SignatureContent extends transport_1.CoreSerializable {
-    static from(value) {
-        return this.fromAny(value);
-    }
-};
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", Number)
-], SignatureContent.prototype, "version", void 0);
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", Number)
-], SignatureContent.prototype, "signatureAlgorithm", void 0);
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", Number)
-], SignatureContent.prototype, "hashAlgorithm", void 0);
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", transport_1.CoreDate)
-], SignatureContent.prototype, "signedAt", void 0);
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", transport_1.CoreAddress)
-], SignatureContent.prototype, "signer", void 0);
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", transport_1.CoreId)
-], SignatureContent.prototype, "keyId", void 0);
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", transport_1.CoreHash)
-], SignatureContent.prototype, "hash", void 0);
-SignatureContent = __decorate([
-    (0, ts_serval_1.type)("SignatureContent")
-], SignatureContent);
-exports.SignatureContent = SignatureContent;
-//# sourceMappingURL=SignatureContent.js.map

package/dist/modules/signatures/SignatureContent.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SignatureContent.js","sourceRoot":"","sources":["../../../src/modules/signatures/SignatureContent.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAE9D,gDAA+G;AAa/G,IAAa,gBAAgB,GAA7B,MAAa,gBAAiB,SAAQ,4BAAgB;IA6B3C,MAAM,CAAC,IAAI,CAAC,KAAwB;QACvC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ,CAAA;AA7BG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;iDACU;AAItB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;4DACuC;AAInD;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;uDAC6B;AAIzC;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACK,oBAAQ;kDAAA;AAIzB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACG,uBAAW;gDAAA;AAI1B;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACE,kBAAM;+CAAA;AAIpB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACC,oBAAQ;8CAAA;AA3BZ,gBAAgB;IAD5B,IAAA,gBAAI,EAAC,kBAAkB,CAAC;GACZ,gBAAgB,CAgC5B;AAhCY,4CAAgB"}