@wevu/compiler 6.6.5 → 6.6.7

package/dist/index.d.mts

@@ -192,6 +192,20 @@ interface ScopedSlotComponentAsset {
   classStyleWxs?: boolean;
   inlineExpressions?: InlineExpressionAsset[];
 }
+/**
+ * 内联表达式资源描述。
+ */
+interface InlineExpressionIndexBindingAsset {
+  key: string;
+  binding: string;
+}
+/**
+ * 内联表达式作用域恢复器描述。
+ */
+interface InlineExpressionScopeResolverAsset {
+  key: string;
+  expression: string;
+}
 /**
  * 内联表达式资源描述。
  */
@@ -199,6 +213,8 @@ interface InlineExpressionAsset {
   id: string;
   expression: string;
   scopeKeys: string[];
+  indexBindings?: InlineExpressionIndexBindingAsset[];
+  scopeResolvers?: InlineExpressionScopeResolverAsset[];
 }
 /**
  * 模板编译结果。

package/dist/index.mjs

@@ -2576,7 +2576,21 @@ function buildInlineMapExpression(inlineExpressions) {
 			t.identifier("scope"),
 			t.identifier("$event")
 		], exprAst);
-		const entryObj = t.objectExpression([t.objectProperty(t.identifier("keys"), keysExpr), t.objectProperty(t.identifier("fn"), fnExpr)]);
+		const entryObjProps = [t.objectProperty(t.identifier("keys"), keysExpr), t.objectProperty(t.identifier("fn"), fnExpr)];
+		if (entry.indexBindings?.length) {
+			const indexKeysExpr = t.arrayExpression(entry.indexBindings.map((binding) => t.stringLiteral(binding.key)));
+			entryObjProps.push(t.objectProperty(t.identifier("indexKeys"), indexKeysExpr));
+		}
+		if (entry.scopeResolvers?.length) {
+			const resolverMap = new Map(entry.scopeResolvers.map((item) => [item.key, item.expression]));
+			const resolverExpr = t.arrayExpression(entry.scopeKeys.map((key) => {
+				const source = resolverMap.get(key);
+				if (!source) return t.identifier("undefined");
+				return parseBabelExpression(source) ?? t.identifier("undefined");
+			}));
+			entryObjProps.push(t.objectProperty(t.identifier("scopeResolvers"), resolverExpr));
+		}
+		const entryObj = t.objectExpression(entryObjProps);
 		return t.objectProperty(t.stringLiteral(entry.id), entryObj);
 	});
 	return t.objectExpression(entries);
@@ -4397,6 +4411,7 @@ const INLINE_GLOBALS = new Set([
 	"require",
 	"arguments",
 	"__weapp_vite",
+	"__wevuUnref",
 	"globalThis",
 	"setTimeout",
 	"clearTimeout",
@@ -4413,8 +4428,10 @@ const INLINE_GLOBALS = new Set([
 	"ctx",
 	"scope"
 ]);
+const IDENTIFIER_RE = /^[A-Z_$][\w$]*$/i;
+const SIMPLE_PATH_RE = /^[A-Z_$][\w$]*(?:\.[A-Z_$][\w$]*)*$/i;
 function createMemberAccess$1(target, prop) {
-	if (/^[A-Z_$][\w$]*$/i.test(prop)) return t.memberExpression(t.identifier(target), t.identifier(prop));
+	if (IDENTIFIER_RE.test(prop)) return t.memberExpression(t.identifier(target), t.identifier(prop));
 	return t.memberExpression(t.identifier(target), t.stringLiteral(prop), true);
 }
 function resolveSlotPropBinding(slotProps, name) {
@@ -4423,29 +4440,16 @@ function resolveSlotPropBinding(slotProps, name) {
 	if (!prop) return "__wvSlotPropsData";
 	return generateExpression(createMemberAccess$1("__wvSlotPropsData", prop));
 }
-function registerInlineExpression(exp, context) {
-	const parsed = parseBabelExpressionFile(exp);
-	if (!parsed) return null;
-	const { ast, expression } = parsed;
-	const locals = collectScopedSlotLocals(context);
-	const slotProps = collectSlotPropMapping(context);
-	for (const name of Object.keys(slotProps)) locals.add(name);
-	const usedLocals = [];
-	const usedLocalSet = /* @__PURE__ */ new Set();
-	const markLocal = (name) => {
-		if (usedLocalSet.has(name)) return;
-		usedLocalSet.add(name);
-		usedLocals.push(name);
-	};
+function rewriteExpressionAst(ast, locals, options) {
 	traverse(ast, {
 		Identifier(path) {
 			if (!path.isReferencedIdentifier()) return;
 			const name = path.node.name;
 			if (name === "$event") return;
 			if (name === "ctx" || name === "scope") return;
-			if (path.scope.hasBinding(name)) return;
+			if (path.scope.getBinding(name)) return;
 			if (locals.has(name)) {
-				markLocal(name);
+				options?.markLocal?.(name);
 				path.replaceWith(createMemberAccess$1("scope", name));
 				return;
 			}
@@ -4456,19 +4460,85 @@ function registerInlineExpression(exp, context) {
 			path.replaceWith(t.identifier("ctx"));
 		}
 	});
-	const updatedExpression = generateExpression(expression);
+}
+function buildInlineIndexBindings(context) {
+	if (!context.forStack.length) return [];
+	return context.forStack.map((forInfo, level) => ({
+		key: `__wv_i${level}`,
+		binding: forInfo.index?.trim() || "index"
+	}));
+}
+function buildForItemResolverExpression(targetKey, context, slotProps, indexBindings) {
+	let targetLevel = -1;
+	for (let level = context.forStack.length - 1; level >= 0; level -= 1) if (context.forStack[level]?.item === targetKey) {
+		targetLevel = level;
+		break;
+	}
+	if (targetLevel < 0) return null;
+	const listExp = context.forStack[targetLevel]?.listExp?.trim() ?? "";
+	const indexBinding = indexBindings[targetLevel];
+	if (!listExp || !indexBinding || !SIMPLE_PATH_RE.test(listExp)) return null;
+	const root = listExp.split(".")[0];
+	const localRoots = new Set(Object.keys(slotProps));
+	for (let level = 0; level <= targetLevel; level += 1) {
+		const item = context.forStack[level]?.item?.trim();
+		const index = context.forStack[level]?.index?.trim();
+		if (item) localRoots.add(item);
+		if (index) localRoots.add(index);
+		localRoots.add("index");
+	}
+	if (localRoots.has(root)) return null;
+	return `({type:'for-item',path:${JSON.stringify(listExp)},indexKey:${JSON.stringify(indexBinding.key)}})`;
+}
+function buildScopeResolvers(usedLocals, context, slotProps, indexBindings) {
+	const resolvers = [];
+	for (const key of usedLocals) {
+		const expression = buildForItemResolverExpression(key, context, slotProps, indexBindings);
+		if (!expression) continue;
+		resolvers.push({
+			key,
+			expression
+		});
+	}
+	return resolvers;
+}
+function registerInlineExpression(exp, context) {
+	const parsed = parseBabelExpressionFile(exp);
+	if (!parsed) return null;
+	const { ast } = parsed;
+	const locals = collectScopedSlotLocals(context);
+	const slotProps = collectSlotPropMapping(context);
+	for (const name of Object.keys(slotProps)) locals.add(name);
+	const usedLocals = [];
+	const usedLocalSet = /* @__PURE__ */ new Set();
+	const markLocal = (name) => {
+		if (usedLocalSet.has(name)) return;
+		usedLocalSet.add(name);
+		usedLocals.push(name);
+	};
+	rewriteExpressionAst(ast, locals, { markLocal });
+	const updatedStmt = ast.program.body[0];
+	const updatedExpressionNode = updatedStmt && "expression" in updatedStmt ? updatedStmt.expression : null;
+	const updatedExpression = updatedExpressionNode ? generateExpression(updatedExpressionNode) : exp;
 	const scopeBindings = usedLocals.map((name) => {
 		return resolveSlotPropBinding(slotProps, name) ?? name;
 	});
+	const indexBindings = buildInlineIndexBindings(context);
+	const scopeResolvers = buildScopeResolvers(usedLocals, context, slotProps, indexBindings);
 	const asset = {
 		id: `__wv_inline_${context.inlineExpressionSeed++}`,
 		expression: updatedExpression,
 		scopeKeys: usedLocals
 	};
+	if (scopeResolvers.length) {
+		asset.indexBindings = indexBindings;
+		asset.scopeResolvers = scopeResolvers;
+	}
 	context.inlineExpressions.push(asset);
 	return {
 		id: asset.id,
-		scopeBindings
+		scopeBindings,
+		indexBindings: scopeResolvers.length ? indexBindings.map((binding) => binding.binding) : []
 	};
 }
 
@@ -4891,6 +4961,11 @@ function buildInlineScopeAttrs(scopeBindings, context) {
 		return `data-wv-s${index}="${renderMustache(binding.replace(/"/g, "&quot;"), context)}"`;
 	});
 }
