[Console] Monaco migration: send request and copy as curl buttons

packages/kbn-monaco/index.ts

@@ -37,4 +37,8 @@ export {
   CONSOLE_OUTPUT_LANG_ID,
   CONSOLE_THEME_ID,
   CONSOLE_OUTPUT_THEME_ID,
+  getParsedRequestsProvider,
+  ConsoleParsedRequestsProvider,
 } from './src/console';
+
+export type { ParsedRequest } from './src/console';

packages/kbn-monaco/src/console/console_errors_provider.ts

@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { ConsoleWorkerProxyService } from './console_worker_proxy';
+import { CONSOLE_LANG_ID } from './constants';
+import { monaco } from '../monaco_imports';
+
+export const setupConsoleErrorsProvider = (workerProxyService: ConsoleWorkerProxyService) => {
+  const updateErrorMarkers = async (model: monaco.editor.IModel): Promise<void> => {
+    if (model.isDisposed()) {
+      return;
+    }
+    const parserResult = await workerProxyService.getParserResult(model.uri);
+
+    if (!parserResult) {
+      return;
+    }
+    const { errors } = parserResult;
+    monaco.editor.setModelMarkers(
+      model,
+      CONSOLE_LANG_ID,
+      errors.map(({ offset, text }) => {
+        const { column, lineNumber } = model.getPositionAt(offset);
+        return {
+          startLineNumber: lineNumber,
+          startColumn: column,
+          endLineNumber: lineNumber,
+          endColumn: column,
+          message: text,
+          severity: monaco.MarkerSeverity.Error,
+        };
+      })
+    );
+  };
+  const onModelAdd = (model: monaco.editor.IModel) => {
+    if (model.getLanguageId() !== CONSOLE_LANG_ID) {
+      return;
+    }
+
+    const { dispose } = model.onDidChangeContent(async () => {
+      await updateErrorMarkers(model);
+    });
+
+    model.onWillDispose(() => {
+      dispose();
+    });
+
+    updateErrorMarkers(model);
+  };
+  monaco.editor.onDidCreateModel(onModelAdd);
+};

packages/kbn-monaco/src/console/console_parsed_requests_provider.ts

@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { ConsoleWorkerProxyService } from './console_worker_proxy';
+import { ParsedRequest } from './types';
+import { monaco } from '../monaco_imports';
+
+export class ConsoleParsedRequestsProvider {
+  constructor(
+    private workerProxyService: ConsoleWorkerProxyService,
+    private model: monaco.editor.ITextModel | null
+  ) {}
+  public async getRequests(): Promise<ParsedRequest[]> {
+    if (!this.model) {
+      return [];
+    }
+    const parserResult = await this.workerProxyService.getParserResult(this.model.uri);
+    return parserResult?.requests ?? [];
+  }
+}

packages/kbn-monaco/src/console/console_worker_proxy.ts

@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { monaco } from '../monaco_imports';
+import { CONSOLE_LANG_ID } from './constants';
+import { ConsoleParserResult, ConsoleWorkerDefinition } from './types';
+
+export class ConsoleWorkerProxyService {
+  private worker: monaco.editor.MonacoWebWorker<ConsoleWorkerDefinition> | undefined;
+
+  public async getParserResult(modelUri: monaco.Uri): Promise<ConsoleParserResult | undefined> {
+    if (!this.worker) {
+      throw new Error('Worker Proxy Service has not been setup!');
+    }
+    await this.worker.withSyncedResources([modelUri]);
+    const parser = await this.worker.getProxy();
+    return parser.getParserResult(modelUri.toString());
+  }
+
+  public setup() {
+    this.worker = monaco.editor.createWebWorker({ label: CONSOLE_LANG_ID, moduleId: '' });
+  }
+
+  public stop() {
+    if (this.worker) this.worker.dispose();
+  }
+}

packages/kbn-monaco/src/console/index.ts

@@ -40,3 +40,7 @@ export const ConsoleOutputLang: LangModuleType = {
   lexerRules: consoleOutputLexerRules,
   languageConfiguration: consoleOutputLanguageConfiguration,
 };
