fix(float/clamp): work around compiler bug by type annotation

Author: glennsl

src/Core__Float.mjs

@@ -1,7 +1,5 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Caml_obj from "rescript/lib/es6/caml_obj.js";
-import * as Caml_option from "rescript/lib/es6/caml_option.js";
 
 var Constants = {};
 
@@ -15,19 +13,9 @@ function fromString(i) {
 }
 
 function clamp(min, max, value) {
-  var value$1;
-  if (max !== undefined) {
-    var max$1 = Caml_option.valFromOption(max);
-    value$1 = Caml_obj.lessthan(max$1, value) ? max$1 : value;
-  } else {
-    value$1 = value;
-  }
-  if (min === undefined) {
-    return value$1;
-  }
-  var min$1 = Caml_option.valFromOption(min);
-  if (Caml_obj.greaterthan(min$1, value$1)) {
-    return min$1;
+  var value$1 = max !== undefined && max < value ? max : value;
+  if (min !== undefined && min > value$1) {
+    return min;
   } else {
     return value$1;
   }

src/Core__Float.res

@@ -38,7 +38,7 @@ external fromInt: int => float = "%identity"
 
 @unboxed @noalloc external mod: (float, float) => float = "?fmod_float"
 
-let clamp = (~min=?, ~max=?, value) => {
+let clamp = (~min=?, ~max=?, value): float => {
   let value = switch max {
   | Some(max) if max < value => max
   | _ => value

test/FloatTests.mjs

@@ -105,7 +105,7 @@ Test.run([
         33
       ],
       "clamp - nan"
-    ], Core__Float.clamp(4.1, 4.3, Number.NaN), eq, 4.1);
+    ], isNaN(Core__Float.clamp(4.1, 4.3, Number.NaN)), eq, true);
 
 Test.run([
       [
@@ -135,7 +135,7 @@ Test.run([
         37
       ],
       "clamp - min nan"
-    ], isNaN(Core__Float.clamp(Number.NaN, undefined, 4.2)), eq, true);
+    ], Core__Float.clamp(Number.NaN, undefined, 4.2), eq, 4.2);
 
 Test.run([
       [
@@ -150,17 +150,17 @@ Test.run([
 Test.run([
       [
         "FloatTests.res",
+        19,
         20,
-        13,
-        39
+        46
       ],
       "clamp - min nan, max nan"
-    ], isNaN(Core__Float.clamp(Number.NaN, Number.NaN, 4.2)), eq, true);
+    ], Core__Float.clamp(Number.NaN, Number.NaN, 4.2), eq, 4.2);
 
 Test.run([
       [
         "FloatTests.res",
-        25,
+        20,
         20,
         42
       ],
@@ -170,7 +170,7 @@ Test.run([
 Test.run([
       [
         "FloatTests.res",
-        26,
+        21,
         20,
         42
       ],
@@ -180,7 +180,7 @@ Test.run([
 Test.run([
       [
         "FloatTests.res",
-        27,
+        22,
         20,
         43
       ],
@@ -190,7 +190,7 @@ Test.run([
 Test.run([
       [
         "FloatTests.res",
-        28,
+        23,
         20,
         43
       ],
@@ -200,7 +200,7 @@ Test.run([
 Test.run([
       [
         "FloatTests.res",
-        30,
+        25,
         13,
         49
       ],
@@ -210,7 +210,7 @@ Test.run([
 Test.run([
       [
         "FloatTests.res",
-        36,
+        31,
         13,
         50
       ],
@@ -220,7 +220,7 @@ Test.run([
 Test.run([
       [
         "FloatTests.res",
-        42,
+        37,
         13,
         50
       ],
@@ -230,7 +230,7 @@ Test.run([
 Test.run([
       [
         "FloatTests.res",
-        48,
+        43,
         13,
         51
       ],

test/FloatTests.res

@@ -11,17 +11,12 @@ Test.run(__POS_OF__("clamp - < min, < max"), Float.clamp(~min=4.3, ~max=4.5, 4.2
 Test.run(__POS_OF__("clamp - < min, > max"), Float.clamp(~min=4.3, ~max=4.1, 4.2), eq, 4.3) // min wins
 Test.run(__POS_OF__("clamp - > min, < max"), Float.clamp(~min=4.1, ~max=4.5, 4.2), eq, 4.2)
 Test.run(__POS_OF__("clamp - > min, > max"), Float.clamp(~min=4.1, ~max=4.1, 4.2), eq, 4.1)
-Test.run(__POS_OF__("clamp - nan"), Float.clamp(~min=4.1, ~max=4.3, nan), eq, 4.1) // min wins ??
+Test.run(__POS_OF__("clamp - nan"), Float.clamp(~min=4.1, ~max=4.3, nan)->Float.isNaN, eq, true)
 Test.run(__POS_OF__("clamp - infinity"), Float.clamp(~min=4.1, ~max=4.3, infinity), eq, 4.3)
 Test.run(__POS_OF__("clamp - -infinity"), Float.clamp(~min=4.1, ~max=4.3, neg_infinity), eq, 4.1)
-Test.run(__POS_OF__("clamp - min nan"), Float.clamp(~min=nan, 4.2)->Float.isNaN, eq, true) // ??
+Test.run(__POS_OF__("clamp - min nan"), Float.clamp(~min=nan, 4.2), eq, 4.2)
 Test.run(__POS_OF__("clamp - max nan"), Float.clamp(~max=nan, 4.2), eq, 4.2)
-Test.run(
-  __POS_OF__("clamp - min nan, max nan"),
-  Float.clamp(~min=nan, ~max=nan, 4.2)->Float.isNaN,
-  eq,
-  true, // ??
-)
+Test.run(__POS_OF__("clamp - min nan, max nan"), Float.clamp(~min=nan, ~max=nan, 4.2), eq, 4.2)
 Test.run(__POS_OF__("clamp - min infinity"), Float.clamp(~min=infinity, 4.2), eq, infinity)
 Test.run(__POS_OF__("clamp - max infinity"), Float.clamp(~max=infinity, 4.2), eq, 4.2)
 Test.run(__POS_OF__("clamp - min -infinity"), Float.clamp(~min=neg_infinity, 4.2), eq, 4.2)