fix(queries): read member query options like ngtsc, and check queries: with the source text

Member query decorators (`@ViewChild`, `@ContentChildren`, ...) now go
through the same code as `queries:` (ngtsc uses one function for both,
`extractDecoratorQueryMetadata`):

- `static`, `descendants` and `emitDistinctChangesOnly` are evaluated, so
  `{emitDistinctChangesOnly: FLAG}` with `const FLAG = false` gives flag 1
  like ngtsc (it was 5), and parenthesized or `as` options are read.
- A non-boolean option, options that aren't an object literal
  (`@ViewChild('x', OPTS)`), a predicate that can't be interpreted, and
  missing or extra arguments report ngtsc's errors, at the node ngtsc
  points to. An imported option reports the other-module error.

The public `extract_*` functions without the file's imports keep reading
literals only.

The diagnostic pass read `queries:` without the source text, so a
function-expression predicate (`new ViewChild(function Token() {})`) was
compiled but also reported as "predicate cannot be interpreted". It now
reads it the way the class is compiled.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

Author: Brooooooklyn

crates/oxc_angular_compiler/src/component/transform.rs

@@ -2579,7 +2579,12 @@ pub fn transform_angular_file(
             let implicit_standalone = options.implicit_standalone();
 
             // `inputs:`/`outputs:` forms ngtsc rejects, rather than dropping them silently.
-            result.diagnostics.extend(decorator_io_errors(allocator, class, &string_consts));
+            result.diagnostics.extend(decorator_io_errors(
+                allocator,
+                class,
+                Some(source),
+                &string_consts,
+            ));
 
             if let Some(mut metadata) = extract_component_metadata(
                 &allocator,

crates/oxc_angular_compiler/src/directive/decorator.rs

@@ -1033,19 +1033,22 @@ pub(crate) fn angular_decorator_config<'a>(
 /// The first error ngtsc raises for the inputs, outputs and queries of a
 /// `@Component` / `@Directive` on `class`, in the order it checks them
 /// (`extractDirectiveMetadata`): `inputs:`, `@Input` members, `outputs:`,
-/// output members, then `queries:`. ngtsc stops at the first one.
+/// output members, query members (`@ViewChild`, ...), then `queries:`. ngtsc
+/// stops at the first one.
 ///
 /// Each error points where ngtsc's does: the `inputs:` / `outputs:` value, the
-/// member, or the part of `queries:` at fault.
+/// member, or the part of a query at fault. `source_text` is the file's, as
+/// when the class is compiled, so both read the same queries.
 pub fn decorator_io_errors<'a>(
     allocator: &'a Allocator,
     class: &'a Class<'a>,
+    source_text: Option<&'a str>,
     consts: &StringConsts<'a>,
 ) -> std::vec::Vec<OxcDiagnostic> {
     let Some((config, decorator_name)) = angular_decorator_config(class) else {
         return std::vec::Vec::new();
     };
-    let io = config.map(|config| parse_decorator_io(allocator, config, class, None, consts));
+    let io = config.map(|config| parse_decorator_io(allocator, config, class, source_text, consts));
     let (meta_inputs, meta_outputs): (std::vec::Vec<&str>, std::vec::Vec<&str>) = match &io {
         Some(io) => (
             io.inputs.iter().map(|i| i.class_property_name.as_str()).collect(),
@@ -1123,16 +1126,29 @@ pub fn decorator_io_errors<'a>(
             })
         })
     };
+    let member_queries =
+        || super::property_decorators::member_query_error(allocator, class, source_text, consts);
+    // With the source text, like the compiled queries: a predicate is emitted
+    // as written, which some expressions (functions) need it for.
     let queries = || {
         let config = config?;
-        super::parse_decorator_queries(allocator, config, class, None, consts, decorator_name).error
+        let queries = super::parse_decorator_queries(
+            allocator,
+            config,
+            class,
+            source_text,
+            consts,
+            decorator_name,
+        );
+        queries.error
     };
 
     io.as_ref()
         .and_then(|io| io.input_error.clone())
         .or_else(input_members)
         .or_else(|| io.as_ref().and_then(|io| io.output_error.clone()))
         .or_else(output_members)
+        .or_else(member_queries)
         .or_else(queries)
         .map(|(message, span)| OxcDiagnostic::error(message).with_label(span))
         .into_iter()

crates/oxc_angular_compiler/src/directive/property_decorators.rs

@@ -859,6 +859,28 @@ fn parse_query_config<'a>(
     source_text: Option<&'a str>,
     consts: Option<&super::StringConsts<'a>>,
 ) -> QueryConfig<'a> {
