@fc-components/monaco-editor 0.1.23 → 0.1.25

package/dist/monaco-editor.esm.js

@@ -3,7 +3,7 @@ import MonacoEditor from 'react-monaco-editor';
 import * as monaco from 'monaco-editor';
 import { languages, Range, editor, Selection, KeyMod, KeyCode, MarkerSeverity } from 'monaco-editor';
 import { promLanguageDefinition } from 'monaco-promql';
-import { parser, LabelMatchers, VectorSelector, PromQL, FunctionCallBody, StringLiteral, UnquotedLabelMatcher, BinaryExpr, NumberDurationLiteralInDurationContext, MatrixSelector, GroupingLabels, AggregateModifier, AggregateExpr, Identifier, LabelName, MatchOp, EqlSingle, EqlRegex, Neq, NeqRegex } from '@fc-components/lezer-metricsql';
+import { parser, LabelName, UnquotedLabelMatcher, LabelMatchers, VectorSelector, PromQL, Identifier, FunctionCallBody, StringLiteral, BinaryExpr, NumberDurationLiteralInDurationContext, MatrixSelector, GroupingLabels, AggregateModifier, AggregateExpr, MatchOp, EqlSingle, EqlRegex, Neq, NeqRegex } from '@fc-components/lezer-metricsql';
 import { v4 } from 'uuid';
 import { css } from '@emotion/css';
 
