Add rule-set merge command

2024-12-16 12:01:42 +08:00
parent ff7aaf977b
commit 50b8f3ab94
5 changed files with 199 additions and 4 deletions
--- a/option/rule_set.go
+++ b/option/rule_set.go
@@ -194,8 +194,9 @@ func (r LogicalHeadlessRule) IsValid() bool {
 }

 type _PlainRuleSetCompat struct {
-	Version uint8        `json:"version"`
-	Options PlainRuleSet `json:"-"`
+	Version    uint8           `json:"version"`
+	Options    PlainRuleSet    `json:"-"`
+	RawMessage json.RawMessage `json:"-"`
 }

 type PlainRuleSetCompat _PlainRuleSetCompat
@@ -229,6 +230,7 @@ func (r *PlainRuleSetCompat) UnmarshalJSON(bytes []byte) error {
 	if err != nil {
 		return err
 	}
+	r.RawMessage = bytes
 	return nil
 }