+    // With the file, read like ngtsc does (see [`member_query`]). A query it
+    // rejects isn't compiled; [`member_query_error`] reports it.
+    if let Some(consts) = consts {
+        return match member_query(
+            allocator,
+            decorator,
+            decorator_name,
+            Span::default(),
+            source_text,
+            consts,
+        ) {
+            Ok(query) => QueryConfig {
+                predicate: Some(query.predicate),
+                is_static: query.is_static,
+                read: query.read,
+                descendants: query.descendants,
+                emit_distinct_changes_only: query.emit_distinct_changes_only,
+            },
+            Err(_) => QueryConfig::default_for(decorator_name),
+        };
+    }
+
     let Expression::CallExpression(call) = &decorator.expression else {
         return QueryConfig::default_for(decorator_name);
     };
@@ -869,27 +891,16 @@ fn parse_query_config<'a>(
 
     let mut config = QueryConfig::default_for(decorator_name);
 
-    // The predicate: a string selector, a string array, or a type/token.
+    // The predicate: a string selector or a type/token.
     // forwardRef isn't included in compiled output.
-    let node = try_unwrap_forward_ref(first_arg, consts).unwrap_or(first_arg);
-    let selectors = match (consts, node) {
-        (Some(consts), _) => match super::evaluator::Evaluator::new(consts).evaluate(node) {
-            super::evaluator::Value::String(s) => Some(std::vec![s]),
-            super::evaluator::Value::Array(items) => {
-                items.iter().map(|i| i.as_str().map(str::to_string)).collect()
-            }
-            _ => None,
-        },
-        (None, Expression::StringLiteral(lit)) => Some(std::vec![lit.value.to_string()]),
-        _ => None,
-    };
-    config.predicate = match selectors {
-        Some(selectors) => {
+    let node = try_unwrap_forward_ref(first_arg, None).unwrap_or(first_arg);
+    config.predicate = match node {
+        Expression::StringLiteral(lit) => {
             let mut list = Vec::new_in(&allocator);
-            list.extend(selectors.iter().map(|s| Ident::from(allocator.alloc_str(s))));
+            list.push(lit.value.clone().into());
             Some(QueryPredicate::Selectors(list))
         }
-        None => convert_oxc_expression(allocator, node, source_text).map(QueryPredicate::Type),
+        _ => convert_oxc_expression(allocator, node, source_text).map(QueryPredicate::Type),
     };
 
     // Parse options from second argument if present
@@ -1798,8 +1809,9 @@ pub(crate) fn parse_decorator_queries<'a>(
             consts,
             &evaluator,
             type_name,
-            new_expr,
-            property_name,
+            &new_expr.arguments,
+            new_expr.span,
+            &property_name,
             source_text,
         ) {
             Ok(query) if type_name.starts_with("Content") => {
@@ -1849,21 +1861,71 @@ pub(crate) fn parse_decorator_queries<'a>(
     queries
 }
 
-/// One `new ViewChild(predicate, options?)` and friends. An error comes with
-/// the node ngtsc reports it on.
+/// A query member decorator (`@ViewChild('el', {static: true})` on the
+/// member at `span`), read like ngtsc's `extractDecoratorQueryMetadata` (see
+/// [`decorator_query`]): the options are evaluated, so a same-file `const`
+/// counts and a value of the wrong type is an error.
+fn member_query<'a>(
+    allocator: &'a Allocator,
+    decorator: &'a Decorator<'a>,
+    name: &str,
+    span: Span,
+    source_text: Option<&'a str>,
+    consts: &super::StringConsts<'a>,
+) -> Result<R3QueryMetadata<'a>, (String, Span)> {
+    // `@ViewChild` without a call has no arguments.
+    let args: &'a [Argument<'a>] = match &decorator.expression {
+        Expression::CallExpression(call) => &call.arguments,
+        _ => &[],
+    };
+    let evaluator = super::evaluator::Evaluator::new(consts);
+    decorator_query(allocator, consts, &evaluator, name, args, span, "", source_text)
+}
+
+/// The first error ngtsc raises for a class's query member decorators
+/// (`parseQueriesOfClassFields`), in member order: the one
+/// [`member_query`] reports, on the node ngtsc points at.
+pub(crate) fn member_query_error<'a>(
+    allocator: &'a Allocator,
+    class: &'a Class<'a>,
+    source_text: Option<&'a str>,
+    consts: &super::StringConsts<'a>,
+) -> Option<(String, Span)> {
+    class.body.body.iter().find_map(|element| {
+        let (decorators, span) = match element {
+            ClassElement::PropertyDefinition(prop) => (&prop.decorators, prop.span),
+            ClassElement::MethodDefinition(method)
+                if matches!(method.kind, MethodDefinitionKind::Set | MethodDefinitionKind::Get) =>
+            {
+                (&method.decorators, method.span)
+            }
+            _ => return None,
+        };
+        let (decorator, name) = QUERY_TYPES.iter().find_map(|name| {
+            Some((find_decorator_by_name(decorators, name, Some(consts))?, *name))
+        })?;
+        member_query(allocator, decorator, name, span, source_text, consts).err()
+    })
+}
+
+/// ngtsc's `extractDecoratorQueryMetadata`: one `@ViewChild(predicate,
+/// options?)` member decorator, or `new ViewChild(...)` in `queries:`, and
+/// friends. `args` are its arguments and `span` the member or the `new`
+/// expression. An error comes with the node ngtsc reports it on.
+#[expect(clippy::too_many_arguments)]
 fn decorator_query<'a>(
     allocator: &'a Allocator,
     consts: &super::StringConsts<'a>,
     evaluator: &super::evaluator::Evaluator<'_, 'a>,
     name: &str,
