Remove luau option, and make it standard behavior. Closes #66

jackTabsCode · Jun 25, 2024 · 95bfcdc · 95bfcdc
1 parent 466ddd0
commit 95bfcdc
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -55,7 +55,6 @@ write_dir = "src/shared/"
 
 [codegen]
 typescript = true
-luau = true
 style = "flat"
 output_name = "assets"
 
@@ -93,8 +92,6 @@ id = 9670971
 
 -   `typescript`: boolean (optional)
     -   Generate a Typescript definition file.
--   `luau`: boolean (optional)
-    -   Use the `luau` file extension.
 -   `style`: "flat" | "nested" (optional)
     -   The code-generation style to use. Defaults to `flat`. If you would like to have an experience similar to [Tarmac](https://github.com/rojo-rbx/tarmac), use `nested`.
 -   `output_name`: string (optional)

diff --git a/src/commands/init.rs b/src/commands/init.rs
@@ -58,12 +58,6 @@ pub async fn init() -> anyhow::Result<()> {
         .prompt()
         .unwrap_or_else(|_| exit(1));
 
-    let luau = Confirm::new(".luau extension")
-        .with_help_message("Use .luau extension for Lua files.")
-        .with_default(false)
-        .prompt()
-        .unwrap_or_else(|_| exit(1));
-
     let codegen_style = Select::new("Style", vec![CodegenStyle::Flat, CodegenStyle::Nested])
         .with_help_message("The style to use for generated code.")
         .prompt()
@@ -83,7 +77,6 @@ pub async fn init() -> anyhow::Result<()> {
         codegen: CodegenConfig {
             output_name,
             typescript: Some(typescript),
-            luau: Some(luau),
             style: Some(codegen_style),
             strip_extension: Some(strip_extension),
         },

diff --git a/src/commands/sync/config.rs b/src/commands/sync/config.rs
@@ -54,7 +54,6 @@ pub struct ExistingAsset {
 pub struct CodegenConfig {
     pub output_name: Option<String>,
     pub typescript: Option<bool>,
-    pub luau: Option<bool>,
     pub style: Option<CodegenStyle>,
     pub strip_extension: Option<bool>,
 }

diff --git a/src/commands/sync/mod.rs b/src/commands/sync/mod.rs
@@ -146,7 +146,7 @@ pub async fn sync(args: SyncArgs, existing_lockfile: LockFile) -> anyhow::Result
             )
         }));
 
-    let lua_filename = format!("{}.{}", state.output_name, state.lua_extension);
+    let lua_filename = format!("{}.{}", state.output_name, "luau");
     let lua_output = generate_lua(
         &state.new_lockfile,
         asset_dir_str,
@@ -156,7 +156,7 @@ pub async fn sync(args: SyncArgs, existing_lockfile: LockFile) -> anyhow::Result
 
     write(Path::new(&state.write_dir).join(lua_filename), lua_output?)
         .await
-        .context("Failed to write output Lua file")?;
+        .context("Failed to write output Luau file")?;
 
     if state.typescript {
         let ts_filename = format!("{}.d.ts", state.output_name);

diff --git a/src/commands/sync/state.rs b/src/commands/sync/state.rs
@@ -50,7 +50,6 @@ pub struct SyncState {
 
     pub typescript: bool,
     pub output_name: String,
-    pub lua_extension: String,
     pub style: CodegenStyle,
     pub strip_extension: bool,
 
@@ -99,12 +98,6 @@ impl SyncState {
         let typescript = config.codegen.typescript.unwrap_or(false);
         let style = config.codegen.style.unwrap_or(CodegenStyle::Flat);
 
-        let lua_extension = String::from(if config.codegen.luau.unwrap_or(false) {
-            "luau"
-        } else {
-            "lua"
-        });
-
         let strip_extension = config.codegen.strip_extension.unwrap_or(false);
 
         let mut font_db = Database::new();
@@ -129,7 +122,6 @@ impl SyncState {
             creator,
             typescript,
             output_name,
-            lua_extension,
             style,
             strip_extension,
             font_db,