Skip to content
Merged
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
16 changes: 13 additions & 3 deletions src/codegen/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ mod hoist;
pub mod normalizer;
pub mod profile;
mod reachability;
pub mod reify;

use std::collections::{BTreeMap, BTreeSet};
use std::path::PathBuf;
Expand All @@ -14,7 +15,9 @@ use serde_json::Value;

use crate::codegen::compose::compose_active_extensions;
use crate::codegen::hoist::{hoist_defs, insert_sliced_or_normalized_def};
use crate::codegen::normalizer::{align_directional_refs, to_pascal_case};
use crate::codegen::normalizer::{
align_directional_refs, flatten_object_allof, qualify_inline_object_titles, to_pascal_case,
};
pub use crate::codegen::profile::{parse_profile_source, ParsedProfile, RestServiceBinding};
use crate::codegen::reachability::{
compute_reachable_closure, load_all_schemas, select_active_schemas,
Expand Down Expand Up @@ -220,7 +223,12 @@ pub fn compile_types(options: &GenerateTypesOptions) -> Result<CompiledTypes, Co
&mut inlined_mixin_defs,
)?;

// Stage 4: Inline Conditional Variant Hoisting (added in Phase 3 / Task 6)
// Stage 4: Inline Conditional Variant Hoisting
reify::hoist_inline_conditional_variants(
&mut root_raw_schemas,
&mut defs,
&mut sliced_base_names,
)?;

// Stage 5: Directional Slicing & Base Normalization
for (base_name, raw_schema) in &root_raw_schemas {
Expand All @@ -233,8 +241,10 @@ pub fn compile_types(options: &GenerateTypesOptions) -> Result<CompiledTypes, Co
)?;
}

// Stage 6: Directional $ref Alignment
// Stage 6: Directional $ref Alignment & Single-Object/Array allOf Flattening
align_all_directional_refs(&mut defs, &sliced_base_names);
flatten_object_allof(&mut defs);
qualify_inline_object_titles(&mut defs);

// Stage 7: Ordered anyOf Union Lowering & Subtype Registration (added in Phase 3 / Task 7)

Expand Down
Loading
Loading