refactor: remove no longer required TomlValue struct

assets/inputs/readme_example.corn

@@ -26,4 +26,4 @@ let {
 
     config.port = 8080
     config.hostname = null
-}
+}

assets/outputs/toml/basic.toml

@@ -1,2 +1,2 @@
-foo = 'bar'
+foo = "bar"
 

assets/outputs/toml/basic_empty_let.toml

@@ -1,2 +1,2 @@
-foo = 'bar'
+foo = "bar"
 

assets/outputs/toml/chained.toml

@@ -1,3 +1,3 @@
 [foo]
-bar = 'baz'
+bar = "baz"
 

assets/outputs/toml/chained_complex.toml

@@ -1,9 +1,9 @@
 [foo]
-qux = true
 quux = [
-    'green eggs',
-    'ham',
+    "green eggs",
+    "ham",
 ]
+qux = true
 
 [foo.bar]
 baz = 42

assets/outputs/toml/char.toml

@@ -1,2 +1,2 @@
-foo = 'a'
+foo = "a"
 

assets/outputs/toml/comment.toml

@@ -1,2 +1,2 @@
-foo = 'bar'
+foo = "bar"
 

assets/outputs/toml/compact.toml

@@ -1,6 +1,6 @@
 eight = [
-    'foo',
-    'bar',
+    "foo",
+    "bar",
 ]
 eleven = [
     [],
@@ -10,11 +10,6 @@ nine = [
     true,
     false,
 ]
-ten = []
-
-[[twelve]]
-
-[[twelve]]
 
 [five]
 
@@ -23,12 +18,13 @@ bar = false
 foo = true
 
 [one]
-bar = 'foo'
-foo = 'bar'
+bar = "foo"
+foo = "bar"
 
 [seven]
 bar = []
 foo = []
+
 [six.bar]
 
 [six.foo]
@@ -37,6 +33,10 @@ foo = []
 bar = 2.0
 foo = 1.0
 
+[[twelve]]
+
+[[twelve]]
+
 [two]
 bar = 2
 foo = 1

assets/outputs/toml/complex.toml

@@ -1,37 +1,32 @@
 age = 32
-gender = 'M'
 empty2 = []
 favourites = [
-    'blue',
-    'fish',
-    'egg',
-    'Postman',
+    "blue",
+    "fish",
+    "egg",
+    "Postman",
     4.73753,
-    false
-[[favourites]]
-hello = 'world'
-
-[favourites.food]
-favourite = 'egg'
-hated = 'beef'
-,
+    false,
+    { hello = "world" },
 ]
+gender = "M"
 
 [employment]
 employed = true
-name = 'Postman'
+name = "Postman"
 sinceYear = 2019
 
 [empty1]
 
 [name]
-first = 'John'
-full = '$firstName $lastName'
-last = 'Smith'
+first = "John"
+full = "$firstName $lastName"
+last = "Smith"
 
 [negative]
 float = -34.34
 int = -34
+
 [parents.father.birthday]
 day = 3
 month = 2

assets/outputs/toml/complex_keys.toml

@@ -5,8 +5,8 @@ with_underscore = 0
 "with_🌽" = 2
 
 [apple-pie]
-crust = 'yum'
+crust = "yum"
 
 [foo]
-bar-baz = 'hello'
+bar-baz = "hello"
 

assets/outputs/toml/environment_variable.toml

@@ -1,2 +1,2 @@
-foo = 'bar'
+foo = "bar"
 

assets/outputs/toml/input.toml

@@ -4,6 +4,6 @@ month = 1
 year = 1970
 
 [name]
-first = 'John'
-last = 'Smith'
+first = "John"
+last = "Smith"
 

assets/outputs/toml/input_references_input.toml

@@ -1,2 +1,2 @@
-foo = 'bar'
+foo = "bar"
 

assets/outputs/toml/mixed_array.toml

@@ -1,6 +1,6 @@
 foo = [
     1,
-    'two',
+    "two",
     false,
 ]
 

assets/outputs/toml/readme_example.toml

@@ -1,30 +1,30 @@
-main = 'dist/index.js'
-name = 'example-package'
+main = "dist/index.js"
+name = "example-package"
 private = false
-version = '1.0.0'
-
-[[contributors]]
-email = 'mail@example.com'
-name = 'John Smith'
+version = "1.0.0"
 
 [author]
-email = 'mail@example.com'
-name = 'John Smith'
-url = 'https://example.com'
+email = "mail@example.com"
+name = "John Smith"
+url = "https://example.com"
 
 [bin]
-filebrowser = 'dist/index.js'
+filebrowser = "dist/index.js"
 
 [config]
 port = 8080
 
+[[contributors]]
+email = "mail@example.com"
+name = "John Smith"
+
 [dependencies]
-dotenv = '^8.2.0'
+dotenv = "^8.2.0"
 
 [devDependencies]
-typescript = '^4.5'
+typescript = "^4.5"
 
 [scripts]
-build = 'tsc'
-run = 'node dist'
+build = "tsc"
+run = "node dist"
 

assets/outputs/toml/spread.toml

@@ -1,5 +1,5 @@
-bar = 'baz'
-hello = 'world'
+bar = "baz"
+hello = "world"
 nums = [
     1,
     2,

assets/outputs/toml/string.toml

@@ -1,2 +1,2 @@
-foo = 'bar'
+foo = "bar"
 

assets/outputs/toml/very_compact.toml

@@ -1,6 +1,6 @@
 eight = [
-    'foo',
-    'bar',
+    "foo",
+    "bar",
 ]
 eleven = [
     [],
@@ -10,11 +10,6 @@ nine = [
     true,
     false,
 ]
-ten = []
-
-[[twelve]]
-
-[[twelve]]
 
 [five]
 
@@ -23,12 +18,13 @@ bar = false
 foo = true
 
 [one]
-bar = 'foo'
-foo = 'bar'
+bar = "foo"
+foo = "bar"
 
 [seven]
 bar = []
 foo = []
+
 [six.bar]
 
 [six.foo]
@@ -37,6 +33,10 @@ foo = []
 bar = 2.0
 foo = 1.0
 
+[[twelve]]
+
+[[twelve]]
+
 [two]
 bar = 2
 foo = 1

corn-cli/Cargo.toml

@@ -14,5 +14,5 @@ colored = "2.0.0"
 serde = { version = "1.0.133", features = ["derive"] }
 serde_json = "1.0.75"
 serde_yaml = "0.9.11"
-toml = "0.5.9"
+toml = "0.7.4"
 pest = "2.3.0"

corn-cli/src/bin/corn.rs

@@ -1,5 +1,5 @@
 use corn_cli::error::{print_err, Error, ExitCode};
-use libcorn::{parse, TomlValue, Value};
+use libcorn::{parse, Value};
 use std::fs::read_to_string;
 use std::path::Path;
 use std::process::exit;
@@ -88,8 +88,7 @@ fn serialize(config: Value, output_type: OutputType) -> Result<String, Error> {
             }
         }
         OutputType::Toml => {
-            let toml_value = TomlValue::from(config);
-            let res = toml::to_string_pretty(&toml_value);
+            let res = toml::to_string_pretty(&config);
             match res {
                 Ok(str) => Ok(str),
                 Err(err) => Err(Error::Serializing(err.to_string())),

libcorn/Cargo.toml

@@ -19,7 +19,6 @@ pest_derive = "2.6.0"
 cfg-if = "1.0.0"
 serde = { version = "1.0.133", features = ["derive"] }
 thiserror = "1.0.40"
-toml = "0.5.9" # currently required to work around toml serializing
 wasm-bindgen = { version = "0.2.83", optional = true }
 serde-wasm-bindgen = { version = "0.4.5", optional = true }
 console_error_panic_hook = { version = "0.1.7", optional = true }
@@ -31,3 +30,4 @@ wasm-bindgen-test = { version = "0.3.29" }
 # required for testing
 serde_json = "1.0.75"
 serde_yaml = "0.9.11"
+toml = "0.7.4"