From 0516cfa29629b10b3ffd65803b070bcf9a402477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Fri, 17 Sep 2021 16:04:26 +0200 Subject: [PATCH] :recycle: Small refactor of basic specs --- common/src/app/common/pages/spec.cljc | 91 +++++++++---------- common/src/app/common/types/interactions.cljc | 11 +-- 2 files changed, 47 insertions(+), 55 deletions(-) diff --git a/common/src/app/common/pages/spec.cljc b/common/src/app/common/pages/spec.cljc index 81f5b3335..a1db691f2 100644 --- a/common/src/app/common/pages/spec.cljc +++ b/common/src/app/common/pages/spec.cljc @@ -31,9 +31,6 @@ (s/def ::component-root? boolean?) (s/def ::shape-ref uuid?) -(s/def ::safe-integer ::us/safe-integer) -(s/def ::safe-number ::us/safe-number) - (s/def :internal.matrix/a ::us/safe-number) (s/def :internal.matrix/b ::us/safe-number) (s/def :internal.matrix/c ::us/safe-number) @@ -62,15 +59,15 @@ ;; GRADIENTS (s/def :internal.gradient.stop/color ::string) -(s/def :internal.gradient.stop/opacity ::safe-number) -(s/def :internal.gradient.stop/offset ::safe-number) +(s/def :internal.gradient.stop/opacity ::us/safe-number) +(s/def :internal.gradient.stop/offset ::us/safe-number) (s/def :internal.gradient/type #{:linear :radial}) -(s/def :internal.gradient/start-x ::safe-number) -(s/def :internal.gradient/start-y ::safe-number) -(s/def :internal.gradient/end-x ::safe-number) -(s/def :internal.gradient/end-y ::safe-number) -(s/def :internal.gradient/width ::safe-number) +(s/def :internal.gradient/start-x ::us/safe-number) +(s/def :internal.gradient/start-y ::us/safe-number) +(s/def :internal.gradient/end-x ::us/safe-number) +(s/def :internal.gradient/end-y ::us/safe-number) +(s/def :internal.gradient/width ::us/safe-number) (s/def :internal.gradient/stop (s/keys :req-un [:internal.gradient.stop/color @@ -96,7 +93,7 @@ (s/def :internal.color/path (s/nilable ::string)) (s/def :internal.color/value (s/nilable ::string)) (s/def :internal.color/color (s/nilable ::string)) -(s/def :internal.color/opacity (s/nilable ::safe-number)) +(s/def :internal.color/opacity (s/nilable ::us/safe-number)) (s/def :internal.color/gradient (s/nilable ::gradient)) (s/def ::color @@ -114,10 +111,10 @@ (s/def :internal.shadow/id uuid?) (s/def :internal.shadow/style #{:drop-shadow :inner-shadow}) (s/def :internal.shadow/color ::color) -(s/def :internal.shadow/offset-x ::safe-number) -(s/def :internal.shadow/offset-y ::safe-number) -(s/def :internal.shadow/blur ::safe-number) -(s/def :internal.shadow/spread ::safe-number) +(s/def :internal.shadow/offset-x ::us/safe-number) +(s/def :internal.shadow/offset-y ::us/safe-number) +(s/def :internal.shadow/blur ::us/safe-number) +(s/def :internal.shadow/spread ::us/safe-number) (s/def :internal.shadow/hidden boolean?) (s/def :internal.shadow/shadow @@ -138,7 +135,7 @@ (s/def :internal.blur/id uuid?) (s/def :internal.blur/type #{:layer-blur}) -(s/def :internal.blur/value ::safe-number) +(s/def :internal.blur/value ::us/safe-number) (s/def :internal.blur/hidden boolean?) (s/def ::blur @@ -149,17 +146,17 @@ ;; Page Options (s/def :internal.page.grid.color/value string?) -(s/def :internal.page.grid.color/opacity ::safe-number) +(s/def :internal.page.grid.color/opacity ::us/safe-number) -(s/def :internal.page.grid/size ::safe-integer) +(s/def :internal.page.grid/size ::us/safe-integer) (s/def :internal.page.grid/color (s/keys :req-un [:internal.page.grid.color/value :internal.page.grid.color/opacity])) (s/def :internal.page.grid/type #{:stretch :left :center :right}) -(s/def :internal.page.grid/item-length (s/nilable ::safe-integer)) -(s/def :internal.page.grid/gutter (s/nilable ::safe-integer)) -(s/def :internal.page.grid/margin (s/nilable ::safe-integer)) +(s/def :internal.page.grid/item-length (s/nilable ::us/safe-integer)) +(s/def :internal.page.grid/gutter (s/nilable ::us/safe-integer)) +(s/def :internal.page.grid/margin (s/nilable ::us/safe-integer)) (s/def :internal.page.grid/square (s/keys :req-un [:internal.page.grid/size @@ -214,33 +211,33 @@ (s/def :internal.shape/content any?) (s/def :internal.shape/fill-color string?) -(s/def :internal.shape/fill-opacity ::safe-number) +(s/def :internal.shape/fill-opacity ::us/safe-number) (s/def :internal.shape/fill-color-gradient (s/nilable ::gradient)) (s/def :internal.shape/fill-color-ref-file (s/nilable uuid?)) (s/def :internal.shape/fill-color-ref-id (s/nilable uuid?)) (s/def :internal.shape/font-family string?) -(s/def :internal.shape/font-size ::safe-integer) +(s/def :internal.shape/font-size ::us/safe-integer) (s/def :internal.shape/font-style string?) (s/def :internal.shape/font-weight string?) (s/def :internal.shape/hidden boolean?) -(s/def :internal.shape/letter-spacing ::safe-number) -(s/def :internal.shape/line-height ::safe-number) +(s/def :internal.shape/letter-spacing ::us/safe-number) +(s/def :internal.shape/line-height ::us/safe-number) (s/def :internal.shape/locked boolean?) (s/def :internal.shape/page-id uuid?) -(s/def :internal.shape/proportion ::safe-number) +(s/def :internal.shape/proportion ::us/safe-number) (s/def :internal.shape/proportion-lock boolean?) -(s/def :internal.shape/rx ::safe-number) -(s/def :internal.shape/ry ::safe-number) -(s/def :internal.shape/r1 ::safe-number) -(s/def :internal.shape/r2 ::safe-number) -(s/def :internal.shape/r3 ::safe-number) -(s/def :internal.shape/r4 ::safe-number) +(s/def :internal.shape/rx ::us/safe-number) +(s/def :internal.shape/ry ::us/safe-number) +(s/def :internal.shape/r1 ::us/safe-number) +(s/def :internal.shape/r2 ::us/safe-number) +(s/def :internal.shape/r3 ::us/safe-number) +(s/def :internal.shape/r4 ::us/safe-number) (s/def :internal.shape/stroke-color string?) (s/def :internal.shape/stroke-color-gradient (s/nilable ::gradient)) (s/def :internal.shape/stroke-color-ref-file (s/nilable uuid?)) (s/def :internal.shape/stroke-color-ref-id (s/nilable uuid?)) -(s/def :internal.shape/stroke-opacity ::safe-number) +(s/def :internal.shape/stroke-opacity ::us/safe-number) (s/def :internal.shape/stroke-style #{:solid :dotted :dashed :mixed :none :svg}) (def stroke-caps-line #{:round :square}) @@ -253,26 +250,26 @@ [shape] (= (:type shape) :path)) -(s/def :internal.shape/stroke-width ::safe-number) +(s/def :internal.shape/stroke-width ::us/safe-number) (s/def :internal.shape/stroke-alignment #{:center :inner :outer}) (s/def :internal.shape/text-align #{"left" "right" "center" "justify"}) -(s/def :internal.shape/x ::safe-number) -(s/def :internal.shape/y ::safe-number) -(s/def :internal.shape/cx ::safe-number) -(s/def :internal.shape/cy ::safe-number) -(s/def :internal.shape/width ::safe-number) -(s/def :internal.shape/height ::safe-number) +(s/def :internal.shape/x ::us/safe-number) +(s/def :internal.shape/y ::us/safe-number) +(s/def :internal.shape/cx ::us/safe-number) +(s/def :internal.shape/cy ::us/safe-number) +(s/def :internal.shape/width ::us/safe-number) +(s/def :internal.shape/height ::us/safe-number) (s/def :internal.shape/index integer?) (s/def :internal.shape/shadow ::shadow) (s/def :internal.shape/blur ::blur) -(s/def :internal.shape/x1 ::safe-number) -(s/def :internal.shape/y1 ::safe-number) -(s/def :internal.shape/x2 ::safe-number) -(s/def :internal.shape/y2 ::safe-number) +(s/def :internal.shape/x1 ::us/safe-number) +(s/def :internal.shape/y1 ::us/safe-number) +(s/def :internal.shape/x2 ::us/safe-number) +(s/def :internal.shape/y2 ::us/safe-number) (s/def :internal.shape.export/suffix string?) -(s/def :internal.shape.export/scale ::safe-number) +(s/def :internal.shape.export/scale ::us/safe-number) (s/def :internal.shape/export (s/keys :req-un [::type :internal.shape.export/suffix @@ -384,8 +381,8 @@ :internal.color/gradient])) (s/def :internal.media-object/name ::string) -(s/def :internal.media-object/width ::safe-integer) -(s/def :internal.media-object/height ::safe-integer) +(s/def :internal.media-object/width ::us/safe-integer) +(s/def :internal.media-object/height ::us/safe-integer) (s/def :internal.media-object/mtype ::string) (s/def ::media-object diff --git a/common/src/app/common/types/interactions.cljc b/common/src/app/common/types/interactions.cljc index 64ae31899..287b4b30d 100644 --- a/common/src/app/common/types/interactions.cljc +++ b/common/src/app/common/types/interactions.cljc @@ -10,11 +10,6 @@ [app.common.spec :as us] [clojure.spec.alpha :as s])) -;; TODO: Move this to other place to avoid duplication with common.pages.spec -(s/def ::string string?) -(s/def ::safe-integer ::us/safe-integer) -(s/def ::uuid uuid?) - (s/def ::point (s/and (s/keys :req-un [::x ::y]) gpt/point?)) @@ -28,7 +23,7 @@ :mouse-leave :after-delay}) -(s/def ::delay ::safe-integer) +(s/def ::delay ::us/safe-integer) (defmulti event-opts-spec :event-type) @@ -49,9 +44,9 @@ :prev-screen :open-url}) -(s/def ::destination (s/nilable ::uuid)) +(s/def ::destination (s/nilable ::us/uuid)) (s/def ::overlay-position ::point) -(s/def ::url ::string) +(s/def ::url ::us/string) (defmulti action-opts-spec :action-type)