Skip to content
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

fix: Pick up the correct slot scope type from $slots #540

Merged
merged 3 commits into from
Oct 1, 2021
Merged

fix: Pick up the correct slot scope type from $slots #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f9cda6
fix: Pick up the correct slot scope type from `$slots`
yusufkandemir Sep 29, 2021
23862a6
Merge branch 'master' into pr/540
johnsoncodehk Oct 1, 2021
d881df7
fix: fixed slots type edge cases
johnsoncodehk Oct 1, 2021
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
11 changes: 8 additions & 3 deletions packages/vscode-vue-languageservice/src/generators/template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ export function generate(
}>,
}> = {};
const tagResolves: Record<string, {
name: string,
rawComponent: string,
baseProps: string,
emit: string,
slots: string,
events: Record<string, string>,
offsets: number[],
}> = {};
Expand All @@ -94,13 +94,18 @@ export function generate(
const var_rawComponent = `__VLS_${elementIndex++}`;
const var_baseProps = `__VLS_${elementIndex++}`;
const var_emit = `__VLS_${elementIndex++}`;
const var_slots = `__VLS_${elementIndex++}`;
const var_events: Record<string, string> = {};

tsCodeGen.addText(`declare const ${var_correctTagName}: __VLS_GetComponentName<typeof __VLS_rawComponents, '${tag}'>;\n`);
tsCodeGen.addText(`declare const ${var_wrapComponent}: __VLS_GetProperty<typeof __VLS_wrapComponents, typeof ${var_correctTagName}, any>;\n`);
tsCodeGen.addText(`declare const ${var_rawComponent}: __VLS_GetProperty<typeof __VLS_rawComponents, typeof ${var_correctTagName}, any>;\n`);
tsCodeGen.addText(`declare const ${var_baseProps}: __VLS_ExtractComponentProps<typeof ${var_rawComponent}>;\n`);
tsCodeGen.addText(`declare const ${var_emit}: __VLS_ExtractEmit2<typeof ${var_rawComponent}>;\n`);
tsCodeGen.addText(`declare const ${var_slots}:
__VLS_TemplateSlots<typeof ${var_wrapComponent}>
& __VLS_ScriptSlots<typeof ${var_rawComponent}>
& __VLS_DefaultSlots<typeof ${var_wrapComponent}, typeof ${var_rawComponent}>;\n`);

const resolvedTag = tags[tag];
const tagRanges = resolvedTag.offsets.map(offset => ({ start: offset, end: offset + tag.length }));
Expand Down Expand Up @@ -212,10 +217,10 @@ export function generate(
}

tagResolves[tag] = {
name: var_correctTagName,
rawComponent: var_rawComponent,
baseProps: var_baseProps,
emit: var_emit,
slots: var_slots,
events: var_events,
offsets: tags[tag].offsets.map(offset => htmlToTemplate(offset, offset)).filter(shared.notEmpty),
};
Expand Down Expand Up @@ -1123,7 +1128,7 @@ export function generate(
slotName = prop.arg.content;
}
const diagStart = tsCodeGen.getText().length;
tsCodeGen.addText(`({ ...__VLS_getTemplateSlots(__VLS_wrapComponents[${tagResolves[parentEl.tag].name}]), ...__VLS_getScriptSlots(__VLS_rawComponents[${tagResolves[parentEl.tag].name}])})`);
tsCodeGen.addText(tagResolves[parentEl.tag].slots);
const argRange = prop.arg
? {
start: prop.arg.loc.start.offset,
Expand Down
9 changes: 7 additions & 2 deletions packages/vscode-vue-languageservice/src/utils/globalDoc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,13 @@ declare global {
function __VLS_directiveFunction<T>(dir: T): T extends ObjectDirective<infer E, infer V> ? V extends { value: infer V_2 } ? (value: V_2) => void : (value: V) => void
: T extends FunctionDirective<infer E, infer V> ? V extends { value: infer V_2 } ? (value: V_2) => void : (value: V) => void : T;
function __VLS_getTemplateSlots<T>(t: T): T extends { __VLS_slots: infer S } ? S : {};
function __VLS_getScriptSlots<T>(t: T): T extends new (...args: any) => { $slots?: infer S } ? (S extends object ? S : {}) : {};
type __VLS_TemplateSlots<T> = T extends { __VLS_slots: infer S } ? S : {};
type __VLS_ScriptSlots<T> = T extends new (...args: any) => { $slots?: infer S }
? { [K in keyof S]: S[K] extends (obj: infer O) => any ? O : S[K] }
: {};
type __VLS_DefaultSlots<W, R> = W extends { __VLS_slots: infer _ }
? {} : R extends new (...args: any) => { $slots?: infer _ }
? {} : Record<string, any>;
type __VLS_GetComponentName<T, K extends string> = K extends keyof T ? IsAny<T[K]> extends false ? K : __VLS_GetComponentName_CamelCase<T, CamelCase<K>> : __VLS_GetComponentName_CamelCase<T, CamelCase<K>>;
type __VLS_GetComponentName_CamelCase<T, K extends string> = K extends keyof T ? IsAny<T[K]> extends false ? K : __VLS_GetComponentName_CapitalCase<T, Capitalize<K>> : __VLS_GetComponentName_CapitalCase<T, Capitalize<K>>;
Expand Down