Skip to content

feat: resolve file-scope string consts in decorator metadata #271

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

Open
ashley-hunter wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: resolve file-scope string consts in decorator metadata #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f956d64
feat: resolve file-scope string consts in decorator metadata
ashley-hunter May 13, 2026
3f3d6de
formatting
ashley-hunter May 14, 2026
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
52 changes: 36 additions & 16 deletions crates/oxc_angular_compiler/src/component/decorator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ use super::metadata::{
};
use super::transform::ImportMap;
use crate::directive::{
extract_host_bindings, extract_host_listeners, extract_input_metadata, extract_output_metadata,
StringConsts, extract_host_bindings, extract_host_listeners, extract_input_metadata,
extract_output_metadata,
};
use crate::output::oxc_converter::convert_oxc_expression;

Expand Down Expand Up @@ -52,6 +53,7 @@ pub fn extract_component_metadata<'a>(
implicit_standalone: bool,
import_map: &ImportMap<'a>,
source_text: Option<&'a str>,
consts: &StringConsts<'a>,
) -> Option<ComponentMetadata<'a>> {
// Get the class name
let class_name: Ident<'a> = class.id.as_ref()?.name.clone().into();
Expand Down Expand Up @@ -85,30 +87,30 @@ pub fn extract_component_metadata<'a>(
// Parse each property in the config object
for prop in &config_obj.properties {
if let ObjectPropertyKind::ObjectProperty(prop) = prop {
let key_name = get_property_key_name(&prop.key)?;
let key_name = get_property_key_name(&prop.key, consts)?;

match key_name.as_str() {
"selector" => {
metadata.selector = extract_string_value(&prop.value);
metadata.selector = extract_string_value(&prop.value, consts);
}
"template" => {
metadata.template = extract_string_value(&prop.value);
metadata.template = extract_string_value(&prop.value, consts);
}
"templateUrl" => {
metadata.template_url = extract_string_value(&prop.value);
metadata.template_url = extract_string_value(&prop.value, consts);
}
"styles" => {
if let Some(styles) = extract_string_array(allocator, &prop.value) {
metadata.styles = styles;
} else if let Some(style) = extract_string_value(&prop.value) {
} else if let Some(style) = extract_string_value(&prop.value, consts) {
// Single style string (legacy support)
metadata.styles.push(style);
}
}
"styleUrls" | "styleUrl" => {
if let Some(urls) = extract_string_array(allocator, &prop.value) {
metadata.style_urls = urls;
} else if let Some(url) = extract_string_value(&prop.value) {
} else if let Some(url) = extract_string_value(&prop.value, consts) {
metadata.style_urls.push(url);
}
}
Expand All @@ -125,7 +127,7 @@ pub fn extract_component_metadata<'a>(
metadata.change_detection = extract_change_detection(&prop.value);
}
"host" => {
metadata.host = extract_host_metadata(allocator, &prop.value);
metadata.host = extract_host_metadata(allocator, &prop.value, consts);
}
"imports" => {
// For standalone components, we need:
Expand All @@ -137,7 +139,7 @@ pub fn extract_component_metadata<'a>(
}
"exportAs" => {
// exportAs can be comma-separated: "foo, bar"
if let Some(export_as) = extract_string_value(&prop.value) {
if let Some(export_as) = extract_string_value(&prop.value, consts) {
for part in export_as.as_str().split(',') {
let trimmed = part.trim();
if !trimmed.is_empty() {
Expand Down Expand Up @@ -175,7 +177,7 @@ pub fn extract_component_metadata<'a>(
// Extract host directives array
// Handles both simple identifiers and complex objects with inputs/outputs
metadata.host_directives =
extract_host_directives(allocator, &prop.value, import_map);
extract_host_directives(allocator, &prop.value, import_map, consts);
}
"signals" => {
// Extract signals flag (true if component uses signal-based inputs)
Expand Down Expand Up @@ -341,16 +343,28 @@ fn is_component_call(callee: &Expression<'_>) -> bool {
}

/// Get the name of a property key as a string.
fn get_property_key_name<'a>(key: &PropertyKey<'a>) -> Option<Ident<'a>> {
///
/// Resolves same-file `const` identifiers in computed keys (`[FOO]: bar`) so the
/// emitted component metadata matches the official Angular compiler's output.
fn get_property_key_name<'a>(
key: &PropertyKey<'a>,
consts: &StringConsts<'a>,
) -> Option<Ident<'a>> {
match key {
PropertyKey::StaticIdentifier(id) => Some(id.name.clone().into()),
PropertyKey::StringLiteral(lit) => Some(lit.value.clone().into()),
// Computed identifier reference: `[FOO]: bar` — resolve against same-file consts.
PropertyKey::Identifier(id) => consts.get(id.name.as_str()).cloned(),
_ => None,
}
}

/// Extract a string value from an expression.
fn extract_string_value<'a>(expr: &Expression<'a>) -> Option<Ident<'a>> {
///
/// Resolves same-file `const` identifier references in value position
/// (`host: { type: FOO }`) so the emitted metadata matches the official
/// Angular compiler's output.
fn extract_string_value<'a>(expr: &Expression<'a>, consts: &StringConsts<'a>) -> Option<Ident<'a>> {
match expr {
Expression::StringLiteral(lit) => Some(lit.value.clone().into()),
Expression::TemplateLiteral(tpl) if tpl.expressions.is_empty() => {
Expand All @@ -359,6 +373,7 @@ fn extract_string_value<'a>(expr: &Expression<'a>) -> Option<Ident<'a>> {
// Angular evaluates template literals, so we need cooked, not raw
tpl.quasis.first().and_then(|q| q.value.cooked.clone().map(Into::into))
}
Expression::Identifier(id) => consts.get(id.name.as_str()).cloned(),
_ => None,
}
}
Expand Down Expand Up @@ -474,6 +489,7 @@ fn extract_change_detection(expr: &Expression<'_>) -> ChangeDetectionStrategy {
fn extract_host_metadata<'a>(
allocator: &'a Allocator,
expr: &Expression<'a>,
consts: &StringConsts<'a>,
) -> Option<HostMetadata<'a>> {
let Expression::ObjectExpression(obj) = expr else {
return None;
Expand All @@ -489,10 +505,10 @@ fn extract_host_metadata<'a>(

for prop in &obj.properties {
if let ObjectPropertyKind::ObjectProperty(prop) = prop {
let Some(key_name) = get_property_key_name(&prop.key) else {
let Some(key_name) = get_property_key_name(&prop.key, consts) else {
continue;
};
let Some(value) = extract_string_value(&prop.value) else {
let Some(value) = extract_string_value(&prop.value, consts) else {
continue;
};

Expand Down Expand Up @@ -539,6 +555,7 @@ fn extract_host_directives<'a>(
allocator: &'a Allocator,
expr: &Expression<'a>,
import_map: &ImportMap<'a>,
consts: &StringConsts<'a>,
) -> Vec<'a, HostDirectiveMetadata<'a>> {
let mut result = Vec::new_in(allocator);

Expand All @@ -547,7 +564,7 @@ fn extract_host_directives<'a>(
};

for element in &arr.elements {
if let Some(meta) = extract_single_host_directive(allocator, element, import_map) {
if let Some(meta) = extract_single_host_directive(allocator, element, import_map, consts) {
result.push(meta);
}
}
Expand All @@ -565,6 +582,7 @@ fn extract_single_host_directive<'a>(
allocator: &'a Allocator,
element: &ArrayExpressionElement<'a>,
import_map: &ImportMap<'a>,
consts: &StringConsts<'a>,
) -> Option<HostDirectiveMetadata<'a>> {
match element {
// Simple identifier: TooltipDirective
Expand All @@ -587,7 +605,7 @@ fn extract_single_host_directive<'a>(

for prop in &obj.properties {
if let ObjectPropertyKind::ObjectProperty(prop) = prop {
let Some(key_name) = get_property_key_name(&prop.key) else {
let Some(key_name) = get_property_key_name(&prop.key, consts) else {
continue;
};

Expand Down Expand Up @@ -1149,6 +1167,7 @@ mod tests {

// Build import map from the program body
let import_map = build_import_map(&allocator, &parser_ret.program.body, None);
let consts = crate::directive::collect_string_consts(&parser_ret.program);

// Find the first class declaration (handles plain, export default, and export named)
let mut found_metadata = None;
Expand All @@ -1173,6 +1192,7 @@ mod tests {
implicit_standalone,
&import_map,
Some(code),
&consts,
) {
found_metadata = Some(metadata);
break;
Expand Down
17 changes: 14 additions & 3 deletions crates/oxc_angular_compiler/src/component/transform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ use crate::class_metadata::{
R3ClassMetadata, build_ctor_params_metadata, build_decorator_metadata_array,
build_prop_decorators_metadata, compile_class_metadata,
};
use crate::directive::collect_string_consts;
use crate::directive::{
R3QueryMetadata, create_content_queries_function, create_view_queries_function,
extract_content_queries, extract_directive_metadata, extract_view_queries,
Expand Down Expand Up @@ -1825,6 +1826,11 @@ pub fn transform_angular_file(
let import_map =
build_import_map(allocator, &parser_ret.program.body, options.resolved_imports.as_ref());

// Collect file-scope string consts so decorator metadata can resolve identifier
// references (e.g. `host: { [ATTR_NAME]: '' }`) the same way the official
// Angular compiler does.
let string_consts = collect_string_consts(&parser_ret.program);

#[cfg(feature = "cross_file_elision")]
let mut import_map =
build_import_map(allocator, &parser_ret.program.body, options.resolved_imports.as_ref());
Expand Down Expand Up @@ -1872,6 +1878,7 @@ pub fn transform_angular_file(
implicit_standalone,
&import_map,
Some(source),
&string_consts,
) {
// 3. Resolve external styles and merge into metadata
resolve_styles(allocator, &mut metadata, resolved_resources);
Expand Down Expand Up @@ -2106,9 +2113,13 @@ pub fn transform_angular_file(
// definitions. This prevents Angular's JIT runtime from processing
// the directive and creating conflicting property definitions (like
// ɵfac getters) that interfere with the AOT-compiled assignments.
if let Some(mut directive_metadata) =
extract_directive_metadata(allocator, class, implicit_standalone, Some(source))
{
if let Some(mut directive_metadata) = extract_directive_metadata(
allocator,
class,
implicit_standalone,
Some(source),
&string_consts,
) {
// Track decorator span for removal
if let Some(span) = find_directive_decorator_span(class) {
decorator_spans_to_remove.push(span);
Expand Down
Loading