@vue/language-core 1.8.10 → 1.8.11

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

@@ -95,6 +95,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 +313,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],
                 {
@@ -636,6 +637,9 @@ 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;
@@ -712,6 +716,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`);
     }

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/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/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.11",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "97d60fa475b653fe435a7fae6e2a626821658351"
+	"gitHead": "cce193dcc182aad5d02f630fa3ae8a793d443680"
 }