+function buildInlineIndexAttrs(indexBindings, context) {
+	return indexBindings.map((binding, index) => {
+		return `data-wv-i${index}="${renderMustache(binding.replace(/"/g, "&quot;"), context)}"`;
+	});
+}
 function resolveEventPrefix(modifiers) {
 	const hasCatch = modifiers.some((modifier) => modifier.content === "catch");
 	const hasStop = modifiers.some((modifier) => modifier.content === "stop");
@@ -4916,9 +4991,11 @@ function transformOnDirective(node, context) {
 	if (context.rewriteScopedSlot) {
 		if (inlineExpression) {
 			const scopeAttrs = buildInlineScopeAttrs(inlineExpression.scopeBindings, context);
+			const indexAttrs = buildInlineIndexAttrs(inlineExpression.indexBindings, context);
 			return [
 				`data-wv-inline-id="${inlineExpression.id}"`,
 				...scopeAttrs,
+				...indexAttrs,
 				`${bindAttr}="__weapp_vite_owner"`
 			].filter(Boolean).join(" ");
 		}
@@ -4931,9 +5008,11 @@ function transformOnDirective(node, context) {
 	const expValue = normalizeWxmlExpressionWithContext(rawExpValue, context);
 	if (inlineExpression) {
 		const scopeAttrs = buildInlineScopeAttrs(inlineExpression.scopeBindings, context);
+		const indexAttrs = buildInlineIndexAttrs(inlineExpression.indexBindings, context);
 		return [
 			`data-wv-inline-id="${inlineExpression.id}"`,
 			...scopeAttrs,
+			...indexAttrs,
 			`${bindAttr}="__weapp_vite_inline"`
 		].filter(Boolean).join(" ");
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.6.5",
+  "version": "6.6.7",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",