fix custom marshal for map key

goccy · Nov 13, 2022 · 705f517 · 705f517
1 parent 41ad89f
commit 705f517
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/encode_test.go b/encode_test.go
@@ -2605,3 +2605,18 @@ func TestIssue386(t *testing.T) {
  t.Error(err)
  }
 }
+
+type customMapKey string
+
+func (b customMapKey) MarshalJSON() ([]byte, error) {
+ return []byte("[]"), nil
+}
+
+func TestCustomMarshalForMapKey(t *testing.T) {
+ m := map[customMapKey]string{customMapKey("skipcustom"): "test"}
+ expected, err := stdjson.Marshal(m)
+ assertErr(t, err)
+ got, err := json.Marshal(m)
+ assertErr(t, err)
+ assertEq(t, "custom map key", string(expected), string(got))
+}
diff --git a/internal/encoder/compiler.go b/internal/encoder/compiler.go
@@ -506,8 +506,6 @@ func (c *Compiler) listElemCode(typ *runtime.Type) (Code, error) {
 
 func (c *Compiler) mapKeyCode(typ *runtime.Type) (Code, error) {
  switch {
- case c.implementsMarshalJSON(typ):
- return c.marshalJSONCode(typ)
  case c.implementsMarshalText(typ):
  return c.marshalTextCode(typ)
  }