@nmshd/consumption 3.3.0 → 3.3.2

package/dist/buildInformation.js

@@ -6,11 +6,11 @@ const content_1 = require("@nmshd/content");
 const crypto_1 = require("@nmshd/crypto");
 const transport_1 = require("@nmshd/transport");
 exports.buildInformation = {
-    version: "3.3.0",
-    build: "105",
-    date: "2023-08-10T06:20:25+00:00",
-    commit: "1cc2cae1c39a21b6f37b8dd0a26ae801473a40f1",
-    dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","@nmshd/iql":"^0.0.1","ts-simple-nameof":"^1.3.1"},
+    version: "3.3.2",
+    build: "107",
+    date: "2023-09-27T10:34:54+00:00",
+    commit: "d1f155d8411c372c9b03b293818245a398bd3b32",
+    dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","@nmshd/iql":"^0.0.4","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
         crypto: crypto_1.buildInformation,

package/dist/consumption/CoreErrors.js

@@ -19,7 +19,7 @@ class Requests {
         return new transport_1.CoreError("error.consumption.requests.servalErrorDuringRequestItemProcessing", error instanceof Error ? error.message : `Serval error: '${JSON.stringify(error)}'`, undefined, undefined, error);
     }
     invalidAcceptParameters() {
-        return new ts_utils_1.ApplicationError("error.consumption.requests.canAccept.invalidAcceptParameters", "The RequestItemGroup was answered as a RequestItem.");
+        return new ts_utils_1.ApplicationError("error.consumption.requests.canAccept.invalidAcceptParameters", "The RequestItem was answered with incorrect parameters.");
     }
     invalidRequestItem(message) {
         return new transport_1.CoreError("error.consumption.requests.invalidRequestItem", message);

package/dist/consumption/CoreErrors.js.map

@@ -1 +1 @@
-{"version":3,"file":"CoreErrors.js","sourceRoot":"","sources":["../../src/consumption/CoreErrors.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AACpD,gDAAoD;AAEpD,MAAM,UAAU;IACL,kCAAkC,CAAC,QAAyB;QAC/D,OAAO,IAAI,qBAAS,CAChB,iEAAiE,EACjE,uDAAuD,QAAQ,CAAC,QAAQ,EAAE,8HAA8H,CAC3M,CAAA;IACL,CAAC;CACJ;AAED,MAAM,QAAQ;IAAd;QAkEoB,qBAAgB,GAAG,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAA;IACvE,CAAC;IAlEU,0CAA0C,CAAC,KAAU;QACxD,OAAO,IAAI,qBAAS,CAChB,uEAAuE,EACvE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EACpF,SAAS,EACT,SAAS,EACT,KAAK,CACR,CAAA;IACL,CAAC;IAEM,sCAAsC,CAAC,KAAU;QACpD,OAAO,IAAI,qBAAS,CAChB,mEAAmE,EACnE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EACnF,SAAS,EACT,SAAS,EACT,KAAK,CACR,CAAA;IACL,CAAC;IAEM,uBAAuB;QAC1B,OAAO,IAAI,2BAAgB,CACvB,8DAA8D,EAC9D,qDAAqD,CACxD,CAAA;IACL,CAAC;IAEM,kBAAkB,CAAC,OAAe;QACrC,OAAO,IAAI,qBAAS,CAAC,+CAA+C,EAAE,OAAO,CAAC,CAAA;IAClF,CAAC;;AAEuB,0BAAiB,GAAG;IACjC,oBAAoB,CAAC,OAAe;QACvC,OAAO,IAAI,2BAAgB,CAAC,mEAAmE,EAAE,OAAO,CAAC,CAAA;IAC7G,CAAC;IAEM,gCAAgC,CAAC,OAAe;QACnD,OAAO,IAAI,2BAAgB,CACvB,+EAA+E,EAC/E,OAAO,CACV,CAAA;IACL,CAAC;IAEM,6BAA6B,CAAC,OAAe;QAChD,OAAO,IAAI,2BAAgB,CACvB,4EAA4E,EAC5E,OAAO,CACV,CAAA;IACL,CAAC;IAEM,qCAAqC;QACxC,OAAO,IAAI,2BAAgB,CACvB,oFAAoF,EACpF,qDAAqD,CACxD,CAAA;IACL,CAAC;IAEM,qCAAqC;QACxC,OAAO,IAAI,2BAAgB,CACvB,oFAAoF,EACpF,qDAAqD,CACxD,CAAA;IACL,CAAC;CACJ,CAAA;AAKL,MAAa,UAAU;;AAAvB,gCAGC;AAFiB,qBAAU,GAAG,IAAI,UAAU,EAAE,CAAA;AAC7B,mBAAQ,GAAG,IAAI,QAAQ,EAAE,CAAA"}
+{"version":3,"file":"CoreErrors.js","sourceRoot":"","sources":["../../src/consumption/CoreErrors.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AACpD,gDAAoD;AAEpD,MAAM,UAAU;IACL,kCAAkC,CAAC,QAAyB;QAC/D,OAAO,IAAI,qBAAS,CAChB,iEAAiE,EACjE,uDAAuD,QAAQ,CAAC,QAAQ,EAAE,8HAA8H,CAC3M,CAAA;IACL,CAAC;CACJ;AAED,MAAM,QAAQ;IAAd;QAkEoB,qBAAgB,GAAG,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAA;IACvE,CAAC;IAlEU,0CAA0C,CAAC,KAAU;QACxD,OAAO,IAAI,qBAAS,CAChB,uEAAuE,EACvE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EACpF,SAAS,EACT,SAAS,EACT,KAAK,CACR,CAAA;IACL,CAAC;IAEM,sCAAsC,CAAC,KAAU;QACpD,OAAO,IAAI,qBAAS,CAChB,mEAAmE,EACnE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EACnF,SAAS,EACT,SAAS,EACT,KAAK,CACR,CAAA;IACL,CAAC;IAEM,uBAAuB;QAC1B,OAAO,IAAI,2BAAgB,CACvB,8DAA8D,EAC9D,yDAAyD,CAC5D,CAAA;IACL,CAAC;IAEM,kBAAkB,CAAC,OAAe;QACrC,OAAO,IAAI,qBAAS,CAAC,+CAA+C,EAAE,OAAO,CAAC,CAAA;IAClF,CAAC;;AAEuB,0BAAiB,GAAG;IACjC,oBAAoB,CAAC,OAAe;QACvC,OAAO,IAAI,2BAAgB,CAAC,mEAAmE,EAAE,OAAO,CAAC,CAAA;IAC7G,CAAC;IAEM,gCAAgC,CAAC,OAAe;QACnD,OAAO,IAAI,2BAAgB,CACvB,+EAA+E,EAC/E,OAAO,CACV,CAAA;IACL,CAAC;IAEM,6BAA6B,CAAC,OAAe;QAChD,OAAO,IAAI,2BAAgB,CACvB,4EAA4E,EAC5E,OAAO,CACV,CAAA;IACL,CAAC;IAEM,qCAAqC;QACxC,OAAO,IAAI,2BAAgB,CACvB,oFAAoF,EACpF,qDAAqD,CACxD,CAAA;IACL,CAAC;IAEM,qCAAqC;QACxC,OAAO,IAAI,2BAAgB,CACvB,oFAAoF,EACpF,qDAAqD,CACxD,CAAA;IACL,CAAC;CACJ,CAAA;AAKL,MAAa,UAAU;;AAAvB,gCAGC;AAFiB,qBAAU,GAAG,IAAI,UAAU,EAAE,CAAA;AAC7B,mBAAQ,GAAG,IAAI,QAAQ,EAAE,CAAA"}

package/dist/modules/requests/itemProcessors/utility/validateQuery.js

@@ -18,7 +18,7 @@ function validateQuery(query, sender, recipient) {
     else if (query instanceof content_1.IQLQuery) {
         const validationResult = (0, iql_1.validate)(query.queryString);
         if (!validationResult.isValid) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem(`IQL query syntax error at character ${validationResult.error?.location.start.column}`));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem(`IQL query syntax error at character ${validationResult.error.location.start.column}`));
         }
     }
     return ValidationResult_1.ValidationResult.success();

package/dist/modules/requests/itemProcessors/utility/validateQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateQuery.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/utility/validateQuery.ts"],"names":[],"mappings":";;AAAA,4CAKuB;AACvB,oCAAoD;AAEpD,yDAAoD;AACpD,0DAAsD;AAEtD,SAAwB,aAAa,CACjC,KAA4G,EAC5G,MAAmB,EACnB,SAAuB;IAEvB,IAAI,KAAK,YAAY,8CAAoC,EAAE;QACvD,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,UAAU,EAAE;YACvC,MAAM,MAAM,GAAG,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;YAChE,IAAI,MAAM,CAAC,OAAO,EAAE;gBAAE,OAAO,MAAM,CAAA;SACtC;QAED,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAC5B,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,iDAAiD,CAAC,CAC5F,CAAA;SACJ;KACJ;SAAM,IAAI,KAAK,YAAY,kBAAQ,EAAE;QAClC,MAAM,gBAAgB,GAAG,IAAA,cAAW,EAAC,KAAK,CAAC,WAAW,CAAC,CAAA;QACvD,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;YAC3B,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAClC,uCAAuC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,CACzF,CACJ,CAAA;SACJ;KACJ;IAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAA;AACrC,CAAC;AA5BD,gCA4BC;AAED,SAAS,kBAAkB,CAAC,UAAuB,EAAE,MAAmB,EAAE,SAAuB;IAC7F,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC3B,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,gEAAgE,CAAC,CAC3G,CAAA;KACJ;IAED,IAAI,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC9B,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAClC,wEAAwE,CAC3E,CACJ,CAAA;KACJ;IAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAA;AACrC,CAAC"}
+{"version":3,"file":"validateQuery.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/utility/validateQuery.ts"],"names":[],"mappings":";;AAAA,4CAKuB;AACvB,oCAAoD;AAEpD,yDAAoD;AACpD,0DAAsD;AAEtD,SAAwB,aAAa,CACjC,KAA4G,EAC5G,MAAmB,EACnB,SAAuB;IAEvB,IAAI,KAAK,YAAY,8CAAoC,EAAE;QACvD,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,UAAU,EAAE;YACvC,MAAM,MAAM,GAAG,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;YAChE,IAAI,MAAM,CAAC,OAAO,EAAE;gBAAE,OAAO,MAAM,CAAA;SACtC;QAED,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAC5B,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,iDAAiD,CAAC,CAC5F,CAAA;SACJ;KACJ;SAAM,IAAI,KAAK,YAAY,kBAAQ,EAAE;QAClC,MAAM,gBAAgB,GAAG,IAAA,cAAW,EAAC,KAAK,CAAC,WAAW,CAAC,CAAA;QACvD,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;YAC3B,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAClC,uCAAuC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,CACxF,CACJ,CAAA;SACJ;KACJ;IAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAA;AACrC,CAAC;AA5BD,gCA4BC;AAED,SAAS,kBAAkB,CAAC,UAAuB,EAAE,MAAmB,EAAE,SAAuB;IAC7F,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC3B,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,gEAAgE,CAAC,CAC3G,CAAA;KACJ;IAED,IAAI,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC9B,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAClC,wEAAwE,CAC3E,CACJ,CAAA;KACJ;IAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAA;AACrC,CAAC"}

package/lib-web/nmshd.consumption.js

@@ -17,11 +17,11 @@ 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: "3.3.0",
-    build: "105",
-    date: "2023-08-10T06:20:25+00:00",
-    commit: "1cc2cae1c39a21b6f37b8dd0a26ae801473a40f1",
-    dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","@nmshd/iql":"^0.0.1","ts-simple-nameof":"^1.3.1"},
+    version: "3.3.2",
+    build: "107",
+    date: "2023-09-27T10:34:54+00:00",
+    commit: "d1f155d8411c372c9b03b293818245a398bd3b32",
+    dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","@nmshd/iql":"^0.0.4","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
         crypto: crypto_1.buildInformation,
@@ -228,7 +228,7 @@ class Requests {
         return new transport_1.CoreError("error.consumption.requests.servalErrorDuringRequestItemProcessing", error instanceof Error ? error.message : `Serval error: '${JSON.stringify(error)}'`, undefined, undefined, error);
     }
     invalidAcceptParameters() {
-        return new ts_utils_1.ApplicationError("error.consumption.requests.canAccept.invalidAcceptParameters", "The RequestItemGroup was answered as a RequestItem.");
+        return new ts_utils_1.ApplicationError("error.consumption.requests.canAccept.invalidAcceptParameters", "The RequestItem was answered with incorrect parameters.");
     }
     invalidRequestItem(message) {
         return new transport_1.CoreError("error.consumption.requests.invalidRequestItem", message);
@@ -3544,7 +3544,7 @@ function validateQuery(query, sender, recipient) {
     else if (query instanceof content_1.IQLQuery) {
         const validationResult = (0, iql_1.validate)(query.queryString);
         if (!validationResult.isValid) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem(`IQL query syntax error at character ${validationResult.error?.location.start.column}`));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem(`IQL query syntax error at character ${validationResult.error.location.start.column}`));
         }
     }
     return ValidationResult_1.ValidationResult.success();
@@ -5710,8 +5710,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) {