@vue/language-core 1.8.4 → 1.8.5

package/out/generators/script.js

@@ -648,7 +648,7 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
                     const templateStart = (0, source_map_1.getLength)(codes);
                     codes.push(varName);
                     const templateEnd = (0, source_map_1.getLength)(codes);
-                    codes.push(`: {} as typeof `);
+                    codes.push(`: ${varName} as typeof `);
                     const scriptStart = (0, source_map_1.getLength)(codes);
                     codes.push(varName);
                     const scriptEnd = (0, source_map_1.getLength)(codes);
@@ -723,7 +723,7 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
                 continue;
             codes.push(`${style.module}: Record<string, string> & __VLS_Prettify<{}`);
             for (const className of style.classNames) {
-                generateCssClassProperty(i, className.text.substring(1), { start: className.offset, end: className.offset + className.text.length }, 'string', false);
+                generateCssClassProperty(i, className.text.substring(1), { start: className.offset, end: className.offset + className.text.length }, 'string', false, true);
             }
             codes.push('>;\n');
         }
@@ -739,10 +739,10 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
         codes.push('type __VLS_StyleScopedClasses = {}');
         for (let i = 0; i < _sfc.styles.length; i++) {
             const style = _sfc.styles[i];
-            if (!style.scoped)
+            if (!style.scoped && vueCompilerOptions.experimentalResolveStyleCssClasses !== 'always')
                 continue;
             for (const className of style.classNames) {
-                generateCssClassProperty(i, className.text.substring(1), { start: className.offset, end: className.offset + className.text.length }, 'boolean', true);
+                generateCssClassProperty(i, className.text.substring(1), { start: className.offset, end: className.offset + className.text.length }, 'boolean', true, !style.module);
             }
         }
         codes.push(';\n');
@@ -773,7 +773,7 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
         }
         codes.push(`return __VLS_slots;\n`);
         return { cssIds };
