R4b and R5 polishing (#33)

* fix(typescript): backbone property type in pascal case

* fix(typescript): valueset names should clash with resource names

* fix(typescript): include BaseSearchParameters file for r5

Author: krvital

src/aidbox_sdk/converter.clj

@@ -364,7 +364,9 @@
                        (->pascal-case (url->resource-name base)))
                :elements (->> (resolve-elements search-params-schemas (:id schema))
                               (map (fn [el] {:type "string" :name el})))}))
-       (remove #(empty? (:elements %)))))
+       (remove #(and
+                 (not= (:name %) "Base")
+                 (empty? (:elements %))))))
 
 ;;
 ;; Constraints

src/aidbox_sdk/generator/typescript.clj

@@ -11,6 +11,7 @@
    [aidbox_sdk.generator CodeGenerator]))
 
 (def reserved-names #{"RequestPriority"})
+(def valuset-exception #{"SubscriptionStatus"})
 (def reserved-name-suffix "_")
 
 (defn package->directory
@@ -27,10 +28,6 @@
   (io/file (package->directory (:package ir-schema))
            (str (->pascal-case (:resource-name ir-schema)) ".ts")))
 
-(defn constraint-file-path [ir-schema name]
-  (io/file (package->directory (:package ir-schema))
-           (str (->pascal-case (:resource-name ir-schema)) ".ts")))
-
 (defn search-param-filepath [ir-schema]
   (io/file "search" (str (:name ir-schema) "SearchParameters.ts")))
 
@@ -76,6 +73,12 @@
       (str name' "_")
       name')))
 
+(defn valueset-name [type-name]
+  (let [name' (class-name type-name)]
+    (if (contains? valuset-exception name')
+      (str name' "VS")
+      name')))
+
 (defn generate-polymorphic-property [{:keys [name required choices]}]
   (let [type (->> choices
                   (map :type)
@@ -85,7 +88,7 @@
     (str name (when-not required "?") ": " type ";")))
 
 (defn ->backbone-type [element]
-  (str/replace (str (:base element) (uppercase-first-letter (:name element))) #"[_-]" ""))
+  (str/replace (str (:base element) (->pascal-case (:name element))) #"[_-]" ""))
 
 (defn generate-property [{:keys [name array required type choices profile fhir-version] :as element}]
   (let [optional (if required "" "?")]
@@ -103,7 +106,7 @@
                         (->backbone-type element)
 
                         (:valueset element)
-                        (class-name (:valueset element))
+                        (valueset-name (:valueset element))
 
                         :else
                         (->lang-type (:type element)))
@@ -176,7 +179,7 @@
                                  (seq (:valueset-deps ir-schema)))
                         (format "import { %s } from \"./valuesets\""
                                 (->> (:valueset-deps ir-schema)
-                                     (map class-name)
+                                     (map valueset-name)
                                      (str/join ", "))))]
     (str (->> (:deps ir-schema)
               (map class-name)
@@ -256,7 +259,7 @@
                  :content
                  (->> schemas
                       (mapv (fn [vs]
-                              (let [type-name (class-name (:name vs))
+                              (let [type-name (valueset-name (:name vs))
                                     values (->> (:values vs)
                                                 (map #(format "\"%s\"" %))
                                                 (str/join " | "))]