From ebdd97574c743f1abd14ae1af01c0ea3afe0c42d Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Thu, 6 Mar 2025 12:26:52 +0000 Subject: [PATCH 1/8] add ts-autocomplete package --- package-lock.json | 72 +++++++ packages/ts-autocomplete/.depcheckrc | 8 + packages/ts-autocomplete/.eslintignore | 2 + packages/ts-autocomplete/.eslintrc.js | 8 + packages/ts-autocomplete/.mocharc.js | 1 + packages/ts-autocomplete/.prettierignore | 3 + packages/ts-autocomplete/.prettierrc.json | 1 + packages/ts-autocomplete/LICENSE | 201 ++++++++++++++++++++ packages/ts-autocomplete/package.json | 67 +++++++ packages/ts-autocomplete/src/index.spec.ts | 56 ++++++ packages/ts-autocomplete/src/index.ts | 106 +++++++++++ packages/ts-autocomplete/tsconfig-lint.json | 5 + packages/ts-autocomplete/tsconfig.json | 10 + 13 files changed, 540 insertions(+) create mode 100644 packages/ts-autocomplete/.depcheckrc create mode 100644 packages/ts-autocomplete/.eslintignore create mode 100644 packages/ts-autocomplete/.eslintrc.js create mode 100644 packages/ts-autocomplete/.mocharc.js create mode 100644 packages/ts-autocomplete/.prettierignore create mode 100644 packages/ts-autocomplete/.prettierrc.json create mode 100644 packages/ts-autocomplete/LICENSE create mode 100644 packages/ts-autocomplete/package.json create mode 100644 packages/ts-autocomplete/src/index.spec.ts create mode 100644 packages/ts-autocomplete/src/index.ts create mode 100644 packages/ts-autocomplete/tsconfig-lint.json create mode 100644 packages/ts-autocomplete/tsconfig.json diff --git a/package-lock.json b/package-lock.json index 76588448..68174e02 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5907,6 +5907,10 @@ "node": ">=0.10.0" } }, + "node_modules/@mongodb-js/ts-autocomplete": { + "resolved": "packages/ts-autocomplete", + "link": true + }, "node_modules/@mongodb-js/tsconfig-devtools": { "resolved": "configs/tsconfig-devtools", "link": true @@ -27918,6 +27922,44 @@ "node": ">=14.17" } }, + "packages/ts-autocomplete": { + "name": "@mongodb-js/ts-autocomplete", + "version": "0.1.0", + "license": "Apache-2.0", + "devDependencies": { + "@mongodb-js/eslint-config-devtools": "0.9.10", + "@mongodb-js/mocha-config-devtools": "^1.0.4", + "@mongodb-js/prettier-config-devtools": "^1.0.1", + "@mongodb-js/tsconfig-devtools": "^1.0.2", + "@types/chai": "^4.2.21", + "@types/mocha": "^9.1.1", + "@types/node": "^17.0.35", + "@types/sinon-chai": "^3.2.5", + "chai": "^4.3.6", + "depcheck": "^1.4.1", + "eslint": "^7.25.0", + "gen-esm-wrapper": "^1.1.1", + "mocha": "^8.4.0", + "nyc": "^15.1.0", + "prettier": "^2.3.2", + "sinon": "^9.2.3", + "typescript": "^5.0.4" + } + }, + "packages/ts-autocomplete/node_modules/typescript": { + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", + "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, "scripts": { "name": "@mongodb-js/devtools-scripts", "version": "0.2.16", @@ -33944,6 +33986,36 @@ "ip-address": "^9.0.5" } }, + "@mongodb-js/ts-autocomplete": { + "version": "file:packages/ts-autocomplete", + "requires": { + "@mongodb-js/eslint-config-devtools": "0.9.10", + "@mongodb-js/mocha-config-devtools": "^1.0.4", + "@mongodb-js/prettier-config-devtools": "^1.0.1", + "@mongodb-js/tsconfig-devtools": "^1.0.2", + "@types/chai": "^4.2.21", + "@types/mocha": "^9.1.1", + "@types/node": "^17.0.35", + "@types/sinon-chai": "^3.2.5", + "chai": "^4.3.6", + "depcheck": "^1.4.1", + "eslint": "^7.25.0", + "gen-esm-wrapper": "^1.1.1", + "mocha": "^8.4.0", + "nyc": "^15.1.0", + "prettier": "^2.3.2", + "sinon": "^9.2.3", + "typescript": "^5.0.4" + }, + "dependencies": { + "typescript": { + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", + "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", + "dev": true + } + } + }, "@mongodb-js/tsconfig-devtools": { "version": "file:configs/tsconfig-devtools", "requires": { diff --git a/packages/ts-autocomplete/.depcheckrc b/packages/ts-autocomplete/.depcheckrc new file mode 100644 index 00000000..48bf9af6 --- /dev/null +++ b/packages/ts-autocomplete/.depcheckrc @@ -0,0 +1,8 @@ +ignores: + - '@mongodb-js/prettier-config-devtools' + - '@mongodb-js/tsconfig-devtools' + - '@types/chai' + - '@types/sinon-chai' + - 'sinon' +ignore-patterns: + - 'dist' diff --git a/packages/ts-autocomplete/.eslintignore b/packages/ts-autocomplete/.eslintignore new file mode 100644 index 00000000..85a8a75e --- /dev/null +++ b/packages/ts-autocomplete/.eslintignore @@ -0,0 +1,2 @@ +.nyc-output +dist diff --git a/packages/ts-autocomplete/.eslintrc.js b/packages/ts-autocomplete/.eslintrc.js new file mode 100644 index 00000000..83296d73 --- /dev/null +++ b/packages/ts-autocomplete/.eslintrc.js @@ -0,0 +1,8 @@ +module.exports = { + root: true, + extends: ['@mongodb-js/eslint-config-devtools'], + parserOptions: { + tsconfigRootDir: __dirname, + project: ['./tsconfig-lint.json'], + }, +}; diff --git a/packages/ts-autocomplete/.mocharc.js b/packages/ts-autocomplete/.mocharc.js new file mode 100644 index 00000000..64afeb1f --- /dev/null +++ b/packages/ts-autocomplete/.mocharc.js @@ -0,0 +1 @@ +module.exports = require('@mongodb-js/mocha-config-devtools'); diff --git a/packages/ts-autocomplete/.prettierignore b/packages/ts-autocomplete/.prettierignore new file mode 100644 index 00000000..4d28df66 --- /dev/null +++ b/packages/ts-autocomplete/.prettierignore @@ -0,0 +1,3 @@ +.nyc_output +dist +coverage diff --git a/packages/ts-autocomplete/.prettierrc.json b/packages/ts-autocomplete/.prettierrc.json new file mode 100644 index 00000000..dfae21d0 --- /dev/null +++ b/packages/ts-autocomplete/.prettierrc.json @@ -0,0 +1 @@ +"@mongodb-js/prettier-config-devtools" diff --git a/packages/ts-autocomplete/LICENSE b/packages/ts-autocomplete/LICENSE new file mode 100644 index 00000000..5e0fd33c --- /dev/null +++ b/packages/ts-autocomplete/LICENSE @@ -0,0 +1,201 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, +and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by +the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all +other entities that control, are controlled by, or are under common +control with that entity. For the purposes of this definition, +"control" means (i) the power, direct or indirect, to cause the +direction or management of such entity, whether by contract or +otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity +exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation +source, and configuration files. + +"Object" form shall mean any form resulting from mechanical +transformation or translation of a Source form, including but +not limited to compiled object code, generated documentation, +and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or +Object form, made available under the License, as indicated by a +copyright notice that is included in or attached to the work +(an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object +form, that is based on (or derived from) the Work and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. For the purposes +of this License, Derivative Works shall not include works that remain +separable from, or merely link (or bind by name) to the interfaces of, +the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including +the original version of the Work and any modifications or additions +to that Work or Derivative Works thereof, that is intentionally +submitted to Licensor for inclusion in the Work by the copyright owner +or by an individual or Legal Entity authorized to submit on behalf of +the copyright owner. For the purposes of this definition, "submitted" +means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, +and issue tracking systems that are managed by, or on behalf of, the +Licensor for the purpose of discussing and improving the Work, but +excluding communication that is conspicuously marked or otherwise +designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity +on behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the +Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, +use, offer to sell, sell, import, and otherwise transfer the Work, +where such license applies only to those patent claims licensable +by such Contributor that are necessarily infringed by their +Contribution(s) alone or by combination of their Contribution(s) +with the Work to which such Contribution(s) was submitted. If You +institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work +or a Contribution incorporated within the Work constitutes direct +or contributory patent infringement, then any patent licenses +granted to You under this License for that Work shall terminate +as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the +Work or Derivative Works thereof in any medium, with or without +modifications, and in Source or Object form, provided that You +meet the following conditions: + +(a) You must give any other recipients of the Work or +Derivative Works a copy of this License; and + +(b) You must cause any modified files to carry prominent notices +stating that You changed the files; and + +(c) You must retain, in the Source form of any Derivative Works +that You distribute, all copyright, patent, trademark, and +attribution notices from the Source form of the Work, +excluding those notices that do not pertain to any part of +the Derivative Works; and + +(d) If the Work includes a "NOTICE" text file as part of its +distribution, then any Derivative Works that You distribute must +include a readable copy of the attribution notices contained +within such NOTICE file, excluding those notices that do not +pertain to any part of the Derivative Works, in at least one +of the following places: within a NOTICE text file distributed +as part of the Derivative Works; within the Source form or +documentation, if provided along with the Derivative Works; or, +within a display generated by the Derivative Works, if and +wherever such third-party notices normally appear. The contents +of the NOTICE file are for informational purposes only and +do not modify the License. You may add Your own attribution +notices within Derivative Works that You distribute, alongside +or as an addendum to the NOTICE text from the Work, provided +that such additional attribution notices cannot be construed +as modifying the License. + +You may add Your own copyright statement to Your modifications and +may provide additional or different license terms and conditions +for use, reproduction, or distribution of Your modifications, or +for any such Derivative Works as a whole, provided Your use, +reproduction, and distribution of the Work otherwise complies with +the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, +any Contribution intentionally submitted for inclusion in the Work +by You to the Licensor shall be under the terms and conditions of +this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify +the terms of any separate license agreement you may have executed +with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade +names, trademarks, service marks, or product names of the Licensor, +except as required for reasonable and customary use in describing the +origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or +agreed to in writing, Licensor provides the Work (and each +Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied, including, without limitation, any warranties or conditions +of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A +PARTICULAR PURPOSE. You are solely responsible for determining the +appropriateness of using or redistributing the Work and assume any +risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, +whether in tort (including negligence), contract, or otherwise, +unless required by applicable law (such as deliberate and grossly +negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a +result of this License or out of the use or inability to use the +Work (including but not limited to damages for loss of goodwill, +work stoppage, computer failure or malfunction, or any and all +other commercial damages or losses), even if such Contributor +has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing +the Work or Derivative Works thereof, You may choose to offer, +and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this +License. However, in accepting such obligations, You may act only +on Your own behalf and on Your sole responsibility, not on behalf +of any other Contributor, and only if You agree to indemnify, +defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason +of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following +boilerplate notice, with the fields enclosed by brackets "{}" +replaced with your own identifying information. (Don't include +the brackets!) The text should be enclosed in the appropriate +comment syntax for the file format. We also recommend that a +file or class name and description of purpose be included on the +same "printed page" as the copyright notice for easier +identification within third-party archives. + +Copyright {yyyy} {name of copyright owner} + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/packages/ts-autocomplete/package.json b/packages/ts-autocomplete/package.json new file mode 100644 index 00000000..ae7926ab --- /dev/null +++ b/packages/ts-autocomplete/package.json @@ -0,0 +1,67 @@ +{ + "name": "@mongodb-js/ts-autocomplete", + "description": "Provide auto-completion for a string using typescript types", + "author": { + "name": "MongoDB Inc", + "email": "compass@mongodb.com" + }, + "publishConfig": { + "access": "public" + }, + "bugs": { + "url": "https://jira.mongodb.org/projects/COMPASS/issues", + "email": "compass@mongodb.com" + }, + "homepage": "https://github.com/mongodb-js/devtools-shared", + "version": "0.1.0", + "repository": { + "type": "git", + "url": "https://github.com/mongodb-js/devtools-shared.git" + }, + "files": [ + "dist" + ], + "license": "Apache-2.0", + "main": "dist/index.js", + "exports": { + "require": "./dist/index.js", + "import": "./dist/.esm-wrapper.mjs" + }, + "types": "./dist/index.d.ts", + "scripts": { + "bootstrap": "npm run compile", + "prepublishOnly": "npm run compile", + "compile": "tsc -p tsconfig.json && gen-esm-wrapper . ./dist/.esm-wrapper.mjs", + "typecheck": "tsc --noEmit", + "eslint": "eslint", + "prettier": "prettier", + "lint": "npm run eslint . && npm run prettier -- --check .", + "depcheck": "depcheck", + "check": "npm run typecheck && npm run lint && npm run depcheck", + "check-ci": "npm run check", + "test": "mocha", + "test-cov": "nyc -x \"**/*.spec.*\" --reporter=lcov --reporter=text --reporter=html npm run test", + "test-watch": "npm run test -- --watch", + "test-ci": "npm run test-cov", + "reformat": "npm run prettier -- --write ." + }, + "devDependencies": { + "@mongodb-js/eslint-config-devtools": "0.9.10", + "@mongodb-js/mocha-config-devtools": "^1.0.4", + "@mongodb-js/prettier-config-devtools": "^1.0.1", + "@mongodb-js/tsconfig-devtools": "^1.0.2", + "@types/chai": "^4.2.21", + "@types/mocha": "^9.1.1", + "@types/node": "^17.0.35", + "@types/sinon-chai": "^3.2.5", + "chai": "^4.3.6", + "depcheck": "^1.4.1", + "eslint": "^7.25.0", + "gen-esm-wrapper": "^1.1.1", + "mocha": "^8.4.0", + "nyc": "^15.1.0", + "prettier": "^2.3.2", + "sinon": "^9.2.3", + "typescript": "^5.0.4" + } +} diff --git a/packages/ts-autocomplete/src/index.spec.ts b/packages/ts-autocomplete/src/index.spec.ts new file mode 100644 index 00000000..602d5705 --- /dev/null +++ b/packages/ts-autocomplete/src/index.spec.ts @@ -0,0 +1,56 @@ +import Autocompleter from './index'; +import { expect } from 'chai'; + +describe('Autocompleter', function () { + let autoCompleter: Autocompleter; + + beforeEach(function () { + autoCompleter = new Autocompleter(); + }); + + it('returns nothing when it has no code', function () { + expect(autoCompleter.autocomplete('foo')).to.deep.equal([]); + expect(autoCompleter.autocomplete('foo', 0)).to.deep.equal([]); + expect(autoCompleter.autocomplete('foo', 1)).to.deep.equal([]); + }); + + it('returns completions when it knows of some code', function () { + autoCompleter.updateCode({ + 'foo.ts': ` +export type Foo = { + a: string, + bb: function (p1: number) {} +}; + + declare global { + declare var foo: Foo; + } + `, + }); + + expect(autoCompleter.autocomplete('foo')).to.deep.equal([]); + expect(autoCompleter.autocomplete('foo.')).to.deep.equal([ + { kind: 'property', name: 'a', type: 'string' }, + { kind: 'property', name: 'bb', type: 'function (p1: number)' }, + ]); + + expect(autoCompleter.autocomplete('foo.', 0)).to.deep.equal([]); + expect(autoCompleter.autocomplete('foo.', 1)).to.deep.equal([]); + expect(autoCompleter.autocomplete('foo.', 2)).to.deep.equal([]); + expect(autoCompleter.autocomplete('foo.', 3)).to.deep.equal([]); + + // TODO: is this expected? + expect(autoCompleter.autocomplete('fo')).to.deep.equal([]); + + // TODO: is this expected? + expect(autoCompleter.autocomplete('foo.b')).to.deep.equal([ + { kind: 'property', name: 'a', type: 'string' }, + { kind: 'property', name: 'bb', type: 'function (p1: number)' }, + ]); + + expect(autoCompleter.autocomplete('foo.bar', 4)).to.deep.equal([ + { kind: 'property', name: 'a', type: 'string' }, + { kind: 'property', name: 'bb', type: 'function (p1: number)' }, + ]); + }); +}); diff --git a/packages/ts-autocomplete/src/index.ts b/packages/ts-autocomplete/src/index.ts new file mode 100644 index 00000000..3150d222 --- /dev/null +++ b/packages/ts-autocomplete/src/index.ts @@ -0,0 +1,106 @@ +import * as ts from 'typescript'; + +type TypeFilename = string; + +type UpdateDefinitionFunction = (newDef: Record) => void; + +function getVirtualLanguageService(): [ + ts.LanguageService, + UpdateDefinitionFunction +] { + const codeHolder: Record = Object.create(null); + const versions: Record = Object.create(null); + const options: ts.CompilerOptions = { + target: ts.ScriptTarget.ES2022, + allowJs: true, + }; + + const updateCode = (newDef: Record) => { + for (const [key, value] of Object.entries(newDef)) { + codeHolder[key] = value; + versions[key] = (versions[key] ?? 1) + 1; + } + }; + + const servicesHost: ts.LanguageServiceHost = { + getScriptFileNames: () => Object.keys(codeHolder), + getScriptVersion: (fileName) => (versions[fileName] ?? 1).toString(), + getScriptSnapshot: (fileName) => { + if (fileName in codeHolder) { + return ts.ScriptSnapshot.fromString(codeHolder[fileName]); + } + + return ts.ScriptSnapshot.fromString(ts.sys.readFile(fileName) || ''); + }, + getCurrentDirectory: () => process.cwd(), + getCompilationSettings: () => options, + getDefaultLibFileName: (options) => ts.getDefaultLibFilePath(options), + fileExists: (fileName) => + fileName in codeHolder || ts.sys.fileExists(fileName), + readFile: (fileName) => { + if (fileName in codeHolder) { + return codeHolder[fileName]; + } + return ts.sys.readFile(fileName); + }, + readDirectory: (...args) => ts.sys.readDirectory(...args), + directoryExists: (...args) => ts.sys.directoryExists(...args), + getDirectories: (...args) => ts.sys.getDirectories(...args), + }; + + return [ + ts.createLanguageService(servicesHost, ts.createDocumentRegistry()), + updateCode, + ]; +} + +function mapCompletions(completions: ts.CompletionInfo) { + return completions.entries.map((entry) => { + const declarations = entry.symbol?.getDeclarations(); + let type = 'any'; + if (declarations && declarations[0]) { + const decl = declarations[0]; + type = decl.getChildAt(2)?.getFullText()?.trim() ?? 'any'; + } + + return { + name: entry.name, + kind: entry.kind, + type, + }; + }); +} + +export default class Autocompleter { + private readonly languageService: ts.LanguageService; + readonly updateCode: UpdateDefinitionFunction; + + constructor() { + [this.languageService, this.updateCode] = getVirtualLanguageService(); + } + + autocomplete(code: string, position?: number) { + if (typeof position === 'undefined') { + position = code.length; + } + + this.updateCode({ + 'main.ts': code, + }); + + const completions = this.languageService.getCompletionsAtPosition( + 'main.ts', + position, + { + allowIncompleteCompletions: true, + includeSymbol: true, + } + ); + + if (completions?.isMemberCompletion) { + return mapCompletions(completions); + } + + return []; + } +} diff --git a/packages/ts-autocomplete/tsconfig-lint.json b/packages/ts-autocomplete/tsconfig-lint.json new file mode 100644 index 00000000..6bdef84f --- /dev/null +++ b/packages/ts-autocomplete/tsconfig-lint.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["**/*"], + "exclude": ["node_modules", "dist"] +} diff --git a/packages/ts-autocomplete/tsconfig.json b/packages/ts-autocomplete/tsconfig.json new file mode 100644 index 00000000..156674a5 --- /dev/null +++ b/packages/ts-autocomplete/tsconfig.json @@ -0,0 +1,10 @@ +{ + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", + "compilerOptions": { + "outDir": "dist", + "allowJs": true, + "strict": true + }, + "include": ["src/**/*"], + "exclude": ["./src/**/*.spec.*"] +} From e07d7881687b0922484f044e4998be146556fb1d Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Thu, 6 Mar 2025 12:35:01 +0000 Subject: [PATCH 2/8] unused dep --- packages/ts-autocomplete/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/ts-autocomplete/package.json b/packages/ts-autocomplete/package.json index ae7926ab..1201f453 100644 --- a/packages/ts-autocomplete/package.json +++ b/packages/ts-autocomplete/package.json @@ -52,7 +52,6 @@ "@mongodb-js/tsconfig-devtools": "^1.0.2", "@types/chai": "^4.2.21", "@types/mocha": "^9.1.1", - "@types/node": "^17.0.35", "@types/sinon-chai": "^3.2.5", "chai": "^4.3.6", "depcheck": "^1.4.1", From 6a05d4b11479ef266a6df813c6fc532f30ce2ea3 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Thu, 6 Mar 2025 14:48:12 +0000 Subject: [PATCH 3/8] Update packages/ts-autocomplete/src/index.ts Co-authored-by: Anna Henningsen --- packages/ts-autocomplete/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ts-autocomplete/src/index.ts b/packages/ts-autocomplete/src/index.ts index 3150d222..9a515ca6 100644 --- a/packages/ts-autocomplete/src/index.ts +++ b/packages/ts-autocomplete/src/index.ts @@ -58,7 +58,7 @@ function mapCompletions(completions: ts.CompletionInfo) { return completions.entries.map((entry) => { const declarations = entry.symbol?.getDeclarations(); let type = 'any'; - if (declarations && declarations[0]) { + if (declarations?.[0]) { const decl = declarations[0]; type = decl.getChildAt(2)?.getFullText()?.trim() ?? 'any'; } From e36df0d1f77aa405576cee5f3e67adc1744d9cfa Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Thu, 6 Mar 2025 15:06:55 +0000 Subject: [PATCH 4/8] add return types --- packages/ts-autocomplete/src/index.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/ts-autocomplete/src/index.ts b/packages/ts-autocomplete/src/index.ts index 9a515ca6..1d3c5caf 100644 --- a/packages/ts-autocomplete/src/index.ts +++ b/packages/ts-autocomplete/src/index.ts @@ -15,7 +15,7 @@ function getVirtualLanguageService(): [ allowJs: true, }; - const updateCode = (newDef: Record) => { + const updateCode = (newDef: Record): void => { for (const [key, value] of Object.entries(newDef)) { codeHolder[key] = value; versions[key] = (versions[key] ?? 1) + 1; @@ -54,7 +54,13 @@ function getVirtualLanguageService(): [ ]; } -function mapCompletions(completions: ts.CompletionInfo) { +type AutoCompletion = { + name: string; + kind: ts.ScriptElementKind; + type: string; +}; + +function mapCompletions(completions: ts.CompletionInfo): AutoCompletion[] { return completions.entries.map((entry) => { const declarations = entry.symbol?.getDeclarations(); let type = 'any'; @@ -79,7 +85,7 @@ export default class Autocompleter { [this.languageService, this.updateCode] = getVirtualLanguageService(); } - autocomplete(code: string, position?: number) { + autocomplete(code: string, position?: number): AutoCompletion[] { if (typeof position === 'undefined') { position = code.length; } From 62426f08f2532d4a07f64a4f9db7c7255a780242 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Fri, 7 Mar 2025 15:12:03 +0000 Subject: [PATCH 5/8] realising we need declare global --- package-lock.json | 4 +- packages/ts-autocomplete/package.json | 1 + packages/ts-autocomplete/src/index.spec.ts | 58 +++++++++++++++------- packages/ts-autocomplete/src/index.ts | 37 ++++++++++++-- 4 files changed, 75 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 68174e02..8bff90a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27933,9 +27933,9 @@ "@mongodb-js/tsconfig-devtools": "^1.0.2", "@types/chai": "^4.2.21", "@types/mocha": "^9.1.1", - "@types/node": "^17.0.35", "@types/sinon-chai": "^3.2.5", "chai": "^4.3.6", + "debug": "^4.3.6", "depcheck": "^1.4.1", "eslint": "^7.25.0", "gen-esm-wrapper": "^1.1.1", @@ -33995,9 +33995,9 @@ "@mongodb-js/tsconfig-devtools": "^1.0.2", "@types/chai": "^4.2.21", "@types/mocha": "^9.1.1", - "@types/node": "^17.0.35", "@types/sinon-chai": "^3.2.5", "chai": "^4.3.6", + "debug": "^4.3.6", "depcheck": "^1.4.1", "eslint": "^7.25.0", "gen-esm-wrapper": "^1.1.1", diff --git a/packages/ts-autocomplete/package.json b/packages/ts-autocomplete/package.json index 1201f453..049e3490 100644 --- a/packages/ts-autocomplete/package.json +++ b/packages/ts-autocomplete/package.json @@ -54,6 +54,7 @@ "@types/mocha": "^9.1.1", "@types/sinon-chai": "^3.2.5", "chai": "^4.3.6", + "debug": "^4.3.6", "depcheck": "^1.4.1", "eslint": "^7.25.0", "gen-esm-wrapper": "^1.1.1", diff --git a/packages/ts-autocomplete/src/index.spec.ts b/packages/ts-autocomplete/src/index.spec.ts index 602d5705..d7beaf73 100644 --- a/packages/ts-autocomplete/src/index.spec.ts +++ b/packages/ts-autocomplete/src/index.spec.ts @@ -1,6 +1,21 @@ import Autocompleter from './index'; import { expect } from 'chai'; +const FOO_TS = ` + +export type Foo = { + a: string, + bb: (p1: number) => void +}; + +export type Params = { param1: string, param2: string }; + +declare global { + declare var foo: Foo; + export function bar(params: Params): void {}; +} +`; + describe('Autocompleter', function () { let autoCompleter: Autocompleter; @@ -12,26 +27,18 @@ describe('Autocompleter', function () { expect(autoCompleter.autocomplete('foo')).to.deep.equal([]); expect(autoCompleter.autocomplete('foo', 0)).to.deep.equal([]); expect(autoCompleter.autocomplete('foo', 1)).to.deep.equal([]); + expect(autoCompleter.autocomplete('foo.')).to.deep.equal([]); }); - it('returns completions when it knows of some code', function () { + it('returns completions for members of global variables', function () { autoCompleter.updateCode({ - 'foo.ts': ` -export type Foo = { - a: string, - bb: function (p1: number) {} -}; - - declare global { - declare var foo: Foo; - } - `, + '/foo.d.ts': FOO_TS, }); expect(autoCompleter.autocomplete('foo')).to.deep.equal([]); expect(autoCompleter.autocomplete('foo.')).to.deep.equal([ { kind: 'property', name: 'a', type: 'string' }, - { kind: 'property', name: 'bb', type: 'function (p1: number)' }, + { kind: 'property', name: 'bb', type: '(p1: number) => void' }, ]); expect(autoCompleter.autocomplete('foo.', 0)).to.deep.equal([]); @@ -39,18 +46,33 @@ export type Foo = { expect(autoCompleter.autocomplete('foo.', 2)).to.deep.equal([]); expect(autoCompleter.autocomplete('foo.', 3)).to.deep.equal([]); - // TODO: is this expected? - expect(autoCompleter.autocomplete('fo')).to.deep.equal([]); - - // TODO: is this expected? expect(autoCompleter.autocomplete('foo.b')).to.deep.equal([ { kind: 'property', name: 'a', type: 'string' }, - { kind: 'property', name: 'bb', type: 'function (p1: number)' }, + { kind: 'property', name: 'bb', type: '(p1: number) => void' }, ]); expect(autoCompleter.autocomplete('foo.bar', 4)).to.deep.equal([ { kind: 'property', name: 'a', type: 'string' }, - { kind: 'property', name: 'bb', type: 'function (p1: number)' }, + { kind: 'property', name: 'bb', type: '(p1: number) => void' }, + ]); + }); + + it('returns completions for the fields of object function parameters', function () { + autoCompleter.updateCode({ + '/foo.d.ts': FOO_TS, + }); + + expect(autoCompleter.autocomplete('bar({ par')).to.deep.equal([ + { + kind: 'property', + name: 'param1', + type: 'string', + }, + { + kind: 'property', + name: 'param2', + type: 'string', + }, ]); }); }); diff --git a/packages/ts-autocomplete/src/index.ts b/packages/ts-autocomplete/src/index.ts index 1d3c5caf..ed6cfc86 100644 --- a/packages/ts-autocomplete/src/index.ts +++ b/packages/ts-autocomplete/src/index.ts @@ -1,4 +1,9 @@ import * as ts from 'typescript'; +import createDebug from 'debug'; + +const debugLog = createDebug('ts-autocomplete:log'); +const debugTrace = createDebug('ts-autocomplete:trace'); +const debugError = createDebug('ts-autocomplete:error'); type TypeFilename = string; @@ -18,13 +23,17 @@ function getVirtualLanguageService(): [ const updateCode = (newDef: Record): void => { for (const [key, value] of Object.entries(newDef)) { codeHolder[key] = value; - versions[key] = (versions[key] ?? 1) + 1; + versions[key] = (versions[key] ?? 0) + 1; } }; const servicesHost: ts.LanguageServiceHost = { - getScriptFileNames: () => Object.keys(codeHolder), - getScriptVersion: (fileName) => (versions[fileName] ?? 1).toString(), + getScriptFileNames: () => { + return Object.keys(codeHolder); + }, + getScriptVersion: (fileName) => { + return (versions[fileName] ?? 1).toString(); + }, getScriptSnapshot: (fileName) => { if (fileName in codeHolder) { return ts.ScriptSnapshot.fromString(codeHolder[fileName]); @@ -35,8 +44,9 @@ function getVirtualLanguageService(): [ getCurrentDirectory: () => process.cwd(), getCompilationSettings: () => options, getDefaultLibFileName: (options) => ts.getDefaultLibFilePath(options), - fileExists: (fileName) => - fileName in codeHolder || ts.sys.fileExists(fileName), + fileExists: (fileName) => { + return fileName in codeHolder || ts.sys.fileExists(fileName); + }, readFile: (fileName) => { if (fileName in codeHolder) { return codeHolder[fileName]; @@ -46,6 +56,10 @@ function getVirtualLanguageService(): [ readDirectory: (...args) => ts.sys.readDirectory(...args), directoryExists: (...args) => ts.sys.directoryExists(...args), getDirectories: (...args) => ts.sys.getDirectories(...args), + + log: (...args) => debugLog(args), + trace: (...args) => debugTrace(args), + error: (...args) => debugError(args), }; return [ @@ -62,6 +76,7 @@ type AutoCompletion = { function mapCompletions(completions: ts.CompletionInfo): AutoCompletion[] { return completions.entries.map((entry) => { + //console.log(entry.symbol?.getDeclarations()); const declarations = entry.symbol?.getDeclarations(); let type = 'any'; if (declarations?.[0]) { @@ -105,6 +120,18 @@ export default class Autocompleter { if (completions?.isMemberCompletion) { return mapCompletions(completions); + } else { + /* + // TOOD: trying to find examples of things that are not member completions.. + if (completions) { + console.log(completions.entries?.length, 'entries'); + if (completions.entries?.length > 100) { + completions.entries = [];// so I can see something + } + console.log(completions); + //console.log(completions?.entries.map((entry) => entry.name).filter((name) => name.includes('param'))); + } + */ } return []; From 15ef3f398d195d05cfec2032f496ede3df079ba9 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Fri, 7 Mar 2025 15:43:36 +0000 Subject: [PATCH 6/8] comments --- packages/ts-autocomplete/src/index.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/ts-autocomplete/src/index.ts b/packages/ts-autocomplete/src/index.ts index ed6cfc86..169bfa82 100644 --- a/packages/ts-autocomplete/src/index.ts +++ b/packages/ts-autocomplete/src/index.ts @@ -76,11 +76,15 @@ type AutoCompletion = { function mapCompletions(completions: ts.CompletionInfo): AutoCompletion[] { return completions.entries.map((entry) => { - //console.log(entry.symbol?.getDeclarations()); + // entry.symbol is included because we specify includeSymbol when calling + // getCompletionsAtPosition const declarations = entry.symbol?.getDeclarations(); let type = 'any'; - if (declarations?.[0]) { - const decl = declarations[0]; + const decl = declarations?.[0]; + if (decl) { + // decl's children are things like ['a', ':', 'string'] or ['bb', ':', + // '(p1: number) => void']. So the one at position 2 (zero indexed) is the + // type. type = decl.getChildAt(2)?.getFullText()?.trim() ?? 'any'; } From dc6badea9397469d9cd33f62852dddeb31271a1c Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Mon, 10 Mar 2025 12:21:41 +0000 Subject: [PATCH 7/8] add support for filtering, add more tests --- packages/ts-autocomplete/src/index.spec.ts | 323 +++++++++++++++++---- packages/ts-autocomplete/src/index.ts | 113 ++++--- 2 files changed, 348 insertions(+), 88 deletions(-) diff --git a/packages/ts-autocomplete/src/index.spec.ts b/packages/ts-autocomplete/src/index.spec.ts index d7beaf73..8e529ffc 100644 --- a/packages/ts-autocomplete/src/index.spec.ts +++ b/packages/ts-autocomplete/src/index.spec.ts @@ -1,78 +1,293 @@ import Autocompleter from './index'; import { expect } from 'chai'; -const FOO_TS = ` +const CODE_TS = ` -export type Foo = { - a: string, - bb: (p1: number) => void +export type MyObject = { + stringProp: string, + functionProp: (p1: number) => void }; -export type Params = { param1: string, param2: string }; +export type MyFunctionParams = { param1: string, param2: string }; declare global { - declare var foo: Foo; - export function bar(params: Params): void {}; + declare var myGlobalObject: MyObject; + export function myGlobalFunction(params: MyFunctionParams): void {}; } `; +function filterStartingWith({ + name, + trigger, +}: { + name: string; + trigger: string; +}): boolean { + name = name.toLocaleLowerCase(); + trigger = trigger.toLocaleLowerCase(); + + return name !== trigger && name.startsWith(trigger); +} + describe('Autocompleter', function () { - let autoCompleter: Autocompleter; + describe('without filter', function () { + let autoCompleter: Autocompleter; - beforeEach(function () { - autoCompleter = new Autocompleter(); - }); + beforeEach(function () { + autoCompleter = new Autocompleter(); + }); - it('returns nothing when it has no code', function () { - expect(autoCompleter.autocomplete('foo')).to.deep.equal([]); - expect(autoCompleter.autocomplete('foo', 0)).to.deep.equal([]); - expect(autoCompleter.autocomplete('foo', 1)).to.deep.equal([]); - expect(autoCompleter.autocomplete('foo.')).to.deep.equal([]); - }); + it('returns the global scope for a global variable that does not exist', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); + + const completions = autoCompleter.autocomplete('doesNotExist'); + expect(completions.length).to.be.gt(100); + }); + + it('returns completions for global variables', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); + + // this is just the entire global scope + const completions = autoCompleter.autocomplete('myGlobalFunct'); + + expect(completions.length).to.be.gt(100); + + // one of them is the myGlobalFunction() function + expect(completions).to.deep.include({ + kind: 'function', + name: 'myGlobalFunction', + type: 'myGlobalFunction', + }); + }); + + it('returns nothing for a member of a variable that does not exist', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); + + expect( + autoCompleter.autocomplete('doesNotExist.somethingElse') + ).to.deep.equal([]); + }); + + it('returns matches for a member of a variable that exists', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); + + expect(autoCompleter.autocomplete('myGlobalObject.')).to.deep.equal([ + { + kind: 'property', + name: 'functionProp', + type: '(p1: number) => void', + }, + { kind: 'property', name: 'stringProp', type: 'string' }, + ]); + }); + + it('returns matches for part of a member of a variable that exists', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); + + expect(autoCompleter.autocomplete('myGlobalObject.str')).to.deep.equal([ + { + kind: 'property', + name: 'functionProp', + type: '(p1: number) => void', + }, + { kind: 'property', name: 'stringProp', type: 'string' }, + ]); + }); + + it('returns matches for an unknown member of a variable that exists', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); + + expect( + autoCompleter.autocomplete('myGlobalObject.doesNotExist') + ).to.deep.equal([ + { + kind: 'property', + name: 'functionProp', + type: '(p1: number) => void', + }, + { kind: 'property', name: 'stringProp', type: 'string' }, + ]); + }); - it('returns completions for members of global variables', function () { - autoCompleter.updateCode({ - '/foo.d.ts': FOO_TS, + it('returns the global scope for object parameters of a function that does not exist', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); + + const completions = autoCompleter.autocomplete('doesNotExist({'); + + expect(completions.length).to.be.gt(100); }); - expect(autoCompleter.autocomplete('foo')).to.deep.equal([]); - expect(autoCompleter.autocomplete('foo.')).to.deep.equal([ - { kind: 'property', name: 'a', type: 'string' }, - { kind: 'property', name: 'bb', type: '(p1: number) => void' }, - ]); + it('returns matches for object parameters of a function that exists', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); - expect(autoCompleter.autocomplete('foo.', 0)).to.deep.equal([]); - expect(autoCompleter.autocomplete('foo.', 1)).to.deep.equal([]); - expect(autoCompleter.autocomplete('foo.', 2)).to.deep.equal([]); - expect(autoCompleter.autocomplete('foo.', 3)).to.deep.equal([]); + const completions = autoCompleter.autocomplete('myGlobalFunction({ p'); + + expect(completions).to.deep.equal([ + { + kind: 'property', + name: 'param1', + type: 'string', + }, + { + kind: 'property', + name: 'param2', + type: 'string', + }, + ]); + }); - expect(autoCompleter.autocomplete('foo.b')).to.deep.equal([ - { kind: 'property', name: 'a', type: 'string' }, - { kind: 'property', name: 'bb', type: '(p1: number) => void' }, - ]); + it('returns matches for part of an object parameter of a function that exists', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); + + const completions = autoCompleter.autocomplete('myGlobalFunction({ p'); + + expect(completions).to.deep.equal([ + { + kind: 'property', + name: 'param1', + type: 'string', + }, + { + kind: 'property', + name: 'param2', + type: 'string', + }, + ]); + }); - expect(autoCompleter.autocomplete('foo.bar', 4)).to.deep.equal([ - { kind: 'property', name: 'a', type: 'string' }, - { kind: 'property', name: 'bb', type: '(p1: number) => void' }, - ]); + it('returns matches for an unknown object parameter of a function that exists', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); + + const completions = autoCompleter.autocomplete( + 'myGlobalFunction({ doesNotExist' + ); + expect(completions).to.deep.equal([ + { + kind: 'property', + name: 'param1', + type: 'string', + }, + { + kind: 'property', + name: 'param2', + type: 'string', + }, + ]); + }); }); - it('returns completions for the fields of object function parameters', function () { - autoCompleter.updateCode({ - '/foo.d.ts': FOO_TS, - }); - - expect(autoCompleter.autocomplete('bar({ par')).to.deep.equal([ - { - kind: 'property', - name: 'param1', - type: 'string', - }, - { - kind: 'property', - name: 'param2', - type: 'string', - }, - ]); + describe('with filter', function () { + let autoCompleter: Autocompleter; + + beforeEach(function () { + autoCompleter = new Autocompleter({ filter: filterStartingWith }); + }); + + it('returns nothing when it has no code', function () { + expect(autoCompleter.autocomplete('myGlobalOb')).to.deep.equal([]); + expect(autoCompleter.autocomplete('myGlobalObject')).to.deep.equal([]); + expect(autoCompleter.autocomplete('myGlobalObject', 0)).to.deep.equal([]); + expect(autoCompleter.autocomplete('myGlobalObject', 1)).to.deep.equal([]); + expect(autoCompleter.autocomplete('myGlobalObject.')).to.deep.equal([]); + }); + + it('returns completions for global variables', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); + + // it finds the entire global scope and then filters it + expect(autoCompleter.autocomplete('myGlobalFunct')).to.deep.equal([ + { + kind: 'function', + name: 'myGlobalFunction', + type: 'myGlobalFunction', + }, + ]); + }); + + it('returns completions for members of global variables', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); + + expect(autoCompleter.autocomplete('myGlobalObject')).to.deep.equal([]); + expect(autoCompleter.autocomplete('myGlobalObject.')).to.deep.equal([ + { + kind: 'property', + name: 'functionProp', + type: '(p1: number) => void', + }, + { kind: 'property', name: 'stringProp', type: 'string' }, + ]); + + expect(autoCompleter.autocomplete('myGlobalObject.', 0)).to.deep.equal( + [] + ); + expect(autoCompleter.autocomplete('myGlobalObject.', 1)).to.deep.equal( + [] + ); + expect(autoCompleter.autocomplete('myGlobalObject.', 2)).to.deep.equal( + [] + ); + expect(autoCompleter.autocomplete('myGlobalObject.', 3)).to.deep.equal( + [] + ); + + expect( + autoCompleter.autocomplete('myGlobalObject.functionPr') + ).to.deep.equal([ + { + kind: 'property', + name: 'functionProp', + type: '(p1: number) => void', + }, + ]); + + expect( + autoCompleter.autocomplete('myGlobalObject.typo', 4) + ).to.deep.equal([]); + }); + + it('returns completions for the fields of object function parameters', function () { + autoCompleter.updateCode({ + '/code.d.ts': CODE_TS, + }); + + expect( + autoCompleter.autocomplete('myGlobalFunction({ par') + ).to.deep.equal([ + { + kind: 'property', + name: 'param1', + type: 'string', + }, + { + kind: 'property', + name: 'param2', + type: 'string', + }, + ]); + }); }); }); diff --git a/packages/ts-autocomplete/src/index.ts b/packages/ts-autocomplete/src/index.ts index 169bfa82..81253541 100644 --- a/packages/ts-autocomplete/src/index.ts +++ b/packages/ts-autocomplete/src/index.ts @@ -68,39 +68,94 @@ function getVirtualLanguageService(): [ ]; } +function compileSourceFile(code: string): ts.SourceFile { + return ts.createSourceFile( + '_initial_parsing.ts', + code, + ts.ScriptTarget.Latest, + true + ); +} + +function getSymbolAtPosition( + sourceFile: ts.SourceFile, + position: number +): string | null { + function findNodeAtPosition(node: ts.Node): ts.Node | undefined { + if (position >= node.getStart(sourceFile) && position <= node.getEnd()) { + return ts.forEachChild(node, findNodeAtPosition) || node; + } + + return undefined; + } + + let node = findNodeAtPosition(sourceFile); + + while (node && !ts.isIdentifier(node)) { + if (node.parent) { + node = node.parent; + } else { + break; + } + } + + return node && ts.isIdentifier(node) ? node.getText(sourceFile) : null; +} + type AutoCompletion = { name: string; kind: ts.ScriptElementKind; type: string; }; -function mapCompletions(completions: ts.CompletionInfo): AutoCompletion[] { - return completions.entries.map((entry) => { - // entry.symbol is included because we specify includeSymbol when calling - // getCompletionsAtPosition - const declarations = entry.symbol?.getDeclarations(); - let type = 'any'; - const decl = declarations?.[0]; - if (decl) { - // decl's children are things like ['a', ':', 'string'] or ['bb', ':', - // '(p1: number) => void']. So the one at position 2 (zero indexed) is the - // type. - type = decl.getChildAt(2)?.getFullText()?.trim() ?? 'any'; - } +function mapCompletions( + filter: AutocompleteFilterFunction, + trigger: string, + completions: ts.CompletionInfo +): AutoCompletion[] { + return completions.entries + .filter((entry) => filter({ trigger, name: entry.name })) + .map((entry) => { + // entry.symbol is included because we specify includeSymbol when calling + // getCompletionsAtPosition + const declarations = entry.symbol?.getDeclarations(); + let type = 'any'; + const decl = declarations?.[0]; + if (decl) { + // decl's children are things like ['a', ':', 'string'] or ['bb', ':', + // '(p1: number) => void']. So the one at position 2 (zero indexed) is the + // type. + type = decl.getChildAt(2)?.getFullText()?.trim() ?? 'any'; + } - return { - name: entry.name, - kind: entry.kind, - type, - }; - }); + return { + name: entry.name, + kind: entry.kind, + type, + }; + }); } +type AutocompleteFilterOptions = { + trigger: string; + name: string; +}; + +type AutocompleteFilterFunction = ( + filterOptions: AutocompleteFilterOptions +) => boolean; + +type AutocompleterOptions = { + filter?: AutocompleteFilterFunction; +}; + export default class Autocompleter { + private readonly filter: AutocompleteFilterFunction; private readonly languageService: ts.LanguageService; readonly updateCode: UpdateDefinitionFunction; - constructor() { + constructor({ filter }: AutocompleterOptions = {}) { + this.filter = filter ?? (() => true); [this.languageService, this.updateCode] = getVirtualLanguageService(); } @@ -122,20 +177,10 @@ export default class Autocompleter { } ); - if (completions?.isMemberCompletion) { - return mapCompletions(completions); - } else { - /* - // TOOD: trying to find examples of things that are not member completions.. - if (completions) { - console.log(completions.entries?.length, 'entries'); - if (completions.entries?.length > 100) { - completions.entries = [];// so I can see something - } - console.log(completions); - //console.log(completions?.entries.map((entry) => entry.name).filter((name) => name.includes('param'))); - } - */ + if (completions) { + const tsAst = compileSourceFile(code); + const symbolAtPosition = getSymbolAtPosition(tsAst, position) ?? ''; + return mapCompletions(this.filter, symbolAtPosition, completions); } return []; From 94672b20d8adc274158407c1fe1f936365ced2e6 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Mon, 10 Mar 2025 12:36:13 +0000 Subject: [PATCH 8/8] external fixture --- packages/ts-autocomplete/src/index.spec.ts | 26 ++++++++----------- .../ts-autocomplete/test/fixtures/code.ts | 12 +++++++++ 2 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 packages/ts-autocomplete/test/fixtures/code.ts diff --git a/packages/ts-autocomplete/src/index.spec.ts b/packages/ts-autocomplete/src/index.spec.ts index 8e529ffc..d5a5018b 100644 --- a/packages/ts-autocomplete/src/index.spec.ts +++ b/packages/ts-autocomplete/src/index.spec.ts @@ -1,21 +1,8 @@ +import path from 'path'; +import { promises as fs } from 'fs'; import Autocompleter from './index'; import { expect } from 'chai'; -const CODE_TS = ` - -export type MyObject = { - stringProp: string, - functionProp: (p1: number) => void -}; - -export type MyFunctionParams = { param1: string, param2: string }; - -declare global { - declare var myGlobalObject: MyObject; - export function myGlobalFunction(params: MyFunctionParams): void {}; -} -`; - function filterStartingWith({ name, trigger, @@ -30,6 +17,15 @@ function filterStartingWith({ } describe('Autocompleter', function () { + let CODE_TS: string; + + before(async function () { + CODE_TS = await fs.readFile( + path.resolve(__dirname, '..', 'test', 'fixtures', 'code.ts'), + 'utf8' + ); + }); + describe('without filter', function () { let autoCompleter: Autocompleter; diff --git a/packages/ts-autocomplete/test/fixtures/code.ts b/packages/ts-autocomplete/test/fixtures/code.ts new file mode 100644 index 00000000..80180bc6 --- /dev/null +++ b/packages/ts-autocomplete/test/fixtures/code.ts @@ -0,0 +1,12 @@ +/* eslint-disable @typescript-eslint/no-empty-function */ +export type MyObject = { + stringProp: string; + functionProp: (p1: number) => void; +}; + +export type MyFunctionParams = { param1: string; param2: string }; + +declare global { + export const myGlobalObject: MyObject; + export function myGlobalFunction(params: MyFunctionParams): void; +}