@dynatrace/strato-components 3.8.0 → 3.10.0

package/esm/editors/dql-editor/dql/SuggestionsInfoSection.sty.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/editors/dql-editor/dql/SuggestionsInfoSection.css.ts"],
-  "sourcesContent": ["import './SuggestionsInfoSection.css';\nexport var container = '_cpuf061-3-8-0';\nexport var shortcutLabel = '_cpuf063-3-8-0';\nexport var shortcutsGroup = '_cpuf062-3-8-0';"],
+  "sourcesContent": ["import './SuggestionsInfoSection.css';\nexport var container = '_cpuf061-3-10-0';\nexport var shortcutLabel = '_cpuf063-3-10-0';\nexport var shortcutsGroup = '_cpuf062-3-10-0';"],
   "mappings": "AAAA,OAAO;AACA,IAAI,YAAY;AAChB,IAAI,gBAAgB;AACpB,IAAI,iBAAiB;",
   "names": []
 }

package/esm/editors/dql-editor/dql/dql-fold-service.js

@@ -0,0 +1,163 @@
+import { foldService } from "@codemirror/language";
+import { StateField } from "@codemirror/state";
+function computeBlockCommentRanges(state) {
+  const text = state.doc.sliceString(0, state.doc.length);
+  const ranges = [];
+  let i = 0;
+  while (i < text.length) {
+    if (text[i] === '"') {
+      i = skipStringLiteral(text, i);
+    } else if (text[i] === "/" && text[i + 1] === "/") {
+      i = skipLineComment(text, i);
+    } else if (text[i] === "/" && text[i + 1] === "*") {
+      const start = i;
+      i = skipBlockComment(text, i);
+      ranges.push([start, i]);
+    } else {
+      i++;
+    }
+  }
+  return ranges;
+}
+const blockCommentRangesField = StateField.define({
+  create: computeBlockCommentRanges,
+  update: (value, transaction) => transaction.docChanged ? computeBlockCommentRanges(transaction.state) : value
+});
+function isInsideBlockComment(ranges, lineStart) {
+  for (const [start, end] of ranges) {
+    if (start >= lineStart) {
+      break;
+    }
+    if (end > lineStart) {
+      return true;
+    }
+  }
+  return false;
+}
+function skipLineComment(docSlice, from) {
+  const newline = docSlice.indexOf("\n", from);
+  return newline >= 0 ? newline + 1 : docSlice.length;
+}
+function skipBlockComment(docSlice, from) {
+  const close = docSlice.indexOf("*/", from + 2);
+  return close >= 0 ? close + 2 : docSlice.length;
+}
+function skipStringLiteral(docSlice, from) {
+  let i = from + 1;
+  while (i < docSlice.length) {
+    const ch = docSlice[i];
+    if (ch === "\\") {
+      i += 2;
+    } else if (ch === '"') {
+      return i + 1;
+    } else if (ch === "\n") {
+      return i + 1;
+    } else {
+      i++;
+    }
+  }
+  return docSlice.length;
+}
+function scanLineTokens(lineText) {
+  let i = 0;
+  let blockComment = -1;
+  let bracket = -1;
+  while (i < lineText.length) {
+    const ch = lineText[i];
+    if (ch === '"') {
+      i = skipStringLiteral(lineText, i);
+      continue;
+    }
+    if (ch === "/" && lineText[i + 1] === "/") {
+      return { blockComment, lineComment: i, bracket };
+    }
+    if (ch === "/" && lineText[i + 1] === "*" && blockComment < 0) {
+      blockComment = i;
+    }
+    if (ch === "[" && bracket < 0) {
+      bracket = i;
+    }
+    i++;
+  }
+  return { blockComment, lineComment: -1, bracket };
+}
+function findMatchingBracketEnd(docSlice, lineStart, bracketIdx) {
+  let depth = 0;
+  let i = 0;
+  while (i < docSlice.length) {
+    const ch = docSlice[i];
+    if (ch === '"') {
+      i = skipStringLiteral(docSlice, i);
+      continue;
+    }
+    if (ch === "/" && docSlice[i + 1] === "/") {
+      i = skipLineComment(docSlice, i);
+      continue;
+    }
+    if (ch === "/" && docSlice[i + 1] === "*") {
+      i = skipBlockComment(docSlice, i);
+      continue;
+    }
+    if (ch === "[") {
+      depth++;
+    } else if (ch === "]") {
+      depth--;
+      if (depth === 0) {
+        return lineStart + bracketIdx + i;
+      }
+    }
+    i++;
+  }
+  return -1;
+}
+function findBlockCommentFold(state, lineStart, lineEnd, blockCommentIdx) {
+  if (blockCommentIdx < 0) {
+    return null;
+  }
+  const docSlice = state.doc.sliceString(lineStart + blockCommentIdx);
+  const closeOffset = docSlice.indexOf("*/", 2);
+  if (closeOffset < 0) {
+    return null;
+  }
+  const closeEnd = lineStart + blockCommentIdx + closeOffset + 2;
+  const closeLine = state.doc.lineAt(closeEnd - 1);
+  if (closeLine.from <= lineEnd) {
+    return null;
+  }
+  const closeLineText = state.doc.sliceString(closeLine.from, closeLine.to);
+  const delimOffset = closeLineText.indexOf("*/");
+  return {
+    from: lineEnd,
+    to: closeLine.from + (delimOffset >= 0 ? delimOffset : 0)
+  };
+}
+function findSubqueryFold(state, lineStart, lineEnd, bracketIdx) {
+  if (bracketIdx < 0) {
+    return null;
+  }
+  const docSlice = state.doc.sliceString(lineStart + bracketIdx);
+  const closePos = findMatchingBracketEnd(docSlice, lineStart, bracketIdx);
+  if (closePos < 0) {
+    return null;
+  }
+  const closeLine = state.doc.lineAt(closePos);
+  if (closeLine.from <= lineEnd) {
+    return null;
+  }
+  return { from: lineEnd, to: closePos };
+}
+const dqlFoldService = [
+  blockCommentRangesField,
+  foldService.of((state, lineStart, lineEnd) => {
+    if (isInsideBlockComment(state.field(blockCommentRangesField), lineStart)) {
+      return null;
+    }
+    const lineText = state.doc.sliceString(lineStart, lineEnd);
+    const { blockComment, bracket } = scanLineTokens(lineText);
+    return findBlockCommentFold(state, lineStart, lineEnd, blockComment) ?? findSubqueryFold(state, lineStart, lineEnd, bracket);
+  })
+];
+export {
+  dqlFoldService
+};
+//# sourceMappingURL=dql-fold-service.js.map

package/esm/editors/dql-editor/dql/dql-fold-service.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../src/editors/dql-editor/dql/dql-fold-service.ts"],
+  "sourcesContent": ["import { foldService } from '@codemirror/language';\nimport { StateField, type EditorState } from '@codemirror/state';\n\n/**\n * Scans the full document and returns all block-comment ranges as `[openOffset, closeOffset]`\n * pairs sorted by open offset. `closeOffset` is the position just past `*\\/`, or `doc.length` if\n * the comment is unclosed. Ignores `/*` tokens that appear inside `\"...\"` strings or after `//`.\n */\nfunction computeBlockCommentRanges(\n  state: EditorState,\n): ReadonlyArray<[number, number]> {\n  const text = state.doc.sliceString(0, state.doc.length);\n  const ranges: Array<[number, number]> = [];\n  let i = 0;\n  while (i < text.length) {\n    if (text[i] === '\"') {\n      i = skipStringLiteral(text, i);\n    } else if (text[i] === '/' && text[i + 1] === '/') {\n      i = skipLineComment(text, i);\n    } else if (text[i] === '/' && text[i + 1] === '*') {\n      const start = i;\n      i = skipBlockComment(text, i);\n      ranges.push([start, i]);\n    } else {\n      i++;\n    }\n  }\n  return ranges;\n}\n\n// Recomputed once per transaction (only when the document changes); used by foldService\n// to avoid rescanning the entire document once per line (O(N\u00B2) \u2192 O(N) per transaction).\nconst blockCommentRangesField = StateField.define<\n  ReadonlyArray<[number, number]>\n>({\n  create: computeBlockCommentRanges,\n  update: (value, transaction) =>\n    transaction.docChanged\n      ? computeBlockCommentRanges(transaction.state)\n      : value,\n});\n\n/**\n * Returns `true` if `lineStart` falls inside one of the pre-computed block-comment ranges.\n * Ranges are sorted by open offset, so the loop short-circuits as soon as it passes `lineStart`.\n */\nfunction isInsideBlockComment(\n  ranges: ReadonlyArray<[number, number]>,\n  lineStart: number,\n): boolean {\n  for (const [start, end] of ranges) {\n    if (start >= lineStart) {\n      break;\n    }\n    if (end > lineStart) {\n      return true;\n    }\n  }\n  return false;\n}\n\n/**\n * Returns the index of the first character after the `//` line comment that starts at `from`,\n * or `docSlice.length` if no newline follows.\n */\nfunction skipLineComment(docSlice: string, from: number): number {\n  const newline = docSlice.indexOf('\\n', from);\n  return newline >= 0 ? newline + 1 : docSlice.length;\n}\n\n/**\n * Returns the index of the first character after the block comment whose `/*` opens at `from`,\n * or `docSlice.length` if the closing delimiter is absent.\n */\nfunction skipBlockComment(docSlice: string, from: number): number {\n  // Start search at from+2 to skip past the /* opener itself \u2014 otherwise /*/\n  // would be misread as an immediately-closed comment (the * at [1] and / at [2]\n  // would form a false */ match).\n  const close = docSlice.indexOf('*/', from + 2);\n  return close >= 0 ? close + 2 : docSlice.length;\n}\n\n/**\n * Returns the index of the first character after the double-quoted string that opens at `from`.\n * Handles `\\\"` escape sequences. Treats an unmatched `\"` as ending at the next newline or end of\n * input \u2014 strings do not span lines in DQL.\n */\nfunction skipStringLiteral(docSlice: string, from: number): number {\n  let i = from + 1; // skip the opening \"\n  while (i < docSlice.length) {\n    const ch = docSlice[i];\n    if (ch === '\\\\') {\n      i += 2; // skip escaped character\n    } else if (ch === '\"') {\n      return i + 1; // past the closing \"\n    } else if (ch === '\\n') {\n      return i + 1; // string does not span lines; treat as implicitly closed\n    } else {\n      i++;\n    }\n  }\n  return docSlice.length;\n}\n\n/**\n * Scans a single line left-to-right, skipping double-quoted string contents, and returns\n * the character offsets of the first real `/*`, `//`, and `[` tokens \u2014 where \"real\" means\n * outside a string literal. Returns `-1` for any token that is absent or only appears inside\n * a string.\n *\n * A plain `indexOf` call would incorrectly match tokens that appear inside string values such\n * as `filter url == \"http://example.com\"`, where `//` is not a line comment.\n */\nfunction scanLineTokens(lineText: string): {\n  blockComment: number;\n  lineComment: number;\n  bracket: number;\n} {\n  let i = 0;\n  let blockComment = -1;\n  let bracket = -1;\n  while (i < lineText.length) {\n    const ch = lineText[i];\n    if (ch === '\"') {\n      i = skipStringLiteral(lineText, i);\n      continue;\n    }\n    if (ch === '/' && lineText[i + 1] === '/') {\n      // // ends the real content of this line; nothing after it matters\n      return { blockComment, lineComment: i, bracket };\n    }\n    if (ch === '/' && lineText[i + 1] === '*' && blockComment < 0) {\n      blockComment = i;\n    }\n    if (ch === '[' && bracket < 0) {\n      bracket = i;\n    }\n    i++;\n  }\n  return { blockComment, lineComment: -1, bracket };\n}\n\n/**\n * Scans `docSlice` (which starts at `lineStart + bracketIdx` in the document) for the `]` that\n * closes the outermost `[`, skipping nested brackets, comment tokens, and string literals.\n * @returns The absolute document offset of the closing `]`, or `-1` if not found.\n */\nfunction findMatchingBracketEnd(\n  docSlice: string,\n  lineStart: number,\n  bracketIdx: number,\n): number {\n  // depth tracks nesting: the opening [ has already been consumed by the caller\n  // (docSlice starts at that [), so the first [ increments depth to 1 and the\n  // matching ] decrements it back to 0, which signals the end of the subquery.\n  let depth = 0;\n  let i = 0;\n  while (i < docSlice.length) {\n    const ch = docSlice[i];\n    if (ch === '\"') {\n      i = skipStringLiteral(docSlice, i);\n      continue;\n    }\n    if (ch === '/' && docSlice[i + 1] === '/') {\n      i = skipLineComment(docSlice, i);\n      continue;\n    }\n    if (ch === '/' && docSlice[i + 1] === '*') {\n      i = skipBlockComment(docSlice, i);\n      continue;\n    }\n    if (ch === '[') {\n      depth++;\n    } else if (ch === ']') {\n      depth--;\n      if (depth === 0) {\n        return lineStart + bracketIdx + i;\n      }\n    }\n    i++;\n  }\n  return -1;\n}\n\n/**\n * Returns a fold range for a multi-line block comment (opening `/*`) that starts on the given line,\n * or `null` if the line contains no such opener or the comment closes on the same line.\n * @param blockCommentIdx - Character offset of the `/*` on this line (outside any string literal\n *   and before any `//`), or `-1` if absent. Computed by {@link scanLineTokens}.\n */\nfunction findBlockCommentFold(\n  state: EditorState,\n  lineStart: number,\n  lineEnd: number,\n  blockCommentIdx: number,\n): { from: number; to: number } | null {\n  if (blockCommentIdx < 0) {\n    return null;\n  }\n\n  const docSlice = state.doc.sliceString(lineStart + blockCommentIdx);\n  const closeOffset = docSlice.indexOf('*/', 2);\n  if (closeOffset < 0) {\n    return null;\n  }\n\n  const closeEnd = lineStart + blockCommentIdx + closeOffset + 2;\n  // closeEnd points one past the closing /; subtract 1 to land on the * so\n  // lineAt resolves the line that contains the */ delimiter, not the one after it.\n  const closeLine = state.doc.lineAt(closeEnd - 1);\n  if (closeLine.from <= lineEnd) {\n    return null;\n  }\n\n  const closeLineText = state.doc.sliceString(closeLine.from, closeLine.to);\n  const delimOffset = closeLineText.indexOf('*/');\n  // Fold up to the * of */ (not the line start) so leading whitespace is hidden\n  // and the result reads /*\u2026*/ rather than /*\u2026 */.\n  return {\n    from: lineEnd,\n    to: closeLine.from + (delimOffset >= 0 ? delimOffset : 0),\n  };\n}\n\n/**\n * Returns a fold range for a multi-line subquery `[ \u2026 ]` that opens on the given line,\n * or `null` if the line contains no such opener or the closing `]` is on the same line.\n * @param bracketIdx - Character offset of the `[` on this line (outside any string literal\n *   and before any `//`), or `-1` if absent. Computed by {@link scanLineTokens}.\n */\nfunction findSubqueryFold(\n  state: EditorState,\n  lineStart: number,\n  lineEnd: number,\n  bracketIdx: number,\n): { from: number; to: number } | null {\n  if (bracketIdx < 0) {\n    return null;\n  }\n\n  const docSlice = state.doc.sliceString(lineStart + bracketIdx);\n  const closePos = findMatchingBracketEnd(docSlice, lineStart, bracketIdx);\n  if (closePos < 0) {\n    return null;\n  }\n\n  const closeLine = state.doc.lineAt(closePos);\n  if (closeLine.from <= lineEnd) {\n    return null;\n  }\n\n  return { from: lineEnd, to: closePos };\n}\n\n/**\n * Provides foldable regions for DQL:\n *  - multi-line block comments\n *  - multi-line subqueries\n * Used with StreamLanguage which has no syntax tree and therefore no built-in fold ranges.\n * @internal\n */\nexport const dqlFoldService = [\n  blockCommentRangesField,\n  foldService.of((state, lineStart, lineEnd) => {\n    if (isInsideBlockComment(state.field(blockCommentRangesField), lineStart)) {\n      return null;\n    }\n\n    const lineText = state.doc.sliceString(lineStart, lineEnd);\n    const { blockComment, bracket } = scanLineTokens(lineText);\n\n    return (\n      findBlockCommentFold(state, lineStart, lineEnd, blockComment) ??\n      findSubqueryFold(state, lineStart, lineEnd, bracket)\n    );\n  }),\n];\n"],
+  "mappings": "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",
+  "names": []
+}

