diff --git a/package-lock.json b/package-lock.json index e2a62b2d1..7f20e35a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12926,7 +12926,7 @@ }, "packages/runtime": { "name": "@nmshd/runtime", - "version": "3.5.1", + "version": "3.5.2", "license": "MIT", "dependencies": { "@js-soft/docdb-querytranslator": "^1.1.2", diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 79d06d2dc..c2ffc685c 100644 --- 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 index 21cfb335a..105bbb746 100644 --- a/packages/runtime/src/useCases/common/Schemas.ts +++ b/packages/runtime/src/useCases/common/Schemas.ts @@ -15916,7 +15916,29 @@ 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": [ @@ -15924,32 +15946,6 @@ export const ExecuteIQLQueryRequest: any = { ], "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 index 6ce4a177b..d80600a2f 100644 --- 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 & { "@type"?: "IQLQuery" }; } class Validator extends SchemaValidator {