added encode forward to to_json if indent is set to 0

added Usage

Author: cryi

README.md

@@ -1,4 +1,47 @@
 # hjson-lua
 A lightweight H/JSON library for Lua
 
-Ported from [hjson-py](https://github.com/hjson/hjson-py). Inspired by rxi - [json.lua](https://github.com/rxi/json.lua).
+Ported from [hjson-py](https://github.com/hjson/hjson-py). Inspired by rxi - [json.lua](https://github.com/rxi/json.lua).
+
+* Implemented in pure Lua: tested with latest Lua (5.3) only
+
+## Setup
+
+1. drop [hjson.lua](tree/master/hjson.lua) and [hjson folder](tree/master/hjson) folder into your project
+2. require hjson.lua
+   * `hjson = require "hjson"`
+
+## Usage
+
+Library exports json.lua like and JS like api.
+
+- Lua object to HJSON - returns HJSON string
+  - `encode(obj, indent, skipkeys)` 
+  - `stringify(obj, indent, skipkeys)`
+  - Parameters:
+    - `obj` - Lua object - `table`, `string`, `number`, `nil`, `boolean`
+    - `indent` - default `"    "`. Accepts string of whitespace characters or a number representing number of spaces (non indented HJSON is JSON, automatically forwards to `_to_json` version)
+    - `skipkeys` - default `true`  Skips invalid keys. If false throws error on invalid key.
+      - Valid key types: `boolean`, `nil`, `string`
+- Lua object to JSON - returns JSON string
+  - `encode(obj, indent, skipkeys)` 
+  - `stringify(obj, indent, skipkeys)`
+  - Parameters:
+    - `obj` - Lua object - `table`, `string`, `number`, `nil`, `boolean`
+    - `indent` - default `"    "`. Accepts string of whitespace characters or a number representing number of spaces
+    - `skipkeys` - default `true`  Skips invalid keys. If false throws error on invalid key.
+      - Valid key types: `boolean`, `nil`, `string`
+- H/JSON to Lua object - returns Lua object
+    - `decode(str, strict, object_hook, object_pairs_hook)`
+    - `parse(str, strict, object_hook, object_pairs_hook)`
+    - Parameters:
+      - `str` has to be valid HJSON string
+      - `strict` default `true` . If true parse/decode fails on invalid control characters.
+      - `object_hook` - `function(obj)` hook which allows to adjust tables generated from JSON on per JSON object basis (including nested objects). `obj` is lua `table`.
+      - `object_pairs_hook` - `function(pairs)` hook which allows to adjust table before generation. `pairs` is table (in array form) composited from `key/value` pairs. It is called before the table for `object_hook` is generated.
+
+*`null` values contained within an array or object are converted to `nil` and are therefore lost upon decoding.*
+
+## License
+This library is free software; you can redistribute it and/or modify it under
+the terms of the MIT license. See [LICENSE](LICENSE) for details.

hjson.lua

@@ -8,28 +8,28 @@ local _decoder
 local _encoder
 local _encoderH
 
-function decode(str) 
-    if not _decoder then 
-        _decoder = decoder:new()
-    end
+local function decode(str, strict, object_hook, object_pairs_hook) 
+    _decoder = decoder:new(strict, object_hook, object_pairs_hoo)
     return _decoder:decode(str)
 end
 
-function encode_json(str) 
-    if not _encoder then 
-        _encoder = encoder:new()
-    end
-    return _encoder:encode(str)
+local function encode_json(obj, indent, skipkeys) 
+    _encoder = encoder:new(indent, skipkeys)
+    return _encoder:encode(obj)
 end
 
-function encode(str) 
+local function encode(obj, indent, skipkeys) 
+    forward = false
+    if indent == "" or indent == false or indent == 0 then 
+        return encode_json(obj, indent, skipkeys) 
+    end
     if not _encoderH then 
         _encoderH = encoderH:new()
     end
-    return _encoderH:encode(str)
+    return _encoderH:encode(obj)
 end
 
-hjson = {
+local hjson = {
     encode = encode,
     stringify = encode,
     encode_to_json = encode_json,

hjson/encoder.lua

@@ -57,6 +57,10 @@ function JsonEncoder:new(indent, skipkeys, sort_keys, item_sort_key)
     indent = string.rep(" ", indent)
   end
 
+  if type(indent) == "boolean" and indent then 
+    indent = "    "
+  end
+
   if indent and not indent:match("%s*") then
     error("Indent has to contain only whitespace characters or be a number")
   end

hjson/encoderH.lua

@@ -117,7 +117,7 @@ function HjsonEncoder:new(indent, skipkeys, sort_keys, item_sort_key)
     if indent == nil then
         indent = "    "
     end
-    if (type(indent) ~= "number" or indent < 2) and (type(indent) ~= "string" or not indent:find("%s%s+")) then
+    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
     if type(indent) == "number" then
@@ -289,7 +289,7 @@ function HjsonEncoder:new(indent, skipkeys, sort_keys, item_sort_key)
         end
         local func = encodeFunctionMap[_type]
         if type(func) == "function" then
-            return func(o, encode)
+            return func(o, _encode)
         end
         error("Unexpected type '" .. _type .. "'")
     end