-
Notifications
You must be signed in to change notification settings - Fork 70
feat: Shell API autocomplete type definitions MONGOSH-2031 MONGOSH-2032 MONGOSH-2173 #2434
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.
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
base: main
Are you sure you want to change the base?
Conversation
```sh cd packages/shell-api && \ npm run compile && \ npx api-extractor run ; \ npx ts-node bin/api-postprocess.ts ; \ cat lib/api-processed.d.ts ```
@@ -294,7 +294,7 @@ describe('completer.completer', function () { | |||
|
|||
it('returns all suggestions', async function () { | |||
const i = 'db.'; | |||
const attr = shellSignatures.Database.attributes as any; | |||
const attr = shellSignatures.DatabaseImpl.attributes as any; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fact that Database and Collection are now types and the classes got replaced with DatabaseImpl and CollectionImpl is having a lot of knock-on effects and kinda ended up being responsible for most of this diff.
I'm wondering if we should keep them as Database and Collection but then rather name the new types to be something like DatabaseWithSchema and CollectionWithSchema. Then maybe the change will be smaller?
Not sure which way around would work out better ergonomically overall.
"types": "./lib/index.d.ts" | ||
}, | ||
"./api": { | ||
"types": "./lib/api-processed.d.ts" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure what would be the best way to export/publish this and then reference it from the outside.
I think import type ShellApi from '@monogdb-js/shell-api/api'
works with this and I tried it manually from a file, but I'll see shortly when I plug this into mongodb-ts-autocomplete
InterruptFlag, | ||
}; | ||
|
||
// TODO: do we really want all these? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a reminder for myself to remove this TODO comment before merging and after bringing it up with the team.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I started looking into all the ae-forgotten-export errors, but in the end I made those warnings for now. It is kinda a lot and as you start adding them one by one their dependencies end up becoming errors..
I don't think we need this as the shell api, though - that warning/error is probably more useful for something that's used as a library.
it('calls help function', async function () { | ||
expect((await toShellResult(apiClass.help())).type).to.equal('Help'); | ||
expect((await toShellResult(apiClass.help)).type).to.equal('Help'); | ||
}); | ||
}); | ||
describe('signatures', function () { | ||
it('type', function () { | ||
expect(signatures.Collection.type).to.equal('Collection'); | ||
// TODO: do we want the signatures to be CollectionImpl or Collection? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a reminder for myself to remove this TODO comment before merging and after bringing it up with the team.
@@ -0,0 +1,102 @@ | |||
// TODO: does it make sense to have all this stuff? Don't we just need enough for the top-level API, ie. the globals? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a reminder for myself to remove this TODO comment before merging and after bringing it up with the team.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This would all become one big ShellAPI import in monogdb-ts-autocomplete where we set up the db, sh, rs, sp globals so we can reference things like ShellAPI.Database. But I suppose we can hide it by importing it as a type.
'Running "' + joinedCommand + '" in ' + args[2]?.cwd ?? process.cwd() | ||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment | ||
// @ts-ignore TS2869 Right operand of ?? is unreachable because the left operand is never nullish. | ||
`Running "${joinedCommand}" in ${args[2]?.cwd ?? process.cwd()}` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
drive-by. For some reason I got a compile error on this line in CI.
"@mongosh/service-provider-core", | ||
"@mongosh/types", | ||
"mongodb", | ||
"bson" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have bson set up in mongodb-ts-autocomplete, so I might remove it from here.
@@ -0,0 +1,44 @@ | |||
declare global { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file is basically a snippet that gets appended at the end of api-globals.d.ts after we api-extract that. See bin/api-postprocess.ts.
I first tried to write a babel plugin to walk the ShellAPI class's methods and the ShellBson interface's methods, but that turned out to be really complicated.
There is one benefit to having them all mapped here explicitly: We don't end up accidentally leaking everything on ShellAPI into the global scope whether we want to or not. And it is arguably handy seeing them all enumerated here.
The only other variables added as globals would be db, sh, sp and rs which all get specified dynamically by mongodb-ts-autocomplete so they reference the server/database/collection schema generics.
browserslistConfigFile: false, | ||
compact: false, | ||
sourceType: 'module', | ||
plugins: [applyAsyncRewriterChanges()], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We end up with these errors:
~/mongo/mongosh/packages/shell-api % npx tsc --lib es2019 --target es2018 --moduleResolution node --types node lib/api-processed.d.ts
lib/api-processed.d.ts:4412:3 - error TS2416: Property 'hasNext' in type 'Cursor' is not assignable to the same property in base type 'AggregateOrFindCursor<ServiceProviderFindCursor<Document_2>>'.
Type '() => boolean' is not assignable to type '() => Promise<boolean>'.
Type 'boolean' is not assignable to type 'Promise<boolean>'.
4412 hasNext(): boolean;
~~~~~~~
lib/api-processed.d.ts:4418:3 - error TS2416: Property 'next' in type 'Cursor' is not assignable to the same property in base type 'AggregateOrFindCursor<ServiceProviderFindCursor<Document_2>>'.
Type '() => Document_2' is not assignable to type '() => Promise<Document_2>'.
Type 'Document_2' is missing the following properties from type 'Promise<Document_2>': then, catch, finally, [Symbol.toStringTag]
4418 next(): Document_2 | null;
~~~~
Found 2 errors in the same file, starting at: lib/api-processed.d.ts:4412
Weirdly these seem to be the only two cases - if I revert those two return types manually then the file is all green.
The ts language service works around it as far as I can tell, so it doesn't impact autocomplete. If we did want to make the generated .ts valid we'll have to do something like modify the base type's methods' return types or somehow flatten the return type so that it doesn't inherit anymore?
Maybe there are other ideas.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wild idea: we can just add the comment
// @ts-expect-error The type of this function is not compatible with the type of the function in the base class
as part of the babel processing...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The reason I ultimately care about this is because it would be nice to have some smoke tests where we import this file and use it.
|
||
function getHelpClassName(className: string) { | ||
switch (className) { | ||
case 'CollectionImpl': |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I pointed this out below as well, but this is an example of the kind of fallout from renaming Collection to CollectionImpl and reusing the name for a type. And doing the same for Database.
Maybe this is OK but we could also consider leaving Collection and Database unchanged and then just having the types named something else like CollectionWithSchema and DatabaseWithSchema. Or whatever might be a better name.
This is a continuation of Anna's work here.
Implements:
Changes:
Notes: