Skip to content

Commit

Permalink
✨ feat: ES2015 transform spread v3
Browse files Browse the repository at this point in the history
  • Loading branch information
@caoccao
caoccao committed May 22, 2024
1 parent 66b1a12 commit 4819962
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 55 deletions.
8 changes: 8 additions & 0 deletions src/main/java/com/caoccao/javet/swc4j/ast/expr/lit/Swc4jAstArrayLit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ public Swc4jAstArrayLit(
this.elems.stream().filter(Optional::isPresent).map(Optional::get).forEach(node -> node.setParent(this));
}

public static Swc4jAstArrayLit create() {
return new Swc4jAstArrayLit(SimpleList.of(), Swc4jSpan.DUMMY);
}

public static Swc4jAstArrayLit create(List<String> list) {
List<Swc4jAstExprOrSpread> elems = new ArrayList<>();
if (list != null && !list.isEmpty()) {
Expand Down Expand Up @@ -234,6 +238,10 @@ public boolean isAllPrimitive() {
});
}

public boolean isSpreadPresent() {
return elems.stream().anyMatch(elem -> elem.map(e -> e.getSpread().isPresent()).orElse(false));
}

public String join(String separator) {
if (separator == null) {
separator = ",";
Expand Down
113 changes: 65 additions & 48 deletions .../java/com/caoccao/javet/swc4j/plugins/es2015/Swc4jPluginVisitorEs2015TransformSpread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.caoccao.javet.swc4j.ast.expr.Swc4jAstIdent;
import com.caoccao.javet.swc4j.ast.expr.Swc4jAstMemberExpr;
import com.caoccao.javet.swc4j.ast.expr.lit.Swc4jAstArrayLit;
import com.caoccao.javet.swc4j.ast.interfaces.ISwc4jAst;
import com.caoccao.javet.swc4j.ast.interfaces.ISwc4jAstExpr;
import com.caoccao.javet.swc4j.ast.visitors.Swc4jAstVisitor;
import com.caoccao.javet.swc4j.ast.visitors.Swc4jAstVisitorResponse;

Expand All @@ -34,57 +34,74 @@
*/
public class Swc4jPluginVisitorEs2015TransformSpread extends Swc4jAstVisitor {
@Override
public Swc4jAstVisitorResponse visitExprOrSpread(Swc4jAstExprOrSpread node) {
if (node.getSpread().isPresent()) {
switch (node.getParent().getType()) {
case ArrayLit:
Swc4jAstArrayLit arrayLit = node.getParent().as(Swc4jAstArrayLit.class);
final int length = arrayLit.getElems().size();
if (length == 1) {
arrayLit.getParent().replaceNode(arrayLit, node.getExpr());
} else {
int index = arrayLit.indexOf(node);
if (index == 0) {
Swc4jAstMemberExpr memberExpr = Swc4jAstMemberExpr.create(
node.getExpr(),
Swc4jAstIdent.create(Swc4jAstArrayLit.CONCAT));
Swc4jAstCallExpr callExpr = Swc4jAstCallExpr.create(memberExpr);
ISwc4jAst newNode = callExpr;
for (int i = 1; i < length; i++) {
Optional<Swc4jAstExprOrSpread> elem = arrayLit.getElems().get(i);
if (elem.isPresent()) {
if (elem.get().getSpread().isPresent()) {
callExpr.getArgs().add(Swc4jAstExprOrSpread.create(elem.get().getExpr()));
newNode = callExpr;
memberExpr = Swc4jAstMemberExpr.create(
callExpr,
Swc4jAstIdent.create(Swc4jAstArrayLit.CONCAT));
callExpr = Swc4jAstCallExpr.create(memberExpr);
} else {
// TODO
}
} else {
// TODO
}
}
arrayLit.getParent().replaceNode(arrayLit, newNode);
} else if (index == length - 1) {
// TODO
public Swc4jAstVisitorResponse visitArrayLit(Swc4jAstArrayLit node) {
if (node.isSpreadPresent()) {
final int length = node.getElems().size();
if (length == 1) {
node.getParent().replaceNode(node, node.getElems().get(0).get().getExpr());
} else {
// Prepare obj
ISwc4jAstExpr obj;
Optional<Swc4jAstExprOrSpread> optionalExprOrSpread = node.getElems().get(0);
int startIndex;
if (optionalExprOrSpread.map(e -> e.getSpread().isPresent()).orElse(false)) {
startIndex = 1;
obj = optionalExprOrSpread.get().getExpr();
} else {
startIndex = 0;
Swc4jAstArrayLit objArrayLit = Swc4jAstArrayLit.create();
for (int i = 0; i < length; i++) {
optionalExprOrSpread = node.getElems().get(i);
if (optionalExprOrSpread.map(e -> e.getSpread().isPresent()).orElse(false)) {
break;
} else {
// TODO
Swc4jAstExprOrSpread elem = Swc4jAstExprOrSpread.create(optionalExprOrSpread.get().getExpr());
elem.setParent(objArrayLit);
objArrayLit.getElems().add(Optional.of(elem));
startIndex = i + 1;
}
}
obj = objArrayLit;
}
// Prepare concat()
Swc4jAstMemberExpr memberExpr = Swc4jAstMemberExpr.create(
obj,
Swc4jAstIdent.create(Swc4jAstArrayLit.CONCAT));
Swc4jAstCallExpr callExpr = Swc4jAstCallExpr.create(memberExpr);
Swc4jAstArrayLit objArrayLit = null;
// Prepare args
for (int i = startIndex; i < length; i++) {
optionalExprOrSpread = node.getElems().get(i);
if (optionalExprOrSpread.map(e -> e.getSpread().isPresent()).orElse(false)) {
if (objArrayLit != null) {
Swc4jAstExprOrSpread arg = Swc4jAstExprOrSpread.create(objArrayLit);
arg.setParent(callExpr);
callExpr.getArgs().add(arg);
objArrayLit = null;
}
Swc4jAstExprOrSpread elem = Swc4jAstExprOrSpread.create(optionalExprOrSpread.get().getExpr());
elem.setParent(callExpr);
callExpr.getArgs().add(elem);
} else {
if (objArrayLit == null) {
objArrayLit = Swc4jAstArrayLit.create();
}
Swc4jAstExprOrSpread elem = null;
if (optionalExprOrSpread.isPresent()) {
elem = Swc4jAstExprOrSpread.create(optionalExprOrSpread.get().getExpr());
elem.setParent(objArrayLit);
}
objArrayLit.getElems().add(Optional.ofNullable(elem));
}
break;
case CallExpr:
break;
case NewExpr:
break;
case OptCall:
break;
default:
break;
}
if (objArrayLit != null) {
Swc4jAstExprOrSpread arg = Swc4jAstExprOrSpread.create(objArrayLit);
arg.setParent(callExpr);
callExpr.getArgs().add(arg);
}
node.getParent().replaceNode(node, callExpr);
}
}
return super.visitExprOrSpread(node);
return super.visitArrayLit(node);
}
}
15 changes: 8 additions & 7 deletions ...a/com/caoccao/javet/swc4j/plugins/es2015/TestSwc4jPluginVisitorEs2015TransformSpread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,18 @@ protected void beforeEach() {
}

@Test
public void testArrayLitFirst() {
public void testArrayLit() {
assertTransformAndEvalAsString(SimpleMap.of(
"const a = [1,2]; const b = [3,4]; JSON.stringify([...a, ...b]);",
"const a=[1,2];const b=[3,4];JSON.stringify(a.concat(b));",
"const a = [1,2]; const b = [3,4]; JSON.stringify([...a, ...b, ...b, ...a]);",
"const a=[1,2];const b=[3,4];JSON.stringify(a.concat(b).concat(b).concat(a));"));
}

@Test
public void testArrayLitOne() {
assertTransformAndEvalAsString(SimpleMap.of(
"const a=[1,2];const b=[3,4];JSON.stringify(a.concat(b,b,a));",
"const a = [1,2]; const b = [3,4]; JSON.stringify(['x', ...a, ...b, 'y']);",
"const a=[1,2];const b=[3,4];JSON.stringify([\"x\"].concat(a,b,[\"y\"]));",
"const a = [1,2]; const b = [3,4]; JSON.stringify(['x', 'y', ...a, ...b]);",
"const a=[1,2];const b=[3,4];JSON.stringify([\"x\",\"y\"].concat(a,b));",
"const a = [1,2]; const b = [3,4]; JSON.stringify([...a, ...[...a, ...b], ...b]);",
"const a=[1,2];const b=[3,4];JSON.stringify(a.concat(a.concat(b),b));",
"const a = [1,2]; JSON.stringify([...a]);",
"const a=[1,2];JSON.stringify(a);"));
}
Expand Down

0 comments on commit 4819962

Please sign in to comment.