Merge pull request #1100 from metosin/feat/json-integral-decoding

feat: json-transformer decodes 123.0 into 123 for int schemas

Author: ikitommi

CHANGELOG.md

@@ -20,6 +20,7 @@ Malli is in well matured [alpha](README.md#alpha).
 * Distribute `:merge` over `:multi` [#1086](https://github.com/metosin/malli/pull/1086), see [documentation](README.md#distributive-schemas)
 * allow `m/-proxy-schema` child to be a `delay`
 * Fix `malli.dev.pretty` throws when explaining errors in nested maps [#1094](https://github.com/metosin/malli/issues/1096)
+* `json-transformer` decodes 123.0 into 123 for schemas like `:int`, `pos-int?` etc. [#986](https://github.com/metosin/malli/issues/986)
 
 ## 0.16.3 (2024-08-05)
 

src/malli/transform.cljc

@@ -1,6 +1,7 @@
 (ns malli.transform
   #?(:cljs (:refer-clojure :exclude [Inst Keyword UUID]))
   (:require [malli.core :as m]
+            [clojure.math :as math]
             #?(:cljs [goog.date.UtcDateTime])
             #?(:cljs [goog.date.Date]))
   #?(:clj (:import (java.time Instant ZoneId)
@@ -94,6 +95,12 @@
 (defn -number->double [x]
   (if (number? x) (double x) x))
 
+(defn -number->long [x]
+  (cond
+    (integer? x) x
+    (and (number? x) (== x (math/round x))) (math/round x)
+    :else x))
+
 (defn -string->keyword [x]
   (if (string? x) (keyword x) x))
 
@@ -254,13 +261,21 @@
    'float? -number->float
    'double? -number->double
    'inst? -string->date
+   'integer? -number->long
+   'int? -number->long
+   'pos-int? -number->long
+   'neg-int? -number->long
+   'nat-int? -number->long
+   'zero? -number->long
+
    #?@(:clj ['uri? -string->uri])
 
    :enum {:compile (-infer-child-compiler :decode)}
    := {:compile (-infer-child-compiler :decode)}
 
    :float -number->float
    :double -number->double
+   :int -number->long
    :keyword -string->keyword
    :symbol -string->symbol
    :qualified-keyword -string->keyword

test/malli/transform_test.cljc

@@ -119,6 +119,16 @@
   (is (= 1.0 (mt/-number->double 1)))
   (is (= "kikka" (mt/-number->double "kikka"))))
 
+(deftest number->long
+  (is (= 1 (mt/-number->long 1.0)))
+  (is (= 2 (mt/-number->long 2.0)))
+  (is (= 2.5 (mt/-number->long 2.5)))
+  (is (= "2.5" (mt/-number->long "2.5")))
+  #?(:clj (is (= 2 (mt/-number->long 4/2))))
+  #?(:clj (is (= 2 (mt/-number->long (float 2.0)))))
+  #?(:clj (is (= 2 (mt/-number->long (double 2.0)))))
+  (is (= 2 (mt/-number->long 2))))
+
 (deftest any->string
   #?(:clj (is (= "1/2" (mt/-any->string 1/2))))
   #?(:clj (is (= "http://example.com" (mt/-any->string (URI. "http://example.com")))))
@@ -140,6 +150,12 @@
       (is (= 1 (m/decode int? "+1" mt/string-transformer)))
       (is (= -1 (m/decode int? "-1" mt/string-transformer)))
       (is (= "1" (m/decode int? "1" mt/json-transformer)))
+      (is (= 1 (m/decode int? 1.0 mt/json-transformer)))
+      (is (= 1 (m/decode :int 1.0 mt/json-transformer)))
+      (is (= 1.5 (m/decode int? 1.5 mt/json-transformer)))
+      (is (= 1.5 (m/decode :int 1.5 mt/json-transformer)))
+      (is (= 1 (m/decode pos-int? 1.0 mt/json-transformer)))
+      (is (= 0 (m/decode zero? 0.0 mt/json-transformer)))
       (is (= 1.0 (m/decode double? 1 mt/json-transformer)))
       (is (= 1 (m/decode double? 1 mt/string-transformer)))
       (is (= "1.0x" (m/decode double? "1.0x" mt/string-transformer)))