@vue/language-core 1.8.15 → 1.8.17

package/out/generators/script.js

@@ -55,6 +55,7 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
             bindings: [],
             emitsAssignName: undefined,
             exposeRuntimeArg: undefined,
+            exposeTypeArg: undefined,
             leadingCommentEndOffset: 0,
             importSectionEndOffset: 0,
             withDefaults: undefined,
@@ -356,10 +357,10 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
             //#endregion
             codes.push('return {} as {\n');
             codes.push(`props: __VLS_Prettify<Omit<typeof __VLS_fnPropsDefineComponent & typeof __VLS_fnPropsTypeOnly, keyof typeof __VLS_defaultProps>> & typeof __VLS_fnPropsSlots & typeof __VLS_defaultProps,\n`);
-            codes.push(`expose(exposed: ${scriptSetupRanges.exposeRuntimeArg ? 'typeof __VLS_exposed' : '{}'}): void,\n`);
+            codes.push(`expose(exposed: import('${vueCompilerOptions.lib}').ShallowUnwrapRef<${scriptSetupRanges.defineExpose ? 'typeof __VLS_exposed' : '{}'}>): void,\n`);
             codes.push('attrs: any,\n');
             codes.push('slots: ReturnType<typeof __VLS_template>,\n');
-            codes.push('emit: typeof __VLS_emit');
+            codes.push(`emit: typeof ${scriptSetupRanges.emitsAssignName ?? '__VLS_emit'},\n`);
             codes.push('};\n');
             codes.push('})(),\n');
             codes.push(`) => ({} as import('${vueCompilerOptions.lib}').VNode & { __ctx?: Awaited<typeof __VLS_setup> }))`);
@@ -429,12 +430,11 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
         const scriptSetupGeneratedOffset = muggle.getLength(codes) - scriptSetupRanges.importSectionEndOffset;
         let setupCodeModifies = [];
         if (scriptSetupRanges.defineProps && !scriptSetupRanges.propsAssignName) {
-            if (scriptSetupRanges.withDefaults) {
-                setupCodeModifies.push([() => codes.push(`const __VLS_props = `), scriptSetupRanges.withDefaults.start, scriptSetupRanges.withDefaults.start]);
-            }
-            else {
-                setupCodeModifies.push([() => codes.push(`const __VLS_props = `), scriptSetupRanges.defineProps.start, scriptSetupRanges.defineProps.start]);
-            }
+            const ranges = scriptSetupRanges.withDefaults ?? scriptSetupRanges.defineProps;
+            codes.push(`const __VLS_props = `);
+            addVirtualCode('scriptSetup', ranges.start, ranges.end);
+            codes.push(`;\n`);
+            setupCodeModifies.push([() => codes.push(`__VLS_props`), ranges.start, ranges.end]);
         }
         if (scriptSetupRanges.defineSlots && !scriptSetupRanges.slotsAssignName) {
             setupCodeModifies.push([() => codes.push(`const __VLS_slots = `), scriptSetupRanges.defineSlots.start, scriptSetupRanges.defineSlots.start]);
@@ -442,15 +442,22 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
         if (scriptSetupRanges.defineEmits && !scriptSetupRanges.emitsAssignName) {
             setupCodeModifies.push([() => codes.push(`const __VLS_emit = `), scriptSetupRanges.defineEmits.start, scriptSetupRanges.defineEmits.start]);
         }
-        if (scriptSetupRanges.defineExpose && scriptSetupRanges.exposeRuntimeArg) {
+        if (scriptSetupRanges.defineExpose) {
             setupCodeModifies.push([() => {
-                    codes.push(`const __VLS_exposed = `);
-                    addVirtualCode('scriptSetup', scriptSetupRanges.exposeRuntimeArg.start, scriptSetupRanges.exposeRuntimeArg.end);
-                    codes.push(`;`);
-                    addVirtualCode('scriptSetup', scriptSetupRanges.defineExpose.start, scriptSetupRanges.exposeRuntimeArg.start);
-                    codes.push(`__VLS_exposed`);
-                    addVirtualCode('scriptSetup', scriptSetupRanges.exposeRuntimeArg.end, scriptSetupRanges.defineExpose.end);
-                }, scriptSetupRanges.defineExpose.start, scriptSetupRanges.defineExpose.end]);
+                    if (scriptSetupRanges?.exposeTypeArg) {
+                        codes.push(`let __VLS_exposed!: `);
+                        addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.exposeTypeArg.start, scriptSetupRanges.exposeTypeArg.end);
+                        codes.push(`;\n`);
+                    }
+                    else if (scriptSetupRanges?.exposeRuntimeArg) {
+                        codes.push(`const __VLS_exposed = `);
+                        addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.exposeRuntimeArg.start, scriptSetupRanges.exposeRuntimeArg.end);
+                        codes.push(`;\n`);
+                    }
+                    else {
+                        codes.push(`const __VLS_exposed = {};\n`);
+                    }
+                }, scriptSetupRanges.defineExpose.start, scriptSetupRanges.defineExpose.start]);
         }
         setupCodeModifies = setupCodeModifies.sort((a, b) => a[1] - b[1]);
         if (setupCodeModifies.length) {
@@ -546,14 +553,11 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
         codes.push(`setup() {\n`);
         codes.push(`return {\n`);
         generateSetupReturns();
-        if (scriptSetupRanges.exposeRuntimeArg) {
+        if (scriptSetupRanges.defineExpose) {
             codes.push(`...__VLS_exposed,\n`);
         }
         codes.push(`};\n`);
         codes.push(`},\n`);
-        if (scriptRanges?.exportDefault?.args) {
-            addVirtualCode('script', scriptRanges.exportDefault.args.start + 1, scriptRanges.exportDefault.args.end - 1);
-        }
         codes.push(`})`);
     }
     function generateComponentOptions(functional) {
@@ -595,6 +599,9 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
                 codes.push(`emits: ({} as __VLS_NormalizeEmits<typeof `, scriptSetupRanges.emitsAssignName ?? '__VLS_emit', `>),\n`);
             }
         }
