Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/oxc_angular_compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ cross_file_elision = ["oxc_resolver", "pathdiff"]

[dev-dependencies]
insta = { workspace = true, features = ["glob"] }
serde_json = { workspace = true }
tempfile = "3"

[lints]
Expand Down
19 changes: 13 additions & 6 deletions crates/oxc_angular_compiler/src/component/decorator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use super::metadata::{
use super::transform::ImportMap;
use crate::directive::{
StringConsts, extract_host_bindings, extract_host_listeners, extract_input_metadata,
extract_output_metadata,
extract_output_metadata, merge_by_class_property, parse_decorator_io,
};
use crate::output::oxc_converter::convert_oxc_expression;

Expand Down Expand Up @@ -261,11 +261,18 @@ pub fn extract_component_metadata<'a>(
metadata.constructor_deps =
extract_constructor_deps(allocator, class, import_map, has_superclass);

// Extract inputs from @Input decorators on class members
metadata.inputs = extract_input_metadata(allocator, class, source_text);

// Extract outputs from @Output decorators on class members
metadata.outputs = extract_output_metadata(allocator, class);
// Inputs/outputs from the `inputs:`/`outputs:` metadata, overridden by
// @Input/@Output/signal members ({...fromMeta, ...fromFields} in ngtsc).
let io = parse_decorator_io(allocator, config_obj, source_text, consts);
metadata.inputs = merge_by_class_property(
io.inputs,
extract_input_metadata(allocator, class, source_text),
|i| i.class_property_name.as_str(),
);
metadata.outputs =
merge_by_class_property(io.outputs, extract_output_metadata(allocator, class), |o| {
o.0.as_str()
});

// Detect if ngOnChanges lifecycle hook is implemented
// Similar to Angular's: const usesOnChanges = members.some(member => ...)
Expand Down
1 change: 1 addition & 0 deletions crates/oxc_angular_compiler/src/component/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ mod transform;
#[cfg(feature = "cross_file_elision")]
pub use cross_file_elision::CrossFileAnalyzer;
pub use decorator::extract_component_metadata;
pub(crate) use decorator::find_component_decorator;
pub use definition::{
ComponentDefinitions, const_value_to_expression, generate_component_definitions,
};
Expand Down
7 changes: 6 additions & 1 deletion crates/oxc_angular_compiler/src/component/transform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ use crate::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,
decorator_io_errors, extract_content_queries, extract_directive_metadata, extract_view_queries,
find_directive_decorator, find_directive_decorator_span, generate_directive_definitions,
};
use crate::dts;
Expand Down Expand Up @@ -2578,6 +2578,11 @@ pub fn transform_angular_file(
// Compute implicit_standalone based on Angular version
let implicit_standalone = options.implicit_standalone();

// `inputs:`/`outputs:` forms ngtsc rejects, rather than dropping them silently.
for error in decorator_io_errors(allocator, class, &string_consts) {
result.diagnostics.push(OxcDiagnostic::error(error));
}

if let Some(mut metadata) = extract_component_metadata(
&allocator,
class,
Expand Down
Loading
Loading