@weapp-vite/volar 2.0.8 → 2.1.0

package/README.md

@@ -1,58 +1,65 @@
 # @weapp-vite/volar
 
-> 为 weapp-vite 提供 VSCode 智能提示和类型检查的 Volar 插件
+## 1. 简介
 
-## 安装
+`@weapp-vite/volar` 是 `weapp-vite` 的 Volar 语言服务插件，用来给小程序 Vue SFC 中的自定义块和相关宏提供更准确的类型、补全和诊断能力。
 
-此包已作为 `weapp-vite` 的依赖自动安装，**无需单独安装**。
+它主要覆盖：
 
-如果你确实需要单独安装：
+- `<json>` 自定义块的 schema 与类型提示
+- `definePageJson` / `defineComponentJson` 等配置宏配套体验
+- `wxs` 模块声明补全
+- `script setup` 中为 weapp-vite / wevu 注入的额外声明
 
-```bash
-npm install -D @weapp-vite/volar
-# or
-pnpm add -D @weapp-vite/volar
-# or
-yarn add -D @weapp-vite/volar
-```
+## 2. 安装方式
+
+大多数情况下不需要单独安装。
 
-## 使用方法
+`weapp-vite` 已经依赖并自动启用这个插件，项目里通常只需要按文档配置 `tsconfig.json` / `jsconfig.json` 即可。
 
-**推荐方式：** 通过 weapp-vite 使用，插件会自动启用。
+如果你要在非标准工程里单独集成，可以安装：
 
-详细使用文档请参考：[weapp-vite Volar 文档](../weapp-vite/docs/volar.md)
+```bash
+pnpm add -D @weapp-vite/volar @weapp-core/schematics
+```
 
-## 功能特性
+## 3. 常见配置
 
-- ✅ **配置文件智能提示** - 为 `<json>` 代码块提供完整的类型检查和自动补全
-- ✅ **JSON Schema 支持** - 支持 JSON Schema 验证和自动补全
-- ✅ **TypeScript 类型检查** - 利用 TypeScript 类型系统确保配置正确性
-- ✅ **自动推断配置类型** - 根据文件路径自动推断是 App/Page/Component 配置
-- ✅ **多模式支持** - 支持 JSON 模式和 TypeScript 模式
+```json
+{
+  "vueCompilerOptions": {
+    "plugins": ["weapp-vite/volar"]
+  }
+}
+```
 
-## 开发
+> **注意**：更完整的编辑器接入方式，请优先参考 `weapp-vite` 主包文档中的 Volar 章节。
 
-```bash
-# 安装依赖
-pnpm install
+## 4. 提供的能力
 
-# 开发模式
-pnpm dev
+| 能力                    | 说明                                                   |
+| ----------------------- | ------------------------------------------------------ |
+| `<json>` 块诊断         | 根据 App / Page / Component 语义提供 schema 与类型校验 |
+| `script setup` 声明增强 | 自动补齐 weapp 相关额外声明                            |
+| `wxs` 模块名收集        | 让模板与脚本中的 `wxs` 使用获得更稳定的类型体验        |
+| 自定义块嵌入代码        | 让 Volar 能识别并处理额外代码片段                      |
 
-# 构建
-pnpm build
+## 5. 适用场景
 
-# 测试
-pnpm test
-```
+- 在 `.vue` 文件里直接编写小程序页面 / 组件配置
+- 使用 `definePageJson`、`defineComponentJson` 等宏
+- 需要让 VS Code / Volar 正确理解 weapp-vite 的自定义块与扩展语义
 
-## 相关文档
+## 6. 本地开发
 
