Merge branch 'funcsrc' into 'master'

feat: supply source file name for functions files

Closes #64

See merge request larswirzenius/subplot!51

1 files changed, 19 insertions, 3 deletions

diff --git a/src/codegen.rs b/src/codegen.rs
index 9895783..c1da2f8 100644
--- a/src/codegen.rs
+++ b/src/codegen.rs
@@ -2,10 +2,11 @@ use crate::{Document, SubplotError, TemplateSpec};
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::prelude::{Read, Write};
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 use base64::encode;
 
+use serde::Serialize;
 use tera::{Context, Tera, Value};
 
 use anyhow::Result;
@@ -42,11 +43,11 @@ fn context(doc: &mut Document) -> Result<Context> {
     context.insert("files", doc.files());
 
     let funcs_filenames = doc.meta().functions_filenames();
-    let mut funcs = String::new();
+    let mut funcs = vec![];
     for filename in funcs_filenames {
         let content =
             cat(filename).map_err(|e| SubplotError::FunctionsFileNotFound(filename.into(), e))?;
-        funcs.push_str(&content);
+        funcs.push(Func::new(filename, content));
     }
     context.insert("functions", &funcs);
 
@@ -83,3 +84,18 @@ fn base64(v: &Value, _: &HashMap<String, Value>) -> tera::Result<Value> {
         )),
     }
 }
+
+#[derive(Debug, Serialize)]
+pub struct Func {
+    pub source: PathBuf,
+    pub code: String,
+}
+
+impl Func {
+    pub fn new(source: &Path, code: String) -> Func {
+        Func {
+            source: source.to_path_buf(),
+            code,
+        }
+    }
+}