+        if (scriptRanges?.exportDefault?.args) {
+            addVirtualCode('script', scriptRanges.exportDefault.args.start + 1, scriptRanges.exportDefault.args.end - 1);
+        }
     }
     function generateSetupReturns() {
         if (scriptSetupRanges && bypassDefineComponent) {

package/out/generators/template.d.ts

@@ -5,7 +5,7 @@ import * as muggle from 'muggle-string';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import { Sfc, VueCompilerOptions } from '../types';
 type Code = Segment<FileRangeCapabilities>;
-export declare function generate(ts: typeof import('typescript/lib/tsserverlibrary'), compilerOptions: ts.CompilerOptions, vueCompilerOptions: VueCompilerOptions, sourceTemplate: string, sourceLang: string, sfc: Sfc, hasScriptSetupSlots: boolean, slotsAssignName: string | undefined, codegenStack: boolean): {
+export declare function generate(ts: typeof import('typescript/lib/tsserverlibrary'), compilerOptions: ts.CompilerOptions, vueCompilerOptions: VueCompilerOptions, sourceTemplate: string, sourceLang: string, sfc: Sfc, hasScriptSetupSlots: boolean, slotsAssignName: string | undefined, propsAssignName: string | undefined, codegenStack: boolean): {
     codes: Code[];
     codeStacks: muggle.StackNode[];
     formatCodes: Code[];

package/out/generators/template.js

@@ -84,7 +84,7 @@ const transformContext = {
     },
     expressionPlugins: ['typescript'],
 };
-function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourceLang, sfc, hasScriptSetupSlots, slotsAssignName, codegenStack) {
+function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourceLang, sfc, hasScriptSetupSlots, slotsAssignName, propsAssignName, codegenStack) {
     const nativeTags = new Set(vueCompilerOptions.nativeTags);
     const [codes, codeStacks] = codegenStack ? muggle.track([]) : [[], []];
     const [formatCodes, formatCodeStacks] = codegenStack ? muggle.track([]) : [[], []];
@@ -104,6 +104,9 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
     let ignoreStart;
     let expectedErrorStart;
     let expectedErrorNode;
+    if (propsAssignName) {
+        localVars[propsAssignName] = 1;
+    }
     generatePreResolveComponents();
     if (sfc.templateAst) {
         visitNode(sfc.templateAst, undefined, undefined, undefined);

package/out/parsers/scriptSetupRanges.d.ts

@@ -18,6 +18,7 @@ export declare function parseScriptSetupRanges(ts: typeof import('typescript/lib
     slotsAssignName: string | undefined;
     emitsAssignName: string | undefined;
     exposeRuntimeArg: TextRange | undefined;
+    exposeTypeArg: TextRange | undefined;
     defineProp: {
         name: TextRange | undefined;
         nameIsString: boolean;

package/out/parsers/scriptSetupRanges.js

@@ -16,6 +16,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     let slotsAssignName;
     let emitsAssignName;
     let exposeRuntimeArg;
+    let exposeTypeArg;
     const definePropProposalA = vueCompilerOptions.experimentalDefinePropProposal === 'kevinEdition' || ast.getFullText().trimStart().startsWith('// @experimentalDefinePropProposal=kevinEdition');
     const definePropProposalB = vueCompilerOptions.experimentalDefinePropProposal === 'johnsonEdition' || ast.getFullText().trimStart().startsWith('// @experimentalDefinePropProposal=johnsonEdition');
     const defineProp = [];
@@ -58,6 +59,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
         slotsAssignName,
         emitsAssignName,
         exposeRuntimeArg,
+        exposeTypeArg,
         defineProp,
     };
     function _getStartEnd(node) {
@@ -159,6 +161,9 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                 if (node.arguments.length) {
                     exposeRuntimeArg = _getStartEnd(node.arguments[0]);
                 }
+                if (node.typeArguments?.length) {
+                    exposeTypeArg = _getStartEnd(node.typeArguments[0]);
+                }
             }
             else if (vueCompilerOptions.macros.defineProps.includes(callText)) {
                 defineProps = _getStartEnd(node);

package/out/plugins/vue-tsx.d.ts

@@ -28,6 +28,7 @@ export declare const tsCodegen: WeakMap<Sfc, {
         slotsAssignName: string | undefined;
         emitsAssignName: string | undefined;
         exposeRuntimeArg: import("../types").TextRange | undefined;
+        exposeTypeArg: import("../types").TextRange | undefined;
         defineProp: {
             name: import("../types").TextRange | undefined;
             nameIsString: boolean;

package/out/plugins/vue-tsx.js

@@ -138,15 +138,17 @@ function createTsx(fileName, _sfc, { vueCompilerOptions, compilerOptions, codege
     const htmlGen = (0, reactivity_1.computed)(() => {
         if (!_sfc.templateAst)
             return;
-        return templateGen.generate(ts, compilerOptions, vueCompilerOptions, _sfc.template?.content ?? '', _sfc.template?.lang ?? 'html', _sfc, hasScriptSetupSlots.value, slotsAssignName.value, codegenStack);
+        return templateGen.generate(ts, compilerOptions, vueCompilerOptions, _sfc.template?.content ?? '', _sfc.template?.lang ?? 'html', _sfc, hasScriptSetupSlots.value, slotsAssignName.value, propsAssignName.value, codegenStack);
     });
     //#region remove when https://github.com/vuejs/core/pull/5912 merged
     const hasScriptSetupSlots = (0, reactivity_1.shallowRef)(false);
     const slotsAssignName = (0, reactivity_1.shallowRef)();
+    const propsAssignName = (0, reactivity_1.shallowRef)();
     //#endregion
     const tsxGen = (0, reactivity_1.computed)(() => {
         hasScriptSetupSlots.value = !!scriptSetupRanges.value?.defineSlots;
         slotsAssignName.value = scriptSetupRanges.value?.slotsAssignName;
+        propsAssignName.value = scriptSetupRanges.value?.propsAssignName;
         return (0, script_1.generate)(ts, fileName, _sfc, lang.value, scriptRanges.value, scriptSetupRanges.value, htmlGen.value, compilerOptions, vueCompilerOptions, codegenStack);
     });
     return {

package/out/utils/globalTypes.js

@@ -111,8 +111,8 @@ type __VLS_OverloadUnion<T> = Exclude<
 	T extends () => never ? never : () => never
 >;
 type __VLS_ConstructorOverloads<T> = __VLS_OverloadUnion<T> extends infer F
-	? F extends (event: infer E, ...args: infer A) => infer R
-	? { [K in E as K extends string ? K : never]: (...args: A) => void; }
+	? F extends (event: infer E, ...args: infer A) => any
+	? { [K in E & string]: (...args: A) => void; }
 	: never
 	: never;
 type __VLS_NormalizeEmits<T> = __VLS_Prettify<

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "1.8.15",
+	"version": "1.8.17",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,12 +13,12 @@
 		"directory": "packages/vue-language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~1.10.0",
-		"@volar/source-map": "~1.10.0",
+		"@volar/language-core": "1.10.2",
+		"@volar/source-map": "1.10.2",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/reactivity": "^3.3.0",
 		"@vue/shared": "^3.3.0",
-		"minimatch": "^9.0.0",
+		"minimatch": "^9.0.3",
 		"muggle-string": "^0.3.1",
 		"vue-template-compiler": "^2.7.14"
 	},
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "24de4582131385e75f904bff7294df0e16ce1e01"
+	"gitHead": "81b41fe5daa15b01183459d036710ccc2491782e"
 }