@vue/language-core 1.7.7 → 1.7.9

package/out/generators/script.js

@@ -56,7 +56,7 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
         WithTemplateSlots: false,
         PropsChildren: false,
     };
-    codes.push('/* __vue_virtual_code_placeholder__ */\n');
+    codes.push(`/* ${Object.entries(vueCompilerOptions).map(([key, value]) => `${key}: ${JSON.stringify(value)}`).join(', ')} */\n`);
     let generatedTemplate = false;
     generateSrc();
     generateScriptSetupImports();
@@ -281,73 +281,62 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
             codes.push(';\n');
             //#endregion
             //#region props
-            if (scriptSetupRanges.propsRuntimeArg
-                || scriptSetupRanges.defineProp.length) {
-                if (scriptSetupRanges.propsRuntimeArg) {
-                    codes.push(`const __VLS_props = (new __VLS_publicComponent()).$props;\n`);
-                }
-                else if (scriptSetupRanges.defineProp.length) {
-                    codes.push(`const __VLS_defaults = {\n`);
-                    for (const defineProp of scriptSetupRanges.defineProp) {
-                        if (defineProp.defaultValue) {
-                            if (defineProp.name) {
-                                codes.push(sfc.scriptSetup.content.substring(defineProp.name.start, defineProp.name.end));
-                            }
-                            else {
-                                codes.push('modelValue');
-                            }
-                            codes.push(`: `);
-                            codes.push(sfc.scriptSetup.content.substring(defineProp.defaultValue.start, defineProp.defaultValue.end));
-                            codes.push(`,\n`);
-                        }
-                    }
-                    codes.push(`};\n`);
-                    codes.push(`let __VLS_props!: {\n`);
-                    for (const defineProp of scriptSetupRanges.defineProp) {
-                        let propName = 'modelValue';
+            if (scriptSetupRanges.defineProp.length) {
+                codes.push(`const __VLS_defaults = {\n`);
+                for (const defineProp of scriptSetupRanges.defineProp) {
+                    if (defineProp.defaultValue) {
                         if (defineProp.name) {
-                            propName = sfc.scriptSetup.content.substring(defineProp.name.start, defineProp.name.end);
-                            const propMirrorStart = muggle.getLength(codes);
-                            definePropMirrors[propName] = [propMirrorStart, propMirrorStart + propName.length];
-                        }
-                        codes.push(`${propName}${defineProp.required ? '' : '?'}: `);
-                        if (defineProp.type) {
-                            codes.push(sfc.scriptSetup.content.substring(defineProp.type.start, defineProp.type.end));
-                        }
-                        else if (defineProp.defaultValue) {
-                            codes.push(`typeof __VLS_defaults['`);
-                            codes.push(propName);
-                            codes.push(`']`);
+                            codes.push(sfc.scriptSetup.content.substring(defineProp.name.start, defineProp.name.end));
                         }
                         else {
-                            codes.push(`any`);
+                            codes.push('modelValue');
                         }
-                        codes.push(',\n');
+                        codes.push(`: `);
+                        codes.push(sfc.scriptSetup.content.substring(defineProp.defaultValue.start, defineProp.defaultValue.end));
+                        codes.push(`,\n`);
                     }
-                    codes.push(`};\n`);
-                }
-                if (scriptSetupRanges.slotsTypeArg && vueCompilerOptions.jsxSlots) {
-                    usedHelperTypes.PropsChildren = true;
-                    codes.push(` & __VLS_PropsChildren<`);
-                    addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.slotsTypeArg.start, scriptSetupRanges.slotsTypeArg.end);
-                    codes.push(`>`);
                 }
-                codes.push(`;\n`);
+                codes.push(`};\n`);
             }
-            else {
-                codes.push(`const __VLS_props: {}`);
-                if (scriptSetupRanges.slotsTypeArg && vueCompilerOptions.jsxSlots) {
-                    usedHelperTypes.PropsChildren = true;
-                    codes.push(` & __VLS_PropsChildren<`);
-                    addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.slotsTypeArg.start, scriptSetupRanges.slotsTypeArg.end);
-                    codes.push(`>`);
-                }
-                if (scriptSetupRanges.propsTypeArg) {
-                    codes.push(' & ');
-                    addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.propsTypeArg.start, scriptSetupRanges.propsTypeArg.end);
+            codes.push(`let __VLS_props!: {}`);
+            if (scriptSetupRanges.propsRuntimeArg) {
+                codes.push(` & InstanceType<typeof __VLS_publicComponent>['$props']`);
+            }
+            if (scriptSetupRanges.propsTypeArg) {
+                codes.push(` & `);
+                addVirtualCode('scriptSetup', scriptSetupRanges.propsTypeArg.start, scriptSetupRanges.propsTypeArg.end);
+            }
+            if (scriptSetupRanges.defineProp.length) {
+                codes.push(` & {\n`);
+                for (const defineProp of scriptSetupRanges.defineProp) {
+                    let propName = 'modelValue';
+                    if (defineProp.name) {
+                        propName = sfc.scriptSetup.content.substring(defineProp.name.start, defineProp.name.end);
+                        const propMirrorStart = muggle.getLength(codes);
+                        definePropMirrors[propName] = [propMirrorStart, propMirrorStart + propName.length];
+                    }
+                    codes.push(`${propName}${defineProp.required ? '' : '?'}: `);
+                    if (defineProp.type) {
+                        codes.push(sfc.scriptSetup.content.substring(defineProp.type.start, defineProp.type.end));
+                    }
+                    else if (defineProp.defaultValue) {
+                        codes.push(`typeof __VLS_defaults['`);
+                        codes.push(propName);
+                        codes.push(`']`);
+                    }
+                    else {
+                        codes.push(`any`);
+                    }
+                    codes.push(',\n');
                 }
-                codes.push(`;\n`);
+                codes.push(`}`);
+            }
+            if (scriptSetupRanges.slotsTypeArg && vueCompilerOptions.jsxSlots) {
+                usedHelperTypes.PropsChildren = true;
+                codes.push(` & __VLS_PropsChildren<`);
+                addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.slotsTypeArg.start, scriptSetupRanges.slotsTypeArg.end);
             }
+            codes.push(`;\n`);
             //#endregion
             //#region emits
             codes.push(`const __VLS_emit = `);
@@ -439,17 +428,8 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
             addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.withDefaultsArg.start, scriptSetupRanges.withDefaultsArg.end);
             codes.push(`);\n`);
         }
