@vue/language-core 3.0.5 → 3.0.7-alpha.0

package/index.d.ts

@@ -1,5 +1,6 @@
 export * from './lib/codegen/globalTypes';
 export * from './lib/codegen/template';
+export * from './lib/compilerOptions';
 export * from './lib/languagePlugin';
 export * from './lib/parsers/scriptSetupRanges';
 export * from './lib/plugins';
@@ -7,7 +8,6 @@ export * from './lib/types';
 export * from './lib/utils/collectBindings';
 export * from './lib/utils/parseSfc';
 export * from './lib/utils/shared';
-export * from './lib/utils/ts';
 export * from './lib/virtualFile/vueFile';
 export { tsCodegen } from './lib/plugins/vue-tsx';
 export * from '@volar/language-core';

package/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsCodegen = void 0;
 __exportStar(require("./lib/codegen/globalTypes"), exports);
 __exportStar(require("./lib/codegen/template"), exports);
+__exportStar(require("./lib/compilerOptions"), exports);
 __exportStar(require("./lib/languagePlugin"), exports);
 __exportStar(require("./lib/parsers/scriptSetupRanges"), exports);
 __exportStar(require("./lib/plugins"), exports);
@@ -24,7 +25,6 @@ __exportStar(require("./lib/types"), exports);
 __exportStar(require("./lib/utils/collectBindings"), exports);
 __exportStar(require("./lib/utils/parseSfc"), exports);
 __exportStar(require("./lib/utils/shared"), exports);
-__exportStar(require("./lib/utils/ts"), exports);
 __exportStar(require("./lib/virtualFile/vueFile"), exports);
 var vue_tsx_1 = require("./lib/plugins/vue-tsx");
 Object.defineProperty(exports, "tsCodegen", { enumerable: true, get: function () { return vue_tsx_1.tsCodegen; } });

package/lib/codegen/codeFeatures.d.ts

