Skip to content
Open
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Options:
--derive-builders Derive builders for generated record structs
--derive-schemas Derive AvroSchema for generated record structs
--extra_derives Append extra derive macros list to the generated record structs
--prefix-namespace Prefix the namespace(if any) to generated types
-h, --help Print help
-V, --version Print version
```
Expand Down
14 changes: 11 additions & 3 deletions src/generator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@ impl Generator {
Schema::Array(ArraySchema {
items: ref inner, ..
}) => {
let type_str = array_type(inner, &gs)?;
let type_str = array_type(inner, &gs, self.templater.prefix_namespace)?;
gs.put_type(&s, type_str)
}
Schema::Map(MapSchema {
types: ref inner, ..
}) => {
let type_str = map_type(inner, &gs)?;
let type_str = map_type(inner, &gs, self.templater.prefix_namespace)?;
gs.put_type(&s, type_str)
}

Expand All @@ -130,7 +130,7 @@ impl Generator {
}

// Register inner union for it to be used as a nested type later
let type_str = union_type(union, &gs, true)?;
let type_str = union_type(union, &gs, true, self.templater.prefix_namespace)?;
gs.put_type(&s, type_str)
}

Expand Down Expand Up @@ -286,6 +286,7 @@ pub struct GeneratorBuilder {
derive_builders: bool,
derive_schemas: bool,
extra_derives: Vec<String>,
prefix_namespace: bool,
}

impl Default for GeneratorBuilder {
Expand All @@ -298,6 +299,7 @@ impl Default for GeneratorBuilder {
derive_builders: false,
derive_schemas: false,
extra_derives: vec![],
prefix_namespace: false,
}
}
}
Expand Down Expand Up @@ -361,6 +363,11 @@ impl GeneratorBuilder {
self
}

pub fn prefix_namespace(mut self, prefix_namespace: bool) -> GeneratorBuilder {
self.prefix_namespace = prefix_namespace;
self
}

/// Create a [`Generator`](Generator) with the builder parameters.
pub fn build(self) -> Result<Generator> {
let mut templater = Templater::new()?;
Expand All @@ -371,6 +378,7 @@ impl GeneratorBuilder {
templater.derive_builders = self.derive_builders;
templater.derive_schemas = self.derive_schemas;
templater.extra_derives = self.extra_derives;
templater.prefix_namespace = self.prefix_namespace;
Ok(Generator { templater })
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ struct Args {
/// Extract Derives for generated record structs, comma separated, e.g. `std::fmt::Display,std::string::ToString`
#[clap(long, value_delimiter = ',')]
pub extra_derives: Vec<String>,

/// Prefix namespace to name
#[clap(long)]
pub prefix_namespace: bool,
}

fn run() -> Result<(), Box<dyn Error>> {
Expand Down Expand Up @@ -75,6 +79,7 @@ fn run() -> Result<(), Box<dyn Error>> {
.derive_builders(args.derive_builders)
.derive_schemas(args.derive_schemas)
.extra_derives(args.extra_derives)
.prefix_namespace(args.prefix_namespace)
.build()?;

g.generate(&source, &mut out)?;
Expand Down
Loading