+
+export type { ParsedRequest } from './types';
+export { getParsedRequestsProvider } from './language';
+export { ConsoleParsedRequestsProvider } from './console_parsed_requests_provider';

packages/kbn-monaco/src/console/language.ts

@@ -6,14 +6,19 @@
  * Side Public License, v 1.
  */
 
-import { ConsoleWorker } from './worker';
-import { WorkerProxyService } from '../ace_migration/worker_proxy';
+import { setupConsoleErrorsProvider } from './console_errors_provider';
+import { ConsoleWorkerProxyService } from './console_worker_proxy';
 import { monaco } from '../monaco_imports';
 import { CONSOLE_LANG_ID } from './constants';
-import { setupWorker } from '../ace_migration/setup_worker';
+import { ConsoleParsedRequestsProvider } from './console_parsed_requests_provider';
+
+const workerProxyService = new ConsoleWorkerProxyService();
+
+export const getParsedRequestsProvider = (model: monaco.editor.ITextModel | null) => {
+  return new ConsoleParsedRequestsProvider(workerProxyService, model);
+};
 
-const OWNER = 'CONSOLE_GRAMMAR_CHECKER';
-const wps = new WorkerProxyService<ConsoleWorker>();
 monaco.languages.onLanguage(CONSOLE_LANG_ID, async () => {
-  setupWorker(CONSOLE_LANG_ID, OWNER, wps);
+  workerProxyService.setup();
+  setupConsoleErrorsProvider(workerProxyService);
 });

packages/kbn-monaco/src/console/parser.js

