[ES|QL] Remove command option definitions

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

@@ -8,12 +8,7 @@
  */
 
 export type { SuggestionRawDefinition, ItemKind } from './src/autocomplete/types';
-export type {
-  FunctionDefinition,
-  CommandDefinition,
-  CommandOptionsDefinition,
-  Literals,
-} from './src/definitions/types';
+export type { FunctionDefinition, CommandDefinition, Literals } from './src/definitions/types';
 export type { ESQLCallbacks } from './src/shared/types';
 
 /**
@@ -44,7 +39,6 @@ export {
   getFunctionDefinition,
   getCommandDefinition,
   getAllCommands,
-  getCommandOption,
   getColumnForASTNode as lookupColumn,
   shouldBeQuotedText,
   printFunctionSignature,

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

@@ -77,7 +77,7 @@ describe('autocomplete.suggest', () => {
         });
         const { assertSuggestions } = await setup();
         const expected = [
-          'METADATA $0',
+          'METADATA ',
           ',',
           '| ',
           ...recommendedQueries.map((query) => query.queryString),
@@ -89,7 +89,7 @@ describe('autocomplete.suggest', () => {
       test('partially-typed METADATA keyword', async () => {
         const { assertSuggestions } = await setup();
 
-        assertSuggestions('FROM index1 MET/', ['METADATA $0']);
+        assertSuggestions('FROM index1 MET/', ['METADATA ']);
       });
 
       test('not before first index', async () => {

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

@@ -319,7 +319,7 @@ describe('autocomplete', () => {
 
     // FROM source METADATA
     recommendedQuerySuggestions = getRecommendedQueriesSuggestions('', 'dateField');
-    testSuggestions('FROM index1 M/', ['METADATA $0']);
+    testSuggestions('FROM index1 M/', ['METADATA ']);
 
     // FROM source METADATA field
     testSuggestions('FROM index1 METADATA _/', METADATA_FIELDS);
@@ -570,7 +570,7 @@ describe('autocomplete', () => {
     testSuggestions('FROM a /', [
       attachTriggerCommand('| '),
       ',',
-      attachAsSnippet(attachTriggerCommand('METADATA $0')),
+      attachTriggerCommand('METADATA '),
       ...recommendedQuerySuggestions.map((q) => q.queryString),
     ]);
 
@@ -675,7 +675,6 @@ describe('autocomplete', () => {
           {
             text: 'foo$bar METADATA ',
             filterText: 'foo$bar',
-            asSnippet: false, // important because the text includes "$"
             command: TRIGGER_SUGGESTION_COMMAND,
             rangeToReplace: { start: 6, end: 13 },
           },
@@ -708,7 +707,7 @@ describe('autocomplete', () => {
 
     recommendedQuerySuggestions = getRecommendedQueriesSuggestions('', 'dateField');
     // FROM source METADATA
-    testSuggestions('FROM index1 M/', [attachAsSnippet(attachTriggerCommand('METADATA $0'))]);
+    testSuggestions('FROM index1 M/', [attachTriggerCommand('METADATA ')]);
 
     describe('ENRICH', () => {
       testSuggestions(

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

@@ -8,8 +8,8 @@
  */
 
 import { ESQLCommandOption } from '@kbn/esql-ast';
+import { i18n } from '@kbn/i18n';
 import { isMarkerNode } from '../../../shared/context';
-import { metadataOption } from '../../../definitions/options';
 import type { SuggestionRawDefinition } from '../../types';
 import { getOverlapRange, handleFragment, removeQuoteForSuggestedSources } from '../../helper';
 import { CommandSuggestParams } from '../../../definitions/types';
