@vue/language-core 1.9.0-alpha.3 → 2.0.1

package/lib/generators/utils.d.ts

@@ -0,0 +1,6 @@
+import type { Code, CodeAndStack, VueCodeInformation } from '../types';
+export declare function withStack(code: Code): CodeAndStack;
+export declare function getStack(): string;
+export declare function disableAllFeatures(override: Partial<VueCodeInformation>): VueCodeInformation;
+export declare function enableAllFeatures(override: Partial<VueCodeInformation>): VueCodeInformation;
+export declare function mergeFeatureSettings(base: VueCodeInformation, ...others: Partial<VueCodeInformation>[]): VueCodeInformation;

package/lib/generators/utils.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeFeatureSettings = exports.enableAllFeatures = exports.disableAllFeatures = exports.getStack = exports.withStack = void 0;
+function withStack(code) {
+    return [code, getStack()];
+}
+exports.withStack = withStack;
+// TODO: import from muggle-string
+function getStack() {
+    const stack = new Error().stack;
+    let source = stack.split('\n')[3].trim();
+    if (source.endsWith(')')) {
+        source = source.slice(source.lastIndexOf('(') + 1, -1);
+    }
+    else {
+        source = source.slice(source.lastIndexOf(' ') + 1);
+    }
+    return source;
+}
+exports.getStack = getStack;
+function disableAllFeatures(override) {
+    return {
+        verification: false,
+        completion: false,
+        semantic: false,
+        navigation: false,
+        structure: false,
+        format: false,
+        ...override,
+    };
+}
+exports.disableAllFeatures = disableAllFeatures;
+function enableAllFeatures(override) {
+    return {
+        verification: true,
+        completion: true,
+        semantic: true,
+        navigation: true,
+        structure: true,
+        format: true,
+        ...override,
+    };
+}
+exports.enableAllFeatures = enableAllFeatures;
+function mergeFeatureSettings(base, ...others) {
+    const result = { ...base };
+    for (const info of others) {
+        for (const key in info) {
+            const value = info[key];
+            if (value) {
+                result[key] = value;
+            }
+        }
+    }
+    return result;
+}
+exports.mergeFeatureSettings = mergeFeatureSettings;
+//# sourceMappingURL=utils.js.map

package/lib/languageModule.d.ts

@@ -0,0 +1,5 @@
+import { type LanguagePlugin } from '@volar/language-core';
+import type * as ts from 'typescript';
+import type { VueCompilerOptions } from './types';
+import { VueGeneratedCode } from './virtualFile/vueFile';
+export declare function createVueLanguagePlugin(ts: typeof import('typescript'), getFileName: (fileId: string) => string, compilerOptions?: ts.CompilerOptions, _vueCompilerOptions?: Partial<VueCompilerOptions>, codegenStack?: boolean, globalTypesHolder?: string): LanguagePlugin<VueGeneratedCode>;

