Fix/make iql queries atType optional again (#14)

* fix: make the iqlquery atType optional again * chore: bump the runtime version
nmshd · Feb 6, 2024 · b08c71d · b08c71d
1 parent c3fcf5e
commit b08c71d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nmshd/runtime",
-    "version": "3.5.1",
+    "version": "3.5.2",
     "description": "The enmeshed client runtime.",
     "homepage": "https://enmeshed.eu",
     "repository": {

diff --git a/packages/runtime/src/useCases/common/Schemas.ts b/packages/runtime/src/useCases/common/Schemas.ts
@@ -15916,40 +15916,36 @@ export const ExecuteIQLQueryRequest: any = {
             "type": "object",
             "properties": {
                 "query": {
-                    "$ref": "#/definitions/IQLQueryJSON"
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "@type": {
+                            "type": "string",
+                            "const": "IQLQuery"
+                        },
+                        "queryString": {
+                            "type": "string"
+                        },
+                        "attributeCreationHints": {
+                            "$ref": "#/definitions/IQLQueryCreationHintsJSON"
+                        },
+                        "@context": {
+                            "type": "string"
+                        },
+                        "@version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "queryString"
+                    ]
                 }
             },
             "required": [
                 "query"
             ],
             "additionalProperties": false
         },
-        "IQLQueryJSON": {
-            "type": "object",
-            "properties": {
-                "@type": {
-                    "type": "string",
-                    "const": "IQLQuery"
-                },
-                "@context": {
-                    "type": "string"
-                },
-                "@version": {
-                    "type": "string"
-                },
-                "queryString": {
-                    "type": "string"
-                },
-                "attributeCreationHints": {
-                    "$ref": "#/definitions/IQLQueryCreationHintsJSON"
-                }
-            },
-            "required": [
-                "@type",
-                "queryString"
-            ],
-            "additionalProperties": false
-        },
         "IQLQueryCreationHintsJSON": {
             "type": "object",
             "properties": {

diff --git a/packages/runtime/src/useCases/consumption/attributes/ExecuteIQLQuery.ts b/packages/runtime/src/useCases/consumption/attributes/ExecuteIQLQuery.ts
@@ -7,7 +7,7 @@ import { SchemaRepository, SchemaValidator, UseCase } from "../../common";
 import { AttributeMapper } from "./AttributeMapper";
 
 export interface ExecuteIQLQueryRequest {
-    query: IQLQueryJSON;
+    query: Omit<IQLQueryJSON, "@type"> & { "@type"?: "IQLQuery" };
 }
 
 class Validator extends SchemaValidator<ExecuteIQLQueryRequest> {