🔥 Remove usage of public usage of sm/define funcion

frontend/src/app/main/data/comments.cljs

@@ -19,33 +19,31 @@
    [potok.v2.core :as ptk]))
 
 (def ^:private schema:comment-thread
-  (sm/define
-    [:map {:title "CommentThread"}
-     [:id ::sm/uuid]
-     [:page-id ::sm/uuid]
-     [:file-id ::sm/uuid]
-     [:project-id ::sm/uuid]
-     [:owner-id ::sm/uuid]
-     [:page-name :string]
-     [:file-name :string]
-     [:seqn :int]
-     [:content :string]
-     [:participants ::sm/set-of-uuid]
-     [:created-at ::sm/inst]
-     [:modified-at ::sm/inst]
-     [:position ::gpt/point]
-     [:count-unread-comments {:optional true} :int]
-     [:count-comments {:optional true} :int]]))
+  [:map {:title "CommentThread"}
+   [:id ::sm/uuid]
+   [:page-id ::sm/uuid]
+   [:file-id ::sm/uuid]
+   [:project-id ::sm/uuid]
+   [:owner-id ::sm/uuid]
+   [:page-name :string]
+   [:file-name :string]
+   [:seqn :int]
+   [:content :string]
+   [:participants ::sm/set-of-uuid]
+   [:created-at ::sm/inst]
+   [:modified-at ::sm/inst]
+   [:position ::gpt/point]
+   [:count-unread-comments {:optional true} :int]
+   [:count-comments {:optional true} :int]])
 
 (def ^:private schema:comment
-  (sm/define
-    [:map {:title "Comment"}
-     [:id ::sm/uuid]
-     [:thread-id ::sm/uuid]
-     [:owner-id ::sm/uuid]
-     [:created-at ::sm/inst]
-     [:modified-at ::sm/inst]
-     [:content :string]]))
+  [:map {:title "Comment"}
+   [:id ::sm/uuid]
+   [:thread-id ::sm/uuid]
+   [:owner-id ::sm/uuid]
+   [:created-at ::sm/inst]
+   [:modified-at ::sm/inst]
+   [:content :string]])
 
 (def check-comment-thread!
   (sm/check-fn schema:comment-thread))
@@ -84,12 +82,11 @@
 
 (def ^:private
   schema:create-thread-on-workspace
-  (sm/define
-    [:map {:title "created-thread-on-workspace"}
-     [:page-id ::sm/uuid]
-     [:file-id ::sm/uuid]
-     [:position ::gpt/point]
-     [:content :string]]))
+  [:map {:title "created-thread-on-workspace"}
+   [:page-id ::sm/uuid]
+   [:file-id ::sm/uuid]
+   [:position ::gpt/point]
+   [:content :string]])
 
 (defn create-thread-on-workspace
   [params]
@@ -136,13 +133,12 @@
 
 (def ^:private
   schema:create-thread-on-viewer
-  (sm/define
-    [:map {:title "created-thread-on-viewer"}
-     [:page-id ::sm/uuid]
-     [:file-id ::sm/uuid]
-     [:frame-id ::sm/uuid]
-     [:position ::gpt/point]
-     [:content :string]]))
+  [:map {:title "created-thread-on-viewer"}
+   [:page-id ::sm/uuid]
+   [:file-id ::sm/uuid]
+   [:frame-id ::sm/uuid]
+   [:position ::gpt/point]
+   [:content :string]])
 
 (defn create-thread-on-viewer
   [params]
@@ -469,11 +465,10 @@
 
 (def ^:private
   schema:create-draft
-  (sm/define
-    [:map {:title "create-draft"}
-     [:page-id ::sm/uuid]
-     [:file-id ::sm/uuid]
-     [:position ::gpt/point]]))
+  [:map {:title "create-draft"}
+   [:page-id ::sm/uuid]
+   [:file-id ::sm/uuid]
+   [:position ::gpt/point]])
 
 (defn create-draft
   [params]

frontend/src/app/main/data/shortcuts.cljs

@@ -129,12 +129,11 @@
 
 (def ^:private
   schema:shortcuts
-  (sm/define
-    [:map-of :keyword
-     [:map
-      [:command [:or :string [:vector :any]]]
-      [:fn {:optional true} fn?]
-      [:tooltip {:optional true} :string]]]))
+  [:map-of :keyword
+   [:map
+    [:command [:or :string [:vector :any]]]
+    [:fn {:optional true} fn?]
+    [:tooltip {:optional true} :string]]])
 
 (def check-shortcuts!
   (sm/check-fn schema:shortcuts))

