@fc-components/monaco-editor 0.1.14 → 0.1.16

package/dist/promql/completion/DataProvider.d.ts

@@ -19,7 +19,7 @@ export declare class DataProvider {
     setVariablesNames(variablesNames: string[]): void;
     private buildRequest;
     private request;
-    fetchSeries: (selector: string, withLimit?: string | undefined) => Promise<Record<string, string>[]>;
+    fetchSeries: (selector: string, withLimit?: string | undefined) => Promise<Record<string, string | undefined>[]>;
     fetchLabels: (selector: string) => Promise<string[]>;
     fetchLabelValues: (labelName: string, selector: string) => Promise<string[]>;
     getAllMetricNames(): string[];

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.14",
+  "version": "0.1.16",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/monaco-editor.esm.js",

package/src/promql/completion/DataProvider.ts

@@ -112,7 +112,7 @@ export class DataProvider {
       });
   }
 
-  fetchSeries = async (selector: string, withLimit?: string): Promise<Record<string, string>[]> => {
+  fetchSeries = async (selector: string, withLimit?: string): Promise<Record<string, string | undefined>[]> => {
     const end = new Date();
     const start = new Date(end.getTime() - this.lookbackInterval);
     const url = `${this.apiPrefix}/series`;
@@ -174,6 +174,7 @@ export class DataProvider {
     if (selector) {
       urlParams['match[]'] = selector;
     }
+
     const request = this.buildRequest(url, new URLSearchParams(urlParams));
 
     return await this.request<string[]>(request.uri, {

package/src/promql/completion/completions.ts

@@ -1,4 +1,4 @@
-import UFuzzy from '@leeoniya/ufuzzy';
+// import UFuzzy from '@leeoniya/ufuzzy';
 
 import { FUNCTIONS } from '../promql';
 import { makeSelector, NeverCaseError } from '../util';
@@ -17,26 +17,26 @@ type Completion = {
   triggerOnInsert?: boolean;
 };
 
-const metricNamesSearchClient = new UFuzzy({ intraMode: 1 });
+// const metricNamesSearchClient = new UFuzzy({ intraMode: 1 });
 
 // we order items like: history, functions, metrics
 function getAllMetricNamesCompletions(dataProvider: DataProvider): Completion[] {
   let metricNames = dataProvider.getAllMetricNames();
 
-  if (metricNames.length > dataProvider.metricNamesSuggestionLimit) {
-    const { monacoSettings } = dataProvider;
-    monacoSettings.enableAutocompleteSuggestionsUpdate();
-
-    if (monacoSettings.inputInRange) {
-      metricNames =
-        metricNamesSearchClient
-          .filter(metricNames, monacoSettings.inputInRange)
-          ?.slice(0, dataProvider.metricNamesSuggestionLimit)
-          .map((idx) => metricNames[idx]) ?? [];
-    } else {
-      metricNames = metricNames.slice(0, dataProvider.metricNamesSuggestionLimit);
-    }
-  }
+  // if (metricNames.length > dataProvider.metricNamesSuggestionLimit) {
+  //   const { monacoSettings } = dataProvider;
+  //   monacoSettings.enableAutocompleteSuggestionsUpdate();
+
+  //   if (monacoSettings.inputInRange) {
+  //     metricNames =
+  //       metricNamesSearchClient
+  //         .filter(metricNames, monacoSettings.inputInRange)
+  //         ?.slice(0, dataProvider.metricNamesSuggestionLimit)
+  //         .map((idx) => metricNames[idx]) ?? [];
+  //   } else {
+  //     metricNames = metricNames.slice(0, dataProvider.metricNamesSuggestionLimit);
+  //   }
+  // }
 
   return dataProvider.metricNamesToMetrics(metricNames).map((metric) => ({
     type: 'METRIC_NAME',
@@ -143,7 +143,7 @@ async function getLabelValues(metric: string | undefined, labelName: string, oth
         if (key === '__name__') {
           continue;
         }
-        if (key === labelName) {
+        if (key === labelName && value) {
           labelValues.add(value);
         }
       }

package/src/yaml/index.tsx

@@ -121,6 +121,8 @@ export default function YamlEditor(props: YamlEditorProps) {
       colors: {
         'editor.background': '#00000000',
         focusBorder: '#00000000',
+        'editor.lineHighlightBackground': '#00000000',
+        'editor.lineHighlightBorder': '#00000000',
       },
     });
 
@@ -139,6 +141,8 @@ export default function YamlEditor(props: YamlEditorProps) {
       colors: {
         'editor.background': '#00000000',
         focusBorder: '#00000000',
+        'editor.lineHighlightBackground': '#00000000',
+        'editor.lineHighlightBorder': '#00000000',
       },
     });
 
@@ -352,7 +356,9 @@ export default function YamlEditor(props: YamlEditorProps) {
               top: SIZE_MAP[size].top,
               bottom: SIZE_MAP[size].bottom,
             },
-            renderLineHighlight: 'line',
+            renderLineHighlight: 'none',
+            renderLineHighlightOnlyWhenFocus: false,
+            hideCursorInOverviewRuler: true,
             scrollbar: {
               vertical: 'auto',
               verticalScrollbarSize: 8,