Unverified Commit 25aa8693 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Rewrite action transform in SWC (#47049)

This is almost a rewrite of the transform to simply some logic. For a `"use server"` file we now simply annotate every exported identifier and will later do runtime checks. This is because that we can't statically know the source of exported values.

This rewrite also makes it possible to annotate anonymous arrow functions.

Thanks to @kdy1 for some of the suggestions here.

Closes NEXT-708, closes NEXT-421.
parent 5cf42196
/* __next_internal_action_entry_do_not_use__ */ export function foo() {} /* __next_internal_action_entry_do_not_use__ foo */ export function foo() {}
\ No newline at end of file foo.$$typeof = Symbol.for("react.server.reference");
foo.$$id = "ab21efdafbe611287bc25c0462b1e0510d13e48b";
foo.$$bound = [];
/* __next_internal_action_entry_do_not_use__ */ 'use strict'; /* __next_internal_action_entry_do_not_use__ bar */ 'use strict';
export function bar() {} export function bar() {}
bar.$$typeof = Symbol.for("react.server.reference");
bar.$$id = "ac840dcaf5e8197cb02b7f3a43c119b7a770b272";
bar.$$bound = [];
/* __next_internal_action_entry_do_not_use__ */ export const x = 1; /* __next_internal_action_entry_do_not_use__ x */ export const x = 1;
\ No newline at end of file x.$$typeof = Symbol.for("react.server.reference");
x.$$id = "b78c261f135a7a852508c2920bd7228020ff4bd7";
x.$$bound = [];
/* __next_internal_action_entry_do_not_use__ $$ACTION_1 */ const foo = $$ACTION_0 = ()=>$$ACTION_1($$ACTION_0.$$bound);
$$ACTION_0.$$typeof = Symbol.for("react.server.reference");
$$ACTION_0.$$id = "188d5d945750dc32e2c842b93c75a65763d4a922";
$$ACTION_0.$$bound = [];
export const $$ACTION_1 = (closure)=>{};
var $$ACTION_0;
x Server actions must be async functions
,-[input.js:1:1]
1 | ,-> const foo = () => {
2 | | 'use server'
3 | `-> }
`----
/* __next_internal_action_entry_do_not_use__ $ACTION_deleteItem */ import deleteFromDb from 'db' /* __next_internal_action_entry_do_not_use__ $$ACTION_0 */ import deleteFromDb from 'db';
export function Item({ id1 , id2 }) { export function Item({ id1 , id2 }) {
async function deleteItem() { async function deleteItem() {
return $ACTION_deleteItem(deleteItem.$$bound); return $$ACTION_0(deleteItem.$$bound);
} }
deleteItem.$$typeof = Symbol.for("react.server.reference"); deleteItem.$$typeof = Symbol.for("react.server.reference");
deleteItem.$$id = "de52fdc8536c533b05b2e525bd43b18cf019cbb3"; deleteItem.$$id = "6d53ce510b2e36499b8f56038817b9bad86cabb4";
deleteItem.$$bound = [ deleteItem.$$bound = [
id1, id1,
id2 id2
]; ];
return <Button action={deleteItem}>Delete</Button>; return <Button action={deleteItem}>Delete</Button>;
} }
export async function $ACTION_deleteItem(closure) { export async function $$ACTION_0(closure) {
await deleteFromDb(closure[0]); await deleteFromDb(closure[0]);
await deleteFromDb(closure[1]); await deleteFromDb(closure[1]);
} }
\ No newline at end of file
/* __next_internal_action_entry_do_not_use__ default */ export default async function $ACTION_default_0() {} /* __next_internal_action_entry_do_not_use__ default */ export default async function $$ACTION_0() {}
$ACTION_default_0.$$typeof = Symbol.for("react.server.reference"); $$ACTION_0.$$typeof = Symbol.for("react.server.reference");
$ACTION_default_0.$$id = "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d"; $$ACTION_0.$$id = "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d";
$ACTION_default_0.$$bound = []; $$ACTION_0.$$bound = [];
\ No newline at end of file
/* __next_internal_action_entry_do_not_use__ default */ async function foo() {} /* __next_internal_action_entry_do_not_use__ default */ async function foo() {}
export default foo;
foo.$$typeof = Symbol.for("react.server.reference"); foo.$$typeof = Symbol.for("react.server.reference");
foo.$$id = "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d"; foo.$$id = "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d";
foo.$$bound = []; foo.$$bound = [];
export default foo;
\ No newline at end of file
/* __next_internal_action_entry_do_not_use__ default,$ACTION_fn_1 */ const foo = async function $ACTION_fn_0() {}; /* __next_internal_action_entry_do_not_use__ default,bar */ const foo = async function() {};
$ACTION_fn_0.$$typeof = Symbol.for("react.server.reference");
$ACTION_fn_0.$$id = "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d";
$ACTION_fn_0.$$bound = [];
export default foo; export default foo;
const bar = async function $ACTION_fn_1() {}; const bar = async function() {};
$ACTION_fn_1.$$typeof = Symbol.for("react.server.reference");
$ACTION_fn_1.$$id = "5bde18329eb1c98fc2d6dea0a22639861a18ce65";
$ACTION_fn_1.$$bound = [];
export { bar }; export { bar };
foo.$$typeof = Symbol.for("react.server.reference");
foo.$$id = "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d";
foo.$$bound = [];
bar.$$typeof = Symbol.for("react.server.reference");
bar.$$id = "ac840dcaf5e8197cb02b7f3a43c119b7a770b272";
bar.$$bound = [];
/* __next_internal_action_entry_do_not_use__ default */ export default $ACTION_default_0 = async (a, b)=>{ /* __next_internal_action_entry_do_not_use__ default */ export default $$ACTION_0 = async (a, b)=>{
console.log(a, b); console.log(a, b);
}; };
$ACTION_default_0.$$typeof = Symbol.for("react.server.reference"); var $$ACTION_0;
$ACTION_default_0.$$id = "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d"; $$ACTION_0.$$typeof = Symbol.for("react.server.reference");
$ACTION_default_0.$$bound = []; $$ACTION_0.$$id = "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d";
var $ACTION_default_0; $$ACTION_0.$$bound = [];
\ No newline at end of file
import deleteFromDb from 'db'
const v1 = 'v1';
export function Item({ id1, id2 }) {
const v2 = id2;
const deleteItem = async () => {
"use server";
await deleteFromDb(id1);
await deleteFromDb(v1);
await deleteFromDb(v2);
}
return <Button action={deleteItem}>Delete</Button>;
}
/* __next_internal_action_entry_do_not_use__ $$ACTION_1 */ import deleteFromDb from 'db';
const v1 = 'v1';
export function Item({ id1 , id2 }) {
const v2 = id2;
const deleteItem = $$ACTION_0 = async ()=>$$ACTION_1($$ACTION_0.$$bound);
$$ACTION_0.$$typeof = Symbol.for("react.server.reference");
$$ACTION_0.$$id = "188d5d945750dc32e2c842b93c75a65763d4a922";
$$ACTION_0.$$bound = [
id1,
v2
];
return <Button action={deleteItem}>Delete</Button>;
}
export const $$ACTION_1 = async (closure)=>{
await deleteFromDb(closure[0]);
await deleteFromDb(v1);
await deleteFromDb(closure[1]);
};
var $$ACTION_0;
\ No newline at end of file
'use server'
export const foo = async () => {}
const bar = async () => {}
export { bar }
/* __next_internal_action_entry_do_not_use__ foo,bar */ export const foo = async ()=>{};
const bar = async ()=>{};
export { bar };
foo.$$typeof = Symbol.for("react.server.reference");
foo.$$id = "ab21efdafbe611287bc25c0462b1e0510d13e48b";
foo.$$bound = [];
bar.$$typeof = Symbol.for("react.server.reference");
bar.$$id = "ac840dcaf5e8197cb02b7f3a43c119b7a770b272";
bar.$$bound = [];
\ No newline at end of file
import deleteFromDb from 'db'
const v1 = 'v1';
export function Item({ id1, id2 }) {
const v2 = id2;
// TODO: Fix the inline function cases.
return <>
<Button action={async () => {
"use server";
await deleteFromDb(id1);
await deleteFromDb(v1);
await deleteFromDb(v2);
}}>Delete</Button>
<Button action={async function () {
"use server";
await deleteFromDb(id1);
await deleteFromDb(v1);
await deleteFromDb(v2);
}}>Delete</Button>
</>
}
/* __next_internal_action_entry_do_not_use__ $$ACTION_1,$$ACTION_3 */ import deleteFromDb from 'db';
const v1 = 'v1';
export function Item({ id1 , id2 }) {
const v2 = id2;
// TODO: Fix the inline function cases.
return <>
<Button action={$$ACTION_0 = async ()=>$$ACTION_1($$ACTION_0.$$bound)}>Delete</Button>
<Button action={async function $$ACTION_2() {
return $$ACTION_3($$ACTION_2.$$bound);
}}>Delete</Button>
</>;
$$ACTION_0.$$typeof = Symbol.for("react.server.reference");
$$ACTION_0.$$id = "188d5d945750dc32e2c842b93c75a65763d4a922";
$$ACTION_0.$$bound = [
id1,
v2
];
$$ACTION_2.$$typeof = Symbol.for("react.server.reference");
$$ACTION_2.$$id = "56a859f462d35a297c46a1bbd1e6a9058c104ab8";
$$ACTION_2.$$bound = [
id1,
v2
];
}
export const $$ACTION_1 = async (closure)=>{
await deleteFromDb(closure[0]);
await deleteFromDb(v1);
await deleteFromDb(closure[1]);
};
var $$ACTION_0;
export async function $$ACTION_3(closure) {
await deleteFromDb(closure[0]);
await deleteFromDb(v1);
await deleteFromDb(closure[1]);
}
/* __next_internal_action_entry_do_not_use__ $ACTION_myAction */ async function myAction(a, b, c) { /* __next_internal_action_entry_do_not_use__ $$ACTION_0 */ async function myAction(a, b, c) {
console.log('a'); console.log('a');
} }
myAction.$$typeof = Symbol.for("react.server.reference"); myAction.$$typeof = Symbol.for("react.server.reference");
myAction.$$id = "c67fa6a80e65945a14b1fac181d282d79bba49b7"; myAction.$$id = "6d53ce510b2e36499b8f56038817b9bad86cabb4";
myAction.$$bound = []; myAction.$$bound = [];
export const $ACTION_myAction = myAction; export const $$ACTION_0 = myAction;
export default function Page() { export default function Page() {
return <Button action={myAction}>Delete</Button>; return <Button action={myAction}>Delete</Button>;
} }
/* __next_internal_action_entry_do_not_use__ a,b,c,$ACTION_e */ export async function a() {} /* __next_internal_action_entry_do_not_use__ a,b,c */ export async function a() {}
export async function b() {}
export async function c() {}
function d() {}
function Foo() {
async function e() {}
}
a.$$typeof = Symbol.for("react.server.reference"); a.$$typeof = Symbol.for("react.server.reference");
a.$$id = "6e7bc104e4d6e7fda190c4a51be969cfd0be6d6d"; a.$$id = "6e7bc104e4d6e7fda190c4a51be969cfd0be6d6d";
a.$$bound = []; a.$$bound = [];
export async function b() {}
b.$$typeof = Symbol.for("react.server.reference"); b.$$typeof = Symbol.for("react.server.reference");
b.$$id = "d1f7eb64271d7c601dfef7d4d7053de1c2ca4338"; b.$$id = "d1f7eb64271d7c601dfef7d4d7053de1c2ca4338";
b.$$bound = []; b.$$bound = [];
export async function c() {}
c.$$typeof = Symbol.for("react.server.reference"); c.$$typeof = Symbol.for("react.server.reference");
c.$$id = "1ab723c80dcca470e0410b4b2a2fc2bf21f41476"; c.$$id = "1ab723c80dcca470e0410b4b2a2fc2bf21f41476";
c.$$bound = []; c.$$bound = [];
function d() {}
function Foo() {
async function e() {
return $ACTION_e(e.$$bound);
}
e.$$typeof = Symbol.for("react.server.reference");
e.$$id = "b6c8c6754aefb804cf95f444931ba7e955c0701d";
e.$$bound = [];
}
export async function $ACTION_e(closure) {}
\ No newline at end of file
/* __next_internal_action_entry_do_not_use__ $ACTION_deleteItem */ import deleteFromDb from 'db'; /* __next_internal_action_entry_do_not_use__ $$ACTION_0 */ import deleteFromDb from 'db';
const v1 = 'v1'; const v1 = 'v1';
export function Item({ id1 , id2 }) { export function Item({ id1 , id2 }) {
const v2 = id2; const v2 = id2;
async function deleteItem() { async function deleteItem() {
return $ACTION_deleteItem(deleteItem.$$bound); return $$ACTION_0(deleteItem.$$bound);
} }
deleteItem.$$typeof = Symbol.for("react.server.reference"); deleteItem.$$typeof = Symbol.for("react.server.reference");
deleteItem.$$id = "de52fdc8536c533b05b2e525bd43b18cf019cbb3"; deleteItem.$$id = "6d53ce510b2e36499b8f56038817b9bad86cabb4";
deleteItem.$$bound = [ deleteItem.$$bound = [
id1, id1,
v2 v2
]; ];
return <Button action={deleteItem}>Delete</Button>; return <Button action={deleteItem}>Delete</Button>;
} }
export async function $ACTION_deleteItem(closure) { export async function $$ACTION_0(closure) {
await deleteFromDb(closure[0]); await deleteFromDb(closure[0]);
await deleteFromDb(v1); await deleteFromDb(v1);
await deleteFromDb(closure[1]); await deleteFromDb(closure[1]);
......
/* __next_internal_action_entry_do_not_use__ $ACTION_action */ import f, { f1, f2 } from 'foo'; /* __next_internal_action_entry_do_not_use__ $$ACTION_0 */ import f, { f1, f2 } from 'foo';
const f3 = 1; const f3 = 1;
var f4; var f4;
let f5; let f5;
...@@ -18,12 +18,11 @@ export function y(p, [p1, { p2 }], ...p3) { ...@@ -18,12 +18,11 @@ export function y(p, [p1, { p2 }], ...p3) {
const f8 = 1; const f8 = 1;
} }
async function action() { async function action() {
return $ACTION_action(action.$$bound); return $$ACTION_0(action.$$bound);
} }
action.$$typeof = Symbol.for("react.server.reference"); action.$$typeof = Symbol.for("react.server.reference");
action.$$id = "b3d2707f04906fa37fdc7bee4f53e41053034751"; action.$$id = "6d53ce510b2e36499b8f56038817b9bad86cabb4";
action.$$bound = [ action.$$bound = [
f2,
f2, f2,
f11, f11,
p, p,
...@@ -33,11 +32,11 @@ export function y(p, [p1, { p2 }], ...p3) { ...@@ -33,11 +32,11 @@ export function y(p, [p1, { p2 }], ...p3) {
]; ];
return <Button action={action}>Delete</Button>; return <Button action={action}>Delete</Button>;
} }
export async function $ACTION_action(closure) { export async function $$ACTION_0(closure) {
const f17 = 1; const f17 = 1;
if (true) { if (true) {
const f18 = 1; const f18 = 1;
const f19 = 1; const f19 = 1;
} }
console.log(f, f1, closure[0], f3, f4, f5, f6, f7, f8, closure[0](f9), f12, closure[2], f16.x, f17, f18, closure[3], closure[4], closure[5], closure[6], g19, g20, globalThis); console.log(f, f1, closure[0], f3, f4, f5, f6, f7, f8, closure[0](f9), f12, closure[1], f16.x, f17, f18, closure[2], closure[3], closure[4], closure[5], g19, g20, globalThis);
} }
/* __next_internal_action_entry_do_not_use__ $ACTION_deleteItem */ import deleteFromDb from 'db'; /* __next_internal_action_entry_do_not_use__ $$ACTION_0 */ import deleteFromDb from 'db';
export function Item(product, foo, bar) { export function Item(product, foo, bar) {
async function deleteItem() { async function deleteItem() {
return $ACTION_deleteItem(deleteItem.$$bound); return $$ACTION_0(deleteItem.$$bound);
} }
deleteItem.$$typeof = Symbol.for("react.server.reference"); deleteItem.$$typeof = Symbol.for("react.server.reference");
deleteItem.$$id = "de52fdc8536c533b05b2e525bd43b18cf019cbb3"; deleteItem.$$id = "6d53ce510b2e36499b8f56038817b9bad86cabb4";
deleteItem.$$bound = [ deleteItem.$$bound = [
product.id, product.id,
product?.foo, product?.foo,
...@@ -15,6 +15,6 @@ export function Item(product, foo, bar) { ...@@ -15,6 +15,6 @@ export function Item(product, foo, bar) {
]; ];
return <Button action={deleteItem}>Delete</Button>; return <Button action={deleteItem}>Delete</Button>;
} }
export async function $ACTION_deleteItem(closure) { export async function $$ACTION_0(closure) {
await deleteFromDb(closure[3].id, closure[3]?.foo, closure[3].bar.baz, closure[3][closure[4], closure[5]]); await deleteFromDb(closure[3].id, closure[3]?.foo, closure[3].bar.baz, closure[3][closure[4], closure[5]]);
} }
\ No newline at end of file
/* __next_internal_action_entry_do_not_use__ $ACTION_myAction */ async function myAction(a, b, c) { /* __next_internal_action_entry_do_not_use__ $$ACTION_0 */ async function myAction(a, b, c) {
// comment // comment
"use strict"; "use strict";
console.log('a'); console.log('a');
} }
myAction.$$typeof = Symbol.for("react.server.reference"); myAction.$$typeof = Symbol.for("react.server.reference");
myAction.$$id = "c67fa6a80e65945a14b1fac181d282d79bba49b7"; myAction.$$id = "6d53ce510b2e36499b8f56038817b9bad86cabb4";
myAction.$$bound = []; myAction.$$bound = [];
export const $ACTION_myAction = myAction; export const $$ACTION_0 = myAction;
export default function Page() { export default function Page() {
return <Button action={myAction}>Delete</Button>; return <Button action={myAction}>Delete</Button>;
} }
\ No newline at end of file
// app/send.ts // app/send.ts
/* __next_internal_action_entry_do_not_use__ foo,bar,qux */ async function foo() {} /* __next_internal_action_entry_do_not_use__ foo,baz,default */ async function foo() {}
export { foo };
async function bar() {}
export { bar as baz };
async function qux() {}
export { qux as default };
foo.$$typeof = Symbol.for("react.server.reference"); foo.$$typeof = Symbol.for("react.server.reference");
foo.$$id = "ab21efdafbe611287bc25c0462b1e0510d13e48b"; foo.$$id = "ab21efdafbe611287bc25c0462b1e0510d13e48b";
foo.$$bound = []; foo.$$bound = [];
export { foo };
async function bar() {}
bar.$$typeof = Symbol.for("react.server.reference"); bar.$$typeof = Symbol.for("react.server.reference");
bar.$$id = "ac840dcaf5e8197cb02b7f3a43c119b7a770b272"; bar.$$id = "050e3854b72b19e3c7e3966a67535543a90bf7e0";
bar.$$bound = []; bar.$$bound = [];
export { bar as baz };
async function qux() {}
qux.$$typeof = Symbol.for("react.server.reference"); qux.$$typeof = Symbol.for("react.server.reference");
qux.$$id = "3c8ed39a99caf636869d076cc7cae786a4053164"; qux.$$id = "c18c215a6b7cdc64bf709f3a714ffdef1bf9651d";
qux.$$bound = []; qux.$$bound = [];
export { qux as default };
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment