@nmshd/content 2.7.1 → 2.7.3

package/dist/attributes/IQLQuery.d.ts

@@ -1,13 +1,31 @@
+import { ISerializable, Serializable } from "@js-soft/ts-serval";
 import { AbstractAttributeQuery, AbstractAttributeQueryJSON, IAbstractAttributeQuery } from "./AbstractAttributeQuery";
+import { AttributeValues } from "./AttributeValueTypes";
+export interface IQLQueryCreationHintsJSON {
+    valueType: AttributeValues.Identity.TypeName;
+    tags?: string[];
+}
+export interface IIQLQueryCreationHints extends ISerializable {
+    valueType: AttributeValues.Identity.TypeName;
+    tags?: string[];
+}
+export declare class IQLQueryCreationHints extends Serializable implements IIQLQueryCreationHints {
+    valueType: AttributeValues.Identity.TypeName;
+    tags?: string[];
+    static from(value: IIQLQueryCreationHints | Omit<IQLQueryCreationHintsJSON, "@type">): IQLQueryCreationHints;
+}
 export interface IQLQueryJSON extends AbstractAttributeQueryJSON {
     "@type": "IQLQuery";
     queryString: string;
+    attributeCreationHints?: IQLQueryCreationHintsJSON;
 }
 export interface IIQLQuery extends IAbstractAttributeQuery {
     queryString: string;
+    attributeCreationHints?: IIQLQueryCreationHints;
 }
 export declare class IQLQuery extends AbstractAttributeQuery implements IIQLQuery {
     queryString: string;
+    attributeCreationHints?: IQLQueryCreationHints;
     static from(value: IIQLQuery | Omit<IQLQueryJSON, "@type">): IQLQuery;
     toJSON(verbose?: boolean | undefined, serializeAsString?: boolean | undefined): IQLQueryJSON;
 }

package/dist/attributes/IQLQuery.js

@@ -32,10 +32,31 @@ 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.IQLQuery = void 0;
+exports.IQLQuery = exports.IQLQueryCreationHints = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const Iql = __importStar(require("@nmshd/iql"));
 const AbstractAttributeQuery_1 = require("./AbstractAttributeQuery");
+const AttributeValueTypes_1 = require("./AttributeValueTypes");
+const IdentityAttribute_1 = require("./IdentityAttribute");
+let IQLQueryCreationHints = class IQLQueryCreationHints extends ts_serval_1.Serializable {
+    static from(value) {
+        return this.fromAny(value);
+    }
+};
+exports.IQLQueryCreationHints = IQLQueryCreationHints;
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)({ customValidator: IdentityAttribute_1.IdentityAttribute.validateTypeName }),
+    __metadata("design:type", String)
+], IQLQueryCreationHints.prototype, "valueType", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)({ type: String }),
+    (0, ts_serval_1.validate)({ nullable: true, customValidator: IdentityAttribute_1.IdentityAttribute.validateTags }),
+    __metadata("design:type", Array)
+], IQLQueryCreationHints.prototype, "tags", void 0);
+exports.IQLQueryCreationHints = IQLQueryCreationHints = __decorate([
+    (0, ts_serval_1.type)("IQLQueryCreationHints")
+], IQLQueryCreationHints);
 let IQLQuery = class IQLQuery extends AbstractAttributeQuery_1.AbstractAttributeQuery {
     static from(value) {
         return this.fromAny(value);
@@ -58,6 +79,11 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], IQLQuery.prototype, "queryString", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
+    __metadata("design:type", IQLQueryCreationHints)
+], IQLQuery.prototype, "attributeCreationHints", void 0);
 exports.IQLQuery = IQLQuery = __decorate([
     (0, ts_serval_1.type)("IQLQuery")
 ], IQLQuery);

