Skip to content

fix(metadata): keep an optional-call signal query predicate as written #612

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Brooooooklyn merged 1 commit into from
Oct 22, 2026
Merged

fix(metadata): keep an optional-call signal query predicate as written #612

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions crates/oxc_angular_compiler/src/class_metadata/builders.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

use oxc_allocator::{Allocator, Box, Vec as AllocVec};
use oxc_ast::ast::{
BindingPattern, Class, ClassElement, Declaration, Decorator, Expression, FormalParameter,
MethodDefinitionKind, ObjectPropertyKind, PropertyKey, Statement, TSNamespaceDeclarationBody,
TSType, TSTypeName, VariableDeclaration,
BindingPattern, ChainElement, Class, ClassElement, Declaration, Decorator, Expression,
FormalParameter, MethodDefinitionKind, ObjectPropertyKind, PropertyKey, Statement,
TSNamespaceDeclarationBody, TSType, TSTypeName, VariableDeclaration,
};
use oxc_span::GetSpan;
use oxc_str::Ident;
Expand Down Expand Up @@ -790,6 +790,10 @@ fn build_signal_query_decorator<'a>(
let string_or_call = match expr {
Expression::StringLiteral(_) | Expression::CallExpression(_) => true,
Expression::TemplateLiteral(template) => template.expressions.is_empty(),
// `a?.b()` is a call too, as `ts.isCallExpression` sees it
Expression::ChainExpression(chain) => {
matches!(chain.expression, ChainElement::CallExpression(_))
}
_ => false,
};
if string_or_call {
Expand Down
24 changes: 24 additions & 0 deletions crates/oxc_angular_compiler/tests/signal_query_metadata_forward_ref_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,27 @@ export class FParent {
assert_contains(&code, "legacy:[{type:ContentChildren,args:[FPane]}]");
assert_contains(&code, r#"strings:[{type:ViewChildren,args:["a,b"]}]"#);
}

#[test]
fn call_predicates_stay_as_written() {
// ngtsc leaves a call as written, an optional call (`a?.b()`) included, since
// `ts.isCallExpression` is true for it.
let code = compile(
r"
import { Component, viewChild } from '@angular/core';
const tokens: any = { get: () => 'ref' };
@Component({ selector: 'g-cmp', template: '' })
export class GCmp {
plain = viewChild(tokens.get());
optional = viewChild(tokens?.get());
optionalCall = viewChild(tokens.get?.());
}
",
);
assert_contains(&code, "plain:[{type:i0.ViewChild,args:[tokens.get(),{isSignal:true}]}]");
assert_contains(&code, "optional:[{type:i0.ViewChild,args:[tokens?.get(),{isSignal:true}]}]");
assert_contains(
&code,
"optionalCall:[{type:i0.ViewChild,args:[tokens.get?.(),{isSignal:true}]}]",
);
}
Loading