🔥 Remove usage of public usage of sm/define funcion

backend/src/app/http/websocket.clj

@@ -279,9 +279,8 @@
   message)
 
 (def ^:private schema:params
-  (sm/define
   [:map {:title "params"}
-     [:session-id ::sm/uuid]]))
+   [:session-id ::sm/uuid]])
 
 (defn- http-handler
   [cfg {:keys [params ::session/profile-id] :as request}]

backend/src/app/rpc/commands/files.clj

@@ -174,7 +174,6 @@
 ;; --- COMMAND QUERY: get-file (by id)
 
 (def schema:file
-  (sm/define
   [:map {:title "File"}
    [:id ::sm/uuid]
    [:features ::cfeat/features]
@@ -186,26 +185,23 @@
    [:is-shared ::sm/boolean]
    [:project-id ::sm/uuid]
    [:created-at ::dt/instant]
-     [:data {:optional true} :any]]))
+   [:data {:optional true} :any]])
 
 (def schema:permissions-mixin
-  (sm/define
   [:map {:title "PermissionsMixin"}
-     [:permissions ::perms/permissions]]))
+   [:permissions ::perms/permissions]])
 
 (def schema:file-with-permissions
-  (sm/define
   [:merge {:title "FileWithPermissions"}
    schema:file
-     schema:permissions-mixin]))
+   schema:permissions-mixin])
 
 (def ^:private
   schema:get-file
-  (sm/define
   [:map {:title "get-file"}
    [:features {:optional true} ::cfeat/features]
    [:id ::sm/uuid]
-     [:project-id {:optional true} ::sm/uuid]]))
+   [:project-id {:optional true} ::sm/uuid]])
 
 (defn- migrate-file
   [{:keys [::db/conn] :as cfg} {:keys [id] :as file}]
@@ -914,10 +910,9 @@
 
 (def ^:private
   schema:set-file-shared
-  (sm/define
   [:map {:title "set-file-shared"}
    [:id ::sm/uuid]
-     [:is-shared ::sm/boolean]]))
+   [:is-shared ::sm/boolean]])
 
 (sv/defmethod ::set-file-shared
   {::doc/added "1.17"
@@ -944,9 +939,8 @@
 
 (def ^:private
   schema:delete-file
-  (sm/define
   [:map {:title "delete-file"}
-     [:id ::sm/uuid]]))
+   [:id ::sm/uuid]])
 
 (defn- delete-file
   [{:keys [::db/conn] :as cfg} {:keys [profile-id id] :as params}]
@@ -978,10 +972,9 @@
 
 (def ^:private
   schema:link-file-to-library
-  (sm/define
   [:map {:title "link-file-to-library"}
    [:file-id ::sm/uuid]
-     [:library-id ::sm/uuid]]))
+   [:library-id ::sm/uuid]])
 
 (sv/defmethod ::link-file-to-library
   {::doc/added "1.17"

backend/src/app/rpc/commands/files_thumbnails.clj

@@ -179,18 +179,16 @@
 
 (def ^:private
   schema:get-file-data-for-thumbnail
-  (sm/define
   [:map {:title "get-file-data-for-thumbnail"}
    [:file-id ::sm/uuid]
-     [:features {:optional true} ::cfeat/features]]))
+   [:features {:optional true} ::cfeat/features]])
 
 (def ^:private
   schema:partial-file
-  (sm/define
   [:map {:title "PartialFile"}
    [:id ::sm/uuid]
    [:revn {:min 0} ::sm/int]
-     [:page :any]]))
+   [:page :any]])
 
 (sv/defmethod ::get-file-data-for-thumbnail
   "Retrieves the data for generate the thumbnail of the file. Used

backend/src/app/rpc/commands/management.clj

@@ -88,10 +88,9 @@
 
 (def ^:private
   schema:duplicate-file
-  (sm/define
   [:map {:title "duplicate-file"}
    [:file-id ::sm/uuid]
-     [:name {:optional true} [:string {:max 250}]]]))
+   [:name {:optional true} [:string {:max 250}]]])
 
 (sv/defmethod ::duplicate-file
   "Duplicate a single file in the same team."
@@ -150,10 +149,9 @@
 
 (def ^:private
   schema:duplicate-project
-  (sm/define
   [:map {:title "duplicate-project"}
    [:project-id ::sm/uuid]
-     [:name {:optional true} [:string {:max 250}]]]))
+   [:name {:optional true} [:string {:max 250}]]])
 
 (sv/defmethod ::duplicate-project
   "Duplicate an entire project with all the files"
@@ -327,10 +325,9 @@
 
 (def ^:private
   schema:move-files
-  (sm/define
   [:map {:title "move-files"}
    [:ids ::sm/set-of-uuid]
-     [:project-id ::sm/uuid]]))
+   [:project-id ::sm/uuid]])
 
 (sv/defmethod ::move-files
   "Move a set of files from one project to other."

backend/src/app/rpc/commands/profile.clj

@@ -109,11 +109,10 @@
 
 (def ^:private
   schema:update-profile
-  (sm/define
   [:map {:title "update-profile"}
    [:fullname [::sm/word-string {:max 250}]]
    [:lang {:optional true} [:string {:max 8}]]
-     [:theme {:optional true} [:string {:max 250}]]]))
+   [:theme {:optional true} [:string {:max 250}]]])
 
 (sv/defmethod ::update-profile
   {::doc/added "1.0"
@@ -154,11 +153,10 @@
 
 (def ^:private
   schema:update-profile-password
-  (sm/define
   [:map {:title "update-profile-password"}
    [:password [::sm/word-string {:max 500}]]
    ;; Social registered users don't have old-password
-     [:old-password {:optional true} [:maybe [::sm/word-string {:max 500}]]]]))
+   [:old-password {:optional true} [:maybe [::sm/word-string {:max 500}]]]])
 
 (sv/defmethod ::update-profile-password
   {::doc/added "1.0"
@@ -209,9 +207,8 @@
 
 (def ^:private
   schema:update-profile-photo
-  (sm/define
   [:map {:title "update-profile-photo"}
-     [:file ::media/upload]]))
+   [:file ::media/upload]])
 
 (sv/defmethod ::update-profile-photo
   {:doc/added "1.1"
@@ -278,9 +275,8 @@
 
 (def ^:private
   schema:request-email-change
-  (sm/define
   [:map {:title "request-email-change"}
-     [:email ::sm/email]]))
+   [:email ::sm/email]])
 
 (sv/defmethod ::request-email-change
   {::doc/added "1.0"

backend/src/app/rpc/quotes.clj

@@ -26,14 +26,13 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (def ^:private schema:quote
-  (sm/define
   [:map {:title "Quote"}
    [::team-id {:optional true} ::sm/uuid]
    [::project-id {:optional true} ::sm/uuid]
    [::file-id {:optional true} ::sm/uuid]
    [::incr {:optional true} [::sm/int {:min 0}]]
    [::id :keyword]
-     [::profile-id ::sm/uuid]]))
+   [::profile-id ::sm/uuid]])
 
 (def ^:private enabled (volatile! true))
 

