babel-plugin-essor 0.0.16-beta.6 → 0.0.16-beta.8

package/dist/index.cjs

@@ -22443,17 +22443,18 @@ function buildForIR(expression, ctx) {
   if (indexParam && !core.types.isIdentifier(indexParam) && !core.types.isPattern(indexParam)) {
     return null;
   }
-  const bodyPath = getForCallbackBodyPath(
+  const callbackBody = getForCallbackBody(
     callback
   );
-  if (!bodyPath) return null;
-  const key = extractKeyExpression(bodyPath);
+  if (!callbackBody) return null;
+  const key = extractKeyExpression(callbackBody.path);
   return {
     type: 4 /* FOR */,
     each: callee.node.object,
     itemParam,
     indexParam: indexParam != null ? indexParam : null,
-    body: buildIR(bodyPath, ctx),
+    bodyPrelude: callbackBody.prelude,
+    body: buildIR(callbackBody.path, ctx),
     key,
     loc: expression.node.loc
   };
@@ -22464,32 +22465,53 @@ function extractKeyExpression(path2) {
     if (!attrPath.isJSXAttribute()) continue;
     if (!core.types.isJSXIdentifier(attrPath.node.name, { name: "key" })) continue;
     const value = attrPath.node.value;
-    attrPath.remove();
-    if (!value) return core.types.booleanLiteral(true);
-    if (core.types.isStringLiteral(value)) return core.types.stringLiteral(value.value);
-    if (core.types.isJSXExpressionContainer(value) && !core.types.isJSXEmptyExpression(value.expression)) {
-      return value.expression;
+    if (!value) {
+      attrPath.remove();
+      return core.types.booleanLiteral(true);
+    }
+    if (core.types.isStringLiteral(value)) {
+      attrPath.remove();
+      return core.types.stringLiteral(value.value);
+    }
+    const valuePath = attrPath.get("value");
+    if (!Array.isArray(valuePath) && valuePath.isJSXExpressionContainer()) {
+      const expressionPath = valuePath.get("expression");
+      attrPath.remove();
+      if (expressionPath.isJSXEmptyExpression()) return null;
+      return expressionPath.node;
     }
+    attrPath.remove();
     return null;
   }
   return null;
 }
-function getForCallbackBodyPath(callback) {
+function getForCallbackBody(callback) {
   const bodyPath = callback.get("body");
   if (Array.isArray(bodyPath)) return null;
   if (bodyPath.isJSXElement() || bodyPath.isJSXFragment()) {
-    return bodyPath;
+    return {
+      path: bodyPath,
+      prelude: []
+    };
   }
   if (!bodyPath.isBlockStatement()) {
     return null;
   }
+  const prelude = [];
   for (const statement of bodyPath.get("body")) {
-    if (!statement.isReturnStatement()) continue;
+    if (!statement.isReturnStatement()) {
+      prelude.push(core.types.cloneNode(statement.node, true));
+      continue;
+    }
     const argument = statement.get("argument");
-    if (Array.isArray(argument) || !argument.node) continue;
+    if (Array.isArray(argument) || !argument.node) {
+      prelude.push(core.types.cloneNode(statement.node, true));
+      continue;
+    }
     if (argument.isJSXElement() || argument.isJSXFragment()) {
-      return argument;
+      return { path: argument, prelude };
     }
+    prelude.push(core.types.cloneNode(statement.node, true));
   }
   return null;
 }
@@ -22628,6 +22650,7 @@ function buildComponentPropsExpression(node, options) {
 function buildForProps(node, bodyExpr) {
   const childrenParams = [core.types.cloneNode(node.itemParam, true)];
   if (node.indexParam) childrenParams.push(core.types.cloneNode(node.indexParam, true));
+  const childrenBody = buildForCallbackBody(node, bodyExpr);
   const props = [
     core.types.objectMethod(
       "get",
@@ -22637,20 +22660,30 @@ function buildForProps(node, bodyExpr) {
       false,
       false
     ),
-    core.types.objectProperty(core.types.identifier("children"), core.types.arrowFunctionExpression(childrenParams, bodyExpr))
+    core.types.objectProperty(
+      core.types.identifier("children"),
+      core.types.arrowFunctionExpression(childrenParams, childrenBody)
+    )
   ];
   if (node.key) {
     const keyParams = [core.types.cloneNode(node.itemParam, true)];
     if (node.indexParam) keyParams.push(core.types.cloneNode(node.indexParam, true));
+    const keyBody = buildForCallbackBody(node, core.types.cloneNode(node.key, true));
     props.push(
       core.types.objectProperty(
         core.types.identifier("key"),
-        core.types.arrowFunctionExpression(keyParams, core.types.cloneNode(node.key, true))
+        core.types.arrowFunctionExpression(keyParams, keyBody)
       )
     );
   }
   return core.types.objectExpression(props);
 }
+function buildForCallbackBody(node, returnValue) {
+  return node.bodyPrelude.length ? core.types.blockStatement([
+    ...node.bodyPrelude.map((statement) => core.types.cloneNode(statement, true)),
+    core.types.returnStatement(returnValue)
+  ]) : returnValue;
+}
 function buildForCall(node, bodyExpr) {
   return core.types.callExpression(useImport("createComponent"), [
     useImport("For"),

package/dist/index.js

@@ -22436,17 +22436,18 @@ function buildForIR(expression, ctx) {
   if (indexParam && !types.isIdentifier(indexParam) && !types.isPattern(indexParam)) {
     return null;
   }
-  const bodyPath = getForCallbackBodyPath(
+  const callbackBody = getForCallbackBody(
     callback
   );
-  if (!bodyPath) return null;
-  const key = extractKeyExpression(bodyPath);
+  if (!callbackBody) return null;
+  const key = extractKeyExpression(callbackBody.path);
   return {
     type: 4 /* FOR */,
     each: callee.node.object,
     itemParam,
     indexParam: indexParam != null ? indexParam : null,
-    body: buildIR(bodyPath, ctx),
+    bodyPrelude: callbackBody.prelude,
+    body: buildIR(callbackBody.path, ctx),
     key,
     loc: expression.node.loc
   };
@@ -22457,32 +22458,53 @@ function extractKeyExpression(path3) {
     if (!attrPath.isJSXAttribute()) continue;
     if (!types.isJSXIdentifier(attrPath.node.name, { name: "key" })) continue;
     const value = attrPath.node.value;
-    attrPath.remove();
-    if (!value) return types.booleanLiteral(true);
-    if (types.isStringLiteral(value)) return types.stringLiteral(value.value);
-    if (types.isJSXExpressionContainer(value) && !types.isJSXEmptyExpression(value.expression)) {
-      return value.expression;
+    if (!value) {
+      attrPath.remove();
+      return types.booleanLiteral(true);
+    }
+    if (types.isStringLiteral(value)) {
+      attrPath.remove();
+      return types.stringLiteral(value.value);
+    }
+    const valuePath = attrPath.get("value");
+    if (!Array.isArray(valuePath) && valuePath.isJSXExpressionContainer()) {
+      const expressionPath = valuePath.get("expression");
+      attrPath.remove();
+      if (expressionPath.isJSXEmptyExpression()) return null;
+      return expressionPath.node;
     }
+    attrPath.remove();
     return null;
   }
   return null;
 }
-function getForCallbackBodyPath(callback) {
+function getForCallbackBody(callback) {
   const bodyPath = callback.get("body");
   if (Array.isArray(bodyPath)) return null;
   if (bodyPath.isJSXElement() || bodyPath.isJSXFragment()) {
-    return bodyPath;
+    return {
+      path: bodyPath,
+      prelude: []
+    };
   }
   if (!bodyPath.isBlockStatement()) {
     return null;
   }
+  const prelude = [];
   for (const statement of bodyPath.get("body")) {
-    if (!statement.isReturnStatement()) continue;
+    if (!statement.isReturnStatement()) {
+      prelude.push(types.cloneNode(statement.node, true));
+      continue;
+    }
     const argument = statement.get("argument");
-    if (Array.isArray(argument) || !argument.node) continue;
+    if (Array.isArray(argument) || !argument.node) {
+      prelude.push(types.cloneNode(statement.node, true));
+      continue;
+    }
     if (argument.isJSXElement() || argument.isJSXFragment()) {
-      return argument;
+      return { path: argument, prelude };
     }
+    prelude.push(types.cloneNode(statement.node, true));
   }
   return null;
 }
@@ -22621,6 +22643,7 @@ function buildComponentPropsExpression(node, options) {
 function buildForProps(node, bodyExpr) {
   const childrenParams = [types.cloneNode(node.itemParam, true)];
   if (node.indexParam) childrenParams.push(types.cloneNode(node.indexParam, true));
+  const childrenBody = buildForCallbackBody(node, bodyExpr);
   const props = [
     types.objectMethod(
       "get",
@@ -22630,20 +22653,30 @@ function buildForProps(node, bodyExpr) {
       false,
       false
     ),
-    types.objectProperty(types.identifier("children"), types.arrowFunctionExpression(childrenParams, bodyExpr))
+    types.objectProperty(
+      types.identifier("children"),
+      types.arrowFunctionExpression(childrenParams, childrenBody)
+    )
   ];
   if (node.key) {
     const keyParams = [types.cloneNode(node.itemParam, true)];
     if (node.indexParam) keyParams.push(types.cloneNode(node.indexParam, true));
+    const keyBody = buildForCallbackBody(node, types.cloneNode(node.key, true));
     props.push(
       types.objectProperty(
         types.identifier("key"),
-        types.arrowFunctionExpression(keyParams, types.cloneNode(node.key, true))
+        types.arrowFunctionExpression(keyParams, keyBody)
       )
     );
   }
   return types.objectExpression(props);
 }
+function buildForCallbackBody(node, returnValue) {
+  return node.bodyPrelude.length ? types.blockStatement([
+    ...node.bodyPrelude.map((statement) => types.cloneNode(statement, true)),
+    types.returnStatement(returnValue)
+  ]) : returnValue;
+}
 function buildForCall(node, bodyExpr) {
   return types.callExpression(useImport("createComponent"), [
     useImport("For"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-essor",
-  "version": "0.0.16-beta.6",
+  "version": "0.0.16-beta.8",
   "description": "",
   "type": "module",
   "keywords": [],
@@ -33,7 +33,7 @@
   "sideEffects": false,
   "dependencies": {
     "@babel/core": "^7.29.0",
-    "@estjs/shared": "0.0.16-beta.6"
+    "@estjs/shared": "0.0.16-beta.8"
   },
   "devDependencies": {
     "@babel/types": "^7.29.0",