3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-07 14:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

♻️ Remove some undeclared namespaces

Browse source
This commit is contained in:
Andrés Moya 2022-10-17 17:06:07 +02:00
parent 04f8bbb1f2
commit 8463d501cd
7 changed files with 103 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/src/app/common/pages/changes_spec.cljc
View file

@ -8,7 +8,7 @@
(:require (:require
[app.common.spec :as us] [app.common.spec :as us]
[app.common.types.color :as ctc] [app.common.types.color :as ctc]
[app.common.types.file :as ctf] [app.common.types.file.media-object :as ctfm]
[app.common.types.page :as ctp] [app.common.types.page :as ctp]
[app.common.types.shape :as cts] [app.common.types.shape :as cts]
[app.common.types.typography :as ctt] [app.common.types.typography :as ctt]
@ -126,7 +126,7 @@
(s/keys :req-un [:internal.changes.add-recent-color/color])) (s/keys :req-un [:internal.changes.add-recent-color/color]))
(s/def :internal.changes.add-media/object ::ctf/media-object) (s/def :internal.changes.add-media/object ::ctfm/media-object)
(defmethod change-spec :add-media [_] (defmethod change-spec :add-media [_]
(s/keys :req-un [:internal.changes.add-media/object])) (s/keys :req-un [:internal.changes.add-media/object]))

94
common/src/app/common/types/color.cljc
View file

@ -9,77 +9,77 @@
[app.common.data :as d] [app.common.data :as d]
[app.common.spec :as us] [app.common.spec :as us]
[app.common.text :as txt] [app.common.text :as txt]
[app.common.types.color.generic :as-alias color-generic]
[app.common.types.color.gradient :as-alias color-gradient]
[app.common.types.color.gradient.stop :as-alias color-gradient-stop]
[clojure.spec.alpha :as s])) [clojure.spec.alpha :as s]))
;; TODO: waiting clojure 1.11 to rename this all :internal.stuff to a
;; more consistent name.
;; TODO: maybe define ::color-hex-string with proper hex color spec? ;; TODO: maybe define ::color-hex-string with proper hex color spec?
;; --- GRADIENTS ;; --- GRADIENTS
(s/def ::id uuid?) (s/def ::id uuid?)
(s/def :internal.gradient.stop/color string?) (s/def ::color-gradient/type #{:linear :radial})
(s/def :internal.gradient.stop/opacity ::us/safe-number) (s/def ::color-gradient/start-x ::us/safe-number)
(s/def :internal.gradient.stop/offset ::us/safe-number) (s/def ::color-gradient/start-y ::us/safe-number)
(s/def ::color-gradient/end-x ::us/safe-number)
(s/def ::color-gradient/end-y ::us/safe-number)
(s/def ::color-gradient/width ::us/safe-number)
(s/def :internal.gradient/type #{:linear :radial}) (s/def ::color-gradient-stop/color string?)
(s/def :internal.gradient/start-x ::us/safe-number) (s/def ::color-gradient-stop/opacity ::us/safe-number)
(s/def :internal.gradient/start-y ::us/safe-number) (s/def ::color-gradient-stop/offset ::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/def ::color-gradient/stop
(s/keys :req-un [:internal.gradient.stop/color (s/keys :req-un [::color-gradient-stop/color
:internal.gradient.stop/opacity ::color-gradient-stop/opacity
:internal.gradient.stop/offset])) ::color-gradient-stop/offset]))
(s/def :internal.gradient/stops (s/def ::color-gradient/stops
(s/coll-of :internal.gradient/stop :kind vector?)) (s/coll-of ::color-gradient/stop :kind vector?))
(s/def ::gradient (s/def ::gradient
(s/keys :req-un [:internal.gradient/type (s/keys :req-un [::color-gradient/type
:internal.gradient/start-x ::color-gradient/start-x
:internal.gradient/start-y ::color-gradient/start-y
:internal.gradient/end-x ::color-gradient/end-x
:internal.gradient/end-y ::color-gradient/end-y
:internal.gradient/width ::color-gradient/width
:internal.gradient/stops])) ::color-gradient/stops]))
;; --- COLORS ;; --- COLORS
(s/def :internal.color/name string?) (s/def ::color-generic/name string?)
(s/def :internal.color/path (s/nilable string?)) (s/def ::color-generic/path (s/nilable string?))
(s/def :internal.color/value (s/nilable string?)) (s/def ::color-generic/value (s/nilable string?))
(s/def :internal.color/color (s/nilable string?)) (s/def ::color-generic/color (s/nilable string?))
(s/def :internal.color/opacity (s/nilable ::us/safe-number)) (s/def ::color-generic/opacity (s/nilable ::us/safe-number))
(s/def :internal.color/gradient (s/nilable ::gradient)) (s/def ::color-generic/gradient (s/nilable ::gradient))
(s/def :internal.color/ref-id uuid?) (s/def ::color-generic/ref-id uuid?)
(s/def :internal.color/ref-file uuid?) (s/def ::color-generic/ref-file uuid?)
(s/def ::shape-color (s/def ::shape-color
(s/keys :req-un [:us/color (s/keys :req-un [:us/color
:internal.color/opacity] ::color-generic/opacity]
:opt-un [:internal.color/gradient :opt-un [::color-generic/gradient
:internal.color/ref-id ::color-generic/ref-id
:internal.color/ref-file])) ::color-generic/ref-file]))
(s/def ::color (s/def ::color
(s/keys :opt-un [::id (s/keys :opt-un [::id
:internal.color/name ::color-generic/name
:internal.color/path ::color-generic/path
:internal.color/value ::color-generic/value
:internal.color/color ::color-generic/color
:internal.color/opacity ::color-generic/opacity
:internal.color/gradient])) ::color-generic/gradient]))
(s/def ::recent-color (s/def ::recent-color
(s/keys :opt-un [:internal.color/value (s/keys :opt-un [::color-generic/value
:internal.color/color ::color-generic/color
:internal.color/opacity ::color-generic/opacity
:internal.color/gradient])) ::color-generic/gradient]))
;; --- Helpers for color in different parts of a shape ;; --- Helpers for color in different parts of a shape

10
common/src/app/common/types/file.cljc
View file

@ -28,14 +28,6 @@
;; Specs ;; Specs
(s/def ::media-object
(s/keys :req-un [::id
::name
::ctfm/width
::ctfm/height
::ctfm/mtype]
:opt-un [::ctfm/path]))
(s/def ::colors (s/def ::colors
(s/map-of uuid? ::ctc/color)) (s/map-of uuid? ::ctc/color))
@ -49,7 +41,7 @@
(s/coll-of uuid? :kind vector?)) (s/coll-of uuid? :kind vector?))
(s/def ::media (s/def ::media
(s/map-of uuid? ::media-object)) (s/map-of uuid? ::ctfm/media-object))
(s/def ::pages-index (s/def ::pages-index
(s/map-of uuid? ::ctp/page)) (s/map-of uuid? ::ctp/page))

