fix(language-core): fallthrough attributes should be optional

vuejs · Aug 26, 2024 · b2707f0 · b2707f0
1 parent 29b13cf
commit b2707f0
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 9 deletions.
diff --git a/packages/language-core/lib/codegen/script/template.ts b/packages/language-core/lib/codegen/script/template.ts
@@ -158,7 +158,7 @@ function* generateTemplateContext(
 	yield `return {${newLine}`;
 	yield `slots: ${options.scriptSetupRanges?.slots.name ?? '__VLS_slots'},${newLine}`;
 	yield `refs: __VLS_refs as __VLS_PickRefsExpose<typeof __VLS_refs>,${newLine}`;
-	yield `attrs: __VLS_inheritedAttrs,${newLine}`;
+	yield `attrs: {} as Partial<typeof __VLS_inheritedAttrs>,${newLine}`;
 	yield `}${endOfLine}`;
 }
 

diff --git a/packages/tsc/tests/__snapshots__/dts.spec.ts.snap b/packages/tsc/tests/__snapshots__/dts.spec.ts.snap
@@ -170,17 +170,17 @@ type __VLS_Prettify<T> = {
 `;
 
 exports[`vue-tsc-dts > Input: generic/main.vue, Output: generic/main.vue.d.ts 1`] = `
-"declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<__VLS_OmitIndexSignature<{
+"declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<__VLS_OmitIndexSignature<Partial<{
     "onUpdate:title"?: (title: string) => any;
     onBar?: (data: number) => any;
     title?: string;
     foo: number;
-} & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps>>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<__VLS_OmitIndexSignature<{
+} & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps>>>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<__VLS_OmitIndexSignature<Partial<{
     "onUpdate:title"?: (title: string) => any;
     onBar?: (data: number) => any;
     title?: string;
     foo: number;
-} & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps>>>>, {}, {}>;
+} & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps>>>>>, {}, {}>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
 type __VLS_TypePropsToOption<T> = {
@@ -671,7 +671,7 @@ exports[`vue-tsc-dts > Input: template-slots/component.vue, Output: template-slo
         }): any;
     };
     refs: __VLS_PickRefsExpose<{}>;
-    attrs: {};
+    attrs: Partial<{}>;
 };
 type __VLS_Slots = ReturnType<typeof __VLS_template>['slots'];
 declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
@@ -714,7 +714,7 @@ declare const __VLS_template: () => {
         'no-bind': () => VNode[];
     };
     refs: __VLS_PickRefsExpose<{}>;
-    attrs: {};
+    attrs: Partial<{}>;
 };
 type __VLS_Slots = ReturnType<typeof __VLS_template>['slots'];
 declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
@@ -740,7 +740,7 @@ exports[`vue-tsc-dts > Input: template-slots/component-destructuring.vue, Output
         }) => any[];
     };
     refs: __VLS_PickRefsExpose<{}>;
-    attrs: {};
+    attrs: Partial<{}>;
 };
 type __VLS_Slots = ReturnType<typeof __VLS_template>['slots'];
 declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
@@ -770,7 +770,7 @@ exports[`vue-tsc-dts > Input: template-slots/component-no-script.vue, Output: te
         }): any;
     };
     refs: __VLS_PickRefsExpose<{}>;
-    attrs: {};
+    attrs: Partial<{}>;
 };
 type __VLS_Slots = ReturnType<typeof __VLS_template>['slots'];
 declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;

diff --git a/test-workspace/tsc/passedFixtures/vue3_strictTemplate/inheritAttrs/main.vue b/test-workspace/tsc/passedFixtures/vue3_strictTemplate/inheritAttrs/main.vue
@@ -1,4 +1,4 @@
-<script setup	lang="ts">
+<script setup lang="ts">
 import { exactType } from '../../shared';
 import basic from './basic.vue';
 import inheritAttrsFalse from './inherit-attrs-false.vue';

diff --git a/test-workspace/tsc/passedFixtures/vue3_strictTemplate/inheritAttrs_requiredProps/basic.vue b/test-workspace/tsc/passedFixtures/vue3_strictTemplate/inheritAttrs_requiredProps/basic.vue
@@ -0,0 +1,7 @@
+<script setup lang="ts">
+import child from './child.vue';
+</script>
+
+<template>
+	<child bar="bar" />
+</template>
diff --git a/test-workspace/tsc/passedFixtures/vue3_strictTemplate/inheritAttrs_requiredProps/child.vue b/test-workspace/tsc/passedFixtures/vue3_strictTemplate/inheritAttrs_requiredProps/child.vue
@@ -0,0 +1,5 @@
+<script setup lang="ts">
+defineProps<{
+	bar: string;
+}>();
+</script>
diff --git a/test-workspace/tsc/passedFixtures/vue3_strictTemplate/inheritAttrs_requiredProps/main.vue b/test-workspace/tsc/passedFixtures/vue3_strictTemplate/inheritAttrs_requiredProps/main.vue
@@ -0,0 +1,7 @@
+<script setup lang="ts">
+import basic from './basic.vue';
+</script>
+
+<template>
+	<basic />
+</template>