@@ -23,7 +23,6 @@ import {
 import {
   TRIGGER_SUGGESTION_COMMAND,
   buildFieldsDefinitions,
-  buildOptionDefinition,
   buildSourcesDefinitions,
 } from '../../factories';
 import { ESQLSourceResult } from '../../../shared/types';
@@ -70,7 +69,7 @@ export async function suggest({
   }
   // FROM something /
   else if (indexes.length > 0 && /\s$/.test(innerText) && !isRestartingExpression(innerText)) {
-    suggestions.push(buildOptionDefinition(metadataOption));
+    suggestions.push(metadataSuggestion);
     suggestions.push(commaCompleteItem);
     suggestions.push(pipeCompleteItem);
     suggestions.push(...(await getRecommendedQueriesSuggestions()));
@@ -81,7 +80,7 @@ export async function suggest({
     /^FROM\s+\S+\s+/i.test(innerText) &&
     metadataOverlap.start !== metadataOverlap.end
   ) {
-    suggestions.push(buildOptionDefinition(metadataOption));
+    suggestions.push(metadataSuggestion);
   }
   // FROM someth/
   // FROM something/
@@ -127,10 +126,9 @@ export async function suggest({
               rangeToReplace,
             },
             {
-              ...buildOptionDefinition(metadataOption),
+              ...metadataSuggestion,
               filterText: fragment,
               text: fragment + ' METADATA ',
-              asSnippet: false, // turn this off because $ could be contained within the source name
               rangeToReplace,
             },
             ...recommendedQuerySuggestions.map((suggestion) => ({
@@ -161,6 +159,17 @@ function getSourceSuggestions(sources: ESQLSourceResult[]) {
   );
 }
 
+const metadataSuggestion: SuggestionRawDefinition = {
+  label: 'METADATA',
+  text: 'METADATA ',
+  kind: 'Reference',
+  detail: i18n.translate('kbn-esql-validation-autocomplete.esql.definitions.metadataDoc', {
+    defaultMessage: 'Metadata',
+  }),
+  sortText: '1',
+  command: TRIGGER_SUGGESTION_COMMAND,
+};
+
 async function suggestForMetadata(metadata: ESQLCommandOption, innerText: string) {
   const existingFields = new Set(metadata.args.filter(isColumnItem).map(({ name }) => name));
   const filteredMetaFields = METADATA_FIELDS.filter((name) => !existingFields.has(name));

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

@@ -13,7 +13,6 @@ import { operatorsDefinitions } from '../definitions/all_operators';
 import { getOperatorSuggestion, TRIGGER_SUGGESTION_COMMAND } from './factories';
 import { CommandDefinition, CommandTypeDefinition } from '../definitions/types';
 import { getCommandDefinition } from '../shared/helpers';
-import { getCommandSignature } from '../definitions/helpers';
 import { buildDocumentation } from './documentation_util';
 
 const techPreviewLabel = i18n.translate(
@@ -55,15 +54,14 @@ export const getCommandAutocompleteDefinitions = (
       if (commandDefinition.preview) {
         detail = `[${techPreviewLabel}] ${detail}`;
       }
-      const commandSignature = getCommandSignature(commandDefinition, type.name);
       const suggestion: SuggestionRawDefinition = {
         label: type.name ? `${type.name.toLocaleUpperCase()} ${label}` : label,
         text: type.name ? `${type.name.toLocaleUpperCase()} ${text}` : text,
         asSnippet: true,
         kind: 'Method',
         detail,
         documentation: {
-          value: buildDocumentation(commandSignature.declaration, commandSignature.examples),
+          value: buildDocumentation(commandDefinition.declaration, commandDefinition.examples),
         },
         sortText: 'A-' + label + '-' + type.name,
         command: TRIGGER_SUGGESTION_COMMAND,

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

@@ -18,7 +18,6 @@ import { getFunctionSignatures } from '../definitions/helpers';
 import { timeUnitsToSuggest } from '../definitions/literals';
 import {
   FunctionDefinition,
-  CommandOptionsDefinition,
   FunctionParameterType,
   FunctionDefinitionTypes,
 } from '../definitions/types';
@@ -366,28 +365,6 @@ export const buildPoliciesDefinitions = (
     command: TRIGGER_SUGGESTION_COMMAND,
   }));
 
-/** @deprecated — options will be removed */
-export const buildOptionDefinition = (
-  option: CommandOptionsDefinition,
-  isAssignType: boolean = false
-) => {
-  const completeItem: SuggestionRawDefinition = {
-    label: option.name.toUpperCase(),
-    text: option.name.toUpperCase(),
-    kind: 'Reference',
-    detail: option.description,
-    sortText: '1',
-  };
-  if (isAssignType || option.signature.params.length) {
-    completeItem.text = isAssignType
-      ? `${option.name.toUpperCase()} = $0`
-      : `${option.name.toUpperCase()} $0`;
-    completeItem.asSnippet = true;
-    completeItem.command = TRIGGER_SUGGESTION_COMMAND;
-  }
-  return completeItem;
-};
-
 export function getUnitDuration(unit: number = 1) {
   const filteredTimeLiteral = timeUnitsToSuggest.filter(({ name }) => {
     const result = /s$/.test(name);