Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 2 additions & 8 deletions packages/mongodb-ts-autocomplete/scripts/extract-types.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
/* eslint-disable no-console */
import { promises as fs } from 'fs';
import path from 'path';
import { api as ShellApiText } from '@mongosh/shell-api/api';

function replaceImports(code: string) {
// This just makes it possible to work on mql.ts because then the
// IDE finds the import.
return code.replace(/'bson'/g, "'/bson.ts'");
}
import { replaceImports } from '../src/utils';

async function loadSources(sources: Record<string, string>) {
const result: Record<string, string> = {};
Expand All @@ -25,7 +19,6 @@ async function run() {
'/mql.ts': path.join(__dirname, '..', 'src', 'fixtures', 'mql.ts'),
};
const files = await loadSources(input);
files['/shell-api.ts'] = replaceImports(ShellApiText);
const code = `
const files = ${JSON.stringify(files)};
export default files;
Expand All @@ -38,6 +31,7 @@ export default files;
'fixtures',
'autocomplete-types.ts',
);
console.log(filepath);
await fs.writeFile(filepath, code, 'utf-8');
}

Expand Down
7 changes: 6 additions & 1 deletion packages/mongodb-ts-autocomplete/src/autocompleter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import Autocompleter from '@mongodb-js/ts-autocomplete';
import type { AutoCompletion } from '@mongodb-js/ts-autocomplete';
import autocompleteTypes from './fixtures/autocomplete-types';
import { api as ShellApiText } from '@mongosh/shell-api/api';
import { replaceImports } from './utils';

import type { JSONSchema } from 'mongodb-schema';
import { toTypescriptTypeDefinition } from 'mongodb-schema';
Expand Down Expand Up @@ -159,7 +161,10 @@ export class MongoDBAutocompleter {

this.connectionSchemas = Object.create(null);

this.autocompleter.updateCode(autocompleteTypes);
this.autocompleter.updateCode({
...autocompleteTypes,
'/shell-api.ts': replaceImports(ShellApiText),
});
}

addConnection(connectionId: string): ConnectionSchema {
Expand Down
5 changes: 5 additions & 0 deletions packages/mongodb-ts-autocomplete/src/utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export function replaceImports(code: string) {
// This just makes it possible to work on mql.ts because then the
// IDE finds the import.
return code.replace(/'bson'/g, "'/bson.ts'");
}