refactor: types tslib -> ts, remove tslib imports in some places

zardoy · zardoy · commit a0306d55ee3e · 2022-09-19T12:53:50.000+03:00
diff --git a/typescript/src/codeActions/decorateProxy.ts b/typescript/src/codeActions/decorateProxy.ts
@@ -1,8 +1,7 @@
-import type tslib from 'typescript/lib/tsserverlibrary'
 import { GetConfig } from '../types'
 import getCodeActions, { REFACTORS_CATEGORY } from './getCodeActions'
 
-export default (proxy: tslib.LanguageService, languageService: tslib.LanguageService, c: GetConfig) => {
+export default (proxy: ts.LanguageService, languageService: ts.LanguageService, c: GetConfig) => {
     proxy.getApplicableRefactors = (fileName, positionOrRange, preferences) => {
         let prior = languageService.getApplicableRefactors(fileName, positionOrRange, preferences)
 
diff --git a/typescript/src/codeActions/getCodeActions.ts b/typescript/src/codeActions/getCodeActions.ts
@@ -10,10 +10,10 @@ type SimplifiedRefactorInfo = {
 
 export type ApplyCodeAction = (
     ts: typeof tslib,
-    sourceFile: tslib.SourceFile,
+    sourceFile: ts.SourceFile,
     position: number,
-    range?: tslib.TextRange,
-) => tslib.RefactorEditInfo | SimplifiedRefactorInfo[] | undefined
+    range?: ts.TextRange,
+) => ts.RefactorEditInfo | SimplifiedRefactorInfo[] | undefined
 
 export type CodeAction = {
     name: string
@@ -29,10 +29,10 @@ export const REFACTORS_CATEGORY = 'essential-refactors'
 
 export default (
     ts: typeof tslib,
-    sourceFile: tslib.SourceFile,
-    positionOrRange: tslib.TextRange | number,
+    sourceFile: ts.SourceFile,
+    positionOrRange: ts.TextRange | number,
     requestingEditsId?: string,
-): { info?: ts.ApplicableRefactorInfo; edit: tslib.RefactorEditInfo } => {
+): { info?: ts.ApplicableRefactorInfo; edit: ts.RefactorEditInfo } => {
     const range = typeof positionOrRange !== 'number' && positionOrRange.pos !== positionOrRange.end ? positionOrRange : undefined
     const appliableCodeActions = compact(
         codeActions.map(action => {
@@ -56,7 +56,7 @@ export default (
                                   }),
                               },
                           ],
-                      } as tslib.RefactorEditInfo)
+                      } as ts.RefactorEditInfo)
                     : edits,
             }
         }),
diff --git a/typescript/src/codeFixes.ts b/typescript/src/codeFixes.ts
@@ -2,7 +2,7 @@ import type tslib from 'typescript/lib/tsserverlibrary'
 import { GetConfig } from './types'
 import { getIndentFromPos } from './utils'
 
