From 6c327b0f3ed7be5c39f36730b9b1e885ced4561c Mon Sep 17 00:00:00 2001 From: Mofei Zhang Date: Thu, 9 Nov 2023 18:55:06 -0500 Subject: [PATCH] [repro] Repro for fbt preserve whitespace bug Current sprout output (if you remove the line in `SproutTodoFilter`): ``` Failures: FAIL: bug-fbt-preserve-whitespace Difference in forget and non-forget results. Expected result: { "kind": "ok", "value": "Before text hello world", "logs": [] } Found: { "kind": "ok", "value": "Before texthello world", "logs": [] } ``` `fbt` transforms run before jsx ones, so our lowering should also account for [fbt's whitespace rules](https://github.com/facebook/fbt/blob/main/packages/babel-plugin-fbt/src/fbt-nodes/FbtImplicitParamNode.js#L230-L233) in `BuildHIR:trimJsxText`. --- .../bug-fbt-preserve-whitespace.expect.md | 65 +++++++++++++++ .../compiler/bug-fbt-preserve-whitespace.tsx | 18 +++++ .../jsx-preserve-whitespace.expect.md | 80 +++++++++++++++++++ .../compiler/jsx-preserve-whitespace.tsx | 24 ++++++ .../packages/sprout/src/SproutTodoFilter.ts | 1 + 5 files changed, 188 insertions(+) create mode 100644 compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/bug-fbt-preserve-whitespace.expect.md create mode 100644 compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/bug-fbt-preserve-whitespace.tsx create mode 100644 compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/jsx-preserve-whitespace.expect.md create mode 100644 compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/jsx-preserve-whitespace.tsx diff --git a/compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/bug-fbt-preserve-whitespace.expect.md b/compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/bug-fbt-preserve-whitespace.expect.md new file mode 100644 index 0000000000..f36e869e75 --- /dev/null +++ b/compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/bug-fbt-preserve-whitespace.expect.md @@ -0,0 +1,65 @@ + +## Input + +```javascript +import fbt from "fbt"; +/** + * TODO: remove this from SproutTodoFilter when fixed. + */ + +function Component({ value }: { value: string }) { + return ( + + Before text + {value} + + ); +} + +export const FIXTURE_ENTRYPOINT = { + fn: Component, + params: [{ value: "hello world" }], +}; + +``` + +## Code + +```javascript +import { unstable_useMemoCache as useMemoCache } from "react"; +import fbt from "fbt"; +/** + * TODO: remove this from SproutTodoFilter when fixed. + */ + +function Component(t11) { + const $ = useMemoCache(2); + const { value } = t11; + let t0; + if ($[0] !== value) { + t0 = fbt._( + "Before text{paramName}", + [ + fbt._param( + "paramName", + + value + ), + ], + { hk: "3DIRxJ" } + ); + $[0] = value; + $[1] = t0; + } else { + t0 = $[1]; + } + return t0; +} + +export const FIXTURE_ENTRYPOINT = { + fn: Component, + params: [{ value: "hello world" }], +}; + +``` + \ No newline at end of file diff --git a/compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/bug-fbt-preserve-whitespace.tsx b/compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/bug-fbt-preserve-whitespace.tsx new file mode 100644 index 0000000000..79903b0462 --- /dev/null +++ b/compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/bug-fbt-preserve-whitespace.tsx @@ -0,0 +1,18 @@ +import fbt from "fbt"; +/** + * TODO: remove this from SproutTodoFilter when fixed. + */ + +function Component({ value }: { value: string }) { + return ( + + Before text + {value} + + ); +} + +export const FIXTURE_ENTRYPOINT = { + fn: Component, + params: [{ value: "hello world" }], +}; diff --git a/compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/jsx-preserve-whitespace.expect.md b/compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/jsx-preserve-whitespace.expect.md new file mode 100644 index 0000000000..5f6abdf37b --- /dev/null +++ b/compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/jsx-preserve-whitespace.expect.md @@ -0,0 +1,80 @@ + +## Input + +```javascript +import { StaticText1 } from "shared-runtime"; + +function Component() { + return ( +
+ Before text + + Middle text + + Inner before text + + Inner middle text + + Inner after text + + After text +
+ ); +} + +export const FIXTURE_ENTRYPOINT = { + fn: Component, + params: [], +}; + +``` + +## Code + +```javascript +import { unstable_useMemoCache as useMemoCache } from "react"; +import { StaticText1 } from "shared-runtime"; + +function Component() { + const $ = useMemoCache(3); + let t0; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t0 = ; + $[0] = t0; + } else { + t0 = $[0]; + } + let t1; + if ($[1] === Symbol.for("react.memo_cache_sentinel")) { + t1 = ; + $[1] = t1; + } else { + t1 = $[1]; + } + let t2; + if ($[2] === Symbol.for("react.memo_cache_sentinel")) { + t2 = ( +
+ Before text{t0}Middle text + + Inner before text{t1}Inner middle text + + Inner after text + + After text +
+ ); + $[2] = t2; + } else { + t2 = $[2]; + } + return t2; +} + +export const FIXTURE_ENTRYPOINT = { + fn: Component, + params: [], +}; + +``` + \ No newline at end of file diff --git a/compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/jsx-preserve-whitespace.tsx b/compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/jsx-preserve-whitespace.tsx new file mode 100644 index 0000000000..c825b669b7 --- /dev/null +++ b/compiler/packages/babel-plugin-react-forget/src/__tests__/fixtures/compiler/jsx-preserve-whitespace.tsx @@ -0,0 +1,24 @@ +import { StaticText1 } from "shared-runtime"; + +function Component() { + return ( +
+ Before text + + Middle text + + Inner before text + + Inner middle text + + Inner after text + + After text +
+ ); +} + +export const FIXTURE_ENTRYPOINT = { + fn: Component, + params: [], +}; diff --git a/compiler/packages/sprout/src/SproutTodoFilter.ts b/compiler/packages/sprout/src/SproutTodoFilter.ts index d9acb43bf2..8167c27ab1 100644 --- a/compiler/packages/sprout/src/SproutTodoFilter.ts +++ b/compiler/packages/sprout/src/SproutTodoFilter.ts @@ -469,6 +469,7 @@ const skipFilter = new Set([ // Bug in Forget output "todo-rename-source-variables", + "bug-fbt-preserve-whitespace", // Tested e2e in forget-feedback repo "userspace-use-memo-cache",