backend/src/app/setup/templates.clj

@@ -21,16 +21,14 @@
 
 (def ^:private
   schema:template
-  (sm/define
   [:map {:title "Template"}
    [:id ::sm/word-string]
    [:name ::sm/word-string]
-     [:file-uri ::sm/word-string]]))
+   [:file-uri ::sm/word-string]])
 
 (def ^:private
   schema:templates
-  (sm/define
+  [:vector schema:template])
-    [:vector schema:template]))
 
 (defmethod ig/init-key ::setup/templates
   [_ _]

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

@@ -19,7 +19,6 @@
    [potok.v2.core :as ptk]))
 
 (def ^:private schema:comment-thread
-  (sm/define
   [:map {:title "CommentThread"}
    [:id ::sm/uuid]
    [:page-id ::sm/uuid]
@@ -35,17 +34,16 @@
    [:modified-at ::sm/inst]
    [:position ::gpt/point]
    [:count-unread-comments {:optional true} :int]
-     [:count-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]]))
+   [: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]]))
+   [: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]]))
+   [: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]]))
+   [: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]]]))
+    [: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]]))
+   [: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 {:title "login-with-ldap"}
-    [:map
    [:email ::sm/email]
-     [:password :string]]))
+   [: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]]))
+   [: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]]))
+   [: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]]))
+   [: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]]))
+   [:share-id {:optional true} ::sm/uuid]])
 
 (defn- fetch-bundle
   [{:keys [file-id share-id] :as params}]

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

@@ -1676,7 +1676,6 @@
 
 (def ^:private
   schema:paste-data
-  (sm/define
   [:map {:title "paste-data"}
    [:type [:= :copied-shapes]]
    [:features ::sm/set-of-strings]
@@ -1686,7 +1685,10 @@
    [:objects
     [:map-of ::sm/uuid :map]]
    [:images [:set :map]]
-     [:position {:optional true} ::gpt/point]]))
+   [:position {:optional true} ::gpt/point]])
+
+(def validate-paste-data!
+  (sm/validate-fn schema:paste-data))
 
 (defn- paste-transit
   [{:keys [images] :as pdata}]
@@ -1711,8 +1713,7 @@
         (let [file-id (:current-file-id state)
               features (features/get-team-enabled-features state)]
 
-          (sm/validate! schema:paste-data pdata
+          (validate-paste-data! pdata {:hint "invalid paste data"
-                        {:hint "invalid paste data"
                                        :code :invalid-paste-data})
 
           (cfeat/check-paste-features! features (:features 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]]))
+   [: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]]))
+   [: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]]))
+   [: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,9 +232,7 @@
                           :redo-changes (vec changes)
                           :undo-changes []})))))
 
-(def ^:private
+(def ^:private schema:handle-library-change
-  schema:handle-library-change
-  (sm/define
   [:map {:title "handle-library-change"}
    [:type :keyword]
    [:profile-id ::sm/uuid]
@@ -240,13 +240,16 @@
    [:session-id ::sm/uuid]
    [:revn :int]
    [:modified-at ::sm/inst]
-     [:changes ::cpc/changes]]))
+   [: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,7 +27,6 @@
 
 (def ^:private
   schema:path-content
-  (sm/define
   [:vector {:title "PathContent"}
    [:map {:title "PathContentEntry"}
     [:command [::sm/one-of valid-commands]]
@@ -40,7 +39,7 @@
       [:c1x {:optional true} :double]
       [:c1y {:optional true} :double]
       [:c2x {:optional true} :double]
-        [:c2y {: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]]]))
+   [: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
+(def ^:private schema:message
-  schema:message
-  (sm/define
   [:map {:title "WorkerMessage"}
    [:sender-id ::sm/uuid]
    [:payload
     [:map
      [:cmd :keyword]]]
-     [:buffer? {:optional true} :boolean]]))
+   [: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)))