Skip to content

Support passing a record as a single positional parameter to a short form template call. #2678

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
copybara-service merged 1 commit into from
Feb 6, 2026
Merged

Support passing a record as a single positional parameter to a short form template call. #2678

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 38 additions & 16 deletions java/src/com/google/template/soy/passes/RewriteShortFormCallsPass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import com.google.template.soy.soytree.PrintNode;
import com.google.template.soy.soytree.SoyFileNode;
import com.google.template.soy.soytree.SoyTreeUtils;
import com.google.template.soy.types.RecordType;
import com.google.template.soy.types.SanitizedType;
import com.google.template.soy.types.SoyType;
import com.google.template.soy.types.SoyType.Kind;
Expand All @@ -66,7 +67,7 @@ final class RewriteShortFormCallsPass implements CompilerFileSetPass {
Impression.ERROR_REWRITE_SHORT_FORM_CALLS_PASS_OVERFLOW);
static final SoyErrorKind EXPECTED_NAMED_PARAMETERS =
SoyErrorKind.of(
"Expected named parameters.",
"Expected named parameters or a single record parameter.",
Impression.ERROR_REWRITE_SHORT_FORM_CALLS_PASS_EXPECTED_NAMED_PARAMETERS);

private final ErrorReporter errorReporter;
Expand Down Expand Up @@ -202,33 +203,43 @@ private CallBasicNode convert(ExprRootNode expr, IdGenerator nodeIdGen) {
return null;
}

if (fnNode.getParamsStyle() == ParamsStyle.POSITIONAL) {
boolean dataParam = isShortFormDataCall(fnNode);
if (fnNode.getParamsStyle() == ParamsStyle.POSITIONAL && !dataParam) {
errorReporter.report(fnNode.getSourceLocation(), EXPECTED_NAMED_PARAMETERS);
// Only report error once.
expr.replaceChild(0, new StringNode("$error", QuoteStyle.SINGLE, expr.getSourceLocation()));
return null;
}

SourceLocation loc = expr.getSourceLocation();
ImmutableList<CommandTagAttribute> attrs = ImmutableList.of();
if (dataParam) {
CommandTagAttribute attr =
new CommandTagAttribute(
Identifier.create("data", loc),
QuoteStyle.DOUBLE,
ImmutableList.of(fnNode.getParam(0)),
loc);
attr.valueAsExprList().forEach(root -> root.setType(root.getRoot().getType()));
attrs = ImmutableList.of(attr);
}

ExprNode callee = nameExpr.copy(new CopyState());
SoyType type = callee.getType();
CallBasicNode call =
new CallBasicNode(
nodeIdGen.genId(),
expr.getSourceLocation(),
expr.getSourceLocation(),
callee,
ImmutableList.of(),
false,
ErrorReporter.exploding());
nodeIdGen.genId(), loc, loc, callee, attrs, false, ErrorReporter.exploding());
call.setOriginalShortFormExprEquivalence(exprEquivalence.wrap(expr.copy(new CopyState())));
call.getCalleeExpr().setType(type);
for (int i = 0; i < fnNode.getParamNames().size(); i++) {
Identifier id = fnNode.getParamNames().get(i);
CallParamValueNode valueNode =
new CallParamValueNode(
nodeIdGen.genId(), id.location(), id, fnNode.getParam(i).copy(new CopyState()));
valueNode.getExpr().setType(fnNode.getParam(i).getType());
call.addChild(valueNode);
if (!dataParam) {
for (int i = 0; i < fnNode.getParamNames().size(); i++) {
Identifier id = fnNode.getParamNames().get(i);
CallParamValueNode valueNode =
new CallParamValueNode(
nodeIdGen.genId(), id.location(), id, fnNode.getParam(i).copy(new CopyState()));
valueNode.getExpr().setType(fnNode.getParam(i).getType());
call.addChild(valueNode);
}
}

// Allow CheckTemplateCallsPass to find stricthtml violations. This will be more strict than if
Expand All @@ -237,4 +248,15 @@ private CallBasicNode convert(ExprRootNode expr, IdGenerator nodeIdGen) {

return call;
}

private static boolean isShortFormDataCall(FunctionNode fnNode) {
if (fnNode.getParamsStyle() != ParamsStyle.POSITIONAL) {
return false;
}
if (fnNode.getParams().size() != 1) {
return false;
}
ExprNode param = fnNode.getParam(0);
return RecordType.EMPTY_RECORD.isAssignableFromLoose(param.getType());
}
}