Merge pull request #79 from linux2647/fix-unmarshal-bool-or-array-of-…

…string

Fix ref unmarshal into BoolOrArrayOfString

pkg/schema/schema.go

@@ -55,6 +55,18 @@ func NewBoolOrArrayOfString(arr []string, b bool) BoolOrArrayOfString {
 	}
 }
 
+func (s *BoolOrArrayOfString) UnmarshalJSON(value []byte) error {
+	var multi []string
+	var single bool
+
+	if err := json.Unmarshal(value, &multi); err == nil {
+		s.Strings = multi
+	} else if err := json.Unmarshal(value, &single); err == nil {
+		s.Bool = single
+	}
+	return nil
+}
+
 func (s *BoolOrArrayOfString) MarshalJSON() ([]byte, error) {
 	if s.Strings == nil {
 		return json.Marshal([]string{})

tests/ref_input.json

@@ -2,5 +2,18 @@
   "foo": {
     "type": "string",
     "description": "from ref"
+  },
+  "bar": {
+    "type": "object",
+    "description": "from different ref",
+    "properties": {
+      "baz": {
+        "type": "string",
+        "description": "from ref"
+      }
+    },
+    "required": [
+      "baz"
+    ]
   }
 }

tests/test_ref.yaml

@@ -4,3 +4,9 @@
 # @schema
 # Not from ref
 foo: bar
+# @schema
+# $ref: ref_input.json#/bar
+# @schema
+# Not from ref
+bar:
+  baz: qux

tests/test_ref_expected.schema.json

@@ -2,6 +2,22 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "additionalProperties": false,
   "properties": {
+    "bar": {
+      "additionalProperties": false,
+      "description": "from different ref",
+      "properties": {
+        "baz": {
+          "description": "from ref",
+          "required": [],
+          "type": "string"
+        }
+      },
+      "required": [
+        "baz"
+      ],
+      "title": "bar",
+      "type": "object"
+    },
     "foo": {
       "default": "bar",
       "description": "from ref",
@@ -18,4 +34,4 @@
   },
   "required": [],
   "type": "object"
-}
+}