Skip to content

feat: Improve Typed Slots Support #2547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 26, 2023
Merged

feat: Improve Typed Slots Support #2547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dcf1ca3
refactor: generate slots as `$slots` function members
johnsoncodehk Mar 26, 2023
fdaf8e8
feat: count anonymous default slot references
johnsoncodehk Mar 26, 2023
090d0ba
feat: support slot required checking
johnsoncodehk Mar 26, 2023
244cc25
refactor: `__VLS_x` -> `__VLS_any`
johnsoncodehk Mar 26, 2023
b055d37
fix: fixed slots tests
johnsoncodehk Mar 26, 2023
6c61e99
Merge branch 'master' into typed-slots-improves
johnsoncodehk Mar 26, 2023
7cd49ab
Merge branch 'master' into typed-slots-improves
johnsoncodehk Mar 26, 2023
7519fde
feat: extract slots type with `keyof JSX.ElementChildrenAttribute`
johnsoncodehk Mar 26, 2023
ff7466e
chore: fix test
johnsoncodehk Mar 26, 2023
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
5 changes: 4 additions & 1 deletion packages/vue-component-meta/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,10 @@ function createSchemaResolvers(
};
}
function resolveSlotProperties(prop: ts.Symbol): SlotMeta {
const subtype = typeChecker.getTypeOfSymbolAtLocation(typeChecker.getTypeOfSymbolAtLocation(prop, symbolNode!).getCallSignatures()[0].parameters[0], symbolNode!);
const propType = typeChecker.getNonNullableType(typeChecker.getTypeOfSymbolAtLocation(prop, symbolNode!));
const signatures = propType.getCallSignatures();
const paramType = signatures[0].parameters[0];
const subtype = typeChecker.getTypeOfSymbolAtLocation(paramType, symbolNode!);
let schema: PropertyMetaSchema;

return {
Expand Down
2 changes: 2 additions & 0 deletions packages/vue-language-core/src/generators/script.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,8 @@ export function generate(

const useGlobalThisTypeInCtx = fileName.endsWith('.html');

codeGen.push(`let __VLS_any: any;\n`);

codeGen.push(`let __VLS_ctx!: ${useGlobalThisTypeInCtx ? 'typeof globalThis &' : ''}`);
if (sfc.scriptSetup) {
codeGen.push(`InstanceType<import('./__VLS_types.js').PickNotAny<typeof __VLS_publicComponent, new () => {}>> & `);
Expand Down
Loading