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

Aidbox · Oct 21, 2024 · e0cf9ad · e0cf9ad
1 parent 528b059
commit e0cf9ad
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/aidbox_sdk/generator/typescript.clj b/src/aidbox_sdk/generator/typescript.clj
@@ -10,8 +10,8 @@
   (:import
    [aidbox_sdk.generator CodeGenerator]))
 
-
 (def reserved-names #{"RequestPriority"})
+(def valuset-exception #{"SubscriptionStatus"})
 (def reserved-name-suffix "_")
 
 (defn package->directory
@@ -28,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")))
 
@@ -77,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)
@@ -104,7 +106,7 @@
                         (->backbone-type element)
 
                         (:valueset element)
-                        (class-name (:valueset element))
+                        (valueset-name (:valueset element))
 
                         :else
                         (->lang-type (:type element)))
@@ -177,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)
@@ -257,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 " | "))]