@wevu/compiler 6.16.25 → 6.16.27

package/dist/index.mjs

@@ -5743,6 +5743,9 @@ function buildCtxValueAccess(member) {
 function isValueMemberObject(node, parent) {
 	return t.isMemberExpression(parent) && parent.object === node && t.isIdentifier(parent.property, { name: "value" }) && !parent.computed;
 }
+function isCallTarget(node, parent) {
+	return (t.isCallExpression(parent) || t.isOptionalCallExpression(parent) || t.isNewExpression(parent)) && parent.callee === node;
+}
 function rewriteTopLevelRefLikeAccess(ast, context) {
 	traverse(ast, {
 		AssignmentExpression(path) {
@@ -5761,6 +5764,7 @@ function rewriteTopLevelRefLikeAccess(ast, context) {
 	traverse(ast, { MemberExpression(path) {
 		if (!isRefLikeCtxMember(path.node, context)) return;
 		if (isValueMemberObject(path.node, path.parentPath?.node)) return;
+		if (isCallTarget(path.node, path.parentPath?.node)) return;
 		path.replaceWith(buildCtxValueAccess(path.node));
 		path.skip();
 	} });
@@ -7116,7 +7120,7 @@ function transformSlotElement(node, context, transformNode) {
 	];
 	if (context.slotMultipleInstance) scopedAttrs.push(`${WEVU_SLOT_SCOPE_ATTR}="${renderMustache(WEVU_SLOT_SCOPE_KEY, context)}"`);
 	const scopedTag = `<${genericKey}${scopedAttrs.length ? ` ${scopedAttrs.join(" ")}` : ""} />`;
-	const projectedContent = hasScopeBindings ? scopedTag : `${scopedTag}${context.platform.wrapElse(slotTag)}`;
+	const projectedContent = hasScopeBindings ? `${slotTag}${scopedTag}` : `${scopedTag}${context.platform.wrapElse(slotTag)}`;
 	if (fallbackContent && slotPresentExp) return `${context.platform.wrapIf(slotPresentExp, projectedContent, (exp) => renderMustache(exp, context))}${context.platform.wrapElse(fallbackContent)}`;
 	return projectedContent;
 }
@@ -8731,7 +8735,15 @@ function resolveScriptSetupPropsDerivedKeys(bindings) {
 function collectScriptSetupReturnInfo(scriptCode) {
 	const keys = /* @__PURE__ */ new Set();
 	const propsObjectAliases = new Set(["__props"]);
+	const propsRefsAliases = /* @__PURE__ */ new Set();
 	const destructuredPropsKeys = /* @__PURE__ */ new Set();
+	const addObjectPatternKeys = (pattern) => {
+		for (const property of pattern.properties) {
+			if (!t.isObjectProperty(property)) continue;
+			if (t.isIdentifier(property.value)) destructuredPropsKeys.add(property.value.name);
+			else if (t.isAssignmentPattern(property.value) && t.isIdentifier(property.value.left)) destructuredPropsKeys.add(property.value.left.name);
+		}
+	};
 	try {
 		traverse(parseJsLike(scriptCode), {
 			VariableDeclarator(path) {
@@ -8740,12 +8752,20 @@ function collectScriptSetupReturnInfo(scriptCode) {
 					propsObjectAliases.add(path.node.id.name);
 					return;
 				}
-				if (!t.isObjectPattern(path.node.id) || !t.isIdentifier(init) || !propsObjectAliases.has(init.name)) return;
-				for (const property of path.node.id.properties) {
-					if (!t.isObjectProperty(property)) continue;
-					if (t.isIdentifier(property.value)) destructuredPropsKeys.add(property.value.name);
-					else if (t.isAssignmentPattern(property.value) && t.isIdentifier(property.value.left)) destructuredPropsKeys.add(property.value.left.name);
+				if (t.isIdentifier(path.node.id) && t.isCallExpression(init) && t.isIdentifier(init.callee, { name: "toRefs" }) && init.arguments.length === 1 && t.isIdentifier(init.arguments[0]) && propsObjectAliases.has(init.arguments[0].name)) {
+					propsRefsAliases.add(path.node.id.name);
+					return;
+				}
+				if (!t.isObjectPattern(path.node.id)) return;
+				if (t.isIdentifier(init) && propsObjectAliases.has(init.name)) {
+					addObjectPatternKeys(path.node.id);
+					return;
+				}
+				if (t.isIdentifier(init) && propsRefsAliases.has(init.name)) {
+					addObjectPatternKeys(path.node.id);
+					return;
 				}
+				if (t.isCallExpression(init) && t.isIdentifier(init.callee, { name: "toRefs" }) && init.arguments.length === 1 && t.isIdentifier(init.arguments[0]) && propsObjectAliases.has(init.arguments[0].name)) addObjectPatternKeys(path.node.id);
 			},
 			ObjectProperty(path) {
 				const objectPath = path.parentPath;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.16.25",
+  "version": "6.16.27",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -42,18 +42,18 @@
   ],
   "dependencies": {
     "@jridgewell/remapping": "^2.3.5",
-    "@vue/compiler-core": "^3.5.34",
-    "@vue/compiler-dom": "^3.5.34",
+    "@vue/compiler-core": "^3.5.35",
+    "@vue/compiler-dom": "^3.5.35",
     "comment-json": "^5.0.0",
     "lru-cache": "^11.5.0",
     "magic-string": "^0.30.21",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
-    "vue": "^3.5.34",
+    "vue": "^3.5.35",
     "@weapp-core/constants": "0.1.10",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.25",
-    "rolldown-require": "2.0.17"
+    "@weapp-vite/ast": "6.16.27",
+    "rolldown-require": "2.0.18"
   },
   "publishConfig": {
     "access": "public",