From b9ca6f256a526a33ac92233a0b77d2ccc45ee50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Thu, 22 Feb 2024 18:22:45 +0800
Subject: [PATCH] badjson: Improve omitempty

---
 common/json/badjson/array.go  | 13 +++++++++++++
 common/json/badjson/empty.go  |  5 +++++
 common/json/badjson/object.go | 16 ++++++++++++++--
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 common/json/badjson/empty.go

diff --git a/common/json/badjson/array.go b/common/json/badjson/array.go
index f662f18..a7d5f70 100644
--- a/common/json/badjson/array.go
+++ b/common/json/badjson/array.go
@@ -3,12 +3,25 @@ package badjson
 import (
 	"bytes"
 
+	"github.com/sagernet/sing/common"
 	E "github.com/sagernet/sing/common/exceptions"
 	"github.com/sagernet/sing/common/json"
 )
 
 type JSONArray []any
 
+func (a JSONArray) IsEmpty() bool {
+	if len(a) == 0 {
+		return true
+	}
+	return common.All(a, func(it any) bool {
+		if valueInterface, valueMaybeEmpty := it.(isEmpty); valueMaybeEmpty && valueInterface.IsEmpty() {
+			return true
+		}
+		return false
+	})
+}
+
 func (a JSONArray) MarshalJSON() ([]byte, error) {
 	return json.Marshal([]any(a))
 }
diff --git a/common/json/badjson/empty.go b/common/json/badjson/empty.go
new file mode 100644
index 0000000..da8bedf
--- /dev/null
+++ b/common/json/badjson/empty.go
@@ -0,0 +1,5 @@
+package badjson
+
+type isEmpty interface {
+	IsEmpty() bool
+}
diff --git a/common/json/badjson/object.go b/common/json/badjson/object.go
index 225d3af..61d5862 100644
--- a/common/json/badjson/object.go
+++ b/common/json/badjson/object.go
@@ -15,11 +15,23 @@ type JSONObject struct {
 	linkedhashmap.Map[string, any]
 }
 
-func (m JSONObject) MarshalJSON() ([]byte, error) {
+func (m *JSONObject) IsEmpty() bool {
+	if m.Size() == 0 {
+		return true
+	}
+	return common.All(m.Entries(), func(it collections.MapEntry[string, any]) bool {
+		if valueInterface, valueMaybeEmpty := it.Value.(isEmpty); valueMaybeEmpty && valueInterface.IsEmpty() {
+			return true
+		}
+		return false
+	})
+}
+
+func (m *JSONObject) MarshalJSON() ([]byte, error) {
 	buffer := new(bytes.Buffer)
 	buffer.WriteString("{")
 	items := common.Filter(m.Entries(), func(it collections.MapEntry[string, any]) bool {
-		if valueObject, valueIsJSONObject := it.Value.(*JSONObject); valueIsJSONObject && valueObject.IsEmpty() {
+		if valueInterface, valueMaybeEmpty := it.Value.(isEmpty); valueMaybeEmpty && valueInterface.IsEmpty() {
 			return false
 		}
 		return true