Skip to content

Don't include subresources for referenced_components #150

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

Merged
svix-jplatte merged 1 commit into from
Mar 9, 2026
+22 −4
Merged

Don't include subresources for referenced_components #150

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
18 changes: 17 additions & 1 deletion src/api/resources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
use std::collections::{BTreeMap, BTreeSet};
use std::{
collections::{BTreeMap, BTreeSet},
ops::Deref,
};

use aide::openapi::{self, ReferenceOr};
use anyhow::{Context as _, bail};
Expand Down Expand Up @@ -120,6 +123,19 @@ impl Resource {

res
}

pub(crate) fn referenced_components_direct(&self) -> impl Iterator<Item = &str> {
self.operations.iter().flat_map(|op| {
op.query_params
.iter()
.filter_map(|qp| match &qp.r#type {
FieldType::SchemaRef { name, inner: None } => Some(name.as_str()),
_ => None,
})
.chain(op.request_body_schema_name.iter().map(Deref::deref))
.chain(op.response_body_schema_name.iter().map(Deref::deref))
})
}
}

/// A named HTTP endpoint.
Expand Down
8 changes: 5 additions & 3 deletions src/generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::str::FromStr;
use std::{collections::BTreeSet, str::FromStr};

use anyhow::{Context as _, bail};
use camino::{Utf8Path, Utf8PathBuf};
Expand Down Expand Up @@ -101,7 +101,8 @@ impl Generator<'_> {
) -> anyhow::Result<Vec<Utf8PathBuf>> {
let mut generated_paths = vec![];
for resource in resources {
let referenced_components = resource.referenced_components();
let referenced_components: BTreeSet<_> =
resource.referenced_components_direct().collect();
for operation in &resource.operations {
if operation.has_query_or_header_params() {
generated_paths.extend_from_slice(&self.render_tpl(
Expand Down Expand Up @@ -130,7 +131,8 @@ impl Generator<'_> {
let mut generated_paths = vec![];

for resource in resources {
let referenced_components = resource.referenced_components();
let referenced_components: BTreeSet<_> =
resource.referenced_components_direct().collect();
generated_paths.extend_from_slice(&self.render_tpl(
Some(&resource.name),
context! { resource, referenced_components },
Expand Down