@vue/language-core 3.1.8 → 3.2.0

package/index.d.ts

@@ -1,7 +1,7 @@
-export * from './lib/codegen/globalTypes';
 export * from './lib/codegen/template';
 export * from './lib/compilerOptions';
 export * from './lib/languagePlugin';
+export * from './lib/parsers/scriptRanges';
 export * from './lib/parsers/scriptSetupRanges';
 export * from './lib/plugins';
 export * from './lib/types';

package/index.js

@@ -10,15 +10,37 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     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 __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);
 };
+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.tsCodegen = exports.names = 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/scriptRanges"), exports);
 __exportStar(require("./lib/parsers/scriptSetupRanges"), exports);
 __exportStar(require("./lib/plugins"), exports);
 __exportStar(require("./lib/types"), exports);
@@ -27,8 +49,8 @@ __exportStar(require("./lib/utils/forEachTemplateNode"), exports);
 __exportStar(require("./lib/utils/parseSfc"), exports);
 __exportStar(require("./lib/utils/shared"), exports);
 __exportStar(require("./lib/virtualCode"), exports);
-exports.names = require("./lib/codegen/names");
-var vue_tsx_1 = require("./lib/plugins/vue-tsx");
+exports.names = __importStar(require("./lib/codegen/names"));
+const vue_tsx_1 = require("./lib/plugins/vue-tsx");
 Object.defineProperty(exports, "tsCodegen", { enumerable: true, get: function () { return vue_tsx_1.tsCodegen; } });
 __exportStar(require("@volar/language-core"), exports);
 //# sourceMappingURL=index.js.map

package/lib/codegen/codeFeatures.d.ts

@@ -1,86 +1,20 @@
 import type { VueCodeInformation } from '../types';
