refactor: move deps resolving from generator to converter

Author: krvital

src/aidbox_sdk/converter.clj

@@ -4,7 +4,8 @@
                                          uppercase-first-letter vector->map]]
    [clojure.set :as set]
    [clojure.string :as str]
-   [clojure.walk :as walk]))
+   [clojure.walk :as walk]
+   [aidbox-sdk.fhir :as fhir]))
 
 (def primitives #{"dateTime" "xhtml" "Distance" "time" "date" "string" "uuid" "oid" "id" "Dosage" "Duration" "instant" "Count" "decimal" "code" "base64Binary" "unsignedInt" "url" "markdown" "uri" "positiveInt"  "canonical" "Age" "Timing"})
 
@@ -88,15 +89,16 @@
   (if (contains? v :choices)
     {:name    (escape-keyword (name k))
      :choices (:choices v)}
-    {:name          (escape-keyword (name k))
-     :base          parent-name
-     :array         (boolean (:array v))
-     :required      (.contains required (name k))
-     :value         (transform-element
-                     (str (url->resource-name parent-name) "_" (uppercase-first-letter (name k)))
-                     v
-                     (.contains required (name k)))
-     :type          (:type v)
+    {:name     (escape-keyword (name k))
+     :base     parent-name
+     :array    (boolean (:array v))
+     :required (.contains required (name k))
+     :value    (transform-element
+                (str (url->resource-name parent-name) "_" (uppercase-first-letter (name k)))
+                v
+                (.contains required (name k)))
+     :type     (:type v)
+
      :choice-option (boolean (:choiceOf v))}))
 
 (defn- get-typings-and-imports [parent-name required data]
@@ -138,6 +140,7 @@
           (url->resource-name (:url schema)))
          (safe-conj
           (hash-map :base (get schema :base)
+                    :base-resource-name (url->resource-name (get schema :base))
                     :package (get schema :package)
                     :url (get schema :url)
                     :type (get schema :type)
@@ -188,14 +191,35 @@
 (defn resolve-choices [schemas]
   (map resolve-schema-choices schemas))
 
+(defn collect-dependencies [schema]
+  (let [primitive-element? (partial fhir/primitive-element? (:package schema))]
+    (set/union
+     #{(:base-resource-name schema)}
+     (->> (:elements schema)
+          (remove primitive-element?)
+          (map :type)
+          (remove nil?)
+          set)
+     (->> (:backbone-elements schema)
+          (map :elements)
+          flatten
+          (remove primitive-element?)
+          (map :type)
+          (remove nil?)
+          set))))
+
+(defn resolve-dependencies [schemas]
+  (map #(assoc % :deps (collect-dependencies %)) schemas))
+
 (defn convert [schemas]
   (->> schemas
        (resolve-references)
        (compile-elements)
        (combine-elements)
-       (map (fn [schema] (update schema
-                                 :backbone-elements #(resolve-choices (flatten-backbones % [])))))
-       (resolve-choices)))
+       (map (fn [schema]
+              (update schema :backbone-elements #(resolve-choices (flatten-backbones % [])))))
+       (resolve-choices)
+       (resolve-dependencies)))
 
 ;;
 ;; Search Params

src/aidbox_sdk/fhir.clj

@@ -126,9 +126,9 @@
 ;;
 
 (defmulti  base-type? :package)
-(defmethod base-type? "hl7.fhir.r4.core"  [schema] (contains? r4-base-types  (:id schema)) )
-(defmethod base-type? "hl7.fhir.r4b.core" [schema] (contains? r4b-base-types (:id schema)) )
-(defmethod base-type? "hl7.fhir.r5.core"  [schema] (contains? r5-base-types  (:id schema)) )
+(defmethod base-type? "hl7.fhir.r4.core"  [schema] (contains? r4-base-types  (:id schema)))
+(defmethod base-type? "hl7.fhir.r4b.core" [schema] (contains? r4b-base-types (:id schema)))
+(defmethod base-type? "hl7.fhir.r5.core"  [schema] (contains? r5-base-types  (:id schema)))
 
 (defn base-schema? [schema]
   (or (= (:url schema) "http://hl7.org/fhir/StructureDefinition/BackboneElement")
@@ -144,3 +144,7 @@
 (defn search-parameter-from-extension? [search-parameter]
   (str/includes? (:id search-parameter) "-extensions-"))
 
+(defmulti primitive-element? (fn [package _element] package))
+(defmethod primitive-element? "hl7.fhir.r4.core"  [_ {:keys [type]}] (contains? r4-primitive-types type))
+(defmethod primitive-element? "hl7.fhir.r4b.core" [_ {:keys [type]}] (contains? r4b-primitive-types type))
+(defmethod primitive-element? "hl7.fhir.r5.core"  [_ {:keys [type]}] (contains? r5-primitive-types type))

src/aidbox_sdk/generator/typescript.clj

@@ -134,23 +134,6 @@
        (map #(assoc % :base "BackboneElement"))
        (map generate-class)))
 
-(defn collect-dependecies [ir-schema]
-  (let [primitive? (fn [type] (= (subs type 0 1)
-                                 (str/lower-case (subs type 0 1))))]
-    (into
-     (->> (:elements ir-schema)
-          (map :type)
-          (remove nil?)
-          (remove primitive?)
-          set)
-     (->> (:backbone-elements ir-schema)
-          (map :elements)
-          flatten
-          (map :type)
-          (remove nil?)
-          (remove primitive?)
-          set))))
-
 (defrecord TypeScriptCodeGenerator []
   CodeGenerator
   (generate-datatypes [_ ir-schemas]
@@ -165,10 +148,9 @@
   (generate-resource-module [_ ir-schema]
     {:path (resource-file-path ir-schema)
      :content (generate-module
-               {:deps [{:module "../datatypes" :members (collect-dependecies ir-schema)}]
+               {:deps [{:module "../datatypes" :members (:deps ir-schema)}]
                 :classes [(generate-class ir-schema
                                           (generate-backbone-classes ir-schema))]})})
-
   (generate-search-params [_ ir-schemas] [])
   (generate-constraints [_ ir-schemas] [])
   (generate-sdk-files [this] (generator/prepare-sdk-files :typescript)))