package/esm/editors/dql-editor/dql/dql-language.js

@@ -2,17 +2,20 @@ import { closeCompletion, startCompletion } from "@codemirror/autocomplete";
 import { StreamLanguage } from "@codemirror/language";
 import { linter, setDiagnostics } from "@codemirror/lint";
 import { EditorView } from "@codemirror/view";
+import { dqlFoldService } from "./dql-fold-service.js";
 import { dqlLinter } from "./dql-linter.js";
 import { dql } from "./dql.js";
 import { openAutocomplete } from "./open-autocomplete.js";
-import { suggestionAutocompletion } from "./suggestion-autocompletions.js";
+import { createSuggestionAutocompletion } from "./suggestion-autocompletions.js";
 import { suggestionsInfoSectionExtension } from "./suggestions-info-section-extension.js";
 const VALIDATION_DELAY = 500;
 function getDqlConfig(readOnly, onValidationStart, onValidationEnd, setValidityInfo) {
   const language = StreamLanguage.define(dql);
+  const suggestionCache = /* @__PURE__ */ new Map();
   return {
     language,
     extendWith: [
+      dqlFoldService,
       language.data.of({
         commentTokens: {
           block: {
@@ -87,7 +90,7 @@ function getDqlConfig(readOnly, onValidationStart, onValidationEnd, setValidityI
     autocompleteOptions: readOnly ? void 0 : {
       activateOnTyping: false,
       optionClass: (completion) => completion.label.length === 0 ? "cm-empty-option" : "",
-      providers: [suggestionAutocompletion]
+      providers: [createSuggestionAutocompletion(suggestionCache)]
     }
   };
 }

package/esm/editors/dql-editor/dql/dql-language.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/editors/dql-editor/dql/dql-language.ts"],
-  "sourcesContent": ["import { closeCompletion, startCompletion } from '@codemirror/autocomplete';\nimport { StreamLanguage } from '@codemirror/language';\nimport { linter, setDiagnostics } from '@codemirror/lint';\nimport { EditorView } from '@codemirror/view';\n\nimport { EditorLanguageConfiguration } from '../../base-code-editor/configuration/configuration.js';\nimport type { DQLEditorValidityInfo } from '../dql-editor-types.js';\nimport { dqlLinter } from './dql-linter.js';\nimport { dql } from './dql.js';\nimport { openAutocomplete } from './open-autocomplete.js';\nimport { suggestionAutocompletion } from './suggestion-autocompletions.js';\nimport { suggestionsInfoSectionExtension } from './suggestions-info-section-extension.js';\n\nconst VALIDATION_DELAY = 500;\n\n/**\n * @internal\n * Gets editor configuration for DQL.\n **/\nexport function getDqlConfig(\n  readOnly: boolean,\n  onValidationStart?: () => void,\n  onValidationEnd?: (validityInfo: DQLEditorValidityInfo[]) => void,\n  setValidityInfo?: (validityInfo: DQLEditorValidityInfo[]) => void,\n): EditorLanguageConfiguration {\n  const language = StreamLanguage.define(dql);\n\n  return {\n    language,\n    extendWith: [\n      language.data.of({\n        commentTokens: {\n          block: {\n            open: '/*',\n            close: '*/',\n          },\n          line: '//',\n        },\n        closeBrackets: {\n          brackets: ['(', '[', '{', '\"'],\n          before: ')]}:;>|',\n          stringPrefixes: [],\n        },\n      }),\n      EditorView.domEventObservers({\n        // Clear lint decorations when composition starts. Lint spans in the DOM\n        // corrupt CodeMirror's DOM reconciliation during IME / dead-key composition.\n        // The linter re-runs automatically after composition ends since the\n        // composed character is a document change.\n        compositionstart: (_event, view) => {\n          closeCompletion(view);\n          view.dispatch(setDiagnostics(view.state, []));\n        },\n      }),\n      linter(\n        async (view) => {\n          const editorContent = view.state.doc.toString();\n\n          const validityResult = await dqlLinter(\n            editorContent,\n            onValidationStart,\n            onValidationEnd,\n          );\n\n          if (view.composing) {\n            return [];\n          }\n\n          setValidityInfo?.(validityResult);\n          return validityResult;\n        },\n        {\n          delay: VALIDATION_DELAY,\n        },\n      ),\n      EditorView.updateListener.of((update) => {\n        const isTyping =\n          update.docChanged &&\n          update.transactions.some((transaction) =>\n            transaction.isUserEvent('input.type'),\n          );\n\n        const isDeleting =\n          update.docChanged &&\n          update.transactions.some((transaction) =>\n            transaction.isUserEvent('delete.backward'),\n          );\n\n        const isFocused = update.focusChanged && update.view.hasFocus;\n\n        if (!(isTyping || isDeleting || isFocused)) {\n          return;\n        }\n\n        if (update.view.composing) {\n          return;\n        }\n\n        void openAutocomplete(\n          {\n            isTyping,\n            isDeleting,\n            isFocused,\n          },\n          update.state,\n        ).then((shouldComplete) => {\n          if (shouldComplete) {\n            startCompletion(update.view);\n          }\n        });\n      }),\n      ...(readOnly ? [] : [suggestionsInfoSectionExtension]),\n    ],\n    autocompleteOptions: readOnly\n      ? undefined\n      : {\n          activateOnTyping: false,\n          optionClass: (completion) =>\n            completion.label.length === 0 ? 'cm-empty-option' : '',\n          providers: [suggestionAutocompletion],\n        },\n  };\n}\n"],
-  "mappings": "AAAA,SAAS,iBAAiB,uBAAuB;AACjD,SAAS,sBAAsB;AAC/B,SAAS,QAAQ,sBAAsB;AACvC,SAAS,kBAAkB;AAI3B,SAAS,iBAAiB;AAC1B,SAAS,WAAW;AACpB,SAAS,wBAAwB;AACjC,SAAS,gCAAgC;AACzC,SAAS,uCAAuC;AAEhD,MAAM,mBAAmB;AAMlB,SAAS,aACd,UACA,mBACA,iBACA,iBAC6B;AAC7B,QAAM,WAAW,eAAe,OAAO,GAAG;AAE1C,SAAO;AAAA,IACL;AAAA,IACA,YAAY;AAAA,MACV,SAAS,KAAK,GAAG;AAAA,QACf,eAAe;AAAA,UACb,OAAO;AAAA,YACL,MAAM;AAAA,YACN,OAAO;AAAA,UACT;AAAA,UACA,MAAM;AAAA,QACR;AAAA,QACA,eAAe;AAAA,UACb,UAAU,CAAC,KAAK,KAAK,KAAK,GAAG;AAAA,UAC7B,QAAQ;AAAA,UACR,gBAAgB,CAAC;AAAA,QACnB;AAAA,MACF,CAAC;AAAA,MACD,WAAW,kBAAkB;AAAA;AAAA;AAAA;AAAA;AAAA,QAK3B,kBAAkB,CAAC,QAAQ,SAAS;AAClC,0BAAgB,IAAI;AACpB,eAAK,SAAS,eAAe,KAAK,OAAO,CAAC,CAAC,CAAC;AAAA,QAC9C;AAAA,MACF,CAAC;AAAA,MACD;AAAA,QACE,OAAO,SAAS;AACd,gBAAM,gBAAgB,KAAK,MAAM,IAAI,SAAS;AAE9C,gBAAM,iBAAiB,MAAM;AAAA,YAC3B;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAEA,cAAI,KAAK,WAAW;AAClB,mBAAO,CAAC;AAAA,UACV;AAEA,4BAAkB,cAAc;AAChC,iBAAO;AAAA,QACT;AAAA,QACA;AAAA,UACE,OAAO;AAAA,QACT;AAAA,MACF;AAAA,MACA,WAAW,eAAe,GAAG,CAAC,WAAW;AACvC,cAAM,WACJ,OAAO,cACP,OAAO,aAAa;AAAA,UAAK,CAAC,gBACxB,YAAY,YAAY,YAAY;AAAA,QACtC;AAEF,cAAM,aACJ,OAAO,cACP,OAAO,aAAa;AAAA,UAAK,CAAC,gBACxB,YAAY,YAAY,iBAAiB;AAAA,QAC3C;AAEF,cAAM,YAAY,OAAO,gBAAgB,OAAO,KAAK;AAErD,YAAI,EAAE,YAAY,cAAc,YAAY;AAC1C;AAAA,QACF;AAEA,YAAI,OAAO,KAAK,WAAW;AACzB;AAAA,QACF;AAEA,aAAK;AAAA,UACH;AAAA,YACE;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAAA,UACA,OAAO;AAAA,QACT,EAAE,KAAK,CAAC,mBAAmB;AACzB,cAAI,gBAAgB;AAClB,4BAAgB,OAAO,IAAI;AAAA,UAC7B;AAAA,QACF,CAAC;AAAA,MACH,CAAC;AAAA,MACD,GAAI,WAAW,CAAC,IAAI,CAAC,+BAA+B;AAAA,IACtD;AAAA,IACA,qBAAqB,WACjB,SACA;AAAA,MACE,kBAAkB;AAAA,MAClB,aAAa,CAAC,eACZ,WAAW,MAAM,WAAW,IAAI,oBAAoB;AAAA,MACtD,WAAW,CAAC,wBAAwB;AAAA,IACtC;AAAA,EACN;AACF;",
+  "sourcesContent": ["import { closeCompletion, startCompletion } from '@codemirror/autocomplete';\nimport { StreamLanguage } from '@codemirror/language';\nimport { linter, setDiagnostics } from '@codemirror/lint';\nimport { EditorView } from '@codemirror/view';\n\nimport { EditorLanguageConfiguration } from '../../base-code-editor/configuration/configuration.js';\nimport type { DQLEditorValidityInfo } from '../dql-editor-types.js';\nimport { dqlFoldService } from './dql-fold-service.js';\nimport { dqlLinter } from './dql-linter.js';\nimport { dql } from './dql.js';\nimport type { SuggestionCache } from './get-suggestions.js';\nimport { openAutocomplete } from './open-autocomplete.js';\nimport { createSuggestionAutocompletion } from './suggestion-autocompletions.js';\nimport { suggestionsInfoSectionExtension } from './suggestions-info-section-extension.js';\n\nconst VALIDATION_DELAY = 500;\n\n/**\n * @internal\n * Gets editor configuration for DQL.\n **/\nexport function getDqlConfig(\n  readOnly: boolean,\n  onValidationStart?: () => void,\n  onValidationEnd?: (validityInfo: DQLEditorValidityInfo[]) => void,\n  setValidityInfo?: (validityInfo: DQLEditorValidityInfo[]) => void,\n): EditorLanguageConfiguration {\n  const language = StreamLanguage.define(dql);\n\n  // Suggestion cache scoped to this config (and therefore to the editor\n  // instance that created it). It is discarded when the editor unmounts, so\n  // cached suggestions never outlive the editor or leak between editors.\n  const suggestionCache: SuggestionCache = new Map();\n\n  return {\n    language,\n    extendWith: [\n      dqlFoldService,\n      language.data.of({\n        commentTokens: {\n          block: {\n            open: '/*',\n            close: '*/',\n          },\n          line: '//',\n        },\n        closeBrackets: {\n          brackets: ['(', '[', '{', '\"'],\n          before: ')]}:;>|',\n          stringPrefixes: [],\n        },\n      }),\n      EditorView.domEventObservers({\n        // Clear lint decorations when composition starts. Lint spans in the DOM\n        // corrupt CodeMirror's DOM reconciliation during IME / dead-key composition.\n        // The linter re-runs automatically after composition ends since the\n        // composed character is a document change.\n        compositionstart: (_event, view) => {\n          closeCompletion(view);\n          view.dispatch(setDiagnostics(view.state, []));\n        },\n      }),\n      linter(\n        async (view) => {\n          const editorContent = view.state.doc.toString();\n\n          const validityResult = await dqlLinter(\n            editorContent,\n            onValidationStart,\n            onValidationEnd,\n          );\n\n          if (view.composing) {\n            return [];\n          }\n\n          setValidityInfo?.(validityResult);\n          return validityResult;\n        },\n        {\n          delay: VALIDATION_DELAY,\n        },\n      ),\n      EditorView.updateListener.of((update) => {\n        const isTyping =\n          update.docChanged &&\n          update.transactions.some((transaction) =>\n            transaction.isUserEvent('input.type'),\n          );\n\n        const isDeleting =\n          update.docChanged &&\n          update.transactions.some((transaction) =>\n            transaction.isUserEvent('delete.backward'),\n          );\n\n        const isFocused = update.focusChanged && update.view.hasFocus;\n\n        if (!(isTyping || isDeleting || isFocused)) {\n          return;\n        }\n\n        if (update.view.composing) {\n          return;\n        }\n\n        void openAutocomplete(\n          {\n            isTyping,\n            isDeleting,\n            isFocused,\n          },\n          update.state,\n        ).then((shouldComplete) => {\n          if (shouldComplete) {\n            startCompletion(update.view);\n          }\n        });\n      }),\n      ...(readOnly ? [] : [suggestionsInfoSectionExtension]),\n    ],\n    autocompleteOptions: readOnly\n      ? undefined\n      : {\n          activateOnTyping: false,\n          optionClass: (completion) =>\n            completion.label.length === 0 ? 'cm-empty-option' : '',\n          providers: [createSuggestionAutocompletion(suggestionCache)],\n        },\n  };\n}\n"],
+  "mappings": "AAAA,SAAS,iBAAiB,uBAAuB;AACjD,SAAS,sBAAsB;AAC/B,SAAS,QAAQ,sBAAsB;AACvC,SAAS,kBAAkB;AAI3B,SAAS,sBAAsB;AAC/B,SAAS,iBAAiB;AAC1B,SAAS,WAAW;AAEpB,SAAS,wBAAwB;AACjC,SAAS,sCAAsC;AAC/C,SAAS,uCAAuC;AAEhD,MAAM,mBAAmB;AAMlB,SAAS,aACd,UACA,mBACA,iBACA,iBAC6B;AAC7B,QAAM,WAAW,eAAe,OAAO,GAAG;AAK1C,QAAM,kBAAmC,oBAAI,IAAI;AAEjD,SAAO;AAAA,IACL;AAAA,IACA,YAAY;AAAA,MACV;AAAA,MACA,SAAS,KAAK,GAAG;AAAA,QACf,eAAe;AAAA,UACb,OAAO;AAAA,YACL,MAAM;AAAA,YACN,OAAO;AAAA,UACT;AAAA,UACA,MAAM;AAAA,QACR;AAAA,QACA,eAAe;AAAA,UACb,UAAU,CAAC,KAAK,KAAK,KAAK,GAAG;AAAA,UAC7B,QAAQ;AAAA,UACR,gBAAgB,CAAC;AAAA,QACnB;AAAA,MACF,CAAC;AAAA,MACD,WAAW,kBAAkB;AAAA;AAAA;AAAA;AAAA;AAAA,QAK3B,kBAAkB,CAAC,QAAQ,SAAS;AAClC,0BAAgB,IAAI;AACpB,eAAK,SAAS,eAAe,KAAK,OAAO,CAAC,CAAC,CAAC;AAAA,QAC9C;AAAA,MACF,CAAC;AAAA,MACD;AAAA,QACE,OAAO,SAAS;AACd,gBAAM,gBAAgB,KAAK,MAAM,IAAI,SAAS;AAE9C,gBAAM,iBAAiB,MAAM;AAAA,YAC3B;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAEA,cAAI,KAAK,WAAW;AAClB,mBAAO,CAAC;AAAA,UACV;AAEA,4BAAkB,cAAc;AAChC,iBAAO;AAAA,QACT;AAAA,QACA;AAAA,UACE,OAAO;AAAA,QACT;AAAA,MACF;AAAA,MACA,WAAW,eAAe,GAAG,CAAC,WAAW;AACvC,cAAM,WACJ,OAAO,cACP,OAAO,aAAa;AAAA,UAAK,CAAC,gBACxB,YAAY,YAAY,YAAY;AAAA,QACtC;AAEF,cAAM,aACJ,OAAO,cACP,OAAO,aAAa;AAAA,UAAK,CAAC,gBACxB,YAAY,YAAY,iBAAiB;AAAA,QAC3C;AAEF,cAAM,YAAY,OAAO,gBAAgB,OAAO,KAAK;AAErD,YAAI,EAAE,YAAY,cAAc,YAAY;AAC1C;AAAA,QACF;AAEA,YAAI,OAAO,KAAK,WAAW;AACzB;AAAA,QACF;AAEA,aAAK;AAAA,UACH;AAAA,YACE;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAAA,UACA,OAAO;AAAA,QACT,EAAE,KAAK,CAAC,mBAAmB;AACzB,cAAI,gBAAgB;AAClB,4BAAgB,OAAO,IAAI;AAAA,UAC7B;AAAA,QACF,CAAC;AAAA,MACH,CAAC;AAAA,MACD,GAAI,WAAW,CAAC,IAAI,CAAC,+BAA+B;AAAA,IACtD;AAAA,IACA,qBAAqB,WACjB,SACA;AAAA,MACE,kBAAkB;AAAA,MAClB,aAAa,CAAC,eACZ,WAAW,MAAM,WAAW,IAAI,oBAAoB;AAAA,MACtD,WAAW,CAAC,+BAA+B,eAAe,CAAC;AAAA,IAC7D;AAAA,EACN;AACF;",
   "names": []
 }

package/esm/editors/dql-editor/dql/dql.js

@@ -79,8 +79,15 @@ const dql = simpleMode({
     // start matching a new query syntax after | or [
   ],
   tripleQuoteString: [
-    { regex: /"?"?(?:[^"]"?"?)*"""/, token: tokenMapping.string, pop: true },
-    // end of triple quote string: content cannot contain 3+ consecutive quotes
+    // End of a triple-quote string. Because `"{1,2}` and `[^"]+` match disjoint
+    // characters, the content has only one possible segmentation, so simpleMode
+    // matches or fails this rule in a single linear pass (it is applied anchored
+    // at the cursor) rather than backtracking catastrophically on many quotes.
+    {
+      regex: /[^"]*(?:"{1,2}[^"]+)*"{3,5}/,
+      token: tokenMapping.string,
+      pop: true
+    },
     { regex: /.*/, token: tokenMapping.string }
   ],
   doubleQuoteString: [

package/esm/editors/dql-editor/dql/dql.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/editors/dql-editor/dql/dql.ts"],
-  "sourcesContent": ["import { simpleMode } from '@codemirror/legacy-modes/mode/simple-mode';\n\nimport {\n  booleanLiteralPattern,\n  dqlUnitSuffixPattern,\n  nullLiteralPattern,\n  parameterNamePattern,\n  sortedDqlCommands,\n} from '../../../core/dql/dql-common.js';\n\nconst tokenMapping = {\n  command: 'keyword',\n  comment: 'comment',\n  parameter: 'variableName',\n  string: 'string',\n  number: 'number',\n  bool: 'bool',\n  null: 'bool', // null uses the same token as boolean literals\n} as const;\n\nconst startComment = [\n  { regex: /\\/\\/.*/, token: tokenMapping.comment }, // single line comment\n  { regex: /\\/\\*.*?/, token: tokenMapping.comment, push: 'comment' }, // start of multiline comment\n];\n\nexport const dql = simpleMode({\n  start: [\n    ...startComment,\n    {\n      regex: new RegExp(\n        `(\\\\s*)((?:${sortedDqlCommands.join('|')})\\\\b\\\\s*)`,\n        'i',\n      ),\n      token: ['', tokenMapping.command],\n      next: 'parameters',\n    },\n    {\n      // We want to tokenize parts of a query as well, so in case of no command\n      // in the start state, we go directly to the `parameters` state\n      regex: /\\s*\\b/,\n      next: 'parameters',\n    },\n  ],\n  comment: [\n    { regex: /.*?\\*\\//, token: tokenMapping.comment, pop: true }, // end of multiline comment\n    { regex: /.*/, token: tokenMapping.comment },\n  ],\n  parameters: [\n    ...startComment,\n    { regex: parameterNamePattern, token: tokenMapping.parameter }, // parameter, eg: scanLimitGb:\n    { regex: booleanLiteralPattern, token: tokenMapping.bool }, // boolean literals (true/false)\n    { regex: nullLiteralPattern, token: tokenMapping.null }, // null literal\n    { regex: /[A-Za-z\\]]+[A-Za-z_.0-9]+/ }, // identifier, eg: runs_on or metricsJson\n    { regex: /\"\"\"/, token: tokenMapping.string, push: 'tripleQuoteString' },\n    { regex: /\"/, token: tokenMapping.string, push: 'doubleQuoteString' },\n    { regex: /`/, token: tokenMapping.string, push: 'backtickString' },\n    {\n      regex: new RegExp(`(\\\\d+(?:\\\\.\\\\d+)?${dqlUnitSuffixPattern}?)(?![.\\\\w])`), // Match numbers with optional unit suffix\n      token: tokenMapping.number,\n    },\n    {\n      regex: /(\\[)([0-9]*)(\\])/, // array index access, e.g: [0] or [200]\n      token: ['', tokenMapping.number, ''], // only highlight number; do not highlight surrounding square brackets\n    },\n    {\n      regex: /(\\[)(`(?:[^`\\\\]|\\\\.)*`)(])/, // nested property access, e.g: [`app.kubernetes.io/version`]\n      token: ['', tokenMapping.string, ''], // only highlight content and backticks; do not highlight surrounding square brackets\n    },\n    { regex: /\\||\\[/, next: 'start' }, // start matching a new query syntax after | or [\n  ],\n  tripleQuoteString: [\n    { regex: /\"?\"?(?:[^\"]\"?\"?)*\"\"\"/, token: tokenMapping.string, pop: true }, // end of triple quote string: content cannot contain 3+ consecutive quotes\n    { regex: /.*/, token: tokenMapping.string },\n  ],\n  doubleQuoteString: [\n    { regex: /\"/, token: tokenMapping.string, pop: true },\n    // Note on following {0,3000000}: stop at 3 million characters per line to avoid crash.\n    // Code-mirror only shows 2 million characters per line anyway.\n    { regex: /(?:[^\\\\\"]|\\\\(?:.|$)){0,3000000}/, token: tokenMapping.string },\n  ],\n  backtickString: [\n    { regex: /`/, token: tokenMapping.string, pop: true },\n    { regex: /(?:[^\\\\`]|\\\\(?:.|$))*/, token: tokenMapping.string },\n  ],\n  languageData: {\n    name: 'dql',\n    dontIndentStates: [],\n    indentOnInput: /^\\s*\\}$/,\n    commentTokens: { line: '//', block: { open: '/*', close: '*/' } },\n    mergeTokens: false,\n  },\n});\n"],
-  "mappings": "AAAA,SAAS,kBAAkB;AAE3B;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,MAAM,eAAe;AAAA,EACnB,SAAS;AAAA,EACT,SAAS;AAAA,EACT,WAAW;AAAA,EACX,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,MAAM;AAAA;AACR;AAEA,MAAM,eAAe;AAAA,EACnB,EAAE,OAAO,UAAU,OAAO,aAAa,QAAQ;AAAA;AAAA,EAC/C,EAAE,OAAO,WAAW,OAAO,aAAa,SAAS,MAAM,UAAU;AAAA;AACnE;AAEO,MAAM,MAAM,WAAW;AAAA,EAC5B,OAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,MACE,OAAO,IAAI;AAAA,QACT,aAAa,kBAAkB,KAAK,GAAG,CAAC;AAAA,QACxC;AAAA,MACF;AAAA,MACA,OAAO,CAAC,IAAI,aAAa,OAAO;AAAA,MAChC,MAAM;AAAA,IACR;AAAA,IACA;AAAA;AAAA;AAAA,MAGE,OAAO;AAAA,MACP,MAAM;AAAA,IACR;AAAA,EACF;AAAA,EACA,SAAS;AAAA,IACP,EAAE,OAAO,WAAW,OAAO,aAAa,SAAS,KAAK,KAAK;AAAA;AAAA,IAC3D,EAAE,OAAO,MAAM,OAAO,aAAa,QAAQ;AAAA,EAC7C;AAAA,EACA,YAAY;AAAA,IACV,GAAG;AAAA,IACH,EAAE,OAAO,sBAAsB,OAAO,aAAa,UAAU;AAAA;AAAA,IAC7D,EAAE,OAAO,uBAAuB,OAAO,aAAa,KAAK;AAAA;AAAA,IACzD,EAAE,OAAO,oBAAoB,OAAO,aAAa,KAAK;AAAA;AAAA,IACtD,EAAE,OAAO,4BAA4B;AAAA;AAAA,IACrC,EAAE,OAAO,OAAO,OAAO,aAAa,QAAQ,MAAM,oBAAoB;AAAA,IACtE,EAAE,OAAO,KAAK,OAAO,aAAa,QAAQ,MAAM,oBAAoB;AAAA,IACpE,EAAE,OAAO,KAAK,OAAO,aAAa,QAAQ,MAAM,iBAAiB;AAAA,IACjE;AAAA,MACE,OAAO,IAAI,OAAO,oBAAoB,oBAAoB,cAAc;AAAA;AAAA,MACxE,OAAO,aAAa;AAAA,IACtB;AAAA,IACA;AAAA,MACE,OAAO;AAAA;AAAA,MACP,OAAO,CAAC,IAAI,aAAa,QAAQ,EAAE;AAAA;AAAA,IACrC;AAAA,IACA;AAAA,MACE,OAAO;AAAA;AAAA,MACP,OAAO,CAAC,IAAI,aAAa,QAAQ,EAAE;AAAA;AAAA,IACrC;AAAA,IACA,EAAE,OAAO,SAAS,MAAM,QAAQ;AAAA;AAAA,EAClC;AAAA,EACA,mBAAmB;AAAA,IACjB,EAAE,OAAO,wBAAwB,OAAO,aAAa,QAAQ,KAAK,KAAK;AAAA;AAAA,IACvE,EAAE,OAAO,MAAM,OAAO,aAAa,OAAO;AAAA,EAC5C;AAAA,EACA,mBAAmB;AAAA,IACjB,EAAE,OAAO,KAAK,OAAO,aAAa,QAAQ,KAAK,KAAK;AAAA;AAAA;AAAA,IAGpD,EAAE,OAAO,mCAAmC,OAAO,aAAa,OAAO;AAAA,EACzE;AAAA,EACA,gBAAgB;AAAA,IACd,EAAE,OAAO,KAAK,OAAO,aAAa,QAAQ,KAAK,KAAK;AAAA,IACpD,EAAE,OAAO,yBAAyB,OAAO,aAAa,OAAO;AAAA,EAC/D;AAAA,EACA,cAAc;AAAA,IACZ,MAAM;AAAA,IACN,kBAAkB,CAAC;AAAA,IACnB,eAAe;AAAA,IACf,eAAe,EAAE,MAAM,MAAM,OAAO,EAAE,MAAM,MAAM,OAAO,KAAK,EAAE;AAAA,IAChE,aAAa;AAAA,EACf;AACF,CAAC;",
+  "sourcesContent": ["import { simpleMode } from '@codemirror/legacy-modes/mode/simple-mode';\n\nimport {\n  booleanLiteralPattern,\n  dqlUnitSuffixPattern,\n  nullLiteralPattern,\n  parameterNamePattern,\n  sortedDqlCommands,\n} from '../../../core/dql/dql-common.js';\n\nconst tokenMapping = {\n  command: 'keyword',\n  comment: 'comment',\n  parameter: 'variableName',\n  string: 'string',\n  number: 'number',\n  bool: 'bool',\n  null: 'bool', // null uses the same token as boolean literals\n} as const;\n\nconst startComment = [\n  { regex: /\\/\\/.*/, token: tokenMapping.comment }, // single line comment\n  { regex: /\\/\\*.*?/, token: tokenMapping.comment, push: 'comment' }, // start of multiline comment\n];\n\nexport const dql = simpleMode({\n  start: [\n    ...startComment,\n    {\n      regex: new RegExp(\n        `(\\\\s*)((?:${sortedDqlCommands.join('|')})\\\\b\\\\s*)`,\n        'i',\n      ),\n      token: ['', tokenMapping.command],\n      next: 'parameters',\n    },\n    {\n      // We want to tokenize parts of a query as well, so in case of no command\n      // in the start state, we go directly to the `parameters` state\n      regex: /\\s*\\b/,\n      next: 'parameters',\n    },\n  ],\n  comment: [\n    { regex: /.*?\\*\\//, token: tokenMapping.comment, pop: true }, // end of multiline comment\n    { regex: /.*/, token: tokenMapping.comment },\n  ],\n  parameters: [\n    ...startComment,\n    { regex: parameterNamePattern, token: tokenMapping.parameter }, // parameter, eg: scanLimitGb:\n    { regex: booleanLiteralPattern, token: tokenMapping.bool }, // boolean literals (true/false)\n    { regex: nullLiteralPattern, token: tokenMapping.null }, // null literal\n    { regex: /[A-Za-z\\]]+[A-Za-z_.0-9]+/ }, // identifier, eg: runs_on or metricsJson\n    { regex: /\"\"\"/, token: tokenMapping.string, push: 'tripleQuoteString' },\n    { regex: /\"/, token: tokenMapping.string, push: 'doubleQuoteString' },\n    { regex: /`/, token: tokenMapping.string, push: 'backtickString' },\n    {\n      regex: new RegExp(`(\\\\d+(?:\\\\.\\\\d+)?${dqlUnitSuffixPattern}?)(?![.\\\\w])`), // Match numbers with optional unit suffix\n      token: tokenMapping.number,\n    },\n    {\n      regex: /(\\[)([0-9]*)(\\])/, // array index access, e.g: [0] or [200]\n      token: ['', tokenMapping.number, ''], // only highlight number; do not highlight surrounding square brackets\n    },\n    {\n      regex: /(\\[)(`(?:[^`\\\\]|\\\\.)*`)(])/, // nested property access, e.g: [`app.kubernetes.io/version`]\n      token: ['', tokenMapping.string, ''], // only highlight content and backticks; do not highlight surrounding square brackets\n    },\n    { regex: /\\||\\[/, next: 'start' }, // start matching a new query syntax after | or [\n  ],\n  tripleQuoteString: [\n    // End of a triple-quote string. Because `\"{1,2}` and `[^\"]+` match disjoint\n    // characters, the content has only one possible segmentation, so simpleMode\n    // matches or fails this rule in a single linear pass (it is applied anchored\n    // at the cursor) rather than backtracking catastrophically on many quotes.\n    {\n      regex: /[^\"]*(?:\"{1,2}[^\"]+)*\"{3,5}/,\n      token: tokenMapping.string,\n      pop: true,\n    },\n    { regex: /.*/, token: tokenMapping.string },\n  ],\n  doubleQuoteString: [\n    { regex: /\"/, token: tokenMapping.string, pop: true },\n    // Note on following {0,3000000}: stop at 3 million characters per line to avoid crash.\n    // Code-mirror only shows 2 million characters per line anyway.\n    { regex: /(?:[^\\\\\"]|\\\\(?:.|$)){0,3000000}/, token: tokenMapping.string },\n  ],\n  backtickString: [\n    { regex: /`/, token: tokenMapping.string, pop: true },\n    { regex: /(?:[^\\\\`]|\\\\(?:.|$))*/, token: tokenMapping.string },\n  ],\n  languageData: {\n    name: 'dql',\n    dontIndentStates: [],\n    indentOnInput: /^\\s*\\}$/,\n    commentTokens: { line: '//', block: { open: '/*', close: '*/' } },\n    mergeTokens: false,\n  },\n});\n"],
+  "mappings": "AAAA,SAAS,kBAAkB;AAE3B;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,MAAM,eAAe;AAAA,EACnB,SAAS;AAAA,EACT,SAAS;AAAA,EACT,WAAW;AAAA,EACX,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,MAAM;AAAA;AACR;AAEA,MAAM,eAAe;AAAA,EACnB,EAAE,OAAO,UAAU,OAAO,aAAa,QAAQ;AAAA;AAAA,EAC/C,EAAE,OAAO,WAAW,OAAO,aAAa,SAAS,MAAM,UAAU;AAAA;AACnE;AAEO,MAAM,MAAM,WAAW;AAAA,EAC5B,OAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,MACE,OAAO,IAAI;AAAA,QACT,aAAa,kBAAkB,KAAK,GAAG,CAAC;AAAA,QACxC;AAAA,MACF;AAAA,MACA,OAAO,CAAC,IAAI,aAAa,OAAO;AAAA,MAChC,MAAM;AAAA,IACR;AAAA,IACA;AAAA;AAAA;AAAA,MAGE,OAAO;AAAA,MACP,MAAM;AAAA,IACR;AAAA,EACF;AAAA,EACA,SAAS;AAAA,IACP,EAAE,OAAO,WAAW,OAAO,aAAa,SAAS,KAAK,KAAK;AAAA;AAAA,IAC3D,EAAE,OAAO,MAAM,OAAO,aAAa,QAAQ;AAAA,EAC7C;AAAA,EACA,YAAY;AAAA,IACV,GAAG;AAAA,IACH,EAAE,OAAO,sBAAsB,OAAO,aAAa,UAAU;AAAA;AAAA,IAC7D,EAAE,OAAO,uBAAuB,OAAO,aAAa,KAAK;AAAA;AAAA,IACzD,EAAE,OAAO,oBAAoB,OAAO,aAAa,KAAK;AAAA;AAAA,IACtD,EAAE,OAAO,4BAA4B;AAAA;AAAA,IACrC,EAAE,OAAO,OAAO,OAAO,aAAa,QAAQ,MAAM,oBAAoB;AAAA,IACtE,EAAE,OAAO,KAAK,OAAO,aAAa,QAAQ,MAAM,oBAAoB;AAAA,IACpE,EAAE,OAAO,KAAK,OAAO,aAAa,QAAQ,MAAM,iBAAiB;AAAA,IACjE;AAAA,MACE,OAAO,IAAI,OAAO,oBAAoB,oBAAoB,cAAc;AAAA;AAAA,MACxE,OAAO,aAAa;AAAA,IACtB;AAAA,IACA;AAAA,MACE,OAAO;AAAA;AAAA,MACP,OAAO,CAAC,IAAI,aAAa,QAAQ,EAAE;AAAA;AAAA,IACrC;AAAA,IACA;AAAA,MACE,OAAO;AAAA;AAAA,MACP,OAAO,CAAC,IAAI,aAAa,QAAQ,EAAE;AAAA;AAAA,IACrC;AAAA,IACA,EAAE,OAAO,SAAS,MAAM,QAAQ;AAAA;AAAA,EAClC;AAAA,EACA,mBAAmB;AAAA;AAAA;AAAA;AAAA;AAAA,IAKjB;AAAA,MACE,OAAO;AAAA,MACP,OAAO,aAAa;AAAA,MACpB,KAAK;AAAA,IACP;AAAA,IACA,EAAE,OAAO,MAAM,OAAO,aAAa,OAAO;AAAA,EAC5C;AAAA,EACA,mBAAmB;AAAA,IACjB,EAAE,OAAO,KAAK,OAAO,aAAa,QAAQ,KAAK,KAAK;AAAA;AAAA;AAAA,IAGpD,EAAE,OAAO,mCAAmC,OAAO,aAAa,OAAO;AAAA,EACzE;AAAA,EACA,gBAAgB;AAAA,IACd,EAAE,OAAO,KAAK,OAAO,aAAa,QAAQ,KAAK,KAAK;AAAA,IACpD,EAAE,OAAO,yBAAyB,OAAO,aAAa,OAAO;AAAA,EAC/D;AAAA,EACA,cAAc;AAAA,IACZ,MAAM;AAAA,IACN,kBAAkB,CAAC;AAAA,IACnB,eAAe;AAAA,IACf,eAAe,EAAE,MAAM,MAAM,OAAO,EAAE,MAAM,MAAM,OAAO,KAAK,EAAE;AAAA,IAChE,aAAa;AAAA,EACf;AACF,CAAC;",
   "names": []
 }

package/esm/editors/dql-editor/dql/get-suggestions.js

@@ -1,8 +1,7 @@
 import {
   queryAssistanceClient
 } from "@dynatrace-sdk/client-query";
-const globalCache = /* @__PURE__ */ new Map();
-const getSuggestions = async (query, _cursor, maxDataSuggestions, cache = globalCache) => {
+const getSuggestions = async (query, _cursor, maxDataSuggestions, cache) => {
   const cursor = _cursor ?? query.length;
   const key = JSON.stringify({ query, cursor });
   const currentTime = (/* @__PURE__ */ new Date()).getTime();

package/esm/editors/dql-editor/dql/get-suggestions.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/editors/dql-editor/dql/get-suggestions.ts"],
-  "sourcesContent": ["import {\n  AutocompleteResponse,\n  AutocompleteSuggestion,\n  queryAssistanceClient,\n} from '@dynatrace-sdk/client-query';\n\nexport type SuggestionCache = Map<\n  string,\n  { suggestions: AutocompleteSuggestion[]; ttl?: number }\n>;\n\nconst globalCache: SuggestionCache = new Map();\n\n/** Gets memoized suggestions. */\nexport const getSuggestions: (\n  query: string,\n  cursor?: number,\n  maxDataSuggestions?: number,\n  cache?: SuggestionCache,\n) => Promise<AutocompleteSuggestion[]> = async (\n  query,\n  _cursor,\n  maxDataSuggestions,\n  cache = globalCache,\n) => {\n  const cursor = _cursor ?? query.length;\n  const key = JSON.stringify({ query, cursor });\n  const currentTime = new Date().getTime();\n\n  const cacheHit = cache.get(key);\n  if (cacheHit && (cacheHit.ttl ? cacheHit.ttl > currentTime : true)) {\n    return cacheHit.suggestions;\n  } else {\n    cache.delete(key);\n\n    const { suggestions, suggestedTtlSeconds } =\n      await getSuggestionsFromQueryEndpoint(query, cursor, maxDataSuggestions);\n\n    cache.set(key, {\n      suggestions: suggestions ?? [],\n      ttl:\n        suggestedTtlSeconds !== undefined\n          ? new Date().getTime() + suggestedTtlSeconds * 1000\n          : undefined,\n    });\n\n    return suggestions;\n  }\n};\n\n/** Gets suggestions from autocomplete endpoint. */\nasync function getSuggestionsFromQueryEndpoint(\n  query: string,\n  cursor: number,\n  maxDataSuggestions: number = 1_000,\n): Promise<AutocompleteResponse> {\n  try {\n    return await queryAssistanceClient.queryAutocomplete({\n      body: { query, cursorPosition: cursor, maxDataSuggestions },\n    });\n  } catch {\n    //nothing\n  }\n  return { suggestions: [], suggestedTtlSeconds: undefined, optional: false };\n}\n"],
-  "mappings": "AAAA;AAAA,EAGE;AAAA,OACK;AAOP,MAAM,cAA+B,oBAAI,IAAI;AAGtC,MAAM,iBAK4B,OACvC,OACA,SACA,oBACA,QAAQ,gBACL;AACH,QAAM,SAAS,WAAW,MAAM;AAChC,QAAM,MAAM,KAAK,UAAU,EAAE,OAAO,OAAO,CAAC;AAC5C,QAAM,eAAc,oBAAI,KAAK,GAAE,QAAQ;AAEvC,QAAM,WAAW,MAAM,IAAI,GAAG;AAC9B,MAAI,aAAa,SAAS,MAAM,SAAS,MAAM,cAAc,OAAO;AAClE,WAAO,SAAS;AAAA,EAClB,OAAO;AACL,UAAM,OAAO,GAAG;AAEhB,UAAM,EAAE,aAAa,oBAAoB,IACvC,MAAM,gCAAgC,OAAO,QAAQ,kBAAkB;AAEzE,UAAM,IAAI,KAAK;AAAA,MACb,aAAa,eAAe,CAAC;AAAA,MAC7B,KACE,wBAAwB,UACpB,oBAAI,KAAK,GAAE,QAAQ,IAAI,sBAAsB,MAC7C;AAAA,IACR,CAAC;AAED,WAAO;AAAA,EACT;AACF;AAGA,eAAe,gCACb,OACA,QACA,qBAA6B,KACE;AAC/B,MAAI;AACF,WAAO,MAAM,sBAAsB,kBAAkB;AAAA,MACnD,MAAM,EAAE,OAAO,gBAAgB,QAAQ,mBAAmB;AAAA,IAC5D,CAAC;AAAA,EACH,QAAQ;AAAA,EAER;AACA,SAAO,EAAE,aAAa,CAAC,GAAG,qBAAqB,QAAW,UAAU,MAAM;AAC5E;",
+  "sourcesContent": ["import {\n  AutocompleteResponse,\n  AutocompleteSuggestion,\n  queryAssistanceClient,\n} from '@dynatrace-sdk/client-query';\n\nexport type SuggestionCache = Map<\n  string,\n  { suggestions: AutocompleteSuggestion[]; ttl?: number }\n>;\n\n/**\n * Gets memoized suggestions. The `cache` is owned by the calling editor\n * instance so entries never outlive the editor or leak between editors.\n */\nexport const getSuggestions: (\n  query: string,\n  cursor: number | undefined,\n  maxDataSuggestions: number | undefined,\n  cache: SuggestionCache,\n) => Promise<AutocompleteSuggestion[]> = async (\n  query,\n  _cursor,\n  maxDataSuggestions,\n  cache,\n) => {\n  const cursor = _cursor ?? query.length;\n  const key = JSON.stringify({ query, cursor });\n  const currentTime = new Date().getTime();\n\n  const cacheHit = cache.get(key);\n  if (cacheHit && (cacheHit.ttl ? cacheHit.ttl > currentTime : true)) {\n    return cacheHit.suggestions;\n  } else {\n    cache.delete(key);\n\n    const { suggestions, suggestedTtlSeconds } =\n      await getSuggestionsFromQueryEndpoint(query, cursor, maxDataSuggestions);\n\n    cache.set(key, {\n      suggestions: suggestions ?? [],\n      ttl:\n        suggestedTtlSeconds !== undefined\n          ? new Date().getTime() + suggestedTtlSeconds * 1000\n          : undefined,\n    });\n\n    return suggestions;\n  }\n};\n\n/** Gets suggestions from autocomplete endpoint. */\nasync function getSuggestionsFromQueryEndpoint(\n  query: string,\n  cursor: number,\n  maxDataSuggestions: number = 1_000,\n): Promise<AutocompleteResponse> {\n  try {\n    return await queryAssistanceClient.queryAutocomplete({\n      body: { query, cursorPosition: cursor, maxDataSuggestions },\n    });\n  } catch {\n    //nothing\n  }\n  return { suggestions: [], suggestedTtlSeconds: undefined, optional: false };\n}\n"],
+  "mappings": "AAAA;AAAA,EAGE;AAAA,OACK;AAWA,MAAM,iBAK4B,OACvC,OACA,SACA,oBACA,UACG;AACH,QAAM,SAAS,WAAW,MAAM;AAChC,QAAM,MAAM,KAAK,UAAU,EAAE,OAAO,OAAO,CAAC;AAC5C,QAAM,eAAc,oBAAI,KAAK,GAAE,QAAQ;AAEvC,QAAM,WAAW,MAAM,IAAI,GAAG;AAC9B,MAAI,aAAa,SAAS,MAAM,SAAS,MAAM,cAAc,OAAO;AAClE,WAAO,SAAS;AAAA,EAClB,OAAO;AACL,UAAM,OAAO,GAAG;AAEhB,UAAM,EAAE,aAAa,oBAAoB,IACvC,MAAM,gCAAgC,OAAO,QAAQ,kBAAkB;AAEzE,UAAM,IAAI,KAAK;AAAA,MACb,aAAa,eAAe,CAAC;AAAA,MAC7B,KACE,wBAAwB,UACpB,oBAAI,KAAK,GAAE,QAAQ,IAAI,sBAAsB,MAC7C;AAAA,IACR,CAAC;AAED,WAAO;AAAA,EACT;AACF;AAGA,eAAe,gCACb,OACA,QACA,qBAA6B,KACE;AAC/B,MAAI;AACF,WAAO,MAAM,sBAAsB,kBAAkB;AAAA,MACnD,MAAM,EAAE,OAAO,gBAAgB,QAAQ,mBAAmB;AAAA,IAC5D,CAAC;AAAA,EACH,QAAQ;AAAA,EAER;AACA,SAAO,EAAE,aAAa,CAAC,GAAG,qBAAqB,QAAW,UAAU,MAAM;AAC5E;",
   "names": []
 }

package/esm/editors/dql-editor/dql/open-autocomplete.js

@@ -20,6 +20,9 @@ function isTypingParameterPrefixAfterCommand(context) {
   );
   return commandAndParameter !== null;
 }
+function isTypingNumericContext(context) {
+  return context.matchBefore(/\d[\w.]*$/) !== null;
+}
 function isAtTokenBoundary(state) {
   const afterCursor = state.doc.slice(state.selection.main.to).toString();
   const immediateCharacterAfterCursor = afterCursor.slice(0, 1);
@@ -46,7 +49,7 @@ async function openAutocomplete(update, state) {
       return false;
     }
   }
-  if (isTyping && (isTypingCommandPrefixAtCommandBoundary(context) || isTypingCommandPrefixAtSubqueryStart(context) || isTypingParameterPrefixAfterCommand(context)) && isAtTokenBoundary(state)) {
+  if (isTyping && (isTypingCommandPrefixAtCommandBoundary(context) || isTypingCommandPrefixAtSubqueryStart(context) || isTypingParameterPrefixAfterCommand(context) || isTypingNumericContext(context)) && isAtTokenBoundary(state)) {
     return true;
   }
   if (isFocused && state.doc.toString().trim() === "") {

package/esm/editors/dql-editor/dql/open-autocomplete.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/editors/dql-editor/dql/open-autocomplete.ts"],
-  "sourcesContent": ["/* eslint-disable tsdoc/syntax */\nimport { CompletionContext } from '@codemirror/autocomplete';\nimport { EditorState } from '@codemirror/state';\n\nimport { verifyQuery } from './dql-linter.js';\n\n// Look back a bounded amount while typing to keep per-keystroke checks predictable.\nconst SUBQUERY_PREFIX_LOOKBACK_CHARS = 100;\n\n/**\n * Checks whether the cursor is at a position where a command or parameter is expected,\n * following a comma or pipe separator, with only whitespace in between.\n * @param context - the current completion context\n * @returns true if the cursor is at the start of a command or parameter, false otherwise\n */\nfunction isStartOfCommandOrParameter(context: CompletionContext): boolean {\n  return context.matchBefore(/[,|]\\s+$/) !== null;\n}\n\n/**\n * Checks whether the user is typing a command prefix (e.g. `d`, `da`, `fet`)\n * at a valid command boundary: start of query, after a `|` or `,` separator,\n * or after a block comment close (`*\\/`). The latter covers reopening\n * suggestions after ESC and continued typing following an inline block\n * comment, e.g. `/* note *\\/ fetc`.\n * @param context - the current completion context\n * @returns true if the user is typing a command prefix at a valid command boundary, false otherwise\n */\nfunction isTypingCommandPrefixAtCommandBoundary(\n  context: CompletionContext,\n): boolean {\n  return (\n    context.matchBefore(/(?:^|[|,]\\s*|\\*\\/\\s*)[A-Za-z][A-Za-z0-9]*$/) !== null\n  );\n}\n\n/**\n * Covers nested subqueries where a command starts after `[` on a new indented line,\n * e.g. `lookup(..., [\\n    fetc ...)`.\n *\n * Uses a manual slice instead of context.matchBefore because `[` may be on a\n * previous line, which matchBefore cannot see.\n *\n * @param context - the current completion context\n * @returns true if the user is typing a command prefix at the start of a subquery, false otherwise\n */\nfunction isTypingCommandPrefixAtSubqueryStart(\n  context: CompletionContext,\n): boolean {\n  // Slice at most SUBQUERY_PREFIX_LOOKBACK_CHARS before the cursor \u2014 bounding input size\n  // prevents the regex from backtracking excessively on large documents.\n  const slice = context.state.doc.sliceString(\n    Math.max(0, context.pos - SUBQUERY_PREFIX_LOOKBACK_CHARS),\n    context.pos,\n  );\n\n  // Safe and fast regex: we only check a small slice and match a command\n  // prefix at the end of the slice.\n  return /\\[\\s*[A-Za-z]+$/.test(slice);\n}\n\n/**\n * Checks whether the user is typing a parameter prefix after a command.\n * This covers reopening suggestions after ESC when typing continues within\n * the first parameter token at query start, for example\n * `fetch app` -> `fetch appl`.\n * @param context - the current completion context\n * @returns true if the user is typing a parameter prefix after a command, false otherwise\n */\nfunction isTypingParameterPrefixAfterCommand(\n  context: CompletionContext,\n): boolean {\n  const commandAndParameter = context.matchBefore(\n    /^[A-Za-z][A-Za-z0-9]*\\s+[A-Za-z_][A-Za-z0-9_.]*\\s*$/,\n  );\n\n  return commandAndParameter !== null;\n}\n\n/**\n * Allows opening autocomplete when the cursor is at a token boundary:\n * immediately before whitespace, before a comment, or at end of content.\n * This supports selected-token replacement where content can still follow\n * after whitespace, while blocking autocomplete in the middle of identifiers.\n * @param state - the current editor state\n * @returns true if the cursor is at a token boundary, false otherwise\n */\nfunction isAtTokenBoundary(state: EditorState): boolean {\n  const afterCursor = state.doc.slice(state.selection.main.to).toString();\n  const immediateCharacterAfterCursor = afterCursor.slice(0, 1);\n  const afterCursorTrimmed = afterCursor.trimStart();\n\n  return (\n    immediateCharacterAfterCursor.trim().length === 0 ||\n    afterCursorTrimmed.startsWith('//') ||\n    afterCursorTrimmed.startsWith('/*')\n  );\n}\n\n/**\n * Checks whether the query is invalid at the end.\n *\n * @param query - The query string to check\n * @returns A promise that resolves to true if the query is invalid at the end, false otherwise\n */\nexport async function isInvalidAtEnd(query: string): Promise<boolean> {\n  const trimmedQuery = query.trimEnd();\n  const { valid = true, notifications = [] } =\n    (await verifyQuery(trimmedQuery)) ?? {};\n\n  const hasErrorNotificationAtEnd = notifications?.some(\n    (notification) =>\n      notification.severity === 'ERROR' &&\n      notification.syntaxPosition?.end.index === trimmedQuery.length - 1,\n  );\n\n  return !valid && hasErrorNotificationAtEnd;\n}\n\n/**\n * Determines if the autocomplete dropdown should be opened.\n *\n * @param update - Information on the current changes from the update listener\n * @param state - EditorState\n * @returns true when the autocomplete should be opened\n */\nexport async function openAutocomplete(\n  update: {\n    isTyping: boolean;\n    isDeleting: boolean;\n    isFocused: boolean;\n  },\n  state: EditorState,\n): Promise<boolean> {\n  const { isTyping, isDeleting, isFocused } = update;\n\n  const context = new CompletionContext(state, state.selection.main.to, false);\n\n  // While deleting, suppress reopen if the cursor still has a run of trailing\n  // whitespace (including empty lines) behind it. This avoids popup flicker\n  // while users clean up spacing. Reopen can happen again once the run shrinks\n  // to at most one trailing whitespace character.\n  if (isDeleting) {\n    const beforeCursor = state.doc.sliceString(\n      Math.max(0, state.selection.main.to - 2),\n      state.selection.main.to,\n    );\n\n    // We only slice the 2 chars directly before the cursor.\n    // If both are whitespace (`\\s\\s$`), it means there are at least two\n    // trailing whitespace chars before the cursor, so we suppress reopen.\n    if (/\\s\\s$/.test(beforeCursor)) {\n      return false;\n    }\n  }\n\n  if (\n    isTyping &&\n    (isTypingCommandPrefixAtCommandBoundary(context) ||\n      isTypingCommandPrefixAtSubqueryStart(context) ||\n      isTypingParameterPrefixAfterCommand(context)) &&\n    isAtTokenBoundary(state)\n  ) {\n    return true;\n  }\n\n  // open autocomplete when an empty editor receives focus\n  if (isFocused && state.doc.toString().trim() === '') {\n    return true;\n  }\n\n  const hasWhitespaceBefore = context.matchBefore(/\\s/);\n\n  // open autocomplete when the user is typing following a command (==keyword)\n  if (\n    (isTyping || isDeleting) &&\n    context.tokenBefore(['keyword']) &&\n    hasWhitespaceBefore\n  ) {\n    return true;\n  }\n\n  // open autocomplete if the user is typing following a comma or pipe\n  if (isTyping && isStartOfCommandOrParameter(context)) {\n    return true;\n  }\n\n  // open autocomplete if query is invalid and a space was typed beforehand\n  if (isTyping && hasWhitespaceBefore) {\n    const query = state.doc.slice(0, state.selection.main.to).toString();\n    if (await isInvalidAtEnd(query)) {\n      return true;\n    }\n  }\n\n  const characterAfter = state.doc\n    .slice(state.selection.main.to, state.selection.main.to + 1)\n    .toString();\n  const hasSpaceOrEndOfContentAfter = characterAfter.trim().length === 0;\n\n  // open autocomplete if\n  //  - a whitespace was deleted\n  //  - the last char was deleted\n  if (isDeleting && hasSpaceOrEndOfContentAfter) {\n    return true;\n  }\n\n  return false;\n}\n"],
-  "mappings": "AACA,SAAS,yBAAyB;AAGlC,SAAS,mBAAmB;AAG5B,MAAM,iCAAiC;AAQvC,SAAS,4BAA4B,SAAqC;AACxE,SAAO,QAAQ,YAAY,UAAU,MAAM;AAC7C;AAWA,SAAS,uCACP,SACS;AACT,SACE,QAAQ,YAAY,4CAA4C,MAAM;AAE1E;AAYA,SAAS,qCACP,SACS;AAGT,QAAM,QAAQ,QAAQ,MAAM,IAAI;AAAA,IAC9B,KAAK,IAAI,GAAG,QAAQ,MAAM,8BAA8B;AAAA,IACxD,QAAQ;AAAA,EACV;AAIA,SAAO,kBAAkB,KAAK,KAAK;AACrC;AAUA,SAAS,oCACP,SACS;AACT,QAAM,sBAAsB,QAAQ;AAAA,IAClC;AAAA,EACF;AAEA,SAAO,wBAAwB;AACjC;AAUA,SAAS,kBAAkB,OAA6B;AACtD,QAAM,cAAc,MAAM,IAAI,MAAM,MAAM,UAAU,KAAK,EAAE,EAAE,SAAS;AACtE,QAAM,gCAAgC,YAAY,MAAM,GAAG,CAAC;AAC5D,QAAM,qBAAqB,YAAY,UAAU;AAEjD,SACE,8BAA8B,KAAK,EAAE,WAAW,KAChD,mBAAmB,WAAW,IAAI,KAClC,mBAAmB,WAAW,IAAI;AAEtC;AAQA,eAAsB,eAAe,OAAiC;AACpE,QAAM,eAAe,MAAM,QAAQ;AACnC,QAAM,EAAE,QAAQ,MAAM,gBAAgB,CAAC,EAAE,IACtC,MAAM,YAAY,YAAY,KAAM,CAAC;AAExC,QAAM,4BAA4B,eAAe;AAAA,IAC/C,CAAC,iBACC,aAAa,aAAa,WAC1B,aAAa,gBAAgB,IAAI,UAAU,aAAa,SAAS;AAAA,EACrE;AAEA,SAAO,CAAC,SAAS;AACnB;AASA,eAAsB,iBACpB,QAKA,OACkB;AAClB,QAAM,EAAE,UAAU,YAAY,UAAU,IAAI;AAE5C,QAAM,UAAU,IAAI,kBAAkB,OAAO,MAAM,UAAU,KAAK,IAAI,KAAK;AAM3E,MAAI,YAAY;AACd,UAAM,eAAe,MAAM,IAAI;AAAA,MAC7B,KAAK,IAAI,GAAG,MAAM,UAAU,KAAK,KAAK,CAAC;AAAA,MACvC,MAAM,UAAU,KAAK;AAAA,IACvB;AAKA,QAAI,QAAQ,KAAK,YAAY,GAAG;AAC9B,aAAO;AAAA,IACT;AAAA,EACF;AAEA,MACE,aACC,uCAAuC,OAAO,KAC7C,qCAAqC,OAAO,KAC5C,oCAAoC,OAAO,MAC7C,kBAAkB,KAAK,GACvB;AACA,WAAO;AAAA,EACT;AAGA,MAAI,aAAa,MAAM,IAAI,SAAS,EAAE,KAAK,MAAM,IAAI;AACnD,WAAO;AAAA,EACT;AAEA,QAAM,sBAAsB,QAAQ,YAAY,IAAI;AAGpD,OACG,YAAY,eACb,QAAQ,YAAY,CAAC,SAAS,CAAC,KAC/B,qBACA;AACA,WAAO;AAAA,EACT;AAGA,MAAI,YAAY,4BAA4B,OAAO,GAAG;AACpD,WAAO;AAAA,EACT;AAGA,MAAI,YAAY,qBAAqB;AACnC,UAAM,QAAQ,MAAM,IAAI,MAAM,GAAG,MAAM,UAAU,KAAK,EAAE,EAAE,SAAS;AACnE,QAAI,MAAM,eAAe,KAAK,GAAG;AAC/B,aAAO;AAAA,IACT;AAAA,EACF;AAEA,QAAM,iBAAiB,MAAM,IAC1B,MAAM,MAAM,UAAU,KAAK,IAAI,MAAM,UAAU,KAAK,KAAK,CAAC,EAC1D,SAAS;AACZ,QAAM,8BAA8B,eAAe,KAAK,EAAE,WAAW;AAKrE,MAAI,cAAc,6BAA6B;AAC7C,WAAO;AAAA,EACT;AAEA,SAAO;AACT;",
+  "sourcesContent": ["/* eslint-disable tsdoc/syntax */\nimport { CompletionContext } from '@codemirror/autocomplete';\nimport { EditorState } from '@codemirror/state';\n\nimport { verifyQuery } from './dql-linter.js';\n\n// Look back a bounded amount while typing to keep per-keystroke checks predictable.\nconst SUBQUERY_PREFIX_LOOKBACK_CHARS = 100;\n\n/**\n * Checks whether the cursor is at a position where a command or parameter is expected,\n * following a comma or pipe separator, with only whitespace in between.\n * @param context - the current completion context\n * @returns true if the cursor is at the start of a command or parameter, false otherwise\n */\nfunction isStartOfCommandOrParameter(context: CompletionContext): boolean {\n  return context.matchBefore(/[,|]\\s+$/) !== null;\n}\n\n/**\n * Checks whether the user is typing a command prefix (e.g. `d`, `da`, `fet`)\n * at a valid command boundary: start of query, after a `|` or `,` separator,\n * or after a block comment close (`*\\/`). The latter covers reopening\n * suggestions after ESC and continued typing following an inline block\n * comment, e.g. `/* note *\\/ fetc`.\n * @param context - the current completion context\n * @returns true if the user is typing a command prefix at a valid command boundary, false otherwise\n */\nfunction isTypingCommandPrefixAtCommandBoundary(\n  context: CompletionContext,\n): boolean {\n  return (\n    context.matchBefore(/(?:^|[|,]\\s*|\\*\\/\\s*)[A-Za-z][A-Za-z0-9]*$/) !== null\n  );\n}\n\n/**\n * Covers nested subqueries where a command starts after `[` on a new indented line,\n * e.g. `lookup(..., [\\n    fetc ...)`.\n *\n * Uses a manual slice instead of context.matchBefore because `[` may be on a\n * previous line, which matchBefore cannot see.\n *\n * @param context - the current completion context\n * @returns true if the user is typing a command prefix at the start of a subquery, false otherwise\n */\nfunction isTypingCommandPrefixAtSubqueryStart(\n  context: CompletionContext,\n): boolean {\n  // Slice at most SUBQUERY_PREFIX_LOOKBACK_CHARS before the cursor \u2014 bounding input size\n  // prevents the regex from backtracking excessively on large documents.\n  const slice = context.state.doc.sliceString(\n    Math.max(0, context.pos - SUBQUERY_PREFIX_LOOKBACK_CHARS),\n    context.pos,\n  );\n\n  // Safe and fast regex: we only check a small slice and match a command\n  // prefix at the end of the slice.\n  return /\\[\\s*[A-Za-z]+$/.test(slice);\n}\n\n/**\n * Checks whether the user is typing a parameter prefix after a command.\n * This covers reopening suggestions after ESC when typing continues within\n * the first parameter token at query start, for example\n * `fetch app` -> `fetch appl`.\n * @param context - the current completion context\n * @returns true if the user is typing a parameter prefix after a command, false otherwise\n */\nfunction isTypingParameterPrefixAfterCommand(\n  context: CompletionContext,\n): boolean {\n  const commandAndParameter = context.matchBefore(\n    /^[A-Za-z][A-Za-z0-9]*\\s+[A-Za-z_][A-Za-z0-9_.]*\\s*$/,\n  );\n\n  return commandAndParameter !== null;\n}\n\n/**\n * Checks whether the cursor is within a digit-led token, such as an integer, a decimal number,\n * or a number followed by a unit suffix (e.g. `1`, `1mon`, `1.5`, `1.5h`).\n * @param context - the current completion context\n * @returns true if the cursor is within a digit-led token, false otherwise\n */\nfunction isTypingNumericContext(context: CompletionContext): boolean {\n  return context.matchBefore(/\\d[\\w.]*$/) !== null;\n}\n\n/**\n * Allows opening autocomplete when the cursor is at a token boundary:\n * immediately before whitespace, before a comment, or at end of content.\n * This supports selected-token replacement where content can still follow\n * after whitespace, while blocking autocomplete in the middle of identifiers.\n * @param state - the current editor state\n * @returns true if the cursor is at a token boundary, false otherwise\n */\nfunction isAtTokenBoundary(state: EditorState): boolean {\n  const afterCursor = state.doc.slice(state.selection.main.to).toString();\n  const immediateCharacterAfterCursor = afterCursor.slice(0, 1);\n  const afterCursorTrimmed = afterCursor.trimStart();\n\n  return (\n    immediateCharacterAfterCursor.trim().length === 0 ||\n    afterCursorTrimmed.startsWith('//') ||\n    afterCursorTrimmed.startsWith('/*')\n  );\n}\n\n/**\n * Checks whether the query is invalid at the end.\n *\n * @param query - The query string to check\n * @returns A promise that resolves to true if the query is invalid at the end, false otherwise\n */\nexport async function isInvalidAtEnd(query: string): Promise<boolean> {\n  const trimmedQuery = query.trimEnd();\n  const { valid = true, notifications = [] } =\n    (await verifyQuery(trimmedQuery)) ?? {};\n\n  const hasErrorNotificationAtEnd = notifications?.some(\n    (notification) =>\n      notification.severity === 'ERROR' &&\n      notification.syntaxPosition?.end.index === trimmedQuery.length - 1,\n  );\n\n  return !valid && hasErrorNotificationAtEnd;\n}\n\n/**\n * Determines if the autocomplete dropdown should be opened.\n *\n * @param update - Information on the current changes from the update listener\n * @param state - EditorState\n * @returns true when the autocomplete should be opened\n */\nexport async function openAutocomplete(\n  update: {\n    isTyping: boolean;\n    isDeleting: boolean;\n    isFocused: boolean;\n  },\n  state: EditorState,\n): Promise<boolean> {\n  const { isTyping, isDeleting, isFocused } = update;\n\n  const context = new CompletionContext(state, state.selection.main.to, false);\n\n  // While deleting, suppress reopen if the cursor still has a run of trailing\n  // whitespace (including empty lines) behind it. This avoids popup flicker\n  // while users clean up spacing. Reopen can happen again once the run shrinks\n  // to at most one trailing whitespace character.\n  if (isDeleting) {\n    const beforeCursor = state.doc.sliceString(\n      Math.max(0, state.selection.main.to - 2),\n      state.selection.main.to,\n    );\n\n    // We only slice the 2 chars directly before the cursor.\n    // If both are whitespace (`\\s\\s$`), it means there are at least two\n    // trailing whitespace chars before the cursor, so we suppress reopen.\n    if (/\\s\\s$/.test(beforeCursor)) {\n      return false;\n    }\n  }\n\n  if (\n    isTyping &&\n    (isTypingCommandPrefixAtCommandBoundary(context) ||\n      isTypingCommandPrefixAtSubqueryStart(context) ||\n      isTypingParameterPrefixAfterCommand(context) ||\n      isTypingNumericContext(context)) &&\n    isAtTokenBoundary(state)\n  ) {\n    return true;\n  }\n\n  // open autocomplete when an empty editor receives focus\n  if (isFocused && state.doc.toString().trim() === '') {\n    return true;\n  }\n\n  const hasWhitespaceBefore = context.matchBefore(/\\s/);\n\n  // open autocomplete when the user is typing following a command (==keyword)\n  if (\n    (isTyping || isDeleting) &&\n    context.tokenBefore(['keyword']) &&\n    hasWhitespaceBefore\n  ) {\n    return true;\n  }\n\n  // open autocomplete if the user is typing following a comma or pipe\n  if (isTyping && isStartOfCommandOrParameter(context)) {\n    return true;\n  }\n\n  // open autocomplete if query is invalid and a space was typed beforehand\n  if (isTyping && hasWhitespaceBefore) {\n    const query = state.doc.slice(0, state.selection.main.to).toString();\n    if (await isInvalidAtEnd(query)) {\n      return true;\n    }\n  }\n\n  const characterAfter = state.doc\n    .slice(state.selection.main.to, state.selection.main.to + 1)\n    .toString();\n  const hasSpaceOrEndOfContentAfter = characterAfter.trim().length === 0;\n\n  // open autocomplete if\n  //  - a whitespace was deleted\n  //  - the last char was deleted\n  if (isDeleting && hasSpaceOrEndOfContentAfter) {\n    return true;\n  }\n\n  return false;\n}\n"],
+  "mappings": "AACA,SAAS,yBAAyB;AAGlC,SAAS,mBAAmB;AAG5B,MAAM,iCAAiC;AAQvC,SAAS,4BAA4B,SAAqC;AACxE,SAAO,QAAQ,YAAY,UAAU,MAAM;AAC7C;AAWA,SAAS,uCACP,SACS;AACT,SACE,QAAQ,YAAY,4CAA4C,MAAM;AAE1E;AAYA,SAAS,qCACP,SACS;AAGT,QAAM,QAAQ,QAAQ,MAAM,IAAI;AAAA,IAC9B,KAAK,IAAI,GAAG,QAAQ,MAAM,8BAA8B;AAAA,IACxD,QAAQ;AAAA,EACV;AAIA,SAAO,kBAAkB,KAAK,KAAK;AACrC;AAUA,SAAS,oCACP,SACS;AACT,QAAM,sBAAsB,QAAQ;AAAA,IAClC;AAAA,EACF;AAEA,SAAO,wBAAwB;AACjC;AAQA,SAAS,uBAAuB,SAAqC;AACnE,SAAO,QAAQ,YAAY,WAAW,MAAM;AAC9C;AAUA,SAAS,kBAAkB,OAA6B;AACtD,QAAM,cAAc,MAAM,IAAI,MAAM,MAAM,UAAU,KAAK,EAAE,EAAE,SAAS;AACtE,QAAM,gCAAgC,YAAY,MAAM,GAAG,CAAC;AAC5D,QAAM,qBAAqB,YAAY,UAAU;AAEjD,SACE,8BAA8B,KAAK,EAAE,WAAW,KAChD,mBAAmB,WAAW,IAAI,KAClC,mBAAmB,WAAW,IAAI;AAEtC;AAQA,eAAsB,eAAe,OAAiC;AACpE,QAAM,eAAe,MAAM,QAAQ;AACnC,QAAM,EAAE,QAAQ,MAAM,gBAAgB,CAAC,EAAE,IACtC,MAAM,YAAY,YAAY,KAAM,CAAC;AAExC,QAAM,4BAA4B,eAAe;AAAA,IAC/C,CAAC,iBACC,aAAa,aAAa,WAC1B,aAAa,gBAAgB,IAAI,UAAU,aAAa,SAAS;AAAA,EACrE;AAEA,SAAO,CAAC,SAAS;AACnB;AASA,eAAsB,iBACpB,QAKA,OACkB;AAClB,QAAM,EAAE,UAAU,YAAY,UAAU,IAAI;AAE5C,QAAM,UAAU,IAAI,kBAAkB,OAAO,MAAM,UAAU,KAAK,IAAI,KAAK;AAM3E,MAAI,YAAY;AACd,UAAM,eAAe,MAAM,IAAI;AAAA,MAC7B,KAAK,IAAI,GAAG,MAAM,UAAU,KAAK,KAAK,CAAC;AAAA,MACvC,MAAM,UAAU,KAAK;AAAA,IACvB;AAKA,QAAI,QAAQ,KAAK,YAAY,GAAG;AAC9B,aAAO;AAAA,IACT;AAAA,EACF;AAEA,MACE,aACC,uCAAuC,OAAO,KAC7C,qCAAqC,OAAO,KAC5C,oCAAoC,OAAO,KAC3C,uBAAuB,OAAO,MAChC,kBAAkB,KAAK,GACvB;AACA,WAAO;AAAA,EACT;AAGA,MAAI,aAAa,MAAM,IAAI,SAAS,EAAE,KAAK,MAAM,IAAI;AACnD,WAAO;AAAA,EACT;AAEA,QAAM,sBAAsB,QAAQ,YAAY,IAAI;AAGpD,OACG,YAAY,eACb,QAAQ,YAAY,CAAC,SAAS,CAAC,KAC/B,qBACA;AACA,WAAO;AAAA,EACT;AAGA,MAAI,YAAY,4BAA4B,OAAO,GAAG;AACpD,WAAO;AAAA,EACT;AAGA,MAAI,YAAY,qBAAqB;AACnC,UAAM,QAAQ,MAAM,IAAI,MAAM,GAAG,MAAM,UAAU,KAAK,EAAE,EAAE,SAAS;AACnE,QAAI,MAAM,eAAe,KAAK,GAAG;AAC/B,aAAO;AAAA,IACT;AAAA,EACF;AAEA,QAAM,iBAAiB,MAAM,IAC1B,MAAM,MAAM,UAAU,KAAK,IAAI,MAAM,UAAU,KAAK,KAAK,CAAC,EAC1D,SAAS;AACZ,QAAM,8BAA8B,eAAe,KAAK,EAAE,WAAW;AAKrE,MAAI,cAAc,6BAA6B;AAC7C,WAAO;AAAA,EACT;AAEA,SAAO;AACT;",
   "names": []
 }

package/esm/editors/dql-editor/dql/suggestion-autocompletions.js

@@ -8,12 +8,16 @@ import {
 } from "./fuzzy-match.js";
 import { getSuggestions } from "./get-suggestions.js";
 import { SuggestionPart } from "./SuggestionPart.js";
+import { combinedDurationUnits } from "../../../core/dql/dql-common.js";
 import { Flex } from "../../../layouts/flex/Flex.js";
 import { Text } from "../../../typography/text/Text.js";
-function getMatchPattern(content) {
-  const match = content.match(/\W?([\w.]*)$/);
-  const capture = match?.[1];
-  return capture ?? "";
+function extractWordToken(content) {
+  const rawCapture = /\W?([\w.]*)$/.exec(content)?.[1] ?? "";
+  const trimmedCapture = rawCapture.replace(/^\d+(\.\d+)?/, "");
+  return { rawCapture, trimmedCapture };
+}
+function getIsTypingUnitAlias(rawCapture, trimmedCapture) {
+  return trimmedCapture.length > 0 && trimmedCapture !== rawCapture && combinedDurationUnits.some((unit) => unit.startsWith(trimmedCapture));
 }
 function hasInfo(suggestions) {
   return suggestions.some(
@@ -46,7 +50,7 @@ function getRequestString(autocompleteContent, patternLength, requestLength) {
   );
 }
 const MAX_DATA_SUGGESTIONS = 1e4;
-async function getFilteredSuggestions(autocompleteContent, patternLength, explicit) {
+async function getFilteredSuggestions(autocompleteContent, patternLength, explicit, cache) {
   const requestString = getRequestString(
     autocompleteContent,
     patternLength,
@@ -55,7 +59,8 @@ async function getFilteredSuggestions(autocompleteContent, patternLength, explic
   const suggestions = await getSuggestions(
     requestString,
     requestString.length,
-    MAX_DATA_SUGGESTIONS
+    MAX_DATA_SUGGESTIONS,
+    cache
   );
   const pattern = autocompleteContent.slice(
     autocompleteContent.length - patternLength
@@ -68,26 +73,50 @@ async function getFilteredSuggestions(autocompleteContent, patternLength, explic
     explicit
   );
 }
-const suggestionAutocompletion = async (context) => {
+function buildSuggestionInfoPopup(suggestion) {
+  const infoParts = suggestion.parts.filter((part) => !!part.info);
+  if (infoParts.length === 0) {
+    return void 0;
+  }
+  return () => /* @__PURE__ */ jsx(Flex, { flexDirection: "column", gap: 16, children: infoParts.map((part) => /* @__PURE__ */ jsx(SuggestionPart, { suggestionPart: part }, part.info)) });
+}
+function buildSuggestionPopup(label, truncated, infoPopup) {
+  if (label.length === 0) {
+    return void 0;
+  }
+  if (truncated) {
+    return () => /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(Text, { fontStyle: "code", as: "p", children: label }),
+      infoPopup ?? null
+    ] });
+  }
+  return infoPopup;
+}
+const createSuggestionAutocompletion = (cache) => async (context) => {
   if (context.matchBefore(/[^\w.]/) && !context.explicit) {
     return null;
   }
   const autocompleteContent = context.state.doc.slice(0, context.pos).toString();
-  const pattern = getMatchPattern(autocompleteContent);
+  const { rawCapture, trimmedCapture: pattern } = extractWordToken(autocompleteContent);
   const infoSuggestions = await getSuggestions(
-    getRequestString(autocompleteContent, pattern.length, 0)
+    getRequestString(autocompleteContent, pattern.length, 0),
+    void 0,
+    void 0,
+    cache
   );
   let filteredSuggestions = await getFilteredSuggestions(
     autocompleteContent,
     pattern.length,
-    pattern.length <= 1
+    pattern.length <= 1 || getIsTypingUnitAlias(rawCapture, pattern) || pattern.endsWith("."),
+    cache
   );
   if (filteredSuggestions.length === 0) {
     if (pattern.length > 1) {
       filteredSuggestions = await getFilteredSuggestions(
         autocompleteContent,
         pattern.length,
-        true
+        true,
+        cache
       );
     }
   }
@@ -115,12 +144,9 @@ const suggestionAutocompletion = async (context) => {
   const section = infoSuggestions.filter((suggestion) => !suggestion.suggestion).flatMap((suggestion) => suggestion.parts.map((part) => part.info)).filter((text) => !!text).join(" ");
   return {
     suggestions: filteredSuggestions.map((suggestion) => {
-      const hasInfo2 = suggestion.parts.some((part) => !!part.info);
       const shouldBeTruncated = labelShouldBeTruncated(suggestion.suggestion);
       const middleEllipsisText = shouldBeTruncated ? convertToMiddleEllipsis(suggestion.suggestion) : suggestion.suggestion;
-      const infoPopup = hasInfo2 ? () => {
-        return /* @__PURE__ */ jsx(Flex, { flexDirection: "column", gap: 16, children: suggestion.parts.filter((part) => !!part.info).map((part) => /* @__PURE__ */ jsx(SuggestionPart, { suggestionPart: part }, part.info)) });
-      } : void 0;
+      const infoPopup = buildSuggestionInfoPopup(suggestion);
       return {
         ...suggestion,
         label: middleEllipsisText,
@@ -138,10 +164,11 @@ const suggestionAutocompletion = async (context) => {
             userEvent: "input.complete"
           });
         },
-        popup: shouldBeTruncated ? () => /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx(Text, { fontStyle: "code", as: "p", children: suggestion.suggestion }),
-          infoPopup ?? null
-        ] }) : infoPopup
+        popup: buildSuggestionPopup(
+          suggestion.suggestion,
+          shouldBeTruncated,
+          infoPopup
+        )
       };
     }),
     from: autocompletePos,
@@ -164,6 +191,6 @@ const suggestionAutocompletion = async (context) => {
   };
 };
 export {
-  suggestionAutocompletion
+  createSuggestionAutocompletion
 };
 //# sourceMappingURL=suggestion-autocompletions.js.map