package/lib/languageModule.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createVueLanguagePlugin = void 0;
+const language_core_1 = require("@volar/language-core");
+const plugins_1 = require("./plugins");
+const ts_1 = require("./utils/ts");
+const vueFile_1 = require("./virtualFile/vueFile");
+const fileRegistries = [];
+function getVueFileRegistry(key, plugins) {
+    let fileRegistry = fileRegistries.find(r => r.key === key
+        && r.plugins.length === plugins.length
+        && r.plugins.every(plugin => plugins.includes(plugin)))?.files;
+    if (!fileRegistry) {
+        fileRegistry = new Map();
+        fileRegistries.push({
+            key: key,
+            plugins: plugins,
+            files: fileRegistry,
+        });
+    }
+    return fileRegistry;
+}
+function getFileRegistryKey(compilerOptions, vueCompilerOptions, plugins, globalTypesHolder) {
+    const values = [
+        globalTypesHolder,
+        ...Object.keys(vueCompilerOptions)
+            .sort()
+            .filter(key => key !== 'plugins')
+            .map(key => [key, vueCompilerOptions[key]]),
+        [...new Set(plugins.map(plugin => plugin.requiredCompilerOptions ?? []).flat())]
+            .sort()
+            .map(key => [key, compilerOptions[key]]),
+    ];
+    return JSON.stringify(values);
+}
+function createVueLanguagePlugin(ts, getFileName, compilerOptions = {}, _vueCompilerOptions = {}, codegenStack = false, globalTypesHolder) {
+    const vueCompilerOptions = (0, ts_1.resolveVueCompilerOptions)(_vueCompilerOptions);
+    const allowLanguageIds = new Set(['vue']);
+    const pluginContext = (0, plugins_1.createPluginContext)(ts, compilerOptions, vueCompilerOptions, codegenStack, globalTypesHolder);
+    const plugins = (0, plugins_1.getDefaultVueLanguagePlugins)(pluginContext);
+    if (vueCompilerOptions.extensions.includes('.md')) {
+        allowLanguageIds.add('markdown');
+    }
+    if (vueCompilerOptions.extensions.includes('.html')) {
+        allowLanguageIds.add('html');
+    }
+    let generatedCodeRegistry;
+    return {
+        createVirtualCode(fileId, languageId, snapshot) {
+            if (allowLanguageIds.has(languageId)) {
+                const fileName = getFileName(fileId);
+                if (!generatedCodeRegistry) {
+                    pluginContext.globalTypesHolder ??= fileName;
+                    generatedCodeRegistry = getVueFileRegistry(getFileRegistryKey(compilerOptions, vueCompilerOptions, plugins, pluginContext.globalTypesHolder), vueCompilerOptions.plugins);
+                }
+                if (generatedCodeRegistry.has(fileId)) {
+                    const reusedResult = generatedCodeRegistry.get(fileId);
+                    reusedResult.update(snapshot);
+                    return reusedResult;
+                }
+                const vueFile = new vueFile_1.VueGeneratedCode(fileName, languageId, snapshot, vueCompilerOptions, plugins, ts, codegenStack);
+                generatedCodeRegistry.set(fileId, vueFile);
+                return vueFile;
+            }
+        },
+        updateVirtualCode(_fileId, vueFile, snapshot) {
+            vueFile.update(snapshot);
+            return vueFile;
+        },
+        disposeVirtualCode(fileId, vueFile, files) {
+            generatedCodeRegistry?.delete(fileId);
+            if (vueFile.fileName === pluginContext.globalTypesHolder) {
+                if (generatedCodeRegistry?.size) {
+                    for (const [fileName, file] of generatedCodeRegistry) {
+                        pluginContext.globalTypesHolder = fileName;
+                        generatedCodeRegistry = getVueFileRegistry(getFileRegistryKey(compilerOptions, vueCompilerOptions, plugins, pluginContext.globalTypesHolder), vueCompilerOptions.plugins);
+                        files?.set(fileId, file.languageId, 
+                        // force dirty
+                        { ...file.snapshot });
+                        break;
+                    }
+                }
+                else {
+                    generatedCodeRegistry = undefined;
+                    pluginContext.globalTypesHolder = undefined;
+                }
+            }
+        },
+        typescript: {
+            extraFileExtensions: vueCompilerOptions.extensions.map(ext => ({
+                extension: ext.slice(1),
+                isMixedContent: true,
+                scriptKind: 7,
+            })),
+            getScript(rootVirtualCode) {
+                for (const code of (0, language_core_1.forEachEmbeddedCode)(rootVirtualCode)) {
+                    if (code.id.startsWith('script_')) {
+                        const lang = code.id.substring('script_'.length);
+                        return {
+                            code,
+                            extension: '.' + lang,
+                            scriptKind: lang === 'js' ? ts.ScriptKind.JS
+                                : lang === 'jsx' ? ts.ScriptKind.JSX
+                                    : lang === 'tsx' ? ts.ScriptKind.TSX
+                                        : ts.ScriptKind.TS,
+                        };
+                    }
+                }
+            },
+        },
+    };
+}
+exports.createVueLanguagePlugin = createVueLanguagePlugin;
+//# sourceMappingURL=languageModule.js.map

package/{out → lib}/parsers/scriptRanges.d.ts

@@ -1,8 +1,8 @@
 import type { TextRange } from '../types';
-import type * as ts from 'typescript/lib/tsserverlibrary';
+import type * as ts from 'typescript';
 export interface ScriptRanges extends ReturnType<typeof parseScriptRanges> {
 }