-- [weapp-vite 文档](../weapp-vite)
-- [weapp-vite Volar 使用指南](../weapp-vite/docs/volar.md)
-- [Vue 3 文档](https://vuejs.org/)
-- [微信小程序官方文档](https://developers.weixin.qq.com/miniprogram/dev/framework/)
+```bash
+pnpm --filter @weapp-vite/volar build
+pnpm --filter @weapp-vite/volar test
+pnpm --filter @weapp-vite/volar typecheck
+```
 
-## License
+## 7. 相关链接
 
-MIT
+- 详细用法：[./USAGE.md](./USAGE.md)
+- 主包文档：[../weapp-vite/docs/volar.md](../weapp-vite/docs/volar.md)
+- `weapp-vite`：[../weapp-vite/README.md](../weapp-vite/README.md)

package/dist/index.cjs

@@ -329,15 +329,18 @@ function unwrapParenthesizedExpression(node, tsModule) {
 	while (tsModule.isParenthesizedExpression(current)) current = current.expression;
 	return current;
 }
-function findReturnedObjectLiteral(node, tsModule) {
+function findReturnedExpression(node, tsModule) {
 	if (tsModule.isObjectLiteralExpression(node)) return node;
-	if (!tsModule.isBlock(node)) return;
+	if (!tsModule.isBlock(node)) return node;
 	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;
+		return unwrapParenthesizedExpression(statement.expression, tsModule);
 	}
 }
+function findReturnedObjectLiteral(node, tsModule) {
+	const expression = findReturnedExpression(node, tsModule);
+	return expression && tsModule.isObjectLiteralExpression(expression) ? expression : void 0;
+}
 function extractDefineOptionsObjectLiteral(node, tsModule) {
 	if (!tsModule.isIdentifier(node.expression) || node.expression.text !== "defineOptions") return;
 	const [firstArg] = node.arguments;
@@ -346,20 +349,90 @@ function extractDefineOptionsObjectLiteral(node, 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 = [];
+function setBindingType(map, name, typeText) {
+	if (!map.has(name)) map.set(name, typeText);
+}
+function getRuntimeConstructorType(node, tsModule) {
+	if (tsModule.isIdentifier(node)) {
+		if (node.text === "String") return "string";
+		if (node.text === "Number") return "number";
+		if (node.text === "Boolean") return "boolean";
+		if (node.text === "Array") return "any[]";
+		if (node.text === "Object") return "Record<string, any>";
+	}
+	if (tsModule.isArrayLiteralExpression(node)) {
+		const types = [...new Set(node.elements.map((element) => {
+			if (tsModule.isSpreadElement(element)) return null;
+			return getRuntimeConstructorType(element, tsModule);
+		}).filter((typeText) => Boolean(typeText)))];
+		return types.length > 0 ? types.join(" | ") : null;
+	}
+	return null;
+}
+function getFunctionSignatureTypeText(node, sourceFile) {
+	if (!(node.parameters.some((parameter) => Boolean(parameter.type)) || Boolean(node.type))) return "(...args: any[]) => any";
+	return `(${node.parameters.map((parameter) => parameter.getText(sourceFile)).join(", ")}) => ${node.type?.getText(sourceFile) ?? "any"}`;
+}
+function getMiniProgramPropertyType(node, tsModule) {
+	const runtimeType = getRuntimeConstructorType(node, tsModule);
+	if (runtimeType) return runtimeType;
+	if (!tsModule.isObjectLiteralExpression(node)) return "any";
 	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);
+		if (!tsModule.isPropertyAssignment(property)) continue;
+		if (getPropertyNameText(property.name, tsModule) !== "type") continue;
+		return getRuntimeConstructorType(unwrapParenthesizedExpression(property.initializer, tsModule), tsModule) ?? "any";
+	}
+	return "any";
+}
+function getExpressionTypeText(node, tsModule, sourceFile) {
+	const expression = unwrapParenthesizedExpression(node, tsModule);
+	if (tsModule.isAsExpression(expression) || tsModule.isTypeAssertionExpression(expression)) return expression.type.getText(sourceFile);
+	if (tsModule.isStringLiteral(expression) || tsModule.isNoSubstitutionTemplateLiteral(expression)) return "string";
+	if (tsModule.isNumericLiteral(expression)) return "number";
+	if (expression.kind === tsModule.SyntaxKind.TrueKeyword || expression.kind === tsModule.SyntaxKind.FalseKeyword) return "boolean";
+	if (tsModule.isPrefixUnaryExpression(expression) && tsModule.isNumericLiteral(expression.operand)) return "number";
+	if (tsModule.isArrayLiteralExpression(expression)) {
+		const itemTypes = [...new Set(expression.elements.map((element) => {
+			if (tsModule.isSpreadElement(element)) return null;
+			return getExpressionTypeText(element, tsModule, sourceFile);
+		}).filter((typeText) => Boolean(typeText) && typeText !== "undefined"))];
+		if (itemTypes.length === 0) return "any[]";
+		return itemTypes.length === 1 ? `${itemTypes[0]}[]` : `(${itemTypes.join(" | ")})[]`;
 	}
-	return keys;
+	if (tsModule.isObjectLiteralExpression(expression)) {
+		const fields = [];
+		for (const property of expression.properties) {
+			if (tsModule.isPropertyAssignment(property)) {
+				const name = getPropertyNameText(property.name, tsModule);
+				if (name) fields.push(`${name}: ${getExpressionTypeText(property.initializer, tsModule, sourceFile)}`);
+				continue;
+			}
+			if (tsModule.isShorthandPropertyAssignment(property)) {
+				fields.push(`${property.name.text}: any`);
+				continue;
+			}
+			if (tsModule.isMethodDeclaration(property) || tsModule.isGetAccessorDeclaration(property)) {
+				const name = getPropertyNameText(property.name, tsModule);
+				if (name) fields.push(`${name}: (...args: any[]) => any`);
+			}
+		}
+		return fields.length > 0 ? `{ ${fields.join("; ")} }` : "Record<string, any>";
+	}
+	if (tsModule.isArrowFunction(expression) || tsModule.isFunctionExpression(expression)) return "(...args: any[]) => any";
+	if (tsModule.isIdentifier(expression) && expression.text === "undefined") return "undefined";
+	return "any";
+}
+function getFunctionLikeReturnTypeText(node, tsModule, sourceFile) {
+	if (node.type) return node.type.getText(sourceFile);
+	if (!node.body) return "any";
+	const returnedExpression = tsModule.isBlock(node.body) ? findReturnedExpression(node.body, tsModule) : findReturnedExpression(node.body, tsModule);
+	return returnedExpression ? getExpressionTypeText(returnedExpression, tsModule, sourceFile) : "any";
 }
 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 valueBindings = /* @__PURE__ */ new Map();
+	const functionBindings = /* @__PURE__ */ new Map();
 	const visit = (node) => {
 		if (tsModule.isCallExpression(node)) {
 			const optionsObject = extractDefineOptionsObjectLiteral(node, tsModule);
@@ -368,12 +441,30 @@ function collectDefineOptionsTemplateBindings(code, tsModule, lang) {
 				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);
+					if (methodsObject && tsModule.isObjectLiteralExpression(methodsObject)) for (const entry of methodsObject.properties) {
+						if (!tsModule.isPropertyAssignment(entry) && !tsModule.isMethodDeclaration(entry) && !tsModule.isShorthandPropertyAssignment(entry)) continue;
+						const name = getPropertyNameText(entry.name, tsModule);
+						if (!name || !isIdentifierName(name)) continue;
+						setBindingType(functionBindings, name, tsModule.isPropertyAssignment(entry) && (tsModule.isArrowFunction(entry.initializer) || tsModule.isFunctionExpression(entry.initializer)) ? getFunctionSignatureTypeText(entry.initializer, sourceFile) : tsModule.isMethodDeclaration(entry) ? getFunctionSignatureTypeText(entry, sourceFile) : "(...args: any[]) => any");
+					}
 					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);
+					if (objectValue && tsModule.isObjectLiteralExpression(objectValue)) for (const entry of objectValue.properties) {
+						if (!tsModule.isPropertyAssignment(entry) && !tsModule.isMethodDeclaration(entry) && !tsModule.isShorthandPropertyAssignment(entry) && !tsModule.isGetAccessorDeclaration(entry)) continue;
+						const name = getPropertyNameText(entry.name, tsModule);
+						if (!name || !isIdentifierName(name)) continue;
+						let typeText = "any";
+						if (sectionName === "properties" && tsModule.isPropertyAssignment(entry)) typeText = getMiniProgramPropertyType(unwrapParenthesizedExpression(entry.initializer, tsModule), tsModule);
+						else if (sectionName === "computed") {
+							if (tsModule.isPropertyAssignment(entry)) {
+								const initializer = unwrapParenthesizedExpression(entry.initializer, tsModule);
+								if (tsModule.isArrowFunction(initializer) || tsModule.isFunctionExpression(initializer)) typeText = getFunctionLikeReturnTypeText(initializer, tsModule, sourceFile);
+							} else if (tsModule.isMethodDeclaration(entry) || tsModule.isGetAccessorDeclaration(entry)) typeText = getFunctionLikeReturnTypeText(entry, tsModule, sourceFile);
+						}
+						setBindingType(valueBindings, name, typeText);
+					}
 					continue;
 				}
 				if (sectionName === "data") {
@@ -381,9 +472,15 @@ function collectDefineOptionsTemplateBindings(code, tsModule, lang) {
 					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 (tsModule.isObjectLiteralExpression(initializer)) dataObject = initializer;
+						else if (tsModule.isArrowFunction(initializer) || tsModule.isFunctionExpression(initializer)) dataObject = findReturnedObjectLiteral(initializer.body, tsModule);
+					}
+					if (dataObject) for (const property of dataObject.properties) {
+						if (!tsModule.isPropertyAssignment(property) && !tsModule.isMethodDeclaration(property) && !tsModule.isShorthandPropertyAssignment(property) && !tsModule.isGetAccessorDeclaration(property)) continue;
+						const name = getPropertyNameText(property.name, tsModule);
+						if (!name || !isIdentifierName(name)) continue;
+						setBindingType(valueBindings, name, tsModule.isPropertyAssignment(property) ? getExpressionTypeText(property.initializer, tsModule, sourceFile) : "(...args: any[]) => any");
 					}
-					if (dataObject) for (const name of collectObjectLiteralKeys(dataObject, tsModule)) valueBindings.add(name);
 				}
 			}
 		}
