Fixes #15, dealing correctly with required facet and object optional …

…properties
raml-org · Sep 12, 2016 · 0353e51 · 0353e51
1 parent 56cbcc8
commit 0353e51
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/tools/datatype-expansion/src/clj/datatype_expansion/expanded_form.cljc b/tools/datatype-expansion/src/clj/datatype_expansion/expanded_form.cljc
@@ -5,6 +5,7 @@
             [clojure.string]
             [datatype-expansion.utils :refer [clear-node error]]
             [instaparse.core :as insta]
+            [clojure.string :as string]
             [clojure.walk :refer [stringify-keys]]))
 
 #?(:cljs (enable-console-print!))
@@ -147,7 +148,15 @@
        (= type "object"))                     (-> {:type "object"}
                                                   (process-constraints type-node)
                                                   (assoc :properties (->> (:properties type-node)
-                                                                          (mapv (fn [[prop-name type]] [(name prop-name) (expanded-form-inner type context)]))
+                                                                          (mapv (fn [[prop-name type]]
+                                                                                  (let [prop-name (name prop-name)
+                                                                                        prop-expanded (expanded-form-inner type context)
+                                                                                        explicit-required (and (map? type) (:required type))
+                                                                                        optional (string/ends-with? prop-name "?")
+                                                                                        prop-expanded (if (and optional (not explicit-required))
+                                                                                                        (assoc prop-expanded :required false)
+                                                                                                        prop-expanded)]
+                                                                                    [prop-name prop-expanded])))
                                                                           (into {})))
                                                   clear-node)
 

diff --git a/tools/datatype-expansion/test/clj/datatype_expansion/canonical_form_test.cljc b/tools/datatype-expansion/test/clj/datatype_expansion/canonical_form_test.cljc
@@ -279,3 +279,20 @@
             :type "object",
             :required true}
            canonical))))
+
+(deftest optional-property-error
+  (let [input {:properties {"name1?" {:type "string" :required true}
+                            "name2?" "string"
+                            "name3?" {:type "string" :required false}}
+               :additionalProperties true,
+               :type "object"
+               :required true}
+        expanded (expanded-form input {})
+        canonical (canonical-form expanded)]
+    (is (= {:properties {"name1?" {:type "string", :required true},
+                         "name2?" {:type "string", :required false},
+                         "name3?" {:type "string", :required false}},
+            :additionalProperties true,
+            :type "object",
+            :required true}
+           canonical))))