templates wip

src/app.rs

@@ -50,8 +50,7 @@ impl App {
  Some(CliCommand::Test) => {
  let input_path = Path::new("../test-game/dist/.rune/input/");
  let binary = std::fs::read(input_path.join("test-game.wasm")).unwrap();
- rune::runtime::test(input_path.to_path_buf(), binary);
-
+ rune::runtime::test(input_path.to_path_buf(), binary).await;
  },
  Some(CliCommand::Run { release }) => {
  crate::commands::build::build(release).await?;

src/commands/bundle/macos.rs

@@ -247,7 +247,7 @@ fn create_icns_file(
  // }
 
  // Otherwise, read available images and pack them into a new ICNS file.
- let mut family = icns::IconFamily::new();
+ let family = icns::IconFamily::new();
 
  fn add_icon_to_family(
  icon: image::DynamicImage,

src/commands/bundle/windows.rs

@@ -15,7 +15,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<()> {
  fs::remove_dir_all(&msi_path)?;
  }
 
- let mut package = new_empty_package(&msi_path)?;
+ let package = new_empty_package(&msi_path)?;
 
  Ok(())
 }

src/commands/docs.rs

@@ -76,7 +76,7 @@ pub async fn docs(config: &Config, mode: &Mode) -> Result<()> {
  Action::Resize(w, h) => {
  tui.resize(Rect::new(0, 0, w, h))?;
  tui.draw(|f| {
- let r = docs.draw(f, f.size());
+ let r = docs.draw(f, f.area());
  if let Err(e) = r {
  action_tx
  .send(Action::Error(format!(
@@ -89,7 +89,7 @@ pub async fn docs(config: &Config, mode: &Mode) -> Result<()> {
  }
  Action::Render => {
  tui.draw(|f| {
- let r = docs.draw(f, f.size());
+ let r = docs.draw(f, f.area());
  if let Err(e) = r {
  action_tx
  .send(Action::Error(format!(

src/commands/docs/docs.rs

@@ -40,7 +40,7 @@ impl CurrentItem {
  format!("{}: {}", type_def.kind.as_str(), type_def.name.clone().unwrap_or_default())
  },
  CurrentItem::Function(func) => {
- let name = func.item_name().clone();
+ let name = func.item_name();
  let params = func.params.iter().skip(1).map(|(param_name, param_type)| {
  format!("{param_name}")
  }).collect::<Vec<_>>().join(", ");
@@ -126,7 +126,7 @@ fn render_function_list_item<'a>(package: &UnresolvedPackage, func: &Function) -
  let item = CurrentItem::Function(func.clone());
  match func.kind {
  wit_parser::FunctionKind::Freestanding => {
- let name = func.item_name().clone();
+ let name = func.item_name();
  let params = func.params.iter().skip(1).map(|(param_name, param_type)| {
  format!("{param_name}")
  }).collect::<Vec<_>>().join(", ");
@@ -141,7 +141,7 @@ fn render_function_list_item<'a>(package: &UnresolvedPackage, func: &Function) -
  )
  },
  wit_parser::FunctionKind::Method(type_id) => {
- let name = func.item_name().clone();
+ let name = func.item_name();
  let params = func.params.iter().skip(1).map(|(param_name, param_type)| {
  format!("{param_name}")
  }).collect::<Vec<_>>().join(", ");
@@ -156,7 +156,7 @@ fn render_function_list_item<'a>(package: &UnresolvedPackage, func: &Function) -
  )
  },
  wit_parser::FunctionKind::Static(type_id) => {
- let name = func.item_name().clone();
+ let name = func.item_name();
  let params = func.params.iter().skip(1).map(|(param_name, param_type)| {
  format!("{param_name}")
  }).collect::<Vec<_>>().join(", ");
@@ -171,7 +171,7 @@ fn render_function_list_item<'a>(package: &UnresolvedPackage, func: &Function) -
  )
  },
  wit_parser::FunctionKind::Constructor(type_id) => {
- let name = func.item_name().clone();
+ let name = func.item_name();
  let params = func.params.iter().skip(1).map(|(param_name, param_type)| {
  format!("{param_name}")
  }).collect::<Vec<_>>().join(", ");

src/commands/new.rs

@@ -2,7 +2,6 @@ use crate::cli::NewSubcommand;
 
 use crate::Result;
 
-pub mod common;
 pub mod game;
 
 pub async fn new(new: &NewSubcommand) -> Result<()> {

src/commands/new/game.rs

@@ -1,23 +1,54 @@
-use std::{env, fs, path::Path};
+use std::{fs, io::{Read, Write}, borrow::Cow, env, path::{Path, PathBuf}};
+use rust_embed::Embed;
 
 use crate::Result;
 
-use super::common::template_files_recursively;
+use liquid::Object;
+
+#[derive(Embed)]
+#[folder = "src/templates"]
+struct Templates;
 
 pub async fn game(identifier: &String, name: &String, template: &Option<String>) -> Result<()> {
  let template_key = template.clone().unwrap_or("hello-world".to_owned());
 
- let template_path = format!("src/templates/{template_key}");
+ let paths = Templates::iter()
+ .filter(|p| p.starts_with(&template_key))
+ .collect::<Vec<_>>();
 
- let template_root_path = env::current_exe().ok().unwrap().parent().unwrap().parent().unwrap().parent().unwrap().join(&template_path);
  let project_root_path = env::current_dir().ok().unwrap();
 
  let globals = liquid::object!({
  "identifier": identifier,
  "name": name
  });
 
- template_files_recursively(project_root_path.as_path(), &template_root_path, &template_root_path, &globals)?;
+ template_files(&template_key, project_root_path.as_path(), paths, &globals)?;
+
+ Ok(())
+}
+
+
+pub fn template_files(template_key: &str, project_root: &Path, paths: Vec<Cow<'static, str>>, globals: &Object) -> crate::Result<()> {
+ for path in paths {
+ let contents = Templates::get(path.as_ref()).unwrap();
+ let relative_path = path.strip_prefix(&template_key).unwrap();
+ let destination_path = project_root.join(PathBuf::from(relative_path));
+ let mut file = fs::OpenOptions::new()
+ .create(true)
+ .read(true)
+ .write(true)
+ .open(&destination_path.clone())?;
+
+ let template = liquid::ParserBuilder::with_stdlib()
+ .build().unwrap()
+ .parse(&std::str::from_utf8(&contents.data).unwrap())
+ .unwrap();
+
+ let contents = template.render(&globals).unwrap();
+
+ file.write_all(contents.as_bytes())?;
+ }
 
  Ok(())
 }