Skip to content
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

2-arity default-fn #644

Merged
merged 2 commits into from
Feb 15, 2022
Merged

2-arity default-fn #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffce6b2
2-arity default-fn
ikitommi Feb 15, 2022
ad0d96d
Update CHANGELOG
ikitommi Feb 15, 2022
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ We use [Break Versioning][breakver]. The version numbers follow a `<major>.<mino

Malli is in well matured [alpha](README.md#alpha).

## UNRELEASED

* support for 2-arity `default-fn` option in `mt/default-value-transformer` [#582](https://github.com/metosin/malli/pull/582) & [#644](https://github.com/metosin/malli/pull/644)

## 0.8.3 (2022-02-15)

* FIX: qualified-keyword with namespace doesn't generate the ns [#642](https://github.com/metosin/malli/issues/642)
Expand Down
14 changes: 14 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,20 @@ With custom key and type defaults:
; => {:user {:name "", :description "-"}}
```

With custom function:

```clj
(m/decode
[:map
[:os [:string {:property "os.name"}]]
[:timezone [:string {:property "user.timezone"}]]]
{}
(mt/default-value-transformer
{:key :property
:default-fn (fn [_ x] (System/getProperty x))}))
; => {:os "Mac OS X", :timezone "Europe/Helsinki"}
```

Single sweep of defaults & string encoding:

```clj
Expand Down
11 changes: 5 additions & 6 deletions src/malli/transform.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,23 +380,22 @@
(defn default-value-transformer
([]
(default-value-transformer nil))
([{:keys [key default-fn defaults] :or {key :default, default-fn identity}}]
([{:keys [key default-fn defaults] :or {key :default, default-fn (fn [_ x] x)}}]
(let [get-default (fn [schema]
(if-some [e (some-> schema m/properties (find key))]
(constantly (val e))
(some->> schema m/type (get defaults) (#(constantly (% schema))))))
set-default {:compile (fn [schema _]
(when-some [f (get-default schema)]
(fn [x] (if (nil? x) (default-fn (f)) x))))}
(fn [x] (if (nil? x) (default-fn schema (f)) x))))}
add-defaults {:compile (fn [schema _]
(let [defaults (into {}
(keep (fn [[k {:keys [optional] :as p} v]]
(when-not optional
(let [e (find p key)]
(when-some [f (if e
(constantly (val e))
(get-default v))]
[k (comp default-fn f)])))))
(when-some [f (if e (constantly (val e))
(get-default v))]
[k (fn [] (default-fn schema (f)))])))))
(m/children schema))]
(when (seq defaults)
(fn [x]
Expand Down
15 changes: 9 additions & 6 deletions test/malli/transform_test.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,21 +832,24 @@
[:first {:default 1} int?]
[:second {:default 2} int?]]]
(testing "called on each defaulted value"
(let [seen (atom [])]
(is (= {:first 1, :second 2} (m/encode schema nil (mt/default-value-transformer {:default-fn (fn [x] (swap! seen conj x) x)}))))
(let [seen (atom [])
transformer (mt/default-value-transformer {:default-fn (fn [_ x] (swap! seen conj x) x)})]
(is (= {:first 1, :second 2} (m/encode schema nil transformer)))
(is (= [{} 1 2] @seen))))

(testing "only called on defaulted value"
(let [seen (atom [])]
(is (= {:first -1, :second 2} (m/encode schema {:first -1} (mt/default-value-transformer {:default-fn (fn [x] (swap! seen conj x) x)}))))
(let [seen (atom [])
transformer (mt/default-value-transformer {:default-fn (fn [_ x] (swap! seen conj x) x)})]
(is (= {:first -1, :second 2} (m/encode schema {:first -1} transformer)))
(is (= [2] @seen)))))

(testing "custom default :key"
(let [schema [:map {}
[:first {:default 1, :name 'one} int?]
[:second {:default 2, :name 'two} int?]]]
(let [seen (atom [])]
(is (= {:first 'one, :second 'two} (m/encode schema {} (mt/default-value-transformer {:key :name, :default-fn (fn [x] (swap! seen conj x) x)}))))
(let [seen (atom [])
transformer (mt/default-value-transformer {:key :name, :default-fn (fn [_ x] (swap! seen conj x) x)})]
(is (= {:first 'one, :second 'two} (m/encode schema {} transformer)))
(is (= ['one 'two] @seen)))))))

(deftest type-properties-based-transformations
Expand Down