@vue/language-core 2.0.15 → 2.0.16

package/lib/codegen/script/component.js

@@ -98,10 +98,10 @@ function* generateScriptSetupOptions(options, ctx, scriptSetup, scriptSetupRange
     if (options.vueCompilerOptions.target >= 3.5) {
         // https://github.com/vuejs/core/pull/10801
         if (scriptSetupRanges.props.define?.typeArg) {
-            yield `__typeProps: typeof __VLS_typeProps,${common_1.newLine}`;
+            yield `__typeProps: __VLS_typeProps,${common_1.newLine}`;
         }
         if (scriptSetupRanges.emits.define?.typeArg) {
-            yield `__typeEmits: typeof ${scriptSetupRanges.emits.name ?? '__VLS_emit'},${common_1.newLine}`;
+            yield `__typeEmits: ${scriptSetupRanges.emits.name ?? '__VLS_emit'},${common_1.newLine}`;
         }
     }
 }

package/lib/codegen/script/scriptSetup.js

@@ -142,16 +142,16 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
         }
     }
     if (scriptSetupRanges.slots.define) {
-        if (!scriptSetupRanges.slots.name) {
-            setupCodeModifies.push([[`const __VLS_slots = `], scriptSetupRanges.slots.define.start, scriptSetupRanges.slots.define.start]);
-        }
-        else if (scriptSetupRanges.slots.isObjectBindingPattern) {
+        if (scriptSetupRanges.slots.isObjectBindingPattern) {
             setupCodeModifies.push([
                 [`__VLS_slots;\nconst __VLS_slots = `],
                 scriptSetupRanges.slots.define.start,
                 scriptSetupRanges.slots.define.start,
             ]);
         }
+        else if (!scriptSetupRanges.slots.name) {
+            setupCodeModifies.push([[`const __VLS_slots = `], scriptSetupRanges.slots.define.start, scriptSetupRanges.slots.define.start]);
+        }
     }
     if (scriptSetupRanges.emits.define && !scriptSetupRanges.emits.name) {
         setupCodeModifies.push([[`const __VLS_emit = `], scriptSetupRanges.emits.define.start, scriptSetupRanges.emits.define.start]);

package/lib/codegen/template/elementChildren.js

@@ -13,7 +13,8 @@ function* generateElementChildren(options, ctx, node, currentComponent, componen
     }
     yield* ctx.generateAutoImportCompletion();
     // fix https://github.com/vuejs/language-tools/issues/932
-    if (!ctx.hasSlotElements.has(node)
+    if (componentCtxVar
+        && !ctx.hasSlotElements.has(node)
         && node.children.length
         && node.tagType !== CompilerDOM.ElementTypes.ELEMENT
         && node.tagType !== CompilerDOM.ElementTypes.TEMPLATE) {

package/lib/codegen/template/slotOutlet.js

@@ -29,41 +29,40 @@ function* generateSlotOutlet(options, ctx, node, currentComponent, componentCtxV
         yield `)?.(`;
         yield* (0, common_1.wrapWith)(startTagOffset, startTagOffset + node.tag.length, ctx.codeFeatures.verification, `{${common_1.newLine}`, ...(0, elementProps_1.generateElementProps)(options, ctx, node, node.props.filter(prop => prop !== nameProp), true), `}`);
         yield `)${common_1.endOfLine}`;
-        return;
     }
     else {
         yield `var ${varSlot} = {${common_1.newLine}`;
         yield* (0, elementProps_1.generateElementProps)(options, ctx, node, node.props.filter(prop => prop !== nameProp), true);
         yield `}${common_1.endOfLine}`;
-    }
-    if (nameProp?.type === CompilerDOM.NodeTypes.ATTRIBUTE
-        && nameProp.value) {
-        ctx.slots.push({
-            name: nameProp.value.content,
-            loc: nameProp.loc.start.offset + nameProp.loc.source.indexOf(nameProp.value.content, nameProp.name.length),
-            tagRange: [startTagOffset, startTagOffset + node.tag.length],
-            varName: varSlot,
-            nodeLoc: node.loc,
-        });
-    }
-    else if (nameProp?.type === CompilerDOM.NodeTypes.DIRECTIVE
-        && nameProp.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-        const slotExpVar = ctx.getInternalVariable();
-        yield `var ${slotExpVar} = `;
-        yield* (0, interpolation_1.generateInterpolation)(options, ctx, nameProp.exp.content, nameProp.exp, nameProp.exp.loc.start.offset, ctx.codeFeatures.all, '(', ')');
-        yield ` as const${common_1.endOfLine}`;
-        ctx.dynamicSlots.push({
-            expVar: slotExpVar,
-            varName: varSlot,
-        });
-    }
-    else {
-        ctx.slots.push({
-            name: 'default',
-            tagRange: [startTagOffset, startTagOffset + node.tag.length],
-            varName: varSlot,
-            nodeLoc: node.loc,
-        });
+        if (nameProp?.type === CompilerDOM.NodeTypes.ATTRIBUTE
+            && nameProp.value) {
+            ctx.slots.push({
+                name: nameProp.value.content,
+                loc: nameProp.loc.start.offset + nameProp.loc.source.indexOf(nameProp.value.content, nameProp.name.length),
+                tagRange: [startTagOffset, startTagOffset + node.tag.length],
+                varName: varSlot,
+                nodeLoc: node.loc,
+            });
+        }
+        else if (nameProp?.type === CompilerDOM.NodeTypes.DIRECTIVE
+            && nameProp.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
+            const slotExpVar = ctx.getInternalVariable();
+            yield `var ${slotExpVar} = `;
+            yield* (0, interpolation_1.generateInterpolation)(options, ctx, nameProp.exp.content, nameProp.exp, nameProp.exp.loc.start.offset, ctx.codeFeatures.all, '(', ')');
+            yield ` as const${common_1.endOfLine}`;
+            ctx.dynamicSlots.push({
+                expVar: slotExpVar,
+                varName: varSlot,
+            });
+        }
+        else {
+            ctx.slots.push({
+                name: 'default',
+                tagRange: [startTagOffset, startTagOffset + node.tag.length],
+                varName: varSlot,
+                nodeLoc: node.loc,
+            });
+        }
     }
     yield* ctx.generateAutoImportCompletion();
     yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node, currentComponent, componentCtxVar);

package/lib/plugins.d.ts

@@ -22,5 +22,5 @@ export declare function getBasePlugins(pluginContext: Parameters<VueLanguagePlug
         id: string;
         lang: string;
     }[];
-    resolveEmbeddedCode?(fileName: string, sfc: import("./types").Sfc, embeddedFile: import("./virtualFile/embeddedFile").VueEmbeddedCode): void;
+    resolveEmbeddedCode?(fileName: string, sfc: import("./types").Sfc, embeddedFile: import("./types").VueEmbeddedCode): void;
 }[];

package/lib/types.d.ts

@@ -4,6 +4,7 @@ import type * as ts from 'typescript';
 import type { VueEmbeddedCode } from './virtualFile/embeddedFile';
 import type { CodeInformation, Segment } from '@volar/language-core';
 export type { SFCParseResult } from '@vue/compiler-sfc';
+export { VueEmbeddedCode };
 export type RawVueCompilerOptions = Partial<Omit<VueCompilerOptions, 'target' | 'plugins'>> & {
     target?: 'auto' | 2 | 2.7 | 3 | 3.3;
     plugins?: string[];

package/lib/virtualFile/computedFiles.js

@@ -24,7 +24,7 @@ function computedFiles(plugins, fileName, sfc) {
         }
         return blocks;
     });
-    const pluginsResult = plugins.map(plugin => computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock));
+    const pluginsResult = plugins.map(plugin => computedPluginEmbeddedCodes(plugins, plugin, fileName, sfc, nameToBlock));
     const flatResult = (0, computeds_1.computed)(() => pluginsResult.map(r => r()).flat());
     const structuredResult = (0, computeds_1.computed)(() => {
         const embeddedCodes = [];
@@ -36,18 +36,18 @@ function computedFiles(plugins, fileName, sfc) {
                 break;
             }
         }
-        for (const { file } of remain) {
-            console.error('Unable to resolve embedded: ' + file.parentCodeId + ' -> ' + file.id);
+        for (const { code } of remain) {
+            console.error('Unable to resolve embedded: ' + code.parentCodeId + ' -> ' + code.id);
         }
         return embeddedCodes;
         function consumeRemain() {
             for (let i = remain.length - 1; i >= 0; i--) {
-                const { file, snapshot, mappings } = remain[i];
-                if (!file.parentCodeId) {
+                const { code, snapshot, mappings } = remain[i];
+                if (!code.parentCodeId) {
                     embeddedCodes.push({
-                        id: file.id,
-                        languageId: resolveCommonLanguageId(file.lang),
-                        linkedCodeMappings: file.linkedCodeMappings,
+                        id: code.id,
+                        languageId: resolveCommonLanguageId(code.lang),
+                        linkedCodeMappings: code.linkedCodeMappings,
                         snapshot,
                         mappings,
                         embeddedCodes: [],
@@ -55,13 +55,13 @@ function computedFiles(plugins, fileName, sfc) {
                     remain.splice(i, 1);
                 }
                 else {
-                    const parent = findParentStructure(file.parentCodeId, embeddedCodes);
+                    const parent = findParentStructure(code.parentCodeId, embeddedCodes);
                     if (parent) {
                         parent.embeddedCodes ??= [];
                         parent.embeddedCodes.push({
-                            id: file.id,
-                            languageId: resolveCommonLanguageId(file.lang),
-                            linkedCodeMappings: file.linkedCodeMappings,
+                            id: code.id,
+                            languageId: resolveCommonLanguageId(code.lang),
+                            linkedCodeMappings: code.linkedCodeMappings,
                             snapshot,
                             mappings,
                             embeddedCodes: [],
@@ -86,36 +86,37 @@ function computedFiles(plugins, fileName, sfc) {
     return structuredResult;
 }
 exports.computedFiles = computedFiles;
-function computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock) {
-    const embeddedFiles = {};
-    const files = (0, computeds_1.computed)(() => {
+function computedPluginEmbeddedCodes(plugins, plugin, fileName, sfc, nameToBlock) {
+    const computeds = new Map();
+    const getComputedKey = (code) => code.id + '__' + code.lang;
+    const codes = (0, computeds_1.computed)(() => {
         try {
             if (!plugin.getEmbeddedCodes) {
-                return Object.values(embeddedFiles);
+                return [...computeds.values()];
             }
-            const fileInfos = plugin.getEmbeddedCodes(fileName, sfc);
-            for (const oldId of Object.keys(embeddedFiles)) {
-                if (!fileInfos.some(file => file.id === oldId)) {
-                    delete embeddedFiles[oldId];
+            const embeddedCodeInfos = plugin.getEmbeddedCodes(fileName, sfc);
+            for (const oldId of computeds.keys()) {
+                if (!embeddedCodeInfos.some(code => getComputedKey(code) === oldId)) {
+                    computeds.delete(oldId);
                 }
             }
-            for (const fileInfo of fileInfos) {
-                if (!embeddedFiles[fileInfo.id]) {
-                    embeddedFiles[fileInfo.id] = (0, computeds_1.computed)(() => {
+            for (const codeInfo of embeddedCodeInfos) {
+                if (!computeds.has(getComputedKey(codeInfo))) {
+                    computeds.set(getComputedKey(codeInfo), (0, computeds_1.computed)(() => {
                         const content = [];
-                        const file = new embeddedFile_1.VueEmbeddedCode(fileInfo.id, fileInfo.lang, content);
+                        const code = new embeddedFile_1.VueEmbeddedCode(codeInfo.id, codeInfo.lang, content);
                         for (const plugin of plugins) {
                             if (!plugin.resolveEmbeddedCode) {
                                 continue;
                             }
                             try {
-                                plugin.resolveEmbeddedCode(fileName, sfc, file);
+                                plugin.resolveEmbeddedCode(fileName, sfc, code);
                             }
                             catch (e) {
                                 console.error(e);
                             }
                         }
-                        const newText = (0, language_core_1.toString)(file.content);
+                        const newText = (0, language_core_1.toString)(code.content);
                         const changeRanges = new Map();
                         const snapshot = {
                             getText: (start, end) => newText.slice(start, end),
@@ -133,22 +134,22 @@ function computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock) {
                             },
                         };
                         return {
-                            file,
+                            code,
                             snapshot,
                         };
-                    });
+                    }));
                 }
             }
         }
         catch (e) {
             console.error(e);
         }
-        return Object.values(embeddedFiles);
+        return [...computeds.values()];
     });
     return (0, computeds_1.computed)(() => {
-        return files().map(_file => {
-            const { file, snapshot } = _file();
-            const mappings = (0, language_core_1.buildMappings)(file.content);
+        return codes().map(_file => {
+            const { code, snapshot } = _file();
+            const mappings = (0, language_core_1.buildMappings)(code.content);
             const newMappings = [];
             let lastValidMapping;
             for (let i = 0; i < mappings.length; i++) {
@@ -185,7 +186,7 @@ function computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock) {
                 newMappings.push(mapping);
             }
             return {
-                file,
+                code,
                 snapshot,
                 mappings: newMappings,
             };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.0.15",
+	"version": "2.0.16",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.2.0-alpha.12",
+		"@volar/language-core": "~2.2.0",
 		"@vue/compiler-dom": "^3.4.0",
 		"@vue/shared": "^3.4.0",
 		"computeds": "^0.0.1",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "095f44449d71cd5a4730306c9c8c40df4d44dce3"
+	"gitHead": "95b78c38cbf75481ebb59e11956b592346f01d92"
 }