[#6106] proper support for comments in JSON

Co-authored-by: mput <putintsev@gmail.com>

Author: andreyorst

package-lock.json

@@ -5,6 +5,7 @@
     "@monaco-editor/react": "^4.5.0",
     "@sooro-io/react-gtm-module": "^3.0.0",
     "antd": "^5.18.3",
+    "comment-json": "^4.2.5",
     "fhirpath-autocomplete-ts": "git@github.com:Aidbox/fhirpath-autocomplete-ts.git",
     "react": "^18.2.0",
     "react-dom": "^18.3.1",

package.json

@@ -435,8 +435,11 @@
     {:dataLayer {:event         "vd_run"
                  :resource-type (get (:current-vd db) :resource "")}})
    (let [sandbox? (settings-model/in-sandbox? db)
+         parse (if (= :language/json (::m/language db))
+                 yaml/json-parse
+                 yaml/try-parse)
          view-definition (-> (::m/view-definition-code db)
-                             yaml/try-parse
+                             parse
                              (js->clj :keywordize-keys true)
                              strip-empty-select-nodes
                              strip-empty-where-nodes)
@@ -481,7 +484,6 @@
 (reg-event-fx
  ::on-eval-view-definition-error
  (fn [{:keys [db]} [_ result]]
-   (prn result)
    {:db (assoc db ::m/eval-loading false)
     :notification-error (str (get-in result [:response :text :div] "Error") ": "
                              (->> (get-in result [:response :issue])
@@ -702,7 +704,7 @@
 
 (defn format-vd-code [code lang]
   (case lang
-    :language/yaml (-> code js/JSON.parse yaml/stringify)
+    :language/yaml (-> code yaml/json-parse yaml/stringify)
     :language/json (-> code yaml/str->yaml (js/JSON.stringify nil 2))
     ""))
 

src/cljs/vd_designer/pages/form/controller.cljs

@@ -8,7 +8,7 @@
             [vd-designer.components.tabs :as tabs]
             [vd-designer.pages.lists.vds.controller :as c]
             [vd-designer.pages.lists.vds.model :as m]
-            [vd-designer.utils.yaml :refer [str->yaml]]))
+            [vd-designer.utils.yaml :refer [str->yaml json-parse]]))
 
 (def supported-extensions
   [".json" ".yaml" ".yml"])
@@ -34,7 +34,7 @@
   (try
     (str->yaml content)
     (catch js/Error _
-      (js/JSON.parse content))))
+      (json-parse content))))
 
 (defn parse-vd [^String content]
   (js->clj (try-parse-vd content) :keywordize-keys true))

src/cljs/vd_designer/pages/lists/vds/import.cljs

@@ -1,5 +1,6 @@
 (ns vd-designer.utils.yaml
   (:require ["yaml" :as y]
+            ["comment-json" :as json]
             [clojure.string :as str]))
 
 (defn edn->yaml [edn]
@@ -18,4 +19,10 @@
   (try
     (str->yaml content)
     (catch js/Error _
-      (js/JSON.parse content))))
+      nil)))
+
+(defn json-parse [^String content]
+  (try
+    (json/parse content nil true)
+    (catch js/Error _
+      nil)))