frontend/src/app/main/data/users.cljs

@@ -32,14 +32,13 @@
 
 (def ^:private
   schema:profile
-  (sm/define
-    [:map {:title "Profile"}
-     [:id ::sm/uuid]
-     [:created-at {:optional true} :any]
-     [:fullname {:optional true} :string]
-     [:email {:optional true} :string]
-     [:lang {:optional true} :string]
-     [:theme {:optional true} :string]]))
+  [:map {:title "Profile"}
+   [:id ::sm/uuid]
+   [:created-at {:optional true} :any]
+   [:fullname {:optional true} :string]
+   [:email {:optional true} :string]
+   [:lang {:optional true} :string]
+   [:theme {:optional true} :string]])
 
 (def check-profile!
   (sm/check-fn schema:profile))
@@ -253,10 +252,9 @@
              (rx/catch on-error))))))
 
 (def ^:private schema:login-with-ldap
-  (sm/define
-    [:map
-     [:email ::sm/email]
-     [:password :string]]))
+  [:map {:title "login-with-ldap"}
+   [:email ::sm/email]
+   [:password :string]])
 
 (defn login-with-ldap
   [params]
@@ -486,6 +484,7 @@
 
     ;; TODO: for the release 1.13 we should skip fetching profile and just use
     ;; the response value of update-profile-props RPC call
+    ;; FIXME
     ptk/WatchEvent
     (watch [_ _ _]
       (->> (rp/cmd! :update-profile-props {:props props})
@@ -595,9 +594,8 @@
 
 (def ^:private
   schema:request-profile-recovery
-  (sm/define
-    [:map {:title "request-profile-recovery" :closed true}
-     [:email ::sm/email]]))
+  [:map {:title "request-profile-recovery" :closed true}
+   [:email ::sm/email]])
 
 (defn request-profile-recovery
   [data]
@@ -621,10 +619,9 @@
 
 (def ^:private
   schema:recover-profile
-  (sm/define
-    [:map {:title "recover-profile" :closed true}
-     [:password :string]
-     [:token :string]]))
+  [:map {:title "recover-profile" :closed true}
+   [:password :string]
+   [:token :string]])
 
 (defn recover-profile
   [data]

frontend/src/app/main/data/viewer.cljs

@@ -49,11 +49,10 @@
 
 (def ^:private
   schema:initialize
-  (sm/define
-    [:map {:title "initialize"}
-     [:file-id ::sm/uuid]
-     [:share-id {:optional true} [:maybe ::sm/uuid]]
-     [:page-id {:optional true} ::sm/uuid]]))
+  [:map {:title "initialize"}
+   [:file-id ::sm/uuid]
+   [:share-id {:optional true} [:maybe ::sm/uuid]]
+   [:page-id {:optional true} ::sm/uuid]])
 
 (defn initialize
   [{:keys [file-id share-id interactions-show?] :as params}]
@@ -102,11 +101,10 @@
 
 (def ^:private
   schema:fetch-bundle
-  (sm/define
-    [:map {:title "fetch-bundle"}
-     [:page-id ::sm/uuid]
-     [:file-id ::sm/uuid]
-     [:share-id {:optional true} ::sm/uuid]]))
+  [:map {:title "fetch-bundle"}
+   [:page-id ::sm/uuid]
+   [:file-id ::sm/uuid]
+   [:share-id {:optional true} ::sm/uuid]])
 
 (defn- fetch-bundle
   [{:keys [file-id share-id] :as params}]

frontend/src/app/main/data/workspace.cljs

@@ -1676,17 +1676,19 @@
 
 (def ^:private
   schema:paste-data
-  (sm/define
-    [:map {:title "paste-data"}
-     [:type [:= :copied-shapes]]
-     [:features ::sm/set-of-strings]
-     [:version :int]
-     [:file-id ::sm/uuid]
-     [:selected ::sm/set-of-uuid]
-     [:objects
-      [:map-of ::sm/uuid :map]]
-     [:images [:set :map]]
-     [:position {:optional true} ::gpt/point]]))
+  [:map {:title "paste-data"}
+   [:type [:= :copied-shapes]]
+   [:features ::sm/set-of-strings]
+   [:version :int]
+   [:file-id ::sm/uuid]
+   [:selected ::sm/set-of-uuid]
+   [:objects
+    [:map-of ::sm/uuid :map]]
+   [:images [:set :map]]
+   [:position {:optional true} ::gpt/point]])
+
+(def validate-paste-data!
+  (sm/validate-fn schema:paste-data))
 
 (defn- paste-transit
   [{:keys [images] :as pdata}]
@@ -1711,9 +1713,8 @@
         (let [file-id (:current-file-id state)
               features (features/get-team-enabled-features state)]
 
-          (sm/validate! schema:paste-data pdata
-                        {:hint "invalid paste data"
-                         :code :invalid-paste-data})
+          (validate-paste-data! pdata {:hint "invalid paste data"
+                                       :code :invalid-paste-data})
 
           (cfeat/check-paste-features! features (:features pdata))
           (if (= file-id (:file-id pdata))

frontend/src/app/main/data/workspace/media.cljs

@@ -200,14 +200,13 @@
 
 (def ^:private
   schema:process-media-objects
-  (sm/define
-    [:map {:title "process-media-objects"}
-     [:file-id ::sm/uuid]
-     [:local? :boolean]
-     [:name {:optional true} :string]
-     [:data {:optional true} :any] ; FIXME
-     [:uris {:optional true} [:sequential :string]]
-     [:mtype {:optional true} :string]]))
+  [:map {:title "process-media-objects"}
+   [:file-id ::sm/uuid]
+   [:local? :boolean]
+   [:name {:optional true} :string]
+   [:data {:optional true} :any] ; FIXME
+   [:uris {:optional true} [:sequential :string]]
+   [:mtype {:optional true} :string]])
 
 (defn- process-media-objects
   [{:keys [uris on-error] :as params}]
@@ -427,10 +426,9 @@
 
 (def ^:private
   schema:clone-media-object
-  (sm/define
-    [:map {:title "clone-media-object"}
-     [:file-id ::sm/uuid]
-     [:object-id ::sm/uuid]]))
+  [:map {:title "clone-media-object"}
+   [:file-id ::sm/uuid]
+   [:object-id ::sm/uuid]])
 
 (defn clone-media-object
   [{:keys [file-id object-id] :as params}]

frontend/src/app/main/data/workspace/notifications.cljs

@@ -198,21 +198,23 @@
 
 (def ^:private
   schema:handle-file-change
-  (sm/define
-    [:map {:title "handle-file-change"}
-     [:type :keyword]
-     [:profile-id ::sm/uuid]
-     [:file-id ::sm/uuid]
-     [:session-id ::sm/uuid]
-     [:revn :int]
-     [:changes ::cpc/changes]]))
+  [:map {:title "handle-file-change"}
+   [:type :keyword]
+   [:profile-id ::sm/uuid]
+   [:file-id ::sm/uuid]
+   [:session-id ::sm/uuid]
+   [:revn :int]
+   [:changes ::cpc/changes]])
+
+(def ^:private check-file-change-params!
+  (sm/check-fn schema:handle-file-change))
 
 (defn handle-file-change
   [{:keys [file-id changes revn] :as msg}]
 
   (dm/assert!
    "expected valid parameters"
-   (sm/check! schema:handle-file-change msg))
+   (check-file-change-params! msg))
 
   (ptk/reify ::handle-file-change
     IDeref
@@ -230,23 +232,24 @@
                           :redo-changes (vec changes)
                           :undo-changes []})))))
 
