[compiler] Support method-call version of macro functions

compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Pipeline.ts

@@ -248,7 +248,7 @@ function* runWithEnvironment(
   memoizeFbtOperandsInSameScope(hir);
   yield log({
     kind: "hir",
-    name: "MemoizeFbtOperandsInSameScope",
+    name: "MemoizeFbtAndMacroOperandsInSameScope",
     value: hir,
   });
 

compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/MemoizeFbtAndMacroOperandsInSameScope.ts

@@ -15,7 +15,6 @@ import {
 import { eachReactiveValueOperand } from "./visitors";
 
 /**
- * This pass supports the
  * This pass supports the `fbt` translation system (https://facebook.github.io/fbt/)
  * as well as similar user-configurable macro-like APIs where it's important that
  * the name of the function not be changed, and it's literal arguments not be turned
@@ -75,7 +74,7 @@ function visit(
     for (const instruction of block.instructions) {
       const { lvalue, value } = instruction;
       if (lvalue === null) {
-        return;
+        continue;
       }
       if (
         value.kind === "Primitive" &&
@@ -96,7 +95,7 @@ function visit(
       } else if (isFbtCallExpression(fbtValues, value)) {
         const fbtScope = lvalue.identifier.scope;
         if (fbtScope === null) {
-          return;
+          continue;
         }
 
         /*
@@ -121,7 +120,7 @@ function visit(
       ) {
         const fbtScope = lvalue.identifier.scope;
         if (fbtScope === null) {
-          return;
+          continue;
         }
 
         /*

compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/meta-isms/repro-cx-namespace-assigned-to-temporary.expect.md

@@ -0,0 +1,100 @@
+
+## Input
+
+```javascript
+// @compilationMode(infer) @enableAssumeHooksFollowRulesOfReact:false @customMacros(cx)
+import { identity } from "shared-runtime";
+
+const DARK = "dark";
+
+function Component() {
+  const theme = useTheme();
+  return (
+    <div
+      className={cx.foo({
+        "styles/light": true,
+        "styles/dark": identity([theme.getTheme()]),
+      })}
+    />
+  );
+}
+
+function cx(obj) {
+  const classes = [];
+  for (const [key, value] of Object.entries(obj)) {
+    if (value) {
+      classes.push(key);
+    }
+  }
+  return classes.join(" ");
+}
+
+function useTheme() {
+  return {
+    getTheme() {
+      return DARK;
+    },
+  };
+}
+
+export const FIXTURE_ENTRYPOINT = {
+  fn: Component,
+  params: [{}],
+};
+
+```
+
+## Code
+
+```javascript
+import { c as _c } from "react/compiler-runtime"; // @compilationMode(infer) @enableAssumeHooksFollowRulesOfReact:false @customMacros(cx)
+import { identity } from "shared-runtime";
+
+const DARK = "dark";
+
+function Component() {
+  const $ = _c(2);
+  const theme = useTheme();
+
+  const t0 = cx.foo({
+    "styles/light": true,
+    "styles/dark": identity([theme.getTheme()]),
+  });
+  let t1;
+  if ($[0] !== t0) {
+    t1 = <div className={t0} />;
+    $[0] = t0;
+    $[1] = t1;
+  } else {
+    t1 = $[1];
+  }
+  return t1;
+}
+
+function cx(obj) {
+  const classes = [];
+  for (const [key, value] of Object.entries(obj)) {
+    if (value) {
+      classes.push(key);
+    }
+  }
+  return classes.join(" ");
+}
+
+function useTheme() {
+  return {
+    getTheme() {
+      return DARK;
+    },
+  };
+}
+
+export const FIXTURE_ENTRYPOINT = {
+  fn: Component,
+  params: [{}],
+};
+
+```
+
+### Eval output
+(kind: exception) cx.foo is not a function

compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/meta-isms/repro-cx-namespace-assigned-to-temporary.js

@@ -0,0 +1,39 @@
+// @compilationMode(infer) @enableAssumeHooksFollowRulesOfReact:false @customMacros(cx)
+import { identity } from "shared-runtime";
+
+const DARK = "dark";
+
+function Component() {
+  const theme = useTheme();
+  return (
+    <div
+      className={cx.foo({
+        "styles/light": true,
+        "styles/dark": identity([theme.getTheme()]),
+      })}
+    />
+  );
+}
+
+function cx(obj) {
+  const classes = [];
+  for (const [key, value] of Object.entries(obj)) {
+    if (value) {
+      classes.push(key);
+    }
+  }
+  return classes.join(" ");
+}
+
+function useTheme() {
+  return {
+    getTheme() {
+      return DARK;
+    },
+  };
+}
+
+export const FIXTURE_ENTRYPOINT = {
+  fn: Component,
+  params: [{}],
+};

compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/meta-isms/repro-cx-namespace-nesting.expect.md

@@ -0,0 +1,68 @@
+
+## Input
+
+```javascript
+import { makeArray } from "shared-runtime";
+
+function Component() {
+  const items = makeArray("foo", "bar", "", null, "baz", false, "merp");
+  const classname = cx.namespace(...items.filter(isNonEmptyString));
+  return <div className={classname}>Ok</div>;
+}
+
+function isNonEmptyString(s) {
+  return typeof s === "string" && s.trim().length !== 0;
+}
+
+const cx = {
+  namespace(...items) {
+    return items.join(" ");
+  },
+};
+
+export const FIXTURE_ENTRYPOINT = {
+  fn: Component,
+  params: [{}],
+};
+
+```
+
+## Code
+
+```javascript
+import { c as _c } from "react/compiler-runtime";
+import { makeArray } from "shared-runtime";
+
+function Component() {
+  const $ = _c(1);
+  let t0;
+  if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+    const items = makeArray("foo", "bar", "", null, "baz", false, "merp");
+    const classname = cx.namespace(...items.filter(isNonEmptyString));
+    t0 = <div className={classname}>Ok</div>;
+    $[0] = t0;
+  } else {
+    t0 = $[0];
+  }
+  return t0;
+}
+
+function isNonEmptyString(s) {
+  return typeof s === "string" && s.trim().length !== 0;
+}
+
+const cx = {
+  namespace(...items) {
+    return items.join(" ");
+  },
+};
+
+export const FIXTURE_ENTRYPOINT = {
+  fn: Component,
+  params: [{}],
+};
+
+```
+
+### Eval output
+(kind: ok) <div class="foo bar baz merp">Ok</div>

compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/meta-isms/repro-cx-namespace-nesting.js

@@ -0,0 +1,22 @@
+import { makeArray } from "shared-runtime";
+
+function Component() {
+  const items = makeArray("foo", "bar", "", null, "baz", false, "merp");
+  const classname = cx.namespace(...items.filter(isNonEmptyString));
+  return <div className={classname}>Ok</div>;
+}
+
+function isNonEmptyString(s) {
+  return typeof s === "string" && s.trim().length !== 0;
+}
+
+const cx = {
+  namespace(...items) {
+    return items.join(" ");
+  },
+};
+
+export const FIXTURE_ENTRYPOINT = {
+  fn: Component,
+  params: [{}],
+};