@@ -1248,11 +1248,29 @@ function isPathMatch(resolverPath, cursorPath) {
 }
 var ERROR_NODE_NAME = 0; // this is used as error-id
 var RESOLVERS = [{
+  path: [LabelName, UnquotedLabelMatcher],
+  fun: resolveLabelName
+}, {
+  path: [UnquotedLabelMatcher, LabelMatchers],
+  fun: resolveLabelName
+}, {
   path: [LabelMatchers, VectorSelector],
   fun: resolveLabelKeysWithEquals
+}, {
+  path: [LabelMatchers, VectorSelector, PromQL],
+  fun: resolveLabelKeysWithEquals
 }, {
   path: [PromQL],
   fun: resolveTopLevel
+}, {
+  path: [VectorSelector, PromQL],
+  fun: resolveTopLevel
+}, {
+  path: [Identifier, VectorSelector],
+  fun: resolveTopLevel
+}, {
+  path: [Identifier, VectorSelector, PromQL],
+  fun: resolveTopLevel
 }, {
   path: [FunctionCallBody],
   fun: resolveInFunction
@@ -1264,7 +1282,7 @@ var RESOLVERS = [{
   fun: resolveTopLevel
 }, {
   path: [ERROR_NODE_NAME, UnquotedLabelMatcher],
-  fun: resolveLabelMatcher
+  fun: resolveErrorInLabelMatcher
 }, {
   path: [ERROR_NODE_NAME, NumberDurationLiteralInDurationContext, MatrixSelector],
   fun: resolveDurations
@@ -1406,6 +1424,27 @@ function resolveLabelMatcher(node, text, _pos) {
     otherLabels: otherLabels
   };
 }
+function resolveErrorInLabelMatcher(node, text, pos) {
+  // 处理错误节点在 UnquotedLabelMatcher 中的情况
+  // 需要判断是删除值还是删除名称
+  var parent = walk(node, [['parent', UnquotedLabelMatcher]]);
+  if (parent === null) {
+    return null;
+  }
+  var labelNameNode = walk(parent, [['firstChild', LabelName]]);
+  // 情况1: 有完整的标签名 -> 提示 label value
+  if (labelNameNode !== null) {
+    // 检查是否有 MatchOp（=, =~, !=, !~）
+    var hasMatchOp = walk(labelNameNode, [['nextSibling', MatchOp]]) !== null;
+    if (hasMatchOp) {
+      // 这是值场景，使用 resolveLabelMatcher 的逻辑
+      return resolveLabelMatcher(node, text);
+    }
+  }
+  // 情况2: 没有完整的标签名或没有 MatchOp -> 提示 label name
+  // 使用 resolveLabelName 的逻辑
+  return resolveLabelName(parent, text, pos);
+}
 function resolveTopLevel() {
   return {
     type: 'AT_ROOT'
@@ -1421,6 +1460,55 @@ function resolveDurations() {
     type: 'IN_DURATION'
   };
 }
+function resolveLabelName(node, text, pos) {
+  var labelMatcherNode = node;
+  // 如果节点是错误节点，尝试找到其父节点 UnquotedLabelMatcher
+  if (node.type.isError) {
+    var parent = node.parent;
+    if (parent !== null && parent.type.id === UnquotedLabelMatcher) {
+      labelMatcherNode = parent;
+    } else {
+      return null;
+    }
+  } else if (node.type.id === LabelName) {
+    labelMatcherNode = walk(node, [['parent', UnquotedLabelMatcher]]);
+  }
+  if (labelMatcherNode === null || labelMatcherNode.type.id !== UnquotedLabelMatcher) {
+    return null;
+  }
+  var labelNameNode = walk(labelMatcherNode, [['firstChild', LabelName]]);
+  if (labelNameNode === null) {
+    return null;
+  }
+  if (pos > labelNameNode.to) {
+    return null;
+  }
+  var labelMatchersNode = walk(labelMatcherNode, [['parent', LabelMatchers]]);
+  if (labelMatchersNode === null) {
+    return null;
+  }
+  var currentLabelName = getNodeText(labelNameNode, text);
+  var allLabels = getLabels(labelMatchersNode, text);
+  var otherLabels = allLabels.filter(function (label) {
+    return label.name !== currentLabelName;
+  });
+  var hasOperator = walk(labelNameNode, [['nextSibling', MatchOp]]) !== null;
+  var metricNameNode = walk(labelMatchersNode, [['parent', VectorSelector], ['firstChild', Identifier]]);
+  if (metricNameNode === null) {
+    return {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels: otherLabels,
+      hasOperator: hasOperator
+    };
+  }
+  var metricName = getNodeText(metricNameNode, text);
+  return {
+    type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+    metricName: metricName,
+    otherLabels: otherLabels,
+    hasOperator: hasOperator
+  };
+}
 function resolveLabelKeysWithEquals(node, text, pos) {
   // next false positive:
   // `something{a="1"^}`
@@ -1443,14 +1531,16 @@ function resolveLabelKeysWithEquals(node, text, pos) {
     // we are probably in a situation without a metric name.
     return {
       type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
-      otherLabels: otherLabels
+      otherLabels: otherLabels,
+      hasOperator: false
     };
   }
   var metricName = getNodeText(metricNameNode, text);
   return {
     type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
     metricName: metricName,
-    otherLabels: otherLabels
+    otherLabels: otherLabels,
+    hasOperator: false
   };
 }
 // we find the first error-node in the tree that is at the cursor-position.
@@ -1498,8 +1588,10 @@ function getSituation(text, pos) {
   var cur = maybeErrorNode != null ? maybeErrorNode.cursor() : tree.cursorAt(pos);
   var currentNode = cur.node;
   var ids = [cur.type.id];
+  // const names = [cur.type.name];
   while (cur.parent()) {
     ids.push(cur.type.id);
+    // names.push(cur.type.name);
   }
   for (var _iterator3 = _createForOfIteratorHelperLoose(RESOLVERS), _step3; !(_step3 = _iterator3()).done;) {
     var resolver = _step3.value;
@@ -1682,21 +1774,21 @@ function _getLabelNamesForCompletions() {
   }));
   return _getLabelNamesForCompletions.apply(this, arguments);
 }
-function getLabelNamesForSelectorCompletions(_x0, _x1, _x10) {
+function getLabelNamesForSelectorCompletions(_x0, _x1, _x10, _x11) {
   return _getLabelNamesForSelectorCompletions.apply(this, arguments);
 }
 function _getLabelNamesForSelectorCompletions() {
-  _getLabelNamesForSelectorCompletions = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(metric, otherLabels, dataProvider) {
+  _getLabelNamesForSelectorCompletions = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(metric, hasOperator, otherLabels, dataProvider) {
     return _regenerator().w(function (_context4) {
       while (1) switch (_context4.n) {
         case 0:
-          return _context4.a(2, getLabelNamesForCompletions(metric, '=', true, otherLabels, dataProvider));
+          return _context4.a(2, getLabelNamesForCompletions(metric, hasOperator ? '' : '=', true, otherLabels, dataProvider));
       }
     }, _callee4);
   }));
   return _getLabelNamesForSelectorCompletions.apply(this, arguments);
 }
-function getLabelNamesForByCompletions(_x11, _x12, _x13) {
+function getLabelNamesForByCompletions(_x12, _x13, _x14) {
   return _getLabelNamesForByCompletions.apply(this, arguments);
 }
 function _getLabelNamesForByCompletions() {
@@ -1710,7 +1802,7 @@ function _getLabelNamesForByCompletions() {
   }));
   return _getLabelNamesForByCompletions.apply(this, arguments);
 }
-function getLabelValues(_x14, _x15, _x16, _x17) {
+function getLabelValues(_x15, _x16, _x17, _x18) {
   return _getLabelValues.apply(this, arguments);
 }
 function _getLabelValues() {
@@ -1775,7 +1867,7 @@ function _getLabelValues() {
   }));
   return _getLabelValues.apply(this, arguments);
 }
-function getLabelValuesForMetricCompletions(_x18, _x19, _x20, _x21, _x22) {
+function getLabelValuesForMetricCompletions(_x19, _x20, _x21, _x22, _x23) {
   return _getLabelValuesForMetricCompletions.apply(this, arguments);
 }
 function _getLabelValuesForMetricCompletions() {
@@ -1820,7 +1912,7 @@ function getCompletions(situation, dataProvider) {
         return Promise.resolve([].concat(historyCompletions, FUNCTION_COMPLETIONS, metricNames));
       }
     case 'IN_LABEL_SELECTOR_NO_LABEL_NAME':
-      return getLabelNamesForSelectorCompletions(situation.metricName, situation.otherLabels, dataProvider);
+      return getLabelNamesForSelectorCompletions(situation.metricName, situation.hasOperator, situation.otherLabels, dataProvider);
     case 'IN_GROUPING':
       return getLabelNamesForByCompletions(situation.metricName, situation.otherLabels, dataProvider);
     case 'IN_LABEL_SELECTOR_WITH_LABEL_NAME':
@@ -2043,6 +2135,8 @@ function PromQLEditor(props) {
   var containerRef = useRef(null);
   var dataProviderRef = useRef(null);
   var editorRef = useRef(null);
+  var previousContentRef = useRef('');
+  var lastDeletionTriggerTimeRef = useRef(0);
   var styles = getStyles(placeholder);
   var handleEditorDidMount = function handleEditorDidMount(editor$1) {
     editorRef.current = editor$1;
@@ -2126,6 +2220,10 @@ function PromQLEditor(props) {
     editor$1.addCommand(KeyCode.Enter, function () {
       onEnter == null || onEnter(editor$1.getValue());
     }, '!suggestWidgetVisible && isEditorFocused' + id);
+    // Initialize previous content tracking
+    previousContentRef.current = editor$1.getValue();
+    lastDeletionTriggerTimeRef.current = 0;
+    var DELETION_TRIGGER_DEBOUNCE_MS = 1000;
     editor$1.onDidChangeModelContent(function () {
       var model = editor$1.getModel();
       if (model) {
@@ -2140,6 +2238,20 @@ function PromQLEditor(props) {
           }, boundary);
         });
         editor.setModelMarkers(model, 'owner', markers);
+        // Detect deletion and trigger completion
+        var previousContent = previousContentRef.current;
+        var isDeletion = query.length < previousContent.length;
+        if (isDeletion && enableAutocomplete) {
+          var now = Date.now();
+          if (now - lastDeletionTriggerTimeRef.current >= DELETION_TRIGGER_DEBOUNCE_MS) {
+            lastDeletionTriggerTimeRef.current = now;
+            // Trigger completion after deletion
+            setTimeout(function () {
+              editor$1.trigger('keyboard', 'editor.action.triggerSuggest', {});
+            }, 0);
+          }
+        }
+        previousContentRef.current = query;
       }
     });
     editorDidMount == null || editorDidMount(editor$1);
@@ -3667,7 +3779,6 @@ function SqlEditor(props) {
       scrollBeyondLastLine: false,
       smoothScrolling: true,
       fontSize: fontSize,
-      lineHeight: 24,
       tabSize: 2,
       wordWrap: 'on',
       automaticLayout: true,