@f1studio/form-spec 5.0.0-alpha.157 → 5.0.0-alpha.159

package/src/Thoth.Json/packages/Thoth.Json/Decode.ts

@@ -4,14 +4,14 @@ import { Result_Bind, Result_Map, FSharpResult$2_Ok, FSharpResult$2_Error, FShar
 import { tryParse as tryParse_2 } from "@fable-org/fable-library-js/Guid.js";
 import { toString as toString_12, FSharpRef } from "@fable-org/fable-library-js/Types.js";
 import { float32 as float32_1, uint32 as uint32_1, int32, uint16 as uint16_1, int16 as int16_1, uint8, tryParse as tryParse_3, int8, float64 } from "@fable-org/fable-library-js/Int32.js";
-import { parse, fromInt32, uint64 as uint64_1, toUInt64, int64 as int64_1, fromFloat64, toInt64, toFloat64 } from "@fable-org/fable-library-js/BigInt.js";
+import { parse, fromInt32, toUInt64, uint64 as uint64_1, int64 as int64_1, fromFloat64, toInt64, toFloat64 } from "@fable-org/fable-library-js/BigInt.js";
 import { tryParse as tryParse_4 } from "@fable-org/fable-library-js/Long.js";
 import { tryParse as tryParse_5, decimal as decimal_1 } from "@fable-org/fable-library-js/Decimal.js";
 import Decimal from "@fable-org/fable-library-js/Decimal.js";
 import { toUniversalTime, tryParse as tryParse_6, minValue } from "@fable-org/fable-library-js/Date.js";
 import { tryParse as tryParse_7, minValue as minValue_1 } from "@fable-org/fable-library-js/DateOffset.js";
 import { tryParse as tryParse_8 } from "@fable-org/fable-library-js/TimeSpan.js";
-import { map as map_4, value as value_44, defaultArg, some, Option } from "@fable-org/fable-library-js/Option.js";
+import { map as map_4, value as value_45, defaultArg, some, Option } from "@fable-org/fable-library-js/Option.js";
 import { ofArray, toArray, map as map_1, length, singleton, append as append_1, tail as tail_1, head as head_1, isEmpty, ofSeq, empty, reverse, fold, FSharpList, tryLast, cons } from "@fable-org/fable-library-js/List.js";
 import { IComparable, int16ToString, numberHash, compare, comparePrimitives, uncurry3, defaultOf, uncurry2, int32ToString } from "@fable-org/fable-library-js/Util.js";
 import { map as map_2, tryFind, foldBack, fill, setItem, fold as fold_1, item } from "@fable-org/fable-library-js/Array.js";
@@ -306,45 +306,64 @@ export const uint32 = (path: string): ((arg0: any) => FSharpResult$2_$union<uint
     }
 });
 
-export const int64 = (path: string): ((arg0: any) => FSharpResult$2_$union<int64_1, [string, ErrorReason_$union]>) => ((value_2: any): FSharpResult$2_$union<int64_1, [string, ErrorReason_$union]> => {
-    const path_1: string = path;
-    const value_3: any = value_2;
-    if ((typeof value_3) === "number") {
-        const value_1_1: float64 = value_3;
-        return (isFinite(value_1_1) && Math.floor(value_1_1) === value_1_1) ? (((toFloat64(-9223372036854775808n) <= value_1_1) && (value_1_1 <= toFloat64(9223372036854775807n))) ? FSharpResult$2_Ok<int64_1, [string, ErrorReason_$union]>(toInt64(fromFloat64(value_1_1))) : FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitiveExtra("an int64", value_1_1, "Value was either too large or too small for an int64")] as [string, ErrorReason_$union])) : FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitiveExtra("an int64", value_1_1, "Value is not an integral value")] as [string, ErrorReason_$union]);
+export function int64(path: string, value_1: any): FSharpResult$2_$union<int64_1, [string, ErrorReason_$union]> {
+    if (typeof value_1 === "number") {
+        const floatVal: float64 = value_1;
+        if ((floatVal >= toFloat64(-9223372036854775808n)) && (floatVal <= toFloat64(9223372036854775807n))) {
+            return FSharpResult$2_Ok<int64_1, [string, ErrorReason_$union]>(toInt64(fromFloat64(floatVal)));
+        }
+        else {
+            return FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path, ErrorReason_BadPrimitive("an int64", value_1)] as [string, ErrorReason_$union]);
+        }
     }