-declare const raw: {
-    all: {
-        verification: true;
-        completion: true;
-        semantic: true;
-        navigation: true;
-    };
-    importCompletionOnly: {
-        __importCompletion: true;
-    };
-    verification: {
-        verification: true;
-    };
-    completion: {
-        completion: true;
-    };
-    withoutCompletion: {
-        verification: true;
-        semantic: true;
-        navigation: true;
-    };
-    navigation: {
-        navigation: true;
-    };
-    navigationWithoutRename: {
-        navigation: {
-            shouldRename: () => false;
-        };
-    };
-    navigationAndCompletion: {
-        navigation: true;
-        completion: true;
-    };
-    navigationAndVerification: {
-        navigation: true;
-        verification: true;
-    };
-    withoutNavigation: {
-        verification: true;
-        completion: true;
-        semantic: true;
-    };
-    semanticWithoutHighlight: {
-        semantic: {
-            shouldHighlight: () => false;
-        };
-    };
-    withoutHighlight: {
-        semantic: {
-            shouldHighlight: () => false;
-        };
-        verification: true;
-        navigation: true;
-        completion: true;
-    };
-    withoutHighlightAndCompletion: {
-        semantic: {
-            shouldHighlight: () => false;
-        };
-        verification: true;
-        navigation: true;
-    };
-    withoutSemantic: {
-        verification: true;
-        navigation: true;
-        completion: true;
-    };
-    doNotReportTs2339AndTs2551: {
-        verification: {
-            shouldReport: (_source: string | undefined, code: string | number | undefined) => boolean;
-        };
-    };
-    doNotReportTs2353AndTs2561: {
-        verification: {
-            shouldReport: (_source: string | undefined, code: string | number | undefined) => boolean;
-        };
-    };
-    doNotReportTs6133: {
-        verification: {
-            shouldReport: (_source: string | undefined, code: string | number | undefined) => boolean;
-        };
-    };
+export declare const codeFeatures: {
+    all: VueCodeInformation;
+    importCompletionOnly: VueCodeInformation;
+    verification: VueCodeInformation;
+    completion: VueCodeInformation;
+    withoutCompletion: VueCodeInformation;
+    navigation: VueCodeInformation;
+    navigationWithoutRename: VueCodeInformation;
+    navigationAndCompletion: VueCodeInformation;
+    navigationAndVerification: VueCodeInformation;
+    withoutNavigation: VueCodeInformation;
+    semanticWithoutHighlight: VueCodeInformation;
+    withoutHighlight: VueCodeInformation;
+    withoutHighlightAndCompletion: VueCodeInformation;
+    withoutSemantic: VueCodeInformation;
+    doNotReportTs2339AndTs2551: VueCodeInformation;
+    doNotReportTs2353AndTs2561: VueCodeInformation;
+    doNotReportTs6133: VueCodeInformation;
 };
-export declare const codeFeatures: { [K in keyof typeof raw]: VueCodeInformation; };
-export {};

package/lib/codegen/names.d.ts

@@ -8,10 +8,9 @@ export declare const modelEmit = "__VLS_modelEmit";
 export declare const emit = "__VLS_emit";
 export declare const exposed = "__VLS_exposed";
 export declare const setup = "__VLS_setup";
-export declare const components = "___VLS_components";
-export declare const directives = "___VLS_directives";
+export declare const components = "__VLS_components";
+export declare const directives = "__VLS_directives";
 export declare const intrinsics = "__VLS_intrinsics";
-export declare const placeholder = "__VLS_placeholder";
 export declare const _export = "__VLS_export";
 export declare const ModelProps = "__VLS_ModelProps";
 export declare const Props = "__VLS_Props";
@@ -26,4 +25,3 @@ export declare const Emit = "__VLS_Emit";
 export declare const SetupExposed = "__VLS_SetupExposed";
 export declare const PublicProps = "__VLS_PublicProps";
 export declare const StyleModules = "__VLS_StyleModules";
-export declare const PROPS_FALLBACK = "__VLS_PROPS_FALLBACK";

package/lib/codegen/names.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PROPS_FALLBACK = exports.StyleModules = exports.PublicProps = exports.SetupExposed = exports.Emit = exports.InternalProps = exports.EmitProps = exports.ModelEmit = exports.RootEl = exports.TemplateRefs = exports.InheritedAttrs = exports.Slots = exports.Props = exports.ModelProps = exports._export = exports.placeholder = exports.intrinsics = exports.directives = exports.components = exports.setup = exports.exposed = exports.emit = exports.modelEmit = exports.defaultModels = exports.defaults = exports.props = exports.slots = exports.dollars = exports.ctx = void 0;
+exports.StyleModules = exports.PublicProps = exports.SetupExposed = exports.Emit = exports.InternalProps = exports.EmitProps = exports.ModelEmit = exports.RootEl = exports.TemplateRefs = exports.InheritedAttrs = exports.Slots = exports.Props = exports.ModelProps = exports._export = exports.intrinsics = exports.directives = exports.components = exports.setup = exports.exposed = exports.emit = exports.modelEmit = exports.defaultModels = exports.defaults = exports.props = exports.slots = exports.dollars = exports.ctx = void 0;
 exports.ctx = '__VLS_ctx';
 exports.dollars = '__VLS_dollars';
 exports.slots = '__VLS_slots';
@@ -11,10 +11,9 @@ exports.modelEmit = '__VLS_modelEmit';
 exports.emit = '__VLS_emit';
 exports.exposed = '__VLS_exposed';
 exports.setup = '__VLS_setup';
-exports.components = '___VLS_components';
-exports.directives = '___VLS_directives';
+exports.components = '__VLS_components';
+exports.directives = '__VLS_directives';
 exports.intrinsics = '__VLS_intrinsics';
-exports.placeholder = '__VLS_placeholder';
 exports._export = '__VLS_export';
 exports.ModelProps = '__VLS_ModelProps';
 exports.Props = '__VLS_Props';
@@ -29,5 +28,4 @@ exports.Emit = '__VLS_Emit';
 exports.SetupExposed = '__VLS_SetupExposed';
 exports.PublicProps = '__VLS_PublicProps';
 exports.StyleModules = '__VLS_StyleModules';
-exports.PROPS_FALLBACK = '__VLS_PROPS_FALLBACK';
 //# sourceMappingURL=names.js.map

package/lib/codegen/script/component.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.generateComponent = generateComponent;
 const codeFeatures_1 = require("../codeFeatures");
-const names = require("../names");
+const names = __importStar(require("../names"));
 const utils_1 = require("../utils");
 const merge_1 = require("../utils/merge");
 function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
@@ -21,12 +54,12 @@ function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
     yield* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, !!emitOptionCodes.length);
     if (options.vueCompilerOptions.target >= 3.5
         && options.vueCompilerOptions.inferComponentDollarRefs
-        && options.templateCodegen?.generatedTypes.has(names.TemplateRefs)) {
+        && options.templateAndStyleTypes.has(names.TemplateRefs)) {
         yield `__typeRefs: {} as ${names.TemplateRefs},${utils_1.newLine}`;
     }
     if (options.vueCompilerOptions.target >= 3.5
         && options.vueCompilerOptions.inferComponentDollarEl
-        && options.templateCodegen?.generatedTypes.has(names.RootEl)) {
+        && options.templateAndStyleTypes.has(names.RootEl)) {
         yield `__typeEl: {} as ${names.RootEl},${utils_1.newLine}`;
     }
     yield `})`;