package/dist/attributes/IQLQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"IQLQuery.js","sourceRoot":"","sources":["../../src/attributes/IQLQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA8D;AAC9D,gDAAiC;AACjC,qEAAsH;AAY/G,IAAM,QAAQ,GAAd,MAAM,QAAS,SAAQ,+CAAsB;IAazC,MAAM,CAAC,IAAI,CAAC,KAA8C;QAC7D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IAEe,MAAM,CAAC,OAA6B,EAAE,iBAAuC;QACzF,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,iBAAiB,CAAiB,CAAA;IACnE,CAAC;CACJ,CAAA;AApBY,4BAAQ;AAWV;IAVN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC;QACN,GAAG,EAAE,IAAI;QACT,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE;YACnB,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;YAC9B,OAAO,CAAC,MAAM,CAAC,OAAO;gBAClB,CAAC,CAAC,yCAAyC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE;gBAC/E,CAAC,CAAC,SAAS,CAAA;QACnB,CAAC;KACJ,CAAC;;6CACwB;mBAXjB,QAAQ;IADpB,IAAA,gBAAI,EAAC,UAAU,CAAC;GACJ,QAAQ,CAoBpB"}
+{"version":3,"file":"IQLQuery.js","sourceRoot":"","sources":["../../src/attributes/IQLQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA2F;AAC3F,gDAAiC;AACjC,qEAAsH;AACtH,+DAAuD;AACvD,2DAAuD;AAahD,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,wBAAY;IAS5C,MAAM,CAAC,IAAI,CACd,KAAwE;QAExE,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ,CAAA;AAdY,sDAAqB;AAGvB;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,eAAe,EAAE,qCAAiB,CAAC,gBAAgB,EAAE,CAAC;;wDACf;AAI5C;IAFN,IAAA,qBAAS,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC3B,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,EAAE,qCAAiB,CAAC,YAAY,EAAE,CAAC;;mDACxD;gCAPb,qBAAqB;IADjC,IAAA,gBAAI,EAAC,uBAAuB,CAAC;GACjB,qBAAqB,CAcjC;AAcM,IAAM,QAAQ,GAAd,MAAM,QAAS,SAAQ,+CAAsB;IAiBzC,MAAM,CAAC,IAAI,CAAC,KAA8C;QAC7D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IAEe,MAAM,CAAC,OAA6B,EAAE,iBAAuC;QACzF,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,iBAAiB,CAAiB,CAAA;IACnE,CAAC;CACJ,CAAA;AAxBY,4BAAQ;AAWV;IAVN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC;QACN,GAAG,EAAE,IAAI;QACT,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE;YACnB,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;YAC9B,OAAO,CAAC,MAAM,CAAC,OAAO;gBAClB,CAAC,CAAC,yCAAyC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE;gBAC/E,CAAC,CAAC,SAAS,CAAA;QACnB,CAAC;KACJ,CAAC;;6CACwB;AAInB;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACG,qBAAqB;wDAAA;mBAf5C,QAAQ;IADpB,IAAA,gBAAI,EAAC,UAAU,CAAC;GACJ,QAAQ,CAwBpB"}

package/dist/attributes/IdentityAttribute.d.ts

@@ -14,5 +14,6 @@ export declare class IdentityAttribute<TValueClass extends AttributeValues.Ident
     tags?: string[];
     static from<TValueClass extends AttributeValues.Identity.Class = AttributeValues.Identity.Class, TValueInterface extends AttributeValues.Identity.Interface = AttributeValues.Identity.Interface, TValueJSONInterface extends AttributeValues.Identity.Json = AttributeValues.Identity.Json>(value: IIdentityAttribute<TValueInterface> | Omit<IdentityAttributeJSON<TValueJSONInterface>, "@type">): IdentityAttribute<TValueClass>;
     toJSON(verbose?: boolean | undefined, serializeAsString?: boolean | undefined): IdentityAttributeJSON;
-    private static validateTags;
+    static validateTags(tags: string[]): string | undefined;
+    static validateTypeName(typeName: string | AttributeValues.Identity.TypeName): string | undefined;
 }

package/dist/attributes/IdentityAttribute.js

@@ -29,6 +29,12 @@ let IdentityAttribute = class IdentityAttribute extends AbstractAttribute_1.Abst
         }
         return undefined;
     }