-    else if (typeof value_3 === "string") {
+    else if (typeof value_1 === "string") {
         let matchValue: [boolean, int64_1];
         let outArg: int64_1 = 0n;
-        matchValue = ([tryParse_4(value_3, 511, false, 64, new FSharpRef<int64_1>((): int64_1 => outArg, (v: int64_1): void => {
+        matchValue = ([tryParse_4(value_1, 511, false, 64, new FSharpRef<int64_1>((): int64_1 => outArg, (v: int64_1): void => {
             outArg = v;
         })), outArg] as [boolean, int64_1]);
-        return matchValue[0] ? FSharpResult$2_Ok<int64_1, [string, ErrorReason_$union]>(matchValue[1]) : FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitive("an int64", value_3)] as [string, ErrorReason_$union]);
+        if (matchValue[0]) {
+            return FSharpResult$2_Ok<int64_1, [string, ErrorReason_$union]>(matchValue[1]);
+        }
+        else {
+            return FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path, ErrorReason_BadPrimitive("an int64", value_1)] as [string, ErrorReason_$union]);
+        }
     }
     else {
-        return FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitive("an int64", value_3)] as [string, ErrorReason_$union]);
+        return FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path, ErrorReason_BadPrimitive("an int64", value_1)] as [string, ErrorReason_$union]);
     }
-});
+}
 
-export const uint64 = (path: string): ((arg0: any) => FSharpResult$2_$union<uint64_1, [string, ErrorReason_$union]>) => ((value_2: any): FSharpResult$2_$union<uint64_1, [string, ErrorReason_$union]> => {
-    const path_1: string = path;
-    const value_3: any = value_2;
-    if ((typeof value_3) === "number") {
-        const value_1_1: float64 = value_3;
-        return (isFinite(value_1_1) && Math.floor(value_1_1) === value_1_1) ? (((toFloat64(0n) <= value_1_1) && (value_1_1 <= toFloat64(18446744073709551615n))) ? FSharpResult$2_Ok<uint64_1, [string, ErrorReason_$union]>(toUInt64(fromFloat64(value_1_1))) : FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitiveExtra("an uint64", value_1_1, "Value was either too large or too small for an uint64")] as [string, ErrorReason_$union])) : FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitiveExtra("an uint64", value_1_1, "Value is not an integral value")] as [string, ErrorReason_$union]);
+export function uint64(path: string, value_1: any): FSharpResult$2_$union<uint64_1, [string, ErrorReason_$union]> {
+    if (typeof value_1 === "bigint") {
+        return FSharpResult$2_Ok<uint64_1, [string, ErrorReason_$union]>(value_1);
     }
-    else if (typeof value_3 === "string") {
+    else if (typeof value_1 === "number") {
+        const floatVal: float64 = value_1;
+        if (((floatVal >= 0) && (floatVal <= toFloat64(18446744073709551615n))) && (floatVal === Math.floor(floatVal))) {
+            return FSharpResult$2_Ok<uint64_1, [string, ErrorReason_$union]>(toUInt64(fromFloat64(floatVal)));
+        }
+        else {
+            return FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path, ErrorReason_BadPrimitive("an uint64", value_1)] as [string, ErrorReason_$union]);
+        }
+    }
+    else if (typeof value_1 === "string") {
         let matchValue: [boolean, uint64_1];
         let outArg: uint64_1 = 0n;
-        matchValue = ([tryParse_4(value_3, 511, true, 64, new FSharpRef<uint64_1>((): uint64_1 => outArg, (v: uint64_1): void => {
+        matchValue = ([tryParse_4(value_1, 511, true, 64, new FSharpRef<uint64_1>((): uint64_1 => outArg, (v: uint64_1): void => {
             outArg = v;
         })), outArg] as [boolean, uint64_1]);
-        return matchValue[0] ? FSharpResult$2_Ok<uint64_1, [string, ErrorReason_$union]>(matchValue[1]) : FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitive("an uint64", value_3)] as [string, ErrorReason_$union]);
+        if (matchValue[0]) {
+            return FSharpResult$2_Ok<uint64_1, [string, ErrorReason_$union]>(matchValue[1]);
+        }
+        else {
+            return FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path, ErrorReason_BadPrimitive("an uint64", value_1)] as [string, ErrorReason_$union]);
+        }
     }
     else {
-        return FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitive("an uint64", value_3)] as [string, ErrorReason_$union]);
+        return FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path, ErrorReason_BadPrimitive("an uint64", value_1)] as [string, ErrorReason_$union]);
     }