-export declare function parseScriptRanges(ts: typeof import('typescript/lib/tsserverlibrary'), ast: ts.SourceFile, hasScriptSetup: boolean, withNode: boolean): {
+export declare function parseScriptRanges(ts: typeof import('typescript'), ast: ts.SourceFile, hasScriptSetup: boolean, withNode: boolean): {
     exportDefault: (TextRange & {
         expression: TextRange;
         args: TextRange;
@@ -13,4 +13,3 @@ export declare function parseScriptRanges(ts: typeof import('typescript/lib/tsse
     }) | undefined;
     bindings: TextRange[];
 };
-//# sourceMappingURL=scriptRanges.d.ts.map

package/{out → lib}/parsers/scriptRanges.js

@@ -5,10 +5,10 @@ const scriptSetupRanges_1 = require("./scriptSetupRanges");
 function parseScriptRanges(ts, ast, hasScriptSetup, withNode) {
     let exportDefault;
     const bindings = hasScriptSetup ? (0, scriptSetupRanges_1.parseBindingRanges)(ts, ast) : [];
-    ast.forEachChild(raw => {
+    ts.forEachChild(ast, raw => {
         if (ts.isExportAssignment(raw)) {
             let node = raw;
-            while (ts.isAsExpression(node.expression) || ts.isParenthesizedExpression(node.expression)) { // fix https://github.com/vuejs/language-tools/issues/1882
+            while (isAsExpression(node.expression) || ts.isParenthesizedExpression(node.expression)) { // fix https://github.com/vuejs/language-tools/issues/1882
                 node = node.expression;
             }
             let obj;
@@ -24,12 +24,13 @@ function parseScriptRanges(ts, ast, hasScriptSetup, withNode) {
             if (obj) {
                 let componentsOptionNode;
                 let nameOptionNode;
-                obj.forEachChild(node => {
+                ts.forEachChild(obj, node => {
                     if (ts.isPropertyAssignment(node) && ts.isIdentifier(node.name)) {
-                        if (node.name.escapedText === 'components' && ts.isObjectLiteralExpression(node.initializer)) {
+                        const name = (0, scriptSetupRanges_1.getNodeText)(ts, node.name, ast);
+                        if (name === 'components' && ts.isObjectLiteralExpression(node.initializer)) {
                             componentsOptionNode = node.initializer;
                         }
-                        if (node.name.escapedText === 'name') {
+                        if (name === 'name') {
                             nameOptionNode = node.initializer;
                         }
                     }
@@ -51,7 +52,11 @@ function parseScriptRanges(ts, ast, hasScriptSetup, withNode) {
         bindings,
     };
     function _getStartEnd(node) {
-        return (0, scriptSetupRanges_1.getStartEnd)(node, ast);
+        return (0, scriptSetupRanges_1.getStartEnd)(ts, node, ast);
+    }
+    // isAsExpression is missing in tsc
+    function isAsExpression(node) {
+        return node.kind === ts.SyntaxKind.AsExpression;
     }
 }
 exports.parseScriptRanges = parseScriptRanges;

package/{out → lib}/parsers/scriptSetupRanges.d.ts

@@ -1,17 +1,18 @@
-import type * as ts from 'typescript/lib/tsserverlibrary';
+import type * as ts from 'typescript';
 import type { VueCompilerOptions, TextRange } from '../types';
 export interface ScriptSetupRanges extends ReturnType<typeof parseScriptSetupRanges> {
 }
-export declare function parseScriptSetupRanges(ts: typeof import('typescript/lib/tsserverlibrary'), ast: ts.SourceFile, vueCompilerOptions: VueCompilerOptions): {
+export declare function parseScriptSetupRanges(ts: typeof import('typescript'), ast: ts.SourceFile, vueCompilerOptions: VueCompilerOptions): {
     leadingCommentEndOffset: number;
     importSectionEndOffset: number;
     bindings: TextRange[];
     props: {
         name?: string | undefined;
         define?: (TextRange & {
-            statement: TextRange;
             arg?: TextRange | undefined;
             typeArg?: TextRange | undefined;
+        } & {
+            statement: TextRange;
         }) | undefined;
         withDefaults?: (TextRange & {
             arg?: TextRange | undefined;
@@ -19,11 +20,17 @@ export declare function parseScriptSetupRanges(ts: typeof import('typescript/lib
     };
     slots: {
         name?: string | undefined;
-        define?: TextRange | undefined;
+        define?: (TextRange & {
+            arg?: TextRange | undefined;
+            typeArg?: TextRange | undefined;
+        }) | undefined;
     };
     emits: {
         name?: string | undefined;
-        define?: TextRange | undefined;
+        define?: (TextRange & {
+            arg?: TextRange | undefined;
+            typeArg?: TextRange | undefined;
+        }) | undefined;
     };
     expose: {
         name?: string | undefined;
@@ -38,12 +45,13 @@ export declare function parseScriptSetupRanges(ts: typeof import('typescript/lib
         type: TextRange | undefined;
         defaultValue: TextRange | undefined;
         required: boolean;
+        isModel?: boolean | undefined;
     }[];
 };
-export declare function parseBindingRanges(ts: typeof import('typescript/lib/tsserverlibrary'), sourceFile: ts.SourceFile): TextRange[];
-export declare function findBindingVars(ts: typeof import('typescript/lib/tsserverlibrary'), left: ts.BindingName, sourceFile: ts.SourceFile): TextRange[];
-export declare function getStartEnd(node: ts.Node, sourceFile: ts.SourceFile): {
+export declare function parseBindingRanges(ts: typeof import('typescript'), sourceFile: ts.SourceFile): TextRange[];
+export declare function findBindingVars(ts: typeof import('typescript'), left: ts.BindingName, sourceFile: ts.SourceFile): TextRange[];
+export declare function getStartEnd(ts: typeof import('typescript'), node: ts.Node, sourceFile: ts.SourceFile): {
     start: number;
     end: number;
 };
-//# sourceMappingURL=scriptSetupRanges.d.ts.map
+export declare function getNodeText(ts: typeof import('typescript'), node: ts.Node, sourceFile: ts.SourceFile): string;

package/{out → lib}/parsers/scriptSetupRanges.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStartEnd = exports.findBindingVars = exports.parseBindingRanges = exports.parseScriptSetupRanges = void 0;
+exports.getNodeText = exports.getStartEnd = exports.findBindingVars = exports.parseBindingRanges = exports.parseScriptSetupRanges = void 0;
 function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     let foundNonImportExportNode = false;
     let importSectionEndOffset = 0;
@@ -8,13 +8,13 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     const slots = {};
     const emits = {};
     const expose = {};
-    const definePropProposalA = vueCompilerOptions.experimentalDefinePropProposal === 'kevinEdition' || ast.getFullText().trimStart().startsWith('// @experimentalDefinePropProposal=kevinEdition');
-    const definePropProposalB = vueCompilerOptions.experimentalDefinePropProposal === 'johnsonEdition' || ast.getFullText().trimStart().startsWith('// @experimentalDefinePropProposal=johnsonEdition');
+    const definePropProposalA = vueCompilerOptions.experimentalDefinePropProposal === 'kevinEdition' || ast.text.trimStart().startsWith('// @experimentalDefinePropProposal=kevinEdition');
+    const definePropProposalB = vueCompilerOptions.experimentalDefinePropProposal === 'johnsonEdition' || ast.text.trimStart().startsWith('// @experimentalDefinePropProposal=johnsonEdition');
     const defineProp = [];
     const bindings = parseBindingRanges(ts, ast);
-    const text = ast.getFullText();
+    const text = ast.text;
     const leadingCommentEndOffset = ts.getLeadingCommentRanges(text, 0)?.reverse()[0].end ?? 0;
-    ast.forEachChild(node => {
+    ts.forEachChild(ast, node => {
         const isTypeExport = (ts.isTypeAliasDeclaration(node) || ts.isInterfaceDeclaration(node)) && node.modifiers?.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword);
         if (!foundNonImportExportNode
             && !ts.isImportDeclaration(node)
@@ -22,18 +22,18 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
             && !ts.isEmptyStatement(node)
             // fix https://github.com/vuejs/language-tools/issues/1223
             && !ts.isImportEqualsDeclaration(node)) {
-            const commentRanges = ts.getLeadingCommentRanges(text, node.getFullStart());
+            const commentRanges = ts.getLeadingCommentRanges(text, node.pos);
             if (commentRanges?.length) {
                 const commentRange = commentRanges.sort((a, b) => a.pos - b.pos)[0];
                 importSectionEndOffset = commentRange.pos;
             }
             else {
-                importSectionEndOffset = node.getStart(ast);
+                importSectionEndOffset = getStartEnd(ts, node, ast).start;
             }
             foundNonImportExportNode = true;
         }
     });
-    ast.forEachChild(child => visitNode(child, [ast]));
+    ts.forEachChild(ast, child => visitNode(child, [ast]));
     return {
         leadingCommentEndOffset,
         importSectionEndOffset,
@@ -45,13 +45,20 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
         defineProp,
     };
     function _getStartEnd(node) {
-        return getStartEnd(node, ast);
+        return getStartEnd(ts, node, ast);
+    }
+    function parseDefineFunction(node) {
+        return {
+            ..._getStartEnd(node),
+            arg: node.arguments.length ? _getStartEnd(node.arguments[0]) : undefined,
+            typeArg: node.typeArguments?.length ? _getStartEnd(node.typeArguments[0]) : undefined,
+        };
     }
     function visitNode(node, parents) {
         const parent = parents[parents.length - 1];
         if (ts.isCallExpression(node)
             && ts.isIdentifier(node.expression)) {
-            const callText = node.expression.getText(ast);
+            const callText = getNodeText(ts, node.expression, ast);
             if (vueCompilerOptions.macros.defineModel.includes(callText)) {
                 let name;
                 let options;
@@ -70,7 +77,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                 let required = false;
                 if (options && ts.isObjectLiteralExpression(options)) {
                     for (const property of options.properties) {
-                        if (ts.isPropertyAssignment(property) && ts.isIdentifier(property.name) && property.name.getText(ast) === 'required' && property.initializer.kind === ts.SyntaxKind.TrueKeyword) {
+                        if (ts.isPropertyAssignment(property) && ts.isIdentifier(property.name) && getNodeText(ts, property.name, ast) === 'required' && property.initializer.kind === ts.SyntaxKind.TrueKeyword) {
                             required = true;
                             break;
                         }
@@ -82,6 +89,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                     type: node.typeArguments?.length ? _getStartEnd(node.typeArguments[0]) : undefined,
                     defaultValue: undefined,
                     required,
+                    isModel: true,
                 });
             }
             else if (callText === 'defineProp') {
@@ -91,7 +99,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                         const secondArg = node.arguments[1];
                         if (ts.isObjectLiteralExpression(secondArg)) {
                             for (const property of secondArg.properties) {
-                                if (ts.isPropertyAssignment(property) && ts.isIdentifier(property.name) && property.name.getText(ast) === 'required' && property.initializer.kind === ts.SyntaxKind.TrueKeyword) {
+                                if (ts.isPropertyAssignment(property) && ts.isIdentifier(property.name) && getNodeText(ts, property.name, ast) === 'required' && property.initializer.kind === ts.SyntaxKind.TrueKeyword) {
                                     required = true;
                                     break;
                                 }
@@ -128,32 +136,26 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                 }
             }
             else if (vueCompilerOptions.macros.defineSlots.includes(callText)) {
-                slots.define = _getStartEnd(node);
+                slots.define = parseDefineFunction(node);
                 if (ts.isVariableDeclaration(parent)) {
-                    slots.name = parent.name.getText(ast);
+                    slots.name = getNodeText(ts, parent.name, ast);
                 }
             }
             else if (vueCompilerOptions.macros.defineEmits.includes(callText)) {
-                emits.define = _getStartEnd(node);
+                emits.define = parseDefineFunction(node);
                 if (ts.isVariableDeclaration(parent)) {
-                    emits.name = parent.name.getText(ast);
+                    emits.name = getNodeText(ts, parent.name, ast);
                 }
             }
             else if (vueCompilerOptions.macros.defineExpose.includes(callText)) {
-                expose.define = _getStartEnd(node);
-                if (node.arguments.length) {
-                    expose.define.arg = _getStartEnd(node.arguments[0]);
-                }
-                if (node.typeArguments?.length) {
-                    expose.define.typeArg = _getStartEnd(node.typeArguments[0]);
-                }
+                expose.define = parseDefineFunction(node);
             }
             else if (vueCompilerOptions.macros.defineProps.includes(callText)) {
                 let statementRange;
                 for (let i = parents.length - 1; i >= 0; i--) {
                     if (ts.isStatement(parents[i])) {
                         const statement = parents[i];
-                        statement.forEachChild(child => {
+                        ts.forEachChild(statement, child => {
                             const range = _getStartEnd(child);
                             statementRange ??= range;
                             statementRange.end = range.end;
@@ -165,11 +167,11 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                     statementRange = _getStartEnd(node);
                 }
                 props.define = {
-                    ..._getStartEnd(node),
+                    ...parseDefineFunction(node),
                     statement: statementRange,
                 };
                 if (ts.isVariableDeclaration(parent)) {
-                    props.name = parent.name.getText(ast);
+                    props.name = getNodeText(ts, parent.name, ast);
                 }
                 if (node.arguments.length) {
                     props.define.arg = _getStartEnd(node.arguments[0]);
@@ -185,11 +187,11 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                     props.withDefaults.arg = _getStartEnd(arg);
                 }
                 if (ts.isVariableDeclaration(parent)) {
-                    props.name = parent.name.getText(ast);
+                    props.name = getNodeText(ts, parent.name, ast);
                 }
             }
         }
-        node.forEachChild(child => {
+        ts.forEachChild(node, child => {
             parents.push(node);
             visitNode(child, parents);
             parents.pop();
@@ -199,7 +201,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
 exports.parseScriptSetupRanges = parseScriptSetupRanges;
 function parseBindingRanges(ts, sourceFile) {
     const bindings = [];
-    sourceFile.forEachChild(node => {
+    ts.forEachChild(sourceFile, node => {
         if (ts.isVariableStatement(node)) {
             for (const node_2 of node.declarationList.declarations) {
                 const vars = _findBindingVars(node_2.name);
@@ -241,7 +243,7 @@ function parseBindingRanges(ts, sourceFile) {
     });
     return bindings;
     function _getStartEnd(node) {
-        return getStartEnd(node, sourceFile);
+        return getStartEnd(ts, node, sourceFile);
     }
     function _findBindingVars(left) {
         return findBindingVars(ts, left, sourceFile);
@@ -254,7 +256,7 @@ function findBindingVars(ts, left, sourceFile) {
     return vars;
     function worker(_node) {
         if (ts.isIdentifier(_node)) {
-            vars.push(getStartEnd(_node, sourceFile));
+            vars.push(getStartEnd(ts, _node, sourceFile));
         }
         // { ? } = ...
         // [ ? ] = ...
@@ -271,7 +273,7 @@ function findBindingVars(ts, left, sourceFile) {
         }
         // { foo } = ...
         else if (ts.isShorthandPropertyAssignment(_node)) {
-            vars.push(getStartEnd(_node.name, sourceFile));
+            vars.push(getStartEnd(ts, _node.name, sourceFile));
         }
         // { ...? } = ...
         // [ ...? ] = ...
@@ -281,11 +283,16 @@ function findBindingVars(ts, left, sourceFile) {
     }
 }
 exports.findBindingVars = findBindingVars;
-function getStartEnd(node, sourceFile) {
+function getStartEnd(ts, node, sourceFile) {
     return {
-        start: node.getStart(sourceFile),
-        end: node.getEnd(),
+        start: ts.getTokenPosOfNode(node, sourceFile),
+        end: node.end,
     };
 }
 exports.getStartEnd = getStartEnd;
+function getNodeText(ts, node, sourceFile) {
+    const { start, end } = getStartEnd(ts, node, sourceFile);
+    return sourceFile.text.substring(start, end);
+}
+exports.getNodeText = getNodeText;
 //# sourceMappingURL=scriptSetupRanges.js.map

package/lib/plugins/file-html.d.ts

@@ -0,0 +1,3 @@
+import type { VueLanguagePlugin } from '../types';
+declare const plugin: VueLanguagePlugin;
+export default plugin;

package/{out → lib}/plugins/file-html.js

@@ -4,7 +4,7 @@ const sfcBlockReg = /\<(script|style)\b([\s\S]*?)\>([\s\S]*?)\<\/\1\>/g;
 const langReg = /\blang\s*=\s*(['\"]?)(\S*)\b\1/;
 const plugin = () => {
     return {
-        version: 1,
+        version: 2,
         parseSFC(fileName, content) {
             if (fileName.endsWith('.html')) {
                 let sfc = {

package/lib/plugins/file-md.d.ts

@@ -0,0 +1,3 @@
+import type { VueLanguagePlugin } from '../types';
+declare const plugin: VueLanguagePlugin;
+export default plugin;

package/{out → lib}/plugins/file-md.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const source_map_1 = require("@volar/source-map");
+const language_core_1 = require("@volar/language-core");
 const parseSfc_1 = require("../utils/parseSfc");
-const codeblockReg = /```[\s\S]+?```/g;
+const codeblockReg = /(`{3,})[\s\S]+?\1/g;
 const inlineCodeblockReg = /`[^\n`]+?`/g;
 const scriptSetupReg = /\\\<[\s\S]+?\>\n?/g;
 const sfcBlockReg = /\<(script|style)\b[\s\S]*?\>([\s\S]*?)\<\/\1\>/g;
@@ -11,12 +11,12 @@ const linkReg = /\[[\s\S]*?\]\([\s\S]*?\)/g;
 const codeSnippetImportReg = /^\s*<<<\s*.+/gm;
 const plugin = () => {
     return {
-        version: 1,
+        version: 2,
         parseSFC(fileName, content) {
             if (fileName.endsWith('.md')) {
                 content = content
                     // code block
-                    .replace(codeblockReg, match => '```' + ' '.repeat(match.length - 6) + '```')
+                    .replace(codeblockReg, (match, quotes) => quotes + ' '.repeat(match.length - quotes.length * 2) + quotes)
                     // inline code block
                     .replace(inlineCodeblockReg, match => `\`${' '.repeat(match.length - 2)}\``)
                     // # \<script setup>
@@ -40,8 +40,8 @@ const plugin = () => {
                 codes.push('<template>\n');
                 codes.push([content, undefined, 0]);
                 codes.push('\n</template>');
-                const file2VueSourceMap = new source_map_1.SourceMap((0, source_map_1.buildMappings)(codes));
-                const sfc = (0, parseSfc_1.parse)((0, source_map_1.toString)(codes));
+                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);
                 }
@@ -59,8 +59,8 @@ const plugin = () => {
                 }
                 return sfc;
                 function transformRange(block) {
-                    block.loc.start.offset = file2VueSourceMap.toSourceOffset(block.loc.start.offset)?.[0] ?? -1;
-                    block.loc.end.offset = file2VueSourceMap.toSourceOffset(block.loc.end.offset)?.[0] ?? -1;
+                    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/file-vue.d.ts

@@ -0,0 +1,3 @@
+import type { VueLanguagePlugin } from '../types';
+declare const plugin: VueLanguagePlugin;
+export default plugin;

package/{out → lib}/plugins/file-vue.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const parseSfc_1 = require("../utils/parseSfc");
 const plugin = (_ctx) => {
     return {
-        version: 1,
+        version: 2,
         parseSFC(_fileName, content) {
             return (0, parseSfc_1.parse)(content);
         },
@@ -19,10 +19,17 @@ const plugin = (_ctx) => {
             if (!hitBlock) {
                 return;
             }
-            hitBlock.content =
+            const oldContent = hitBlock.content;
+            const newContent = hitBlock.content =
                 hitBlock.content.substring(0, change.start - hitBlock.loc.start.offset)
                     + change.newText
                     + hitBlock.content.substring(change.end - hitBlock.loc.start.offset);
+            // #3449
+            const endTagRegex = new RegExp(`</\\s*${hitBlock.type}\\s*>`);
+            const insertedEndTag = !!oldContent.match(endTagRegex) !== !!newContent.match(endTagRegex);
+            if (insertedEndTag) {
+                return;
+            }
             const lengthDiff = change.newText.length - (change.end - change.start);
             for (const block of blocks) {
                 if (block.loc.start.offset > change.end) {

package/lib/plugins/vue-sfc-customblocks.d.ts

@@ -0,0 +1,3 @@
+import type { VueLanguagePlugin } from '../types';
+declare const plugin: VueLanguagePlugin;
+export default plugin;

package/lib/plugins/vue-sfc-customblocks.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../generators/utils");
+const plugin = () => {
+    return {
+        version: 2,
+        getEmbeddedCodes(_fileName, sfc) {
+            return sfc.customBlocks.map((customBlock, i) => ({
+                id: 'customBlock_' + i,
+                lang: customBlock.lang,
+            }));
+        },
+        resolveEmbeddedCode(_fileName, sfc, embeddedFile) {
+            if (embeddedFile.id.startsWith('customBlock_')) {
+                const index = parseInt(embeddedFile.id.slice('customBlock_'.length));
+                const customBlock = sfc.customBlocks[index];
+                embeddedFile.content.push([
+                    customBlock.content,
+                    customBlock.name,
+                    0,
+                    (0, utils_1.enableAllFeatures)({}),
+                ]);
+            }
+        },
+    };
+};
+exports.default = plugin;
+//# sourceMappingURL=vue-sfc-customblocks.js.map