Merge branch 'master' into fix/call-template-ref

vuejs · Aug 31, 2024 · 77b75f4 · 77b75f4
2 parents 153c9c5 + af7fc39
commit 77b75f4
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 7 deletions.
diff --git a/packages/component-meta/lib/base.ts b/packages/component-meta/lib/base.ts
@@ -86,7 +86,10 @@ export function baseCreate(
 	const vueLanguagePlugin = vue.createVueLanguagePlugin<string>(
 		ts,
 		projectHost.getCompilationSettings(),
-		commandLine.vueOptions,
+		{
+			...commandLine.vueOptions,
+			__setupedGlobalTypes: () => true,
+		},
 		id => id
 	);
 	const language = vue.createLanguage(

diff --git a/packages/language-core/lib/codegen/script/index.ts b/packages/language-core/lib/codegen/script/index.ts
@@ -9,6 +9,7 @@ import { createScriptCodegenContext, ScriptCodegenContext } from './context';
 import { generateScriptSetup, generateScriptSetupImports } from './scriptSetup';
 import { generateSrc } from './src';
 import { generateTemplate } from './template';
+import { generateGlobalTypes } from '../globalTypes';
 
 export const codeFeatures = {
 	all: {
@@ -51,7 +52,12 @@ export interface ScriptCodegenOptions {
 export function* generateScript(options: ScriptCodegenOptions): Generator<Code, ScriptCodegenContext> {
 	const ctx = createScriptCodegenContext(options);
 
-	yield `/// <reference types=".vue-global-types/${options.vueCompilerOptions.lib}_${options.vueCompilerOptions.target}_${options.vueCompilerOptions.strictTemplates}.d.ts" />${newLine}`;
+	if (options.vueCompilerOptions.__setupedGlobalTypes?.()) {
+		yield `/// <reference types=".vue-global-types/${options.vueCompilerOptions.lib}_${options.vueCompilerOptions.target}_${options.vueCompilerOptions.strictTemplates}.d.ts" />${newLine}`;
+	}
+	else {
+		yield `/* placeholder */`;
+	}
 
 	if (options.sfc.script?.src) {
 		yield* generateSrc(options.sfc.script, options.sfc.script.src);
@@ -136,6 +142,9 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 		yield `type __VLS_IntrinsicElementsCompletion = __VLS_IntrinsicElements${endOfLine}`;
 	}
 	yield* ctx.localTypes.generate([...ctx.localTypes.getUsedNames()]);
+	if (!options.vueCompilerOptions.__setupedGlobalTypes?.()) {
+		yield generateGlobalTypes(options.vueCompilerOptions.lib, options.vueCompilerOptions.target, options.vueCompilerOptions.strictTemplates);
+	}
 
 	if (options.sfc.scriptSetup) {
 		yield ['', 'scriptSetup', options.sfc.scriptSetup.content.length, codeFeatures.verification];

diff --git a/packages/language-core/lib/types.ts b/packages/language-core/lib/types.ts
@@ -55,6 +55,7 @@ export interface VueCompilerOptions {
 	experimentalModelPropName: Record<string, Record<string, boolean | Record<string, string> | Record<string, string>[]>>;
 
 	// internal
+	__setupedGlobalTypes?: () => boolean;
 	__test?: boolean;
 }
 

diff --git a/packages/language-server/lib/initialize.ts b/packages/language-server/lib/initialize.ts
@@ -44,7 +44,10 @@ export function initialize(
 						createVueLanguagePlugin(
 							ts,
 							compilerOptions,
-							vueCompilerOptions,
+							{
+								...vueCompilerOptions,
+								__setupedGlobalTypes: () => true,
+							},
 							s => uriConverter.asFileName(s)
 						),
 					],

diff --git a/packages/tsc/index.ts b/packages/tsc/index.ts
@@ -22,6 +22,7 @@ export function run(tscPath = require.resolve('typescript/lib/tsc')) {
 				runExtensions.length === allExtensions.length
 				&& runExtensions.every(ext => allExtensions.includes(ext))
 			) {
+				let setupedGlobalTypes = false;
 				try {
 					let dir = typeof configFilePath === 'string'
 						? configFilePath
@@ -36,12 +37,16 @@ export function run(tscPath = require.resolve('typescript/lib/tsc')) {
 					const globalTypesPath = path.resolve(dir, `node_modules/.vue-global-types/${vueOptions.lib}_${vueOptions.target}_${vueOptions.strictTemplates}.d.ts`);
 					const globalTypesContents = vue.generateGlobalTypes(vueOptions.lib, vueOptions.target, vueOptions.strictTemplates);
 					ts.sys.writeFile(globalTypesPath, globalTypesContents);
+					setupedGlobalTypes = true;
 				} catch { }
 
 				const vueLanguagePlugin = vue.createVueLanguagePlugin<string>(
 					ts,
 					options.options,
-					vueOptions,
+					{
+						...vueOptions,
+						__setupedGlobalTypes: () => setupedGlobalTypes,
+					},
 					id => id
 				);
 				return { languagePlugins: [vueLanguagePlugin] };

diff --git a/packages/tsc/tests/dts.spec.ts b/packages/tsc/tests/dts.spec.ts
@@ -31,6 +31,8 @@ describe('vue-tsc-dts', () => {
 			? vue.createParsedCommandLine(ts, ts.sys, configFilePath.replace(windowsPathReg, '/')).vueOptions
 			: vue.resolveVueCompilerOptions({ extensions: ['.vue', '.cext'] });
 
+		let setupedGlobalTypes = false;
+
 		try {
 			let dir = typeof configFilePath === 'string'
 				? configFilePath
@@ -45,12 +47,16 @@ describe('vue-tsc-dts', () => {
 			const globalTypesPath = path.resolve(dir, `node_modules/.vue-global-types/${vueOptions.lib}_${vueOptions.target}_${vueOptions.strictTemplates}.d.ts`);
 			const globalTypesContents = vue.generateGlobalTypes(vueOptions.lib, vueOptions.target, vueOptions.strictTemplates);
 			ts.sys.writeFile(globalTypesPath, globalTypesContents);
+			setupedGlobalTypes = true;
 		} catch { }
 
 		const vueLanguagePlugin = vue.createVueLanguagePlugin<string>(
 			ts,
 			options.options,
-			vueOptions,
+			{
+				...vueOptions,
+				__setupedGlobalTypes: () => setupedGlobalTypes,
+			},
 			id => id
 		);
 		return [vueLanguagePlugin];

diff --git a/packages/typescript-plugin/index.ts b/packages/typescript-plugin/index.ts
@@ -6,16 +6,19 @@ import { startNamedPipeServer } from './lib/server';
 import type * as ts from 'typescript';
 
 const windowsPathReg = /\\/g;
-
 const vueCompilerOptions = new WeakMap<ts.server.Project, vue.VueCompilerOptions>();
+const setupedProjects = new WeakSet<ts.server.Project>();
 
 const basePlugin = createLanguageServicePlugin(
 	(ts, info) => {
 		const vueOptions = getVueCompilerOptions();
 		const languagePlugin = vue.createVueLanguagePlugin<string>(
 			ts,
 			info.languageServiceHost.getCompilationSettings(),
-			vueOptions,
+			{
+				...vueOptions,
+				__setupedGlobalTypes: () => setupedProjects.has(info.project),
+			},
 			id => id
 		);
 
@@ -73,6 +76,7 @@ const plugin: ts.server.PluginModuleFactory = mods => {
 					const globalTypesPath = path.resolve(dir, `node_modules/.vue-global-types/${options.lib}_${options.target}_${options.strictTemplates}.d.ts`);
 					const globalTypesContents = vue.generateGlobalTypes(options.lib, options.target, options.strictTemplates);
 					proj.writeFile(globalTypesPath, globalTypesContents);
+					setupedProjects.add(proj);
 				} catch { }
 			}
 			return pluginModule.getExternalFiles?.(proj, updateLevel) ?? [];