Add frontend module (#69)

Author: jeparlefrancais

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+* refactor darklua frontend ([#69](https://github.com/seaofvoices/darklua/pull/69)):
+  * the `--config-path` argument of the `minify` command was removed
+  * the configuration file does not accept the `column_span` field anymore (use the [`generator` field](https://darklua.com/docs/generators/) instead)
+  * darklua can now also read `.luau` files
+
 ## 0.8.0
 
 * update configuration file ([!60](https://gitlab.com/seaofvoices/darklua/-/merge_requests/60))

Cargo.lock

@@ -30,6 +30,7 @@ structopt = "0.3.25"
 full_moon = { version = "0.15.1", features = ["roblox"] }
 serde = { version = "1.0", features = ["derive"] }
 json5 = "0.4"
+elsa = "1.7.0"
 
 [dev-dependencies]
 assert_cmd = "2.0.4"
@@ -41,6 +42,10 @@ rand_distr = "0.2.2"
 regex = "1.5.5"
 tempfile = "3.3.0"
 
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+node-sys = "0.4.2"
+web-sys = { version = "0.3.60", features = ["Window", "Performance"] }
+
 # This is needed because when runnin `cargo test`, the library and its
 # dependencies are build with the `dev` profile. To make sure full_moon
 # does not stack overflow when parsing complex code, it needs to be compiled

Cargo.toml

@@ -1,12 +1,6 @@
 mod utils;
 
-use darklua_core::{
-    generator::{LuaGenerator, TokenBasedLuaGenerator},
-    nodes::Block,
-    rules::{self, get_default_rules, Context, Rule},
-    Parser,
-};
-use serde::{Deserialize, Serialize};
+use darklua_core::{Configuration, Options, Resources};
 use utils::set_panic_hook;
 use wasm_bindgen::{prelude::wasm_bindgen, JsValue};
 
@@ -16,26 +10,12 @@ use wasm_bindgen::{prelude::wasm_bindgen, JsValue};
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
-#[derive(Serialize, Deserialize)]
-pub struct Config {
-    #[serde(default = "get_default_rules")]
-    pub rules: Vec<Box<dyn Rule>>,
-}
-
-fn generate_code(original_code: &str, block: &Block) -> String {
-    let mut generator = TokenBasedLuaGenerator::new(original_code);
-    generator.write_block(block);
-    generator.into_string()
-}
-
 #[wasm_bindgen]
 pub fn process_code(code: &str, opt_config: JsValue) -> Result<String, JsValue> {
     set_panic_hook();
 
     let config = if opt_config.is_undefined() {
-        Config {
-            rules: get_default_rules(),
-        }
+        Configuration::default()
     } else if opt_config.is_object() {
         let config_string = String::from(js_sys::JSON::stringify(&opt_config)?);
         json5::from_str(&config_string)
@@ -50,32 +30,34 @@ pub fn process_code(code: &str, opt_config: JsValue) -> Result<String, JsValue>
             })?
     };
 
-    let parser = Parser::default().preserve_tokens();
+    let resources = Resources::from_memory();
+    const LOCATION: &str = "file.lua";
+    resources.write(LOCATION, code).unwrap();
 
-    let mut block = parser.parse(code).map_err(|error| error.to_string())?;
+    let result = darklua_core::process(
+        &resources,
+        Options::new(LOCATION).with_configuration(config),
+    );
 
-    for (index, rule) in config.rules.iter().enumerate() {
-        let mut context = Context::default();
-        rule.process(&mut block, &mut context)
-            .map_err(|rule_errors| {
-                let errors: Vec<_> = rule_errors.iter().map(ToString::to_string).collect();
-                format!(
-                    "error with rule {} ({}):\n -> {}",
-                    rule.get_name().to_owned(),
-                    index,
-                    errors.join("\n -> "),
-                )
-            })?;
-    }
-
-    let lua_code = generate_code(&code, &block);
+    match result.result() {
+        Ok(()) => {
+            let lua_code = resources.get(LOCATION).unwrap();
 
-    Ok(lua_code)
+            Ok(lua_code)
+        }
+        Err(errors) => {
+            let errors: Vec<_> = errors
+                .into_iter()
+                .map(|error| format!("-> {}", error))
+                .collect();
+            Err(format!("unable to process code:\n{}", errors.join("\n")).into())
+        }
+    }
 }
 
 #[wasm_bindgen]
 pub fn get_all_rule_names() -> Box<[JsValue]> {
-    rules::get_all_rule_names()
+    darklua_core::rules::get_all_rule_names()
         .into_iter()
         .map(JsValue::from_str)
         .collect::<Vec<_>>()

site/darklua-wasm/src/lib.rs

@@ -20,8 +20,7 @@ fn main() {
     match darklua.run() {
         Ok(()) => {}
         Err(err) => {
-            eprintln!("{}", err);
-            process::exit(1);
+            process::exit(err.exit_code());
         }
     }
 }