Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/language-core/lib/codegen/globalTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export function generateGlobalTypes(options: VueCompilerOptions) {
type __VLS_ResolveDirectives<T> = {
[K in keyof T & string as \`v\${Capitalize<K>}\`]: T[K];
};
type __VLS_PrettifyGlobal<T> = { [K in keyof T as K]: T[K]; } & {};
type __VLS_PrettifyGlobal<T> = (T extends any ? { [K in keyof T]: T[K]; } : { [K in keyof T as K]: T[K]; }) & {};
type __VLS_WithDefaultsGlobal<P, D> = {
[K in keyof P as K extends keyof D ? K : never]-?: P[K];
} & {
Expand Down
3 changes: 2 additions & 1 deletion packages/language-core/lib/codegen/localTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ type __VLS_WithDefaultsLocal<P, D> = {
);
const PrettifyLocal = defineHelper(
`__VLS_PrettifyLocal`,
() => `type __VLS_PrettifyLocal<T> = { [K in keyof T as K]: T[K]; } & {}${endOfLine}`,
() =>
`type __VLS_PrettifyLocal<T> = (T extends any ? { [K in keyof T]: T[K]; } : { [K in keyof T as K]: T[K]; }) & {}${endOfLine}`,
);
const WithSlots = defineHelper(
`__VLS_WithSlots`,
Expand Down
12 changes: 8 additions & 4 deletions packages/tsc/tests/__snapshots__/dts.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,11 @@ exports[`vue-tsc-dts > Input: generic/component.vue, Output: generic/component.v
};
declare const _default: typeof __VLS_export;
export default _default;
type __VLS_PrettifyLocal<T> = {
type __VLS_PrettifyLocal<T> = (T extends any ? {
[K in keyof T]: T[K];
} : {
[K in keyof T as K]: T[K];
} & {};
}) & {};
"
`;

Expand Down Expand Up @@ -110,9 +112,11 @@ exports[`vue-tsc-dts > Input: generic/custom-extension-component.cext, Output: g
};
declare const _default: typeof __VLS_export;
export default _default;
type __VLS_PrettifyLocal<T> = {
type __VLS_PrettifyLocal<T> = (T extends any ? {
[K in keyof T]: T[K];
} : {
[K in keyof T as K]: T[K];
} & {};
}) & {};
"
`;

Expand Down
8 changes: 8 additions & 0 deletions test-workspace/tsc/passedFixtures/vue3/#5592/child.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<script setup lang="ts" generic="T">
defineOptions({ inheritAttrs: false });
defineProps</* @vue-ignore */ T>();
</script>

<template>
<slot v-bind="$attrs as T" />
</template>
9 changes: 9 additions & 0 deletions test-workspace/tsc/passedFixtures/vue3/#5592/main.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<script setup lang="ts">
import child from './child.vue';
</script>

<template>
<child #default="{ foo, bar }" :foo="42" bar="baz">
{{ foo }} {{ bar }}
</child>
</template>
Loading