@vue/language-core 3.1.7 → 3.2.0

package/lib/codegen/template/index.d.ts

@@ -1,7 +1,7 @@
 import type * as ts from 'typescript';
 import type { Code, Sfc, VueCompilerOptions } from '../../types';
 export interface TemplateCodegenOptions {
-    ts: typeof ts;
+    typescript: typeof ts;
     vueCompilerOptions: VueCompilerOptions;
     template: NonNullable<Sfc['template']>;
     setupRefs: Set<string>;
@@ -10,28 +10,27 @@ export interface TemplateCodegenOptions {
     propsAssignName?: string;
     slotsAssignName?: string;
     inheritAttrs: boolean;
-    selfComponentName?: string;
+    componentName: string;
 }
 export { generate as generateTemplate };
 declare function generate(options: TemplateCodegenOptions): {
-    codes: Code[];
     generatedTypes: Set<string>;
     currentInfo: {
-        ignoreError?: boolean;
+        ignoreError?: boolean | undefined;
         expectError?: {
             token: number;
             node: import("@vue/compiler-dom").CommentNode;
-        };
+        } | undefined;
         generic?: {
             content: string;
             offset: number;
-        };
+        } | undefined;
     };
     resolveCodeFeatures: (features: import("../../types").VueCodeInformation) => import("../../types").VueCodeInformation;
     inVFor: boolean;
     slots: {
         name: string;
-        offset?: number;
+        offset?: number | undefined;
         tagRange: [number, number];
         nodeLoc: any;
         propsVar: string;
@@ -49,21 +48,19 @@ declare function generate(options: TemplateCodegenOptions): {
         typeExp: string;
         offset: number;
     }[]>;
-    currentComponent: {
-        get ctxVar(): string;
-        get propsVar(): string;
-    } | undefined;
     singleRootElTypes: Set<string>;
     singleRootNodes: Set<import("@vue/compiler-dom").ElementNode | null>;
     addTemplateRef(name: string, typeExp: string, offset: number): void;
-    recordComponentAccess(source: string, name: string, offset?: number): void;
+    recordComponentAccess(source: string, name: string, offset?: number | undefined): void;
     scopes: Set<string>[];
+    components: (() => string)[];
     declare(...varNames: string[]): void;
     startScope(): () => Generator<Code, any, any>;
     getInternalVariable(): string;
     getHoistVariable(originalVar: string): string;
     generateHoistVariables(): Generator<string, void, unknown>;
     generateConditionGuards(): Generator<string, void, unknown>;
-    enter(node: import("@vue/compiler-dom").RootNode | import("@vue/compiler-dom").TemplateChildNode | import("@vue/compiler-dom").SimpleExpressionNode): boolean;
-    exit(): Generator<Code>;
+    enter(node: import("@vue/compiler-dom").RootNode | import("@vue/compiler-dom").SimpleExpressionNode | import("@vue/compiler-dom").TemplateChildNode): boolean;
+    exit(): Generator<Code, any, any>;
+    codes: Code[];
 };

package/lib/codegen/template/index.js

@@ -1,8 +1,41 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTemplate = generate;
 const codeFeatures_1 = require("../codeFeatures");
-const names = require("../names");
+const names = __importStar(require("../names"));
 const utils_1 = require("../utils");
 const boundary_1 = require("../utils/boundary");
 const context_1 = require("./context");

package/lib/codegen/template/interpolation.d.ts

@@ -1,5 +1,6 @@
 import type { Code, SfcBlock, VueCodeInformation } from '../../types';
-import type { StyleCodegenOptions } from '../style';
 import type { TemplateCodegenContext } from './context';
-import type { TemplateCodegenOptions } from './index';
-export declare function generateInterpolation(options: Pick<TemplateCodegenOptions | StyleCodegenOptions, 'ts' | 'setupRefs'>, ctx: TemplateCodegenContext, block: SfcBlock, data: VueCodeInformation, code: string, start: number, prefix?: string, suffix?: string): Generator<Code>;
+export declare function generateInterpolation({ typescript, setupRefs }: {
+    typescript: typeof import('typescript');
+    setupRefs: Set<string>;
+}, ctx: TemplateCodegenContext, block: SfcBlock, data: VueCodeInformation, code: string, start: number, prefix?: string, suffix?: string): Generator<Code>;

