Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
2988be2a
Unverified
Commit
2988be2a
authored
Feb 25, 2023
by
Shu Ding
Committed by
GitHub
Feb 25, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update server reference syntax and tests (#46389)
parent
b942a6f4
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
32 additions
and
13 deletions
+32
-13
server_actions.rs
packages/next-swc/crates/core/src/server_actions.rs
+14
-3
output.js
...t-swc/crates/core/tests/errors/server-actions/1/output.js
+1
-0
output.js
...t-swc/crates/core/tests/errors/server-actions/2/output.js
+1
-0
output.js
...-swc/crates/core/tests/fixture/server-actions/1/output.js
+2
-2
output.js
...-swc/crates/core/tests/fixture/server-actions/2/output.js
+1
-0
output.js
...-swc/crates/core/tests/fixture/server-actions/3/output.js
+1
-0
output.js
...-swc/crates/core/tests/fixture/server-actions/4/output.js
+5
-2
output.js
...-swc/crates/core/tests/fixture/server-actions/5/output.js
+2
-2
output.js
...-swc/crates/core/tests/fixture/server-actions/6/output.js
+2
-2
output.js
...-swc/crates/core/tests/fixture/server-actions/7/output.js
+2
-2
output.js
...-swc/crates/core/tests/fixture/server-actions/8/output.js
+1
-0
No files found.
packages/next-swc/crates/core/src/server_actions.rs
View file @
2988be2a
...
@@ -166,6 +166,17 @@ impl<C: Comments> VisitMut for ServerActions<C> {
...
@@ -166,6 +166,17 @@ impl<C: Comments> VisitMut for ServerActions<C> {
.push
(
annotate
(
&
f
.ident
,
"$$name"
,
action_name
.into
()));
.push
(
annotate
(
&
f
.ident
,
"$$name"
,
action_name
.into
()));
if
self
.top_level
{
if
self
.top_level
{
// myAction.$$bound = [];
self
.annotations
.push
(
annotate
(
&
f
.ident
,
"$$bound"
,
ArrayLit
{
span
:
DUMMY_SP
,
elems
:
Vec
::
new
(),
}
.into
(),
));
if
!
(
self
.in_action_file
&&
self
.in_export_decl
)
{
if
!
(
self
.in_action_file
&&
self
.in_export_decl
)
{
// export const $ACTION_myAction = myAction;
// export const $ACTION_myAction = myAction;
self
.extra_items
self
.extra_items
...
@@ -197,10 +208,10 @@ impl<C: Comments> VisitMut for ServerActions<C> {
...
@@ -197,10 +208,10 @@ impl<C: Comments> VisitMut for ServerActions<C> {
used_ids
:
&
ids_from_closure
,
used_ids
:
&
ids_from_closure
,
});
});
// myAction.$$
closure
= [id1, id2]
// myAction.$$
bound
= [id1, id2]
self
.annotations
.push
(
annotate
(
self
.annotations
.push
(
annotate
(
&
f
.ident
,
&
f
.ident
,
"$$
closure
"
,
"$$
bound
"
,
ArrayLit
{
ArrayLit
{
span
:
DUMMY_SP
,
span
:
DUMMY_SP
,
elems
:
ids_from_closure
elems
:
ids_from_closure
...
@@ -218,7 +229,7 @@ impl<C: Comments> VisitMut for ServerActions<C> {
...
@@ -218,7 +229,7 @@ impl<C: Comments> VisitMut for ServerActions<C> {
args
:
vec!
[
f
args
:
vec!
[
f
.ident
.ident
.clone
()
.clone
()
.make_member
(
quote_ident!
(
"$$
closure
"
))
.make_member
(
quote_ident!
(
"$$
bound
"
))
.as_arg
()],
.as_arg
()],
type_args
:
Default
::
default
(),
type_args
:
Default
::
default
(),
};
};
...
...
packages/next-swc/crates/core/tests/errors/server-actions/1/output.js
View file @
2988be2a
...
@@ -2,3 +2,4 @@
...
@@ -2,3 +2,4 @@
foo
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
foo
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
foo
.
$$filepath
=
"/app/item.js"
;
foo
.
$$filepath
=
"/app/item.js"
;
foo
.
$$name
=
"foo"
;
foo
.
$$name
=
"foo"
;
foo
.
$$bound
=
[];
\ No newline at end of file
packages/next-swc/crates/core/tests/errors/server-actions/2/output.js
View file @
2988be2a
...
@@ -3,3 +3,4 @@ export function bar() {}
...
@@ -3,3 +3,4 @@ export function bar() {}
bar
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
bar
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
bar
.
$$filepath
=
"/app/item.js"
;
bar
.
$$filepath
=
"/app/item.js"
;
bar
.
$$name
=
"bar"
;
bar
.
$$name
=
"bar"
;
bar
.
$$bound
=
[];
\ No newline at end of file
packages/next-swc/crates/core/tests/fixture/server-actions/1/output.js
View file @
2988be2a
/* __next_internal_action_entry_do_not_use__ $ACTION_deleteItem */
import
deleteFromDb
from
'db'
/* __next_internal_action_entry_do_not_use__ $ACTION_deleteItem */
import
deleteFromDb
from
'db'
export
function
Item
({
id1
,
id2
})
{
export
function
Item
({
id1
,
id2
})
{
async
function
deleteItem
()
{
async
function
deleteItem
()
{
return
$ACTION_deleteItem
(
deleteItem
.
$$
closure
);
return
$ACTION_deleteItem
(
deleteItem
.
$$
bound
);
}
}
deleteItem
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
deleteItem
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
deleteItem
.
$$filepath
=
"/app/item.js"
;
deleteItem
.
$$filepath
=
"/app/item.js"
;
deleteItem
.
$$name
=
"$ACTION_deleteItem"
;
deleteItem
.
$$name
=
"$ACTION_deleteItem"
;
deleteItem
.
$$
closure
=
[
deleteItem
.
$$
bound
=
[
id1
,
id1
,
id2
id2
];
];
...
...
packages/next-swc/crates/core/tests/fixture/server-actions/2/output.js
View file @
2988be2a
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
myAction
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
myAction
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
myAction
.
$$filepath
=
"/app/item.js"
;
myAction
.
$$filepath
=
"/app/item.js"
;
myAction
.
$$name
=
"$ACTION_myAction"
;
myAction
.
$$name
=
"$ACTION_myAction"
;
myAction
.
$$bound
=
[];
export
const
$ACTION_myAction
=
myAction
;
export
const
$ACTION_myAction
=
myAction
;
export
default
function
Page
()
{
export
default
function
Page
()
{
return
<
Button
action
=
{
myAction
}
>
Delete
<
/Button>
;
return
<
Button
action
=
{
myAction
}
>
Delete
<
/Button>
;
...
...
packages/next-swc/crates/core/tests/fixture/server-actions/3/output.js
View file @
2988be2a
...
@@ -5,3 +5,4 @@
...
@@ -5,3 +5,4 @@
myAction
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
myAction
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
myAction
.
$$filepath
=
"/app/item.js"
;
myAction
.
$$filepath
=
"/app/item.js"
;
myAction
.
$$name
=
"myAction"
;
myAction
.
$$name
=
"myAction"
;
myAction
.
$$bound
=
[];
packages/next-swc/crates/core/tests/fixture/server-actions/4/output.js
View file @
2988be2a
...
@@ -2,22 +2,25 @@
...
@@ -2,22 +2,25 @@
a
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
a
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
a
.
$$filepath
=
"/app/item.js"
;
a
.
$$filepath
=
"/app/item.js"
;
a
.
$$name
=
"a"
;
a
.
$$name
=
"a"
;
a
.
$$bound
=
[];
export
async
function
b
()
{}
export
async
function
b
()
{}
b
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
b
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
b
.
$$filepath
=
"/app/item.js"
;
b
.
$$filepath
=
"/app/item.js"
;
b
.
$$name
=
"b"
;
b
.
$$name
=
"b"
;
b
.
$$bound
=
[];
export
async
function
c
()
{}
export
async
function
c
()
{}
c
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
c
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
c
.
$$filepath
=
"/app/item.js"
;
c
.
$$filepath
=
"/app/item.js"
;
c
.
$$name
=
"c"
;
c
.
$$name
=
"c"
;
c
.
$$bound
=
[];
function
d
()
{}
function
d
()
{}
function
Foo
()
{
function
Foo
()
{
async
function
e
()
{
async
function
e
()
{
return
$ACTION_e
(
e
.
$$
closure
);
return
$ACTION_e
(
e
.
$$
bound
);
}
}
e
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
e
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
e
.
$$filepath
=
"/app/item.js"
;
e
.
$$filepath
=
"/app/item.js"
;
e
.
$$name
=
"$ACTION_e"
;
e
.
$$name
=
"$ACTION_e"
;
e
.
$$
closure
=
[];
e
.
$$
bound
=
[];
}
}
export
async
function
$ACTION_e
(
closure
)
{}
export
async
function
$ACTION_e
(
closure
)
{}
\ No newline at end of file
packages/next-swc/crates/core/tests/fixture/server-actions/5/output.js
View file @
2988be2a
...
@@ -3,12 +3,12 @@ const v1 = 'v1';
...
@@ -3,12 +3,12 @@ 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
.
$$
closure
);
return
$ACTION_deleteItem
(
deleteItem
.
$$
bound
);
}
}
deleteItem
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
deleteItem
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
deleteItem
.
$$filepath
=
"/app/item.js"
;
deleteItem
.
$$filepath
=
"/app/item.js"
;
deleteItem
.
$$name
=
"$ACTION_deleteItem"
;
deleteItem
.
$$name
=
"$ACTION_deleteItem"
;
deleteItem
.
$$
closure
=
[
deleteItem
.
$$
bound
=
[
id1
,
id1
,
v2
v2
];
];
...
...
packages/next-swc/crates/core/tests/fixture/server-actions/6/output.js
View file @
2988be2a
...
@@ -18,12 +18,12 @@ export function y(p, [p1, { p2 }], ...p3) {
...
@@ -18,12 +18,12 @@ export function y(p, [p1, { p2 }], ...p3) {
const
f8
=
1
;
const
f8
=
1
;
}
}
async
function
action
()
{
async
function
action
()
{
return
$ACTION_action
(
action
.
$$
closure
);
return
$ACTION_action
(
action
.
$$
bound
);
}
}
action
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
action
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
action
.
$$filepath
=
"/app/item.js"
;
action
.
$$filepath
=
"/app/item.js"
;
action
.
$$name
=
"$ACTION_action"
;
action
.
$$name
=
"$ACTION_action"
;
action
.
$$
closure
=
[
action
.
$$
bound
=
[
f2
,
f2
,
f2
,
f2
,
f11
,
f11
,
...
...
packages/next-swc/crates/core/tests/fixture/server-actions/7/output.js
View file @
2988be2a
/* __next_internal_action_entry_do_not_use__ $ACTION_deleteItem */
import
deleteFromDb
from
'db'
;
/* __next_internal_action_entry_do_not_use__ $ACTION_deleteItem */
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
.
$$
closure
);
return
$ACTION_deleteItem
(
deleteItem
.
$$
bound
);
}
}
deleteItem
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
deleteItem
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
deleteItem
.
$$filepath
=
"/app/item.js"
;
deleteItem
.
$$filepath
=
"/app/item.js"
;
deleteItem
.
$$name
=
"$ACTION_deleteItem"
;
deleteItem
.
$$name
=
"$ACTION_deleteItem"
;
deleteItem
.
$$
closure
=
[
deleteItem
.
$$
bound
=
[
product
.
id
,
product
.
id
,
product
?.
foo
,
product
?.
foo
,
product
.
bar
.
baz
,
product
.
bar
.
baz
,
...
...
packages/next-swc/crates/core/tests/fixture/server-actions/8/output.js
View file @
2988be2a
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
myAction
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
myAction
.
$$typeof
=
Symbol
.
for
(
"react.server.reference"
);
myAction
.
$$filepath
=
"/app/item.js"
;
myAction
.
$$filepath
=
"/app/item.js"
;
myAction
.
$$name
=
"$ACTION_myAction"
;
myAction
.
$$name
=
"$ACTION_myAction"
;
myAction
.
$$bound
=
[];
export
const
$ACTION_myAction
=
myAction
;
export
const
$ACTION_myAction
=
myAction
;
export
default
function
Page
()
{
export
default
function
Page
()
{
return
<
Button
action
=
{
myAction
}
>
Delete
<
/Button>
;
return
<
Button
action
=
{
myAction
}
>
Delete
<
/Button>
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment