@vue/language-core 1.8.5 → 1.8.6

package/out/generators/script.js

@@ -37,6 +37,7 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
             emitsTypeArg: undefined,
             emitsTypeNums: 0,
             exposeRuntimeArg: undefined,
+            leadingCommentEndOffset: 0,
             importSectionEndOffset: 0,
             defineProps: undefined,
             propsAssignName: undefined,
@@ -229,7 +230,7 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
         if (!scriptSetupRanges)
             return;
         codes.push([
-            sfc.scriptSetup.content.substring(0, scriptSetupRanges.importSectionEndOffset),
+            sfc.scriptSetup.content.substring(0, Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset)),
             'scriptSetup',
             0,
             language_core_1.FileRangeCapabilities.full,

package/out/generators/template.js

@@ -585,7 +585,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
             blockConditions.push(condition);
             inScope = true;
         }
-        generateDirectives(node, var_originalComponent);
+        generateDirectives(node);
         generateElReferences(node); // <el ref="foo" />
         if (sfc.styles.some(s => s.scoped || vueCompilerOptions.experimentalResolveStyleCssClasses === 'always')) {
             generateClassScoped(node);
@@ -1019,7 +1019,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
             }
         }
     }
-    function generateDirectives(node, componentVar) {
+    function generateDirectives(node) {
         for (const prop of node.props) {
             if (prop.type === 7 /* CompilerDOM.NodeTypes.DIRECTIVE */
                 && prop.name !== 'slot'
@@ -1052,7 +1052,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                             apply: getRenameApply(prop.name),
                         },
                     },
-                ], ')', '(', ['', 'template', prop.loc.start.offset, capabilitiesPresets.diagnosticOnly], componentVar, vueCompilerOptions.strictTemplates ? '' : ' as any', ['', 'template', prop.loc.start.offset + 'v-'.length + prop.name.length, capabilitiesPresets.diagnosticOnly], ', ');
+                ], ')', '(');
                 if (prop.exp?.type === 4 /* CompilerDOM.NodeTypes.SIMPLE_EXPRESSION */) {
                     codes.push(['', 'template', prop.exp.loc.start.offset, capabilitiesPresets.diagnosticOnly], ...createInterpolationCode(prop.exp.content, prop.exp.loc, prop.exp.loc.start.offset, capabilitiesPresets.all, '(', ')'), ['', 'template', prop.exp.loc.end.offset, capabilitiesPresets.diagnosticOnly]);
                     formatCodes.push(...createFormatCode(prop.exp.content, prop.exp.loc.start.offset, formatBrackets.normal));

package/out/languageModule.js

@@ -10,11 +10,17 @@ function createLanguage(compilerOptions = {}, _vueCompilerOptions = {}, ts = req
     const vueCompilerOptions = (0, ts_1.resolveVueCompilerOptions)(_vueCompilerOptions);
     patchResolveModuleNames(ts, vueCompilerOptions);
     const vueLanguagePlugin = (0, plugins_1.getDefaultVueLanguagePlugins)(ts, compilerOptions, vueCompilerOptions, codegenStack);
+    const allowLanguageIds = new Set(['vue']);
+    if (vueCompilerOptions.extensions.includes('.md')) {
+        allowLanguageIds.add('markdown');
+    }
+    if (vueCompilerOptions.extensions.includes('.html')) {
+        allowLanguageIds.add('html');
+    }
     const languageModule = {
         createVirtualFile(fileName, snapshot, languageId) {
-            if (languageId === 'vue'
-                || (!languageId
-                    && vueCompilerOptions.extensions.some(ext => fileName.endsWith(ext)))) {
+            if ((languageId && allowLanguageIds.has(languageId))
+                || (!languageId && vueCompilerOptions.extensions.some(ext => fileName.endsWith(ext)))) {
                 return new sourceFile_1.VueFile(fileName, snapshot, vueCompilerOptions, vueLanguagePlugin, ts, codegenStack);
             }
         },

package/out/parsers/scriptSetupRanges.d.ts

@@ -3,6 +3,7 @@ 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): {
+    leadingCommentEndOffset: number;
     importSectionEndOffset: number;
     bindings: TextRange[];
     withDefaultsArg: TextRange | undefined;

package/out/parsers/scriptSetupRanges.js

@@ -19,6 +19,8 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     const definePropProposalB = vueCompilerOptions.experimentalDefinePropProposal === 'johnsonEdition' || ast.getFullText().trimStart().startsWith('// @experimentalDefinePropProposal=johnsonEdition');
     const defineProp = [];
     const bindings = parseBindingRanges(ts, ast, false);
+    const text = ast.getFullText();
+    const leadingCommentEndOffset = ts.getLeadingCommentRanges(text, 0)?.reverse()[0].end ?? 0;
     ast.forEachChild(node => {
         const isTypeExport = (ts.isTypeAliasDeclaration(node) || ts.isInterfaceDeclaration(node)) && node.modifiers?.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword);
         if (!foundNonImportExportNode
@@ -27,7 +29,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
             && !ts.isEmptyStatement(node)
             // fix https://github.com/vuejs/language-tools/issues/1223
             && !ts.isImportEqualsDeclaration(node)) {
-            const commentRanges = ts.getLeadingCommentRanges(ast.getFullText(), node.getFullStart());
+            const commentRanges = ts.getLeadingCommentRanges(text, node.getFullStart());
             if (commentRanges?.length) {
                 const commentRange = commentRanges.sort((a, b) => a.pos - b.pos)[0];
                 importSectionEndOffset = commentRange.pos;
@@ -40,6 +42,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     });
     ast.forEachChild(child => visitNode(child, ast));
     return {
+        leadingCommentEndOffset,
         importSectionEndOffset,
         bindings,
         withDefaultsArg,

package/out/utils/globalTypes.js

@@ -51,7 +51,7 @@ declare function __VLS_getVForSourceType<T>(source: T): [
 declare function __VLS_getSlotParams<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
 declare function __VLS_getSlotParam<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
 declare function __VLS_directiveFunction<T>(dir: T):
-	T extends import('${vueCompilerOptions.lib}').ObjectDirective<infer E, infer V> | import('${vueCompilerOptions.lib}').FunctionDirective<infer E, infer V> ? (el: E, value: V) => void
+	T extends import('${vueCompilerOptions.lib}').ObjectDirective<infer E, infer V> | import('${vueCompilerOptions.lib}').FunctionDirective<infer E, infer V> ? (value: V) => void
 	: T;
 declare function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
 declare function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "1.8.5",
+	"version": "1.8.6",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "971820b55ea42cb7e8c8ba7c35c8998d5572b420"
+	"gitHead": "9da8afee02bc7251ae97716480ba31f8aff2794a"
 }