@@ -12,7 +12,6 @@ export const createParser = () => {
 
   let at, // The index of the current character
     ch, // The current character
-    annos, // annotations
     escapee = {
       '"': '"',
       '\\': '\\',
@@ -24,8 +23,44 @@ export const createParser = () => {
       t: '\t',
     },
     text,
-    annotate = function (type, text) {
-      annos.push({ type: type, text: text, at: at });
+    errors,
+    addError = function (text) {
+      errors.push({ text: text, offset: at });
+    },
+    requests,
+    requestStartOffset,
+    requestEndOffset,
+    getLastRequest = function() {
+      return requests.length > 0 ? requests.pop() : {};
+    },
+    addRequestStart = function() {
+      requestStartOffset = at - 1;
+      requests.push({ startOffset: requestStartOffset });
+    },
+    addRequestMethod = function(method) {
+      const lastRequest = getLastRequest();
+      lastRequest.method = method;
+      requests.push(lastRequest);
+      requestEndOffset = at - 1;
+    },
+    addRequestUrl = function(url) {
+      const lastRequest = getLastRequest();
+      lastRequest.url = url;
+      requests.push(lastRequest);
+      requestEndOffset = at - 1;
+    },
+    addRequestData = function(data) {
+      const lastRequest = getLastRequest();
+      const dataArray = lastRequest.data || [];
+      dataArray.push(data);
+      lastRequest.data = dataArray;
+      requests.push(lastRequest);
+      requestEndOffset = at - 1;
+    },
+    addRequestEnd = function() {
+      const lastRequest = getLastRequest();
+      lastRequest.endOffset = requestEndOffset;
+      requests.push(lastRequest);
     },
     error = function (m) {
       throw {
@@ -373,26 +408,32 @@ export const createParser = () => {
     },
     request = function () {
       white();
-      method();
+      addRequestStart();
+      const parsedMethod = method();
+      addRequestMethod(parsedMethod);
       strictWhite();
-      url();
+      const parsedUrl = url();
+      addRequestUrl(parsedUrl );
       strictWhite(); // advance to one new line
       newLine();
       strictWhite();
       if (ch == '{') {
-        object();
+        const parsedObject = object();
+        addRequestData(parsedObject);
       }
       // multi doc request
       strictWhite(); // advance to one new line
       newLine();
       strictWhite();
       while (ch == '{') {
         // another object
-        object();
+        const parsedObject = object();
+        addRequestData(parsedObject);
         strictWhite();
         newLine();
         strictWhite();
       }
+      addRequestEnd();
     },
     comment = function () {
       while (ch == '#') {
@@ -417,7 +458,7 @@ export const createParser = () => {
           request();
           white();
         } catch (e) {
-          annotate('error', e.message);
+          addError(e.message);
           // snap
           const substring = text.substr(at);
           const nextMatch = substring.search(/^POST|HEAD|GET|PUT|DELETE|PATCH/m);
@@ -432,15 +473,16 @@ export const createParser = () => {
 
     text = source;
     at = 0;
-    annos = [];
+    errors = [];
+    requests = [];
     next();
     multi_request();
     white();
     if (ch) {
-      annotate('error', 'Syntax error');
+      addError('Syntax error');
     }
 
-    result = { annotations: annos };
+    result = { errors, requests };
 
     return typeof reviver === 'function'
       ? (function walk(holder, key) {

packages/kbn-monaco/src/console/parser.test.ts

@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { createParser } from './parser';
+import { ConsoleParserResult } from './types';
+
+const parser = createParser();
+describe('console parser', () => {
+  it('returns errors if input is not correct', () => {
+    const input = 'Incorrect input';
+    const parserResult = parser(input) as ConsoleParserResult;
+    // the parser logs 2 errors: for the unexpected method and a general syntax error
+    expect(parserResult.errors.length).toBe(2);
+    // the parser logs a beginning of the request that it's trying to parse
+    expect(parserResult.requests.length).toBe(1);
+  });
+
+  it('returns parsedRequests if the input is correct', () => {
+    const input = 'GET _search';
+    const { requests, errors } = parser(input) as ConsoleParserResult;
+    expect(requests.length).toBe(1);
+    expect(errors.length).toBe(0);
+    const { method, url, startOffset, endOffset } = requests[0];
+    expect(method).toBe('GET');
+    expect(url).toBe('_search');
+    // the start offset of the request is the beginning of the string
+    expect(startOffset).toBe(0);
+    // the end offset of the request is the end of the string
+    expect(endOffset).toBe(11);
+  });
+
+  it('parses several requests', () => {
+    const input = 'GET _search\nPOST _test_index';
+    const { requests } = parser(input) as ConsoleParserResult;
+    expect(requests.length).toBe(2);
+  });
+});

packages/kbn-monaco/src/console/types.ts

@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export interface ErrorAnnotation {
+  offset: number;
+  text: string;
+}
+
+export interface ParsedRequest {
+  startOffset: number;
+  endOffset: number;
+  method: string;
+  url: string;
+  data?: Array<Record<string, unknown>>;
+}
+export interface ConsoleParserResult {
+  errors: ErrorAnnotation[];
+  requests: ParsedRequest[];
+}
+
+export interface ConsoleWorkerDefinition {
+  getParserResult: (modelUri: string) => ConsoleParserResult | undefined;
+}
+export type ConsoleParser = (source: string) => ConsoleParserResult | undefined;

packages/kbn-monaco/src/console/worker/console_worker.ts

@@ -8,20 +8,23 @@
 
 /* eslint-disable-next-line @kbn/eslint/module_migration */
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
-import { Parser, ParseResult } from '../../ace_migration/types';
+import { ConsoleParserResult, ConsoleWorkerDefinition, ConsoleParser } from '../types';
 import { createParser } from '../parser';
 
-export class ConsoleWorker {
+export class ConsoleWorker implements ConsoleWorkerDefinition {
+  private parser: ConsoleParser | undefined;
+  private parserResult: ConsoleParserResult | undefined;
+
   constructor(private ctx: monaco.worker.IWorkerContext) {}
-  private parser: Parser | undefined;
 
-  async parse(modelUri: string): Promise<ParseResult | undefined> {
+  getParserResult(modelUri: string): ConsoleParserResult | undefined {
     if (!this.parser) {
       this.parser = createParser();
     }
     const model = this.ctx.getMirrorModels().find((m) => m.uri.toString() === modelUri);
     if (model) {
-      return this.parser(model.getValue());
+      this.parserResult = this.parser(model.getValue());
     }
+    return this.parserResult;
   }
 }