fix enum idx (#131)

elringus · Jan 5, 2024 · 6de6283 · 6de6283
1 parent d594dc1
commit 6de6283
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6 deletions.
diff --git a/src/cs/Bootsharp.Publish.Test/Pack/BindingTest.cs b/src/cs/Bootsharp.Publish.Test/Pack/BindingTest.cs
@@ -307,4 +307,20 @@ public void ExportedEnumsAreDeclaredInJS ()
             };
             """);
     }
+
+    [Fact]
+    public void CustomEnumIndexesArePreservedInJS ()
+    {
+        AddAssembly(
+            WithClass("n", "public enum Foo { A = 1, B = 6 }"),
+            WithClass("n", "[JSInvokable] public static Foo GetFoo () => default;"));
+        Execute();
+        Contains(
+            """
+            export const n = {
+                getFoo: () => deserialize(getExports().n_MockClass.GetFoo()),
+                Foo: { "1": "A", "6": "B", "A": 1, "B": 6 }
+            };
+            """);
+    }
 }
diff --git a/src/cs/Bootsharp.Publish/Pack/BindingGenerator/BindingGenerator.cs b/src/cs/Bootsharp.Publish/Pack/BindingGenerator/BindingGenerator.cs
@@ -125,10 +125,10 @@ private void EmitEvent (MethodMeta method)
 
     private void EmitEnum (Type @enum)
     {
-        var values = Enum.GetNames(@enum);
-        var fields = string.Join(", ",
-            values.Select((v, i) => $"\"{i}\": \"{v}\"")
-                .Concat(values.Select((v, i) => $"\"{v}\": {i}")));
+        var values = Enum.GetValuesAsUnderlyingType(@enum).Cast<object>().ToArray();
+        var fields = string.Join(", ", values
+            .Select(v => $"\"{v}\": \"{Enum.GetName(@enum, v)}\"")
+            .Concat(values.Select(v => $"\"{Enum.GetName(@enum, v)}\": {v}")));
         builder.Append($"{Comma()}\n{Pad(level + 1)}{@enum.Name}: {{ {fields} }}");
     }
 

diff --git a/src/js/package.json b/src/js/package.json
@@ -8,8 +8,8 @@
     },
     "devDependencies": {
         "typescript": "^5.3.3",
-        "vitest": "^1.1.1",
-        "@vitest/coverage-v8": "^1.1.1",
+        "vitest": "^1.1.3",
+        "@vitest/coverage-v8": "^1.1.3",
         "@types/node": "^20.10.6",
         "ws": "^8.16.0"
     }

diff --git a/src/js/test/cs/Test/IdxEnum.cs b/src/js/test/cs/Test/IdxEnum.cs
@@ -0,0 +1,7 @@
+namespace Test;
+
+public enum IdxEnum
+{
+    One = 1,
+    Two = 2
+}
diff --git a/src/js/test/cs/Test/Invokable.cs b/src/js/test/cs/Test/Invokable.cs
@@ -28,4 +28,7 @@ public static async Task<string> JoinStringsAsync (string a, string b)
 
     [JSInvokable]
     public static string BytesToString (byte[] bytes) => Encoding.UTF8.GetString(bytes);
+
+    [JSInvokable]
+    public static IdxEnum GetIdxEnumOne () => IdxEnum.One;
 }
diff --git a/src/js/test/spec/interop.spec.mjs b/src/js/test/spec/interop.spec.mjs
@@ -154,4 +154,8 @@ describe("while bootsharp is booted", () => {
         expect(TrackType[TrackType.Rubber]).toStrictEqual("Rubber");
         expect(TrackType[TrackType.Chain]).toStrictEqual("Chain");
     });
+    it("can compare indexed enums", () => {
+        expect(Test.getIdxEnumOne() === Test.IdxEnum.One).toBeTruthy();
+        expect(Test.getIdxEnumOne() === Test.IdxEnum.Two).not.toBeTruthy();
+    });
 });