@vue/language-core 1.8.10 → 1.8.12

package/out/generators/script.js

@@ -252,7 +252,7 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
         if (!scriptSetupRanges)
             return;
         codes.push([
-            sfc.scriptSetup.content.substring(0, Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset)),
+            sfc.scriptSetup.content.substring(0, Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset)) + '\n',
             'scriptSetup',
             0,
             language_core_1.FileRangeCapabilities.full,
@@ -433,7 +433,20 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
         const definePropProposalA = sfc.scriptSetup.content.trimStart().startsWith('// @experimentalDefinePropProposal=kevinEdition') || vueCompilerOptions.experimentalDefinePropProposal === 'kevinEdition';
         const definePropProposalB = sfc.scriptSetup.content.trimStart().startsWith('// @experimentalDefinePropProposal=johnsonEdition') || vueCompilerOptions.experimentalDefinePropProposal === 'johnsonEdition';
         if (vueCompilerOptions.target >= 3.3) {
-            codes.push(`const { defineProps, defineEmits, defineExpose, defineOptions, defineSlots, defineModel, withDefaults } = await import('${vueCompilerOptions.lib}');\n`);
+            const bindings = new Set(scriptSetupRanges.bindings.map(range => sfc.scriptSetup.content.substring(range.start, range.end)));
+            codes.push('const { ');
+            for (const [macro, aliases] of Object.entries(vueCompilerOptions.macros)) {
+                for (const alias of aliases) {
+                    if (!bindings.has(alias)) {
+                        codes.push(macro);
+                        if (alias !== macro) {
+                            codes.push(` : ${alias}`);
+                        }
+                        codes.push(`, `);
+                    }
+                }
+            }
+            codes.push(`} = await import('${vueCompilerOptions.lib}');\n`);
         }
         if (definePropProposalA) {
             codes.push(`

package/out/generators/template.js

@@ -60,6 +60,8 @@ const capabilitiesPresets = {
 };
 const formatBrackets = {
     normal: ['`${', '}`;'],
+    // fix https://github.com/vuejs/language-tools/issues/3572
+    params: ['(', ') => {}'],
     // fix https://github.com/vuejs/language-tools/issues/1210
     // fix https://github.com/vuejs/language-tools/issues/2305
     curly: ['0 +', '+ 0;'],
@@ -95,6 +97,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
     const identifiers = new Set();
     const scopedClasses = [];
     const blockConditions = [];
+    const hasSlotElements = new Set();
     let hasSlot = false;
     let elementIndex = 0;
     let ignoreStart;
@@ -312,7 +315,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                 }
             }
             codes.push([
-                '// @ts-expect-error',
+                '// @ts-expect-error __VLS_TS_EXPECT_ERROR',
                 'template',
                 [expectedErrorNode.loc.start.offset, expectedErrorNode.loc.end.offset],
                 {
@@ -529,14 +532,12 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
             }
             codes.push(`typeof __VLS_resolvedLocalAndGlobalComponents['${toCanonicalComponentName(tag)}'];\n`);
         }
-        codes.push(`const ${var_functionalComponent} = __VLS_asFunctionalComponent(`, `${var_originalComponent}, `);
         if (isIntrinsicElement) {
-            codes.push('{}');
+            codes.push(`const ${var_functionalComponent} = __VLS_elementAsFunctionalComponent(${var_originalComponent});\n`);
         }
         else {
-            codes.push(`new ${var_originalComponent}({`, ...createPropsCode(node, props, 'extraReferences'), '})');
+            codes.push(`const ${var_functionalComponent} = __VLS_asFunctionalComponent(`, `${var_originalComponent}, `, `new ${var_originalComponent}({`, ...createPropsCode(node, props, 'extraReferences'), '})', ');\n');
         }
-        codes.push(');\n');
         for (const offset of tagOffsets) {
             if (isNamespacedTag || dynamicTagExp) {
                 continue;
@@ -567,24 +568,32 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                 ], ';\n');
             }
         }
-        codes.push(`const ${var_componentInstance} = ${var_functionalComponent}(`, 
-        // diagnostic start
-        tagOffsets.length ? ['', 'template', tagOffsets[0], capabilitiesPresets.diagnosticOnly]
-            : dynamicTagExp ? ['', 'template', startTagOffset, capabilitiesPresets.diagnosticOnly]
-                : '', '{ ');
-        if (!vueCompilerOptions.strictTemplates) {
-            // fix https://github.com/vuejs/language-tools/issues/3318
-            codes.push('...{ ');
-        }
-        codes.push(...createPropsCode(node, props, 'normal', propsFailedExps));
-        if (!vueCompilerOptions.strictTemplates) {
-            codes.push('}, ');
-        }
-        codes.push('}', 
-        // diagnostic end
-        tagOffsets.length ? ['', 'template', tagOffsets[0] + tag.length, capabilitiesPresets.diagnosticOnly]
-            : dynamicTagExp ? ['', 'template', startTagOffset + tag.length, capabilitiesPresets.diagnosticOnly]
-                : '', `, ...__VLS_functionalComponentArgsRest(${var_functionalComponent}));\n`);
+        if (vueCompilerOptions.strictTemplates) {
+            // with strictTemplates, generate once for props type-checking + instance type
+            codes.push(`const ${var_componentInstance} = ${var_functionalComponent}(`, 
+            // diagnostic start
+            tagOffsets.length ? ['', 'template', tagOffsets[0], capabilitiesPresets.diagnosticOnly]
+                : dynamicTagExp ? ['', 'template', startTagOffset, capabilitiesPresets.diagnosticOnly]
+                    : '', '{ ', ...createPropsCode(node, props, 'normal', propsFailedExps), '}', 
+            // diagnostic end
+            tagOffsets.length ? ['', 'template', tagOffsets[0] + tag.length, capabilitiesPresets.diagnosticOnly]
+                : dynamicTagExp ? ['', 'template', startTagOffset + tag.length, capabilitiesPresets.diagnosticOnly]
+                    : '', `, ...__VLS_functionalComponentArgsRest(${var_functionalComponent}));\n`);
+        }
+        else {
+            // without strictTemplates, this only for instacne type
+            codes.push(`const ${var_componentInstance} = ${var_functionalComponent}(`, '{ ', ...createPropsCode(node, props, 'extraReferences'), '}', `, ...__VLS_functionalComponentArgsRest(${var_functionalComponent}));\n`);
+            // and this for props type-checking
+            codes.push(`({} as (props: __VLS_FunctionalComponentProps<typeof ${var_originalComponent}, typeof ${var_componentInstance}> & Record<string, unknown>) => void)(`, 
+            // diagnostic start
+            tagOffsets.length ? ['', 'template', tagOffsets[0], capabilitiesPresets.diagnosticOnly]
+                : dynamicTagExp ? ['', 'template', startTagOffset, capabilitiesPresets.diagnosticOnly]
+                    : '', '{ ', ...createPropsCode(node, props, 'normal', propsFailedExps), '}', 
+            // diagnostic end
+            tagOffsets.length ? ['', 'template', tagOffsets[0] + tag.length, capabilitiesPresets.diagnosticOnly]
+                : dynamicTagExp ? ['', 'template', startTagOffset + tag.length, capabilitiesPresets.diagnosticOnly]
+                    : '', `);\n`);
+        }
         if (tag !== 'template' && tag !== 'slot') {
             componentCtxVar = `__VLS_${elementIndex++}`;
             codes.push(`const ${componentCtxVar} = __VLS_pickFunctionalComponentCtx(${var_originalComponent}, ${var_componentInstance})!;\n`);
@@ -636,13 +645,16 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         //#endregion
         const slotDir = node.props.find(p => p.type === 7 /* CompilerDOM.NodeTypes.DIRECTIVE */ && p.name === 'slot');
         if (slotDir && componentCtxVar) {
+            if (parentEl) {
+                hasSlotElements.add(parentEl);
+            }
             const slotBlockVars = [];
             codes.push(`{\n`);
             let hasProps = false;
             if (slotDir?.exp?.type === 4 /* CompilerDOM.NodeTypes.SIMPLE_EXPRESSION */) {
-                formatCodes.push(...createFormatCode(slotDir.exp.content, slotDir.exp.loc.start.offset, formatBrackets.normal));
-                const collectAst = createTsAst(slotDir, `(${slotDir.exp.content}) => {}`);
-                (0, transform_1.colletVars)(ts, collectAst, slotBlockVars);
+                formatCodes.push(...createFormatCode(slotDir.exp.content, slotDir.exp.loc.start.offset, formatBrackets.params));
+                const slotAst = createTsAst(slotDir, `(${slotDir.exp.content}) => {}`);
+                (0, transform_1.colletVars)(ts, slotAst, slotBlockVars);
                 hasProps = true;
                 if (slotDir.exp.content.indexOf(':') === -1) {
                     codes.push('const [', [
@@ -712,6 +724,18 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                 prev = childNode;
             }
             resolveComment();
+            // fix https://github.com/vuejs/language-tools/issues/932
+            if (!hasSlotElements.has(node) && node.children.length) {
+                codes.push(`(${componentCtxVar}.slots!)`, ...createPropertyAccessCode([
+                    'default',
+                    'template',
+                    [
+                        node.children[0].loc.start.offset,
+                        node.children[node.children.length - 1].loc.end.offset,
+                    ],
+                    { references: true },
+                ]), ';\n');
+            }
         }
         codes.push(`}\n`);
     }
@@ -721,7 +745,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                 && prop.name === 'on'
                 && prop.arg?.type === 4 /* CompilerDOM.NodeTypes.SIMPLE_EXPRESSION */) {
                 const eventVar = `__VLS_${elementIndex++}`;
-                codes.push(`let ${eventVar} = { '${prop.arg.loc.source}': `, `__VLS_pickEvent(${componentCtxVar}.emit!, '${prop.arg.loc.source}' as const, __VLS_componentProps(${componentVar}, ${componentInstanceVar})`, ...createPropertyAccessCode([
+                codes.push(`let ${eventVar} = { '${prop.arg.loc.source}': `, `__VLS_pickEvent(${componentCtxVar}.emit!, '${prop.arg.loc.source}' as const, {} as __VLS_FunctionalComponentProps<typeof ${componentVar}, typeof ${componentInstanceVar}>`, ...createPropertyAccessCode([
                     (0, shared_1.camelize)('on-' + prop.arg.loc.source),
                     'template',
                     [prop.arg.loc.start.offset, prop.arg.loc.end.offset],

package/out/parsers/scriptSetupRanges.js

@@ -65,7 +65,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
         if (ts.isCallExpression(node)
             && ts.isIdentifier(node.expression)) {
             const callText = node.expression.getText(ast);
-            if (callText === 'defineModel') {
+            if (vueCompilerOptions.macros.defineModel.includes(callText)) {
                 let name;
                 let options;
                 if (node.arguments.length >= 2) {

package/out/plugins/file-md.js

@@ -8,6 +8,7 @@ const scriptSetupReg = /\\\<[\s\S]+?\>\n?/g;
 const sfcBlockReg = /\<(script|style)\b[\s\S]*?\>([\s\S]*?)\<\/\1\>/g;
 const angleBracketReg = /\<\S*\:\S*\>/g;
 const linkReg = /\[[\s\S]*?\]\([\s\S]*?\)/g;
+const codeSnippetImportReg = /^\s*<<<\s*.+/gm;
 const plugin = () => {
     return {
         version: 1,
@@ -19,7 +20,9 @@ const plugin = () => {
                     // inline code block
                     .replace(inlineCodeblockReg, match => `\`${' '.repeat(match.length - 2)}\``)
                     // # \<script setup>
-                    .replace(scriptSetupReg, match => ' '.repeat(match.length));
+                    .replace(scriptSetupReg, match => ' '.repeat(match.length))
+                    // <<< https://vitepress.dev/guide/markdown#import-code-snippets
+                    .replace(codeSnippetImportReg, match => ' '.repeat(match.length));
                 const codes = [];
                 for (const match of content.matchAll(sfcBlockReg)) {
                     if (match.index !== undefined) {

package/out/types.d.ts

@@ -23,6 +23,8 @@ export interface VueCompilerOptions {
         defineSlots: string[];
         defineEmits: string[];
         defineExpose: string[];
+        defineModel: string[];
+        defineOptions: string[];
         withDefaults: string[];
     };
     plugins: VueLanguagePlugin[];

package/out/utils/globalTypes.js

@@ -97,7 +97,8 @@ declare function __VLS_asFunctionalComponent<T, K = T extends new (...args: any)
 	}) => JSX.Element & { __ctx?: typeof ctx & { props?: typeof props; expose?(exposed: K): void; } }
 	: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
 	: T extends (...args: any) => any ? T
-	: (_: T extends import('${vueCompilerOptions.lib}').VNode | import('${vueCompilerOptions.lib}').VNode[] | string ? {}: T${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: T${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'} } }; // IntrinsicElement
+	: (_: {}${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {}${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'} } };
+declare function __VLS_elementAsFunctionalComponent<T>(t: T): (_: T${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: T${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'} } };
 declare function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): Parameters<T>['length'] extends 2 ? [any] : [];
 declare function __VLS_pickEvent<Emit, K, E>(emit: Emit, emitKey: K, event: E): __VLS_FillingEventArg<
 	__VLS_PickNotAny<
@@ -106,16 +107,16 @@ declare function __VLS_pickEvent<Emit, K, E>(emit: Emit, emitKey: K, event: E):
 	>
 > | undefined;
 declare function __VLS_pickFunctionalComponentCtx<T, K>(comp: T, compInstance: K): __VLS_PickNotAny<
-	K extends { __ctx?: infer Ctx } ? Ctx : any,
-	T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
+	'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
+	, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
 >;
+type __VLS_FunctionalComponentProps<T, K> =
+	'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: { props?: infer P } } ? NonNullable<P> : never
+	: T extends (props: infer P, ...args: any) => any ? P :
+	{};
 type __VLS_AsFunctionOrAny<F> = unknown extends F ? any : ((...args: any) => any) extends F ? F : any;
 
 declare function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
-declare function __VLS_componentProps<T, K>(comp: T, fnReturn: K):
-	__VLS_PickNotAny<K, {}> extends { __ctx: { props: infer P } } ? NonNullable<P>
-	: T extends (props: infer P, ...args: any) => any ? NonNullable<P> :
-	{};
 `.trim();
 }
 exports.getTypesCode = getTypesCode;

package/out/utils/ts.js

@@ -225,12 +225,15 @@ function resolveVueCompilerOptions(vueOptions) {
         optionsWrapper: vueOptions.optionsWrapper ?? (target >= 2.7
             ? [`(await import('${lib}')).defineComponent(`, `)`]
             : [`(await import('vue')).default.extend(`, `)`]),
-        macros: vueOptions.macros ?? {
+        macros: {
             defineProps: ['defineProps'],
             defineSlots: ['defineSlots'],
             defineEmits: ['defineEmits'],
             defineExpose: ['defineExpose'],
+            defineModel: ['defineModel'],
+            defineOptions: ['defineOptions'],
             withDefaults: ['withDefaults'],
+            ...vueOptions.macros,
         },
         plugins: vueOptions.plugins ?? [],
         hooks: vueOptions.hooks ?? [],

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "1.8.10",
+	"version": "1.8.12",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "97d60fa475b653fe435a7fae6e2a626821658351"
+	"gitHead": "a065fd7516de02f1804f3394d6e2e0511a1e67a5"
 }