@@ -62,7 +95,7 @@ function* generateEmitsOption(options, scriptSetupRanges) {
 function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasEmitsOption) {
     const optionGenerates = [];
     const typeOptionGenerates = [];
-    if (options.templateCodegen?.generatedTypes.has(names.InheritedAttrs)) {
+    if (options.templateAndStyleTypes.has(names.InheritedAttrs)) {
         const attrsType = hasEmitsOption
             ? `Omit<${names.InheritedAttrs}, keyof ${names.EmitProps}>`
             : names.InheritedAttrs;

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

@@ -1,28 +1,19 @@
-import type * as ts from 'typescript';
 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';
 export interface ScriptCodegenOptions {
-    ts: typeof ts;
     vueCompilerOptions: VueCompilerOptions;
     script: Sfc['script'];
     scriptSetup: Sfc['scriptSetup'];
     fileName: string;
     scriptRanges: ScriptRanges | undefined;
     scriptSetupRanges: ScriptSetupRanges | undefined;
-    templateStartTagOffset: number | undefined;
-    templateCodegen: TemplateCodegenContext & {
-        codes: Code[];
-    } | undefined;
-    styleCodegen: TemplateCodegenContext & {
-        codes: Code[];
-    } | undefined;
-    setupExposed: Set<string>;
+    templateAndStyleTypes: Set<string>;
+    templateAndStyleCodes: Code[];
+    exposed: Set<string>;
 }
 export { generate as generateScript };
 declare function generate(options: ScriptCodegenOptions): {
-    codes: Code[];
     generatedTypes: Set<string>;
     localTypes: {
         generate: () => Generator<string, void, unknown>;
@@ -34,4 +25,5 @@ declare function generate(options: ScriptCodegenOptions): {
         readonly OmitIndexSignature: string;
     };
     inlayHints: import("../inlayHints").InlayHintInfo[];
+    codes: Code[];
 };

package/lib/codegen/script/index.js

@@ -1,14 +1,46 @@
 "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.generateScript = generate;
-const path = require("path-browserify");
+const path = __importStar(require("path-browserify"));
 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");
 const scriptSetup_1 = require("./scriptSetup");
-const src_1 = require("./src");
 const template_1 = require("./template");
 const exportExpression = `{} as typeof ${names._export}`;
 function generate(options) {
@@ -17,16 +49,34 @@ function generate(options) {
     return { ...ctx, codes: [...codeGenerator] };
 }
 function* generateWorker(options, ctx) {
-    yield* generateGlobalTypesReference(options);
-    const { script, scriptRanges, scriptSetup, scriptSetupRanges, vueCompilerOptions } = options;
-    if (scriptSetup && scriptSetupRanges) {
-        yield* (0, scriptSetup_1.generateScriptSetupImports)(scriptSetup, scriptSetupRanges);
-    }
-    if (script?.src) {
-        yield* (0, src_1.generateSrc)(script.src);
+    const { script, scriptRanges, scriptSetup, scriptSetupRanges, vueCompilerOptions, fileName } = options;
+    yield* generateGlobalTypesReference(vueCompilerOptions, fileName);
+    // <script src="">
+    if (typeof script?.src === 'object') {
+        let src = script.src.text;
+        if (src.endsWith('.ts') && !src.endsWith('.d.ts')) {
+            src = src.slice(0, -'.ts'.length) + '.js';
+        }
+        else if (src.endsWith('.tsx')) {
+            src = src.slice(0, -'.tsx'.length) + '.jsx';
+        }
+        yield `import __VLS_default from `;
+        const token = yield* (0, boundary_1.startBoundary)('main', script.src.offset, {
+            ...codeFeatures_1.codeFeatures.all,
+            ...src !== script.src.text ? codeFeatures_1.codeFeatures.navigationWithoutRename : {},
+        });
+        yield `'`;
+        yield [src.slice(0, script.src.text.length), 'main', script.src.offset, { __combineToken: token }];
+        yield src.slice(script.src.text.length);
+        yield `'`;
+        yield (0, boundary_1.endBoundary)(token, script.src.offset + script.src.text.length);
+        yield utils_1.endOfLine;
+        yield `export default __VLS_default;${utils_1.endOfLine}`;
+        yield* (0, template_1.generateTemplate)(options, ctx, '__VLS_default');
     }
     // <script> + <script setup>
-    if (script && scriptRanges && scriptSetup && scriptSetupRanges) {
+    else if (script && scriptRanges && scriptSetup && scriptSetupRanges) {
+        yield* (0, scriptSetup_1.generateScriptSetupImports)(scriptSetup, scriptSetupRanges);
         // <script>
         let selfType;
         const { exportDefault } = scriptRanges;
@@ -50,6 +100,7 @@ function* generateWorker(options, ctx) {
     }
     // only <script setup>
     else if (scriptSetup && scriptSetupRanges) {
+        yield* (0, scriptSetup_1.generateScriptSetupImports)(scriptSetup, scriptSetupRanges);
         if (scriptSetup.generic) {
             yield* generateExportDeclareEqual(scriptSetup, names._export);
             yield* (0, scriptSetup_1.generateGeneric)(options, ctx, scriptSetup, scriptSetupRanges, scriptSetup.generic, (0, scriptSetup_1.generateSetupFunction)(options, ctx, scriptSetup, scriptSetupRanges, (0, template_1.generateTemplate)(options, ctx)));
@@ -77,7 +128,7 @@ function* generateWorker(options, ctx) {
     yield* ctx.localTypes.generate();
 }
 function* generateScriptWithExportDefault(ctx, script, scriptRanges, exportDefault, vueCompilerOptions, varName, templateGenerator) {
-    const { componentOptions } = scriptRanges;
+    const componentOptions = scriptRanges.exportDefault?.options;
     const { expression, isObjectLiteral } = componentOptions ?? exportDefault;
     let wrapLeft;
     let wrapRight;
@@ -119,22 +170,26 @@ function* generateScriptWithExportDefault(ctx, script, scriptRanges, exportDefau
     yield utils_1.endOfLine;
     yield* (0, utils_1.generateSfcBlockSection)(script, exportDefault.end, script.content.length, codeFeatures_1.codeFeatures.all);
 }
-function* generateGlobalTypesReference(options) {
-    const globalTypesPath = options.vueCompilerOptions.globalTypesPath(options.fileName);
-    if (!globalTypesPath) {
-        yield `/* placeholder */${utils_1.newLine}`;
-    }
-    else if (path.isAbsolute(globalTypesPath)) {
-        let relativePath = path.relative(path.dirname(options.fileName), globalTypesPath);
-        if (relativePath !== globalTypesPath
+function* generateGlobalTypesReference({ typesRoot, lib, target, checkUnknownProps }, fileName) {
+    let typesPath;
+    if (path.isAbsolute(typesRoot)) {
+        let relativePath = path.relative(path.dirname(fileName), typesRoot);
+        if (relativePath !== typesRoot
             && !relativePath.startsWith('./')
             && !relativePath.startsWith('../')) {
             relativePath = './' + relativePath;
         }
-        yield `/// <reference types="${relativePath}" />${utils_1.newLine}`;
+        typesPath = relativePath;
     }
     else {
-        yield `/// <reference types="${globalTypesPath}" />${utils_1.newLine}`;
+        typesPath = typesRoot;
+    }
+    yield `/// <reference types=${JSON.stringify(typesPath + '/template-helpers.d.ts')} />${utils_1.newLine}`;
+    if (!checkUnknownProps) {
+        yield `/// <reference types=${JSON.stringify(typesPath + '/props-fallback.d.ts')} />${utils_1.newLine}`;
+    }
+    if (lib === 'vue' && target < 3.5) {
+        yield `/// <reference types=${JSON.stringify(typesPath + '/vue-3.4-shims.d.ts')} />${utils_1.newLine}`;
     }
 }
 function* generateExportDeclareEqual(block, name) {

package/lib/codegen/script/scriptSetup.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.generateScriptSetupImports = generateScriptSetupImports;
 exports.generateGeneric = generateGeneric;
 exports.generateSetupFunction = generateSetupFunction;
 const shared_1 = require("@vue/shared");
 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 camelized_1 = require("../utils/camelized");
@@ -36,6 +69,7 @@ function* generateGeneric(options, ctx, scriptSetup, scriptSetupRanges, generic,
         + `	${names.setup} = (async () => {${utils_1.newLine}`;
     yield* body;
     const propTypes = [];
+    const emitTypes = [];
     const { vueCompilerOptions } = options;
     if (ctx.generatedTypes.has(names.PublicProps)) {
         propTypes.push(names.PublicProps);
@@ -49,10 +83,9 @@ function* generateGeneric(options, ctx, scriptSetup, scriptSetupRanges, generic,
     if (scriptSetupRanges.defineEmits || scriptSetupRanges.defineModel.length) {
         propTypes.push(names.EmitProps);
     }
-    if (options.templateCodegen?.generatedTypes.has(names.InheritedAttrs)) {
+    if (options.templateAndStyleTypes.has(names.InheritedAttrs)) {
         propTypes.push(names.InheritedAttrs);
     }
-    const emitTypes = [];
     if (scriptSetupRanges.defineEmits) {
         emitTypes.push(`typeof ${scriptSetupRanges.defineEmits.name ?? names.emit}`);
     }
@@ -60,23 +93,28 @@ function* generateGeneric(options, ctx, scriptSetup, scriptSetupRanges, generic,
         emitTypes.push(`typeof ${names.modelEmit}`);
     }
     yield `return {} as {${utils_1.newLine}`;
-    yield `	props: ${propTypes.length ? `${ctx.localTypes.PrettifyLocal}<${propTypes.join(` & `)}> & ` : ``}${vueCompilerOptions.target >= 3.4
+    yield `	props: `;
+    yield vueCompilerOptions.target >= 3.4
         ? `import('${vueCompilerOptions.lib}').PublicProps`
         : vueCompilerOptions.target >= 3
             ? `import('${vueCompilerOptions.lib}').VNodeProps`
                 + ` & import('${vueCompilerOptions.lib}').AllowedComponentProps`
                 + ` & import('${vueCompilerOptions.lib}').ComponentCustomProps`
-            : `globalThis.JSX.IntrinsicAttributes`} & (typeof globalThis extends { ${names.PROPS_FALLBACK}: infer P } ? P : {})${utils_1.endOfLine}`;
+            : `globalThis.JSX.IntrinsicAttributes`;
+    if (propTypes.length) {
+        yield ` & ${ctx.localTypes.PrettifyLocal}<${propTypes.join(` & `)}>`;
+    }
+    yield ` & (typeof globalThis extends { __VLS_PROPS_FALLBACK: infer P } ? P : {})${utils_1.endOfLine}`;
     yield `	expose: (exposed: `;
     yield scriptSetupRanges.defineExpose
         ? `import('${vueCompilerOptions.lib}').ShallowUnwrapRef<typeof ${names.exposed}>`
         : `{}`;
     if (options.vueCompilerOptions.inferComponentDollarRefs
-        && options.templateCodegen?.generatedTypes.has(names.TemplateRefs)) {
+        && options.templateAndStyleTypes.has(names.TemplateRefs)) {
         yield ` & { $refs: ${names.TemplateRefs}; }`;
     }
     if (options.vueCompilerOptions.inferComponentDollarEl
-        && options.templateCodegen?.generatedTypes.has(names.RootEl)) {
+        && options.templateAndStyleTypes.has(names.RootEl)) {
         yield ` & { $el: ${names.RootEl}; }`;
     }
     yield `) => void${utils_1.endOfLine}`;
@@ -141,7 +179,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, bo
         transforms.push((0, transform_1.insert)(callExp.start, function* () {
             yield `(`;
         }));
-        const type = options.styleCodegen?.generatedTypes.has(names.StyleModules)
+        const type = options.templateAndStyleTypes.has(names.StyleModules)
             ? names.StyleModules
             : `{}`;
         if (arg) {
@@ -150,7 +188,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, bo
                 yield* (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.withoutSemantic);
                 yield `])`;
             }), (0, transform_1.replace)(arg.start, arg.end, function* () {
-                yield names.placeholder;
+                yield `{} as any`;
             }));
         }
         else {
@@ -176,7 +214,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, bo
         transforms.push((0, transform_1.insert)(callExp.start, function* () {
             yield `(`;
         }), (0, transform_1.insert)(callExp.end, function* () {
-            yield ` as __VLS_UseTemplateRef<`;
+            yield ` as Readonly<import('${options.vueCompilerOptions.lib}').ShallowRef<`;
             if (arg) {
                 yield names.TemplateRefs;
                 yield `[`;
@@ -186,11 +224,11 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, bo
             else {
                 yield `unknown`;
             }
-            yield `>)`;
+            yield ` | null>>)`;
         }));
         if (arg) {
             transforms.push((0, transform_1.replace)(arg.start, arg.end, function* () {
-                yield names.placeholder;
+                yield `{} as any`;
             }));
         }
     }
@@ -219,7 +257,7 @@ function* generateMacros(options) {
         yield `// @ts-ignore${utils_1.newLine}`;
         yield `declare const { `;
         for (const macro of Object.keys(options.vueCompilerOptions.macros)) {
-            if (!options.setupExposed.has(macro)) {
+            if (!options.exposed.has(macro)) {
                 yield `${macro}, `;
             }
         }
@@ -299,7 +337,7 @@ function* generatePublicProps(options, ctx, scriptSetup, scriptSetupRanges) {
 }
 function hasSlotsType(options) {
     return !!(options.scriptSetupRanges?.defineSlots
-        || options.templateCodegen?.generatedTypes.has(names.Slots));
+        || options.templateAndStyleTypes.has(names.Slots));
 }
 function* generateModels(scriptSetup, scriptSetupRanges) {
     if (!scriptSetupRanges.defineModel.length) {