@farm.js/react 0.1.0-beta.10 → 0.1.0-beta.11

package/dist/vite.cjs

@@ -1133,6 +1133,18 @@ function rewriteKeyedArrayReorderHints(root, hintedStateIndices, statesBySetter,
     stateIndices
   };
 }
+function normalizeSafeKeyedFilterPredicate(predicate, safeGlobals) {
+  if (!core.types.isArrowFunctionExpression(predicate) || predicate.async || predicate.generator || predicate.params.length !== 1 || !core.types.isIdentifier(predicate.params[0]) || core.types.isBlockStatement(predicate.body) && predicate.body.directives.length > 0) {
+    return void 0;
+  }
+  const returned = returnedExpression(predicate);
+  if (!returned || validateDerivedExpression(returned, safeGlobals) !== void 0) {
+    return void 0;
+  }
+  const normalized = core.types.cloneNode(predicate, true);
+  normalized.body = core.types.cloneNode(returned, true);
+  return normalized;
+}
 function keyedArrayReorderPipeline(expression, parameterName, safeGlobals) {
   const outerSteps = [];
   let current = expression;
@@ -1147,10 +1159,8 @@ function keyedArrayReorderPipeline(expression, parameterName, safeGlobals) {
       outerSteps.push({ callback, kind: "map" });
     } else if (methodName === "filter") {
       if (current.arguments.length !== 1) return void 0;
-      const predicate = current.arguments[0];
-      if (!core.types.isArrowFunctionExpression(predicate) || predicate.async || predicate.generator || predicate.params.length !== 1 || !core.types.isIdentifier(predicate.params[0]) || !core.types.isExpression(predicate.body) || validateDerivedExpression(predicate.body, safeGlobals)) {
-        return void 0;
-      }
+      const predicate = normalizeSafeKeyedFilterPredicate(current.arguments[0], safeGlobals);
+      if (!predicate) return void 0;
       outerSteps.push({ kind: "filter", predicate });
     } else if (methodName === "slice") {
       if (current.arguments.length < 1 || current.arguments.length > 2) return void 0;
@@ -2388,10 +2398,11 @@ function rewriteKeyedArrayFilterHints(root, hintedStateIndices, statesBySetter,
       }) || !core.types.isIdentifier(updateExpression.callee.property, { name: "filter" })) {
         return;
       }
-      const predicate = updateExpression.arguments[0];
-      if (!core.types.isArrowFunctionExpression(predicate) || predicate.async || predicate.generator || predicate.params.length !== 1 || !core.types.isIdentifier(predicate.params[0]) || !core.types.isExpression(predicate.body) || validateDerivedExpression(predicate.body, safeGlobals)) {
-        return;
-      }
+      const predicate = normalizeSafeKeyedFilterPredicate(
+        updateExpression.arguments[0],
+        safeGlobals
+      );
+      if (!predicate) return;
       const previous = core.types.cloneNode(updater.params[0]);
       const filterMethod = path.scope.generateUidIdentifier("farmFilter");
       path.node.arguments[0] = core.types.arrowFunctionExpression(