try to use fully exposed TS api in fullTs var

zardoy · zardoy · commit 43fae3dc728b · 2022-11-17T19:39:07.000+03:00
diff --git a/buildTsPlugin.mjs b/buildTsPlugin.mjs
@@ -6,7 +6,7 @@ const result = await buildTsPlugin('typescript', undefined, undefined, {
     minify: !process.argv.includes('--watch'),
     metafile: true,
     banner: {
-        js: 'let ts',
+        js: 'let ts, tsFull;',
         // js: 'const log = (...args) => console.log(...args.map(a => JSON.stringify(a)))',
     },
 })
diff --git a/package.json b/package.json
@@ -62,7 +62,6 @@
         "type-fest": "^2.13.1",
         "typed-jsonfile": "^0.2.1",
         "typescript": "^4.8.3",
-        "typescript-old": "npm:typescript@4.5.4",
         "vitest": "^0.15.1",
         "vscode-manifest": "^0.0.4"
     },
@@ -93,6 +92,8 @@
         "rambda": "^7.2.1",
         "require-from-string": "^2.0.2",
         "string-dedent": "^3.0.1",
+        "ts-expose-internals": "^4.8.4",
+        "unleashed-typescript": "^1.3.0",
         "vscode-framework": "^0.0.18",
         "vscode-uri": "^3.0.6"
     },
