[ES|QL] remove worker

examples/esql_validation_example/public/app.tsx

@@ -25,7 +25,6 @@ import {
 import type { CoreStart } from '@kbn/core/public';
 
 import { ESQLCallbacks, ESQLRealField, validateQuery } from '@kbn/esql-validation-autocomplete';
-import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
 import type { StartDependencies } from './plugin';
 import { CodeSnippet } from './code_snippet';
 
@@ -77,16 +76,13 @@ export const App = (props: { core: CoreStart; plugins: StartDependencies }) => {
     if (currentQuery === '') {
       return;
     }
-    validateQuery(
-      currentQuery,
-      getAstAndSyntaxErrors,
-      { ignoreOnMissingCallbacks: ignoreErrors },
-      callbacks
-    ).then(({ errors: validationErrors, warnings: validationWarnings }) => {
-      // syntax errors come with a slight different format than other validation errors
-      setErrors(validationErrors.map((e) => ('severity' in e ? e.message : e.text)));
-      setWarnings(validationWarnings.map((e) => e.text));
-    });
+    validateQuery(currentQuery, { ignoreOnMissingCallbacks: ignoreErrors }, callbacks).then(
+      ({ errors: validationErrors, warnings: validationWarnings }) => {
+        // syntax errors come with a slight different format than other validation errors
+        setErrors(validationErrors.map((e) => ('severity' in e ? e.message : e.text)));
+        setWarnings(validationWarnings.map((e) => e.text));
+      }
+    );
   }, [currentQuery, ignoreErrors, callbacks]);
 
   const checkboxes = [
@@ -106,7 +102,7 @@ export const App = (props: { core: CoreStart; plugins: StartDependencies }) => {
 
   return (
     <EuiPage>
-      <EuiPageBody style={{ maxWidth: 800, margin: '0 auto' }}>
+      <EuiPageBody css={{ maxWidth: 800, margin: '0 auto' }}>
         <EuiPageHeader paddingSize="s" bottomBorder={true} pageTitle="ES|QL validation example" />
         <EuiPageSection paddingSize="s">
           <p>This app shows how to use the ES|QL validation API with all its options</p>

examples/esql_validation_example/public/code_snippet.tsx

@@ -56,15 +56,14 @@ export function CodeSnippet({ currentQuery, callbacks, ignoreErrors }: CodeSnipp
     <EuiCodeBlock language="typescript" isCopyable>
       {`
 import { ESQLCallbacks, validateQuery } from '@kbn/esql-validation-autocomplete';
-import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
+import { parse } from '@kbn/esql-ast';
 
 const currentQuery = "${currentQuery}";
 
 const callbacks: ESQLCallbacks = () => ${getCallbacksCode(callbacks)};
 
 const {errors, warnings} = validateQuery(
     currentQuery,
-    getAstAndSyntaxErrors,
     { ignoreOnMissingCallbacks: ${Boolean(ignoreErrors)} },
     callbacks
 );

examples/esql_validation_example/tsconfig.json

@@ -18,7 +18,6 @@
     "@kbn/data-plugin",
     "@kbn/data-views-plugin",
     "@kbn/developer-examples-plugin",
-    "@kbn/esql-ast",
     "@kbn/esql-validation-autocomplete",
   ]
 }

src/platform/packages/shared/kbn-esql-ast/index.ts

@@ -26,7 +26,6 @@ export type {
   ESQLColumn,
   ESQLLiteral,
   ESQLParamLiteral,
-  AstProviderFn,
   EditorError,
   ESQLAstNode,
   ESQLInlineCast,
@@ -57,7 +56,6 @@ export {
   parseErrors,
   type ParseOptions,
   type ParseResult,
-  getAstAndSyntaxErrors,
   ESQLErrorListener,
 } from './src/parser';
 

src/platform/packages/shared/kbn-esql-ast/src/parser/index.ts

@@ -15,9 +15,6 @@ export {
   parseErrors,
   type ParseOptions,
   type ParseResult,
-
-  /** @deprecated Use `parse` instead. */
-  parse as getAstAndSyntaxErrors,
 } from './parser';
 
 export { ESQLErrorListener } from './esql_error_listener';

src/platform/packages/shared/kbn-esql-ast/src/types.ts

@@ -489,13 +489,6 @@ export interface ESQLMessage {
   code: string;
 }
 
-export type AstProviderFn = (text: string | undefined) =>
-  | Promise<{
-      ast: ESQLAst;
-      errors: EditorError[];
-    }>
-  | { ast: ESQLAst; errors: EditorError[] };
-
 export interface EditorError {
   startLineNumber: number;
   endLineNumber: number;

src/platform/packages/shared/kbn-esql-utils/src/utils/append_to_query.ts

@@ -7,7 +7,6 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
 import { parse, mutate, BasicPrettyPrinter } from '@kbn/esql-ast';
 import { sanitazeESQLInput } from './sanitaze_input';
 
@@ -61,7 +60,7 @@ export function appendWhereClauseToESQLQuery(
     filterValue = '';
   }
 
-  const { ast } = getAstAndSyntaxErrors(baseESQLQuery);
+  const { ast } = parse(baseESQLQuery);
 
   const lastCommandIsWhere = ast[ast.length - 1].name === 'where';
   // if where command already exists in the end of the query:

src/platform/packages/shared/kbn-esql-utils/src/utils/get_esql_with_safe_limit.ts

@@ -7,10 +7,10 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
+import { parse } from '@kbn/esql-ast';
 
 export function getESQLWithSafeLimit(esql: string, limit: number): string {
-  const { ast } = getAstAndSyntaxErrors(esql);
+  const { ast } = parse(esql);
   const sourceCommand = ast.find(({ name }) => ['from', 'metrics'].includes(name));
   if (!sourceCommand) {
     return esql;

src/platform/packages/shared/kbn-esql-validation-autocomplete/README.md

@@ -25,7 +25,7 @@ For instance, not passing the `getSources` callback will report all index mentio
 ##### Usage
 
 ```js
-import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
+import { parse } from '@kbn/esql-ast';
 import { validateQuery } from '@kbn/esql-validation-autocomplete';
 
 // define all callbacks
@@ -35,13 +35,13 @@ const myCallbacks = {
 };
 
 // Full validation performed
-const { errors, warnings } = await validateQuery("from index | stats 1 + avg(myColumn)", getAstAndSyntaxErrors, undefined, myCallbacks);
+const { errors, warnings } = await validateQuery("from index | stats 1 + avg(myColumn)", parse, undefined, myCallbacks);
 ```
 
 If not all callbacks are available it is possible to gracefully degrade the validation experience with the `ignoreOnMissingCallbacks` option:
 
 ```js
-import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
+import { parse } from '@kbn/esql-ast';
 import { validateQuery } from '@kbn/esql-validation-autocomplete';
 
 // define only the getSources callback
@@ -52,7 +52,7 @@ const myCallbacks = {
 // ignore errors that might be triggered by the lack of some callbacks (i.e. "Unknown columns", etc...)
 const { errors, warnings } = await validateQuery(
   'from index | stats 1 + avg(myColumn)',
-  getAstAndSyntaxErrors,
+  parse,
   { ignoreOnMissingCallbacks: true },
   myCallbacks
 );
@@ -63,7 +63,7 @@ const { errors, warnings } = await validateQuery(
 This is the complete logic for the ES|QL autocomplete language, it is completely independent from the actual editor (i.e. Monaco) and the suggestions reported need to be wrapped against the specific editor shape.
 
 ```js
-import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
+import { parse } from '@kbn/esql-ast';
 import { suggest } from '@kbn/esql-validation-autocomplete';
 
 const queryString = "from index | stats 1 + avg(myColumn) ";
@@ -76,7 +76,7 @@ const suggestions = await suggest(
   queryString,
   queryString.length - 1, // the cursor position in a single line context
   { triggerCharacter: " "; triggerKind: 1 }, // kind = 0 is a programmatic trigger, while other values are ignored
-  getAstAndSyntaxErrors,
+  parse,
   myCallbacks
 );
 
@@ -102,7 +102,7 @@ This feature provides a list of suggestions to propose as fixes for a subset of
 The feature works in combination with the validation service.
 
 ```js
-import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
+import { parse } from '@kbn/esql-ast';
 import { validateQuery, getActions } from '@kbn/esql-validation-autocomplete';
 
 const queryString = "from index2 | stats 1 + avg(myColumn)"
@@ -111,12 +111,12 @@ const myCallbacks = {
   getSources: async () => [{name: 'index', hidden: false}],
   ...
 };
-const { errors, warnings } = await validateQuery(queryString, getAstAndSyntaxErrors, undefined, myCallbacks);
+const { errors, warnings } = await validateQuery(queryString, parse, undefined, myCallbacks);
 
 const {title, edits} = await getActions(
   queryString,
   errors,
-  getAstAndSyntaxErrors,
+  parse,
   undefined,
   myCallbacks
 );
@@ -129,7 +129,7 @@ console.log({ title, edits });
 Like with validation also `getActions` can 'relax' its internal checks when no callbacks, either all or specific ones, are passed.
 
 ```js
-import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
+import { parse } from '@kbn/esql-ast';
 import { validateQuery, getActions } from '@kbn/esql-validation-autocomplete';
 
 const queryString = "from index2 | keep unquoted-field"
@@ -138,12 +138,12 @@ const myCallbacks = {
   getSources: async () => [{name: 'index', hidden: false}],
   ...
 };
-const { errors, warnings } = await validateQuery(queryString, getAstAndSyntaxErrors, undefined, myCallbacks);
+const { errors, warnings } = await validateQuery(queryString, parse, undefined, myCallbacks);
 
 const {title, edits} = await getActions(
   queryString,
   errors,
-  getAstAndSyntaxErrors,
+  parse,
   { relaxOnMissingCallbacks: true },
   myCallbacks
 );
@@ -159,13 +159,13 @@ This is an important function in order to build more features on top of the exis
 For instance to show contextual information on Hover the `getAstContext` function can be leveraged to get the correct context for the cursor position:
 
 ```js
-import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
+import { parse } from '@kbn/esql-ast';
 import { getAstContext } from '@kbn/esql-validation-autocomplete';
 
 const queryString = 'from index2 | stats 1 + avg(myColumn)';
 const offset = queryString.indexOf('avg');
 
-const astContext = getAstContext(queryString, getAstAndSyntaxErrors(queryString), offset);
+const astContext = getAstContext(queryString, parse(queryString), offset);
 
 if (astContext.type === 'function') {
   const fnNode = astContext.node;

src/platform/packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/__tests__/autocomplete.suggest.test.ts

@@ -7,7 +7,6 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
 import { ESQLCallbacks } from '../../shared/types';
 import * as autocomplete from '../autocomplete';
 import { getCallbackMocks } from '../../__tests__/helpers';
@@ -26,7 +25,7 @@ const setup = async (caret = '?') => {
     const pos = query.indexOf(caret);
     if (pos < 0) throw new Error(`User cursor/caret "${caret}" not found in query: ${query}`);
     const querySansCaret = query.slice(0, pos) + query.slice(pos + 1);
-    return await autocomplete.suggest(querySansCaret, pos, ctx, getAstAndSyntaxErrors, cb);
+    return await autocomplete.suggest(querySansCaret, pos, ctx, cb);
   };
 
   return {

src/platform/packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/__tests__/helpers.ts

@@ -8,7 +8,6 @@
  */
 
 import { camelCase } from 'lodash';
-import { parse } from '@kbn/esql-ast';
 import { scalarFunctionDefinitions } from '../../definitions/generated/scalar_functions';
 import { operatorsDefinitions } from '../../definitions/all_operators';
 import { NOT_SUGGESTED_TYPES } from '../../shared/resources_helpers';
@@ -353,13 +352,7 @@ export const setup = async (caret = '/') => {
       ? { triggerKind: 1, triggerCharacter: opts.triggerCharacter }
       : { triggerKind: 0 };
 
-    return await autocomplete.suggest(
-      querySansCaret,
-      pos,
-      ctx,
-      (_query: string | undefined) => parse(_query, { withFormatting: true }),
-      opts.callbacks ?? callbacks
-    );
+    return await autocomplete.suggest(querySansCaret, pos, ctx, opts.callbacks ?? callbacks);
   };
 
   const assertSuggestions: AssertSuggestionsFn = async (query, expected, opts) => {

src/platform/packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.test.ts

@@ -7,31 +7,30 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { suggest } from './autocomplete';
+import { commandDefinitions as unmodifiedCommandDefinitions } from '../definitions/commands';
 import { scalarFunctionDefinitions } from '../definitions/generated/scalar_functions';
 import { timeUnitsToSuggest } from '../definitions/literals';
-import { commandDefinitions as unmodifiedCommandDefinitions } from '../definitions/commands';
-import { getSafeInsertText, TIME_SYSTEM_PARAMS, TRIGGER_SUGGESTION_COMMAND } from './factories';
-import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
+import { Location } from '../definitions/types';
+import { METADATA_FIELDS } from '../shared/constants';
+import { ESQL_STRING_TYPES } from '../shared/esql_types';
 import {
-  policies,
-  getFunctionSignaturesByReturnType,
-  getFieldNamesByType,
-  createCustomCallbackMocks,
+  attachTriggerCommand,
   createCompletionContext,
+  createCustomCallbackMocks,
+  fields,
+  getFieldNamesByType,
+  getFunctionSignaturesByReturnType,
   getPolicyFields,
   PartialSuggestionWithText,
-  TIME_PICKER_SUGGESTION,
+  policies,
   setup,
-  attachTriggerCommand,
   SuggestOptions,
-  fields,
+  TIME_PICKER_SUGGESTION,
 } from './__tests__/helpers';
-import { METADATA_FIELDS } from '../shared/constants';
-import { ESQL_STRING_TYPES } from '../shared/esql_types';
-import { getRecommendedQueries } from './recommended_queries/templates';
+import { suggest } from './autocomplete';
 import { getDateHistogramCompletionItem } from './commands/stats/util';
-import { Location } from '../definitions/types';
+import { getSafeInsertText, TIME_SYSTEM_PARAMS, TRIGGER_SUGGESTION_COMMAND } from './factories';
+import { getRecommendedQueries } from './recommended_queries/templates';
 
 const commandDefinitions = unmodifiedCommandDefinitions.filter(({ hidden }) => !hidden);
 
@@ -213,13 +212,7 @@ describe('autocomplete', () => {
       const statement = 'from a | drop keywordField | eval var0 = abs(doubleField) ';
       const triggerOffset = statement.lastIndexOf(' ');
       const context = createCompletionContext(statement[triggerOffset]);
-      await suggest(
-        statement,
-        triggerOffset + 1,
-        context,
-        async (text) => (text ? getAstAndSyntaxErrors(text) : { ast: [], errors: [] }),
-        callbackMocks
-      );
+      await suggest(statement, triggerOffset + 1, context, callbackMocks);
       expect(callbackMocks.getColumnsFor).toHaveBeenCalledWith({
         query: 'from a | drop keywordField',
       });
@@ -229,13 +222,7 @@ describe('autocomplete', () => {
       const statement = 'from a | drop | eval var0 = abs(doubleField) ';
       const triggerOffset = statement.lastIndexOf('p') + 1; // drop <here>
       const context = createCompletionContext(statement[triggerOffset]);
-      await suggest(
-        statement,
-        triggerOffset + 1,
-        context,
-        async (text) => (text ? getAstAndSyntaxErrors(text) : { ast: [], errors: [] }),
-        callbackMocks
-      );
+      await suggest(statement, triggerOffset + 1, context, callbackMocks);
       expect(callbackMocks.getColumnsFor).toHaveBeenCalledWith({ query: 'from a' });
     });
   });

src/platform/packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts

@@ -9,7 +9,7 @@
 
 import { uniq } from 'lodash';
 import {
-  type AstProviderFn,
+  parse,
   type ESQLAstItem,
   type ESQLCommand,
   type ESQLCommandOption,
@@ -87,13 +87,12 @@ export async function suggest(
   fullText: string,
   offset: number,
   context: EditorContext,
-  astProvider: AstProviderFn,
   resourceRetriever?: ESQLCallbacks
 ): Promise<SuggestionRawDefinition[]> {
   // Partition out to inner ast / ast context for the latest command
   const innerText = fullText.substring(0, offset);
   const correctedQuery = correctQuerySyntax(innerText, context);
-  const { ast } = await astProvider(correctedQuery);
+  const { ast } = parse(correctedQuery, { withFormatting: true });
   const astContext = getAstContext(innerText, ast, offset);
 
   if (astContext.type === 'comment') {