fix: elementReference resolving

Author: krvital

src/aidbox_sdk/converter.clj

@@ -150,34 +150,24 @@
 
 ;; resolve references
 
-(defn- find-schema-by-url [schemas url]
-  (->> schemas
-       (filter #(= url (:url %)))
-       (first)))
-
-(defn- find-element-by-reference [element-reference schemas]
-  (let [[schema-url & path] element-reference
-        schema (find-schema-by-url schemas schema-url)
-        element (get-in schema (map keyword path))]
-    (or element {})))
-
-(defn find-elements-by-names [element-names schema]
-  (filter #(contains?
-            (set element-names)
-            (:name %))
-          (:elements schema)))
-
-(defn resolve-references [schemas]
+(defn resolve-element-references [schemas]
   (walk/postwalk
    (fn [x]
-     (if-let [reference (:elementReference x)]
+     ;; TODO add type of the reference
+     (if (:elementReference x)
        (merge (dissoc x :elementReference)
-              (find-element-by-reference reference schemas))
+              {:type "Reference"})
        x))
    schemas))
 
 ;;
 
+(defn find-elements-by-names [element-names schema]
+  (filter #(contains?
+            (set element-names)
+            (:name %))
+          (:elements schema)))
+
 (defn resolve-element-choices [schema el]
   (if (:choices el)
     (let [choices (find-elements-by-names (:choices el) schema)]
@@ -224,7 +214,7 @@
 
 (defn convert [schemas]
   (->> schemas
-       (resolve-references)
+       (resolve-element-references)
        (compile-elements)
        (combine-elements)
        (map (fn [schema]

test/aidbox_sdk/converter_test.clj

@@ -1,8 +1,11 @@
 (ns aidbox-sdk.converter-test
   (:require
    [aidbox-sdk.converter :as sut]
+   [aidbox-sdk.fixtures :as fixt]
    [aidbox-sdk.fixtures.schemas :as fixtures]
-   [clojure.test :refer [are deftest is testing]]))
+   [clojure.test :refer [are deftest is testing use-fixtures]]))
+
+(use-fixtures :once fixt/prepare-examples)
 
 (deftest test-converter-utils
   (testing "url->resource-name"
@@ -24,7 +27,7 @@
 
 (deftest test-resolve-references
   (is (= fixtures/schemas-with-element-reference-resolved
-         (sut/resolve-references fixtures/schemas-with-element-reference))))
+         (sut/resolve-element-references fixtures/schemas-with-element-reference))))
 
 (deftest test-resolve-choices
   (is (= fixtures/schemas-with-element-choices-resolved
@@ -49,3 +52,8 @@
      (= fixtures/observation-constraints-ir-schema
         (sut/convert-constraints fixtures/observation-constraints
                                  [fixtures/observation-ir-schema])))))
+
+(comment
+  (fixt/load-data!)
+
+  @fixt/data)