no more handlebar caching

Author: jrouaix

codegenr/src/lib.rs

@@ -26,13 +26,6 @@ pub type OptionsMap = BTreeMap<String, Options>;
 
 type OriginalDocumentsHash = HashMap<loaders::DocumentPath, Rc<Value>>;
 type ResolvedDocumentsHash = HashMap<loaders::DocumentPath, Rc<Value>>;
-type HandlebarsHash<'a> = HashMap<HandlebarsReusableConf, (String, Handlebars<'a>)>;
-
-#[derive(Debug, PartialEq, Eq, Hash)]
-struct HandlebarsReusableConf {
-  pub templates: Vec<String>,
-  pub custom_helpers: Vec<String>,
-}
 
 #[derive(Error, Debug)]
 pub enum SaverError {
@@ -55,11 +48,10 @@ pub struct Options {
 pub fn run_all_codegenr(options_map: OptionsMap) -> Result<(), CodegenrError> {
   let mut original_cache = Default::default();
   let mut resolved_cache = Default::default();
-  let mut reusables = Default::default();
   let mut errors_count = 0;
   for (name, options) in options_map {
     info!("Running code generation section `{}`", name);
-    if let Err(e) = run_codegenr(options, &mut original_cache, &mut resolved_cache, &mut reusables) {
+    if let Err(e) = run_codegenr(options, &mut original_cache, &mut resolved_cache) {
       error!("Error while executing the `{}` section: `{}`.", name, e);
       errors_count += 1;
     }
@@ -78,8 +70,7 @@ pub fn run_all_codegenr(options_map: OptionsMap) -> Result<(), CodegenrError> {
 pub fn run_one_codegenr(options: Options) -> Result<(), errors::CodegenrError> {
   let mut original_cache = Default::default();
   let mut resolved_cache = Default::default();
-  let mut reusables = Default::default();
-  run_codegenr(options, &mut original_cache, &mut resolved_cache, &mut reusables)
+  run_codegenr(options, &mut original_cache, &mut resolved_cache)
 }
 
 #[allow(clippy::result_large_err)]
@@ -88,7 +79,6 @@ fn run_codegenr(
   options: Options,
   original_cache: &mut OriginalDocumentsHash,
   resolved_cache: &mut ResolvedDocumentsHash,
-  reusables: &mut HandlebarsHash,
 ) -> Result<(), errors::CodegenrError> {
   let document = loaders::DocumentPath::parse(&options.source)?;
   let json = resolver::resolve_refs(document, original_cache, resolved_cache)?;
@@ -97,30 +87,22 @@ fn run_codegenr(
     save_intermediate(&options.intermediate, "resolved.json", &format!("{:#}", json))?;
   }
 
-  let (main_template_name, mut handlebars) = reusables
-    .entry(HandlebarsReusableConf {
-      custom_helpers: options.custom_helpers,
-      templates: options.templates,
-    })
-    .or_insert_with_key(|conf| {
-      let mut all_templates = vec![];
-      for t in conf.templates.iter() {
-        let templates = render::get_templates_from_directory(t).unwrap(); //?;
-        all_templates.extend(templates);
-      }
-      let templates = render::TemplateCollection::from_list(all_templates).unwrap(); //?;
-
-      let mut handlebars = Handlebars::new();
-      helpers::handlebars_misc_setup(&mut handlebars);
-      helpers::handlebars_stateless_setup(&mut handlebars);
-
-      templates.setup_handlebars(&mut handlebars).unwrap(); // todo?;
-      custom::handlebars_setup(&mut handlebars, &conf.custom_helpers).unwrap(); //?;
-      (templates.main_template_name().to_owned(), handlebars)
-    })
-    .clone();
+  let mut all_templates = vec![];
+  for t in options.templates.iter() {
+    let templates = render::get_templates_from_directory(t)?;
+    all_templates.extend(templates);
+  }
 
+  let mut handlebars = Handlebars::new();
+  helpers::handlebars_misc_setup(&mut handlebars);
+  helpers::handlebars_stateless_setup(&mut handlebars);
   helpers::handlebars_statefull_setup(&mut handlebars, options.global_parameters);
+  custom::handlebars_setup(&mut handlebars, &options.custom_helpers)?;
+
+  let templates = render::TemplateCollection::from_list(all_templates)?;
+  templates.setup_handlebars(&mut handlebars)?;
+
+  let main_template_name = templates.main_template_name().to_owned();
 
   let rendered = handlebars.render(&main_template_name, &(*json))?;