-        function generateCssClassProperty(styleIndex, className, classRange, propertyType, optional) {
+        function generateCssClassProperty(styleIndex, className, classRange, propertyType, optional, referencesCodeLens) {
             codes.push(`\n & { `);
             codes.push([
                 '',
@@ -781,7 +781,7 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
                 classRange.start,
                 {
                     references: true,
-                    referencesCodeLens: true,
+                    referencesCodeLens,
                 },
             ]);
             codes.push(`'`);

package/out/generators/template.js

@@ -41,7 +41,8 @@ const formatBrackets = {
     curly: ['0 +', '+ 0;'],
     event: ['() => ', ';'],
 };
-const validTsVar = /^[a-zA-Z_$][0-9a-zA-Z_$]*$/;
+const validTsVarReg = /^[a-zA-Z_$][0-9a-zA-Z_$]*$/;
+const colonReg = /:/g;
 // @ts-ignore
 const transformContext = {
     onError: () => { },
@@ -121,7 +122,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
     function generateStyleScopedClasses() {
         const allClasses = new Set();
         for (const block of sfc.styles) {
-            if (block.scoped) {
+            if (block.scoped || vueCompilerOptions.experimentalResolveStyleCssClasses === 'always') {
                 for (const className of block.classNames) {
                     allClasses.add(className.text.substring(1));
                 }
@@ -144,7 +145,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         codes.push('}\n');
     }
     function toCanonicalComponentName(tagText) {
-        return validTsVar.test(tagText) ? tagText : (0, shared_1.capitalize)((0, shared_1.camelize)(tagText.replace(/:/g, '-')));
+        return validTsVarReg.test(tagText) ? tagText : (0, shared_1.capitalize)((0, shared_1.camelize)(tagText.replace(colonReg, '-')));
     }
     function getPossibleOriginalComponentName(tagText) {
         return [...new Set([
@@ -500,7 +501,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         else {
             codes.push(`let ${var_originalComponent}!: `);
             for (const componentName of getPossibleOriginalComponentName(tag)) {
-                codes.push(`'${componentName}' extends keyof typeof __VLS_ctx ? typeof __VLS_ctx${validTsVar.test(componentName) ? `.${componentName}` : `['${componentName}']`} : `);
+                codes.push(`'${componentName}' extends keyof typeof __VLS_ctx ? typeof __VLS_ctx${validTsVarReg.test(componentName) ? `.${componentName}` : `['${componentName}']`} : `);
             }
             codes.push(`typeof __VLS_resolvedLocalAndGlobalComponents['${toCanonicalComponentName(tag)}'];\n`);
         }
@@ -586,7 +587,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         }
         generateDirectives(node, var_originalComponent);
         generateElReferences(node); // <el ref="foo" />
-        if (sfc.styles.some(s => s.scoped)) {
+        if (sfc.styles.some(s => s.scoped || vueCompilerOptions.experimentalResolveStyleCssClasses === 'always')) {
             generateClassScoped(node);
         }
         if (componentCtxVar) {
@@ -1112,7 +1113,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         const varSlot = `__VLS_${elementIndex++}`;
         const slotNameExpNode = getSlotNameExpNode();
         if (hasScriptSetupSlots) {
-            codes.push(['', 'template', node.loc.start.offset, capabilitiesPresets.diagnosticOnly], '__VLS_slots[', ['', 'template', node.loc.start.offset, capabilitiesPresets.diagnosticOnly], slotNameExpNode?.content ?? `('${getSlotName()}' as const)`, ['', 'template', node.loc.end.offset, capabilitiesPresets.diagnosticOnly], ']', ['', 'template', node.loc.end.offset, capabilitiesPresets.diagnosticOnly], '?.(', ['', 'template', startTagOffset, capabilitiesPresets.diagnosticOnly], '{\n');
+            codes.push('__VLS_normalizeSlot(', ['', 'template', node.loc.start.offset, capabilitiesPresets.diagnosticOnly], '__VLS_slots[', ['', 'template', node.loc.start.offset, capabilitiesPresets.diagnosticOnly], slotNameExpNode?.content ?? `('${getSlotName()}' as const)`, ['', 'template', node.loc.end.offset, capabilitiesPresets.diagnosticOnly], ']', ['', 'template', node.loc.end.offset, capabilitiesPresets.diagnosticOnly], ')?.(', ['', 'template', startTagOffset, capabilitiesPresets.diagnosticOnly], '{\n');
         }
         else {
             codes.push(`var ${varSlot} = {\n`);
@@ -1228,7 +1229,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
     }
     function createObjectPropertyCode(a, astHolder) {
         const aStr = typeof a === 'string' ? a : a[0];
-        if (validTsVar.test(aStr)) {
+        if (validTsVarReg.test(aStr)) {
             return [a];
         }
         else if (aStr.startsWith('[') && aStr.endsWith(']') && astHolder) {
@@ -1296,7 +1297,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
     }
     function createPropertyAccessCode(a, astHolder) {
         const aStr = typeof a === 'string' ? a : a[0];
-        if (!compilerOptions.noPropertyAccessFromIndexSignature && validTsVar.test(aStr)) {
+        if (!compilerOptions.noPropertyAccessFromIndexSignature && validTsVarReg.test(aStr)) {
             return ['.', a];
         }
         else if (aStr.startsWith('[') && aStr.endsWith(']')) {

package/out/languageModule.js

@@ -23,7 +23,7 @@ function createLanguage(compilerOptions = {}, _vueCompilerOptions = {}, ts = req
         },
         resolveHost(host) {
             const sharedTypesSnapshot = ts.ScriptSnapshot.fromString(sharedTypes.getTypesCode(vueCompilerOptions));
-            const sharedTypesFileName = path_1.posix.join(host.getCurrentDirectory(), sharedTypes.baseName);
+            const sharedTypesFileName = path_1.posix.join(host.rootPath, sharedTypes.baseName);
             return {
                 ...host,
                 getScriptFileNames() {

package/out/parsers/scriptSetupRanges.js

@@ -27,7 +27,14 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
             && !ts.isEmptyStatement(node)
             // fix https://github.com/vuejs/language-tools/issues/1223
             && !ts.isImportEqualsDeclaration(node)) {
-            importSectionEndOffset = node.getStart(ast, true);
+            const commentRanges = ts.getLeadingCommentRanges(ast.getFullText(), node.getFullStart());
+            if (commentRanges?.length) {
+                const commentRange = commentRanges.sort((a, b) => a.pos - b.pos)[0];
+                importSectionEndOffset = commentRange.pos;
+            }
+            else {
+                importSectionEndOffset = node.getStart(ast);
+            }
             foundNonImportExportNode = true;
         }
     });

package/out/plugins/file-html.js

@@ -1,4 +1,6 @@
 "use strict";
+const sfcBlockReg = /\<(script|style)\b([\s\S]*?)\>([\s\S]*?)\<\/\1\>/g;
+const langReg = /\blang\s*=\s*(['\"]?)(\S*)\b\1/;
 const plugin = () => {
     return {
         version: 1,
@@ -20,8 +22,6 @@ const plugin = () => {
                     errors: [],
                 };
                 let templateContent = content;
-                const sfcBlockReg = /\<(script|style)\b([\s\S]*?)\>([\s\S]*?)\<\/\1\>/g;
-                const langReg = /\blang\s*=\s*(['\"]?)(\S*)\b\1/;
                 for (const match of content.matchAll(sfcBlockReg)) {
                     const matchText = match[0];
                     const tag = match[1];

package/out/plugins/file-md.js

@@ -1,6 +1,12 @@
 "use strict";
 const source_map_1 = require("@volar/source-map");
 const parseSfc_1 = require("../utils/parseSfc");
+const codeblockReg = /```[\s\S]+?```/g;
+const inlineCodeblockReg = /`[^\n`]+?`/g;
+const scriptSetupReg = /\\\<[\s\S]+?\>\n?/g;
+const sfcBlockReg = /\<(script|style)\b[\s\S]*?\>([\s\S]*?)\<\/\1\>/g;
+const angleBracketReg = /\<\S*\:\S*\>/g;
+const linkReg = /\[[\s\S]*?\]\([\s\S]*?\)/g;
 const plugin = () => {
     return {
         version: 1,
@@ -8,12 +14,11 @@ const plugin = () => {
             if (fileName.endsWith('.md')) {
                 content = content
                     // code block
-                    .replace(/```[\s\S]+?```/g, match => '```' + ' '.repeat(match.length - 6) + '```')
+                    .replace(codeblockReg, match => '```' + ' '.repeat(match.length - 6) + '```')
                     // inline code block
-                    .replace(/`[^\n`]+?`/g, match => `\`${' '.repeat(match.length - 2)}\``)
+                    .replace(inlineCodeblockReg, match => `\`${' '.repeat(match.length - 2)}\``)
                     // # \<script setup>
-                    .replace(/\\\<[\s\S]+?\>\n?/g, match => ' '.repeat(match.length));
-                const sfcBlockReg = /\<(script|style)\b[\s\S]*?\>([\s\S]*?)\<\/\1\>/g;
+                    .replace(scriptSetupReg, match => ' '.repeat(match.length));
                 const codes = [];
                 for (const match of content.matchAll(sfcBlockReg)) {
                     if (match.index !== undefined) {
@@ -25,9 +30,9 @@ const plugin = () => {
                 }
                 content = content
                     // angle bracket: <http://foo.com>
-                    .replace(/\<\S*\:\S*\>/g, match => ' '.repeat(match.length))
+                    .replace(angleBracketReg, match => ' '.repeat(match.length))
                     // [foo](http://foo.com)
-                    .replace(/\[[\s\S]*?\]\([\s\S]*?\)/g, match => ' '.repeat(match.length));
+                    .replace(linkReg, match => ' '.repeat(match.length));
                 codes.push('<template>\n');
                 codes.push([content, undefined, 0]);
                 codes.push('\n</template>');

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

@@ -1,5 +1,6 @@
 "use strict";
 const language_core_1 = require("@volar/language-core");
+const customBlockReg = /^(.*)\.customBlock_([^_]+)_(\d+)\.([^.]+)$/;
 const plugin = () => {
     return {
         version: 1,
@@ -12,7 +13,7 @@ const plugin = () => {
             return names;
         },
         resolveEmbeddedFile(_fileName, sfc, embeddedFile) {
-            const match = embeddedFile.fileName.match(/^(.*)\.customBlock_([^_]+)_(\d+)\.([^.]+)$/);
+            const match = embeddedFile.fileName.match(customBlockReg);
             if (match) {
                 const index = parseInt(match[3]);
                 const customBlock = sfc.customBlocks[index];

package/out/plugins/vue-sfc-scripts.js

@@ -1,5 +1,7 @@
 "use strict";
 const language_core_1 = require("@volar/language-core");
+const scriptFormatReg = /^(.*)\.script_format\.([^.]+)$/;
+const scriptSetupFormatReg = /^(.*)\.scriptSetup_format\.([^.]+)$/;
 const plugin = () => {
     return {
         version: 1,
@@ -14,8 +16,8 @@ const plugin = () => {
             return names;
         },
         resolveEmbeddedFile(_fileName, sfc, embeddedFile) {
-            const scriptMatch = embeddedFile.fileName.match(/^(.*)\.script_format\.([^.]+)$/);
-            const scriptSetupMatch = embeddedFile.fileName.match(/^(.*)\.scriptSetup_format\.([^.]+)$/);
+            const scriptMatch = embeddedFile.fileName.match(scriptFormatReg);
+            const scriptSetupMatch = embeddedFile.fileName.match(scriptSetupFormatReg);
             const script = scriptMatch ? sfc.script : scriptSetupMatch ? sfc.scriptSetup : undefined;
             if (script) {
                 embeddedFile.kind = language_core_1.FileKind.TextFile;

package/out/plugins/vue-sfc-styles.js

@@ -1,5 +1,6 @@
 "use strict";
 const language_core_1 = require("@volar/language-core");
+const styleReg = /^(.*)\.style_(\d+)\.([^.]+)$/;
 const plugin = () => {
     return {
         version: 1,
@@ -12,7 +13,7 @@ const plugin = () => {
             return names;
         },
         resolveEmbeddedFile(_fileName, sfc, embeddedFile) {
-            const match = embeddedFile.fileName.match(/^(.*)\.style_(\d+)\.([^.]+)$/);
+            const match = embeddedFile.fileName.match(styleReg);
             if (match) {
                 const index = parseInt(match[2]);
                 const style = sfc.styles[index];

package/out/plugins/vue-sfc-template.js

@@ -1,5 +1,6 @@
 "use strict";
 const language_core_1 = require("@volar/language-core");
+const templateReg = /^(.*)\.template\.([^.]+)$/;
 const plugin = () => {
     return {
         version: 1,
@@ -10,7 +11,7 @@ const plugin = () => {
             return [];
         },
         resolveEmbeddedFile(_fileName, sfc, embeddedFile) {
-            const match = embeddedFile.fileName.match(/^(.*)\.template\.([^.]+)$/);
+            const match = embeddedFile.fileName.match(templateReg);
             if (match && sfc.template) {
                 embeddedFile.capabilities = language_core_1.FileCapabilities.full;
                 embeddedFile.content.push([

package/out/plugins/vue-tsx.js

@@ -7,6 +7,8 @@ const scriptRanges_1 = require("../parsers/scriptRanges");
 const scriptSetupRanges_1 = require("../parsers/scriptSetupRanges");
 const language_core_1 = require("@volar/language-core");
 const muggle = require("muggle-string");
+const templateFormatReg = /^\.template_format\.ts$/;
+const templateStyleCssReg = /^\.template_style\.css$/;
 const plugin = ({ modules, vueCompilerOptions, compilerOptions, codegenStack }) => {
     const ts = modules.typescript;
     const instances = new WeakMap();
@@ -43,7 +45,7 @@ const plugin = ({ modules, vueCompilerOptions, compilerOptions, codegenStack })
                     embeddedFile.mirrorBehaviorMappings = [...tsx.mirrorBehaviorMappings];
                 }
             }
-            else if (suffix.match(/^\.template_format\.ts$/)) {
+            else if (suffix.match(templateFormatReg)) {
                 embeddedFile.parentFileName = fileName + '.template.' + sfc.template?.lang;
                 embeddedFile.kind = language_core_1.FileKind.TextFile;
                 embeddedFile.capabilities = {
@@ -72,7 +74,7 @@ const plugin = ({ modules, vueCompilerOptions, compilerOptions, codegenStack })
                     }
                 }
             }
-            else if (suffix.match(/^\.template_style\.css$/)) {
+            else if (suffix.match(templateStyleCssReg)) {
                 embeddedFile.parentFileName = fileName + '.template.' + sfc.template?.lang;
                 if (_tsx.htmlGen.value) {
                     const [content, contentStacks] = codegenStack ? muggle.track([..._tsx.htmlGen.value.cssCodes], [..._tsx.htmlGen.value.cssCodeStacks]) : [[..._tsx.htmlGen.value.cssCodes], [..._tsx.htmlGen.value.cssCodeStacks]];

package/out/sourceFile.js

@@ -7,6 +7,7 @@ const reactivity_1 = require("@vue/reactivity");
 const muggle = require("muggle-string");
 const parseCssVars_1 = require("./utils/parseCssVars");
 const parseCssClassNames_1 = require("./utils/parseCssClassNames");
+const jsxReg = /^\.(js|ts)x?$/;
 class VueEmbeddedFile {
     constructor(fileName, content, contentStacks) {
         this.fileName = fileName;
@@ -23,7 +24,7 @@ class VueFile {
         return this._compiledSfcTemplate.value;
     }
     get mainScriptName() {
-        return this._allEmbeddedFiles.value.find(e => e.file.fileName.replace(this.fileName, '').match(/^\.(js|ts)x?$/))?.file.fileName ?? '';
+        return this._allEmbeddedFiles.value.find(e => e.file.fileName.replace(this.fileName, '').match(jsxReg))?.file.fileName ?? '';
     }
     get embeddedFiles() {
         return this._embeddedFiles.value;

package/out/utils/globalTypes.js

@@ -111,6 +111,7 @@ declare function __VLS_pickFunctionalComponentCtx<T, K>(comp: T, compInstance: K
 >;
 type __VLS_AsFunctionOrAny<F> = unknown extends F ? any : ((...args: any) => any) extends F ? F : any;
 
+declare function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
 declare function __VLS_componentProps<T, K>(comp: T, fnReturn: K):
 	__VLS_PickNotAny<K, {}> extends { __ctx: { props: infer P } } ? NonNullable<P>
 	: T extends (props: infer P, ...args: any) => any ? NonNullable<P> :

package/out/utils/parseCssClassNames.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCssClassNames = void 0;
 const parseCssVars_1 = require("./parseCssVars");
+const cssClassNameReg = /(?=([\.]{1}[a-zA-Z_]+[\w\_\-]*)[\s\.\+\{\>#\:]{1})/g;
 function* parseCssClassNames(styleContent) {
     styleContent = (0, parseCssVars_1.clearComments)(styleContent);
-    const cssClassNameRegex = /(?=([\.]{1}[a-zA-Z_]+[\w\_\-]*)[\s\.\+\{\>#\:]{1})/g;
-    const matchs = styleContent.matchAll(cssClassNameRegex);
-    for (const match of matchs) {
+    const matches = styleContent.matchAll(cssClassNameReg);
+    for (const match of matches) {
         if (match.index !== undefined) {
             const matchText = match[1];
             if (matchText !== undefined) {

package/out/utils/parseCssVars.js

@@ -1,11 +1,13 @@
 "use strict";
+// https://github.com/vuejs/core/blob/main/packages/compiler-sfc/src/cssVars.ts#L47-L61
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearComments = exports.parseCssVars = void 0;
-// https://github.com/vuejs/core/blob/main/packages/compiler-sfc/src/cssVars.ts#L47-L61
+const vBindCssVarReg = /\bv-bind\(\s*(?:'([^']+)'|"([^"]+)"|([^'"][^)]*))\s*\)/g;
+const commentReg1 = /\/\*([\s\S]*?)\*\//g;
+const commentReg2 = /\/\/([\s\S]*?)\n/g;
 function* parseCssVars(styleContent) {
     styleContent = clearComments(styleContent);
-    const reg = /\bv-bind\(\s*(?:'([^']+)'|"([^"]+)"|([^'"][^)]*))\s*\)/g;
-    const matchs = styleContent.matchAll(reg);
+    const matchs = styleContent.matchAll(vBindCssVarReg);
     for (const match of matchs) {
         if (match.index !== undefined) {
             const matchText = match[1] ?? match[2] ?? match[3];
@@ -19,8 +21,8 @@ function* parseCssVars(styleContent) {
 exports.parseCssVars = parseCssVars;
 function clearComments(css) {
     return css
-        .replace(/\/\*([\s\S]*?)\*\//g, match => `/*${' '.repeat(match.length - 4)}*/`)
-        .replace(/\/\/([\s\S]*?)\n/g, match => `//${' '.repeat(match.length - 3)}\n`);
+        .replace(commentReg1, match => `/*${' '.repeat(match.length - 4)}*/`)
+        .replace(commentReg2, match => `//${' '.repeat(match.length - 3)}\n`);
 }
 exports.clearComments = clearComments;
 //# sourceMappingURL=parseCssVars.js.map

package/out/utils/ts.js

@@ -60,7 +60,7 @@ function createParsedCommandLine(ts, parseConfigHost, tsConfigPath) {
         };
     }
     catch (err) {
-        console.warn('Failed to resolve tsconfig path:', tsConfigPath, err);
+        // console.warn('Failed to resolve tsconfig path:', tsConfigPath, err);
         return {
             fileNames: [],
             options: {},

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "1.8.4",
+	"version": "1.8.5",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/vue-language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~1.8.0",
-		"@volar/source-map": "~1.8.0",
+		"@volar/language-core": "~1.9.0",
+		"@volar/source-map": "~1.9.0",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/reactivity": "^3.3.0",
 		"@vue/shared": "^3.3.0",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "a62aa882911de149ae65f4c28eddfd93e1dee99d"
+	"gitHead": "971820b55ea42cb7e8c8ba7c35c8998d5572b420"
 }