@weapp-vite/volar 2.0.7 → 2.0.8

package/dist/constants.d.ts

@@ -0,0 +1,31 @@
+export declare const BLOCK_TYPE = "json";
+export declare const JS_LANG = "js";
+export declare const JSONC_LANG = "jsonc";
+export declare const JSON_LANG = "json";
+export declare const JSON5_LANG = "json5";
+export declare const PLUGIN_VERSION: 2.2;
+export declare const TS_LANG = "ts";
+export declare const TS_SCRIPT_KIND_JS = 1;
+export declare const TS_SCRIPT_KIND_TS = 3;
+export declare const TS_SCRIPT_TARGET_LATEST = 99;
+export declare const BACKSLASH_RE: RegExp;
+export declare const DEFINE_OPTIONS_NAME = "defineOptions";
+export declare const IDENTIFIER_NAME_RE: RegExp;
+export declare const NON_SPACE_RE: RegExp;
+export declare const WXS_MODULE_RE: RegExp;
+export declare const FULL_CAPABILITIES: {
+    readonly verification: true;
+    readonly completion: true;
+    readonly semantic: true;
+    readonly navigation: true;
+    readonly structure: true;
+    readonly format: true;
+};
+export declare const VOID_CAPABILITIES: {
+    readonly verification: false;
+    readonly completion: false;
+    readonly semantic: false;
+    readonly navigation: false;
+    readonly structure: false;
+    readonly format: false;
+};

package/dist/index.cjs

@@ -29,33 +29,13 @@ let _weapp_core_schematics = require("@weapp-core/schematics");
 //#region package.json
 var name = "@weapp-vite/volar";
 //#endregion
-//#region src/schema.ts
-/**
-* 为小程序配置生成 JSON Schema
-* 为支持 JSON Schema 的编辑器提供验证和自动补全
-*
-* 注意：JSON Schema 定义由 @weapp-core/schematics 统一维护
-* 使用 Zod 定义并自动生成，确保单一数据源
-*/
-/**
-* 根据文件类型获取对应的 JSON Schema
-* Schema 定义来自 @weapp-core/schematics，使用 Zod 维护单一数据源
-*/
-function getSchemaForType(type) {
-	const definition = _weapp_core_schematics.JSON_SCHEMA_DEFINITIONS.find((d) => d.typeName === type);
-	if (!definition) return null;
-	return definition.schema;
-}
-//#endregion
-//#region src/index.ts
+//#region src/constants.ts
 const BLOCK_TYPE = "json";
-const JS_LANG = "js";
 const JSONC_LANG = "jsonc";
 const JSON_LANG = "json";
-const JSON5_LANG = "json5";
 const PLUGIN_VERSION = 2.2;
-const TS_LANG = "ts";
 const BACKSLASH_RE = /\\/g;
