Skip to content

Prevent default spec names overwriting the :name provided in st/spec #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prevent default spec names overwriting the :name provided in st/spec #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/spec_tools/json_schema.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,10 @@
json-schema-meta (impl/unlift-keys data "json-schema")
extra-info (-> (select-keys data [:description])
(cond-> (and name (not synthetic?))
(assoc :title (impl/qualified-name name))))]
(assoc :title (or (when-let [name-use (:name data)]
(when (string? name-use)
name-use))
(impl/qualified-name name)))))]
(merge (impl/unwrap children) extra-info json-schema-meta)))

(defmethod accept-spec ::default [_ _ _ _]
Expand Down
8 changes: 8 additions & 0 deletions test/cljc/spec_tools/json_schema_test.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,3 +250,11 @@
(s/and (s/keys :req-un [::bar])
(s/keys :req-un [::foo])))))
"allOf properties are merged into properties and required"))

(s/def ::spec-with-explicit-name
(st/spec {:spec ::keys-no-req
:name "specific-name"}))

(deftest name-is-respected-test
(is (= (:title (jsc/transform ::spec-with-explicit-name))
"specific-name")))