Skip to content

feat: add isAwait to ForOfStmt and isRest to ParameterDecl, fix TemplateExpr #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sam-goodwin merged 14 commits into from
Aug 8, 2022
Merged

feat: add isAwait to ForOfStmt and isRest to ParameterDecl, fix TemplateExpr #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
89627c1
feat: add isAwait to ForOfStmt and isRest to ParameterDecl
Aug 6, 2022
31a20df
chore: remove redundant clone functions and add ensure to declaration…
Aug 6, 2022
3640d72
chore: add synth-time errors for for-await and rest parameters
Aug 6, 2022
9ce03c9
feat: add VarDeclKind to VariableDecl
Aug 6, 2022
2951d85
fix: move VarDeclKind to VariableDeclList
Aug 6, 2022
5738dd2
fix: make expr in YieldExpr not optional
Aug 6, 2022
153ef3c
feat: remove normalization logic of operators, === and !==
Aug 6, 2022
87f3962
chore: self mutation
invalid-email-address Aug 6, 2022
d0bcba1
chore: feedback
Aug 7, 2022
bd6e801
feat: add missing BinaryOp and organize them how Mozzila does
Aug 7, 2022
d5378ad
feat: remove QuasiString and add in TemplateHead, Middle, Tail, Span
Aug 8, 2022
e4cfc11
feat: add label to BreakStmt and ContinueStmt, and fix parsing of Lab…
Aug 8, 2022
365fd53
feat: add expr to SwitchStmt
Aug 8, 2022
76775b9
feat: update ReturnStmt.expr to be optional
Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
Identifier,
ReferenceExpr,
ThisExpr,
UndefinedLiteralExpr,
} from "./expression";
import { Function } from "./function";
import {
Expand Down Expand Up @@ -649,7 +650,9 @@ export class APIGatewayVTL extends VTL {
public eval(node: Stmt, returnVar?: string): void;
public eval(node?: Expr | Stmt, returnVar?: string): string | void {
if (isReturnStmt(node)) {
return this.add(this.exprToJson(node.expr));
return this.add(
this.exprToJson(node.expr ?? node.fork(new UndefinedLiteralExpr()))
);
} else if (
isPropAccessExpr(node) &&
isIdentifier(node.name) &&
Expand Down
12 changes: 9 additions & 3 deletions src/appsync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
ReferenceExpr,
StringLiteralExpr,
ThisExpr,
UndefinedLiteralExpr,
} from "./expression";
import {
isVariableStmt,
Expand Down Expand Up @@ -482,7 +483,10 @@ function synthesizeFunctions(api: appsync.GraphqlApi, decl: FunctionLike) {
* Flatten variable declarations into multiple variable statements.
*/
return node.declList.decls.map(
(decl) => new VariableStmt(new VariableDeclList([decl]))
(decl) =>
new VariableStmt(
new VariableDeclList([decl], node.declList.varKind)
)
);
} else if (isBinaryExpr(node)) {
/**
Expand Down Expand Up @@ -608,7 +612,9 @@ function synthesizeFunctions(api: appsync.GraphqlApi, decl: FunctionLike) {
return createStage(
service,
`${pre ? `${pre}\n` : ""}#set( $context.stash.return__flag = true )
#set( $context.stash.return__val = ${getResult(stmt.expr)} )
#set( $context.stash.return__val = ${getResult(
stmt.expr ?? stmt.fork(new UndefinedLiteralExpr())
)} )
{}`
);
} else if (
Expand Down Expand Up @@ -683,7 +689,7 @@ function synthesizeFunctions(api: appsync.GraphqlApi, decl: FunctionLike) {
}
} else if (isLastExpr) {
if (isReturnStmt(stmt)) {
template.return(stmt.expr);
template.return(stmt.expr ?? stmt.fork(new UndefinedLiteralExpr()));
} else if (isIfStmt(stmt)) {
template.eval(stmt);
} else {
Expand Down
Loading