@unmagic/vms 0.1.1 → 0.1.4

package/dist/{cli-B7IxnuYZ.js → cli-ZmVRYzq_.js}

@@ -1739,6 +1739,9 @@ function buildProxyRefsItemAccess(vForInfoList, targetItemIndex, scriptScope, us
 		const propsVarName = scriptScope.propsVarName || "__vmsProps";
 		expr = t.identifier(propsVarName);
 		for (const prop of firstPartProps) expr = t.memberExpression(expr, t.identifier(prop));
+	} else if (firstProp && scriptScope && isImportVariable(firstProp, scriptScope)) {
+		expr = t.identifier(firstProp);
+		for (let i = 1; i < firstPartProps.length; i++) expr = t.memberExpression(expr, t.identifier(firstPartProps[i]));
 	} else {
 		expr = t.identifier("__vmsProxyRefs");
 		for (const prop of firstPartProps) expr = t.memberExpression(expr, t.identifier(prop));
@@ -1784,6 +1787,7 @@ function buildProxyRefsArgument(arg, vForInfoList, vForItemNames, arrowFunctionA
 			const propsVarName = scriptScope.propsVarName || "__vmsProps";
 			return t.memberExpression(t.identifier(propsVarName), t.identifier(arg.name));
 		}
+		if (scriptScope && isImportVariable(arg.name, scriptScope)) return arg;
 		return t.memberExpression(t.identifier("__vmsProxyRefs"), t.identifier(arg.name));
 	}
 	if (t.isOptionalMemberExpression(arg)) {
@@ -2171,9 +2175,10 @@ function getTemplateNodeProp(node, prop, returnValue, counter, wxsExpressionStat
 * 2. babelParse(code) — 重新解析为完整 AST
 *
 * 注意：isAsync 必须正确传递，否则 babel 无法解析 await 关键字。
+* 注意：不能使用 compact: true，否则多语句的 { } 会被移除导致解析错误
 */
 function reparseBodyAsAST(body, isAsync) {
-	const code = generate(t.arrowFunctionExpression([], body, isAsync), { compact: true }).code;
+	const code = generate(t.arrowFunctionExpression([], body, isAsync)).code;
 	return parse$1(code, {
 		sourceType: "module",
 		plugins: ["typescript"]
@@ -2252,6 +2257,11 @@ function processASTExpression(ast, counter, callExpressionWithArgs, excludeBindi
 	if (t.isCallExpression(ast)) return processCallableExpression(ast.callee, ast.arguments, counter, callExpressionWithArgs, excludeBindingVars, vForItemName, vForInfoList, ctx, returnValue);
 	else if (t.isMemberExpression(ast)) return processCallableExpression(ast, null, counter, callExpressionWithArgs, excludeBindingVars, vForItemName, vForInfoList, ctx, returnValue);
 	else if (t.isArrowFunctionExpression(ast)) return processArrowFunctionExpression(ast, counter, callExpressionWithArgs, excludeBindingVars, vForItemName, node, returnValue, ctx);
+	else if (t.isAssignmentExpression(ast)) return processInlineArrowFunction(t.blockStatement([t.expressionStatement(ast)]), [], counter, callExpressionWithArgs, excludeBindingVars, node, returnValue, ctx, false);
+	else if (t.isSequenceExpression(ast)) {
+		const statements = ast.expressions.map((expr) => t.expressionStatement(expr));
+		return processInlineArrowFunction(t.blockStatement(statements), [], counter, callExpressionWithArgs, excludeBindingVars, node, returnValue, ctx, false);
+	} else if (t.isLogicalExpression(ast) || t.isConditionalExpression(ast)) return createShortExprHandler(ast, [], callExpressionWithArgs, vForInfoList, getVForVariables(ctx, node), ctx, counter, returnValue, false);
 	return "";
 }
 /**
@@ -2343,6 +2353,10 @@ function collectExternalVarsFromExpression(body, arrowFunctionArgumentNames, vFo
 			collectVarsFromNode(node.left);
 			collectVarsFromNode(node.right);
 		} else if (t.isUnaryExpression(node)) collectVarsFromNode(node.argument);
+		else if (t.isAssignmentExpression(node)) {
+			collectVarsFromNode(node.left);
+			collectVarsFromNode(node.right);
+		}
 	};
 	if (t.isConditionalExpression(body)) {
 		collectVarsFromNode(body.test);
@@ -2375,6 +2389,14 @@ function rewriteExpressionVars(expr, varsToCollect, arrowFunctionArgumentNames,
 		else if (t.isLogicalExpression(node)) return t.logicalExpression(node.operator, processExpr(node.left), processExpr(node.right));
 		else if (t.isBinaryExpression(node)) return t.binaryExpression(node.operator, processExpr(node.left), processExpr(node.right));
 		else if (t.isUnaryExpression(node)) return t.unaryExpression(node.operator, processExpr(node.argument));
+		else if (t.isAssignmentExpression(node)) {
+			const left = node.left;
+			if (t.isIdentifier(left) || t.isMemberExpression(left)) {
+				const rewritten = processExpr(left);
+				if (t.isIdentifier(rewritten) || t.isMemberExpression(rewritten)) return t.assignmentExpression(node.operator, rewritten, processExpr(node.right));
+			}
+			return t.assignmentExpression(node.operator, left, processExpr(node.right));
+		}
 		return node;
 	};
 	return processExpr(expr);
@@ -2497,7 +2519,7 @@ function processInlineArrowFunction(body, arrowFunctionArguments, counter, callE
 	if (usedVars.size > 0 || vForItemUsage?.shouldCreateReference) ctx.needsProxyRefs = true;
 	const functionIndex = counter.functionPropertyCounter - 1;
 	const dataKey = vForInfoList && vForInfoList.length > 0 ? getFunctionIndexChar(functionIndex) : "";
-	const functionBody = createInlineHandlerBody(body, arrowFunctionArguments, usedVars, vForInfoList, vForItemUsage, isAsync, dataKey);
+	const functionBody = createInlineHandlerBody(body, arrowFunctionArguments, usedVars, vForInfoList, vForItemUsage, isAsync, dataKey, ctx.scriptScope);
 	const dataArgsAst = vForInfoList && vForInfoList.length > 0 ? vForInfoList.map((info) => {
 		const indexName = getVForIndexName(info) || "index";
 		return t.identifier(indexName);
@@ -2635,7 +2657,7 @@ function analyzeVForItemUsage(body, vForInfoList, isAsync = false) {
 /**
 * 创建内联处理函数的函数体
 */
-function createInlineHandlerBody(body, arrowFunctionArguments, externalVars, vForInfoList, vForItemUsage, isAsync = false, dataKey = "a") {
+function createInlineHandlerBody(body, arrowFunctionArguments, externalVars, vForInfoList, vForItemUsage, isAsync = false, dataKey = "a", scriptScope) {
 	const statements = [];
 	const paramNameMapping = /* @__PURE__ */ new Map();
 	if (arrowFunctionArguments.length > 0) {
@@ -2648,9 +2670,9 @@ function createInlineHandlerBody(body, arrowFunctionArguments, externalVars, vFo
 	if (vForInfoList && vForInfoList.length > 0) {
 		const indexVars = vForInfoList.map((info) => getVForIndexName(info) || "index").map((idx) => t.identifier(idx));
 		statements.push(t.variableDeclaration("const", [t.variableDeclarator(t.objectPattern([t.objectProperty(t.identifier(dataKey), t.arrayPattern(indexVars), false, false)]), t.memberExpression(t.memberExpression(t.identifier(EVENT_PARAM_NAME), t.identifier("currentTarget")), t.identifier("dataset")))]));
-		if (vForItemUsage?.shouldCreateReference) statements.push(createLocalReference(vForInfoList, vForItemUsage));
+		if (vForItemUsage?.shouldCreateReference) statements.push(createLocalReference(vForInfoList, vForItemUsage, scriptScope));
 	}
-	const transformedBody = replaceVariableAccess(t.cloneNode(body, true), externalVars, vForInfoList, vForItemUsage, paramNameMapping, isAsync);
+	const transformedBody = replaceVariableAccess(t.cloneNode(body, true), externalVars, vForInfoList, vForItemUsage, paramNameMapping, isAsync, scriptScope);
 	statements.push(...transformedBody.body);
 	return t.blockStatement(statements);
 }
@@ -2660,15 +2682,15 @@ function createInlineHandlerBody(body, arrowFunctionArguments, externalVars, vFo
 * 因为 createInlineHandlerBody 中外层 item 会被 replaceVariableAccess 替换，
 * 而不会先声明为局部变量
 */
-function createLocalReference(vForInfoList, vForItemUsage) {
+function createLocalReference(vForInfoList, vForItemUsage, scriptScope) {
 	const itemName = vForItemUsage.itemName;
-	const accessExpression = buildProxyRefsItemAccess(vForInfoList, vForInfoList.findIndex((info) => getVForItemName(info) === itemName), void 0, true);
+	const accessExpression = buildProxyRefsItemAccess(vForInfoList, vForInfoList.findIndex((info) => getVForItemName(info) === itemName), scriptScope, true);
 	return t.variableDeclaration("const", [t.variableDeclarator(t.identifier(itemName), accessExpression)]);
 }
 /**
 * 替换变量访问
 */
-function replaceVariableAccess(body, externalVars, vForInfoList, vForItemUsage, paramNameMapping, isAsync = false) {
+function replaceVariableAccess(body, externalVars, vForInfoList, vForItemUsage, paramNameMapping, isAsync = false, scriptScope) {
 	const localVars = /* @__PURE__ */ new Set();
 	const ast = reparseBodyAsAST(body, isAsync);
 	traverse(ast, { ...createLocalVarCollector(localVars) });
@@ -2697,7 +2719,7 @@ function replaceVariableAccess(body, externalVars, vForInfoList, vForItemUsage,
 			}
 			if (isVForItem) if (itemIndex === vForInfoList.length - 1 && vForItemUsage?.shouldCreateReference) return;
 			else {
-				const accessExpression = buildProxyRefsItemAccess(vForInfoList, itemIndex);
+				const accessExpression = buildProxyRefsItemAccess(vForInfoList, itemIndex, scriptScope);
 				path.replaceWith(accessExpression);
 				return;
 			}

package/dist/index.js

@@ -2,7 +2,7 @@ import dotenv from "dotenv-flow";
 //#region src/index.ts
 async function runVMS(options) {
 	dotenv.config({ node_env: options.mode });
-	const { dev, prod } = await import("./cli-B7IxnuYZ.js");
+	const { dev, prod } = await import("./cli-ZmVRYzq_.js");
 	if (options.mode === "production") return prod(options);
 	else return dev();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unmagic/vms",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "description": "基于 @unmagic/vue-mini 的Vue3 单文件组件构建工具",
   "type": "module",
   "main": "dist/index.js",