fix(decode_to_defaults): == to !=

#26

Author: BirdeeHub

lua/tomlua/meta.lua

@@ -59,7 +59,7 @@ error("Cannot import a meta module")
 ---@class Tomlua.main
 ---@field opts TomluaOptions
 ---@field types table<TomlType, TomlTypeNum>
----@field decode fun(str:string):(any, string?): table?, string? -- returns result?, err?
+---@field decode fun(str:string, defaults?:table):(any, string?): table?, string? -- returns result?, err?
 ---@field encode fun(val:any):(string, string?): string?, string? -- returns result?, err?
 ---@field type fun(val:any):TomlType
 ---@field type_of fun(val:any):TomlTypeNum

src/decode.c

@@ -105,7 +105,7 @@ static bool recursive_lua_nav(
                     return err_push_keys(L, err, keys_start, keys_end);
                 }
                 lua_Integer len = lua_tointeger(L, defidx);
-                if (had_defaults && deftype == LUA_TNUMBER) {
+                if (had_defaults && deftype != LUA_TNUMBER) {
                     len = lua_arraylen(L, validx);
                 }
                 lua_pop(L, 1);

tests/decode_tests.lua

@@ -21,6 +21,30 @@ return function(define, test_dir)
         it(function() assert(err == nil, err) end, "Should not error on valid TOML")
     end)
 
+    define("reading headings to default table", function()
+        local appendtoml = [=[
+[example]
+test = "this is a test"
+[[example2]]
+test = "this is a test"
+]=]
+        local defaults = {
+            example = {
+                if_defined = "as a heading",
+                the_values_here = "will be recursively updated",
+            },
+            example2 = {
+                { test = "if defined as a heading", },
+                { test = "it will append", }
+            },
+        }
+        local data, err = tomlua_default.decode(appendtoml, defaults)
+        it(err == nil, "Should not error")
+        it(#data.example2 == 3, "Should be longer")
+        it(data.example.test ~= nil, "Should have been added")
+        it(data.example.if_defined ~= nil, "Should not have been removed")
+    end)
+
     define("decode basic integer", function()
         local data, err = tomlua_default.decode("key = 123")
         it(err == nil, "Should not error")

tests/scratch.lua

@@ -182,16 +182,23 @@ print(tomlua.type(val.b))
 print(tomlua.encode(val))
 
 do
-    local toml_edit = require("toml_edit")
-    local errtoml = [=[
-# test = { a.TEST = [ 1, 2, 3 ], a.HA = "hmmmm" }
-# test2 = { a = [ 1, 2, 3 ], a.HA = "hmmmm" }
+    local appendtoml = [=[
+[example]
+test = "this is a test"
+[[example2]]
+test = "this is a test"
 ]=]
+    local defaults = {
+        example = {
+            if_defined = "as a heading",
+            the_values_here = "will be recursively updated",
+        },
+        example2 = {
+            { test = "if defined as a heading", },
+            { test = "it will append", }
+        },
+    }
 
-    local d, e = tomlua.decode(errtoml)
-    local ok, data = pcall(toml_edit.parse_as_tbl, errtoml)
-    print(ok, require("inspect")(data))
-    -- print(require("inspect")(d))
-    print(errtoml)
-    print(tomlua.encode(d), e)
+    local d, e = tomlua.decode(appendtoml, defaults)
+    print(require('inspect')(d), e)
 end