9
common/src/app/common/types/file/media_object.cljc
View file

@ -9,6 +9,7 @@
[app.common.spec :as us] [app.common.spec :as us]
[clojure.spec.alpha :as s])) [clojure.spec.alpha :as s]))
(s/def ::id uuid?)
(s/def ::name string?) (s/def ::name string?)
(s/def ::width ::us/safe-integer) (s/def ::width ::us/safe-integer)
(s/def ::height ::us/safe-integer) (s/def ::height ::us/safe-integer)
@ -19,3 +20,11 @@
;; migration and then mark it as not nilable. ;; migration and then mark it as not nilable.
(s/def ::path (s/nilable string?)) (s/def ::path (s/nilable string?))
(s/def ::media-object
(s/keys :req-un [::id
::name
::width
::height
::mtype]
:opt-un [::path]))

10
common/src/app/common/types/page/grid.cljc
View file

@ -7,18 +7,20 @@
(ns app.common.types.page.grid (ns app.common.types.page.grid
(:require (:require
[app.common.spec :as us] [app.common.spec :as us]
[app.common.types.page.grid.color :as-alias grid-color]
[clojure.spec.alpha :as s])) [clojure.spec.alpha :as s]))
;; --- Board grids ;; --- Board grids
(s/def :grid/color string?)
(s/def :grid/opacity ::us/safe-number) (s/def ::grid-color/color string?)
(s/def ::grid-color/opacity ::us/safe-number)
(s/def ::size (s/nilable ::us/safe-integer)) (s/def ::size (s/nilable ::us/safe-integer))
(s/def ::item-length (s/nilable ::us/safe-number)) (s/def ::item-length (s/nilable ::us/safe-number))
(s/def ::color (s/keys :req-un [:grid/color (s/def ::color (s/keys :req-un [::grid-color/color
:grid/opacity])) ::grid-color/opacity]))
(s/def ::type #{:stretch :left :center :right}) (s/def ::type #{:stretch :left :center :right})
(s/def ::gutter (s/nilable ::us/safe-integer)) (s/def ::gutter (s/nilable ::us/safe-integer))
(s/def ::margin (s/nilable ::us/safe-integer)) (s/def ::margin (s/nilable ::us/safe-integer))

17
common/src/app/common/types/shape/shadow.cljc
View file

@ -21,7 +21,6 @@
(s/def ::spread ::us/safe-number) (s/def ::spread ::us/safe-number)
(s/def ::hidden boolean?) (s/def ::hidden boolean?)
(s/def ::color string?) (s/def ::color string?)
(s/def ::opacity ::us/safe-number) (s/def ::opacity ::us/safe-number)
(s/def ::gradient (s/nilable ::ctc/gradient)) (s/def ::gradient (s/nilable ::ctc/gradient))
@ -36,14 +35,14 @@
::id])) ::id]))
(s/def ::shadow-props (s/def ::shadow-props
(s/keys :req-un [:internal.shadow/id (s/keys :req-un [::id
:internal.shadow/style ::style
:shadow/color ::color
:internal.shadow/offset-x ::offset-x
:internal.shadow/offset-y ::offset-y
:internal.shadow/blur ::blur
:internal.shadow/spread ::spread
:internal.shadow/hidden])) ::hidden]))
(s/def ::shadow (s/def ::shadow
(s/coll-of ::shadow-props :kind vector?)) (s/coll-of ::shadow-props :kind vector?))