-        if (scriptRanges?.exportDefault && scriptRanges.exportDefault.expression.start !== scriptRanges.exportDefault.args.start) {
-            // use defineComponent() from user space code if it exist
-            codes.push(`const __VLS_publicComponent = `);
-            addVirtualCode('script', scriptRanges.exportDefault.expression.start, scriptRanges.exportDefault.args.start);
-            codes.push(`{\n`);
-        }
-        else {
-            codes.push(`const __VLS_publicComponent = (await import('${vueCompilerOptions.lib}')).defineComponent({\n`);
-        }
-        if (scriptSetupRanges.defineProp.length) {
-            codes.push(`props: {} as {\n`);
+        if (!functional && scriptSetupRanges.defineProp.length) {
+            codes.push(`let __VLS_propsOption_defineProp!: {\n`);
             for (const defineProp of scriptSetupRanges.defineProp) {
                 let propName = 'modelValue';
                 if (defineProp.name && defineProp.nameIsString) {
@@ -480,14 +460,28 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
                     codes.push(`import('${vueCompilerOptions.lib}').PropType<${type}>,\n`);
                 }
             }
-            codes.push(`},\n`);
+            codes.push(`};\n`);
+        }
+        if (scriptRanges?.exportDefault && scriptRanges.exportDefault.expression.start !== scriptRanges.exportDefault.args.start) {
+            // use defineComponent() from user space code if it exist
+            codes.push(`const __VLS_publicComponent = `);
+            addVirtualCode('script', scriptRanges.exportDefault.expression.start, scriptRanges.exportDefault.args.start);
+            codes.push(`{\n`);
+        }
+        else {
+            codes.push(`const __VLS_publicComponent = (await import('${vueCompilerOptions.lib}')).defineComponent({\n`);
         }
         if (!bypassDefineComponent) {
-            if (scriptSetupRanges.propsRuntimeArg || scriptSetupRanges.propsTypeArg) {
-                codes.push(`props: (`);
+            if (scriptSetupRanges.propsRuntimeArg || scriptSetupRanges.propsTypeArg || (!functional && scriptSetupRanges.defineProp.length)) {
+                codes.push(`props: {\n`);
+                if (scriptSetupRanges.propsRuntimeArg) {
+                    codes.push('...');
+                    addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.propsRuntimeArg.start, scriptSetupRanges.propsRuntimeArg.end);
+                    codes.push(',\n');
+                }
                 if (scriptSetupRanges.propsTypeArg) {
                     usedHelperTypes.DefinePropsToOptions = true;
-                    codes.push(`{} as `);
+                    codes.push('...{} as ');
                     if (scriptSetupRanges.withDefaultsArg) {
                         usedHelperTypes.mergePropDefaults = true;
                         codes.push(`__VLS_WithDefaults<`);
@@ -504,11 +498,12 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
                         codes.push(`, typeof __VLS_withDefaultsArg`);
                         codes.push(`>`);
                     }
+                    codes.push(',\n');
                 }
-                else if (scriptSetupRanges.propsRuntimeArg) {
-                    addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.propsRuntimeArg.start, scriptSetupRanges.propsRuntimeArg.end);
+                if (!functional && scriptSetupRanges.defineProp.length) {
+                    codes.push(`...__VLS_propsOption_defineProp,\n`);
                 }
-                codes.push(`),\n`);
+                codes.push(`},\n`);
             }
             if (scriptSetupRanges.emitsTypeArg) {
                 usedHelperTypes.ConstructorOverloads = true;

package/out/generators/template.js

@@ -144,7 +144,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
     }
     function generateComponentVars() {
         const data = {};
-        codes.push(`let __VLS_templateComponents!: {}\n`);
+        codes.push(`let __VLS_templateComponents!: __VLS_IntrinsicElements\n`);
         for (const tagName in tagNames) {
             const isNamespacedTag = tagName.indexOf('.') >= 0;
             if (isNamespacedTag)
@@ -287,7 +287,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                         shouldReport: () => errors === 0,
                     },
                 },
-            ], '\n{};\n');
+            ], '\n;\n');
             expectedErrorStart = undefined;
             expectedErrorNode = undefined;
         }
