Skip to content

Commit 02b354a

Browse files
committed
refactor: remove unnecessary import(), satisfies and typeof
1 parent e9ca650 commit 02b354a

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

packages/language-core/lib/codegen/template/element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ function* generateReferencesForScopedCssClasses(
661661
const startOffset = prop.exp.loc.start.offset - 3;
662662

663663
const { ts } = options;
664-
const ast = ts.createSourceFile('', content, 99 satisfies typeof ts.ScriptTarget.Latest);
664+
const ast = ts.createSourceFile('', content, 99 satisfies ts.ScriptTarget.Latest);
665665
const literals: ts.StringLiteralLike[] = [];
666666

667667
ts.forEachChild(ast, node => {

packages/language-core/lib/codegen/template/interpolation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type { TemplateCodegenContext } from './context';
77

88
export function* generateInterpolation(
99
options: {
10-
ts: typeof import('typescript'),
10+
ts: typeof ts,
1111
destructuredPropNames: Set<string> | undefined,
1212
templateRefNames: Set<string> | undefined
1313
},

packages/language-core/lib/plugins/vue-script-js.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type * as ts from 'typescript';
12
import type { VueLanguagePlugin } from '../types';
23

34
const plugin: VueLanguagePlugin = ({ modules }) => {
@@ -9,7 +10,7 @@ const plugin: VueLanguagePlugin = ({ modules }) => {
910
compileSFCScript(lang, script) {
1011
if (lang === 'js' || lang === 'ts' || lang === 'jsx' || lang === 'tsx') {
1112
const ts = modules.typescript;
12-
return ts.createSourceFile('test.' + lang, script, 99 satisfies typeof ts.ScriptTarget.Latest);
13+
return ts.createSourceFile('test.' + lang, script, 99 satisfies ts.ScriptTarget.Latest);
1314
}
1415
},
1516
};

packages/language-core/lib/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ export type VueLanguagePluginReturn = {
8383

8484
export type VueLanguagePlugin = (ctx: {
8585
modules: {
86-
typescript: typeof import('typescript');
87-
'@vue/compiler-dom': typeof import('@vue/compiler-dom');
86+
typescript: typeof ts;
87+
'@vue/compiler-dom': typeof CompilerDOM;
8888
};
8989
compilerOptions: ts.CompilerOptions;
9090
vueCompilerOptions: VueCompilerOptions;

packages/typescript-plugin/lib/requests/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Language } from '@vue/language-core';
22
import type * as ts from 'typescript';
33

44
export interface RequestContext<T = any> {
5-
typescript: typeof import('typescript');
5+
typescript: typeof ts;
66
languageService: ts.LanguageService;
77
languageServiceHost: ts.LanguageServiceHost;
88
language: Language<T>;

packages/typescript-plugin/lib/utils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,14 @@ export async function searchNamedPipeServerForFile(fileName: string) {
138138
}
139139

140140
// Find servers containing the current file
141-
const containsFile = await sendRequestWorker<boolean>({ type: 'containsFile' satisfies Request['type'], args: [fileName] }, socket);
141+
const containsFile = await sendRequestWorker<boolean>({ type: 'containsFile', args: [fileName] }, socket);
142142
if (!containsFile) {
143143
socket.end();
144144
return;
145145
}
146146

147147
// Get project info for each server
148-
const projectInfo = await sendRequestWorker<ProjectInfo>({ type: 'projectInfo' satisfies Request['type'], args: [fileName] }, socket);
148+
const projectInfo = await sendRequestWorker<ProjectInfo>({ type: 'projectInfo', args: [fileName] }, socket);
149149
if (!projectInfo) {
150150
socket.end();
151151
return;
@@ -179,7 +179,7 @@ export async function searchNamedPipeServerForFile(fileName: string) {
179179
}
180180

181181
// Get project info for each server
182-
const projectInfo = await sendRequestWorker<ProjectInfo>({ type: 'projectInfo' satisfies Request['type'], args: [fileName] }, socket);
182+
const projectInfo = await sendRequestWorker<ProjectInfo>({ type: 'projectInfo', args: [fileName] }, socket);
183183
if (!projectInfo) {
184184
socket.end();
185185
return;

0 commit comments

Comments
 (0)