59
common/src/app/common/types/shape/text.cljc
View file

@ -8,6 +8,7 @@
(:require (:require
[app.common.spec :as us] [app.common.spec :as us]
[app.common.types.color :as ctc] [app.common.types.color :as ctc]
[app.common.types.shape.text.position-data :as-alias position-data]
[clojure.spec.alpha :as s])) [clojure.spec.alpha :as s]))
(s/def ::type #{"root" "paragraph-set" "paragraph"}) (s/def ::type #{"root" "paragraph-set" "paragraph"})
@ -37,36 +38,36 @@
:min-count 1)) :min-count 1))
(s/def ::position-data-element (s/def ::position-data-element
(s/keys :req-un [:position-data/x (s/keys :req-un [::position-data/x
:position-data/y ::position-data/y
:position-data/width ::position-data/width
:position-data/height] ::position-data/height]
:opt-un [:position-data/fill-color :opt-un [::position-data/fill-color
:position-data/fill-opacity ::position-data/fill-opacity
:position-data/font-family ::position-data/font-family
:position-data/font-size ::position-data/font-size
:position-data/font-style ::position-data/font-style
:position-data/font-weight ::position-data/font-weight
:position-data/rtl ::position-data/rtl
:position-data/text ::position-data/text
:position-data/text-decoration ::position-data/text-decoration
:position-data/text-transform])) ::position-data/text-transform]))
(s/def :position-data/x ::us/safe-number) (s/def ::position-data/x ::us/safe-number)
(s/def :position-data/y ::us/safe-number) (s/def ::position-data/y ::us/safe-number)
(s/def :position-data/width ::us/safe-number) (s/def ::position-data/width ::us/safe-number)
(s/def :position-data/height ::us/safe-number) (s/def ::position-data/height ::us/safe-number)
(s/def :position-data/fill-color ::fill-color) (s/def ::position-data/fill-color ::fill-color)
(s/def :position-data/fill-opacity ::fill-opacity) (s/def ::position-data/fill-opacity ::fill-opacity)
(s/def :position-data/fill-color-gradient ::fill-color-gradient) (s/def ::position-data/fill-color-gradient ::fill-color-gradient)
(s/def :position-data/font-family string?) (s/def ::position-data/font-family string?)
(s/def :position-data/font-size string?) (s/def ::position-data/font-size string?)
(s/def :position-data/font-style string?) (s/def ::position-data/font-style string?)
(s/def :position-data/font-weight string?) (s/def ::position-data/font-weight string?)
(s/def :position-data/rtl boolean?) (s/def ::position-data/rtl boolean?)
(s/def :position-data/text string?) (s/def ::position-data/text string?)
(s/def :position-data/text-decoration string?) (s/def ::position-data/text-decoration string?)
(s/def :position-data/text-transform string?) (s/def ::position-data/text-transform string?)