@@ -302,7 +302,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
             else if (commentText === '@vue-ignore') {
                 ignoreStart = codes.length;
             }
-            else if (commentText === '@vue-expected-error') {
+            else if (commentText === '@vue-expect-error') {
                 expectedErrorStart = codes.length;
                 expectedErrorNode = prevNode;
             }
@@ -605,7 +605,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                     'default',
                     'template',
                     [slotDir.loc.start.offset, slotDir.loc.start.offset + (slotDir.loc.source.startsWith('#') ? '#'.length : slotDir.loc.source.startsWith('v-slot:') ? 'v-slot:'.length : 0)],
-                    capabilitiesPresets.slotName,
+                    { ...capabilitiesPresets.slotName, completion: false },
                 ])), ['', 'template', (slotDir.arg ?? slotDir).loc.end.offset, capabilitiesPresets.diagnosticOnly]);
             if (hasProps) {
                 codes.push(')');

package/out/languageModule.d.ts

@@ -1,5 +1,6 @@
 import type { Language } from '@volar/language-core';
+import { VueFile } from './sourceFile';
 import { VueCompilerOptions } from './types';
 import type * as ts from 'typescript/lib/tsserverlibrary';
-export declare function createLanguage(compilerOptions?: ts.CompilerOptions, _vueCompilerOptions?: Partial<VueCompilerOptions>, ts?: typeof import('typescript/lib/tsserverlibrary'), codegenStack?: boolean): Language;
+export declare function createLanguage(compilerOptions?: ts.CompilerOptions, _vueCompilerOptions?: Partial<VueCompilerOptions>, ts?: typeof import('typescript/lib/tsserverlibrary'), codegenStack?: boolean): Language<VueFile>;
 export declare function createLanguages(compilerOptions?: ts.CompilerOptions, vueCompilerOptions?: Partial<VueCompilerOptions>, ts?: typeof import('typescript/lib/tsserverlibrary'), codegenStack?: boolean): Language[];

package/out/languageModule.js

@@ -10,7 +10,6 @@ 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 sharedTypesSnapshot = ts.ScriptSnapshot.fromString(sharedTypes.getTypesCode(vueCompilerOptions));
     const languageModule = {
         createVirtualFile(fileName, snapshot, languageId) {
             if (languageId === 'vue'
@@ -23,31 +22,18 @@ function createLanguage(compilerOptions = {}, _vueCompilerOptions = {}, ts = req
             sourceFile.update(snapshot);
         },
         resolveHost(host) {
+            const sharedTypesSnapshot = ts.ScriptSnapshot.fromString(sharedTypes.getTypesCode(vueCompilerOptions));
+            const sharedTypesFileName = path_1.posix.join(host.getCurrentDirectory(), sharedTypes.baseName);
             return {
                 ...host,
-                fileExists(fileName) {
-                    const basename = path_1.posix.basename(fileName);
-                    if (basename === sharedTypes.baseName) {
-                        return true;
-                    }
-                    return host.fileExists(fileName);
-                },
                 getScriptFileNames() {
                     return [
-                        path_1.posix.join(host.getCurrentDirectory(), sharedTypes.baseName),
+                        sharedTypesFileName,
                         ...host.getScriptFileNames(),
                     ];
                 },
-                getScriptVersion(fileName) {
-                    const basename = path_1.posix.basename(fileName);
-                    if (basename === sharedTypes.baseName) {
-                        return '';
-                    }
-                    return host.getScriptVersion(fileName);
-                },
                 getScriptSnapshot(fileName) {
-                    const basename = path_1.posix.basename(fileName);
-                    if (basename === sharedTypes.baseName) {
+                    if (fileName === sharedTypesFileName) {
                         return sharedTypesSnapshot;
                     }
                     return host.getScriptSnapshot(fileName);

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

@@ -5,7 +5,10 @@ const plugin = ({ modules }) => {
         compileSFCTemplate(lang, template, options) {
             if (lang === 'html') {
                 const compiler = modules['@vue/compiler-dom'];
-                return compiler.compile(template, options);
+                return compiler.compile(template, {
+                    ...options,
+                    comments: true,
+                });
             }
         },
         updateSFCTemplate(oldResult, change) {

package/out/utils/directorySharedTypes.js

@@ -62,12 +62,10 @@ declare function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
 
 type __VLS_SelfComponent<N, C> = string extends N ? {} : N extends string ? { [P in N]: C } : {};
 type __VLS_WithComponent<N0 extends string, Components, N1 extends string, N2 extends string, N3 extends string> =
-	__VLS_IsAny<__VLS_IntrinsicElements[N0]> extends true ? (
-		N1 extends keyof Components ? N1 extends N0 ? Pick<Components, N0> : { [K in N0]: Components[N1] } :
-		N2 extends keyof Components ? N2 extends N0 ? Pick<Components, N0> : { [K in N0]: Components[N2] } :
-		N3 extends keyof Components ? N3 extends N0 ? Pick<Components, N0> : { [K in N0]: Components[N3] } :
-		${vueCompilerOptions.strictTemplates ? '{}' : '{ [K in N0]: any }'}
-	) : Pick<__VLS_IntrinsicElements, N0>;
+	N1 extends keyof Components ? N1 extends N0 ? Pick<Components, N0> : { [K in N0]: Components[N1] } :
+	N2 extends keyof Components ? N2 extends N0 ? Pick<Components, N0> : { [K in N0]: Components[N2] } :
+	N3 extends keyof Components ? N3 extends N0 ? Pick<Components, N0> : { [K in N0]: Components[N3] } :
+	${vueCompilerOptions.strictTemplates ? '{}' : '{ [K in N0]: unknown }'}
 
 type __VLS_FillingEventArg_ParametersLength<E extends (...args: any) => any> = __VLS_IsAny<Parameters<E>> extends true ? -1 : Parameters<E>['length'];
 type __VLS_FillingEventArg<E> = E extends (...args: any) => any ? __VLS_FillingEventArg_ParametersLength<E> extends 0 ? ($event?: undefined) => ReturnType<E> : E : E;
@@ -100,7 +98,7 @@ declare function __VLS_asFunctionalComponent<T, K = T extends new (...args: any)
 	}) => JSX.Element & { __ctx?: typeof ctx & { props?: typeof props; expose?(exposed: K): void; } }
 	: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
 	: T extends (...args: any) => any ? T
-	: (_: T extends import('${vueCompilerOptions.lib}').VNode | import('${vueCompilerOptions.lib}').VNode[] | string ? {}: T & Record<string, unknown>, ctx?: any) => { __ctx?: { attrs?: unknown, expose?: unknown, slots?: unknown, emit?: unknown, props?: T & Record<string, unknown> } }; // IntrinsicElement
+	: (_: T extends import('${vueCompilerOptions.lib}').VNode | import('${vueCompilerOptions.lib}').VNode[] | string ? {}: T${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: T${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'} } }; // IntrinsicElement
 declare function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): Parameters<T>['length'] extends 2 ? [any] : [];
 declare function __VLS_pickEvent<Emit, K, E>(emit: Emit, emitKey: K, event: E): __VLS_FillingEventArg<
 	__VLS_PickNotAny<

package/out/utils/ts.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveVueCompilerOptions = exports.createParsedCommandLine = exports.createParsedCommandLineByJson = void 0;
 const path = require("path");
 function createParsedCommandLineByJson(ts, parseConfigHost, rootDir, json) {
-    const tsConfigPath = path.join(rootDir, 'jsconfig.json');
     const proxyHost = proxyParseConfigHostForExtendConfigPaths(parseConfigHost);
-    ts.parseJsonConfigFileContent(json, proxyHost.host, rootDir, {}, tsConfigPath);
+    ts.parseJsonConfigFileContent(json, proxyHost.host, rootDir, {}, rootDir + '/jsconfig.json');
     let vueOptions = {};
     for (const extendPath of proxyHost.extendConfigPaths.reverse()) {
         try {
@@ -16,7 +15,7 @@ function createParsedCommandLineByJson(ts, parseConfigHost, rootDir, json) {
         }
         catch (err) { }
     }
-    const parsed = ts.parseJsonConfigFileContent(json, proxyHost.host, path.dirname(tsConfigPath), {}, tsConfigPath, undefined, (vueOptions.extensions ?? ['.vue']).map(extension => ({
+    const parsed = ts.parseJsonConfigFileContent(json, proxyHost.host, rootDir, {}, rootDir + '/jsconfig.json', undefined, (vueOptions.extensions ?? ['.vue']).map(extension => ({
         extension: extension.slice(1),
         isMixedContent: true,
         scriptKind: ts.ScriptKind.Deferred,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "1.7.7",
+	"version": "1.7.9",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/vue-language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.6.9",
-		"@volar/source-map": "1.6.9",
+		"@volar/language-core": "1.7.3",
+		"@volar/source-map": "1.7.3",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/reactivity": "^3.3.0",
 		"@vue/shared": "^3.3.0",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "0e9411252a4fa30cc999e30acc5db0d126c33daf"
+	"gitHead": "70f9ebedbc55a8d342ec425cc483dfe39c4b7489"
 }