-(def ^:private
-  schema:handle-library-change
-  (sm/define
-    [:map {:title "handle-library-change"}
-     [:type :keyword]
-     [:profile-id ::sm/uuid]
-     [:file-id ::sm/uuid]
-     [:session-id ::sm/uuid]
-     [:revn :int]
-     [:modified-at ::sm/inst]
-     [:changes ::cpc/changes]]))
+(def ^:private schema:handle-library-change
+  [:map {:title "handle-library-change"}
+   [:type :keyword]
+   [:profile-id ::sm/uuid]
+   [:file-id ::sm/uuid]
+   [:session-id ::sm/uuid]
+   [:revn :int]
+   [:modified-at ::sm/inst]
+   [:changes ::cpc/changes]])
+
+(def ^:private check-library-change-params!
+  (sm/check-fn schema:handle-library-change))
 
 (defn handle-library-change
   [{:keys [file-id modified-at changes revn] :as msg}]
   (dm/assert!
    "expected valid arguments"
-   (sm/check! schema:handle-library-change msg))
+   (check-library-change-params! msg))
 
   (ptk/reify ::handle-library-change
     ptk/WatchEvent

frontend/src/app/main/data/workspace/path/common.cljs

@@ -27,20 +27,19 @@
 
 (def ^:private
   schema:path-content
-  (sm/define
-    [:vector {:title "PathContent"}
-     [:map {:title "PathContentEntry"}
-      [:command [::sm/one-of valid-commands]]
-      ;; FIXME: remove the `?` from prop name
-      [:relative? {:optional true} :boolean]
-      [:params {:optional true}
-       [:map {:title "PathContentEntryParams"}
-        [:x :double]
-        [:y :double]
-        [:c1x {:optional true} :double]
-        [:c1y {:optional true} :double]
-        [:c2x {:optional true} :double]
-        [:c2y {:optional true} :double]]]]]))
+  [:vector {:title "PathContent"}
+   [:map {:title "PathContentEntry"}
+    [:command [::sm/one-of valid-commands]]
+    ;; FIXME: remove the `?` from prop name
+    [:relative? {:optional true} :boolean]
+    [:params {:optional true}
+     [:map {:title "PathContentEntryParams"}
+      [:x :double]
+      [:y :double]
+      [:c1x {:optional true} :double]
+      [:c1y {:optional true} :double]
+      [:c2x {:optional true} :double]
+      [:c2y {:optional true} :double]]]]])
 
 (def check-path-content!
   (sm/check-fn schema:path-content))