package/lib/codegen/template/interpolation.js

@@ -1,16 +1,49 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateInterpolation = generateInterpolation;
 const shared_1 = require("@vue/shared");
 const collectBindings_1 = require("../../utils/collectBindings");
 const shared_2 = require("../../utils/shared");
 const codeFeatures_1 = require("../codeFeatures");
-const names = require("../names");
+const names = __importStar(require("../names"));
 const utils_1 = require("../utils");
 // https://github.com/vuejs/core/blob/fb0c3ca519f1fccf52049cd6b8db3a67a669afe9/packages/compiler-core/src/transforms/transformExpression.ts#L47
 const isLiteralWhitelisted = /*@__PURE__*/ (0, shared_1.makeMap)('true,false,null,this');
-function* generateInterpolation(options, ctx, block, data, code, start, prefix = '', suffix = '') {
-    for (const segment of forEachInterpolationSegment(options, ctx, block, code, start, prefix, suffix)) {
+function* generateInterpolation({ typescript, setupRefs }, ctx, block, data, code, start, prefix = '', suffix = '') {
+    for (const segment of forEachInterpolationSegment(typescript, setupRefs, ctx, block, code, start, prefix, suffix)) {
         if (typeof segment === 'string') {
             yield segment;
             continue;
@@ -42,7 +75,7 @@ function* generateInterpolation(options, ctx, block, data, code, start, prefix =
         yield addSuffix;
     }
 }
-function* forEachInterpolationSegment({ ts, setupRefs }, ctx, block, originalCode, start, prefix, suffix) {
+function* forEachInterpolationSegment(ts, setupRefs, ctx, block, originalCode, start, prefix, suffix) {
     const code = prefix + originalCode + suffix;
     let prevEnd = 0;
     for (const [name, offset, isShorthand] of forEachIdentifiers(ts, ctx, block, originalCode, code, prefix)) {

package/lib/codegen/template/slotOutlet.js

@@ -1,11 +1,44 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSlotOutlet = generateSlotOutlet;
-const CompilerDOM = require("@vue/compiler-dom");
+const CompilerDOM = __importStar(require("@vue/compiler-dom"));
 const shared_1 = require("../../utils/shared");
 const codeFeatures_1 = require("../codeFeatures");
 const inlayHints_1 = require("../inlayHints");
-const names = require("../names");
+const names = __importStar(require("../names"));
 const utils_1 = require("../utils");
 const boundary_1 = require("../utils/boundary");
 const elementProps_1 = require("./elementProps");

package/lib/codegen/template/templateChild.js

@@ -1,8 +1,41 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTemplateChild = generateTemplateChild;
 exports.parseInterpolationNode = parseInterpolationNode;
-const CompilerDOM = require("@vue/compiler-dom");
+const CompilerDOM = __importStar(require("@vue/compiler-dom"));
 const shared_1 = require("../../utils/shared");
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
@@ -29,25 +62,21 @@ function* generateTemplateChild(options, ctx, node, enterNode = true) {
         }
     }
     else if (node.type === CompilerDOM.NodeTypes.ELEMENT) {
+        let slotDir;
         if (node.tagType === CompilerDOM.ElementTypes.SLOT) {
             yield* (0, slotOutlet_1.generateSlotOutlet)(options, ctx, node);
         }
+        else if (node.tagType === CompilerDOM.ElementTypes.TEMPLATE
+            && ctx.components.length
+            && (slotDir = node.props.find(p => p.type === CompilerDOM.NodeTypes.DIRECTIVE && p.name === 'slot'))) {
+            yield* (0, vSlot_1.generateVSlot)(options, ctx, node, slotDir, ctx.components[ctx.components.length - 1]());
+        }
+        else if (node.tagType === CompilerDOM.ElementTypes.ELEMENT
+            || node.tagType === CompilerDOM.ElementTypes.TEMPLATE) {
+            yield* (0, element_1.generateElement)(options, ctx, node);
+        }
         else {
-            const slotDir = node.props.find(p => p.type === CompilerDOM.NodeTypes.DIRECTIVE && p.name === 'slot');
-            if (node.tagType === CompilerDOM.ElementTypes.TEMPLATE
-                && ctx.currentComponent
-                && slotDir) {
-                yield* (0, vSlot_1.generateVSlot)(options, ctx, node, slotDir);
-            }
-            else if (node.tagType === CompilerDOM.ElementTypes.ELEMENT
-                || node.tagType === CompilerDOM.ElementTypes.TEMPLATE) {
-                yield* (0, element_1.generateElement)(options, ctx, node);
-            }
-            else {
-                const { currentComponent } = ctx;
-                yield* (0, element_1.generateComponent)(options, ctx, node);
-                ctx.currentComponent = currentComponent;
-            }
+            yield* (0, element_1.generateComponent)(options, ctx, node);
         }
     }
     else if (node.type === CompilerDOM.NodeTypes.TEXT_CALL) {

package/lib/codegen/template/vFor.js

@@ -1,8 +1,41 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateVFor = generateVFor;
 exports.parseVForNode = parseVForNode;
-const CompilerDOM = require("@vue/compiler-dom");
+const CompilerDOM = __importStar(require("@vue/compiler-dom"));
 const collectBindings_1 = require("../../utils/collectBindings");
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
@@ -14,8 +47,8 @@ function* generateVFor(options, ctx, node) {
     const endScope = ctx.startScope();
     yield `for (const [`;
     if (leftExpressionRange && leftExpressionText) {
-        const collectAst = (0, utils_1.getTypeScriptAST)(options.ts, options.template, `const [${leftExpressionText}]`);
-        ctx.declare(...(0, collectBindings_1.collectBindingNames)(options.ts, collectAst, collectAst));
+        const collectAst = (0, utils_1.getTypeScriptAST)(options.typescript, options.template, `const [${leftExpressionText}]`);
+        ctx.declare(...(0, collectBindings_1.collectBindingNames)(options.typescript, collectAst, collectAst));
         yield [
             leftExpressionText,
             'template',
@@ -25,7 +58,7 @@ function* generateVFor(options, ctx, node) {
     }
     yield `] of `;
     if (source.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-        yield `__VLS_getVForSourceType(`;
+        yield `__VLS_vFor(`;
         yield* (0, interpolation_1.generateInterpolation)(options, ctx, options.template, codeFeatures_1.codeFeatures.all, source.content, source.loc.start.offset, `(`, `)`);
         yield `!)`; // #3102
     }

package/lib/codegen/template/vIf.js

@@ -1,7 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateVIf = generateVIf;
-const CompilerDOM = require("@vue/compiler-dom");
+const CompilerDOM = __importStar(require("@vue/compiler-dom"));
 const muggle_string_1 = require("muggle-string");
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");

package/lib/codegen/template/vSlot.d.ts

@@ -2,4 +2,4 @@ import * as CompilerDOM from '@vue/compiler-dom';
 import type { Code } from '../../types';
 import type { TemplateCodegenContext } from './context';
 import type { TemplateCodegenOptions } from './index';
-export declare function generateVSlot(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode, slotDir: CompilerDOM.DirectiveNode | undefined): Generator<Code>;
+export declare function generateVSlot(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode, slotDir: CompilerDOM.DirectiveNode | undefined, ctxVar: string): Generator<Code>;

package/lib/codegen/template/vSlot.js

@@ -1,7 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateVSlot = generateVSlot;
-const CompilerDOM = require("@vue/compiler-dom");
+const CompilerDOM = __importStar(require("@vue/compiler-dom"));
 const muggle_string_1 = require("muggle-string");
 const collectBindings_1 = require("../../utils/collectBindings");
 const codeFeatures_1 = require("../codeFeatures");
@@ -10,39 +43,33 @@ const boundary_1 = require("../utils/boundary");
 const interpolation_1 = require("./interpolation");
 const objectProperty_1 = require("./objectProperty");
 const templateChild_1 = require("./templateChild");
-function* generateVSlot(options, ctx, node, slotDir) {
-    if (!ctx.currentComponent) {
-        return;
-    }
+function* generateVSlot(options, ctx, node, slotDir, ctxVar) {
     const slotVar = ctx.getInternalVariable();
     if (slotDir) {
         yield `{${utils_1.newLine}`;
-    }
-    if (slotDir || node.children.length) {
         yield `const { `;
-        if (slotDir) {
-            if (slotDir.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && slotDir.arg.content) {
-                yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, slotDir.arg.loc.source, slotDir.arg.loc.start.offset, slotDir.arg.isStatic ? codeFeatures_1.codeFeatures.withoutHighlight : codeFeatures_1.codeFeatures.all, false, true);
-            }
-            else {
-                const token = yield* (0, boundary_1.startBoundary)('template', slotDir.loc.start.offset, codeFeatures_1.codeFeatures.withoutHighlightAndCompletion);
-                yield `default`;
-                yield (0, boundary_1.endBoundary)(token, slotDir.loc.start.offset + (slotDir.rawName?.length ?? 0));
-            }
+        if (slotDir.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && slotDir.arg.content) {
+            yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, slotDir.arg.loc.source, slotDir.arg.loc.start.offset, slotDir.arg.isStatic ? codeFeatures_1.codeFeatures.withoutHighlight : codeFeatures_1.codeFeatures.all, false, true);
         }
         else {
-            // #932: reference for implicit default slot
-            const token = yield* (0, boundary_1.startBoundary)('template', node.loc.start.offset, codeFeatures_1.codeFeatures.navigation);
+            const token = yield* (0, boundary_1.startBoundary)('template', slotDir.loc.start.offset, codeFeatures_1.codeFeatures.withoutHighlightAndCompletion);
             yield `default`;
-            yield (0, boundary_1.endBoundary)(token, node.loc.end.offset);
+            yield (0, boundary_1.endBoundary)(token, slotDir.loc.start.offset + (slotDir.rawName?.length ?? 0));
         }
-        yield `: ${slotVar} } = ${ctx.currentComponent.ctxVar}.slots!${utils_1.endOfLine}`;
     }
+    else {
+        yield `const { `;
+        // #932: reference for implicit default slot
+        const token = yield* (0, boundary_1.startBoundary)('template', node.loc.start.offset, codeFeatures_1.codeFeatures.navigation);
+        yield `default`;
+        yield (0, boundary_1.endBoundary)(token, node.loc.end.offset);
+    }
+    yield `: ${slotVar} } = ${ctxVar}.slots!${utils_1.endOfLine}`;
     const endScope = ctx.startScope();
     if (slotDir?.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-        const slotAst = (0, utils_1.getTypeScriptAST)(options.ts, options.template, `(${slotDir.exp.content}) => {}`);
+        const slotAst = (0, utils_1.getTypeScriptAST)(options.typescript, options.template, `(${slotDir.exp.content}) => {}`);
         yield* generateSlotParameters(options, ctx, slotAst, slotDir.exp, slotVar);
-        ctx.declare(...(0, collectBindings_1.collectBindingNames)(options.ts, slotAst, slotAst));
+        ctx.declare(...(0, collectBindings_1.collectBindingNames)(options.typescript, slotAst, slotAst));
     }
     for (const child of node.children) {
         yield* (0, templateChild_1.generateTemplateChild)(options, ctx, child);
@@ -54,7 +81,7 @@ function* generateVSlot(options, ctx, node, slotDir) {
             isStatic = slotDir.arg.isStatic;
         }
         if (isStatic && !slotDir.arg) {
-            yield `${ctx.currentComponent.ctxVar}.slots!['`;
+            yield `${ctxVar}.slots!['`;
             yield [
                 '',
                 'template',
@@ -71,7 +98,7 @@ function* generateVSlot(options, ctx, node, slotDir) {
     }
 }
 function* generateSlotParameters(options, ctx, ast, exp, slotVar) {
-    const { ts } = options;
+    const { typescript: ts } = options;
     const statement = ast.statements[0];
     if (!statement || !ts.isExpressionStatement(statement) || !ts.isArrowFunction(statement.expression)) {
         return;
@@ -98,7 +125,7 @@ function* generateSlotParameters(options, ctx, ast, exp, slotVar) {
     }
     yield `const [`;
     yield* interpolation;
-    yield `] = __VLS_getSlotParameters(${slotVar}!`;
+    yield `] = __VLS_vSlot(${slotVar}!`;
     if (types.some(t => t)) {
         yield `, `;
         const token = yield* (0, boundary_1.startBoundary)('template', exp.loc.start.offset, codeFeatures_1.codeFeatures.verification);

package/lib/codegen/utils/index.js

@@ -39,9 +39,11 @@ function* generateSfcBlockSection(block, start, end, features) {
     yield [text, block.name, start, features];
     // #3632
     if ('parseDiagnostics' in block.ast) {
-        const emptyEndLength = text.length - text.trimEnd().length;
+        const textEnd = text.trimEnd().length;
         for (const diag of block.ast.parseDiagnostics) {
-            if (diag.start >= end - emptyEndLength) {
+            const diagStart = diag.start;
+            const diagEnd = diag.start + diag.length;
+            if (diagStart >= textEnd && diagEnd <= end) {
                 yield `;`;
                 yield ['', block.name, end, codeFeatures_1.codeFeatures.verification];
                 yield exports.newLine;

package/lib/compilerOptions.d.ts

@@ -8,20 +8,16 @@ export interface ParsedCommandLine extends Omit<ts.ParsedCommandLine, 'fileNames
 export declare function createParsedCommandLineByJson(ts: typeof import('typescript'), host: ParseConfigHost, rootDir: string, json: any, configFileName?: string): ParsedCommandLine;
 export declare function createParsedCommandLine(ts: typeof import('typescript'), host: ParseConfigHost, configFileName: string): ParsedCommandLine;
 export declare class CompilerOptionsResolver {
-    fileExists?: ((path: string) => boolean) | undefined;
-    options: Omit<RawVueCompilerOptions, 'target' | 'globalTypesPath' | 'plugins'>;
+    ts: typeof import('typescript');
+    readFile: (fileName: string) => string | undefined;
+    options: Omit<RawVueCompilerOptions, 'target' | 'strictTemplates' | 'typesRoot' | 'plugins'>;
     target: number | undefined;
-    globalTypesPath: string | undefined;
+    typesRoot: string | undefined;
     plugins: VueLanguagePlugin[];
-    constructor(fileExists?: ((path: string) => boolean) | undefined);
+    constructor(ts: typeof import('typescript'), readFile: (fileName: string) => string | undefined);
     addConfig(options: RawVueCompilerOptions, rootDir: string): void;
     build(defaults?: VueCompilerOptions): VueCompilerOptions;
-    private findNodeModulesRoot;
+    resolveVueVersion(folder: string): number | undefined;
 }
-export declare function getDefaultCompilerOptions(target?: number, lib?: string, strictTemplates?: boolean): VueCompilerOptions;
-export declare function createGlobalTypesWriter(vueOptions: VueCompilerOptions, writeFile: (fileName: string, data: string) => void): (fileName: string) => string | void;
-/**
- * @deprecated use `createGlobalTypesWriter` instead
- */
-export declare function writeGlobalTypes(vueOptions: VueCompilerOptions, writeFile: (fileName: string, data: string) => void): void;
+export declare function getDefaultCompilerOptions(target?: number, lib?: string, strictTemplates?: boolean, typesRoot?: string): VueCompilerOptions;
 export {};