@@ -399,13 +496,13 @@ 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) {
+	for (const [name, typeText] of bindings.values) {
 		if (topLevelBindings.has(name)) continue;
-		declarations.push(`const ${name}: any = null as any`);
+		declarations.push(`const ${name}: ${typeText} = null as any`);
 	}
-	for (const name of bindings.functions) {
+	for (const [name, typeText] of bindings.functions) {
 		if (topLevelBindings.has(name)) continue;
-		declarations.push(`const ${name}: (...args: any[]) => any = null as any`);
+		declarations.push(`const ${name}: ${typeText} = null as any`);
 	}
 	return declarations.join("\n");
 }

package/dist/index.mjs

@@ -305,15 +305,18 @@ function unwrapParenthesizedExpression(node, tsModule) {
 	while (tsModule.isParenthesizedExpression(current)) current = current.expression;
 	return current;
 }
-function findReturnedObjectLiteral(node, tsModule) {
+function findReturnedExpression(node, tsModule) {
 	if (tsModule.isObjectLiteralExpression(node)) return node;
-	if (!tsModule.isBlock(node)) return;
+	if (!tsModule.isBlock(node)) return node;
 	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;
+		return unwrapParenthesizedExpression(statement.expression, tsModule);
 	}
 }
+function findReturnedObjectLiteral(node, tsModule) {
+	const expression = findReturnedExpression(node, tsModule);
+	return expression && tsModule.isObjectLiteralExpression(expression) ? expression : void 0;
+}
 function extractDefineOptionsObjectLiteral(node, tsModule) {
 	if (!tsModule.isIdentifier(node.expression) || node.expression.text !== "defineOptions") return;
 	const [firstArg] = node.arguments;
@@ -322,20 +325,90 @@ function extractDefineOptionsObjectLiteral(node, 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 = [];
+function setBindingType(map, name, typeText) {
+	if (!map.has(name)) map.set(name, typeText);
+}
+function getRuntimeConstructorType(node, tsModule) {
+	if (tsModule.isIdentifier(node)) {
+		if (node.text === "String") return "string";
+		if (node.text === "Number") return "number";
+		if (node.text === "Boolean") return "boolean";
+		if (node.text === "Array") return "any[]";
+		if (node.text === "Object") return "Record<string, any>";
+	}
+	if (tsModule.isArrayLiteralExpression(node)) {
+		const types = [...new Set(node.elements.map((element) => {
+			if (tsModule.isSpreadElement(element)) return null;
+			return getRuntimeConstructorType(element, tsModule);
+		}).filter((typeText) => Boolean(typeText)))];
+		return types.length > 0 ? types.join(" | ") : null;
+	}
+	return null;
+}
+function getFunctionSignatureTypeText(node, sourceFile) {
+	if (!(node.parameters.some((parameter) => Boolean(parameter.type)) || Boolean(node.type))) return "(...args: any[]) => any";
+	return `(${node.parameters.map((parameter) => parameter.getText(sourceFile)).join(", ")}) => ${node.type?.getText(sourceFile) ?? "any"}`;
+}
+function getMiniProgramPropertyType(node, tsModule) {
+	const runtimeType = getRuntimeConstructorType(node, tsModule);
+	if (runtimeType) return runtimeType;
+	if (!tsModule.isObjectLiteralExpression(node)) return "any";
 	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);
+		if (!tsModule.isPropertyAssignment(property)) continue;
+		if (getPropertyNameText(property.name, tsModule) !== "type") continue;
+		return getRuntimeConstructorType(unwrapParenthesizedExpression(property.initializer, tsModule), tsModule) ?? "any";
+	}
+	return "any";
+}
+function getExpressionTypeText(node, tsModule, sourceFile) {
+	const expression = unwrapParenthesizedExpression(node, tsModule);
+	if (tsModule.isAsExpression(expression) || tsModule.isTypeAssertionExpression(expression)) return expression.type.getText(sourceFile);
+	if (tsModule.isStringLiteral(expression) || tsModule.isNoSubstitutionTemplateLiteral(expression)) return "string";
+	if (tsModule.isNumericLiteral(expression)) return "number";
+	if (expression.kind === tsModule.SyntaxKind.TrueKeyword || expression.kind === tsModule.SyntaxKind.FalseKeyword) return "boolean";
+	if (tsModule.isPrefixUnaryExpression(expression) && tsModule.isNumericLiteral(expression.operand)) return "number";
+	if (tsModule.isArrayLiteralExpression(expression)) {
+		const itemTypes = [...new Set(expression.elements.map((element) => {
+			if (tsModule.isSpreadElement(element)) return null;
+			return getExpressionTypeText(element, tsModule, sourceFile);
+		}).filter((typeText) => Boolean(typeText) && typeText !== "undefined"))];
+		if (itemTypes.length === 0) return "any[]";
+		return itemTypes.length === 1 ? `${itemTypes[0]}[]` : `(${itemTypes.join(" | ")})[]`;
 	}
-	return keys;
+	if (tsModule.isObjectLiteralExpression(expression)) {
+		const fields = [];
+		for (const property of expression.properties) {
+			if (tsModule.isPropertyAssignment(property)) {
+				const name = getPropertyNameText(property.name, tsModule);
+				if (name) fields.push(`${name}: ${getExpressionTypeText(property.initializer, tsModule, sourceFile)}`);
+				continue;
+			}
+			if (tsModule.isShorthandPropertyAssignment(property)) {
+				fields.push(`${property.name.text}: any`);
+				continue;
+			}
+			if (tsModule.isMethodDeclaration(property) || tsModule.isGetAccessorDeclaration(property)) {
+				const name = getPropertyNameText(property.name, tsModule);
+				if (name) fields.push(`${name}: (...args: any[]) => any`);
+			}
+		}
+		return fields.length > 0 ? `{ ${fields.join("; ")} }` : "Record<string, any>";
+	}
+	if (tsModule.isArrowFunction(expression) || tsModule.isFunctionExpression(expression)) return "(...args: any[]) => any";
+	if (tsModule.isIdentifier(expression) && expression.text === "undefined") return "undefined";
+	return "any";
+}
+function getFunctionLikeReturnTypeText(node, tsModule, sourceFile) {
+	if (node.type) return node.type.getText(sourceFile);
+	if (!node.body) return "any";
+	const returnedExpression = tsModule.isBlock(node.body) ? findReturnedExpression(node.body, tsModule) : findReturnedExpression(node.body, tsModule);
+	return returnedExpression ? getExpressionTypeText(returnedExpression, tsModule, sourceFile) : "any";
 }
 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 valueBindings = /* @__PURE__ */ new Map();
+	const functionBindings = /* @__PURE__ */ new Map();
 	const visit = (node) => {
 		if (tsModule.isCallExpression(node)) {
 			const optionsObject = extractDefineOptionsObjectLiteral(node, tsModule);
@@ -344,12 +417,30 @@ function collectDefineOptionsTemplateBindings(code, tsModule, lang) {
 				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);
+					if (methodsObject && tsModule.isObjectLiteralExpression(methodsObject)) for (const entry of methodsObject.properties) {
+						if (!tsModule.isPropertyAssignment(entry) && !tsModule.isMethodDeclaration(entry) && !tsModule.isShorthandPropertyAssignment(entry)) continue;
+						const name = getPropertyNameText(entry.name, tsModule);
+						if (!name || !isIdentifierName(name)) continue;
+						setBindingType(functionBindings, name, tsModule.isPropertyAssignment(entry) && (tsModule.isArrowFunction(entry.initializer) || tsModule.isFunctionExpression(entry.initializer)) ? getFunctionSignatureTypeText(entry.initializer, sourceFile) : tsModule.isMethodDeclaration(entry) ? getFunctionSignatureTypeText(entry, sourceFile) : "(...args: any[]) => any");
+					}
 					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);
+					if (objectValue && tsModule.isObjectLiteralExpression(objectValue)) for (const entry of objectValue.properties) {
+						if (!tsModule.isPropertyAssignment(entry) && !tsModule.isMethodDeclaration(entry) && !tsModule.isShorthandPropertyAssignment(entry) && !tsModule.isGetAccessorDeclaration(entry)) continue;
+						const name = getPropertyNameText(entry.name, tsModule);
+						if (!name || !isIdentifierName(name)) continue;
+						let typeText = "any";
+						if (sectionName === "properties" && tsModule.isPropertyAssignment(entry)) typeText = getMiniProgramPropertyType(unwrapParenthesizedExpression(entry.initializer, tsModule), tsModule);
+						else if (sectionName === "computed") {
+							if (tsModule.isPropertyAssignment(entry)) {
+								const initializer = unwrapParenthesizedExpression(entry.initializer, tsModule);
+								if (tsModule.isArrowFunction(initializer) || tsModule.isFunctionExpression(initializer)) typeText = getFunctionLikeReturnTypeText(initializer, tsModule, sourceFile);
+							} else if (tsModule.isMethodDeclaration(entry) || tsModule.isGetAccessorDeclaration(entry)) typeText = getFunctionLikeReturnTypeText(entry, tsModule, sourceFile);
+						}
+						setBindingType(valueBindings, name, typeText);
+					}
 					continue;
 				}
 				if (sectionName === "data") {
@@ -357,9 +448,15 @@ function collectDefineOptionsTemplateBindings(code, tsModule, lang) {
 					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 (tsModule.isObjectLiteralExpression(initializer)) dataObject = initializer;
+						else if (tsModule.isArrowFunction(initializer) || tsModule.isFunctionExpression(initializer)) dataObject = findReturnedObjectLiteral(initializer.body, tsModule);
+					}
+					if (dataObject) for (const property of dataObject.properties) {
+						if (!tsModule.isPropertyAssignment(property) && !tsModule.isMethodDeclaration(property) && !tsModule.isShorthandPropertyAssignment(property) && !tsModule.isGetAccessorDeclaration(property)) continue;
+						const name = getPropertyNameText(property.name, tsModule);
+						if (!name || !isIdentifierName(name)) continue;
+						setBindingType(valueBindings, name, tsModule.isPropertyAssignment(property) ? getExpressionTypeText(property.initializer, tsModule, sourceFile) : "(...args: any[]) => any");
 					}
-					if (dataObject) for (const name of collectObjectLiteralKeys(dataObject, tsModule)) valueBindings.add(name);
 				}
 			}
 		}
@@ -375,13 +472,13 @@ 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) {
+	for (const [name, typeText] of bindings.values) {
 		if (topLevelBindings.has(name)) continue;
-		declarations.push(`const ${name}: any = null as any`);
+		declarations.push(`const ${name}: ${typeText} = null as any`);
 	}
-	for (const name of bindings.functions) {
+	for (const [name, typeText] of bindings.functions) {
 		if (topLevelBindings.has(name)) continue;
-		declarations.push(`const ${name}: (...args: any[]) => any = null as any`);
+		declarations.push(`const ${name}: ${typeText} = null as any`);
 	}
 	return declarations.join("\n");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-vite/volar",
-  "version": "2.0.8",
+  "version": "2.1.0",
   "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",