Skip to content
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.

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

Expose generation methods for buf #598

Merged
merged 8 commits into from
Mar 18, 2022
Merged
Show file tree
Hide file tree
Changes from 3 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
63 changes: 43 additions & 20 deletions prost-build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -847,27 +847,43 @@ impl Config {
)
})?;

let modules = self.generate(file_descriptor_set.file)?;
for (module, content) in &modules {
let mut filename = if module.is_empty() {
self.default_package_filename.clone()
} else {
module.join(".")
};
let requests: Vec<_> = file_descriptor_set
.file
.into_iter()
.map(|descriptor| (self.module(&descriptor), descriptor))
.collect();
neoeinstein marked this conversation as resolved.
Show resolved Hide resolved

let file_names: HashMap<Module, String> = requests
.iter()
.map(|req| {
let mut file_name = if req.0.is_empty() {
self.default_package_filename.clone()
} else {
req.0.join(".")
};

file_name.push_str(".rs");

filename.push_str(".rs");
(req.0.clone(), file_name)
})
.collect();
neoeinstein marked this conversation as resolved.
Show resolved Hide resolved

let output_path = target.join(&filename);
let modules = self.generate(requests)?;
for (module, content) in &modules {
let file_name = file_names
.get(module)
.expect("every module should have a filename");
let output_path = target.join(file_name);

let previous_content = fs::read(&output_path);

if previous_content
.map(|previous_content| previous_content == content.as_bytes())
.unwrap_or(false)
{
trace!("unchanged: {:?}", filename);
trace!("unchanged: {:?}", file_name);
} else {
trace!("writing: {:?}", filename);
trace!("writing: {:?}", file_name);
fs::write(output_path, content)?;
}
}
Expand Down Expand Up @@ -949,25 +965,32 @@ impl Config {
outfile.write_all(format!("{}{}\n", (" ").to_owned().repeat(depth), line).as_bytes())
}

fn generate(&mut self, files: Vec<FileDescriptorProto>) -> Result<HashMap<Module, String>> {
/// Processes a set of modules and file descriptors, returning a map of modules to generated
/// code contents.
///
/// This is generally used when control over the output should not be managed by Prost,
/// such as in a flow for a `protoc` code generating plugin. When compiling as part of a
/// `build.rs` file, instead use [`compile_protos()`].
pub fn generate(
&mut self,
requests: Vec<(Module, FileDescriptorProto)>,
LucioFranco marked this conversation as resolved.
Show resolved Hide resolved
neoeinstein marked this conversation as resolved.
Show resolved Hide resolved
) -> Result<HashMap<Module, String>> {
let mut modules = HashMap::new();
let mut packages = HashMap::new();

let message_graph = MessageGraph::new(&files)
let message_graph = MessageGraph::new(requests.iter().map(|x| &x.1))
.map_err(|error| Error::new(ErrorKind::InvalidInput, error))?;
let extern_paths = ExternPaths::new(&self.extern_paths, self.prost_types)
.map_err(|error| Error::new(ErrorKind::InvalidInput, error))?;

for file in files {
let module = self.module(&file);

for request in requests {
// Only record packages that have services
if !file.service.is_empty() {
packages.insert(module.clone(), file.package().to_string());
if !request.1.service.is_empty() {
packages.insert(request.0.clone(), request.1.package().to_string());
}

let buf = modules.entry(module).or_insert_with(String::new);
CodeGenerator::generate(self, &message_graph, &extern_paths, file, buf);
let buf = modules.entry(request.0).or_insert_with(String::new);
CodeGenerator::generate(self, &message_graph, &extern_paths, request.1, buf);
}

if let Some(ref mut service_generator) = self.service_generator {
Expand Down
4 changes: 3 additions & 1 deletion prost-build/src/message_graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ pub struct MessageGraph {
}

impl MessageGraph {
pub fn new(files: &[FileDescriptorProto]) -> Result<MessageGraph, String> {
pub fn new<'a>(
files: impl Iterator<Item = &'a FileDescriptorProto>,
) -> Result<MessageGraph, String> {
let mut msg_graph = MessageGraph {
index: HashMap::new(),
graph: Graph::new(),
Expand Down