@vue/language-core 2.0.14 → 2.0.15

package/lib/plugins/file-html.js

@@ -6,74 +6,71 @@ const plugin = () => {
     return {
         version: 2,
         parseSFC(fileName, content) {
-            if (fileName.endsWith('.html')) {
-                let sfc = {
-                    descriptor: {
-                        filename: fileName,
-                        source: content,
-                        template: null,
-                        script: null,
-                        scriptSetup: null,
-                        styles: [],
-                        customBlocks: [],
-                        cssVars: [],
-                        shouldForceReload: () => false,
-                        slotted: false,
-                    },
-                    errors: [],
-                };
-                let templateContent = content;
-                for (const match of content.matchAll(sfcBlockReg)) {
-                    const matchText = match[0];
-                    const tag = match[1];
-                    const attrs = match[2];
-                    const lang = attrs.match(langReg)?.[2];
-                    const content = match[3];
-                    const contentStart = match.index + matchText.indexOf(content);
-                    if (tag === 'style') {
-                        sfc.descriptor.styles.push({
-                            attrs: {},
-                            content,
-                            loc: {
-                                start: { column: -1, line: -1, offset: contentStart },
-                                end: { column: -1, line: -1, offset: contentStart + content.length },
-                                source: content,
-                            },
-                            type: 'style',
-                            lang,
-                        });
-                    }
-                    // ignore `<script src="...">`
-                    else if (tag === 'script' && attrs.indexOf('src=') === -1) {
-                        let type = attrs.indexOf('type=') >= 0 ? 'scriptSetup' : 'script';
-                        sfc.descriptor[type] = {
-                            attrs: {},
-                            content,
-                            loc: {
-                                start: { column: -1, line: -1, offset: contentStart },
-                                end: { column: -1, line: -1, offset: contentStart + content.length },
-                                source: content,
-                            },
-                            type: 'script',
-                            lang,
-                        };
-                    }
-                    templateContent = templateContent.substring(0, match.index) + ' '.repeat(matchText.length) + templateContent.substring(match.index + matchText.length);
+            let sfc = {
+                descriptor: {
+                    filename: fileName,
+                    source: content,
+                    template: null,
+                    script: null,
+                    scriptSetup: null,
+                    styles: [],
+                    customBlocks: [],
+                    cssVars: [],
+                    shouldForceReload: () => false,
+                    slotted: false,
+                },
+                errors: [],
+            };
+            let templateContent = content;
+            for (const match of content.matchAll(sfcBlockReg)) {
+                const matchText = match[0];
+                const tag = match[1];
+                const attrs = match[2];
+                const lang = attrs.match(langReg)?.[2];
+                const content = match[3];
+                const contentStart = match.index + matchText.indexOf(content);
+                if (tag === 'style') {
+                    sfc.descriptor.styles.push({
+                        attrs: {},
+                        content,
+                        loc: {
+                            start: { column: -1, line: -1, offset: contentStart },
+                            end: { column: -1, line: -1, offset: contentStart + content.length },
+                            source: content,
+                        },
+                        type: 'style',
+                        lang,
+                    });
                 }
-                sfc.descriptor.template = {
-                    attrs: {},
-                    content: templateContent,
-                    loc: {
-                        start: { column: -1, line: -1, offset: 0 },
-                        end: { column: -1, line: -1, offset: templateContent.length },
-                        source: templateContent,
-                    },
-                    type: 'template',
-                    ast: {},
-                };
-                return sfc;
+                // ignore `<script src="...">`
+                else if (tag === 'script' && attrs.indexOf('src=') === -1) {
+                    let type = attrs.indexOf('type=') >= 0 ? 'scriptSetup' : 'script';
+                    sfc.descriptor[type] = {
+                        attrs: {},
+                        content,
+                        loc: {
+                            start: { column: -1, line: -1, offset: contentStart },
+                            end: { column: -1, line: -1, offset: contentStart + content.length },
+                            source: content,
+                        },
+                        type: 'script',
+                        lang,
+                    };
+                }
+                templateContent = templateContent.substring(0, match.index) + ' '.repeat(matchText.length) + templateContent.substring(match.index + matchText.length);
             }
-            ;
+            sfc.descriptor.template = {
+                attrs: {},
+                content: templateContent,
+                loc: {
+                    start: { column: -1, line: -1, offset: 0 },
+                    end: { column: -1, line: -1, offset: templateContent.length },
+                    source: templateContent,
+                },
+                type: 'template',
+                ast: {},
+            };
+            return sfc;
         }
     };
 };

package/lib/plugins/file-md.js

@@ -12,58 +12,55 @@ const codeSnippetImportReg = /^\s*<<<\s*.+/gm;
 const plugin = () => {
     return {
         version: 2,
-        parseSFC(fileName, content) {
-            if (fileName.endsWith('.md')) {
-                content = content
-                    // code block
-                    .replace(codeblockReg, (match, quotes) => quotes + ' '.repeat(match.length - quotes.length * 2) + quotes)
-                    // inline code block
-                    .replace(inlineCodeblockReg, match => `\`${' '.repeat(match.length - 2)}\``)
-                    // # \<script setup>
-                    .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) {
-                        const matchText = match[0];
-                        codes.push([matchText, undefined, match.index]);
-                        codes.push('\n\n');
-                        content = content.substring(0, match.index) + ' '.repeat(matchText.length) + content.substring(match.index + matchText.length);
-                    }
-                }
-                content = content
-                    // angle bracket: <http://foo.com>
-                    .replace(angleBracketReg, match => ' '.repeat(match.length))
-                    // [foo](http://foo.com)
-                    .replace(linkReg, match => ' '.repeat(match.length));
-                codes.push('<template>\n');
-                codes.push([content, undefined, 0]);
-                codes.push('\n</template>');
-                const file2VueSourceMap = new language_core_1.SourceMap((0, language_core_1.buildMappings)(codes));
-                const sfc = (0, parseSfc_1.parse)((0, language_core_1.toString)(codes));
-                if (sfc.descriptor.template) {
-                    transformRange(sfc.descriptor.template);
-                }
-                if (sfc.descriptor.script) {
-                    transformRange(sfc.descriptor.script);
-                }
-                if (sfc.descriptor.scriptSetup) {
-                    transformRange(sfc.descriptor.scriptSetup);
-                }
-                for (const style of sfc.descriptor.styles) {
-                    transformRange(style);
-                }
-                for (const customBlock of sfc.descriptor.customBlocks) {
-                    transformRange(customBlock);
-                }
-                return sfc;
-                function transformRange(block) {
-                    block.loc.start.offset = file2VueSourceMap.getSourceOffset(block.loc.start.offset)?.[0] ?? -1;
-                    block.loc.end.offset = file2VueSourceMap.getSourceOffset(block.loc.end.offset)?.[0] ?? -1;
+        parseSFC(_fileName, content) {
+            content = content
+                // code block
+                .replace(codeblockReg, (match, quotes) => quotes + ' '.repeat(match.length - quotes.length * 2) + quotes)
+                // inline code block
+                .replace(inlineCodeblockReg, match => `\`${' '.repeat(match.length - 2)}\``)
+                // # \<script setup>
+                .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) {
+                    const matchText = match[0];
+                    codes.push([matchText, undefined, match.index]);
+                    codes.push('\n\n');
+                    content = content.substring(0, match.index) + ' '.repeat(matchText.length) + content.substring(match.index + matchText.length);
                 }
             }
-            ;
+            content = content
+                // angle bracket: <http://foo.com>
+                .replace(angleBracketReg, match => ' '.repeat(match.length))
+                // [foo](http://foo.com)
+                .replace(linkReg, match => ' '.repeat(match.length));
+            codes.push('<template>\n');
+            codes.push([content, undefined, 0]);
+            codes.push('\n</template>');
+            const file2VueSourceMap = new language_core_1.SourceMap((0, language_core_1.buildMappings)(codes));
+            const sfc = (0, parseSfc_1.parse)((0, language_core_1.toString)(codes));
+            if (sfc.descriptor.template) {
+                transformRange(sfc.descriptor.template);
+            }
+            if (sfc.descriptor.script) {
+                transformRange(sfc.descriptor.script);
+            }
+            if (sfc.descriptor.scriptSetup) {
+                transformRange(sfc.descriptor.scriptSetup);
+            }
+            for (const style of sfc.descriptor.styles) {
+                transformRange(style);
+            }
+            for (const customBlock of sfc.descriptor.customBlocks) {
+                transformRange(customBlock);
+            }
+            return sfc;
+            function transformRange(block) {
+                block.loc.start.offset = file2VueSourceMap.getSourceOffset(block.loc.start.offset)?.[0] ?? -1;
+                block.loc.end.offset = file2VueSourceMap.getSourceOffset(block.loc.end.offset)?.[0] ?? -1;
+            }
         }
     };
 };

package/lib/plugins/vue-tsx.d.ts

@@ -30,6 +30,7 @@ export declare const tsCodegen: WeakMap<Sfc, {
         };
         slots: {
             name?: string | undefined;
+            isObjectBindingPattern?: boolean | undefined;
             define?: (import("../types").TextRange & {
                 arg?: import("../types").TextRange | undefined;
                 typeArg?: import("../types").TextRange | undefined;

package/lib/plugins.d.ts

@@ -1,5 +1,6 @@
 import { type VueLanguagePlugin } from './types';
-export declare function getDefaultVueLanguagePlugins(pluginContext: Parameters<VueLanguagePlugin>[0]): {
+export * from './plugins/shared';
+export declare function getBasePlugins(pluginContext: Parameters<VueLanguagePlugin>[0]): {
     version: 2;
     name?: string | undefined;
     order?: number | undefined;

package/lib/plugins.js

@@ -1,9 +1,20 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultVueLanguagePlugins = void 0;
-const file_html_1 = require("./plugins/file-html");
-const file_md_1 = require("./plugins/file-md");
-const file_vue_1 = require("./plugins/file-vue");
+exports.getBasePlugins = void 0;
 const vue_sfc_customblocks_1 = require("./plugins/vue-sfc-customblocks");
 const vue_sfc_scripts_1 = require("./plugins/vue-sfc-scripts");
 const vue_sfc_styles_1 = require("./plugins/vue-sfc-styles");
@@ -13,11 +24,9 @@ const vue_template_inline_css_1 = require("./plugins/vue-template-inline-css");
 const vue_template_inline_ts_1 = require("./plugins/vue-template-inline-ts");
 const vue_tsx_1 = require("./plugins/vue-tsx");
 const types_1 = require("./types");
-function getDefaultVueLanguagePlugins(pluginContext) {
+__exportStar(require("./plugins/shared"), exports);
+function getBasePlugins(pluginContext) {
     const plugins = [
-        file_md_1.default, // .md for VitePress
-        file_html_1.default, // .html for PetiteVue
-        file_vue_1.default, // .vue and others for Vue
         vue_template_html_1.default,
         vue_template_inline_css_1.default,
         vue_template_inline_ts_1.default,
@@ -53,5 +62,5 @@ function getDefaultVueLanguagePlugins(pluginContext) {
         return valid;
     });
 }
-exports.getDefaultVueLanguagePlugins = getDefaultVueLanguagePlugins;
+exports.getBasePlugins = getBasePlugins;
 //# sourceMappingURL=plugins.js.map

package/lib/types.d.ts

@@ -26,6 +26,8 @@ export interface VueCompilerOptions {
     target: number;
     lib: string;
     extensions: string[];
+    vitePressExtensions: string[];
+    petiteVueExtensions: string[];
     jsxSlots: boolean;
     strictTemplates: boolean;
     skipTemplateCodegen: boolean;

package/lib/utils/ts.js

@@ -16,7 +16,11 @@ function createParsedCommandLineByJson(ts, parseConfigHost, rootDir, json, confi
         catch (err) { }
     }
     const resolvedVueOptions = resolveVueCompilerOptions(vueOptions);
-    const parsed = ts.parseJsonConfigFileContent(json, proxyHost.host, rootDir, {}, configFileName, undefined, resolvedVueOptions.extensions.map(extension => ({
+    const parsed = ts.parseJsonConfigFileContent(json, proxyHost.host, rootDir, {}, configFileName, undefined, [
+        ...resolvedVueOptions.extensions,
+        ...resolvedVueOptions.vitePressExtensions,
+        ...resolvedVueOptions.petiteVueExtensions,
+    ].map(extension => ({
         extension: extension.slice(1),
         isMixedContent: true,
         scriptKind: ts.ScriptKind.Deferred,
@@ -47,7 +51,11 @@ function createParsedCommandLine(ts, parseConfigHost, tsConfigPath) {
             catch (err) { }
         }
         const resolvedVueOptions = resolveVueCompilerOptions(vueOptions);
-        const parsed = ts.parseJsonSourceFileConfigFileContent(config, proxyHost.host, path.dirname(tsConfigPath), {}, tsConfigPath, undefined, resolvedVueOptions.extensions.map(extension => ({
+        const parsed = ts.parseJsonSourceFileConfigFileContent(config, proxyHost.host, path.dirname(tsConfigPath), {}, tsConfigPath, undefined, [
+            ...resolvedVueOptions.extensions,
+            ...resolvedVueOptions.vitePressExtensions,
+            ...resolvedVueOptions.petiteVueExtensions,
+        ].map(extension => ({
             extension: extension.slice(1),
             isMixedContent: true,
             scriptKind: ts.ScriptKind.Deferred,
@@ -121,7 +129,14 @@ function getPartialVueCompilerOptions(ts, tsConfigSourceFile) {
                 const resolvedPath = resolvePath(pluginPath);
                 if (resolvedPath) {
                     const plugin = require(resolvedPath);
-                    plugin.__moduleName = pluginPath;
+                    if (Array.isArray(plugin)) {
+                        for (let i = 0; i < plugin.length; i++) {
+                            plugin[i].__moduleName = `${pluginPath} (${i})`;
+                        }
+                    }
+                    else {
+                        plugin.__moduleName = pluginPath;
+                    }
                     return plugin;
                 }
                 else {
@@ -158,6 +173,8 @@ function resolveVueCompilerOptions(vueOptions) {
         ...vueOptions,
         target,
         extensions: vueOptions.extensions ?? ['.vue'],
+        vitePressExtensions: vueOptions.vitePressExtensions ?? [],
+        petiteVueExtensions: vueOptions.petiteVueExtensions ?? [],
         lib,
         jsxSlots: vueOptions.jsxSlots ?? false,
         strictTemplates: vueOptions.strictTemplates ?? false,

package/lib/virtualFile/computedFiles.d.ts

@@ -1,3 +1,4 @@
 import { VirtualCode } from '@volar/language-core';
 import type { Sfc, VueLanguagePlugin } from '../types';
 export declare function computedFiles(plugins: ReturnType<VueLanguagePlugin>[], fileName: string, sfc: Sfc): () => VirtualCode[];
+export declare function resolveCommonLanguageId(lang: string): string;

package/lib/virtualFile/computedFiles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.computedFiles = void 0;
+exports.resolveCommonLanguageId = exports.computedFiles = void 0;
 const language_core_1 = require("@volar/language-core");
 const computeds_1 = require("computeds");
 const embeddedFile_1 = require("./embeddedFile");
@@ -46,7 +46,7 @@ function computedFiles(plugins, fileName, sfc) {
                 if (!file.parentCodeId) {
                     embeddedCodes.push({
                         id: file.id,
-                        languageId: (0, language_core_1.resolveCommonLanguageId)(`/dummy.${file.lang}`),
+                        languageId: resolveCommonLanguageId(file.lang),
                         linkedCodeMappings: file.linkedCodeMappings,
                         snapshot,
                         mappings,
@@ -60,7 +60,7 @@ function computedFiles(plugins, fileName, sfc) {
                         parent.embeddedCodes ??= [];
                         parent.embeddedCodes.push({
                             id: file.id,
-                            languageId: (0, language_core_1.resolveCommonLanguageId)(`/dummy.${file.lang}`),
+                            languageId: resolveCommonLanguageId(file.lang),
                             linkedCodeMappings: file.linkedCodeMappings,
                             snapshot,
                             mappings,
@@ -215,4 +215,20 @@ function fullDiffTextChangeRange(oldText, newText) {
         }
     }
 }
+function resolveCommonLanguageId(lang) {
+    switch (lang) {
+        case 'js': return 'javascript';
+        case 'cjs': return 'javascript';
+        case 'mjs': return 'javascript';
+        case 'ts': return 'typescript';
+        case 'cts': return 'typescript';
+        case 'mts': return 'typescript';
+        case 'jsx': return 'javascriptreact';
+        case 'tsx': return 'typescriptreact';
+        case 'pug': return 'jade';
+        case 'md': return 'markdown';
+    }
+    return lang;
+}
+exports.resolveCommonLanguageId = resolveCommonLanguageId;
 //# sourceMappingURL=computedFiles.js.map

package/package.json

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