Add the StyleType enum

README.md

@@ -61,8 +61,8 @@ id = 583095803
     -   Generate a Typescript definition file.
 -   `luau`: boolean (optional)
     -   Use the `luau` file extension.
--   `tarmac`: boolean (optional)
-    -   Use tarmac-styled code generation.
+-   `style`: string (optional)
+    -   The code-generation style to use. Defaults to `flat`.
 -   `output_name`: string (optional)
     -   The name for the generated files. Defaults to `assets`.
 -   `existing`: map<string, ExistingAsset> (optional)

src/config.rs

@@ -2,6 +2,13 @@ use std::collections::HashMap;
 
 use serde::{Deserialize, Serialize};
 
+#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[serde(rename_all = "snake_case")]
+pub enum StyleType {
+    Flat,
+    Nested,
+}
+
 #[derive(Debug, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "snake_case")]
 pub enum CreatorType {
@@ -29,7 +36,7 @@ pub struct Config {
     pub output_name: Option<String>,
     pub typescript: Option<bool>,
     pub luau: Option<bool>,
-    pub tarmac: Option<bool>,
+    pub style: Option<StyleType>,
 
     pub existing: Option<HashMap<String, ExistingAsset>>,
 }

src/main.rs

@@ -180,23 +180,15 @@ async fn main() -> anyhow::Result<()> {
         }));
 
     let lua_filename = format!("{}.{}", state.output_name, state.lua_extension);
-    let lua_output = if state.tarmac {
-        tarmac::generate_lua
-    } else {
-        generate_lua
-    }(&state.new_lockfile, asset_dir_str);
+    let lua_output = generate_lua(&state.new_lockfile, asset_dir_str);
 
     write(Path::new(&state.write_dir).join(lua_filename), lua_output?)
         .await
         .context("Failed to write output Lua file")?;
 
     if state.typescript {
         let ts_filename = format!("{}.d.ts", state.output_name);
-        let ts_output = if state.tarmac {
-            tarmac::generate_ts
-        } else {
-            generate_ts
-        }(
+        let ts_output = generate_ts(
             &state.new_lockfile,
             asset_dir_str,
             state.output_name.as_str(),

src/state.rs

@@ -1,6 +1,6 @@
 use crate::{
     args::Args,
-    config::{Config, CreatorType, ExistingAsset},
+    config::{Config, CreatorType, ExistingAsset, StyleType},
     LockFile,
 };
 use anyhow::Context;
@@ -35,7 +35,7 @@ pub struct State {
     pub output_name: String,
     pub lua_extension: String,
 
-    pub tarmac: bool,
+    pub style: StyleType,
 
     pub font_db: Database,
 
@@ -74,7 +74,7 @@ impl State {
             .to_string();
 
         let typescript = config.typescript.unwrap_or(false);
-        let tarmac = config.tarmac.unwrap_or(false);
+        let style = config.style.unwrap_or(StyleType::Flat);
 
         let lua_extension = String::from(if config.luau.unwrap_or(false) {
             "luau"
@@ -104,7 +104,7 @@ impl State {
             typescript,
             output_name,
             lua_extension,
-            tarmac,
+            style,
             font_db,
             existing_lockfile,
             new_lockfile,