Skip to content

fix(autocomplete): fix a semver check in old autocomplete #2499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lerouxb merged 6 commits into from
Jul 7, 2025
Merged

fix(autocomplete): fix a semver check in old autocomplete #2499

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e9d7b8
fix a semver check in old autocomplete
lerouxb Jul 7, 2025
43687f8
add a test
lerouxb Jul 7, 2025
6e41eb7
don't check the results
lerouxb Jul 7, 2025
d7688e4
print the whole error
lerouxb Jul 7, 2025
688553c
wait longer
lerouxb Jul 7, 2025
677f388
too much
lerouxb Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 161 additions & 0 deletions packages/autocomplete/src/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,167 @@ describe('completer.completer', function () {
});

context('when context is aggregation query', function () {
it('returns all suggestions', async function () {
const i = 'db.shipwrecks.aggregate([{';
expect(await completer(standalone440, i)).to.deep.equal([
[
'db.shipwrecks.aggregate([{$abs',
'db.shipwrecks.aggregate([{$accumulator',
'db.shipwrecks.aggregate([{$add',
'db.shipwrecks.aggregate([{$allElementsTrue',
'db.shipwrecks.aggregate([{$and',
'db.shipwrecks.aggregate([{$anyElementTrue',
'db.shipwrecks.aggregate([{$arrayElemAt',
'db.shipwrecks.aggregate([{$arrayToObject',
'db.shipwrecks.aggregate([{$binarySize',
'db.shipwrecks.aggregate([{$bsonSize',
'db.shipwrecks.aggregate([{$ceil',
'db.shipwrecks.aggregate([{$cmp',
'db.shipwrecks.aggregate([{$concat',
'db.shipwrecks.aggregate([{$concatArrays',
'db.shipwrecks.aggregate([{$cond',
'db.shipwrecks.aggregate([{$dateFromParts',
'db.shipwrecks.aggregate([{$dateFromString',
'db.shipwrecks.aggregate([{$dateToParts',
'db.shipwrecks.aggregate([{$dateToString',
'db.shipwrecks.aggregate([{$dayOfMonth',
'db.shipwrecks.aggregate([{$dayOfWeek',
'db.shipwrecks.aggregate([{$dayOfYear',
'db.shipwrecks.aggregate([{$dateToString',
'db.shipwrecks.aggregate([{$divide',
'db.shipwrecks.aggregate([{$eq',
'db.shipwrecks.aggregate([{$exp',
'db.shipwrecks.aggregate([{$filter',
'db.shipwrecks.aggregate([{$first',
'db.shipwrecks.aggregate([{$floor',
'db.shipwrecks.aggregate([{$function',
'db.shipwrecks.aggregate([{$gt',
'db.shipwrecks.aggregate([{$gte',
'db.shipwrecks.aggregate([{$hour',
'db.shipwrecks.aggregate([{$ifNull',
'db.shipwrecks.aggregate([{$in',
'db.shipwrecks.aggregate([{$indexOfArray',
'db.shipwrecks.aggregate([{$indexOfBytes',
'db.shipwrecks.aggregate([{$indexOfCP',
'db.shipwrecks.aggregate([{$isArray',
'db.shipwrecks.aggregate([{$isNumber',
'db.shipwrecks.aggregate([{$isoDayOfWeek',
'db.shipwrecks.aggregate([{$isoWeek',
'db.shipwrecks.aggregate([{$isoWeekYear',
'db.shipwrecks.aggregate([{$last',
'db.shipwrecks.aggregate([{$let',
'db.shipwrecks.aggregate([{$literal',
'db.shipwrecks.aggregate([{$lt',
'db.shipwrecks.aggregate([{$lt',
'db.shipwrecks.aggregate([{$ln',
'db.shipwrecks.aggregate([{$log',
'db.shipwrecks.aggregate([{$log10',
'db.shipwrecks.aggregate([{$map',
'db.shipwrecks.aggregate([{$mergeObjects',
'db.shipwrecks.aggregate([{$meta',
'db.shipwrecks.aggregate([{$millisecond',
'db.shipwrecks.aggregate([{$minute',
'db.shipwrecks.aggregate([{$mod',
'db.shipwrecks.aggregate([{$month',
'db.shipwrecks.aggregate([{$multiply',
'db.shipwrecks.aggregate([{$new',
'db.shipwrecks.aggregate([{$not',
'db.shipwrecks.aggregate([{$objectToArray',
'db.shipwrecks.aggregate([{$or',
'db.shipwrecks.aggregate([{$pow',
'db.shipwrecks.aggregate([{$range',
'db.shipwrecks.aggregate([{$reduce',
'db.shipwrecks.aggregate([{$regexFind',
'db.shipwrecks.aggregate([{$regexFindAll',
'db.shipwrecks.aggregate([{$regexMatch',
'db.shipwrecks.aggregate([{$replaceAll',
'db.shipwrecks.aggregate([{$replaceOne',
'db.shipwrecks.aggregate([{$reverseArray',
'db.shipwrecks.aggregate([{$second',
'db.shipwrecks.aggregate([{$setDifference',
'db.shipwrecks.aggregate([{$setEquals',
'db.shipwrecks.aggregate([{$setIntersection',
'db.shipwrecks.aggregate([{$setIsSubset',
'db.shipwrecks.aggregate([{$setUnion',
'db.shipwrecks.aggregate([{$size',
'db.shipwrecks.aggregate([{$slice',
'db.shipwrecks.aggregate([{$split',
'db.shipwrecks.aggregate([{$sqrt',
'db.shipwrecks.aggregate([{$strcasecmp',
'db.shipwrecks.aggregate([{$strLenBytes',
'db.shipwrecks.aggregate([{$strLenCP',
'db.shipwrecks.aggregate([{$substr',
'db.shipwrecks.aggregate([{$substrBytes',
'db.shipwrecks.aggregate([{$substrCP',
'db.shipwrecks.aggregate([{$subtract',
'db.shipwrecks.aggregate([{$switch',
'db.shipwrecks.aggregate([{$toHashedIndexKey',
'db.shipwrecks.aggregate([{$toLower',
'db.shipwrecks.aggregate([{$toUpper',
'db.shipwrecks.aggregate([{$trunc',
'db.shipwrecks.aggregate([{$type',
'db.shipwrecks.aggregate([{$week',
'db.shipwrecks.aggregate([{$year',
'db.shipwrecks.aggregate([{$zip',
'db.shipwrecks.aggregate([{$convert',
'db.shipwrecks.aggregate([{$ltrim',
'db.shipwrecks.aggregate([{$rtrim',
'db.shipwrecks.aggregate([{$toBool',
'db.shipwrecks.aggregate([{$toDate',
'db.shipwrecks.aggregate([{$toDecimal',
'db.shipwrecks.aggregate([{$toDouble',
'db.shipwrecks.aggregate([{$toInt',
'db.shipwrecks.aggregate([{$toLong',
'db.shipwrecks.aggregate([{$toObjectId',
'db.shipwrecks.aggregate([{$toString',
'db.shipwrecks.aggregate([{$trim',
'db.shipwrecks.aggregate([{Code',
'db.shipwrecks.aggregate([{ObjectId',
'db.shipwrecks.aggregate([{Binary',
'db.shipwrecks.aggregate([{DBRef',
'db.shipwrecks.aggregate([{Timestamp',
'db.shipwrecks.aggregate([{NumberInt',
'db.shipwrecks.aggregate([{NumberLong',
'db.shipwrecks.aggregate([{NumberDecimal',
'db.shipwrecks.aggregate([{MaxKey',
'db.shipwrecks.aggregate([{MinKey',
'db.shipwrecks.aggregate([{ISODate',
'db.shipwrecks.aggregate([{RegExp',
'db.shipwrecks.aggregate([{$addFields',
'db.shipwrecks.aggregate([{$bucket',
'db.shipwrecks.aggregate([{$bucketAuto',
'db.shipwrecks.aggregate([{$changeStream',
'db.shipwrecks.aggregate([{$collStats',
'db.shipwrecks.aggregate([{$count',
'db.shipwrecks.aggregate([{$currentOp',
'db.shipwrecks.aggregate([{$facet',
'db.shipwrecks.aggregate([{$geoNear',
'db.shipwrecks.aggregate([{$graphLookup',
'db.shipwrecks.aggregate([{$group',
'db.shipwrecks.aggregate([{$indexStats',
'db.shipwrecks.aggregate([{$limit',
'db.shipwrecks.aggregate([{$listLocalSessions',
'db.shipwrecks.aggregate([{$lookup',
'db.shipwrecks.aggregate([{$match',
'db.shipwrecks.aggregate([{$merge',
'db.shipwrecks.aggregate([{$out',
'db.shipwrecks.aggregate([{$project',
'db.shipwrecks.aggregate([{$redact',
'db.shipwrecks.aggregate([{$replaceRoot',
'db.shipwrecks.aggregate([{$replaceWith',
'db.shipwrecks.aggregate([{$sample',
'db.shipwrecks.aggregate([{$set',
'db.shipwrecks.aggregate([{$skip',
'db.shipwrecks.aggregate([{$sort',
'db.shipwrecks.aggregate([{$sortByCount',
'db.shipwrecks.aggregate([{$unionWith',
'db.shipwrecks.aggregate([{$unset',
'db.shipwrecks.aggregate([{$unwind',
Copy link
Collaborator

@addaleax addaleax Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this test error before? I think we could just verify that it doesn't throw, rather than asserting against the full list, since this list probably changes over time (while the old autocompleter exists, at least)

Copy link
Contributor Author

@lerouxb lerouxb Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on server 4.4, though? I suppose I can change it.

],
i,
]);
});

it('has several matches', async function () {
const i = 'db.shipwrecks.aggregate([ { $so';
expect(await completer(standalone440, i)).to.deep.equal([
Expand Down
11 changes: 10 additions & 1 deletion packages/autocomplete/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,12 @@ export async function completer(
return [[], line];
}

// from https://github.com/mongodb-js/devtools-shared/commit/e4a5b00a83b19a76bdf380799a421511230168db
function satisfiesVersion(v1: string, v2: string): boolean {
const isGTECheck = /^\d+?\.\d+?\.\d+?$/.test(v2);
return semver.satisfies(v1, isGTECheck ? `>=${v2}` : v2);
Comment on lines +295 to +296
Copy link

Copilot AI Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than a custom regex, consider using semver.valid(v2) to detect exact version strings, which will handle pre-release and build metadata more robustly.

Suggested change
const isGTECheck = /^\d+?\.\d+?\.\d+?$/.test(v2);
return semver.satisfies(v1, isGTECheck ? `>=${v2}` : v2);
const isValidVersion = semver.valid(v2);
return isValidVersion && semver.satisfies(v1, isValidVersion.startsWith('>=') ? v2 : `>=${v2}`);

Copilot uses AI. Check for mistakes.
}

function isAcceptable(
params: AutocompleteParameters,
entry: {
Expand All @@ -310,7 +316,10 @@ function isAcceptable(
!entry[versionKey] ||
// TODO: when https://jira.mongodb.org/browse/SPM-2327 is done we can rely on server_version being present
!connectionInfo?.server_version ||
semver.gte(connectionInfo.server_version, entry[versionKey] as string);
satisfiesVersion(
connectionInfo.server_version,
entry[versionKey] as string
);
}
const isAcceptableEnvironment =
!entry.env ||
Expand Down
Loading