misc fixes;

core/src/fs.rs

@@ -65,7 +65,7 @@ fn copy_files_recursive(
 }
 
 /// Copy static files to the destination path.
-pub fn copy_files(dest_path: &Path, project_template: &str, ignore: &[&str]) -> anyhow::Result<()> {
+pub fn copy_builtin_files(dest_path: &Path, project_template: &str, ignore: &[&str]) -> anyhow::Result<()> {
     copy_files_recursive(
         dest_path,
         TEMPLATE_DIR.get_dir(project_template).unwrap(),

core/src/template.rs

@@ -7,7 +7,7 @@ use crate::{OutputOptions, write_file};
 pub static TEMPLATE_DIR: include_dir::Dir<'_> =
     include_dir::include_dir!("$CARGO_MANIFEST_DIR/template");
 
-pub fn copy_templates(
+pub fn copy_builtin_templates(
     opts: &OutputOptions,
     tera: &tera::Tera,
     context: &Context,

core/template/rust/Cargo.toml.j2

@@ -15,7 +15,7 @@ repository = "https://github.com/{{ github_repo }}"
 doctest = false
 
 [dependencies]
-httpclient = "0.18.0"
+httpclient = "0.19.0"
 serde = { version = "1.0.137", features = ["derive"] }
 serde_json = "1.0.81"
 futures = "0.3.25"

libninja/Cargo.toml

@@ -30,8 +30,8 @@ tera = "1.19.0"
 include_dir = "0.7.3"
 regex = "1.9.0"
 indoc = "2.0.2"
-cargo_toml = "0.15.3"
-toml = "0.7.6"
+cargo_toml = "0.17.1"
+toml = "0.8.8"
 topo_sort = "0.4.0"
 url = "2.4.0"
 http = "0.2.9"
@@ -45,6 +45,7 @@ ln-core = { path = "../core" }
 libninja_mir = { path = "../mir" }
 libninja_hir = { path = "../hir" }
 libninja_commercial = { path = "../commercial" , optional = true }
+ignore = "0.4.21"
 
 [dev-dependencies]
 env_logger = "0.10.0"

libninja/src/rust.rs

@@ -2,7 +2,7 @@ use std::hash::Hash;
 use std::path::Path;
 use std::thread::current;
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use convert_case::{Case, Casing};
 use indoc::formatdoc;
 use openapiv3::OpenAPI;
@@ -12,7 +12,7 @@ use quote::quote;
 use codegen::ToRustIdent;
 use codegen::ToRustType;
 use format::format_code;
-use ln_core::{copy_files, copy_templates, create_context, get_template_file, prepare_templates};
+use ln_core::{copy_builtin_files, copy_builtin_templates, create_context, get_template_file, prepare_templates};
 use ::mir::{Visibility, Import, File};
 use ln_core::fs;
 use hir::{HirSpec, IntegerSerialization, DateSerialization};
@@ -91,6 +91,24 @@ pub fn calculate_extras(spec: &HirSpec) -> Extras {
 }
 
 
+pub fn copy_from_target_templates(opts: &OutputOptions) -> Result<()> {
+    let template_path = opts.dest_path.join("template");
+    for path in ignore::Walk::new(&template_path) {
+        let path: ignore::DirEntry = path?;
+        let rel_path = path.path().strip_prefix(&template_path)?;
+        if rel_path.to_str().unwrap() == "src/lib.rs" {
+            continue;
+        }
+        if path.file_type().expect(&format!("Failed to read file: {}", path.path().display())).is_file() {
+            let dest = opts.dest_path.join(rel_path);
+            fs::create_dir_all(dest.parent().unwrap())?;
+            //copy the file
+            std::fs::copy(&path.path(), &dest)?;
+        }
+    }
+    Ok(())
+}
+
 pub fn generate_rust_library(spec: OpenAPI, opts: OutputOptions) -> Result<()> {
     let config = &opts.library_options.config;
     let src_path = opts.dest_path.join("src");
@@ -123,8 +141,9 @@ pub fn generate_rust_library(spec: OpenAPI, opts: OutputOptions) -> Result<()> {
 
     context.insert("client_docs_url", &format!("https://docs.rs/{}", opts.library_options.package_name));
 
-    copy_files(&opts.dest_path, &opts.library_options.language.to_string(), &["src"])?;
-    copy_templates(&opts, &tera, &context)?;
+    copy_builtin_files(&opts.dest_path, &opts.library_options.language.to_string(), &["src"])?;
+    copy_builtin_templates(&opts, &tera, &context)?;
+    copy_from_target_templates(&opts)?;
 
     bump_version_and_update_deps(&extras, &opts)?;