diff --git a/patches/ts-expose-internals+^4.8.4.patch b/patches/ts-expose-internals+^4.8.4.patch
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/typescript/src/codeActions/toggleBraces.ts b/typescript/src/codeActions/toggleBraces.ts
@@ -6,7 +6,6 @@ const tryToApply: ApplyCodeAction = (ts, sourceFile, pos, range) => {
     const currentNode = findChildContainingPosition(ts, sourceFile, pos)
     if (!currentNode) return
     const closestBlock = findClosestParent(
-        ts,
         currentNode,
         [
             ts.SyntaxKind.IfStatement,
diff --git a/typescript/src/completions/postfixesAtPosition.ts b/typescript/src/completions/postfixesAtPosition.ts
@@ -18,7 +18,7 @@ export default (position: number, fileName: string, scriptSnapshot: ts.IScriptSn
     let foundNode: ts.Node | undefined
     if (
         ts.isIdentifier(node) &&
-        (foundNode = findClosestParent(ts, node, [ts.SyntaxKind.BinaryExpression, ts.SyntaxKind.IfStatement], [])) &&
+        (foundNode = findClosestParent(node, [ts.SyntaxKind.BinaryExpression, ts.SyntaxKind.IfStatement], [])) &&
         (!ts.isBinaryExpression(foundNode!) || !isComparingToken(foundNode.operatorToken))
     ) {
         if (ts.isIdentifier(node)) {
diff --git a/typescript/src/getPatchedNavTree.ts b/typescript/src/getPatchedNavTree.ts
@@ -1,10 +1,9 @@
-import type tslib from 'typescript/lib/tsserverlibrary'
 import { nodeModules } from './utils'
 
 // uses at testing only
 declare const __TS_SEVER_PATH__: string | undefined
 
-const getPatchedNavModule = (ts: typeof tslib) => {
+const getPatchedNavModule = () => {
     const tsServerPath = typeof __TS_SEVER_PATH__ !== 'undefined' ? __TS_SEVER_PATH__ : require.main!.filename
     const mainScript = nodeModules!.fs.readFileSync(tsServerPath, 'utf8') as string
     const startIdx = mainScript.indexOf('var NavigationBar;')
@@ -75,8 +74,8 @@ const getPatchedNavModule = (ts: typeof tslib) => {
 
 let navModule
 
-export const getNavTreeItems = (ts: typeof tslib, info: ts.server.PluginCreateInfo, fileName: string) => {
-    if (!navModule) navModule = getPatchedNavModule(ts)
+export const getNavTreeItems = (info: ts.server.PluginCreateInfo, fileName: string) => {
+    if (!navModule) navModule = getPatchedNavModule()
     const program = info.languageService.getProgram()
     if (!program) throw new Error('no program')
     const sourceFile = program?.getSourceFile(fileName)
diff --git a/typescript/src/globals.d.ts b/typescript/src/globals.d.ts
@@ -1,4 +1,17 @@
-// prvided by esbuild in buildTsPlugin.mjs
-declare let ts: typeof import('typescript/lib/tsserverlibrary')
+import('ts-expose-internals')
+// prvided by esbuild at top-level of bundle in buildTsPlugin.mjs
+declare let ts: typeof import('typescript')
+declare let tsFull: typeof import('typescript-full')
+
+// declare type ts = import('typescript')
+// export {}
+// export * from 'typescript'
+// // export * from 'typescript/lib/tsserverlibrary'
+
+// export as namespace ts
+// declare global {
+//     export as namespace ts
+//     declare let ts: typeof import('typescript')
+// }
 
 declare let __WEB__: boolean
diff --git a/typescript/src/index.ts b/typescript/src/index.ts
@@ -98,7 +98,7 @@ const decorateLanguageService = (info: ts.server.PluginCreateInfo, existingProxy
         // so we forced to communicate via fs
         const config = JSON.parse(ts.sys.readFile(require('path').join(__dirname, '../../plugin-config.json'), 'utf8') ?? '{}')
         proxy.getNavigationTree = fileName => {
-            if (c('patchOutline') || config.patchOutline) return getNavTreeItems(ts, info, fileName)
+            if (c('patchOutline') || config.patchOutline) return getNavTreeItems(info, fileName)
             return info.languageService.getNavigationTree(fileName)
         }
     }
@@ -110,7 +110,7 @@ const decorateLanguageService = (info: ts.server.PluginCreateInfo, existingProxy
 const updateConfigListeners: Array<() => void> = []
 
 const plugin: ts.server.PluginModuleFactory = ({ typescript }) => {
-    ts = typescript
+    ts = tsFull = typescript as any
     return {
         create(info) {
             // receive fresh config
diff --git a/typescript/src/specialCommands/prepareTextForEmmet.ts b/typescript/src/specialCommands/prepareTextForEmmet.ts
@@ -22,7 +22,7 @@ export default (
 ): false | string => {
     const text = getTextInner(position, leftNode)
     if (text === false) return false
-    const closestElem = findClosestParent(ts, leftNode, [ts.SyntaxKind.JsxElement], [ts.SyntaxKind.JsxFragment]) as ts.JsxElement | undefined
+    const closestElem = findClosestParent(leftNode, [ts.SyntaxKind.JsxElement], [ts.SyntaxKind.JsxFragment]) as ts.JsxElement | undefined
     const bannedTags = ['style']
     const tagName = closestElem?.openingElement.tagName.getText()
     if (tagName && bannedTags.includes(tagName)) return false
diff --git a/typescript/src/utils.ts b/typescript/src/utils.ts
@@ -1,7 +1,6 @@
-import type tslib from 'typescript/lib/tsserverlibrary'
 import { SetOptional } from 'type-fest'
 
-export function findChildContainingPosition(typescript: typeof tslib, sourceFile: ts.SourceFile, position: number): ts.Node | undefined {
+export function findChildContainingPosition(typescript: typeof ts, sourceFile: ts.SourceFile, position: number): ts.Node | undefined {
     function find(node: ts.Node): ts.Node | undefined {
         if (position >= node.getStart() && position < node.getEnd()) {
             return typescript.forEachChild(node, find) || node
@@ -46,7 +45,7 @@ export const matchNodePath = (sourceFile: ts.SourceFile, position: number, candi
     const nodesPath = getNodePath(sourceFile, position)
 }
 
-export const getIndentFromPos = (typescript: typeof tslib, sourceFile: ts.SourceFile, position: number) => {
+export const getIndentFromPos = (typescript: typeof ts, sourceFile: ts.SourceFile, position: number) => {
     const { character } = typescript.getLineAndCharacterOfPosition(sourceFile, position)
     return (
         sourceFile
@@ -56,7 +55,7 @@ export const getIndentFromPos = (typescript: typeof tslib, sourceFile: ts.Source
     )
 }
 
-export const findClosestParent = (ts: typeof tslib, node: ts.Node, stopKinds: ts.SyntaxKind[], rejectKinds: ts.SyntaxKind[]) => {
+export const findClosestParent = (node: ts.Node, stopKinds: ts.SyntaxKind[], rejectKinds: ts.SyntaxKind[]) => {
     rejectKinds = [...rejectKinds, ts.SyntaxKind.SourceFile]
     while (node && !stopKinds.includes(node.kind)) {
         if (rejectKinds.includes(node.kind)) return
diff --git a/typescript/test/completions.spec.ts b/typescript/test/completions.spec.ts
@@ -13,7 +13,7 @@ import handleCommand from '../src/specialCommands/handle'
 
 const require = createRequire(import.meta.url)
 //@ts-ignore plugin expect it to set globallly
-globalThis.ts = ts
+globalThis.ts = globalThis.tsFull = ts
 
 const entrypoint = '/test.tsx'
 const files = { [entrypoint]: '' }
@@ -274,7 +274,7 @@ test('Patched navtree (outline)', () => {
             </Notification>
         }
     `)
-    const navTreeItems: ts.NavigationTree = getNavTreeItems(ts, { languageService, languageServiceHost: {} } as any, entrypoint)
+    const navTreeItems: ts.NavigationTree = getNavTreeItems({ languageService, languageServiceHost: {} } as any, entrypoint)
     const simplify = (items: ts.NavigationTree[]) => {
         const newItems: { text: any; childItems? }[] = []
         for (const { text, childItems } of items) {
diff --git a/typescript/tsconfig.json b/typescript/tsconfig.json
@@ -9,6 +9,10 @@
         "lib": [
             "ESNext"
         ],
+        "types": [
+            "@zardoy/tsconfig",
+            // "ts-expose-internals"
+        ],
         "outDir": "build"
     },
     "include": [

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ const tryToApply: ApplyCodeAction = (ts, sourceFile, pos, range) => {`
`6`	`6`	`const currentNode = findChildContainingPosition(ts, sourceFile, pos)`
`7`	`7`	`if (!currentNode) return`
`8`	`8`	`const closestBlock = findClosestParent(`
`9`		`- ts,`
`10`	`9`	`currentNode,`
`11`	`10`	`[`
`12`	`11`	`ts.SyntaxKind.IfStatement,`