-export default (proxy: tslib.LanguageService, languageService: tslib.LanguageService, c: GetConfig) => {
+export default (proxy: ts.LanguageService, languageService: ts.LanguageService, c: GetConfig) => {
     proxy.getCodeFixesAtPosition = (fileName, start, end, errorCodes, formatOptions, preferences) => {
         let prior = languageService.getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences)
         // fix builtin codefixes/refactorings
diff --git a/typescript/src/completions/indexSignatureAccess.ts b/typescript/src/completions/indexSignatureAccess.ts
@@ -1,13 +1,10 @@
-import type tslib from 'typescript/lib/tsserverlibrary'
-
 export default (
     position: number,
-    node: tslib.Node | undefined,
-    scriptSnapshot: tslib.IScriptSnapshot,
-    sourceFile: tslib.SourceFile,
-    program: tslib.Program,
-    ts: typeof tslib,
-): tslib.CompletionEntry[] => {
+    node: ts.Node | undefined,
+    scriptSnapshot: ts.IScriptSnapshot,
+    sourceFile: ts.SourceFile,
+    program: ts.Program,
+): ts.CompletionEntry[] => {
     if (!node || !ts.isStringLiteralLike(node)) return []
     const isConditionalExpression = ts.isConditionalExpression(node.parent)
     // optimize?
@@ -30,7 +27,7 @@ export default (
         return {
             kind: ts.ScriptElementKind.string,
             name: prop.name,
-            // derang completion is used on other side
+            // derang completions used on other side
             sortText: prop.name === usedProp ? '9999' : '',
         }
     })
diff --git a/typescript/src/completions/isGoodPositionMethodCompletion.ts b/typescript/src/completions/isGoodPositionMethodCompletion.ts
@@ -2,7 +2,7 @@ import type tslib from 'typescript/lib/tsserverlibrary'
 import { GetConfig } from '../types'
 import { findChildContainingPosition, findChildContainingPositionMaxDepth } from '../utils'
 
-export const isGoodPositionBuiltinMethodCompletion = (ts: typeof tslib, sourceFile: tslib.SourceFile, position: number, c: GetConfig) => {
+export const isGoodPositionBuiltinMethodCompletion = (ts: typeof tslib, sourceFile: ts.SourceFile, position: number, c: GetConfig) => {
     const importClauseCandidate = findChildContainingPositionMaxDepth(ts, sourceFile, position, 3)
     if (importClauseCandidate && ts.isImportClause(importClauseCandidate)) return false
     const textBeforePos = sourceFile.getFullText().slice(position - 1, position)
@@ -24,9 +24,9 @@ export const isGoodPositionBuiltinMethodCompletion = (ts: typeof tslib, sourceFi
 export const isGoodPositionMethodCompletion = (
     ts: typeof tslib,
     fileName: string,
-    sourceFile: tslib.SourceFile,
+    sourceFile: ts.SourceFile,
     position: number,
-    languageService: tslib.LanguageService,
+    languageService: ts.LanguageService,
     c: GetConfig,
 ) => {
     if (!isGoodPositionBuiltinMethodCompletion(ts, sourceFile, position, c)) return false
diff --git a/typescript/src/completions/isInBannedPosition.ts b/typescript/src/completions/isInBannedPosition.ts
@@ -1,6 +1,6 @@
 import type tslib from 'typescript/lib/tsserverlibrary'
 
-export default (position: number, scriptSnapshot: tslib.IScriptSnapshot, sourceFile: tslib.SourceFile): boolean => {
+export default (position: number, scriptSnapshot: ts.IScriptSnapshot, sourceFile: ts.SourceFile): boolean => {
     const { character } = sourceFile.getLineAndCharacterOfPosition(position)
     const textBeforePositionLine = scriptSnapshot?.getText(position - character, position)
     const textAfterPositionLine = scriptSnapshot?.getText(position, sourceFile.getLineEndOfPosition(position))
diff --git a/typescript/src/completions/jsxAttributes.ts b/typescript/src/completions/jsxAttributes.ts
@@ -1,16 +1,14 @@
 import { compact } from '@zardoy/utils'
-import type tslib from 'typescript/lib/tsserverlibrary'
 import { Configuration } from '../../../src/configurationType'
 import escapeStringRegexp from 'escape-string-regexp'
 
 export default (
-    ts: typeof tslib,
-    entries: tslib.CompletionEntry[],
-    node: tslib.Node,
+    entries: ts.CompletionEntry[],
+    node: ts.Node,
     position: number,
-    sourceFile: tslib.SourceFile,
+    sourceFile: ts.SourceFile,
     jsxCompletionsMap: Configuration['jsxCompletionsMap'],
-): tslib.CompletionEntry[] => {
+): ts.CompletionEntry[] => {
     // ++ patch with jsxCompletionsMap
     // -- don't
     // <div| - identifier, not attribute --
@@ -66,7 +64,7 @@ export default (
                 const patchMethod = patchEntries[i]
                 if (patchMethod === undefined) return entry
                 if (patchMethod === false) return
-                const patchedEntry: tslib.CompletionEntry = { ...entry, insertText: entry.name + patchMethod.insertText, isSnippet: true }
+                const patchedEntry: ts.CompletionEntry = { ...entry, insertText: entry.name + patchMethod.insertText, isSnippet: true }
                 const { keepOriginal } = patchMethod
                 if (!keepOriginal) return patchedEntry
                 return keepOriginal === 'above' ? [entry, patchedEntry] : [patchedEntry, entry]
diff --git a/typescript/src/completions/postfixesAtPosition.ts b/typescript/src/completions/postfixesAtPosition.ts
@@ -2,7 +2,7 @@ import type tslib from 'typescript/lib/tsserverlibrary'
 import { PostfixCompletion } from '../ipcTypes'
 import { findChildContainingPosition, findClosestParent } from '../utils'
 
-export default (position: number, fileName: string, scriptSnapshot: tslib.IScriptSnapshot, languageService: tslib.LanguageService): PostfixCompletion[] => {
+export default (position: number, fileName: string, scriptSnapshot: ts.IScriptSnapshot, languageService: ts.LanguageService): PostfixCompletion[] => {
     const { character } = languageService.toLineColumnOffset!(fileName, position)
     const startLinePos = position - character
     const textBeforePositionLine = scriptSnapshot?.getText(startLinePos, position + 1)
@@ -15,7 +15,7 @@ export default (position: number, fileName: string, scriptSnapshot: tslib.IScrip
     const node = findChildContainingPosition(ts, sourceFile, nodePos)
     if (!node) return []
     const postfixes: PostfixCompletion[] = []
-    let foundNode: tslib.Node | undefined
+    let foundNode: ts.Node | undefined
     if (
         ts.isIdentifier(node) &&
         (foundNode = findClosestParent(ts, node, [ts.SyntaxKind.BinaryExpression, ts.SyntaxKind.IfStatement], [])) &&
@@ -44,7 +44,7 @@ export default (position: number, fileName: string, scriptSnapshot: tslib.IScrip
     return postfixes
 }
 
-const isComparingToken = (node: tslib.Node) => {
+const isComparingToken = (node: ts.Node) => {
     switch (node.kind) {
         case ts.SyntaxKind.EqualsEqualsEqualsToken:
         case ts.SyntaxKind.EqualsEqualsToken:
@@ -59,7 +59,7 @@ const isComparingToken = (node: tslib.Node) => {
     return false
 }
 
-const probablyAddNotSnippet = (postfixes: PostfixCompletion[], binaryExprNode: tslib.BinaryExpression, ts: typeof tslib) => {
+const probablyAddNotSnippet = (postfixes: PostfixCompletion[], binaryExprNode: ts.BinaryExpression, ts: typeof tslib) => {
     let replaceOperator: string | undefined
     switch (binaryExprNode.operatorToken as any) {
         case ts.SyntaxKind.EqualsEqualsEqualsToken:
diff --git a/typescript/src/completions/snippetForFunctionCall.ts b/typescript/src/completions/snippetForFunctionCall.ts
@@ -1,5 +1,3 @@
-import type tslib from 'typescript/lib/tsserverlibrary'
-
 class DisplayPartKind {
     public static readonly functionName = 'functionName'
     public static readonly methodName = 'methodName'
@@ -9,8 +7,8 @@ class DisplayPartKind {
     public static readonly text = 'text'
 }
 
-export function getParameterListParts(displayParts: ReadonlyArray<tslib.SymbolDisplayPart>) {
-    const parts: tslib.SymbolDisplayPart[] = []
+export function getParameterListParts(displayParts: ReadonlyArray<ts.SymbolDisplayPart>) {
+    const parts: ts.SymbolDisplayPart[] = []
     let gotMethodHit = false
     let isInMethod = false
     let hasOptionalParameters = false
diff --git a/typescript/src/completionsAtPosition.ts b/typescript/src/completionsAtPosition.ts
@@ -10,7 +10,7 @@ import { isGoodPositionBuiltinMethodCompletion } from './completions/isGoodPosit
 import improveJsxCompletions from './completions/jsxAttributes'
 import arrayMethods from './completions/arrayMethods'
 
-export type PrevCompletionMap = Record<string, { originalName?: string; documentationOverride?: string | tslib.SymbolDisplayPart[] }>
+export type PrevCompletionMap = Record<string, { originalName?: string; documentationOverride?: string | ts.SymbolDisplayPart[] }>
 
 export const getCompletionsAtPosition = (
     fileName: string,
@@ -22,7 +22,7 @@ export const getCompletionsAtPosition = (
     ts: typeof tslib,
 ):
     | {
-          completions: tslib.CompletionInfo
+          completions: ts.CompletionInfo
           /** Let default getCompletionEntryDetails to know original name or let add documentation from here */
           prevCompletionsMap: PrevCompletionMap
       }
@@ -125,7 +125,7 @@ export const getCompletionsAtPosition = (
     }
     const addSignatureAccessCompletions = prior?.entries.filter(({ kind }) => kind !== ts.ScriptElementKind.warning).length
         ? []
-        : indexSignatureAccessCompletions(position, node, scriptSnapshot, sourceFile, program, ts)
+        : indexSignatureAccessCompletions(position, node, scriptSnapshot, sourceFile, program)
     if (addSignatureAccessCompletions.length && ensurePrior() && prior) {
         prior.entries = [...prior.entries, ...addSignatureAccessCompletions]
     }
@@ -211,7 +211,7 @@ export const getCompletionsAtPosition = (
 
     prior.entries = arrayMethods(prior.entries, node, position, sourceFile, c)
 
-    if (c('improveJsxCompletions') && leftNode) prior.entries = improveJsxCompletions(ts, prior.entries, leftNode, position, sourceFile, c('jsxCompletionsMap'))
+    if (c('improveJsxCompletions') && leftNode) prior.entries = improveJsxCompletions(prior.entries, leftNode, position, sourceFile, c('jsxCompletionsMap'))
 
     for (const rule of c('replaceSuggestions')) {
         let foundIndex: number
diff --git a/typescript/src/definitions.ts b/typescript/src/definitions.ts
@@ -1,7 +1,7 @@
 import type tslib from 'typescript/lib/tsserverlibrary'
 import { GetConfig } from './types'
 
-export default (proxy: tslib.LanguageService, info: tslib.server.PluginCreateInfo, c: GetConfig) => {
+export default (proxy: ts.LanguageService, info: ts.server.PluginCreateInfo, c: GetConfig) => {
     proxy.getDefinitionAndBoundSpan = (fileName, position) => {
         const prior = info.languageService.getDefinitionAndBoundSpan(fileName, position)
         if (!prior) return
diff --git a/typescript/src/getPatchedNavTree.ts b/typescript/src/getPatchedNavTree.ts
@@ -45,7 +45,7 @@ const getPatchedNavModule = (ts: typeof tslib) => {
         }
     }
     const getModule = requireFromString('module.exports = (ts, getNameFromJsxTag) => {' + lines.join('\n') + 'return NavigationBar;}')
-    const getNameFromJsxTag = (node: tslib.JsxSelfClosingElement | tslib.JsxOpeningElement) => {
+    const getNameFromJsxTag = (node: ts.JsxSelfClosingElement | ts.JsxOpeningElement) => {
         const {
             attributes: { properties },
         } = node
@@ -74,7 +74,7 @@ const getPatchedNavModule = (ts: typeof tslib) => {
 
 let navModule
 
-export const getNavTreeItems = (ts: typeof tslib, info: tslib.server.PluginCreateInfo, fileName: string) => {
+export const getNavTreeItems = (ts: typeof tslib, info: ts.server.PluginCreateInfo, fileName: string) => {
     if (!navModule) navModule = getPatchedNavModule(ts)
     const program = info.languageService.getProgram()
     if (!program) throw new Error('no program')
diff --git a/typescript/src/libDomPatching.ts b/typescript/src/libDomPatching.ts
@@ -1,7 +1,7 @@
 import type tslib from 'typescript/lib/tsserverlibrary'
 
 // not used for now
-export default (info: tslib.server.PluginCreateInfo) => {
+export default (info: ts.server.PluginCreateInfo) => {
     // info.serverHost.readFile = fileName => {
     //     let contents = realReadFile(fileName)
     //     if (fileName.endsWith('/node_modules/typescript/lib/lib.dom.d.ts') && c('eventTypePatching.enable')) {
diff --git a/typescript/src/references.ts b/typescript/src/references.ts
@@ -1,7 +1,7 @@
 import type tslib from 'typescript/lib/tsserverlibrary'
 import { GetConfig } from './types'
 
-export default (proxy: tslib.LanguageService, languageService: tslib.LanguageService, c: GetConfig) => {
+export default (proxy: ts.LanguageService, languageService: ts.LanguageService, c: GetConfig) => {
     proxy.findReferences = (fileName, position) => {
         let prior = languageService.findReferences(fileName, position)
         if (!prior) return
diff --git a/typescript/src/semanticDiagnostics.ts b/typescript/src/semanticDiagnostics.ts
@@ -1,7 +1,7 @@
 import type tslib from 'typescript/lib/tsserverlibrary'
 import { GetConfig } from './types'
 
-export default (proxy: tslib.LanguageService, info: tslib.server.PluginCreateInfo, c: GetConfig) => {
+export default (proxy: ts.LanguageService, info: ts.server.PluginCreateInfo, c: GetConfig) => {
     proxy.getSemanticDiagnostics = fileName => {
         let prior = info.languageService.getSemanticDiagnostics(fileName)
         if (c('supportTsDiagnosticDisableComment')) {
diff --git a/typescript/src/specialCommands/handle.ts b/typescript/src/specialCommands/handle.ts
@@ -4,7 +4,7 @@ import { NodeAtPositionResponse, TriggerCharacterCommand, triggerCharacterComman
 import { findChildContainingPosition } from '../utils'
 
 export default (
-    info: tslib.server.PluginCreateInfo,
+    info: ts.server.PluginCreateInfo,
     fileName: string,
     position: number,
     specialCommand: TriggerCharacterCommand,
diff --git a/typescript/src/types.ts b/typescript/src/types.ts
@@ -5,7 +5,7 @@ import { ConditionalPick } from 'type-fest'
 import tslib from 'typescript/lib/tsserverlibrary'
 export type Configuration = Configuration
 export type GetConfig = <T extends keyof Configuration>(key: T) => Configuration[T]
-export type LanguageServiceMethodWithConfig<T extends keyof ConditionalPick<tslib.LanguageService, (...args) => any>, O extends any[] = []> = (
+export type LanguageServiceMethodWithConfig<T extends keyof ConditionalPick<ts.LanguageService, (...args) => any>, O extends any[] = []> = (
     c: GetConfig,
-    ...args: Parameters<tslib.LanguageService[T]>
-) => ReturnType<tslib.LanguageService[T]>
+    ...args: Parameters<ts.LanguageService[T]>
+) => ReturnType<ts.LanguageService[T]>
diff --git a/typescript/src/utils.ts b/typescript/src/utils.ts
@@ -2,9 +2,9 @@ import type tslib from 'typescript/lib/tsserverlibrary'
 
 export function findChildContainingPosition(
     typescript: typeof import('typescript/lib/tsserverlibrary'),
-    sourceFile: tslib.SourceFile,
+    sourceFile: ts.SourceFile,
     position: number,
-): tslib.Node | undefined {
+): ts.Node | undefined {
     function find(node: ts.Node): ts.Node | undefined {
         if (position >= node.getStart() && position < node.getEnd()) {
             return typescript.forEachChild(node, find) || node
@@ -17,10 +17,10 @@ export function findChildContainingPosition(
 
 export function findChildContainingPositionMaxDepth(
     typescript: typeof import('typescript/lib/tsserverlibrary'),
-    sourceFile: tslib.SourceFile,
+    sourceFile: ts.SourceFile,
     position: number,
     maxDepth?: number,
-): tslib.Node | undefined {
+): ts.Node | undefined {
     let currentDepth = 0
     function find(node: ts.Node): ts.Node | undefined {
         if (position >= node.getStart() && position < node.getEnd()) {
@@ -33,7 +33,7 @@ export function findChildContainingPositionMaxDepth(
     return find(sourceFile)
 }
 
-export const getIndentFromPos = (typescript: typeof import('typescript/lib/tsserverlibrary'), sourceFile: tslib.SourceFile, position: number) => {
+export const getIndentFromPos = (typescript: typeof import('typescript/lib/tsserverlibrary'), sourceFile: ts.SourceFile, position: number) => {
     const { character } = typescript.getLineAndCharacterOfPosition(sourceFile, position)
     return (
         sourceFile
@@ -43,7 +43,7 @@ export const getIndentFromPos = (typescript: typeof import('typescript/lib/tsser
     )
 }
 
-export const findClosestParent = (ts: typeof tslib, node: tslib.Node, stopKinds: tslib.SyntaxKind[], rejectKinds: tslib.SyntaxKind[]) => {
+export const findClosestParent = (ts: typeof tslib, 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