@@ -25,11 +25,6 @@ declare const raw: {
     navigation: {
         navigation: true;
     };
-    navigationWithoutHighlight: {
-        navigation: {
-            shouldHighlight: () => false;
-        };
-    };
     navigationWithoutRename: {
         navigation: {
             shouldRename: () => false;

package/lib/codegen/codeFeatures.js

@@ -25,9 +25,6 @@ const raw = {
     navigation: {
         navigation: true,
     },
-    navigationWithoutHighlight: {
-        navigation: { shouldHighlight: () => false },
-    },
     navigationWithoutRename: {
         navigation: { shouldRename: () => false },
     },

package/lib/codegen/script/component.d.ts

@@ -3,6 +3,6 @@ import type { Code, Sfc } from '../../types';
 import type { ScriptCodegenContext } from './context';
 import type { ScriptCodegenOptions } from './index';
 export declare function generateComponent(options: ScriptCodegenOptions, ctx: ScriptCodegenContext, scriptSetup: NonNullable<Sfc['scriptSetup']>, scriptSetupRanges: ScriptSetupRanges): Generator<Code>;
-export declare function generateComponentSetupReturns(scriptSetupRanges: ScriptSetupRanges): Generator<Code>;
+export declare function generateComponentSetupReturns(scriptSetupRanges: ScriptSetupRanges): Generator<string>;
 export declare function generateEmitsOption(options: ScriptCodegenOptions, scriptSetupRanges: ScriptSetupRanges): Generator<Code>;
 export declare function generatePropsOption(options: ScriptCodegenOptions, ctx: ScriptCodegenContext, scriptSetup: NonNullable<Sfc['scriptSetup']>, scriptSetupRanges: ScriptSetupRanges, hasEmitsOption: boolean, inheritAttrs: boolean): Generator<Code>;

package/lib/codegen/script/component.js

@@ -17,23 +17,18 @@ function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
     else {
         yield `(await import('${options.vueCompilerOptions.lib}')).defineComponent({${utils_1.newLine}`;
     }
-    yield `setup() {${utils_1.newLine}`;
     const returns = [];
     if (ctx.bypassDefineComponent) {
-        yield* `const __VLS_returns = {${utils_1.newLine}`;
-        yield* generateComponentSetupReturns(scriptSetupRanges);
-        yield `}${utils_1.endOfLine}`;
-        returns.push(`typeof __VLS_returns`);
+        returns.push(...generateComponentSetupReturns(scriptSetupRanges));
     }
     if (scriptSetupRanges.defineExpose) {
-        returns.push(`typeof __VLS_exposed`);
+        returns.push(`__VLS_exposed`);
     }
     if (returns.length) {
-        yield `return {} as `;
-        yield* (0, merge_1.generateIntersectMerge)(returns);
-        yield utils_1.endOfLine;
+        yield `setup: () => (`;
+        yield* (0, merge_1.generateSpreadMerge)(returns);
+        yield `),${utils_1.newLine}`;
     }
-    yield `},${utils_1.newLine}`;
     if (!ctx.bypassDefineComponent) {
         const emitOptionCodes = [...generateEmitsOption(options, scriptSetupRanges)];
         yield* emitOptionCodes;
@@ -58,13 +53,14 @@ function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
 function* generateComponentSetupReturns(scriptSetupRanges) {
     // fill $props
     if (scriptSetupRanges.defineProps) {
+        const name = scriptSetupRanges.defineProps.name ?? `__VLS_props`;
         // NOTE: defineProps is inaccurate for $props
-        yield `$props: __VLS_makeOptional(${scriptSetupRanges.defineProps.name ?? `__VLS_props`}),${utils_1.newLine}`;
-        yield `...${scriptSetupRanges.defineProps.name ?? `__VLS_props`},${utils_1.newLine}`;
+        yield name;
+        yield `{} as { $props: Partial<typeof ${name}> }`;
     }
     // fill $emit
     if (scriptSetupRanges.defineEmits) {
-        yield `$emit: ${scriptSetupRanges.defineEmits.name ?? '__VLS_emit'},${utils_1.newLine}`;
+        yield `{} as { $emit: typeof ${scriptSetupRanges.defineEmits.name ?? `__VLS_emit`} }`;
     }
 }
 function* generateEmitsOption(options, scriptSetupRanges) {
@@ -99,7 +95,7 @@ function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasE
     const getOptionCodes = [];
     const typeOptionCodes = [];
     if (inheritAttrs && options.templateCodegen?.inheritedAttrVars.size) {
-        let attrsType = `Partial<__VLS_InheritedAttrs>`;
+        let attrsType = `__VLS_InheritedAttrs`;
         if (hasEmitsOption) {
             attrsType = `Omit<${attrsType}, \`on\${string}\`>`;
         }

package/lib/codegen/script/componentSelf.js

@@ -1,41 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateComponentSelf = generateComponentSelf;
+const shared_1 = require("@vue/shared");
 const path = require("path-browserify");
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const component_1 = require("./component");
-const template_1 = require("./template");
 function* generateComponentSelf(options, ctx, templateCodegenCtx) {
     if (options.sfc.scriptSetup && options.scriptSetupRanges) {
         yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({${utils_1.newLine}`;
-        yield `setup() {${utils_1.newLine}`;
-        yield `return {${utils_1.newLine}`;
+        yield `setup: () => ({${utils_1.newLine}`;
         if (ctx.bypassDefineComponent) {
-            yield* (0, component_1.generateComponentSetupReturns)(options.scriptSetupRanges);
+            for (const code of (0, component_1.generateComponentSetupReturns)(options.scriptSetupRanges)) {
+                yield `...${code},${utils_1.newLine}`;
+            }
         }
         // bindings
-        const templateUsageVars = (0, template_1.getTemplateUsageVars)(options, ctx);
-        for (const [content, bindings] of [
-            [options.sfc.scriptSetup.content, options.scriptSetupRanges.bindings],
-            options.sfc.script && options.scriptRanges
-                ? [options.sfc.script.content, options.scriptRanges.bindings]
-                : ['', []],
-        ]) {
-            for (const { range } of bindings) {
-                const varName = content.slice(range.start, range.end);
-                if (!templateUsageVars.has(varName) && !templateCodegenCtx.accessExternalVariables.has(varName)) {
-                    continue;
-                }
-                const token = Symbol(varName.length);
-                yield ['', undefined, 0, { __linkedToken: token }];
-                yield `${varName}: ${varName} as typeof `;
-                yield ['', undefined, 0, { __linkedToken: token }];
-                yield `${varName},${utils_1.newLine}`;
+        const templateUsageVars = new Set([
+            ...options.sfc.template?.ast?.components.flatMap(c => [(0, shared_1.camelize)(c), (0, shared_1.capitalize)((0, shared_1.camelize)(c))]) ?? [],
+            ...options.templateCodegen?.accessExternalVariables.keys() ?? [],
+            ...templateCodegenCtx.accessExternalVariables.keys(),
+        ]);
+        for (const varName of ctx.bindingNames) {
+            if (!templateUsageVars.has(varName)) {
+                continue;
             }
+            const token = Symbol(varName.length);
+            yield ['', undefined, 0, { __linkedToken: token }];
+            yield `${varName}: ${varName} as typeof `;
+            yield ['', undefined, 0, { __linkedToken: token }];
+            yield `${varName},${utils_1.newLine}`;
         }
-        yield `}${utils_1.endOfLine}`; // return {
-        yield `},${utils_1.newLine}`; // setup() {
+        yield `}),${utils_1.newLine}`;
         if (options.sfc.scriptSetup && options.scriptSetupRanges && !ctx.bypassDefineComponent) {
             const emitOptionCodes = [...(0, component_1.generateEmitsOption)(options, options.scriptSetupRanges)];
             yield* emitOptionCodes;

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

@@ -3,8 +3,6 @@ import type { ScriptRanges } from '../../parsers/scriptRanges';
 import type { ScriptSetupRanges } from '../../parsers/scriptSetupRanges';
 import type { Code, Sfc, VueCompilerOptions } from '../../types';
 import type { TemplateCodegenContext } from '../template/context';
-import { type ScriptCodegenContext } from './context';
-export * from './context';
 export interface ScriptCodegenOptions {
     ts: typeof ts;
     compilerOptions: ts.CompilerOptions;
@@ -20,5 +18,24 @@ export interface ScriptCodegenOptions {
     destructuredPropNames: Set<string>;
     templateRefNames: Set<string>;
 }
-export declare function generateScript(options: ScriptCodegenOptions, ctx: ScriptCodegenContext): Generator<Code>;
+export { generate as generateScript };
+declare function generate(options: ScriptCodegenOptions): {
+    codes: Code[];
+    generatedTemplate: boolean;
+    generatedPropsType: boolean;
+    bypassDefineComponent: boolean;
+    bindingNames: Set<string>;
+    localTypes: {
+        generate: (names: string[]) => Generator<string, void, unknown>;
+        getUsedNames(): Set<string>;
+        readonly PrettifyLocal: string;
+        readonly OmitKeepDiscriminatedUnion: string;
+        readonly WithDefaults: string;
+        readonly WithSlots: string;
+        readonly PropsChildren: string;
+        readonly TypePropsToOption: string;
+        readonly OmitIndexSignature: string;
+    };
+    inlayHints: import("../inlayHints").InlayHintInfo[];
+};
 export declare function generateScriptSectionPartiallyEnding(source: string, end: number, mark: string, delimiter?: string): Generator<Code>;

package/lib/codegen/script/index.js

@@ -1,29 +1,23 @@
 "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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateScript = generateScript;
+exports.generateScript = generate;
 exports.generateScriptSectionPartiallyEnding = generateScriptSectionPartiallyEnding;
 const path = require("path-browserify");
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const componentSelf_1 = require("./componentSelf");
+const context_1 = require("./context");
 const scriptSetup_1 = require("./scriptSetup");
 const src_1 = require("./src");
 const template_1 = require("./template");
-__exportStar(require("./context"), exports);
+function generate(options) {
+    const context = (0, context_1.createScriptCodegenContext)(options);
+    const codegen = generateScript(options, context);
+    return {
+        ...context,
+        codes: [...codegen],
+    };
+}
 function* generateScript(options, ctx) {
     yield* generateGlobalTypesPath(options);
     if (options.sfc.script?.src) {

package/lib/codegen/script/scriptSetup.js

@@ -54,7 +54,7 @@ function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
             emitTypes.push(`typeof __VLS_modelEmit`);
         }
         yield `return {} as {${utils_1.newLine}`
-            + `	props: ${ctx.localTypes.PrettifyLocal}<__VLS_OwnProps & __VLS_PublicProps & Partial<__VLS_InheritedAttrs>> & __VLS_BuiltInPublicProps,${utils_1.newLine}`
+            + `	props: ${ctx.localTypes.PrettifyLocal}<__VLS_OwnProps & __VLS_PublicProps & __VLS_InheritedAttrs> & __VLS_BuiltInPublicProps,${utils_1.newLine}`
             + `	expose(exposed: import('${options.vueCompilerOptions.lib}').ShallowUnwrapRef<${scriptSetupRanges.defineExpose ? 'typeof __VLS_exposed' : '{}'}>): void,${utils_1.newLine}`
             + `	attrs: any,${utils_1.newLine}`
             + `	slots: __VLS_Slots,${utils_1.newLine}`

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

@@ -4,4 +4,3 @@ import type { ScriptCodegenContext } from './context';
 import type { ScriptCodegenOptions } from './index';
 export declare function generateTemplate(options: ScriptCodegenOptions, ctx: ScriptCodegenContext): Generator<Code, TemplateCodegenContext>;
 export declare function generateTemplateDirectives(options: ScriptCodegenOptions): Generator<Code>;
-export declare function getTemplateUsageVars(options: ScriptCodegenOptions, ctx: ScriptCodegenContext): Set<string>;

package/lib/codegen/script/template.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTemplate = generateTemplate;
 exports.generateTemplateDirectives = generateTemplateDirectives;
-exports.getTemplateUsageVars = getTemplateUsageVars;
-const shared_1 = require("../../utils/shared");
 const codeFeatures_1 = require("../codeFeatures");
 const modules_1 = require("../style/modules");
 const scopedClasses_1 = require("../style/scopedClasses");
@@ -45,18 +43,11 @@ function* generateTemplateComponents(options) {
     if (options.sfc.script && options.scriptRanges?.exportDefault?.componentsOption) {
         const { componentsOption } = options.scriptRanges.exportDefault;
         yield `const __VLS_componentsOption = `;
-        yield [
-            options.sfc.script.content.slice(componentsOption.start, componentsOption.end),
-            'script',
-            componentsOption.start,
-            codeFeatures_1.codeFeatures.navigation,
-        ];
+        yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, componentsOption.start, componentsOption.end, codeFeatures_1.codeFeatures.navigation);
         yield utils_1.endOfLine;
         types.push(`typeof __VLS_componentsOption`);
     }
-    yield `type __VLS_LocalComponents =`;
-    yield* (0, merge_1.generateIntersectMerge)(types);
-    yield utils_1.endOfLine;
+    yield `type __VLS_LocalComponents = ${types.join(` & `)}${utils_1.endOfLine}`;
     yield `let __VLS_components!: __VLS_LocalComponents & __VLS_GlobalComponents${utils_1.endOfLine}`;
 }
 function* generateTemplateDirectives(options) {
@@ -64,18 +55,11 @@ function* generateTemplateDirectives(options) {
     if (options.sfc.script && options.scriptRanges?.exportDefault?.directivesOption) {
         const { directivesOption } = options.scriptRanges.exportDefault;
         yield `const __VLS_directivesOption = `;
-        yield [
-            options.sfc.script.content.slice(directivesOption.start, directivesOption.end),
-            'script',
-            directivesOption.start,
-            codeFeatures_1.codeFeatures.navigation,
-        ];
+        yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, directivesOption.start, directivesOption.end, codeFeatures_1.codeFeatures.navigation);
         yield utils_1.endOfLine;
         types.push(`__VLS_ResolveDirectives<typeof __VLS_directivesOption>`);
     }
-    yield `type __VLS_LocalDirectives =`;
-    yield* (0, merge_1.generateIntersectMerge)(types);
-    yield utils_1.endOfLine;
+    yield `type __VLS_LocalDirectives = ${types.join(` & `)}${utils_1.endOfLine}`;
     yield `let __VLS_directives!: __VLS_LocalDirectives & __VLS_GlobalDirectives${utils_1.endOfLine}`;
 }
 function* generateTemplateBody(options, templateCodegenCtx) {
@@ -101,32 +85,11 @@ function* generateCssVars(options, ctx) {
     }
     yield `// CSS variable injection ${utils_1.newLine}`;
     for (const style of options.sfc.styles) {
-        for (const cssBind of style.cssVars) {
-            yield* (0, interpolation_1.generateInterpolation)(options, ctx, style.name, codeFeatures_1.codeFeatures.all, cssBind.text, cssBind.offset);
+        for (const binding of style.bindings) {
+            yield* (0, interpolation_1.generateInterpolation)(options, ctx, style.name, codeFeatures_1.codeFeatures.all, binding.text, binding.offset);
             yield utils_1.endOfLine;
         }
     }
     yield `// CSS variable injection end ${utils_1.newLine}`;
 }
-function getTemplateUsageVars(options, ctx) {
-    const usageVars = new Set();
-    const components = new Set(options.sfc.template?.ast?.components);
-    if (options.templateCodegen) {
-        // fix import components unused report
-        for (const varName of ctx.bindingNames) {
-            if (components.has(varName) || components.has((0, shared_1.hyphenateTag)(varName))) {
-                usageVars.add(varName);
-            }
-        }
-        for (const component of components) {
-            if (component.includes('.')) {
-                usageVars.add(component.split('.')[0]);
-            }
-        }
-        for (const [varName] of options.templateCodegen.accessExternalVariables) {
-            usageVars.add(varName);
-        }
-    }
-    return usageVars;
-}
 //# sourceMappingURL=template.js.map

package/lib/codegen/template/element.js

@@ -20,13 +20,7 @@ const styleScopedClasses_1 = require("./styleScopedClasses");
 const vSlot_1 = require("./vSlot");
 const colonReg = /:/g;
 function* generateComponent(options, ctx, node) {
-    const tagOffsets = [node.loc.start.offset + options.template.content.slice(node.loc.start.offset).indexOf(node.tag)];
-    if (!node.isSelfClosing && options.template.lang === 'html') {
-        const endTagOffset = node.loc.start.offset + node.loc.source.lastIndexOf(node.tag);
-        if (endTagOffset > tagOffsets[0]) {
-            tagOffsets.push(endTagOffset);
-        }
-    }
+    const tagOffsets = (0, shared_2.getElementTagOffsets)(node, options.template);
     const failedPropExps = [];
     const possibleOriginalNames = getPossibleOriginalComponentNames(node.tag, true);
     const matchImportName = possibleOriginalNames.find(name => options.scriptSetupImportComponentNames.has(name));
@@ -186,21 +180,13 @@ function* generateComponent(options, ctx, node) {
     }
 }
 function* generateElement(options, ctx, node) {
-    const startTagOffset = node.loc.start.offset
-        + options.template.content.slice(node.loc.start.offset).indexOf(node.tag);
-    const endTagOffset = !node.isSelfClosing && options.template.lang === 'html'
-        ? node.loc.start.offset + node.loc.source.lastIndexOf(node.tag)
-        : undefined;
+    const [startTagOffset, endTagOffset] = (0, shared_2.getElementTagOffsets)(node, options.template);
     const failedPropExps = [];
-    const features = {
-        ...codeFeatures_1.codeFeatures.semanticWithoutHighlight,
-        ...codeFeatures_1.codeFeatures.navigationWithoutHighlight,
-    };
     yield `__VLS_asFunctionalElement(__VLS_elements`;
-    yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, startTagOffset, features);
+    yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, startTagOffset, codeFeatures_1.codeFeatures.withoutHighlightAndCompletion);
     if (endTagOffset !== undefined) {
         yield `, __VLS_elements`;
-        yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, endTagOffset, features);
+        yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, endTagOffset, codeFeatures_1.codeFeatures.withoutHighlightAndCompletion);
     }
     yield `)(`;
     yield* (0, wrapWith_1.wrapWith)(startTagOffset, startTagOffset + node.tag.length, codeFeatures_1.codeFeatures.verification, `{${utils_1.newLine}`, ...(0, elementProps_1.generateElementProps)(options, ctx, node, node.props, options.vueCompilerOptions.checkUnknownProps, true, failedPropExps), `}`);

package/lib/codegen/template/elementDirectives.js

@@ -29,7 +29,9 @@ function* generateElementDirectives(options, ctx, node) {
             || prop.name === 'bind') {
             continue;
         }
-        ctx.accessExternalVariable((0, shared_1.camelize)('v-' + prop.name), prop.loc.start.offset);
+        if (!builtInDirectives.has(prop.name)) {
+            ctx.accessExternalVariable((0, shared_1.camelize)('v-' + prop.name), prop.loc.start.offset);
+        }
         yield* (0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.end.offset, codeFeatures_1.codeFeatures.verification, `__VLS_asFunctionalDirective(`, ...generateIdentifier(options, prop), `)(null!, { ...__VLS_directiveBindingRestFields, `, ...generateArg(options, ctx, prop), ...generateModifiers(options, ctx, prop), ...generateValue(options, ctx, prop), ` }, null!, null!)`);
         yield utils_1.endOfLine;
     }

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

@@ -1,8 +1,6 @@
 import * as CompilerDOM from '@vue/compiler-dom';
 import type * as ts from 'typescript';
 import type { Code, Sfc, VueCompilerOptions } from '../../types';
-import type { TemplateCodegenContext } from './context';
-export * from './context';
 export interface TemplateCodegenOptions {
     ts: typeof ts;
     compilerOptions: ts.CompilerOptions;
@@ -18,5 +16,67 @@ export interface TemplateCodegenOptions {
     inheritAttrs: boolean;
     selfComponentName?: string;
 }
-export declare function generateTemplate(options: TemplateCodegenOptions, ctx: TemplateCodegenContext): Generator<Code>;
+export { generate as generateTemplate };
+declare function generate(options: TemplateCodegenOptions): {
+    codes: Code[];
+    currentInfo: {
+        ignoreError?: boolean;
+        expectError?: {
+            token: number;
+            node: CompilerDOM.CommentNode;
+        };
+        generic?: {
+            content: string;
+            offset: number;
+        };
+    };
+    resolveCodeFeatures: (features: import("../../types").VueCodeInformation) => import("../../types").VueCodeInformation;
+    inlineTsAsts: Map<string, ts.SourceFile> | undefined;
+    inVFor: boolean;
+    slots: {
+        name: string;
+        offset?: number;
+        tagRange: [number, number];
+        nodeLoc: any;
+        propsVar: string;
+    }[];
+    dynamicSlots: {
+        expVar: string;
+        propsVar: string;
+    }[];
+    dollarVars: Set<string>;
+    accessExternalVariables: Map<string, Set<number>>;
+    blockConditions: string[];
+    scopedClasses: {
+        source: string;
+        className: string;
+        offset: number;
+    }[];
+    emptyClassOffsets: number[];
+    inlayHints: import("../inlayHints").InlayHintInfo[];
+    bindingAttrLocs: CompilerDOM.SourceLocation[];
+    inheritedAttrVars: Set<string>;
+    templateRefs: Map<string, {
+        typeExp: string;
+        offset: number;
+    }[]>;
+    currentComponent: {
+        ctxVar: string;
+        used: boolean;
+    } | undefined;
+    singleRootElTypes: string[];
+    singleRootNodes: Set<CompilerDOM.ElementNode | null>;
+    addTemplateRef(name: string, typeExp: string, offset: number): void;
+    accessExternalVariable(name: string, offset?: number): void;
+    hasLocalVariable(name: string): boolean;
+    addLocalVariable(name: string): void;
+    removeLocalVariable(name: string): void;
+    getInternalVariable(): string;
+    getHoistVariable(originalVar: string): string;
+    generateHoistVariables(): Generator<string, void, unknown>;
+    generateConditionGuards(): Generator<string, void, unknown>;
+    generateAutoImportCompletion(): Generator<Code>;
+    enter(node: CompilerDOM.RootNode | CompilerDOM.TemplateChildNode | CompilerDOM.SimpleExpressionNode): boolean;
+    exit(): Generator<Code>;
+};
 export declare function forEachElementNode(node: CompilerDOM.RootNode | CompilerDOM.TemplateChildNode): Generator<CompilerDOM.ElementNode>;

package/lib/codegen/template/index.js

@@ -1,30 +1,31 @@
 "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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTemplate = generateTemplate;
+exports.generateTemplate = generate;
 exports.forEachElementNode = forEachElementNode;
 const CompilerDOM = require("@vue/compiler-dom");
 const shared_1 = require("../../utils/shared");
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const wrapWith_1 = require("../utils/wrapWith");
+const context_1 = require("./context");
 const objectProperty_1 = require("./objectProperty");
 const styleScopedClasses_1 = require("./styleScopedClasses");
 const templateChild_1 = require("./templateChild");
-__exportStar(require("./context"), exports);
+function generate(options) {
+    const context = (0, context_1.createTemplateCodegenContext)(options, options.template.ast);
+    const codegen = generateTemplate(options, context);
+    const codes = [];
+    for (const code of codegen) {
+        if (typeof code === 'object') {
+            code[3] = context.resolveCodeFeatures(code[3]);
+        }
+        codes.push(code);
+    }
+    return {
+        ...context,
+        codes,
+    };
+}
 function* generateTemplate(options, ctx) {
     if (options.slotsAssignName) {
         ctx.addLocalVariable(options.slotsAssignName);
@@ -83,10 +84,9 @@ function* generateSlots(options, ctx) {
     return `__VLS_Slots`;
 }
 function* generateInheritedAttrs(options, ctx) {
-    yield `type __VLS_InheritedAttrs = {}`;
-    for (const varName of ctx.inheritedAttrVars) {
-        yield ` & typeof ${varName}`;
-    }
+    yield `type __VLS_InheritedAttrs = ${ctx.inheritedAttrVars.size
+        ? `Partial<${[...ctx.inheritedAttrVars].map(name => `typeof ${name}`).join(` & `)}>`
+        : `{}`}`;
     yield utils_1.endOfLine;
     if (ctx.bindingAttrLocs.length) {
         yield `[`;
@@ -102,7 +102,7 @@ function* generateInheritedAttrs(options, ctx) {
         }
         yield `]${utils_1.endOfLine}`;
     }
-    return `import('${options.vueCompilerOptions.lib}').ComponentPublicInstance['$attrs'] & Partial<__VLS_InheritedAttrs>`;
+    return `import('${options.vueCompilerOptions.lib}').ComponentPublicInstance['$attrs'] & __VLS_InheritedAttrs`;
 }
 function* generateTemplateRefs(options, ctx) {
     yield `type __VLS_TemplateRefs = {}`;

package/lib/codegen/template/interpolation.js

@@ -140,8 +140,13 @@ function walkIdentifiers(ts, node, ast, cb, ctx, blockVars, isRoot = false) {
             ctx.addLocalVariable(name);
             blockVars.push(name);
         }
-        if (node.initializer) {
-            walkIdentifiers(ts, node.initializer, ast, cb, ctx, blockVars);
+        walkIdentifiersInBinding(ts, node, ast, cb, ctx, blockVars);
+    }
+    else if (ts.isArrayBindingPattern(node) || ts.isObjectBindingPattern(node)) {
+        for (const element of node.elements) {
+            if (ts.isBindingElement(element)) {
+                walkIdentifiersInBinding(ts, element, ast, cb, ctx, blockVars);
+            }
         }
     }
     else if (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) {
@@ -194,13 +199,22 @@ function walkIdentifiers(ts, node, ast, cb, ctx, blockVars, isRoot = false) {
         }
     }
 }
+function walkIdentifiersInBinding(ts, node, ast, cb, ctx, blockVars) {
+    if ('type' in node && node.type) {
+        walkIdentifiersInTypeNode(ts, node.type, cb);
+    }
+    if (!ts.isIdentifier(node.name)) {
+        walkIdentifiers(ts, node.name, ast, cb, ctx, blockVars);
+    }
+    if (node.initializer) {
+        walkIdentifiers(ts, node.initializer, ast, cb, ctx, blockVars);
+    }
+}
 function walkIdentifiersInFunction(ts, node, ast, cb, ctx) {
     const functionArgs = [];
     for (const param of node.parameters) {
         functionArgs.push(...(0, collectBindings_1.collectBindingNames)(ts, param.name, ast));
-        if (param.type) {
-            walkIdentifiersInTypeNode(ts, param.type, cb);
-        }
+        walkIdentifiersInBinding(ts, param, ast, cb, ctx, functionArgs);
     }
     for (const varName of functionArgs) {
         ctx.addLocalVariable(varName);

package/lib/codegen/template/slotOutlet.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSlotOutlet = generateSlotOutlet;
 const CompilerDOM = require("@vue/compiler-dom");
+const shared_1 = require("../../utils/shared");
 const codeFeatures_1 = require("../codeFeatures");
 const inlayHints_1 = require("../inlayHints");
 const utils_1 = require("../utils");
@@ -11,8 +12,7 @@ const elementProps_1 = require("./elementProps");
 const interpolation_1 = require("./interpolation");
 const propertyAccess_1 = require("./propertyAccess");
 function* generateSlotOutlet(options, ctx, node) {
-    const startTagOffset = node.loc.start.offset
-        + options.template.content.slice(node.loc.start.offset).indexOf(node.tag);
+    const [startTagOffset] = (0, shared_1.getElementTagOffsets)(node, options.template);
     const startTagEndOffset = startTagOffset + node.tag.length;
     const propsVar = ctx.getInternalVariable();
     const nameProp = node.props.find(prop => {