default indent if not defined - empty for json, '\t' for hjson

Author: cryi

hjson.lua

@@ -20,8 +20,8 @@ local function decode(str, options)
 end
 
 ---@class HJsonEncodeOptions
----@field indent string|boolean|nil
----@field skip_keys boolean?
+---@field indent string|boolean|integer|nil
+---@field skip_keys boolean? skip invalid keys
 ---@field sort_keys boolean?
 ---@field item_sort_key (fun(k1:any, k2:any): boolean)?
 ---@field invalid_objects_as_type boolean?

hjson/encoder.lua

@@ -8,6 +8,7 @@ local escape_char_map = {
     ["\r"] = "\\r",
     ["\t"] = "\\t"
 }
+local default_indent = false
 
 local function isArray(t)
     local i = 0
@@ -45,19 +46,18 @@ function JsonEncoder:new(options)
         options.item_sort_key, options.invalid_objects_as_type
 
     if skip_invalid_keys == nil then skip_invalid_keys = true end
-    if indent == nil then indent = "    " end
-    if type(indent) ~= "number" and type(indent) ~= "string" and type(indent) ~=
-        "boolean" then
-        error(
-            "indent (#1 parameter) has to be of type string, number or boolean")
+    local indent_type = type(indent)
+    assert(indent_type == "string" or indent_type == "number" or indent_type == "boolean" or indent == nil,
+           "indent has to be of type string, number or boolean, got " .. indent_type)
+    assert(indent_type ~= "string" or indent:match("^%s*$"),
+           "indent has to be a string consisting of whitespace characters only")
+
+    if type(indent) == "number" then
+        indent = math.floor(indent)
+        indent = string.rep(" ", indent)
     end
-    if type(indent) == "number" then indent = string.rep(" ", indent) end
-
-    if type(indent) == "boolean" and indent then indent = "    " end
-
-    assert(indent and indent:match("%s*"),
-           "indent (#1 parameter) has to be of type string with at least 2 spaces or integer greater than 1")
-
+    if indent == true then indent = "\t" end
+    if not indent or indent == "" then indent = default_indent end
 
     local stack = {}
     local currentIndentLevel = 0

hjson/encoderH.lua

@@ -9,6 +9,8 @@ local escape_char_map = {
     ["\t"] = "\\t"
 }
 
+local default_indent = "\t"
+
 local COMMONRANGE = "\127-\159" -- // TODO: add unicode escape sequences
 
 local function containsSequences(s, sequences)
@@ -102,19 +104,19 @@ function HjsonEncoder:new(options)
         options.item_sort_key, options.invalid_objects_as_type
 
     if skip_invalid_keys == nil then skip_invalid_keys = true end
-    if indent == nil then indent = "    " end
-    if (type(indent) ~= "number" or indent < 2) and
-        (type(indent) ~= "string" or not indent:find("%s%s*")) then
-        error(
-            "indent (#1 parameter) has to be of type string with at least 2 spaces or integer greater than 1")
-    end
+    local indent_type = type(indent)
+    assert(indent_type == "string" or indent_type == "number" or indent_type == "boolean" or indent == nil,
+           "indent has to be of type string, number or boolean, got " .. indent_type)
+    assert(indent_type ~= "string" or indent:match("^%s*$"),
+           "indent has to be a string consisting of whitespace characters only")
+    assert(type(indent) ~= "boolean" or indent == true,
+           "if indent is a boolean, it has to be true, got " .. tostring(indent))
+
     if type(indent) == "number" then
         indent = math.floor(indent)
         indent = string.rep(" ", indent)
     end
-
-    assert(indent and indent:match("%s*"),
-           "indent (#1 parameter) has to be of type string with at least 2 spaces or integer greater than 1")
+    if not indent or indent == true or indent == "" then indent = default_indent end
 
     local stack = {}
     local currentIndentLevel = 0