-    new_expr: &'a oxc_ast::ast::NewExpression<'a>,
-    property_name: String,
+    args: &'a [Argument<'a>],
+    span: Span,
+    property_name: &str,
     source_text: Option<&'a str>,
 ) -> Result<R3QueryMetadata<'a>, (String, Span)> {
     use super::evaluator::Value;
-    let args = &new_expr.arguments;
     let Some(first) = args.first().and_then(Argument::as_expression) else {
-        return Err((format!("@{name} must have arguments"), new_expr.span));
+        return Err((format!("@{name} must have arguments"), span));
     };
     let node = try_unwrap_forward_ref(first, Some(consts)).unwrap_or(first);
     let at_node = |message: String| (message, node.span());
@@ -1940,7 +2002,7 @@ fn decorator_query<'a>(
     }
 
     Ok(R3QueryMetadata {
-        property_name: Ident::from(allocator.alloc_str(&property_name)),
+        property_name: Ident::from(allocator.alloc_str(property_name)),
         first: name == "ViewChild" || name == "ContentChild",
         predicate,
         descendants: config.descendants,

crates/oxc_angular_compiler/tests/decorator_metadata_ngtsc_test.rs

@@ -299,7 +299,7 @@ fn decorator_metadata_matches_ngtsc() {
         failures.len(),
         failures.join("\n\n")
     );
-    assert_eq!(compared, 513, "fixtures compared");
+    assert_eq!(compared, 606, "fixtures compared");
 }
 
 fn transform(source: &str) -> TransformResult {
@@ -909,7 +909,7 @@ export class Cmp {
     }
 }
 
-/// `queries:` values imported from another file: ngtsc 22.1.7 reads the file
+/// Query values imported from another file: ngtsc 22.1.7 reads the file
 /// and compiles all of these (`probe: queries-imported*`, with
 /// `export const FLAG = true; export const SELS = ['a', 'b']; export const SEL
 /// = 'b';` in `./flags`). oxc can't, and says so rather than reporting
@@ -961,4 +961,44 @@ export class Cmp {{
             "{query}"
         );
     }
+
+    // The same options on member decorators, read by the same code as ngtsc
+    // does (`probe: queries-member-*`; ngtsc 22.1.7 compiles these with
+    // `export const FLAG = false` in the other file).
+    let cases = [
+        (
+            "@ViewChildren('el', {emitDistinctChangesOnly: FLAG})",
+            "@ViewChildren options.emitDistinctChangesOnly",
+            "FLAG",
+        ),
+        (
+            "@ContentChildren('el', {descendants: flags.FLAG})",
+            "@ContentChildren options.descendants",
+            "flags.FLAG",
+        ),
+        ("@ViewChild('el', {static: FLAG})", "@ViewChild options.static", "'el'"),
+        ("@ContentChild(['a', SEL])", "@ContentChild predicate", "['a', SEL]"),
+    ];
+    for (decorator, subject, span) in cases {
+        let source = format!(
+            "import {{Component, ViewChild, ViewChildren, ContentChild, ContentChildren}} from '@angular/core';
+import {{FLAG, SEL}} from './flags';
+import * as flags from './flags';
+@Component({{selector: 'c', template: ''}})
+export class Cmp {{
+  {decorator} el: any;
+}}
+"
+        );
+        let name = if subject.ends_with("predicate") { "SEL" } else { "FLAG" };
+        let message = format!(
+            "{subject} depends on '{name}', which is imported from another module. \
+             OXC compiles one file at a time and cannot evaluate values from other files."
+        );
+        assert_eq!(
+            errors(&transform(&source), &source),
+            vec![(message, span.to_string())],
+            "{decorator}"
+        );
+    }
 }