@wevu/compiler 6.6.7 → 6.6.8

package/dist/index.mjs

@@ -325,8 +325,57 @@ function templateLiteralToConcat(node) {
 	if (segments.length === 1) return segments[0];
 	return segments.reduce((acc, cur) => t.binaryExpression("+", acc, cur));
 }
+function isOptionalChainNode(node) {
+	return Boolean(node && (t.isOptionalMemberExpression(node) || t.isOptionalCallExpression(node)));
+}
+function collectOptionalChain(node) {
+	const operations = [];
+	let current = node;
+	while (isOptionalChainNode(current)) {
+		if (t.isOptionalMemberExpression(current)) {
+			operations.push({
+				type: "member",
+				optional: current.optional === true,
+				computed: current.computed,
+				property: t.cloneNode(current.property)
+			});
+			current = current.object;
+			continue;
+		}
+		operations.push({
+			type: "call",
+			optional: current.optional === true,
+			args: current.arguments.map((arg) => t.cloneNode(arg))
+		});
+		current = current.callee;
+	}
+	if (!t.isExpression(current)) return null;
+	return {
+		base: t.cloneNode(current),
+		operations: operations.reverse()
+	};
+}
+function applyOptionalChainOperation(base, operation) {
+	if (operation.type === "member") return t.memberExpression(base, t.cloneNode(operation.property), operation.computed);
+	return t.callExpression(base, operation.args.map((arg) => t.cloneNode(arg)));
+}
+function lowerOptionalChain(node) {
+	const chain = collectOptionalChain(node);
+	if (!chain) return t.cloneNode(node);
+	const segments = [chain.base];
+	for (const operation of chain.operations) {
+		const currentBase = t.cloneNode(segments[segments.length - 1]);
+		segments.push(applyOptionalChainOperation(currentBase, operation));
+	}
+	let lowered = t.cloneNode(segments[segments.length - 1]);
+	for (let index = chain.operations.length - 1; index >= 0; index--) {
+		if (!chain.operations[index].optional) continue;
+		lowered = t.conditionalExpression(t.binaryExpression("==", t.cloneNode(segments[index]), t.nullLiteral()), t.identifier("undefined"), lowered);
+	}
+	return lowered;
+}
 function normalizeWxmlExpression(exp) {
-	if (!exp.includes("`") && !exp.includes("??")) return exp;
+	if (!exp.includes("`") && !exp.includes("??") && !exp.includes("?.")) return exp;
 	try {
 		const ast = parse$2(`(${exp})`, {
 			sourceType: "module",
@@ -335,6 +384,16 @@ function normalizeWxmlExpression(exp) {
 		const stmt = ast.program.body[0];
 		if (!stmt || !("expression" in stmt)) return exp;
 		traverse(ast, {
+			OptionalMemberExpression: { exit(path) {
+				if (isOptionalChainNode(path.parentPath.node)) return;
+				path.replaceWith(lowerOptionalChain(path.node));
+				path.skip();
+			} },
+			OptionalCallExpression: { exit(path) {
+				if (isOptionalChainNode(path.parentPath.node)) return;
+				path.replaceWith(lowerOptionalChain(path.node));
+				path.skip();
+			} },
 			LogicalExpression(path) {
 				if (path.node.operator !== "??") return;
 				const left = path.node.left;
@@ -4606,6 +4665,23 @@ function createThisMemberAccess(prop) {
 function createUnrefCall(exp) {
 	return t.callExpression(t.identifier("__wevuUnref"), [exp]);
 }
+function createHasOwnPropertyCall(target, key) {
+	return t.callExpression(t.memberExpression(t.memberExpression(t.memberExpression(t.identifier("Object"), t.identifier("prototype")), t.identifier("hasOwnProperty")), t.identifier("call")), [target, t.stringLiteral(key)]);
+}
+function createIdentifierAccessWithPropsFallback(name) {
+	if (name === "props") {
+		const propsObject = createThisMemberAccess("__wevuProps");
+		return t.conditionalExpression(t.binaryExpression("!=", propsObject, t.nullLiteral()), propsObject, createThisMemberAccess("props"));
+	}
+	const thisAccess = createThisMemberAccess(name);
+	const propsAccess = createMemberAccess(createThisMemberAccess("__wevuProps"), name);
+	const propsObject = createThisMemberAccess("__wevuProps");
+	const hasPropsObject = t.binaryExpression("!=", propsObject, t.nullLiteral());
+	const hasDefinedPropsValue = t.binaryExpression("!==", propsAccess, t.identifier("undefined"));
+	const hasPropsKey = createHasOwnPropertyCall(propsObject, name);
+	const hasUsablePropsValue = t.logicalExpression("&&", hasPropsObject, t.logicalExpression("||", hasDefinedPropsValue, hasPropsKey));
+	return t.conditionalExpression(hasUsablePropsValue, propsAccess, thisAccess);
+}
 function normalizeJsExpressionWithContext(exp, context, options) {
 	const trimmed = exp.trim();
 	if (!trimmed) return null;
@@ -4631,7 +4707,7 @@ function normalizeJsExpressionWithContext(exp, context, options) {
 			replacement = createUnrefCall(prop ? createMemberAccess(base, prop) : base);
 		} else if (name === "__wvOwner" || name === "__wvSlotPropsData" || name === "__wvSlotProps" || name === "__wvSlotScope") replacement = createUnrefCall(createThisMemberAccess(name));
 		else replacement = createUnrefCall(createMemberAccess(createThisMemberAccess("__wvOwner"), name));
-		else replacement = createUnrefCall(createThisMemberAccess(name));
+		else replacement = createUnrefCall(createIdentifierAccessWithPropsFallback(name));
 		const parent = path.parentPath;
 		if (parent.isObjectProperty() && parent.node.shorthand && parent.node.key === path.node) {
 			parent.node.shorthand = false;

package/package.json

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