Bump version and bug fixes

Author: alfonsogarciacaro

RELEASE_NOTES_COMPILER.md

@@ -1,3 +1,7 @@
+### 0.7.33
+
+* Add operator `enum`
+
 ### 0.7.32
 
 * Fixed default comparer: PR #658

RELEASE_NOTES_CORE.md

@@ -1,3 +1,7 @@
+### 0.7.24
+
+* Fixed serialization of maps with string keys: #659
+
 ### 0.7.23
 
 * Added BigInt conversions: PR #650

src/fable/Fable.Compiler/Replacements.fs

@@ -681,6 +681,7 @@ module private AstPass =
         | "toSingle" | "toDouble" | "toDecimal" -> toFloat com info args |> Some
         | "toChar" -> toChar com info args.Head |> Some
         | "toString" -> toString com info args.Head |> Some
+        | "toEnum" -> args.Head |> Some        
         | "createDictionary" ->
             GlobalCall("Map", None, true, args) |> makeCall r typ |> Some
         | "createSet" ->

src/fable/Fable.Core/ts/Serialize.ts

@@ -25,8 +25,13 @@ export function toJson(o: any): string {
         return Array.from(v);
       }
       else if (v instanceof FableMap || v instanceof Map) {
+        let stringKeys: boolean = null;
         return fold((o: any, kv: [any,any]) => {
-          return o[toJson(kv[0])] = kv[1], o;
+          if (stringKeys === null) {
+            stringKeys = typeof kv[0] === "string"; 
+          }
+          o[stringKeys ? kv[0] : toJson(kv[0])] = kv[1];
+          return o;
         }, {}, v);
       }
       else if (!hasInterface(v, "FSharpRecord") && properties) {

src/tests/Main/EnumTests.fs

@@ -107,6 +107,12 @@ let ``EnumOfValue works``() =
     EnumOfValue 2 |> equal Fruits.Banana
     EnumOfValue 3 |> equal Fruits.Coconut
 
+[<Test>]
+let ``Enum operator enum works``() =
+    enum 1 |> equal Fruits.Apple
+    enum 2 |> equal Fruits.Banana
+    enum 3 |> equal Fruits.Coconut
+
 open LanguagePrimitives
 
 type Vegetables =

src/tests/Main/JsonTests.fs

@@ -293,6 +293,12 @@ let ``Maps`` () =
     result.a.Count |> equal 2
     result.a.["b"] = { a="bb"; b=2 } |> equal true
 
+[<Test>]
+let ``Map string keys are not quoted``() = // #659
+    let v = [ "foo", 1 ] |> Map.ofList 
+    let serialised = toJson v
+    (toJson v).Replace(" ", "") |> equal """{"foo":1}"""
+
 type DictionaryJson =
     { a: System.Collections.Generic.Dictionary<string, Child> }