Merge remote-tracking branch 'upstream/master' into whiteboards

resources/package.json

@@ -36,7 +36,7 @@
     "https-proxy-agent": "5.0.0",
     "@sentry/electron": "2.5.1",
     "posthog-js": "1.10.2",
-    "@logseq/rsapi": "0.0.35",
+    "@logseq/rsapi": "0.0.36",
     "electron-deeplink": "1.0.10",
     "abort-controller": "3.0.0"
   },

src/main/logseq/api.cljs

@@ -41,14 +41,19 @@
 
 ;; helpers
 (defn- normalize-keyword-for-json
-  [input]
-  (when input
-    (walk/postwalk
+  ([input] (normalize-keyword-for-json input true))
+  ([input camel-case?]
+   (when input
+     (walk/postwalk
       (fn [a]
         (cond
-          (keyword? a) (csk/->camelCase (name a))
+          (keyword? a)
+          (cond-> (name a)  
+            camel-case? 
+            (csk/->camelCase))
+
           (uuid? a) (str a)
-          :else a)) input)))
+          :else a)) input))))
 
 (defn- parse-hiccup-ui
   [input]
@@ -735,7 +740,7 @@
       (let [query (cljs.reader/read-string query)
             resolved-inputs (map (comp query-react/resolve-input cljs.reader/read-string) inputs)
             result (apply d/q query db resolved-inputs)]
-        (clj->js result)))))
+        (bean/->js (normalize-keyword-for-json result false))))))
 
 (defn ^:export custom_query
   [query-string]