frontend/src/app/main/data/workspace/undo.cljs

@@ -26,10 +26,9 @@
 
 (def ^:private
   schema:undo-entry
-  (sm/define
-    [:map {:title "undo-entry"}
-     [:undo-changes [:vector ::cpc/change]]
-     [:redo-changes [:vector ::cpc/change]]]))
+  [:map {:title "undo-entry"}
+   [:undo-changes [:vector ::cpc/change]]
+   [:redo-changes [:vector ::cpc/change]]])
 
 (def check-undo-entry!
   (sm/check-fn schema:undo-entry))

frontend/src/app/worker.cljs

@@ -24,24 +24,27 @@
 
 ;; --- Messages Handling
 
-(def ^:private
-  schema:message
-  (sm/define
-    [:map {:title "WorkerMessage"}
-     [:sender-id ::sm/uuid]
-     [:payload
-      [:map
-       [:cmd :keyword]]]
-     [:buffer? {:optional true} :boolean]]))
+(def ^:private schema:message
+  [:map {:title "WorkerMessage"}
+   [:sender-id ::sm/uuid]
+   [:payload
+    [:map
+     [:cmd :keyword]]]
+   [:buffer? {:optional true} :boolean]])
+
+(def ^:private check-message!
+  (sm/check-fn schema:message))
 
 (def buffer (rx/subject))
 
 (defn- handle-message
   "Process the message and returns to the client"
   [{:keys [sender-id payload transfer] :as message}]
+
   (dm/assert!
    "expected valid message"
-   (sm/check! schema:message message))
+   (check-message! message))
+
   (letfn [(post [msg]
             (let [msg (-> msg (assoc :reply-to sender-id) (wm/encode))]
               (.postMessage js/self msg)))