+const IDENTIFIER_NAME_RE = /^[$_\p{ID_Start}][$\u200C\u200D\p{ID_Continue}]*$/u;
 const NON_SPACE_RE = /\S/;
 const WXS_MODULE_RE = /<wxs[\s\S]*?module\s*=\s*(?:"([^"]+)"|'([^']+)')[\s\S]*?\/?>/gi;
 const FULL_CAPABILITIES = {
@@ -74,21 +54,185 @@ const VOID_CAPABILITIES = {
 	structure: false,
 	format: false
 };
-const require$1 = (0, node_module.createRequire)(typeof module !== "undefined" && module.filename ? module.filename : node_path.default.join(node_process.default.cwd(), "weapp-vite-volar.cjs"));
-let hasSchematicsTypes = false;
-try {
-	require$1.resolve("@weapp-core/schematics");
-	hasSchematicsTypes = true;
-} catch {
-	hasSchematicsTypes = false;
+//#endregion
+//#region src/schema.ts
+/**
+* 为小程序配置生成 JSON Schema
+* 为支持 JSON Schema 的编辑器提供验证和自动补全
+*
+* 注意：JSON Schema 定义由 @weapp-core/schematics 统一维护
+* 使用 Zod 定义并自动生成，确保单一数据源
+*/
+/**
+* 根据文件类型获取对应的 JSON Schema
+* Schema 定义来自 @weapp-core/schematics，使用 Zod 维护单一数据源
+*/
+function getSchemaForType(type) {
+	const definition = _weapp_core_schematics.JSON_SCHEMA_DEFINITIONS.find((d) => d.typeName === type);
+	if (!definition) return null;
+	return definition.schema;
 }
-function parseVueSfc(content, filename = "component.vue") {
-	try {
-		return require$1("@vue/compiler-sfc").parse(content, { filename });
-	} catch {
+//#endregion
+//#region src/jsonBlock.ts
+function normalizeFilename(filename) {
+	if (!filename) return "";
+	return filename.replace(BACKSLASH_RE, "/");
+}
+function inferConfigType(filename) {
+	const normalized = normalizeFilename(filename);
+	if (normalized.endsWith("/app.vue")) return "App";
+	if (normalized.includes("/plugin/")) return "Plugin";
+	if (normalized.includes("/components/")) return "Component";
+	if (normalized.includes("/theme/")) return "Theme";
+	if (normalized.includes("/sitemap")) return "Sitemap";
+	return "Page";
+}
+function normalizeLang(lang) {
+	if (!lang) return JSON_LANG;
+	const lower = lang.toLowerCase();
+	if (lower === "txt") return JSON_LANG;
+	return lower;
+}
+function getEmbeddedCodesFromCustomBlocks(sfc) {
+	const names = [];
+	for (let i = 0; i < sfc.customBlocks.length; i++) {
+		const block = sfc.customBlocks[i];
+		if (block.type === "json") {
+			const normalizedLang = normalizeLang(block.lang);
+			if (normalizedLang === "js" || normalizedLang === "ts") {
+				names.push({
+					id: `${BLOCK_TYPE}_${i}`,
+					lang: "ts"
+				});
+				continue;
+			}
+			const embeddedLang = normalizedLang === "json" || normalizedLang === "jsonc" || normalizedLang === "json5" ? JSONC_LANG : JSON_LANG;
+			names.push({
+				id: `${BLOCK_TYPE}_${i}`,
+				lang: embeddedLang
+			});
+		}
+	}
+	return names;
+}
+function findExportDefaultExpression(code, tsModule, lang) {
+	const scriptKind = lang === "ts" ? 3 : 1;
+	const sourceFile = tsModule.createSourceFile(`config.${lang}`, code, 99, true, scriptKind);
+	for (const statement of sourceFile.statements) if (tsModule.isExportAssignment(statement)) {
+		const expressionStart = statement.expression.getStart(sourceFile);
+		const expressionEnd = statement.expression.getEnd();
+		const leading = code.slice(0, statement.getStart(sourceFile));
+		return {
+			expression: code.slice(expressionStart, expressionEnd),
+			expressionStart,
+			expressionEnd,
+			leading,
+			trailing: code.slice(statement.getEnd())
+		};
+	}
+	return null;
+}
+function injectSchemaIntoJsonObject(content, schemaId) {
+	const trimmed = content.trim();
+	if (!trimmed.startsWith("{")) return content;
+	const leftBraceIndex = content.indexOf("{");
+	if (leftBraceIndex < 0) return content;
+	const firstNonSpace = content.slice(leftBraceIndex + 1).match(NON_SPACE_RE);
+	const nextCharIndex = firstNonSpace ? leftBraceIndex + 1 + firstNonSpace.index : -1;
+	const isEmptyObject = nextCharIndex >= 0 && content[nextCharIndex] === "}";
+	const schemaLine = `  "$schema": "${schemaId}"`;
+	const injected = isEmptyObject ? `{\n${schemaLine}\n}` : `{\n${schemaLine},${content.slice(leftBraceIndex + 1)}`;
+	if (trimmed === content) return injected;
+	return `${content.slice(0, content.indexOf(trimmed))}${injected}${content.slice(content.indexOf(trimmed) + trimmed.length)}`;
+}
+function resolveEmbeddedJsonBlock(fileName, sfc, embeddedCode, tsModule, hasSchematicsTypes) {
+	const match = embeddedCode.id.match(new RegExp(`^${BLOCK_TYPE}_(\\d+)$`));
+	if (!match) return;
+	const index = Number.parseInt(match[1]);
+	const block = sfc.customBlocks[index];
+	if (!block) return;
+	const normalizedLang = normalizeLang(block.lang);
+	const configType = inferConfigType(fileName);
+	if (!hasSchematicsTypes) {
+		embeddedCode.content.push([
+			block.content,
+			block.name,
+			0,
+			FULL_CAPABILITIES
+		]);
 		return;
 	}
+	if (normalizedLang === "js" || normalizedLang === "ts") {
+		const parsed = tsModule && findExportDefaultExpression(block.content, tsModule, normalizedLang);
+		if (parsed) {
+			const typeImport = `import type { ${configType} as __WeappConfig } from '@weapp-core/schematics'\n`;
+			embeddedCode.content.push([
+				`${typeImport}const __weapp_defineConfig = <T extends __WeappConfig>(config: T) => config
+
+`,
+				void 0,
+				0,
+				VOID_CAPABILITIES
+			]);
+			if (parsed.leading) embeddedCode.content.push([
+				parsed.leading,
+				block.name,
+				0,
+				FULL_CAPABILITIES
+			]);
+			embeddedCode.content.push([
+				"export default __weapp_defineConfig(",
+				void 0,
+				parsed.expressionStart,
+				VOID_CAPABILITIES
+			]);
+			embeddedCode.content.push([
+				parsed.expression,
+				block.name,
+				parsed.expressionStart,
+				FULL_CAPABILITIES
+			]);
+			embeddedCode.content.push([
+				")",
+				void 0,
+				parsed.expressionEnd,
+				VOID_CAPABILITIES
+			]);
+			if (parsed.trailing) embeddedCode.content.push([
+				parsed.trailing,
+				block.name,
+				parsed.expressionEnd,
+				FULL_CAPABILITIES
+			]);
+			return;
+		}
+		embeddedCode.content.push([
+			block.content,
+			block.name,
+			0,
+			FULL_CAPABILITIES
+		]);
+		return;
+	}
+	const schema = getSchemaForType(configType);
+	if (schema && schema.$id && !block.content.includes("$schema")) {
+		embeddedCode.content.push([
+			injectSchemaIntoJsonObject(block.content, schema.$id),
+			block.name,
+			0,
+			FULL_CAPABILITIES
+		]);
+		return;
+	}
+	embeddedCode.content.push([
+		block.content,
+		block.name,
+		0,
+		FULL_CAPABILITIES
+	]);
 }
+//#endregion
+//#region src/scriptSetup.ts
 function collectWxsModuleNames(templateContent) {
 	if (!templateContent) return [];
 	const names = /* @__PURE__ */ new Set();
@@ -107,6 +251,10 @@ function appendWxsDeclarations(code, moduleNames) {
 	if (!declarations) return code;
 	return code ? `${code}\n\n${declarations}\n` : `${declarations}\n`;
 }
+function appendScriptSetupDeclarations(code, declarations) {
+	if (!declarations) return code;
+	return code ? `${code}\n\n${declarations}\n` : `${declarations}\n`;
+}
 function createSyntheticScriptSetup(moduleNames) {
 	const content = createWxsModuleDeclarations(moduleNames);
 	if (!content) return;
@@ -135,54 +283,151 @@ function createSyntheticScriptSetup(moduleNames) {
 		name: "scriptSetup"
 	};
 }
-function normalizeFilename(filename) {
-	if (!filename) return "";
-	return filename.replace(BACKSLASH_RE, "/");
+function syncScriptBlockSource(block) {
+	if (!block) return;
+	const attrs = Object.entries(block.attrs ?? {}).filter(([, value]) => value != null).map(([key, value]) => value === true ? key : `${key}="${String(value)}"`).join(" ");
+	const openTag = attrs ? `<script ${attrs}>` : "<script>";
+	block.loc.source = `${openTag}\n${block.content}\n<\/script>`;
 }
-function inferConfigType(filename) {
-	const normalized = normalizeFilename(filename);
-	if (normalized.endsWith("/app.vue")) return "App";
-	if (normalized.includes("/plugin/")) return "Plugin";
-	if (normalized.includes("/components/")) return "Component";
-	if (normalized.includes("/theme/")) return "Theme";
-	if (normalized.includes("/sitemap")) return "Sitemap";
-	return "Page";
+function isIdentifierName(name) {
+	return IDENTIFIER_NAME_RE.test(name);
 }
-function normalizeLang(lang) {
-	if (!lang) return JSON_LANG;
-	const lower = lang.toLowerCase();
-	if (lower === "txt") return JSON_LANG;
-	return lower;
+function getPropertyNameText(node, tsModule) {
+	if (tsModule.isIdentifier(node) || tsModule.isStringLiteral(node) || tsModule.isNumericLiteral(node)) return node.text;
 }
-function findExportDefaultExpression(code, tsModule, lang) {
-	const scriptKind = lang === TS_LANG ? tsModule.ScriptKind.TS : tsModule.ScriptKind.JS;
-	const sourceFile = tsModule.createSourceFile(`config.${lang}`, code, tsModule.ScriptTarget.Latest, true, scriptKind);
-	for (const statement of sourceFile.statements) if (tsModule.isExportAssignment(statement)) {
-		const expressionStart = statement.expression.getStart(sourceFile);
-		const expressionEnd = statement.expression.getEnd();
-		const leading = code.slice(0, statement.getStart(sourceFile));
-		return {
-			expression: code.slice(expressionStart, expressionEnd),
-			expressionStart,
-			expressionEnd,
-			leading,
-			trailing: code.slice(statement.getEnd())
-		};
+function collectBindingNames(name, tsModule, bindings) {
+	if (tsModule.isIdentifier(name)) {
+		bindings.add(name.text);
+		return;
 	}
-	return null;
+	for (const element of name.elements) if (tsModule.isBindingElement(element)) collectBindingNames(element.name, tsModule, bindings);
 }
-function injectSchemaIntoJsonObject(content, schemaId) {
-	const trimmed = content.trim();
-	if (!trimmed.startsWith("{")) return content;
-	const leftBraceIndex = content.indexOf("{");
-	if (leftBraceIndex < 0) return content;
-	const firstNonSpace = content.slice(leftBraceIndex + 1).match(NON_SPACE_RE);
-	const nextCharIndex = firstNonSpace ? leftBraceIndex + 1 + firstNonSpace.index : -1;
-	const isEmptyObject = nextCharIndex >= 0 && content[nextCharIndex] === "}";
-	const schemaLine = `  "$schema": "${schemaId}"`;
-	const injected = isEmptyObject ? `{\n${schemaLine}\n}` : `{\n${schemaLine},${content.slice(leftBraceIndex + 1)}`;
-	if (trimmed === content) return injected;
-	return `${content.slice(0, content.indexOf(trimmed))}${injected}${content.slice(content.indexOf(trimmed) + trimmed.length)}`;
+function collectTopLevelBindingNames(code, tsModule, lang) {
+	const scriptKind = lang === "ts" ? 3 : 1;
+	const sourceFile = tsModule.createSourceFile(`bindings.${lang}`, code, 99, true, scriptKind);
+	const bindings = /* @__PURE__ */ new Set();
+	for (const statement of sourceFile.statements) {
+		if (tsModule.isVariableStatement(statement)) {
+			for (const declaration of statement.declarationList.declarations) collectBindingNames(declaration.name, tsModule, bindings);
+			continue;
+		}
+		if ((tsModule.isFunctionDeclaration(statement) || tsModule.isClassDeclaration(statement) || tsModule.isEnumDeclaration(statement)) && statement.name) {
+			bindings.add(statement.name.text);
+			continue;
+		}
+		if (tsModule.isImportDeclaration(statement) && statement.importClause) {
+			const { importClause } = statement;
+			if (importClause.name) bindings.add(importClause.name.text);
+			if (importClause.namedBindings) if (tsModule.isNamespaceImport(importClause.namedBindings)) bindings.add(importClause.namedBindings.name.text);
+			else for (const element of importClause.namedBindings.elements) bindings.add(element.name.text);
+		}
+	}
+	return bindings;
+}
+function unwrapParenthesizedExpression(node, tsModule) {
+	let current = node;
+	while (tsModule.isParenthesizedExpression(current)) current = current.expression;
+	return current;
+}
+function findReturnedObjectLiteral(node, tsModule) {
+	if (tsModule.isObjectLiteralExpression(node)) return node;
+	if (!tsModule.isBlock(node)) return;
+	for (const statement of node.statements) {
+		if (!tsModule.isReturnStatement(statement) || !statement.expression) continue;
+		const expression = unwrapParenthesizedExpression(statement.expression, tsModule);
+		if (tsModule.isObjectLiteralExpression(expression)) return expression;
+	}
+}
+function extractDefineOptionsObjectLiteral(node, tsModule) {
+	if (!tsModule.isIdentifier(node.expression) || node.expression.text !== "defineOptions") return;
+	const [firstArg] = node.arguments;
+	if (!firstArg) return;
+	const arg = unwrapParenthesizedExpression(firstArg, tsModule);
+	if (tsModule.isObjectLiteralExpression(arg)) return arg;
+	if (tsModule.isArrowFunction(arg) || tsModule.isFunctionExpression(arg)) return findReturnedObjectLiteral(arg.body, tsModule);
+}
+function collectObjectLiteralKeys(node, tsModule) {
+	const keys = [];
+	for (const property of node.properties) {
+		if (!tsModule.isPropertyAssignment(property) && !tsModule.isMethodDeclaration(property) && !tsModule.isShorthandPropertyAssignment(property) && !tsModule.isGetAccessorDeclaration(property)) continue;
+		const key = getPropertyNameText(property.name, tsModule);
+		if (key && isIdentifierName(key)) keys.push(key);
+	}
+	return keys;
+}
+function collectDefineOptionsTemplateBindings(code, tsModule, lang) {
+	const scriptKind = lang === "ts" ? 3 : 1;
+	const sourceFile = tsModule.createSourceFile(`script-setup.${lang}`, code, 99, true, scriptKind);
+	const valueBindings = /* @__PURE__ */ new Set();
+	const functionBindings = /* @__PURE__ */ new Set();
+	const visit = (node) => {
+		if (tsModule.isCallExpression(node)) {
+			const optionsObject = extractDefineOptionsObjectLiteral(node, tsModule);
+			if (optionsObject) for (const property of optionsObject.properties) {
+				const sectionName = tsModule.isPropertyAssignment(property) || tsModule.isMethodDeclaration(property) ? getPropertyNameText(property.name, tsModule) : void 0;
+				if (!sectionName) continue;
+				if (sectionName === "methods") {
+					const methodsObject = tsModule.isPropertyAssignment(property) ? unwrapParenthesizedExpression(property.initializer, tsModule) : void 0;
+					if (methodsObject && tsModule.isObjectLiteralExpression(methodsObject)) for (const name of collectObjectLiteralKeys(methodsObject, tsModule)) functionBindings.add(name);
+					continue;
+				}
+				if (sectionName === "properties" || sectionName === "computed") {
+					const objectValue = tsModule.isPropertyAssignment(property) ? unwrapParenthesizedExpression(property.initializer, tsModule) : void 0;
+					if (objectValue && tsModule.isObjectLiteralExpression(objectValue)) for (const name of collectObjectLiteralKeys(objectValue, tsModule)) valueBindings.add(name);
+					continue;
+				}
+				if (sectionName === "data") {
+					let dataObject;
+					if (tsModule.isMethodDeclaration(property)) dataObject = findReturnedObjectLiteral(property.body ?? tsModule.factory.createBlock([], false), tsModule);
+					else if (tsModule.isPropertyAssignment(property)) {
+						const initializer = unwrapParenthesizedExpression(property.initializer, tsModule);
+						if (tsModule.isArrowFunction(initializer) || tsModule.isFunctionExpression(initializer)) dataObject = findReturnedObjectLiteral(initializer.body, tsModule);
+					}
+					if (dataObject) for (const name of collectObjectLiteralKeys(dataObject, tsModule)) valueBindings.add(name);
+				}
+			}
+		}
+		tsModule.forEachChild(node, visit);
+	};
+	visit(sourceFile);
+	return {
+		values: [...valueBindings],
+		functions: [...functionBindings]
+	};
+}
+function createDefineOptionsTemplateDeclarations(code, tsModule, lang) {
+	const topLevelBindings = collectTopLevelBindingNames(code, tsModule, lang);
+	const bindings = collectDefineOptionsTemplateBindings(code, tsModule, lang);
+	const declarations = [];
+	for (const name of bindings.values) {
+		if (topLevelBindings.has(name)) continue;
+		declarations.push(`const ${name}: any = null as any`);
+	}
+	for (const name of bindings.functions) {
+		if (topLevelBindings.has(name)) continue;
+		declarations.push(`const ${name}: (...args: any[]) => any = null as any`);
+	}
+	return declarations.join("\n");
+}
+function resolveScriptSetupLang(lang) {
+	return lang === "js" ? "js" : "ts";
+}
+//#endregion
+//#region src/index.ts
+const require$1 = (0, node_module.createRequire)(typeof module !== "undefined" && module.filename ? module.filename : node_path.default.join(node_process.default.cwd(), "weapp-vite-volar.cjs"));
+let hasSchematicsTypes = false;
+try {
+	require$1.resolve("@weapp-core/schematics");
+	hasSchematicsTypes = true;
+} catch {
+	hasSchematicsTypes = false;
+}
+function parseVueSfc(content, filename = "component.vue") {
+	try {
+		return require$1("@vue/compiler-sfc").parse(content, { filename });
+	} catch {
+		return;
+	}
 }
 /**
 * Volar 语言插件：为 weapp 配置块提供类型与 schema 提示。
@@ -204,118 +449,21 @@ const plugin = (ctx) => {
 			if (!parsed) return;
 			const descriptor = parsed.descriptor;
 			const wxsModuleNames = collectWxsModuleNames(descriptor.template?.content);
-			if (!wxsModuleNames.length) return parsed;
-			if (descriptor.scriptSetup) descriptor.scriptSetup.content = appendWxsDeclarations(descriptor.scriptSetup.content, wxsModuleNames);
-			else descriptor.scriptSetup = createSyntheticScriptSetup(wxsModuleNames);
+			const scriptSetup = descriptor.scriptSetup;
+			const scriptSetupLang = resolveScriptSetupLang(scriptSetup?.lang);
+			const defineOptionsDeclarations = scriptSetup?.content && tsModule ? createDefineOptionsTemplateDeclarations(scriptSetup.content, tsModule, scriptSetupLang) : "";
+			if (!wxsModuleNames.length && !defineOptionsDeclarations) return parsed;
+			if (descriptor.scriptSetup) {
+				descriptor.scriptSetup.content = appendScriptSetupDeclarations(appendWxsDeclarations(descriptor.scriptSetup.content, wxsModuleNames), defineOptionsDeclarations);
+				syncScriptBlockSource(descriptor.scriptSetup);
+			} else descriptor.scriptSetup = createSyntheticScriptSetup(wxsModuleNames);
 			return parsed;
 		},
 		getEmbeddedCodes(_, sfc) {
-			const names = [];
-			for (let i = 0; i < sfc.customBlocks.length; i++) {
-				const block = sfc.customBlocks[i];
-				if (block.type === BLOCK_TYPE) {
-					const normalizedLang = normalizeLang(block.lang);
-					if (normalizedLang === JS_LANG || normalizedLang === TS_LANG) {
-						names.push({
-							id: `${BLOCK_TYPE}_${i}`,
-							lang: TS_LANG
-						});
-						continue;
-					}
-					const embeddedLang = normalizedLang === JSON_LANG || normalizedLang === JSONC_LANG || normalizedLang === JSON5_LANG ? JSONC_LANG : JSON_LANG;
-					names.push({
-						id: `${BLOCK_TYPE}_${i}`,
-						lang: embeddedLang
-					});
-				}
-			}
-			return names;
+			return getEmbeddedCodesFromCustomBlocks(sfc);
 		},
 		resolveEmbeddedCode(fileName, sfc, embeddedCode) {
-			const match = embeddedCode.id.match(new RegExp(`^${BLOCK_TYPE}_(\\d+)$`));
-			if (!match) return;
-			const index = Number.parseInt(match[1]);
-			const block = sfc.customBlocks[index];
-			if (!block) return;
-			const normalizedLang = normalizeLang(block.lang);
-			const configType = inferConfigType(fileName);
-			if (!hasSchematicsTypes) {
-				embeddedCode.content.push([
-					block.content,
-					block.name,
-					0,
-					FULL_CAPABILITIES
-				]);
-				return;
-			}
-			if (normalizedLang === JS_LANG || normalizedLang === TS_LANG) {
-				const parsed = tsModule && findExportDefaultExpression(block.content, tsModule, normalizedLang);
-				if (parsed && hasSchematicsTypes) {
-					const typeImport = `import type { ${configType} as __WeappConfig } from '@weapp-core/schematics'\n`;
-					embeddedCode.content.push([
-						`${typeImport}const __weapp_defineConfig = <T extends __WeappConfig>(config: T) => config
-
-`,
-						void 0,
-						0,
-						VOID_CAPABILITIES
-					]);
-					if (parsed.leading) embeddedCode.content.push([
-						parsed.leading,
-						block.name,
-						0,
-						FULL_CAPABILITIES
-					]);
-					embeddedCode.content.push([
-						"export default __weapp_defineConfig(",
-						void 0,
-						parsed.expressionStart,
-						VOID_CAPABILITIES
-					]);
-					embeddedCode.content.push([
-						parsed.expression,
-						block.name,
-						parsed.expressionStart,
-						FULL_CAPABILITIES
-					]);
-					embeddedCode.content.push([
-						")",
-						void 0,
-						parsed.expressionEnd,
-						VOID_CAPABILITIES
-					]);
-					if (parsed.trailing) embeddedCode.content.push([
-						parsed.trailing,
-						block.name,
-						parsed.expressionEnd,
-						FULL_CAPABILITIES
-					]);
-					return;
-				}
-				embeddedCode.content.push([
-					block.content,
-					block.name,
-					0,
-					FULL_CAPABILITIES
-				]);
-				return;
-			}
-			const schema = getSchemaForType(configType);
-			if (schema && schema.$id && !block.content.includes("$schema")) {
-				embeddedCode.content.push([
-					injectSchemaIntoJsonObject(block.content, schema.$id),
-					block.name,
-					0,
-					FULL_CAPABILITIES
-				]);
-				return;
-			}
-			embeddedCode.content.push([
-				block.content,
-				block.name,
-				0,
-				FULL_CAPABILITIES
-			]);
+			resolveEmbeddedJsonBlock(fileName, sfc, embeddedCode, tsModule, hasSchematicsTypes);
 		}
 	};
 };

package/dist/index.mjs

@@ -5,33 +5,13 @@ import { JSON_SCHEMA_DEFINITIONS } from "@weapp-core/schematics";
 //#region package.json
 var name = "@weapp-vite/volar";
 //#endregion
-//#region src/schema.ts
-/**
-* 为小程序配置生成 JSON Schema
-* 为支持 JSON Schema 的编辑器提供验证和自动补全
-*
-* 注意：JSON Schema 定义由 @weapp-core/schematics 统一维护
-* 使用 Zod 定义并自动生成，确保单一数据源
-*/
-/**
-* 根据文件类型获取对应的 JSON Schema
-* Schema 定义来自 @weapp-core/schematics，使用 Zod 维护单一数据源
-*/
-function getSchemaForType(type) {
-	const definition = JSON_SCHEMA_DEFINITIONS.find((d) => d.typeName === type);
-	if (!definition) return null;
-	return definition.schema;
-}
-//#endregion
-//#region src/index.ts
+//#region src/constants.ts
 const BLOCK_TYPE = "json";
-const JS_LANG = "js";
 const JSONC_LANG = "jsonc";
 const JSON_LANG = "json";
-const JSON5_LANG = "json5";
 const PLUGIN_VERSION = 2.2;
-const TS_LANG = "ts";
 const BACKSLASH_RE = /\\/g;
+const IDENTIFIER_NAME_RE = /^[$_\p{ID_Start}][$\u200C\u200D\p{ID_Continue}]*$/u;
 const NON_SPACE_RE = /\S/;
 const WXS_MODULE_RE = /<wxs[\s\S]*?module\s*=\s*(?:"([^"]+)"|'([^']+)')[\s\S]*?\/?>/gi;
 const FULL_CAPABILITIES = {
@@ -50,21 +30,185 @@ const VOID_CAPABILITIES = {
 	structure: false,
 	format: false
 };
-const require = createRequire(typeof module !== "undefined" && module.filename ? module.filename : path.join(process.cwd(), "weapp-vite-volar.cjs"));
-let hasSchematicsTypes = false;
-try {
-	require.resolve("@weapp-core/schematics");
-	hasSchematicsTypes = true;
-} catch {
-	hasSchematicsTypes = false;
+//#endregion
+//#region src/schema.ts
+/**
+* 为小程序配置生成 JSON Schema
+* 为支持 JSON Schema 的编辑器提供验证和自动补全
+*
+* 注意：JSON Schema 定义由 @weapp-core/schematics 统一维护
+* 使用 Zod 定义并自动生成，确保单一数据源
+*/
+/**
+* 根据文件类型获取对应的 JSON Schema
+* Schema 定义来自 @weapp-core/schematics，使用 Zod 维护单一数据源
+*/
+function getSchemaForType(type) {
+	const definition = JSON_SCHEMA_DEFINITIONS.find((d) => d.typeName === type);
+	if (!definition) return null;
+	return definition.schema;
 }
-function parseVueSfc(content, filename = "component.vue") {
-	try {
-		return require("@vue/compiler-sfc").parse(content, { filename });
-	} catch {
+//#endregion
+//#region src/jsonBlock.ts
+function normalizeFilename(filename) {
+	if (!filename) return "";
+	return filename.replace(BACKSLASH_RE, "/");
+}
+function inferConfigType(filename) {
+	const normalized = normalizeFilename(filename);
+	if (normalized.endsWith("/app.vue")) return "App";
+	if (normalized.includes("/plugin/")) return "Plugin";
+	if (normalized.includes("/components/")) return "Component";
+	if (normalized.includes("/theme/")) return "Theme";
+	if (normalized.includes("/sitemap")) return "Sitemap";
+	return "Page";
+}
+function normalizeLang(lang) {
+	if (!lang) return JSON_LANG;
+	const lower = lang.toLowerCase();
+	if (lower === "txt") return JSON_LANG;
+	return lower;
+}
+function getEmbeddedCodesFromCustomBlocks(sfc) {
+	const names = [];
+	for (let i = 0; i < sfc.customBlocks.length; i++) {
+		const block = sfc.customBlocks[i];
+		if (block.type === "json") {
+			const normalizedLang = normalizeLang(block.lang);
+			if (normalizedLang === "js" || normalizedLang === "ts") {
+				names.push({
+					id: `${BLOCK_TYPE}_${i}`,
+					lang: "ts"
+				});
+				continue;
+			}
+			const embeddedLang = normalizedLang === "json" || normalizedLang === "jsonc" || normalizedLang === "json5" ? JSONC_LANG : JSON_LANG;
+			names.push({
+				id: `${BLOCK_TYPE}_${i}`,
+				lang: embeddedLang
+			});
+		}
+	}
+	return names;
+}
+function findExportDefaultExpression(code, tsModule, lang) {
+	const scriptKind = lang === "ts" ? 3 : 1;
+	const sourceFile = tsModule.createSourceFile(`config.${lang}`, code, 99, true, scriptKind);
+	for (const statement of sourceFile.statements) if (tsModule.isExportAssignment(statement)) {
+		const expressionStart = statement.expression.getStart(sourceFile);
+		const expressionEnd = statement.expression.getEnd();
+		const leading = code.slice(0, statement.getStart(sourceFile));
+		return {
+			expression: code.slice(expressionStart, expressionEnd),
+			expressionStart,
+			expressionEnd,
+			leading,
+			trailing: code.slice(statement.getEnd())
+		};
+	}
+	return null;
+}
+function injectSchemaIntoJsonObject(content, schemaId) {
+	const trimmed = content.trim();
+	if (!trimmed.startsWith("{")) return content;
+	const leftBraceIndex = content.indexOf("{");
+	if (leftBraceIndex < 0) return content;
+	const firstNonSpace = content.slice(leftBraceIndex + 1).match(NON_SPACE_RE);
+	const nextCharIndex = firstNonSpace ? leftBraceIndex + 1 + firstNonSpace.index : -1;
+	const isEmptyObject = nextCharIndex >= 0 && content[nextCharIndex] === "}";
+	const schemaLine = `  "$schema": "${schemaId}"`;
+	const injected = isEmptyObject ? `{\n${schemaLine}\n}` : `{\n${schemaLine},${content.slice(leftBraceIndex + 1)}`;
+	if (trimmed === content) return injected;
+	return `${content.slice(0, content.indexOf(trimmed))}${injected}${content.slice(content.indexOf(trimmed) + trimmed.length)}`;
+}
+function resolveEmbeddedJsonBlock(fileName, sfc, embeddedCode, tsModule, hasSchematicsTypes) {
+	const match = embeddedCode.id.match(new RegExp(`^${BLOCK_TYPE}_(\\d+)$`));
+	if (!match) return;
+	const index = Number.parseInt(match[1]);
+	const block = sfc.customBlocks[index];
+	if (!block) return;
+	const normalizedLang = normalizeLang(block.lang);
+	const configType = inferConfigType(fileName);
+	if (!hasSchematicsTypes) {
+		embeddedCode.content.push([
+			block.content,
+			block.name,
+			0,
+			FULL_CAPABILITIES
+		]);
 		return;
 	}
+	if (normalizedLang === "js" || normalizedLang === "ts") {
+		const parsed = tsModule && findExportDefaultExpression(block.content, tsModule, normalizedLang);
+		if (parsed) {
+			const typeImport = `import type { ${configType} as __WeappConfig } from '@weapp-core/schematics'\n`;
+			embeddedCode.content.push([
+				`${typeImport}const __weapp_defineConfig = <T extends __WeappConfig>(config: T) => config
+
+`,
+				void 0,
+				0,
+				VOID_CAPABILITIES
+			]);
+			if (parsed.leading) embeddedCode.content.push([
+				parsed.leading,
+				block.name,
+				0,
+				FULL_CAPABILITIES
+			]);
+			embeddedCode.content.push([
+				"export default __weapp_defineConfig(",
+				void 0,
+				parsed.expressionStart,
+				VOID_CAPABILITIES
+			]);
+			embeddedCode.content.push([
+				parsed.expression,
+				block.name,
+				parsed.expressionStart,
+				FULL_CAPABILITIES
+			]);
+			embeddedCode.content.push([
+				")",
+				void 0,
+				parsed.expressionEnd,
+				VOID_CAPABILITIES
+			]);
+			if (parsed.trailing) embeddedCode.content.push([
+				parsed.trailing,
+				block.name,
+				parsed.expressionEnd,
+				FULL_CAPABILITIES
+			]);
+			return;
+		}
+		embeddedCode.content.push([
+			block.content,
+			block.name,
+			0,
+			FULL_CAPABILITIES
+		]);
+		return;
+	}
+	const schema = getSchemaForType(configType);
+	if (schema && schema.$id && !block.content.includes("$schema")) {
+		embeddedCode.content.push([
+			injectSchemaIntoJsonObject(block.content, schema.$id),
+			block.name,
+			0,
+			FULL_CAPABILITIES
+		]);
+		return;
+	}
+	embeddedCode.content.push([
+		block.content,
+		block.name,
+		0,
+		FULL_CAPABILITIES
+	]);
 }
+//#endregion
+//#region src/scriptSetup.ts
 function collectWxsModuleNames(templateContent) {
 	if (!templateContent) return [];
 	const names = /* @__PURE__ */ new Set();
@@ -83,6 +227,10 @@ function appendWxsDeclarations(code, moduleNames) {
 	if (!declarations) return code;
 	return code ? `${code}\n\n${declarations}\n` : `${declarations}\n`;
 }
+function appendScriptSetupDeclarations(code, declarations) {
+	if (!declarations) return code;
+	return code ? `${code}\n\n${declarations}\n` : `${declarations}\n`;
+}
 function createSyntheticScriptSetup(moduleNames) {
 	const content = createWxsModuleDeclarations(moduleNames);
 	if (!content) return;
@@ -111,54 +259,151 @@ function createSyntheticScriptSetup(moduleNames) {
 		name: "scriptSetup"
 	};
 }
-function normalizeFilename(filename) {
-	if (!filename) return "";
-	return filename.replace(BACKSLASH_RE, "/");
+function syncScriptBlockSource(block) {
+	if (!block) return;
+	const attrs = Object.entries(block.attrs ?? {}).filter(([, value]) => value != null).map(([key, value]) => value === true ? key : `${key}="${String(value)}"`).join(" ");
+	const openTag = attrs ? `<script ${attrs}>` : "<script>";
+	block.loc.source = `${openTag}\n${block.content}\n<\/script>`;
 }
-function inferConfigType(filename) {
-	const normalized = normalizeFilename(filename);
-	if (normalized.endsWith("/app.vue")) return "App";
-	if (normalized.includes("/plugin/")) return "Plugin";
-	if (normalized.includes("/components/")) return "Component";
-	if (normalized.includes("/theme/")) return "Theme";
-	if (normalized.includes("/sitemap")) return "Sitemap";
-	return "Page";
+function isIdentifierName(name) {
+	return IDENTIFIER_NAME_RE.test(name);
 }
-function normalizeLang(lang) {
-	if (!lang) return JSON_LANG;
-	const lower = lang.toLowerCase();
-	if (lower === "txt") return JSON_LANG;
-	return lower;
+function getPropertyNameText(node, tsModule) {
+	if (tsModule.isIdentifier(node) || tsModule.isStringLiteral(node) || tsModule.isNumericLiteral(node)) return node.text;
 }
-function findExportDefaultExpression(code, tsModule, lang) {
-	const scriptKind = lang === TS_LANG ? tsModule.ScriptKind.TS : tsModule.ScriptKind.JS;
-	const sourceFile = tsModule.createSourceFile(`config.${lang}`, code, tsModule.ScriptTarget.Latest, true, scriptKind);
-	for (const statement of sourceFile.statements) if (tsModule.isExportAssignment(statement)) {
-		const expressionStart = statement.expression.getStart(sourceFile);
-		const expressionEnd = statement.expression.getEnd();
-		const leading = code.slice(0, statement.getStart(sourceFile));
-		return {
-			expression: code.slice(expressionStart, expressionEnd),
-			expressionStart,
-			expressionEnd,
-			leading,
-			trailing: code.slice(statement.getEnd())
-		};
+function collectBindingNames(name, tsModule, bindings) {
+	if (tsModule.isIdentifier(name)) {
+		bindings.add(name.text);
+		return;
 	}
-	return null;
+	for (const element of name.elements) if (tsModule.isBindingElement(element)) collectBindingNames(element.name, tsModule, bindings);
 }
-function injectSchemaIntoJsonObject(content, schemaId) {
-	const trimmed = content.trim();
-	if (!trimmed.startsWith("{")) return content;
-	const leftBraceIndex = content.indexOf("{");
-	if (leftBraceIndex < 0) return content;
-	const firstNonSpace = content.slice(leftBraceIndex + 1).match(NON_SPACE_RE);
-	const nextCharIndex = firstNonSpace ? leftBraceIndex + 1 + firstNonSpace.index : -1;
-	const isEmptyObject = nextCharIndex >= 0 && content[nextCharIndex] === "}";
-	const schemaLine = `  "$schema": "${schemaId}"`;
-	const injected = isEmptyObject ? `{\n${schemaLine}\n}` : `{\n${schemaLine},${content.slice(leftBraceIndex + 1)}`;
-	if (trimmed === content) return injected;
-	return `${content.slice(0, content.indexOf(trimmed))}${injected}${content.slice(content.indexOf(trimmed) + trimmed.length)}`;
+function collectTopLevelBindingNames(code, tsModule, lang) {
+	const scriptKind = lang === "ts" ? 3 : 1;
+	const sourceFile = tsModule.createSourceFile(`bindings.${lang}`, code, 99, true, scriptKind);
+	const bindings = /* @__PURE__ */ new Set();
+	for (const statement of sourceFile.statements) {
+		if (tsModule.isVariableStatement(statement)) {
+			for (const declaration of statement.declarationList.declarations) collectBindingNames(declaration.name, tsModule, bindings);
+			continue;
+		}
+		if ((tsModule.isFunctionDeclaration(statement) || tsModule.isClassDeclaration(statement) || tsModule.isEnumDeclaration(statement)) && statement.name) {
+			bindings.add(statement.name.text);
+			continue;
+		}
+		if (tsModule.isImportDeclaration(statement) && statement.importClause) {
+			const { importClause } = statement;
+			if (importClause.name) bindings.add(importClause.name.text);
+			if (importClause.namedBindings) if (tsModule.isNamespaceImport(importClause.namedBindings)) bindings.add(importClause.namedBindings.name.text);
+			else for (const element of importClause.namedBindings.elements) bindings.add(element.name.text);
+		}
+	}
+	return bindings;
+}
+function unwrapParenthesizedExpression(node, tsModule) {
+	let current = node;
+	while (tsModule.isParenthesizedExpression(current)) current = current.expression;
+	return current;
+}
+function findReturnedObjectLiteral(node, tsModule) {
+	if (tsModule.isObjectLiteralExpression(node)) return node;
+	if (!tsModule.isBlock(node)) return;
+	for (const statement of node.statements) {
+		if (!tsModule.isReturnStatement(statement) || !statement.expression) continue;
+		const expression = unwrapParenthesizedExpression(statement.expression, tsModule);
+		if (tsModule.isObjectLiteralExpression(expression)) return expression;
+	}
+}
+function extractDefineOptionsObjectLiteral(node, tsModule) {
+	if (!tsModule.isIdentifier(node.expression) || node.expression.text !== "defineOptions") return;
+	const [firstArg] = node.arguments;
+	if (!firstArg) return;
+	const arg = unwrapParenthesizedExpression(firstArg, tsModule);
+	if (tsModule.isObjectLiteralExpression(arg)) return arg;
+	if (tsModule.isArrowFunction(arg) || tsModule.isFunctionExpression(arg)) return findReturnedObjectLiteral(arg.body, tsModule);
+}
+function collectObjectLiteralKeys(node, tsModule) {
+	const keys = [];
+	for (const property of node.properties) {
+		if (!tsModule.isPropertyAssignment(property) && !tsModule.isMethodDeclaration(property) && !tsModule.isShorthandPropertyAssignment(property) && !tsModule.isGetAccessorDeclaration(property)) continue;
+		const key = getPropertyNameText(property.name, tsModule);
+		if (key && isIdentifierName(key)) keys.push(key);
+	}
+	return keys;
+}
+function collectDefineOptionsTemplateBindings(code, tsModule, lang) {
+	const scriptKind = lang === "ts" ? 3 : 1;
+	const sourceFile = tsModule.createSourceFile(`script-setup.${lang}`, code, 99, true, scriptKind);
+	const valueBindings = /* @__PURE__ */ new Set();
+	const functionBindings = /* @__PURE__ */ new Set();
+	const visit = (node) => {
+		if (tsModule.isCallExpression(node)) {
+			const optionsObject = extractDefineOptionsObjectLiteral(node, tsModule);
+			if (optionsObject) for (const property of optionsObject.properties) {
+				const sectionName = tsModule.isPropertyAssignment(property) || tsModule.isMethodDeclaration(property) ? getPropertyNameText(property.name, tsModule) : void 0;
+				if (!sectionName) continue;
+				if (sectionName === "methods") {
+					const methodsObject = tsModule.isPropertyAssignment(property) ? unwrapParenthesizedExpression(property.initializer, tsModule) : void 0;
+					if (methodsObject && tsModule.isObjectLiteralExpression(methodsObject)) for (const name of collectObjectLiteralKeys(methodsObject, tsModule)) functionBindings.add(name);
+					continue;
+				}
+				if (sectionName === "properties" || sectionName === "computed") {
+					const objectValue = tsModule.isPropertyAssignment(property) ? unwrapParenthesizedExpression(property.initializer, tsModule) : void 0;
+					if (objectValue && tsModule.isObjectLiteralExpression(objectValue)) for (const name of collectObjectLiteralKeys(objectValue, tsModule)) valueBindings.add(name);
+					continue;
+				}
+				if (sectionName === "data") {
+					let dataObject;
+					if (tsModule.isMethodDeclaration(property)) dataObject = findReturnedObjectLiteral(property.body ?? tsModule.factory.createBlock([], false), tsModule);
+					else if (tsModule.isPropertyAssignment(property)) {
+						const initializer = unwrapParenthesizedExpression(property.initializer, tsModule);
+						if (tsModule.isArrowFunction(initializer) || tsModule.isFunctionExpression(initializer)) dataObject = findReturnedObjectLiteral(initializer.body, tsModule);
+					}
+					if (dataObject) for (const name of collectObjectLiteralKeys(dataObject, tsModule)) valueBindings.add(name);
+				}
+			}
+		}
+		tsModule.forEachChild(node, visit);
+	};
+	visit(sourceFile);
+	return {
+		values: [...valueBindings],
+		functions: [...functionBindings]
+	};
+}
+function createDefineOptionsTemplateDeclarations(code, tsModule, lang) {
+	const topLevelBindings = collectTopLevelBindingNames(code, tsModule, lang);
+	const bindings = collectDefineOptionsTemplateBindings(code, tsModule, lang);
+	const declarations = [];
+	for (const name of bindings.values) {
+		if (topLevelBindings.has(name)) continue;
+		declarations.push(`const ${name}: any = null as any`);
+	}
+	for (const name of bindings.functions) {
+		if (topLevelBindings.has(name)) continue;
+		declarations.push(`const ${name}: (...args: any[]) => any = null as any`);
+	}
+	return declarations.join("\n");
+}
+function resolveScriptSetupLang(lang) {
+	return lang === "js" ? "js" : "ts";
+}
+//#endregion
+//#region src/index.ts
+const require = createRequire(typeof module !== "undefined" && module.filename ? module.filename : path.join(process.cwd(), "weapp-vite-volar.cjs"));
+let hasSchematicsTypes = false;
+try {
+	require.resolve("@weapp-core/schematics");
+	hasSchematicsTypes = true;
+} catch {
+	hasSchematicsTypes = false;
+}
+function parseVueSfc(content, filename = "component.vue") {
+	try {
+		return require("@vue/compiler-sfc").parse(content, { filename });
+	} catch {
+		return;
+	}
 }
 /**
 * Volar 语言插件：为 weapp 配置块提供类型与 schema 提示。
@@ -180,118 +425,21 @@ const plugin = (ctx) => {
 			if (!parsed) return;
 			const descriptor = parsed.descriptor;
 			const wxsModuleNames = collectWxsModuleNames(descriptor.template?.content);
-			if (!wxsModuleNames.length) return parsed;
-			if (descriptor.scriptSetup) descriptor.scriptSetup.content = appendWxsDeclarations(descriptor.scriptSetup.content, wxsModuleNames);
-			else descriptor.scriptSetup = createSyntheticScriptSetup(wxsModuleNames);
+			const scriptSetup = descriptor.scriptSetup;
+			const scriptSetupLang = resolveScriptSetupLang(scriptSetup?.lang);
+			const defineOptionsDeclarations = scriptSetup?.content && tsModule ? createDefineOptionsTemplateDeclarations(scriptSetup.content, tsModule, scriptSetupLang) : "";
+			if (!wxsModuleNames.length && !defineOptionsDeclarations) return parsed;
+			if (descriptor.scriptSetup) {
+				descriptor.scriptSetup.content = appendScriptSetupDeclarations(appendWxsDeclarations(descriptor.scriptSetup.content, wxsModuleNames), defineOptionsDeclarations);
+				syncScriptBlockSource(descriptor.scriptSetup);
+			} else descriptor.scriptSetup = createSyntheticScriptSetup(wxsModuleNames);
 			return parsed;
 		},
 		getEmbeddedCodes(_, sfc) {
-			const names = [];
-			for (let i = 0; i < sfc.customBlocks.length; i++) {
-				const block = sfc.customBlocks[i];
-				if (block.type === BLOCK_TYPE) {
-					const normalizedLang = normalizeLang(block.lang);
-					if (normalizedLang === JS_LANG || normalizedLang === TS_LANG) {
-						names.push({
-							id: `${BLOCK_TYPE}_${i}`,
-							lang: TS_LANG
-						});
-						continue;
-					}
-					const embeddedLang = normalizedLang === JSON_LANG || normalizedLang === JSONC_LANG || normalizedLang === JSON5_LANG ? JSONC_LANG : JSON_LANG;
-					names.push({
-						id: `${BLOCK_TYPE}_${i}`,
-						lang: embeddedLang
-					});
-				}
-			}
-			return names;
+			return getEmbeddedCodesFromCustomBlocks(sfc);
 		},
 		resolveEmbeddedCode(fileName, sfc, embeddedCode) {
-			const match = embeddedCode.id.match(new RegExp(`^${BLOCK_TYPE}_(\\d+)$`));
-			if (!match) return;
-			const index = Number.parseInt(match[1]);
-			const block = sfc.customBlocks[index];
-			if (!block) return;
-			const normalizedLang = normalizeLang(block.lang);
-			const configType = inferConfigType(fileName);
-			if (!hasSchematicsTypes) {
-				embeddedCode.content.push([
-					block.content,
-					block.name,
-					0,
-					FULL_CAPABILITIES
-				]);
-				return;
-			}
-			if (normalizedLang === JS_LANG || normalizedLang === TS_LANG) {
-				const parsed = tsModule && findExportDefaultExpression(block.content, tsModule, normalizedLang);
-				if (parsed && hasSchematicsTypes) {
-					const typeImport = `import type { ${configType} as __WeappConfig } from '@weapp-core/schematics'\n`;
-					embeddedCode.content.push([
-						`${typeImport}const __weapp_defineConfig = <T extends __WeappConfig>(config: T) => config
-
-`,
-						void 0,
-						0,
-						VOID_CAPABILITIES
-					]);
-					if (parsed.leading) embeddedCode.content.push([
-						parsed.leading,
-						block.name,
-						0,
-						FULL_CAPABILITIES
-					]);
-					embeddedCode.content.push([
-						"export default __weapp_defineConfig(",
-						void 0,
-						parsed.expressionStart,
-						VOID_CAPABILITIES
-					]);
-					embeddedCode.content.push([
-						parsed.expression,
-						block.name,
-						parsed.expressionStart,
-						FULL_CAPABILITIES
-					]);
-					embeddedCode.content.push([
-						")",
-						void 0,
-						parsed.expressionEnd,
-						VOID_CAPABILITIES
-					]);
-					if (parsed.trailing) embeddedCode.content.push([
-						parsed.trailing,
-						block.name,
-						parsed.expressionEnd,
-						FULL_CAPABILITIES
-					]);
-					return;
-				}
-				embeddedCode.content.push([
-					block.content,
-					block.name,
-					0,
-					FULL_CAPABILITIES
-				]);
-				return;
-			}
-			const schema = getSchemaForType(configType);
-			if (schema && schema.$id && !block.content.includes("$schema")) {
-				embeddedCode.content.push([
-					injectSchemaIntoJsonObject(block.content, schema.$id),
-					block.name,
-					0,
-					FULL_CAPABILITIES
-				]);
-				return;
-			}
-			embeddedCode.content.push([
-				block.content,
-				block.name,
-				0,
-				FULL_CAPABILITIES
-			]);
+			resolveEmbeddedJsonBlock(fileName, sfc, embeddedCode, tsModule, hasSchematicsTypes);
 		}
 	};
 };

package/dist/jsonBlock.d.ts

@@ -0,0 +1,24 @@
+import type ts from 'typescript';
+export declare function normalizeFilename(filename?: string): string;
+export declare function inferConfigType(filename?: string): "App" | "Page" | "Component" | "Plugin" | "Sitemap" | "Theme";
+export declare function normalizeLang(lang?: string): string;
+export declare function getEmbeddedCodesFromCustomBlocks(sfc: {
+    customBlocks: ReadonlyArray<{
+        type: string;
+        lang?: string;
+    }>;
+}): {
+    id: string;
+    lang: string;
+}[];
+export declare function resolveEmbeddedJsonBlock(fileName: string, sfc: {
+    customBlocks: ReadonlyArray<{
+        type: string;
+        lang?: string;
+        content: string;
+        name?: string;
+    }>;
+}, embeddedCode: {
+    id: string;
+    content: any[];
+}, tsModule: typeof ts | undefined, hasSchematicsTypes: boolean): void;

package/dist/scriptSetup.d.ts

@@ -0,0 +1,38 @@
+import type ts from 'typescript';
+export declare function collectWxsModuleNames(templateContent?: string): string[];
+export declare function createWxsModuleDeclarations(moduleNames: string[]): string;
+export declare function appendWxsDeclarations(code: string, moduleNames: string[]): string;
+export declare function appendScriptSetupDeclarations(code: string, declarations: string): string;
+export declare function createSyntheticScriptSetup(moduleNames: string[]): {
+    type: string;
+    content: string;
+    loc: {
+        source: string;
+        start: {
+            column: number;
+            line: number;
+            offset: number;
+        };
+        end: {
+            column: number;
+            line: number;
+            offset: number;
+        };
+    };
+    attrs: {
+        setup: boolean;
+        lang: string;
+    };
+    lang: string;
+    setup: boolean;
+    name: string;
+} | undefined;
+export declare function syncScriptBlockSource(block: {
+    content: string;
+    attrs?: Record<string, string | true>;
+    loc: {
+        source: string;
+    };
+} | null | undefined): void;
+export declare function createDefineOptionsTemplateDeclarations(code: string, tsModule: typeof ts, lang: string): string;
+export declare function resolveScriptSetupLang(lang?: string): "js" | "ts";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-vite/volar",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Volar plugin for weapp-vite - Provides IntelliSense and type checking for WeChat mini-program config blocks",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",