@vue/language-core 1.8.14 → 1.8.15

package/out/generators/script.js

@@ -57,6 +57,7 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
             exposeRuntimeArg: undefined,
             leadingCommentEndOffset: 0,
             importSectionEndOffset: 0,
+            withDefaults: undefined,
             defineProps: undefined,
             defineSlots: undefined,
             defineEmits: undefined,
@@ -427,6 +428,14 @@ 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]);
+            }
+        }
         if (scriptSetupRanges.defineSlots && !scriptSetupRanges.slotsAssignName) {
             setupCodeModifies.push([() => codes.push(`const __VLS_slots = `), scriptSetupRanges.defineSlots.start, scriptSetupRanges.defineSlots.start]);
         }
@@ -590,17 +599,10 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
     function generateSetupReturns() {
         if (scriptSetupRanges && bypassDefineComponent) {
             // fill $props
-            if (scriptSetupRanges.propsTypeArg) {
-                // NOTE: defineProps is inaccurate for $props
-                codes.push(`$props: __VLS_makeOptional(defineProps<`);
-                addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.propsTypeArg.start, scriptSetupRanges.propsTypeArg.end);
-                codes.push(`>()),\n`);
-            }
-            else if (scriptSetupRanges.propsRuntimeArg) {
+            if (scriptSetupRanges.defineProps) {
                 // NOTE: defineProps is inaccurate for $props
-                codes.push(`$props: __VLS_makeOptional(defineProps(`);
-                addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.propsRuntimeArg.start, scriptSetupRanges.propsRuntimeArg.end);
-                codes.push(`)),\n`);
+                codes.push(`$props: __VLS_makeOptional(${scriptSetupRanges.propsAssignName ?? `__VLS_props`}),\n`);
+                codes.push(`...${scriptSetupRanges.propsAssignName ?? `__VLS_props`},\n`);
             }
             // fill $emit
             if (scriptSetupRanges.defineEmits) {

package/out/parsers/scriptSetupRanges.d.ts

@@ -7,6 +7,7 @@ export declare function parseScriptSetupRanges(ts: typeof import('typescript/lib
     importSectionEndOffset: number;
     bindings: TextRange[];
     withDefaultsArg: TextRange | undefined;
+    withDefaults: TextRange | undefined;
     defineProps: TextRange | undefined;
     defineSlots: TextRange | undefined;
     defineEmits: TextRange | undefined;

package/out/parsers/scriptSetupRanges.js

@@ -6,6 +6,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     let importSectionEndOffset = 0;
     let withDefaultsArg;
     let propsAssignName;
+    let withDefaults;
     let defineProps;
     let propsRuntimeArg;
     let propsTypeArg;
@@ -46,6 +47,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
         importSectionEndOffset,
         bindings,
         withDefaultsArg,
+        withDefaults,
         defineProps,
         defineSlots,
         defineEmits,
@@ -171,6 +173,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                 }
             }
             else if (vueCompilerOptions.macros.withDefaults.includes(callText)) {
+                withDefaults = _getStartEnd(node);
                 if (node.arguments.length >= 2) {
                     const arg = node.arguments[1];
                     withDefaultsArg = _getStartEnd(arg);

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

@@ -17,6 +17,7 @@ export declare const tsCodegen: WeakMap<Sfc, {
         importSectionEndOffset: number;
         bindings: import("../types").TextRange[];
         withDefaultsArg: import("../types").TextRange | undefined;
+        withDefaults: import("../types").TextRange | undefined;
         defineProps: import("../types").TextRange | undefined;
         defineSlots: import("../types").TextRange | undefined;
         defineEmits: import("../types").TextRange | undefined;

package/out/utils/globalTypes.js

@@ -112,7 +112,7 @@ type __VLS_OverloadUnion<T> = Exclude<
 >;
 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) => R; }
+	? { [K in E as K extends string ? K : never]: (...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.14",
+	"version": "1.8.15",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "5febf2694e80621a7b852464edc76b74f73a5cb6"
+	"gitHead": "24de4582131385e75f904bff7294df0e16ce1e01"
 }