fix: `strictTemplates did not check for unknown components

close #2291
vuejs · Feb 18, 2023 · 27f2960 · 27f2960
1 parent 48e1d51
commit 27f2960
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 17 deletions.
diff --git a/packages/vue-language-core/src/generators/template.ts b/packages/vue-language-core/src/generators/template.ts
@@ -144,7 +144,7 @@ export function generate(
 
 		const data: Record<string, string> = {};
 
-		codeGen.push(`let __VLS_templateComponents!: {\n`);
+		codeGen.push(`let __VLS_templateComponents!: {}\n`);
 
 		for (const tagName in tagNames) {
 
@@ -163,12 +163,12 @@ export function generate(
 			]);
 			const varName = validTsVar.test(tagName) ? tagName : capitalize(camelize(tagName.replace(/:/g, '-')));
 
-			codeGen.push(`${varName}: import('./__VLS_types.js').GetComponents<typeof __VLS_components, ${[...names].map(name => `'${name}'`).join(', ')}>;\n`);
+			codeGen.push(`& import('./__VLS_types.js').WithComponent<'${varName}', typeof __VLS_components, ${[...names].map(name => `'${name}'`).join(', ')}>\n`);
 
 			data[tagName] = varName;
 		}
 
-		codeGen.push(`};\n`);
+		codeGen.push(`;\n`);
 
 		for (const tagName in tagNames) {
 
@@ -541,7 +541,13 @@ export function generate(
 					codeGen.push(`;\n`);
 				}
 
-				codeGen.push(`let __VLS_${elementIndex++}: JSX.IntrinsicElements = { `);
+				codeGen.push(`(__VLS_x as JSX.IntrinsicElements)[`);
+				writeCodeWithQuotes(
+					node.tag,
+					tagOffsets[0],
+					capabilitiesPresets.diagnosticOnly,
+				);
+				codeGen.push(`] = `);
 			}
 			else if (_isNamespacedTag) {
 
@@ -555,7 +561,7 @@ export function generate(
 					codeGen.push(`;\n`);
 				}
 
-				codeGen.push(`const __VLS_${elementIndex++}: import('./__VLS_types.js').ComponentProps<typeof ${node.tag}> = { `);
+				codeGen.push(`(__VLS_x as import('./__VLS_types.js').ComponentProps<typeof ${node.tag}>) = `);
 			}
 			else {
 
@@ -567,29 +573,34 @@ export function generate(
 						componentVars[node.tag] ?? node.tag,
 						'template',
 						[endTagOffset, endTagOffset + node.tag.length],
-						capabilitiesPresets.tagHover,
+						{
+							...capabilitiesPresets.tagHover,
+							...capabilitiesPresets.diagnosticOnly,
+						},
 					]);
 					codeGen.push(`;\n`);
 				}
 
-				codeGen.push(`const __VLS_${elementIndex++}: { '${node.tag}': import('./__VLS_types.js').ComponentProps<typeof `);
+				codeGen.push(`(__VLS_x as import('./__VLS_types.js').ComponentProps<typeof `);
 				if (componentVars[node.tag]) {
 					codeGen.push(`__VLS_templateComponents.`);
 				}
 				codeGen.push([
 					componentVars[node.tag] ?? node.tag,
 					'template',
 					[startTagOffset, startTagOffset + node.tag.length],
-					capabilitiesPresets.tagHover,
+					{
+						...capabilitiesPresets.tagHover,
+						...capabilitiesPresets.diagnosticOnly,
+					},
 				]);
-				codeGen.push(`> } = { `);
+				codeGen.push(`>) = `);
 			}
 
-			writeObjectProperty(node.tag, startTagOffset, capabilitiesPresets.diagnosticOnly, node);
-			codeGen.push(` : { `);
+			codeGen.push(`{ `);
 			const { unWriteExps } = writeProps(node, 'class', 'props');
 			_unWriteExps = unWriteExps;
-			codeGen.push(` } };\n`);
+			codeGen.push(`};\n`);
 		}
 		{
 

diff --git a/packages/vue-language-core/src/utils/localTypes.ts b/packages/vue-language-core/src/utils/localTypes.ts
@@ -102,11 +102,11 @@ export type FirstFunction<F0 = void, F1 = void, F2 = void, F3 = void, F4 = void>
 	NonNullable<F4> extends (Function | AnyArray<Function>) ? F4 :
 	unknown;
 export type SelfComponent<N, C> = string extends N ? {} : N extends string ? { [P in N]: C } : {};
-export type GetComponents<Components, N1, N2 = unknown, N3 = unknown> =
-	N1 extends keyof Components ? Components[N1] :
-	N2 extends keyof Components ? Components[N2] :
-	N3 extends keyof Components ? Components[N3] :
-	${vueCompilerOptions.strictTemplates ? 'unknown' : 'any'};
+export type WithComponent<N0, Components, N1, N2 = unknown, N3 = unknown> =
+	N1 extends keyof Components ? { [K in N0]: Components[N1] } :
+	N2 extends keyof Components ? { [K in N0]: Components[N2] } :
+	N3 extends keyof Components ? { [K in N0]: Components[N3] } :
+	${vueCompilerOptions.strictTemplates ? '{}' : '{ [K in N0]: any }'};
 export type ComponentProps<T> =
 	${vueCompilerOptions.strictTemplates ? '' : 'Record<string, unknown> &'}
 	(