-});
+}
 
 export function bigint(path: string, value_1: any): FSharpResult$2_$union<bigint, [string, ErrorReason_$union]> {
     if ((typeof value_1) === "number") {
@@ -577,7 +596,7 @@ export function optionalAt<value>(fieldNames: FSharpList<string>, decoder: ((arg
         }
     }
     else {
-        return value_44(_arg[2]);
+        return value_45(_arg[2]);
     }
 }
 
@@ -626,7 +645,7 @@ export function at<value>(fieldNames: FSharpList<string>, decoder: ((arg0: strin
         return decoder(_arg[0], _arg[1]);
     }
     else {
-        return value_44(_arg[2]);
+        return value_45(_arg[2]);
     }
 }
 
@@ -1649,7 +1668,7 @@ function mixedArray(offset: int32, decoders: ((arg0: string) => ((arg0: any) =>
 function makeUnion(extra: FSharpMap<string, FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>>, caseStrategy: CaseStrategy_$union, t: any, name: string, path: string, values: any[]): FSharpResult$2_$union<any, [string, ErrorReason_$union]> {
     const uci: Option<any> = tryFind<any>((x: any): boolean => (name_3(x) === name), getUnionCases(t, true));
     if (uci != null) {
-        const uci_1: any = value_44(uci);
+        const uci_1: any = value_45(uci);
         const decoders: ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))[] = map_2<any, ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>((fi: any): ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>)) => autoDecoder(extra, caseStrategy, false, fi[1]), getUnionCaseFields(uci_1));
         return Result_Map<FSharpList<any>, any, [string, ErrorReason_$union]>((values_2: FSharpList<any>): any => makeUnion_1(uci_1, toArray<any>(values_2), true), ((decoders.length === 0) && (values.length <= 1)) ? FSharpResult$2_Ok<FSharpList<any>, [string, ErrorReason_$union]>(empty<any>()) : mixedArray(1, decoders, path, values));
     }
@@ -1878,21 +1897,19 @@ function autoDecoder(extra: FSharpMap<string, FSharpRef<((arg0: string) => ((arg
                 case "System.Single":
                     return (path_28: string): ((arg0: any) => FSharpResult$2_$union<float32_1, [string, ErrorReason_$union]>) => ((value_37: any): FSharpResult$2_$union<float32_1, [string, ErrorReason_$union]> => float32(path_28, value_37));
                 case "System.Int64":
-                    return int64;
+                    return (path_29: string): ((arg0: any) => FSharpResult$2_$union<int64_1, [string, ErrorReason_$union]>) => ((value_38: any): FSharpResult$2_$union<int64_1, [string, ErrorReason_$union]> => int64(path_29, value_38));
                 case "System.UInt64":
-                    return uint64;
+                    return (path_30: string): ((arg0: any) => FSharpResult$2_$union<uint64_1, [string, ErrorReason_$union]>) => ((value_39: any): FSharpResult$2_$union<uint64_1, [string, ErrorReason_$union]> => uint64(path_30, value_39));
                 case "System.Numerics.BigInteger":
-                    return (path_29: string): ((arg0: any) => FSharpResult$2_$union<bigint, [string, ErrorReason_$union]>) => ((value_38: any): FSharpResult$2_$union<bigint, [string, ErrorReason_$union]> => bigint(path_29, value_38));
-                case "System.Decimal":
-                    return (path_30: string): ((arg0: any) => FSharpResult$2_$union<decimal_1, [string, ErrorReason_$union]>) => ((value_39: any): FSharpResult$2_$union<decimal_1, [string, ErrorReason_$union]> => decimal(path_30, value_39));
+                    return (path_31: string): ((arg0: any) => FSharpResult$2_$union<bigint, [string, ErrorReason_$union]>) => ((value_40: any): FSharpResult$2_$union<bigint, [string, ErrorReason_$union]> => bigint(path_31, value_40));
                 case "System.DateTime":
-                    return (path_31: string): ((arg0: any) => FSharpResult$2_$union<Date, [string, ErrorReason_$union]>) => ((value_40: any): FSharpResult$2_$union<Date, [string, ErrorReason_$union]> => datetimeUtc(path_31, value_40));
+                    return (path_32: string): ((arg0: any) => FSharpResult$2_$union<Date, [string, ErrorReason_$union]>) => ((value_41: any): FSharpResult$2_$union<Date, [string, ErrorReason_$union]> => datetimeUtc(path_32, value_41));
                 case "System.DateTimeOffset":
-                    return (path_32: string): ((arg0: any) => FSharpResult$2_$union<Date, [string, ErrorReason_$union]>) => ((value_41: any): FSharpResult$2_$union<Date, [string, ErrorReason_$union]> => datetimeOffset(path_32, value_41));
+                    return (path_33: string): ((arg0: any) => FSharpResult$2_$union<Date, [string, ErrorReason_$union]>) => ((value_42: any): FSharpResult$2_$union<Date, [string, ErrorReason_$union]> => datetimeOffset(path_33, value_42));
                 case "System.TimeSpan":
-                    return (path_33: string): ((arg0: any) => FSharpResult$2_$union<number, [string, ErrorReason_$union]>) => ((value_42: any): FSharpResult$2_$union<number, [string, ErrorReason_$union]> => timespan(path_33, value_42));
+                    return (path_34: string): ((arg0: any) => FSharpResult$2_$union<number, [string, ErrorReason_$union]>) => ((value_43: any): FSharpResult$2_$union<number, [string, ErrorReason_$union]> => timespan(path_34, value_43));
                 case "System.Guid":
-                    return (path_34: string): ((arg0: any) => FSharpResult$2_$union<string, [string, ErrorReason_$union]>) => ((value_43: any): FSharpResult$2_$union<string, [string, ErrorReason_$union]> => guid(path_34, value_43));
+                    return (path_35: string): ((arg0: any) => FSharpResult$2_$union<string, [string, ErrorReason_$union]>) => ((value_44: any): FSharpResult$2_$union<string, [string, ErrorReason_$union]> => guid(path_35, value_44));
                 case "System.Object":
                     return (_arg_6: string): ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>) => (FSharpResult$2_Ok);
                 default:
@@ -1901,14 +1918,14 @@ function autoDecoder(extra: FSharpMap<string, FSharpRef<((arg0: string) => ((arg
         }
     }
     else {
-        const decoderRef: FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))> = value_44(matchValue);
+        const decoderRef: FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))> = value_45(matchValue);
         return (path: string): ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>) => ((value_1: any): FSharpResult$2_$union<any, [string, ErrorReason_$union]> => decoderRef.contents(path)(value_1));
     }
 }
 
 function makeExtra(extra: Option<ExtraCoders>): FSharpMap<string, FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>> {
     if (extra != null) {
-        return map_3<string, [((arg0: any) => any), ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))], FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>>((_arg: string, tupledArg: [((arg0: any) => any), ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))]): FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))> => (new FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>(tupledArg[1])), value_44(extra).Coders);
+        return map_3<string, [((arg0: any) => any), ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))], FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>>((_arg: string, tupledArg: [((arg0: any) => any), ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))]): FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))> => (new FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>(tupledArg[1])), value_45(extra).Coders);
     }
     else {
         return empty_1<string, FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>>({

package/src/Thoth.Json/packages/Thoth.Json/Encode.ts

@@ -2,10 +2,10 @@ import { decimal as decimal_1, toString as toString_1 } from "@fable-org/fable-l
 import { comparePrimitives, Lazy, IDisposable, disposeSafe, IEnumerator, getEnumerator, defaultOf } from "@fable-org/fable-library-js/Util.js";
 import { map as map_1, FSharpList } from "@fable-org/fable-library-js/List.js";
 import { empty, map as map_5, tryFind, add, FSharpMap, toList } from "@fable-org/fable-library-js/Map.js";
-import { uint64 as uint64_1, int64 as int64_1, toString as toString_2 } from "@fable-org/fable-library-js/BigInt.js";
+import { uint64 as uint64_1, int64 as int64_1, toFloat64, compare, toString as toString_2 } from "@fable-org/fable-library-js/BigInt.js";
 import { toString as toString_3 } from "@fable-org/fable-library-js/Date.js";
 import { toString as toString_4 } from "@fable-org/fable-library-js/TimeSpan.js";
-import { defaultArg, value as value_48, Option, map as map_2, defaultArgWith, some } from "@fable-org/fable-library-js/Option.js";
+import { defaultArg, value as value_46, Option, map as map_2, defaultArgWith, some } from "@fable-org/fable-library-js/Option.js";
 import { float32, float64, uint32, uint16, int16, uint8, int8, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { toString as toString_5, FSharpRef } from "@fable-org/fable-library-js/Types.js";
 import { class_type, TypeInfo, getGenerics, getGenericTypeDefinition, getTupleFields, getTupleElements, isTuple, isGenericType, getEnumUnderlyingType, isEnum, getElementType, isArray, getUnionCaseFields, getUnionFields, isUnion, getRecordElements, getRecordField, name, isRecord, fullName as fullName_1 } from "@fable-org/fable-library-js/Reflection.js";
@@ -134,11 +134,21 @@ export function timespan(value: number): any {
 }
 
 export function int64(value: int64_1): any {
-    return String(value);
+    if ((compare(value, -9007199254740991n) >= 0) && (compare(value, 9007199254740991n) <= 0)) {
+        return toFloat64(value);
+    }
+    else {
+        return String(value);
+    }
 }
 
 export function uint64(value: uint64_1): any {
-    return String(value);
+    if (compare(value, 9007199254740991n) <= 0) {
+        return toFloat64(value);
+    }
+    else {
+        return String(value);
+    }
 }
 
 export function unit(): any {
@@ -406,10 +416,6 @@ function autoEncoder(extra: FSharpMap<string, FSharpRef<((arg0: any) => any)>>,
                     return int64;
                 case "System.UInt64":
                     return uint64;
-                case "System.Numerics.BigInteger":
-                    return bigint;
-                case "System.Decimal":
-                    return decimal;
                 case "System.DateTime":
                     return datetime;
                 case "System.DateTimeOffset":
@@ -426,14 +432,14 @@ function autoEncoder(extra: FSharpMap<string, FSharpRef<((arg0: any) => any)>>,
         }
     }
     else {
-        const encoderRef: FSharpRef<((arg0: any) => any)> = value_48(matchValue);
+        const encoderRef: FSharpRef<((arg0: any) => any)> = value_46(matchValue);
         return (v: any): any => encoderRef.contents(v);
     }
 }
 
 function makeExtra(extra: Option<ExtraCoders>): FSharpMap<string, FSharpRef<((arg0: any) => any)>> {
     if (extra != null) {
-        return map_5<string, [((arg0: any) => any), ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))], FSharpRef<((arg0: any) => any)>>((_arg: string, tupledArg: [((arg0: any) => any), ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))]): FSharpRef<((arg0: any) => any)> => (new FSharpRef<((arg0: any) => any)>(tupledArg[0])), value_48(extra).Coders);
+        return map_5<string, [((arg0: any) => any), ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))], FSharpRef<((arg0: any) => any)>>((_arg: string, tupledArg: [((arg0: any) => any), ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))]): FSharpRef<((arg0: any) => any)> => (new FSharpRef<((arg0: any) => any)>(tupledArg[0])), value_46(extra).Coders);
     }
     else {
         return empty<string, FSharpRef<((arg0: any) => any)>>({