+    static validateTypeName(typeName) {
+        if (!AttributeValueTypes_1.AttributeValues.Identity.TYPE_NAMES.includes(typeName)) {
+            return `must be one of: ${AttributeValueTypes_1.AttributeValues.Identity.TYPE_NAMES_STRINGIFIED}`;
+        }
+        return undefined;
+    }
 };
 exports.IdentityAttribute = IdentityAttribute;
 __decorate([

package/dist/attributes/IdentityAttribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"IdentityAttribute.js","sourceRoot":"","sources":["../../src/attributes/IdentityAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAC9D,2DAAkG;AAClG,+DAAuD;AAkBhD,IAAM,iBAAiB,GAAvB,MAAM,iBACT,SAAQ,qCAAiB;IAWlB,MAAM,CAAC,IAAI,CAKd,KAAsG;QAEtG,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAmC,CAAA;IAChE,CAAC;IAEe,MAAM,CAClB,OAA6B,EAC7B,iBAAuC;QAEvC,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,iBAAiB,CAA0B,CAAA;IAC5E,CAAC;IAEO,MAAM,CAAC,YAAY,CAAC,IAAc;QACtC,IAAI,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE;YAClB,OAAO,mCAAmC,CAAA;SAC7C;QAED,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,EAAE;YACtC,OAAO,gDAAgD,CAAA;SAC1D;QAED,OAAO,SAAS,CAAA;IACpB,CAAC;CACJ,CAAA;AAxCY,8CAAiB;AAMnB;IAFN,IAAA,qBAAS,EAAC,EAAE,UAAU,EAAE,qCAAe,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IAC3D,IAAA,oBAAQ,GAAE;;gDACc;AAIlB;IAFN,IAAA,qBAAS,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC3B,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,EAAE,iBAAiB,CAAC,YAAY,EAAE,CAAC;;+CACxD;4BAVb,iBAAiB;IAD7B,IAAA,gBAAI,EAAC,mBAAmB,CAAC;GACb,iBAAiB,CAwC7B"}
+{"version":3,"file":"IdentityAttribute.js","sourceRoot":"","sources":["../../src/attributes/IdentityAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAC9D,2DAAkG;AAClG,+DAAuD;AAkBhD,IAAM,iBAAiB,GAAvB,MAAM,iBACT,SAAQ,qCAAiB;IAWlB,MAAM,CAAC,IAAI,CAKd,KAAsG;QAEtG,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAmC,CAAA;IAChE,CAAC;IAEe,MAAM,CAClB,OAA6B,EAC7B,iBAAuC;QAEvC,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,iBAAiB,CAA0B,CAAA;IAC5E,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,IAAc;QACrC,IAAI,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE;YAClB,OAAO,mCAAmC,CAAA;SAC7C;QAED,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,EAAE;YACtC,OAAO,gDAAgD,CAAA;SAC1D;QAED,OAAO,SAAS,CAAA;IACpB,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAAC,QAAoD;QAC/E,IAAI,CAAC,qCAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,QAA6C,CAAC,EAAE;YAC9F,OAAO,mBAAmB,qCAAe,CAAC,QAAQ,CAAC,sBAAsB,EAAE,CAAA;SAC9E;QACD,OAAO,SAAS,CAAA;IACpB,CAAC;CACJ,CAAA;AA/CY,8CAAiB;AAMnB;IAFN,IAAA,qBAAS,EAAC,EAAE,UAAU,EAAE,qCAAe,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IAC3D,IAAA,oBAAQ,GAAE;;gDACc;AAIlB;IAFN,IAAA,qBAAS,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC3B,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,EAAE,iBAAiB,CAAC,YAAY,EAAE,CAAC;;+CACxD;4BAVb,iBAAiB;IAD7B,IAAA,gBAAI,EAAC,mBAAmB,CAAC;GACb,iBAAiB,CA+C7B"}

package/dist/buildInformation.js

@@ -5,11 +5,11 @@ 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.7.1",
-    build: "146",
-    date: "2023-09-21T08:44:47+00:00",
-    commit: "39152f5b09bbb05a5a23348814c81ad599470a1e",
-    dependencies: {"@js-soft/logging-abstractions":"^1.0.0","@nmshd/iql":"^0.0.3","easy-tsnameof":"^3.0.6","mocha-param":"^2.0.1"},
+    version: "2.7.3",
+    build: "148",
+    date: "2023-09-25T09:11:08+00:00",
+    commit: "553c5c724a23459e85c5610217f9904a988d6d97",
+    dependencies: {"@js-soft/logging-abstractions":"^1.0.0","@nmshd/iql":"^0.0.4","easy-tsnameof":"^3.0.6","mocha-param":"^2.0.1"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         crypto: crypto_1.buildInformation,

package/lib-web/nmshd.content.js

@@ -329,10 +329,31 @@ 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.IQLQuery = void 0;
+exports.IQLQuery = exports.IQLQueryCreationHints = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const Iql = __importStar(__webpack_require__(/*! @nmshd/iql */ "./node_modules/@nmshd/iql/dist/src/index.js"));
 const AbstractAttributeQuery_1 = __webpack_require__(/*! ./AbstractAttributeQuery */ "./dist/attributes/AbstractAttributeQuery.js");
+const AttributeValueTypes_1 = __webpack_require__(/*! ./AttributeValueTypes */ "./dist/attributes/AttributeValueTypes.js");
+const IdentityAttribute_1 = __webpack_require__(/*! ./IdentityAttribute */ "./dist/attributes/IdentityAttribute.js");
+let IQLQueryCreationHints = class IQLQueryCreationHints extends ts_serval_1.Serializable {
+    static from(value) {
+        return this.fromAny(value);
+    }
+};
+exports.IQLQueryCreationHints = IQLQueryCreationHints;
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)({ customValidator: IdentityAttribute_1.IdentityAttribute.validateTypeName }),
+    __metadata("design:type", String)
+], IQLQueryCreationHints.prototype, "valueType", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)({ type: String }),
+    (0, ts_serval_1.validate)({ nullable: true, customValidator: IdentityAttribute_1.IdentityAttribute.validateTags }),
+    __metadata("design:type", Array)
+], IQLQueryCreationHints.prototype, "tags", void 0);
+exports.IQLQueryCreationHints = IQLQueryCreationHints = __decorate([
+    (0, ts_serval_1.type)("IQLQueryCreationHints")
+], IQLQueryCreationHints);
 let IQLQuery = class IQLQuery extends AbstractAttributeQuery_1.AbstractAttributeQuery {
     static from(value) {
         return this.fromAny(value);
@@ -355,6 +376,11 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], IQLQuery.prototype, "queryString", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
+    __metadata("design:type", IQLQueryCreationHints)
+], IQLQuery.prototype, "attributeCreationHints", void 0);
 exports.IQLQuery = IQLQuery = __decorate([
     (0, ts_serval_1.type)("IQLQuery")
 ], IQLQuery);
