@vue/language-core 1.8.21 → 1.8.24

package/out/generators/script.js

@@ -4,7 +4,7 @@ exports.generate = void 0;
 const language_core_1 = require("@volar/language-core");
 const source_map_1 = require("@volar/source-map");
 const muggle = require("muggle-string");
-const path_1 = require("path");
+const path = require("path-browserify");
 const shared_1 = require("../utils/shared");
 const transform_1 = require("../utils/transform");
 function generate(ts, fileName, script, scriptSetup, styles, // TODO: computed it
@@ -91,6 +91,7 @@ lang, scriptRanges, scriptSetupRanges, htmlGen, compilerOptions, vueCompilerOpti
 						default: D[K]
 					}> : P[K]
 				};\n`);
+            codes.push(`type __VLS_Prettify<T> = { [K in keyof T]: T[K]; } & {};\n`);
         }
         if (usedHelperTypes.WithTemplateSlots) {
             codes.push(`type __VLS_WithTemplateSlots<T, S> = T & { new(): {\n`, `${(0, shared_1.getSlotsPropertyName)(vueCompilerOptions.target)}: S;\n`);
@@ -193,7 +194,7 @@ lang, scriptRanges, scriptSetupRanges, htmlGen, compilerOptions, vueCompilerOpti
         if (!script)
             return;
         if (!!scriptSetup && scriptRanges?.exportDefault) {
-            addVirtualCode('script', scriptRanges.exportDefault.end, script.content.length);
+            addVirtualCode('script', scriptRanges.exportDefault.expression.end, script.content.length);
         }
     }
     function generateScriptSetupImports() {
@@ -208,19 +209,6 @@ lang, scriptRanges, scriptSetupRanges, htmlGen, compilerOptions, vueCompilerOpti
             language_core_1.FileRangeCapabilities.full,
         ]);
     }
-    function generateExportDefaultEndMapping() {
-        if (!scriptSetup) {
-            return;
-        }
-        // fix https://github.com/vuejs/language-tools/issues/1127
-        codes.push([
-            '',
-            'scriptSetup',
-            scriptSetup.content.length,
-            { diagnostic: true },
-        ]);
-        codes.push(`\n`);
-    }
     function generateScriptSetupAndTemplate() {
         if (!scriptSetup || !scriptSetupRanges) {
             return;
@@ -343,7 +331,6 @@ lang, scriptRanges, scriptSetupRanges, htmlGen, compilerOptions, vueCompilerOpti
             scriptSetupGeneratedOffset = generateSetupFunction(false, 'return', definePropMirrors);
             codes.push(`})()`);
         }
-        generateExportDefaultEndMapping();
         if (scriptSetupGeneratedOffset !== undefined) {
             for (const defineProp of scriptSetupRanges.defineProp) {
                 if (!defineProp.name) {
@@ -508,9 +495,6 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
                 codes.push(`;\n`);
             }
         }
-        if (mode === 'export') {
-            generateExportDefaultEndMapping();
-        }
         return scriptSetupGeneratedOffset;
     }
     function generateComponent(functional) {
@@ -524,7 +508,6 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
         else {
             codes.push(`(await import('${vueCompilerOptions.lib}')).defineComponent({\n`);
         }
-        generateComponentOptions(functional);
         codes.push(`setup() {\n`);
         codes.push(`return {\n`);
         generateSetupReturns();
@@ -533,6 +516,7 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
         }
         codes.push(`};\n`);
         codes.push(`},\n`);
+        generateComponentOptions(functional);
         codes.push(`})`);
     }
     function generateComponentOptions(functional) {
@@ -633,7 +617,6 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
     function generateComponentForTemplateUsage(functional, cssIds) {
         if (scriptSetup && scriptSetupRanges) {
             codes.push(`const __VLS_internalComponent = (await import('${vueCompilerOptions.lib}')).defineComponent({\n`);
-            generateComponentOptions(functional);
             codes.push(`setup() {\n`);
             codes.push(`return {\n`);
             generateSetupReturns();
@@ -670,10 +653,11 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
             }
             codes.push(`};\n`); // return {
             codes.push(`},\n`); // setup() {
+            generateComponentOptions(functional);
             codes.push(`});\n`); // defineComponent({
         }
         else if (script) {
-            codes.push(`let __VLS_internalComponent!: typeof import('./${path_1.posix.basename(fileName)}')['default'];\n`);
+            codes.push(`let __VLS_internalComponent!: typeof import('./${path.basename(fileName)}')['default'];\n`);
         }
         else {
             codes.push(`const __VLS_internalComponent = (await import('${vueCompilerOptions.lib}')).defineComponent({});\n`);
@@ -708,7 +692,7 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
             codes.push(`;\n`);
         }
         else if (scriptSetup) {
-            codes.push(`let __VLS_name!: '${path_1.posix.basename(fileName.substring(0, fileName.lastIndexOf('.')))}';\n`);
+            codes.push(`let __VLS_name!: '${path.basename(fileName.substring(0, fileName.lastIndexOf('.')))}';\n`);
         }
         else {
             codes.push(`const __VLS_name = undefined;\n`);
@@ -742,7 +726,7 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
         for (let i = 0; i < styles.length; i++) {
             const style = styles[i];
             const option = vueCompilerOptions.experimentalResolveStyleCssClasses;
-            if ((option === 'always' || option === 'scoped') && style.scoped) {
+            if (option === 'always' || (option === 'scoped' && style.scoped)) {
                 for (const className of style.classNames) {
                     generateCssClassProperty(i, className.text.substring(1), { start: className.offset, end: className.offset + className.text.length }, 'boolean', true, !style.module);
                 }

package/out/generators/template.js

@@ -506,11 +506,18 @@ function generate(ts, compilerOptions, vueCompilerOptions, template, shouldGener
             codes.push(`const ${var_originalComponent} = `, ...createInterpolationCode(dynamicTagExp.loc.source, dynamicTagExp.loc, dynamicTagExp.loc.start.offset, capabilitiesPresets.all, '(', ')'), ';\n');
         }
         else {
-            codes.push(`let ${var_originalComponent}!: `);
+            codes.push(`const ${var_originalComponent} = ({} as `);
             for (const componentName of getPossibleOriginalComponentName(tag)) {
-                codes.push(`'${componentName}' extends keyof typeof __VLS_ctx ? typeof __VLS_ctx${validTsVarReg.test(componentName) ? `.${componentName}` : `['${componentName}']`} : `);
+                codes.push(`'${componentName}' extends keyof typeof __VLS_ctx ? `, `{ '${toCanonicalComponentName(tag)}': typeof __VLS_ctx`, ...createPropertyAccessCode(componentName), ` }: `);
             }
-            codes.push(`typeof __VLS_resolvedLocalAndGlobalComponents['${toCanonicalComponentName(tag)}'];\n`);
+            codes.push(`typeof __VLS_resolvedLocalAndGlobalComponents)`, ...(tagOffsets.length
+                ? createPropertyAccessCode([
+                    toCanonicalComponentName(tag),
+                    'template',
+                    [tagOffsets[0], tagOffsets[0] + tag.length],
+                    capabilitiesPresets.diagnosticOnly,
+                ])
+                : createPropertyAccessCode(toCanonicalComponentName(tag))), ';\n');
         }
         if (isIntrinsicElement) {
             codes.push(`const ${var_functionalComponent} = __VLS_elementAsFunctionalComponent(${var_originalComponent});\n`);
@@ -716,7 +723,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, template, shouldGener
                 const eventsVar = componentCtxVar2EmitEventsVar.get(componentCtxVar);
                 const eventVar = `__VLS_${elementIndex++}`;
                 codes.push(`let ${eventVar} = { '${prop.arg.loc.source}': `, `__VLS_pickEvent(${eventsVar}['${prop.arg.loc.source}'], ({} as __VLS_FunctionalComponentProps<typeof ${componentVar}, typeof ${componentInstanceVar}>)`, ...createPropertyAccessCode([
-                    (0, shared_1.camelize)('on-' + prop.arg.loc.source),
+                    (0, shared_1.camelize)('on-' + prop.arg.loc.source), // onClickOutside
                     'template',
                     [prop.arg.loc.start.offset, prop.arg.loc.end.offset],
                     {
@@ -879,6 +886,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, template, shouldGener
                 let camelized = false;
                 if ((!prop.arg || (prop.arg.type === 4 /* CompilerDOM.NodeTypes.SIMPLE_EXPRESSION */ && prop.arg.isStatic)) // isStatic
                     && (0, shared_2.hyphenateAttr)(attrNameText) === attrNameText
+                    && !nativeTags.has(node.tag)
                     && !vueCompilerOptions.htmlAttributes.some(pattern => (0, minimatch_1.minimatch)(attrNameText, pattern))) {
                     attrNameText = (0, shared_1.camelize)(attrNameText);
                     camelized = true;
@@ -902,7 +910,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, template, shouldGener
                     codes.push(...createObjectPropertyCode([
                         attrNameText,
                         'template',
-                        [prop.arg.loc.start.offset, prop.arg.loc.start.offset + attrNameText.length],
+                        [prop.arg.loc.start.offset, prop.arg.loc.start.offset + attrNameText.length], // patch style attr,
                         {
                             ...caps_attr,
                             rename: {
@@ -956,6 +964,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, template, shouldGener
                 }
                 let camelized = false;
                 if ((0, shared_2.hyphenateAttr)(prop.name) === prop.name
+                    && !nativeTags.has(node.tag)
                     && !vueCompilerOptions.htmlAttributes.some(pattern => (0, minimatch_1.minimatch)(attrNameText, pattern))) {
                     attrNameText = (0, shared_1.camelize)(prop.name);
                     camelized = true;

package/out/languageModule.d.ts

@@ -6,5 +6,5 @@ export declare function createVueLanguage(ts: typeof import('typescript/lib/tsse
 /**
  * @deprecated planed to remove in 2.0, please use createVueLanguage instead of
  */
-export declare function createLanguages(compilerOptions?: ts.CompilerOptions, vueCompilerOptions?: Partial<VueCompilerOptions>, ts?: typeof import('typescript/lib/tsserverlibrary'), codegenStack?: boolean): Language[];
+export declare function createLanguages(ts: typeof import('typescript/lib/tsserverlibrary'), compilerOptions?: ts.CompilerOptions, vueCompilerOptions?: Partial<VueCompilerOptions>, codegenStack?: boolean): Language[];
 //# sourceMappingURL=languageModule.d.ts.map

package/out/languageModule.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLanguages = exports.createVueLanguage = void 0;
-const path_1 = require("path");
+const path = require("path-browserify");
 const plugins_1 = require("./plugins");
 const vueFile_1 = require("./virtualFile/vueFile");
 const sharedTypes = require("./utils/globalTypes");
@@ -60,7 +60,7 @@ function createVueLanguage(ts, compilerOptions = {}, _vueCompilerOptions = {}, c
         },
         resolveHost(host) {
             const sharedTypesSnapshot = ts.ScriptSnapshot.fromString(sharedTypes.getTypesCode(vueCompilerOptions));
-            const sharedTypesFileName = path_1.posix.join(host.rootPath, sharedTypes.baseName);
+            const sharedTypesFileName = path.join(host.rootPath, sharedTypes.baseName);
             return {
                 ...host,
                 resolveModuleName(moduleName, impliedNodeFormat) {
@@ -89,7 +89,7 @@ exports.createVueLanguage = createVueLanguage;
 /**
  * @deprecated planed to remove in 2.0, please use createVueLanguage instead of
  */
-function createLanguages(compilerOptions = {}, vueCompilerOptions = {}, ts = require('typescript'), codegenStack = false) {
+function createLanguages(ts, compilerOptions = {}, vueCompilerOptions = {}, codegenStack = false) {
     return [
         createVueLanguage(ts, compilerOptions, vueCompilerOptions, codegenStack),
         ...vueCompilerOptions.experimentalAdditionalLanguageModules?.map(module => require(module)) ?? [],

package/out/parsers/scriptSetupRanges.d.ts

@@ -9,9 +9,10 @@ export declare function parseScriptSetupRanges(ts: typeof import('typescript/lib
     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;

package/out/parsers/scriptSetupRanges.js

@@ -47,6 +47,13 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     function _getStartEnd(node) {
         return getStartEnd(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)
@@ -128,25 +135,19 @@ 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);
                 }
             }
             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);
                 }
             }
             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;
@@ -165,7 +166,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                     statementRange = _getStartEnd(node);
                 }
                 props.define = {
-                    ..._getStartEnd(node),
+                    ...parseDefineFunction(node),
                     statement: statementRange,
                 };
                 if (ts.isVariableDeclaration(parent)) {

package/out/plugins/file-vue.js

@@ -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/out/plugins/vue-tsx.d.ts

@@ -5,9 +5,9 @@ export declare const tsCodegen: WeakMap<Sfc, {
         exportDefault: (import("../types").TextRange & {
             expression: import("../types").TextRange;
             args: import("../types").TextRange;
-            argsNode: import("typescript/lib/tsserverlibrary").ObjectLiteralExpression | undefined;
+            argsNode: import("typescript").ObjectLiteralExpression | undefined;
             componentsOption: import("../types").TextRange | undefined;
-            componentsOptionNode: import("typescript/lib/tsserverlibrary").ObjectLiteralExpression | undefined;
+            componentsOptionNode: import("typescript").ObjectLiteralExpression | undefined;
             nameOption: import("../types").TextRange | undefined;
         }) | undefined;
         bindings: import("../types").TextRange[];
@@ -19,9 +19,10 @@ export declare const tsCodegen: WeakMap<Sfc, {
         props: {
             name?: string | undefined;
             define?: (import("../types").TextRange & {
-                statement: import("../types").TextRange;
                 arg?: import("../types").TextRange | undefined;
                 typeArg?: import("../types").TextRange | undefined;
+            } & {
+                statement: import("../types").TextRange;
             }) | undefined;
             withDefaults?: (import("../types").TextRange & {
                 arg?: import("../types").TextRange | undefined;
@@ -29,11 +30,17 @@ export declare const tsCodegen: WeakMap<Sfc, {
         };
         slots: {
             name?: string | undefined;
-            define?: import("../types").TextRange | undefined;
+            define?: (import("../types").TextRange & {
+                arg?: import("../types").TextRange | undefined;
+                typeArg?: import("../types").TextRange | undefined;
+            }) | undefined;
         };
         emits: {
             name?: string | undefined;
-            define?: import("../types").TextRange | undefined;
+            define?: (import("../types").TextRange & {
+                arg?: import("../types").TextRange | undefined;
+                typeArg?: import("../types").TextRange | undefined;
+            }) | undefined;
         };
         expose: {
             name?: string | undefined;

package/out/plugins/vue-tsx.js

@@ -131,7 +131,7 @@ function createTsx(fileName, _sfc, { vueCompilerOptions, compilerOptions, codege
         }
         for (const style of _sfc.styles) {
             const option = vueCompilerOptions.experimentalResolveStyleCssClasses;
-            if ((option === 'always' || option === 'scoped') && style.scoped) {
+            if (option === 'always' || (option === 'scoped' && style.scoped)) {
                 for (const className of style.classNames) {
                     classes.add(className.text.substring(1));
                 }

package/out/plugins.js

@@ -14,9 +14,9 @@ const CompilerDOM = require("@vue/compiler-dom");
 const CompilerVue2 = require("./utils/vue2TemplateCompiler");
 function getDefaultVueLanguagePlugins(ts, compilerOptions, vueCompilerOptions, codegenStack) {
     const plugins = [
-        file_md_1.default,
-        file_html_1.default,
-        file_vue_1.default,
+        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_sfc_styles_1.default,
         vue_sfc_customblocks_1.default,

package/out/utils/ts.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveVueCompilerOptions = exports.createParsedCommandLine = exports.createParsedCommandLineByJson = void 0;
-const path = require("path");
+const path = require("path-browserify");
 function createParsedCommandLineByJson(ts, parseConfigHost, rootDir, json, configFileName = rootDir + '/jsconfig.json') {
     const proxyHost = proxyParseConfigHostForExtendConfigPaths(parseConfigHost);
     ts.parseJsonConfigFileContent(json, proxyHost.host, rootDir, {}, configFileName);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "1.8.21",
+	"version": "1.8.24",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,17 +13,20 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~1.10.5",
-		"@volar/source-map": "~1.10.5",
+		"@volar/language-core": "~1.11.1",
+		"@volar/source-map": "~1.11.1",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/shared": "^3.3.0",
 		"computeds": "^0.0.1",
 		"minimatch": "^9.0.3",
 		"muggle-string": "^0.3.1",
+		"path-browserify": "^1.0.1",
 		"vue-template-compiler": "^2.7.14"
 	},
 	"devDependencies": {
 		"@types/minimatch": "^5.1.2",
+		"@types/node": "latest",
+		"@types/path-browserify": "^1.0.1",
 		"@vue/compiler-sfc": "^3.3.0"
 	},
 	"peerDependencies": {
@@ -34,5 +37,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "46ae2ff1c155e51291fd584c0c3a32ed3dace7a5"
+	"gitHead": "6f850196d6b9cd1bee62104d3d92867cf0b6777e"
 }