Perf: Convert keyword/operator arrays to Sets in Monarch tokenizer (fixes #582)#718
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
Updates autocomplete and UI/higlighting helpers to improve correctness and performance by generating valid aggregation field references, showing index counts in the tree, and speeding up Monarch cases lookups.
Changes:
- Emit
$getFieldaggregation references for field paths that contain non-identifier segments and add tests for unsafe names/escaping. - Cache index counts and surface them as the tree item description for “Indexes”.
- Add a lazy Set-based cache for Monarch named-array lookups to avoid repeated linear
.includes()scans.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/utils/json/data-api/autocomplete/toFieldCompletionItems.ts | Adds escaping + safe/unsafe detection and emits $getField for unsafe aggregation field references. |
| src/utils/json/data-api/autocomplete/toFieldCompletionItems.test.ts | Extends tests to cover $getField output and quote escaping. |
| src/tree/documentdb/IndexesItem.ts | Caches index count after loading and displays it in the tree item description. |
| src/documentdb/shell/highlighting/monarchRunner.ts | Introduces lazy Set caching for faster keyword/operator lookups in cases. |
…ixes microsoft#582) - Added lazy WeakMap<MonarchLanguageRules, Map<string, Set<string>>> cache - resolveCases now uses Set.has() (O(1)) instead of Array.includes() (O(n)) - Sets are created lazily on first access per rules object
tnaum-ms
force-pushed
the
fix/582-monarch-set-lookup
branch
from
e6f013f to
e85a7cd
Compare
sajeetharan
approved these changes
Jun 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #582
Summary
Converts keyword/operator array lookups in the Monarch tokenizer from O(n)
Array.includes()to O(1)Set.has()using a lazyWeakMap-based cache.Changes in
src/documentdb/shell/highlighting/monarchRunner.ts:rulesSetCache— aWeakMap<MonarchLanguageRules, Map<string, Set<string>>>that lazily converts named arrays (keywords,bsonConstructors,shellCommands,operators) to Sets on first accessresolveCases()now usesset?.has(matchedText)instead of(array as string[]).includes(matchedText)WeakMapkeyed by the rules object ensures cached Sets are garbage-collected when the rules reference is releasedTesting