Fix query validation

Author: flobernd

specification/esql/query/QueryRequest.ts

@@ -20,8 +20,8 @@
 import { TableValuesContainer } from '@esql/_types/TableValuesContainer'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { RequestBase } from '@_types/Base'
-import { FieldValue } from '@_types/common'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
+import { EsqlQueryParameters } from './types'
 
 /**
  * Run an ES|QL query.
@@ -70,7 +70,7 @@ export interface Request extends RequestBase {
      * To avoid any attempts of hacking or code injection, extract the values in a separate list of parameters. Use question mark placeholders (?) in the query string for each of the parameters.
      * @doc_id esql-query-params
      */
-    params?: Array<FieldValue>
+    params?: EsqlQueryParameters
     /**
      * If provided and `true` the response will include an extra `profile` object
      * with information on how the query was executed. This information is for human debugging

specification/esql/query/types.ts

@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SingleKeyDictionary } from '@spec_utils/Dictionary'
+import { Field, FieldValue } from '@_types/common'
+
+export type EsqlQueryParameters =
+  | FieldValue[]
+  | SingleKeyDictionary<Field, FieldValue>

specification/sql/types.ts specification/sql/_types/types.tsspecification/sql/types.ts renamed to specification/sql/_types/types.ts

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Name } from '@_types/common'
 
@@ -27,7 +26,3 @@ export class Column {
 }
 
 export type Row = UserDefinedValue[]
-
-export type QueryParameters =
-  | Dictionary<string, UserDefinedValue>
-  | UserDefinedValue[]

specification/sql/get_async/SqlGetAsyncResponse.ts

@@ -18,7 +18,7 @@
  */
 
 import { Id } from '@_types/common'
-import { Column, Row } from '../types'
+import { Column, Row } from '../_types/types'
 
 export class Response {
   body: {

specification/sql/query/QuerySqlRequest.ts

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { QueryParameters } from '@sql/types'
 import { RequestBase } from '@_types/Base'
+import { FieldValue } from '@_types/common'
 import { RuntimeFields } from '@_types/mapping/RuntimeFields'
 import { integer } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
@@ -103,7 +103,7 @@ export interface Request extends RequestBase {
     /**
      * Values for parameters in the query.
      */
-    params?: QueryParameters
+    params?: FieldValue[]
     /**
      * Retention period for an async or saved synchronous search.
      * @server_default 5d

specification/sql/query/QuerySqlResponse.ts

@@ -18,7 +18,7 @@
  */
 
 import { Id } from '@_types/common'
-import { Column, Row } from '../types'
+import { Column, Row } from '../_types/types'
 
 export class Response {
   body: {