feature: supported table value as default value.

Author: membphis

.gitignore

@@ -1,2 +1,3 @@
 test*.lua
 go
+\.*

Makefile

@@ -30,6 +30,7 @@ test:
 	LUA_PATH="./lib/?.lua;$(LUA_PATH)" LUA_CPATH="$(LUA_CPATH)" resty t/draft4.lua
 	LUA_PATH="./lib/?.lua;$(LUA_PATH)" LUA_CPATH="$(LUA_CPATH)" resty t/draft6.lua
 	LUA_PATH="./lib/?.lua;$(LUA_PATH)" LUA_CPATH="$(LUA_CPATH)" resty t/draft7.lua
+	LUA_PATH="./lib/?.lua;$(LUA_PATH)" LUA_CPATH="$(LUA_CPATH)" resty t/default.lua
 
 
 ### help:         Show Makefile rules.

lib/jsonschema.lua

@@ -390,6 +390,22 @@ local function str_filter(s)
   return s
 end
 
+local function to_lua_code(var)
+  if type(var) == "string" then
+    return sformat("%q", var)
+  end
+
+  if type(var) ~= "table" then
+    return var
+  end
+
+  local code = "{"
+  for k, v in pairs(var) do
+    code = code .. string.format("[%s] = %s,", to_lua_code(k), to_lua_code(v))
+  end
+  return code .. "}"
+end
+
 generate_validator = function(ctx, schema)
   -- get type informations as they will be necessary anyway
   local datatype = ctx:localvar(sformat('%s(%s)',
@@ -495,11 +511,9 @@ generate_validator = function(ctx, schema)
       if type(subschema) == "table" and subschema.default and
          (type(subschema.default) == "number" or
           type(subschema.default) == "string" or
-          type(subschema.default) == "boolean") then
-        local default = subschema.default
-        if type(subschema.default) == "string" then
-          default = sformat("%q", default)
-        end
+          type(subschema.default) == "boolean" or
+          type(subschema.default) == "table") then
+        local default = to_lua_code(subschema.default)
         ctx:stmt(        '    if propvalue == nil then')
         ctx:stmt(sformat('      %s[%s] = %s', ctx:param(1), str_filter(prop), default))
         ctx:stmt(        '    end')

spec/extra/default.json

@@ -0,0 +1,21 @@
+[
+  {
+    "description": "table value as default",
+    "schema": {
+      "type": "object",
+      "properties": {
+        "rule": {
+          "type": "array",
+          "default": [1, 2, 3]
+        }
+      }
+    },
+    "tests": [
+        {
+            "description": "valid ip address",
+            "data": {},
+            "valid": true
+        }
+    ]
+  }
+]

t/default.lua

@@ -0,0 +1,31 @@
+local jsonschema = require 'jsonschema'
+
+local rule = {
+    type = "object",
+    properties = {
+        rule = {
+            type = "array",
+            default = {1, 2, 3},
+        },
+        base = {type = "string", default = "xxxxxxxx"}
+    }
+}
+
+-- local code = jsonschema.generate_validator_code(rule)
+-- print(code)
+
+local validator = jsonschema.generate_validator(rule)
+
+local conf = {}
+local ok = validator(conf)
+
+if not ok then
+  ngx.say("fail: check default value")
+  return
+end
+
+if not conf.rule then
+  ngx.say("fail: missing default value")
+  return
+end
+ngx.say("passed: table value as default value")

t/draft7.lua

@@ -52,6 +52,7 @@ local supported = {
   "spec/extra/table.json",
   "spec/extra/ref.json",
   "spec/extra/format.json",
+  "spec/extra/default.json",
 
   'spec/JSON-Schema-Test-Suite/tests/draft7/type.json',
   'spec/JSON-Schema-Test-Suite/tests/draft7/default.json',