Revert "Delete json funcs until Facepunch/garrysmod-issues#4976 is fixed (#2177)" (#2185)

This reverts commit c6ea454.

Author: Anticept

lua/entities/gmod_wire_expression2/core/serialization.lua

@@ -430,9 +430,9 @@ local function jsonDecode( self, data, tp )
 end
 
 __e2setcost(1)
--- e2function string jsonError()
-	-- return last_json_error or ""
--- end
+e2function string jsonError()
+	return last_json_error or ""
+end
 
 __e2setcost(50)
 
@@ -512,8 +512,8 @@ local function jsonEncode_start( self, data, prettyprint )
 end
 
 -- Used to encode an E2 table to a Lua table, so that it can be used by external resources properly.
--- e2function string jsonEncode( table data ) return jsonEncode_start( self, data, 0 ) end
--- e2function string jsonEncode( table data, prettyprint ) return jsonEncode_start( self, data, prettyprint ) end
+e2function string jsonEncode( table data ) return jsonEncode_start( self, data, 0 ) end
+e2function string jsonEncode( table data, prettyprint ) return jsonEncode_start( self, data, prettyprint ) end
 
 -- this function converts a lua table into an E2 table
 local function jsonDecode_recurse( self, luatable, copied_tables )
@@ -552,10 +552,10 @@ local function jsonDecode_recurse( self, luatable, copied_tables )
 	return e2table
 end
 
--- e2function table jsonDecode( string data )
-	-- local luatable = jsonDecode( self, data, "external_t" )
-	-- local copied_tables = {}
-	-- return jsonDecode_recurse( self, luatable, copied_tables )
--- end
+e2function table jsonDecode( string data )
+	local luatable = jsonDecode( self, data, "external_t" )
+	local copied_tables = {}
+	return jsonDecode_recurse( self, luatable, copied_tables )
+end
 
 __e2setcost(nil)

lua/wire/client/e2descriptions.lua

@@ -1456,10 +1456,16 @@ E2Helper.Descriptions["vonEncode(r)"] = "Encodes an array into a string using vO
 E2Helper.Descriptions["vonEncode(t)"] = "Encodes a table into a string using vON"
 E2Helper.Descriptions["vonError()"] = "Returns the last von error"
 
--- E2Helper.Descriptions["jsonDecode(s)"] = "Decodes a string into an array using json"
--- E2Helper.Descriptions["jsonEncode(t)"] = "Encodes a table into a string using json"
--- E2Helper.Descriptions["jsonEncode(tn)"] = "Encodes a table into a string using json"
--- E2Helper.Descriptions["jsonError()"] = "Returns the last json error"
+E2Helper.Descriptions["jsonDecode(s)"] = "Decodes a string into an array using json"
+E2Helper.Descriptions["jsonDecodeTable(s)"] = "Decodes a string into a table using json"
+E2Helper.Descriptions["jsonEncode(r)"] = "Encodes an array into a string using json"
+E2Helper.Descriptions["jsonEncode(rn)"] = "Encodes an array into a string using json"
+E2Helper.Descriptions["jsonEncode(t)"] = "Encodes a table into a string using json"
+E2Helper.Descriptions["jsonEncode(tn)"] = "Encodes a table into a string using json"
+E2Helper.Descriptions["jsonEncodeExternal(t)"] = "Encodes a table into a string using json, in a form that is suitable to be exported to external resources. Unfortunately, arrays are ignored because E2 contains many ambiguous types, and arrays don't keep track of those types. You will have to convert your array to a table manually before encoding it."
+E2Helper.Descriptions["jsonEncodeExternal(tn)"] = "Encodes a table into a string using json, in a form that is suitable to be exported to external resources. Unfortunately, arrays are ignored because E2 contains many ambiguous types, and arrays don't keep track of those types. You will have to convert your array to a table manually before encoding it."
+E2Helper.Descriptions["jsonDecodeTableExternal(s)"] = "Decodes a string into a table using json"
+E2Helper.Descriptions["jsonError()"] = "Returns the last json error"
 
 -- http
 E2Helper.Descriptions["httpCanRequest()"] = "Returns whether you can make a new request (delay has been met or previous request timed out)"