From 3659c6df43aba005538307e98eb3f20bc44b71b5 Mon Sep 17 00:00:00 2001 From: bouzuya Date: Sat, 5 Nov 2022 09:38:38 +0900 Subject: [PATCH] Add disable_comments option --- Cargo.toml | 1 + tests/disable_comments/.gitignore | 1 + tests/disable_comments/Cargo.toml | 17 +++++++++ tests/disable_comments/build.rs | 18 +++++++++ tests/disable_comments/proto/test.proto | 29 ++++++++++++++ tests/disable_comments/src/lib.rs | 3 ++ .../tests/disable_comments.rs | 18 +++++++++ tonic-build/src/client.rs | 29 ++++++++++++-- tonic-build/src/manual.rs | 3 ++ tonic-build/src/prost.rs | 11 ++++++ tonic-build/src/server.rs | 38 +++++++++++++++++-- 11 files changed, 162 insertions(+), 6 deletions(-) create mode 100644 tests/disable_comments/.gitignore create mode 100644 tests/disable_comments/Cargo.toml create mode 100644 tests/disable_comments/build.rs create mode 100644 tests/disable_comments/proto/test.proto create mode 100644 tests/disable_comments/src/lib.rs create mode 100644 tests/disable_comments/tests/disable_comments.rs diff --git a/Cargo.toml b/Cargo.toml index f8717f095..b947ee7f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,6 +8,7 @@ members = [ "tonic-web", # Non-published crates "examples", "interop", # Tests + "tests/disable_comments", "tests/included_service", "tests/same_name", "tests/service_named_service", diff --git a/tests/disable_comments/.gitignore b/tests/disable_comments/.gitignore new file mode 100644 index 000000000..e4163d651 --- /dev/null +++ b/tests/disable_comments/.gitignore @@ -0,0 +1 @@ +/src/generated/ diff --git a/tests/disable_comments/Cargo.toml b/tests/disable_comments/Cargo.toml new file mode 100644 index 000000000..dc2c680db --- /dev/null +++ b/tests/disable_comments/Cargo.toml @@ -0,0 +1,17 @@ +[package] +authors = ["bouzuya "] +edition = "2018" +license = "MIT" +name = "disable-comments" +publish = false +version = "0.1.0" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +prost = "0.11" +tonic = {path = "../../tonic"} + +[build-dependencies] +prost-build = "0.11" +tonic-build = {path = "../../tonic-build"} diff --git a/tests/disable_comments/build.rs b/tests/disable_comments/build.rs new file mode 100644 index 000000000..4a5a2dffd --- /dev/null +++ b/tests/disable_comments/build.rs @@ -0,0 +1,18 @@ +use std::{fs, path::PathBuf}; + +fn main() { + let out_dir = PathBuf::from(std::env!("CARGO_MANIFEST_DIR")) + .join("src") + .join("generated"); + fs::create_dir_all(out_dir.as_path()).unwrap(); + let mut config = prost_build::Config::default(); + config.disable_comments(&["test.Input1", "test.Output1"]); + tonic_build::configure() + .disable_comments("test.Service1") + .disable_comments("test.Service1.Rpc1") + .build_client(true) + .build_server(true) + .out_dir(format!("{}", out_dir.display())) + .compile_with_config(config, &["proto/test.proto"], &["proto"]) + .unwrap(); +} diff --git a/tests/disable_comments/proto/test.proto b/tests/disable_comments/proto/test.proto new file mode 100644 index 000000000..9121425a0 --- /dev/null +++ b/tests/disable_comments/proto/test.proto @@ -0,0 +1,29 @@ +syntax = "proto3"; + +package test; + +// This comment will be removed. +service Service1 { + // This comment will be removed. + rpc Rpc1(Input1) returns (Output1); + // This comment will not be removed. + rpc Rpc2(Input2) returns (Output2); +} + +// This comment will not be removed. +service Service2 { + // This comment will not be removed. + rpc Rpc(Input1) returns (Output1); +} + +// This comment will be removed. +message Input1 {} + +// This comment will not be removed. +message Input2 {} + +// This comment will be removed. +message Output1 {} + +// This comment will not be removed. +message Output2 {} diff --git a/tests/disable_comments/src/lib.rs b/tests/disable_comments/src/lib.rs new file mode 100644 index 000000000..c19832c10 --- /dev/null +++ b/tests/disable_comments/src/lib.rs @@ -0,0 +1,3 @@ +pub mod pb { + include!("generated/test.rs"); +} diff --git a/tests/disable_comments/tests/disable_comments.rs b/tests/disable_comments/tests/disable_comments.rs new file mode 100644 index 000000000..2f45012ad --- /dev/null +++ b/tests/disable_comments/tests/disable_comments.rs @@ -0,0 +1,18 @@ +use std::{fs, path::PathBuf}; + +#[test] +fn test() { + let path = PathBuf::from(std::env!("CARGO_MANIFEST_DIR")) + .join("src") + .join("generated") + .join("test.rs"); + let s = fs::read_to_string(path).unwrap(); + assert!(!s.contains("This comment will be removed.")); + let mut count = 0_usize; + let mut index = 0_usize; + while let Some(found) = s[index..].find("This comment will not be removed.") { + index += found + 1; + count += 1; + } + assert_eq!(count, 2 + 3 + 3); // message: 2, client: 3, server: 3 +} diff --git a/tonic-build/src/client.rs b/tonic-build/src/client.rs index 3442ab867..0aff59d3d 100644 --- a/tonic-build/src/client.rs +++ b/tonic-build/src/client.rs @@ -1,3 +1,5 @@ +use std::collections::HashSet; + use super::{Attributes, Method, Service}; use crate::{generate_doc_comments, naive_snake_case}; use proc_macro2::TokenStream; @@ -14,13 +16,19 @@ pub fn generate( compile_well_known_types: bool, build_transport: bool, attributes: &Attributes, + disable_comments: &HashSet, ) -> TokenStream { let service_ident = quote::format_ident!("{}Client", service.name()); let client_mod = quote::format_ident!("{}_client", naive_snake_case(service.name())); - let methods = generate_methods(service, emit_package, proto_path, compile_well_known_types); + let methods = generate_methods( + service, + emit_package, + proto_path, + compile_well_known_types, + disable_comments, + ); let connect = generate_connect(&service_ident, build_transport); - let service_doc = generate_doc_comments(service.comment()); let package = if emit_package { service.package() } else { "" }; let path = format!( @@ -30,6 +38,12 @@ pub fn generate( service.identifier() ); + let service_doc = if disable_comments.contains(&path) { + TokenStream::new() + } else { + generate_doc_comments(service.comment()) + }; + let mod_attributes = attributes.for_mod(package); let struct_attributes = attributes.for_struct(&path); @@ -142,6 +156,7 @@ fn generate_methods( emit_package: bool, proto_path: &str, compile_well_known_types: bool, + disable_comments: &HashSet, ) -> TokenStream { let mut stream = TokenStream::new(); let package = if emit_package { service.package() } else { "" }; @@ -155,7 +170,15 @@ fn generate_methods( method.identifier() ); - stream.extend(generate_doc_comments(method.comment())); + if !disable_comments.contains(&format!( + "{}{}{}.{}", + package, + if package.is_empty() { "" } else { "." }, + service.identifier(), + method.identifier() + )) { + stream.extend(generate_doc_comments(method.comment())); + } let method = match (method.client_streaming(), method.server_streaming()) { (false, false) => generate_unary(method, proto_path, compile_well_known_types, path), diff --git a/tonic-build/src/manual.rs b/tonic-build/src/manual.rs index 3e9e4c8a1..5368fab7c 100644 --- a/tonic-build/src/manual.rs +++ b/tonic-build/src/manual.rs @@ -32,6 +32,7 @@ use super::{client, server, Attributes}; use proc_macro2::TokenStream; use quote::ToTokens; use std::{ + collections::HashSet, fs, path::{Path, PathBuf}, }; @@ -357,6 +358,7 @@ impl ServiceGenerator { "", // proto_path, -- not used false, // compile_well_known_types -- not used &Attributes::default(), + &HashSet::default(), ); self.servers.extend(server); } @@ -369,6 +371,7 @@ impl ServiceGenerator { false, // compile_well_known_types, -- not used self.builder.build_transport, &Attributes::default(), + &HashSet::default(), ); self.clients.extend(client); } diff --git a/tonic-build/src/prost.rs b/tonic-build/src/prost.rs index 69573e3cd..37eb37b91 100644 --- a/tonic-build/src/prost.rs +++ b/tonic-build/src/prost.rs @@ -3,6 +3,7 @@ use proc_macro2::TokenStream; use prost_build::{Config, Method, Service}; use quote::ToTokens; use std::{ + collections::HashSet, ffi::OsString, io, path::{Path, PathBuf}, @@ -29,6 +30,7 @@ pub fn configure() -> Builder { protoc_args: Vec::new(), include_file: None, emit_rerun_if_changed: std::env::var_os("CARGO").is_some(), + disable_comments: HashSet::default(), } } @@ -163,6 +165,7 @@ impl prost_build::ServiceGenerator for ServiceGenerator { &self.builder.proto_path, self.builder.compile_well_known_types, &self.builder.server_attributes, + &self.builder.disable_comments, ); self.servers.extend(server); } @@ -175,6 +178,7 @@ impl prost_build::ServiceGenerator for ServiceGenerator { self.builder.compile_well_known_types, self.builder.build_transport, &self.builder.client_attributes, + &self.builder.disable_comments, ); self.clients.extend(client); } @@ -229,6 +233,7 @@ pub struct Builder { pub(crate) protoc_args: Vec, pub(crate) include_file: Option, pub(crate) emit_rerun_if_changed: bool, + pub(crate) disable_comments: HashSet, out_dir: Option, } @@ -354,6 +359,12 @@ impl Builder { self } + /// Disable service and rpc comments emission. + pub fn disable_comments(mut self, path: impl AsRef) -> Self { + self.disable_comments.insert(path.as_ref().to_string()); + self + } + /// Emits GRPC endpoints with no attached package. Effectively ignores protofile package declaration from grpc context. /// /// This effectively sets prost's exported package to an empty string. diff --git a/tonic-build/src/server.rs b/tonic-build/src/server.rs index b026b4d1d..080a00fd7 100644 --- a/tonic-build/src/server.rs +++ b/tonic-build/src/server.rs @@ -1,3 +1,5 @@ +use std::collections::HashSet; + use super::{Attributes, Method, Service}; use crate::{generate_doc_comment, generate_doc_comments, naive_snake_case}; use proc_macro2::{Span, TokenStream}; @@ -14,6 +16,7 @@ pub fn generate( proto_path: &str, compile_well_known_types: bool, attributes: &Attributes, + disable_comments: &HashSet, ) -> TokenStream { let methods = generate_methods(service, proto_path, compile_well_known_types); @@ -22,11 +25,12 @@ pub fn generate( let server_mod = quote::format_ident!("{}_server", naive_snake_case(service.name())); let generated_trait = generate_trait( service, + emit_package, proto_path, compile_well_known_types, server_trait.clone(), + disable_comments, ); - let service_doc = generate_doc_comments(service.comment()); let package = if emit_package { service.package() } else { "" }; // Transport based implementations let path = format!( @@ -35,6 +39,13 @@ pub fn generate( if package.is_empty() { "" } else { "." }, service.identifier() ); + + let service_doc = if disable_comments.contains(&path) { + TokenStream::new() + } else { + generate_doc_comments(service.comment()) + }; + let named = generate_named(&server_service, &server_trait, &path); let mod_attributes = attributes.for_mod(package); let struct_attributes = attributes.for_struct(&path); @@ -167,11 +178,19 @@ pub fn generate( fn generate_trait( service: &T, + emit_package: bool, proto_path: &str, compile_well_known_types: bool, server_trait: Ident, + disable_comments: &HashSet, ) -> TokenStream { - let methods = generate_trait_methods(service, proto_path, compile_well_known_types); + let methods = generate_trait_methods( + service, + emit_package, + proto_path, + compile_well_known_types, + disable_comments, + ); let trait_doc = generate_doc_comment(&format!( " Generated trait containing gRPC methods that should be implemented for use with {}Server.", service.name() @@ -188,18 +207,31 @@ fn generate_trait( fn generate_trait_methods( service: &T, + emit_package: bool, proto_path: &str, compile_well_known_types: bool, + disable_comments: &HashSet, ) -> TokenStream { let mut stream = TokenStream::new(); + let package = if emit_package { service.package() } else { "" }; for method in service.methods() { let name = quote::format_ident!("{}", method.name()); let (req_message, res_message) = method.request_response_name(proto_path, compile_well_known_types); - let method_doc = generate_doc_comments(method.comment()); + let method_doc = if disable_comments.contains(&format!( + "{}{}{}.{}", + package, + if package.is_empty() { "" } else { "." }, + service.identifier(), + method.identifier() + )) { + TokenStream::new() + } else { + generate_doc_comments(method.comment()) + }; let method = match (method.client_streaming(), method.server_streaming()) { (false, false) => {