Refactor: centralizing the line splitting of SSE datalines

Author: JeremS

libraries/sdk/src/main/starfederation/datastar/clojure/api/common.clj

@@ -1,4 +1,6 @@
-(ns starfederation.datastar.clojure.api.common)
+(ns starfederation.datastar.clojure.api.common
+  (:require
+   [clojure.string :as string]))
 
 ;; -----------------------------------------------------------------------------
 ;; Option names
@@ -41,12 +43,12 @@
 
 (defn add-data-lines!
   "Add several data-lines to the `data-lines!` transient vector."
-  [data-lines! prefix lines-seq]
+  [data-lines! prefix text]
   (reduce
     (fn [acc part]
       (conj! acc (str prefix part)))
     data-lines!
-    lines-seq))
+    (string/split-lines text)))
 
 
 (defn add-boolean-option?
@@ -56,6 +58,3 @@
   (and
     (boolean? val)
     (not= val default-val)))
-
-
-

libraries/sdk/src/main/starfederation/datastar/clojure/api/elements.clj

@@ -30,7 +30,7 @@
     (cond-> data-lines!
       (and sel (valid-selector? sel))
       (common/add-opt-line! consts/selector-dataline-literal sel)
- 
+
       (and patch-mode (add-epm? patch-mode))
       (common/add-opt-line! consts/mode-dataline-literal patch-mode)
 
@@ -47,8 +47,7 @@
   [data-lines! element]
   (cond-> data-lines!
     (u/not-empty-string? element)
-    (common/add-data-lines! consts/elements-dataline-literal
-                            (string/split-lines element))))
+    (common/add-data-lines! consts/elements-dataline-literal element)))
 
 
 (defn ->patch-elements
@@ -91,13 +90,15 @@
 (defn conj-patch-elements-seq
   "Adds a the data-lines when patching a seq of strings elements."
   [data-lines! elements-seq]
-  (cond-> data-lines!
-    (seq elements-seq)
-    (common/add-data-lines! consts/elements-dataline-literal
-                            (eduction
-                              (comp (mapcat string/split-lines)
-                                    (remove string/blank?))
-                              elements-seq))))
+  (if (seq elements-seq)
+    (reduce
+      (fn [data-lines! elements]
+        (if (string/blank? elements)
+          data-lines!
+          (common/add-data-lines! data-lines! consts/elements-dataline-literal elements)))
+      data-lines!
+      elements-seq)
+    data-lines!))
 
 
 (defn ->patch-elements-seq
@@ -146,5 +147,3 @@
   (patch-elements! sse-gen "" (assoc opts
                                      common/selector selector
                                      common/patch-mode consts/element-patch-mode-remove)))
-
-

libraries/sdk/src/main/starfederation/datastar/clojure/api/signals.clj

@@ -21,16 +21,15 @@
         (common/add-opt-line! consts/only-if-missing-dataline-literal oim)
 
         (u/not-empty-string? signals)
-        (common/add-data-lines! consts/signals-dataline-literal
-                                (string/split-lines signals))))))
+        (common/add-data-lines! consts/signals-dataline-literal signals)))))
 
 
 
 (comment
   (= (->patch-signals "{'some': \n 'json'}" {})
      ["signals {'some': "
       "signals  'json'}"]))
- 
+
 (defn patch-signals! [sse-gen signals-content opts]
   (try
     (sse/send-event! sse-gen
@@ -56,5 +55,3 @@
   (if (= :get (:request-method request))
     (get-in request [:query-params consts/datastar-key])
     (:body request)))
-
-