support numeric indicies for params_shape

Kong · Oct 2, 2023 · d11adee · d11adee
1 parent b4e53cd
commit d11adee
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/lapis/validate/types.lua b/lapis/validate/types.lua
@@ -199,7 +199,7 @@ do
   test_input_type = types.table
   is_base_type = instance_of(BaseType)
   param_validator_spec = types.annotate(types.shape({
-    types.string:tag("field"),
+    (types.string + types.number):tag("field"),
     is_base_type:describe("tableshape type"):tag("type"),
     error = types["nil"] + types.string:tag("error"),
     label = types["nil"] + types.string:tag("label"),

diff --git a/lapis/validate/types.moon b/lapis/validate/types.moon
@@ -37,7 +37,7 @@ class ParamsShapeType extends BaseType
   is_base_type = instance_of BaseType
 
   param_validator_spec = types.annotate types.shape({
-    types.string\tag "field"
+    (types.string + types.number)\tag "field"
 
      -- TODO: AssertErrorType should be unwrapped so we don't yield error when processing nested object
     is_base_type\describe("tableshape type")\tag "type"

diff --git a/spec/validate_spec.moon b/spec/validate_spec.moon
@@ -402,6 +402,33 @@ params type {
         }
       }
 
+    it "numeric indicies", ->
+      t = types.params_shape {
+        {1, types.string}
+        {2, types.number}
+      }
+
+      assert.same {"tuple", 200}, (t\transform { "tuple", 200 })
+      assert.same {"tuple", 200}, (t\transform { "tuple", 200, "extra", things: "true" })
+
+      assert.same {
+        nil, {
+          [[2: expected type "number", got "string"]]
+        }
+      }, {
+        t\transform { "one", "two" }
+      }
+
+      assert.same {
+        nil, {
+          [[1: expected type "string", got "boolean"]]
+          [[2: expected type "number", got "boolean"]]
+        }
+      }, {
+        t\transform { false, true, "give" }
+      }
+
+
   describe "params_array", ->
     types = require "lapis.validate.types"