@@ -399,6 +425,12 @@ let IdentityAttribute = class IdentityAttribute extends AbstractAttribute_1.Abst
         }
         return undefined;
     }
+    static validateTypeName(typeName) {
+        if (!AttributeValueTypes_1.AttributeValues.Identity.TYPE_NAMES.includes(typeName)) {
+            return `must be one of: ${AttributeValueTypes_1.AttributeValues.Identity.TYPE_NAMES_STRINGIFIED}`;
+        }
+        return undefined;
+    }
 };
 exports.IdentityAttribute = IdentityAttribute;
 __decorate([
@@ -7125,11 +7157,11 @@ 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.7.1",
-    build: "146",
-    date: "2023-09-21T08:44:47+00:00",
-    commit: "39152f5b09bbb05a5a23348814c81ad599470a1e",
-    dependencies: {"@js-soft/logging-abstractions":"^1.0.0","@nmshd/iql":"^0.0.3","easy-tsnameof":"^3.0.6","mocha-param":"^2.0.1"},
+    version: "2.7.3",
+    build: "148",
+    date: "2023-09-25T09:11:08+00:00",
+    commit: "553c5c724a23459e85c5610217f9904a988d6d97",
+    dependencies: {"@js-soft/logging-abstractions":"^1.0.0","@nmshd/iql":"^0.0.4","easy-tsnameof":"^3.0.6","mocha-param":"^2.0.1"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         crypto: crypto_1.buildInformation,
@@ -9109,8 +9141,18 @@ function peg$parse(input, options) {
     };
     var peg$f9 = function (op) {
         switch (op) {
+            /* The ?-op checks whether a particular field is defined or not. Empty
+             * arrays and dicts are treated as undefined. */
             case "?":
-                return (fieldVal) => { return fieldVal != undefined; };
+                return (fieldVal) => {
+                    if (Array.isArray(fieldVal)) {
+                        return fieldVal.length > 0;
+                    }
+                    if (fieldVal.constructor.name === "Object") {
+                        return Object.keys(fieldVal).length > 0;
+                    }
+                    return (fieldVal !== undefined && fieldVal !== null);
+                };
         }
     };
     var peg$f10 = function (val) {