chore: bump prost and prost types in template

einride · Oct 9, 2022 · 4a4b986 · 4a4b986
1 parent f93ab9c
commit 4a4b986
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 18 deletions.
diff --git a/src/Cargo.toml.tmpl b/src/Cargo.toml.tmpl
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 bytes = "1.0"
-prost = "0.7"
-prost-types = "0.7"
+prost = "0.11.0"
+prost-types = "0.11.1"
 tonic = { version = "0.4",  default-features = false, features = ["transport", "prost"] }
 once_cell = "1.15.0"
diff --git a/src/main.rs b/src/main.rs
@@ -12,8 +12,6 @@ use walkdir::WalkDir;
 
 use module::Module;
 
-pub const DESCRIPTOR_PATH: &str = "resources";
-
 #[derive(StructOpt, Debug)]
 #[structopt(name = env!("CARGO_PKG_NAME"))]
 struct Opt {
@@ -43,9 +41,13 @@ struct Opt {
 fn main() -> Result<()> {
     let opt = Opt::from_args();
     let src_dir = opt.output_dir.join("src");
+    let resources_dir = opt.output_dir.join("resources");
     let _ignore_err = std::fs::remove_dir_all(&src_dir);
-    fs::create_dir_all(DESCRIPTOR_PATH).context(format!("create dir ({})", src_dir.display()))?;
+    fs::create_dir_all(&resources_dir)
+        .context(format!("create dir ({})", resources_dir.display()))?;
     fs::create_dir_all(&src_dir).context(format!("create dir ({})", src_dir.display()))?;
+    let descriptor_path = PathBuf::from(&resources_dir).join("file_descriptor_set.bin");
+
     {
         // Find all .proto files in any of the root paths.
         let mut proto_paths: Vec<String> = opt
@@ -61,18 +63,10 @@ fn main() -> Result<()> {
             .collect();
         proto_paths.sort();
 
-        let descriptor_path = PathBuf::from(&src_dir)
-            .parent()
-            .unwrap()
-            .join(DESCRIPTOR_PATH)
-            .join("descriptor.bin");
-
         let mut config = prost_build::Config::new();
-        config
-            .file_descriptor_set_path(descriptor_path)
-            .out_dir(&src_dir);
-        let mut builder = prost_reflect_build::Builder::new();
-        builder
+        config.out_dir(&src_dir);
+        prost_reflect_build::Builder::new()
+            .file_descriptor_set_path(&descriptor_path)
             .configure(&mut config, &proto_paths[..], &opt.root[..])
             .context(format!(
                 "generate reflective protobuf ({})",
@@ -92,10 +86,13 @@ fn main() -> Result<()> {
         scope.raw("#![allow(clippy::unreadable_literal)]");
 
         // Adding getter for descriptor pool
-        let line = format!("static DESCRIPTOR_POOL: Lazy<DescriptorPool>
-        = Lazy::new(|| DescriptorPool::decode(include_bytes!(\"{}/descriptor.bin\").as_ref()).unwrap());", DESCRIPTOR_PATH);
         scope.import("prost_reflect", "DescriptorPool");
         scope.import("once_cell::sync", "Lazy");
+        let line = format!(
+            "static DESCRIPTOR_POOL: Lazy<DescriptorPool>
+        = Lazy::new(|| DescriptorPool::decode(include_bytes!(\"..{}\").as_ref()).unwrap());",
+            strip_prefix(descriptor_path, &opt.output_dir).display()
+        );
         scope.raw(line.as_str());
 
         Module::build(Path::new(&src_dir), &[&lib_rs_path])?.codegen(&mut scope);
@@ -123,6 +120,14 @@ fn main() -> Result<()> {
     )
 }
 
+fn strip_prefix(path: PathBuf, prefix: &Path) -> PathBuf {
+    if !path.starts_with(prefix) {
+        return path;
+    }
+
+    PathBuf::from(path.to_str().unwrap()[prefix.to_str().unwrap().len()..].to_owned())
+}
+
 fn write_cargo_toml(
     template_path: Option<PathBuf>,
     output_path: &Path,
@@ -158,3 +163,16 @@ fn write_cargo_toml(
         .write_all(content.as_bytes())
         .context("error writing Cargo.toml")
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_strip() {
+        let path = PathBuf::from("path/to/jassob");
+        let prefix = PathBuf::from("path/to/");
+
+        assert_eq!("jassob", strip_prefix(path, &prefix).to_str().unwrap())
+    }
+}