-
Notifications
You must be signed in to change notification settings - Fork 46.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[compiler] Outline jsx with duplicate attributes (#31441)
Previously, we would skip outlining jsx expressions that had duplicate jsx attributes as we would not rename them causing incorrect compilation. In this PR, we add outlining support for duplicate jsx attributes by renaming them.
- Loading branch information
Showing
9 changed files
with
675 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
166 changes: 166 additions & 0 deletions
166
...iler/src/__tests__/fixtures/compiler/jsx-outlining-dup-key-diff-value.expect.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
|
||
## Input | ||
|
||
```javascript | ||
// @enableJsxOutlining | ||
function Component({arr}) { | ||
const x = useX(); | ||
return ( | ||
<> | ||
{arr.map((i, id) => { | ||
return ( | ||
<Bar key={id} x={x}> | ||
<Baz i={i + 'i'}></Baz> | ||
<Foo k={i + 'j'}></Foo> | ||
</Bar> | ||
); | ||
})} | ||
</> | ||
); | ||
} | ||
function Bar({x, children}) { | ||
return ( | ||
<> | ||
{x} | ||
{children} | ||
</> | ||
); | ||
} | ||
|
||
function Baz({i}) { | ||
return i; | ||
} | ||
|
||
function Foo({k}) { | ||
return k; | ||
} | ||
|
||
function useX() { | ||
return 'x'; | ||
} | ||
|
||
export const FIXTURE_ENTRYPOINT = { | ||
fn: Component, | ||
params: [{arr: ['foo', 'bar']}], | ||
}; | ||
|
||
``` | ||
|
||
## Code | ||
|
||
```javascript | ||
import { c as _c } from "react/compiler-runtime"; // @enableJsxOutlining | ||
function Component(t0) { | ||
const $ = _c(7); | ||
const { arr } = t0; | ||
const x = useX(); | ||
let t1; | ||
if ($[0] !== arr || $[1] !== x) { | ||
let t2; | ||
if ($[3] !== x) { | ||
t2 = (i, id) => { | ||
const T0 = _temp; | ||
return <T0 i={i + "i"} k={i + "j"} key={id} x={x} />; | ||
}; | ||
$[3] = x; | ||
$[4] = t2; | ||
} else { | ||
t2 = $[4]; | ||
} | ||
t1 = arr.map(t2); | ||
$[0] = arr; | ||
$[1] = x; | ||
$[2] = t1; | ||
} else { | ||
t1 = $[2]; | ||
} | ||
let t2; | ||
if ($[5] !== t1) { | ||
t2 = <>{t1}</>; | ||
$[5] = t1; | ||
$[6] = t2; | ||
} else { | ||
t2 = $[6]; | ||
} | ||
return t2; | ||
} | ||
function _temp(t0) { | ||
const $ = _c(8); | ||
const { i: i, k: k, x: x } = t0; | ||
let t1; | ||
if ($[0] !== i) { | ||
t1 = <Baz i={i} />; | ||
$[0] = i; | ||
$[1] = t1; | ||
} else { | ||
t1 = $[1]; | ||
} | ||
let t2; | ||
if ($[2] !== k) { | ||
t2 = <Foo k={k} />; | ||
$[2] = k; | ||
$[3] = t2; | ||
} else { | ||
t2 = $[3]; | ||
} | ||
let t3; | ||
if ($[4] !== t1 || $[5] !== t2 || $[6] !== x) { | ||
t3 = ( | ||
<Bar x={x}> | ||
{t1} | ||
{t2} | ||
</Bar> | ||
); | ||
$[4] = t1; | ||
$[5] = t2; | ||
$[6] = x; | ||
$[7] = t3; | ||
} else { | ||
t3 = $[7]; | ||
} | ||
return t3; | ||
} | ||
|
||
function Bar(t0) { | ||
const $ = _c(3); | ||
const { x, children } = t0; | ||
let t1; | ||
if ($[0] !== children || $[1] !== x) { | ||
t1 = ( | ||
<> | ||
{x} | ||
{children} | ||
</> | ||
); | ||
$[0] = children; | ||
$[1] = x; | ||
$[2] = t1; | ||
} else { | ||
t1 = $[2]; | ||
} | ||
return t1; | ||
} | ||
|
||
function Baz(t0) { | ||
const { i } = t0; | ||
return i; | ||
} | ||
|
||
function Foo(t0) { | ||
const { k } = t0; | ||
return k; | ||
} | ||
|
||
function useX() { | ||
return "x"; | ||
} | ||
|
||
export const FIXTURE_ENTRYPOINT = { | ||
fn: Component, | ||
params: [{ arr: ["foo", "bar"] }], | ||
}; | ||
|
||
``` | ||
### Eval output | ||
(kind: ok) xfooifoojxbaribarj |
41 changes: 41 additions & 0 deletions
41
...plugin-react-compiler/src/__tests__/fixtures/compiler/jsx-outlining-dup-key-diff-value.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
// @enableJsxOutlining | ||
function Component({arr}) { | ||
const x = useX(); | ||
return ( | ||
<> | ||
{arr.map((i, id) => { | ||
return ( | ||
<Bar key={id} x={x}> | ||
<Baz i={i + 'i'}></Baz> | ||
<Foo k={i + 'j'}></Foo> | ||
</Bar> | ||
); | ||
})} | ||
</> | ||
); | ||
} | ||
function Bar({x, children}) { | ||
return ( | ||
<> | ||
{x} | ||
{children} | ||
</> | ||
); | ||
} | ||
|
||
function Baz({i}) { | ||
return i; | ||
} | ||
|
||
function Foo({k}) { | ||
return k; | ||
} | ||
|
||
function useX() { | ||
return 'x'; | ||
} | ||
|
||
export const FIXTURE_ENTRYPOINT = { | ||
fn: Component, | ||
params: [{arr: ['foo', 'bar']}], | ||
}; |
Oops, something went wrong.