fix(language-core): correctly resolve <script src="">

johnsoncodehk · johnsoncodehk · commit 145ee73bf672 · 2025-12-09T23:16:25.000+08:00
close #5838
diff --git a/packages/language-core/lib/codegen/script/index.ts b/packages/language-core/lib/codegen/script/index.ts
@@ -10,7 +10,6 @@ import { endOfLine, generateSfcBlockSection, newLine } from '../utils';
 import { endBoundary, startBoundary } from '../utils/boundary';
 import { createScriptCodegenContext, type ScriptCodegenContext } from './context';
 import { generateGeneric, generateScriptSetupImports, generateSetupFunction } from './scriptSetup';
-import { generateSrc } from './src';
 import { generateTemplate } from './template';
 
 const exportExpression = `{} as typeof ${names._export}`;
@@ -41,19 +40,39 @@ function* generateWorker(
 	options: ScriptCodegenOptions,
 	ctx: ScriptCodegenContext,
 ): Generator<Code> {
-	yield* generateGlobalTypesReference(options);
+	const { script, scriptRanges, scriptSetup, scriptSetupRanges, vueCompilerOptions, fileName } = options;
 
-	const { script, scriptRanges, scriptSetup, scriptSetupRanges, vueCompilerOptions } = options;
+	yield* generateGlobalTypesReference(vueCompilerOptions, fileName);
 
-	if (scriptSetup && scriptSetupRanges) {
-		yield* generateScriptSetupImports(scriptSetup, scriptSetupRanges);
-	}
-	if (script?.src) {
-		yield* generateSrc(script.src);
-	}
+	// <script src="">
+	if (typeof script?.src === 'object') {
+		let src = script.src.text;
+		if (src.endsWith('.ts') && !src.endsWith('.d.ts')) {
+			src = src.slice(0, -'.ts'.length) + '.js';
+		}
+		else if (src.endsWith('.tsx')) {
+			src = src.slice(0, -'.tsx'.length) + '.jsx';
+		}
+
+		yield `import __VLS_default from `;
+		const token = yield* startBoundary('main', script.src.offset, {
+			...codeFeatures.all,
+			...src !== script.src.text ? codeFeatures.navigationWithoutRename : {},
+		});
+		yield `'`;
+		yield [src.slice(0, script.src.text.length), 'main', script.src.offset, { __combineToken: token }];
+		yield src.slice(script.src.text.length);
+		yield `'`;
+		yield endBoundary(token, script.src.offset + script.src.text.length);
+		yield endOfLine;
+		yield `export default __VLS_default;${endOfLine}`;
 
+		yield* generateTemplate(options, ctx, '__VLS_default');
+	}
 	// <script> + <script setup>
-	if (script && scriptRanges && scriptSetup && scriptSetupRanges) {
+	else if (script && scriptRanges && scriptSetup && scriptSetupRanges) {
+		yield* generateScriptSetupImports(scriptSetup, scriptSetupRanges);
+
 		// <script>
 		let selfType: string | undefined;
 		const { exportDefault } = scriptRanges;
@@ -105,6 +124,8 @@ function* generateWorker(
 	}
 	// only <script setup>
 	else if (scriptSetup && scriptSetupRanges) {
+		yield* generateScriptSetupImports(scriptSetup, scriptSetupRanges);
+
 		if (scriptSetup.generic) {
 			yield* generateExportDeclareEqual(scriptSetup, names._export);
 			yield* generateGeneric(
@@ -217,13 +238,13 @@ function* generateScriptWithExportDefault(
 	yield* generateSfcBlockSection(script, exportDefault.end, script.content.length, codeFeatures.all);
 }
 
-function* generateGlobalTypesReference(options: ScriptCodegenOptions): Generator<Code> {
-	const globalTypesPath = options.vueCompilerOptions.globalTypesPath(options.fileName);
+function* generateGlobalTypesReference(vueCompilerOptions: VueCompilerOptions, fileName: string): Generator<Code> {
+	const globalTypesPath = vueCompilerOptions.globalTypesPath(fileName);
 	if (!globalTypesPath) {
 		yield `/* placeholder */${newLine}`;
 	}
 	else if (path.isAbsolute(globalTypesPath)) {
-		let relativePath = path.relative(path.dirname(options.fileName), globalTypesPath);
+		let relativePath = path.relative(path.dirname(fileName), globalTypesPath);
 		if (
 			relativePath !== globalTypesPath
 			&& !relativePath.startsWith('./')
diff --git a/packages/language-core/lib/codegen/script/src.ts b/packages/language-core/lib/codegen/script/src.ts
diff --git a/packages/language-core/lib/codegen/script/template.ts b/packages/language-core/lib/codegen/script/template.ts
@@ -5,7 +5,6 @@ import { endOfLine, generateSfcBlockSection, newLine } from '../utils';
 import { generateSpreadMerge } from '../utils/merge';
 import type { ScriptCodegenContext } from './context';
 import type { ScriptCodegenOptions } from './index';
-import { resolveSrcPath } from './src';
 
 export function* generateTemplate(
 	options: ScriptCodegenOptions,
@@ -26,7 +25,7 @@ export function* generateTemplate(
 }
 
 function* generateTemplateCtx(
-	{ vueCompilerOptions, script, styleCodegen, scriptSetupRanges, fileName }: ScriptCodegenOptions,
+	{ vueCompilerOptions, styleCodegen, scriptSetupRanges, fileName }: ScriptCodegenOptions,
 	ctx: ScriptCodegenContext,
 	selfType: string | undefined,
 ): Generator<Code> {
@@ -40,9 +39,6 @@ function* generateTemplateCtx(
 	if (selfType) {
 		exps.push([`{} as InstanceType<__VLS_PickNotAny<typeof ${selfType}, new () => {}>>`]);
 	}
-	else if (typeof script?.src === 'object') {
-		exps.push([`{} as typeof import('${resolveSrcPath(script.src.text)}').default`]);
-	}
 	else {
 		exps.push([`{} as import('${vueCompilerOptions.lib}').ComponentPublicInstance`]);
 	}
diff --git a/test-workspace/tsc/passedFixtures/vue3/src/javascript.js b/test-workspace/tsc/passedFixtures/vue3/src/javascript.js
@@ -0,0 +1,7 @@
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	setup() {
+		return { foo: 123 };
+	},
+});
diff --git a/test-workspace/tsc/passedFixtures/vue3/src/javascript.vue b/test-workspace/tsc/passedFixtures/vue3/src/javascript.vue
@@ -0,0 +1,7 @@
+<script lang="ts" src="./typescript.js"></script>
+
+<template>
+	{{ foo }}
+	<!-- @vue-expect-error -->
+	{{ bar }}
+</template>
diff --git a/test-workspace/tsc/passedFixtures/vue3/src/javascriptreact.jsx b/test-workspace/tsc/passedFixtures/vue3/src/javascriptreact.jsx
@@ -0,0 +1,7 @@
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	setup() {
+		return { foo: 123 };
+	},
+});
diff --git a/test-workspace/tsc/passedFixtures/vue3/src/javascriptreact.vue b/test-workspace/tsc/passedFixtures/vue3/src/javascriptreact.vue
@@ -0,0 +1,5 @@
+<script lang="ts" src="./javascriptreact.jsx"></script>
+
+<template>
+	{{ foo }}
+</template>
diff --git a/test-workspace/tsc/passedFixtures/vue3/src/typescript.ts b/test-workspace/tsc/passedFixtures/vue3/src/typescript.ts
@@ -0,0 +1,7 @@
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	setup() {
+		return { foo: 123 };
+	},
+});
diff --git a/test-workspace/tsc/passedFixtures/vue3/src/typescript.vue b/test-workspace/tsc/passedFixtures/vue3/src/typescript.vue
@@ -0,0 +1,7 @@
+<script lang="ts" src="./typescript.ts"></script>
+
+<template>
+	{{ foo }}
+	<!-- @vue-expect-error -->
+	{{ bar }}
+</template>
diff --git a/test-workspace/tsc/passedFixtures/vue3/src/typescriptreact.tsx b/test-workspace/tsc/passedFixtures/vue3/src/typescriptreact.tsx
@@ -0,0 +1,7 @@
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	setup() {
+		return { foo: 123 };
+	},
+});
diff --git a/test-workspace/tsc/passedFixtures/vue3/src/typescriptreact.vue b/test-workspace/tsc/passedFixtures/vue3/src/typescriptreact.vue
@@ -0,0 +1,7 @@
+<script lang="ts" src="./typescriptreact.tsx"></script>
+
+<template>
+	{{ foo }}
+	<!-- @vue-expect-error -->
+	{{ bar }}
+</template>
