|
7 | 7 | "fmt" |
8 | 8 | "io" |
9 | 9 | "os" |
| 10 | + "sort" |
10 | 11 | "strings" |
11 | 12 |
|
12 | 13 | fracturedjson "github.com/FileFormatInfo/go-fractured-json" |
@@ -57,7 +58,79 @@ func decodeJSON(input []byte) (any, error) { |
57 | 58 | return v, nil |
58 | 59 | } |
59 | 60 |
|
60 | | -func formatJSON(input []byte, canonical bool, line bool, fractured bool) (string, error) { |
| 61 | +func encodeSortedJSON(v any) ([]byte, error) { |
| 62 | + switch t := v.(type) { |
| 63 | + case map[string]any: |
| 64 | + keys := make([]string, 0, len(t)) |
| 65 | + for k := range t { |
| 66 | + keys = append(keys, k) |
| 67 | + } |
| 68 | + sort.Slice(keys, func(i, j int) bool { |
| 69 | + li := strings.ToLower(keys[i]) |
| 70 | + lj := strings.ToLower(keys[j]) |
| 71 | + if li == lj { |
| 72 | + return keys[i] < keys[j] |
| 73 | + } |
| 74 | + return li < lj |
| 75 | + }) |
| 76 | + |
| 77 | + var buf bytes.Buffer |
| 78 | + buf.WriteByte('{') |
| 79 | + for i, k := range keys { |
| 80 | + if i > 0 { |
| 81 | + buf.WriteByte(',') |
| 82 | + } |
| 83 | + keyJSON, err := json.Marshal(k) |
| 84 | + if err != nil { |
| 85 | + return nil, err |
| 86 | + } |
| 87 | + buf.Write(keyJSON) |
| 88 | + buf.WriteByte(':') |
| 89 | + valJSON, err := encodeSortedJSON(t[k]) |
| 90 | + if err != nil { |
| 91 | + return nil, err |
| 92 | + } |
| 93 | + buf.Write(valJSON) |
| 94 | + } |
| 95 | + buf.WriteByte('}') |
| 96 | + return buf.Bytes(), nil |
| 97 | + case []any: |
| 98 | + var buf bytes.Buffer |
| 99 | + buf.WriteByte('[') |
| 100 | + for i, item := range t { |
| 101 | + if i > 0 { |
| 102 | + buf.WriteByte(',') |
| 103 | + } |
| 104 | + itemJSON, err := encodeSortedJSON(item) |
| 105 | + if err != nil { |
| 106 | + return nil, err |
| 107 | + } |
| 108 | + buf.Write(itemJSON) |
| 109 | + } |
| 110 | + buf.WriteByte(']') |
| 111 | + return buf.Bytes(), nil |
| 112 | + default: |
| 113 | + return json.Marshal(t) |
| 114 | + } |
| 115 | +} |
| 116 | + |
| 117 | +func maybeSortKeys(input []byte, sortKeys bool) ([]byte, error) { |
| 118 | + if !sortKeys { |
| 119 | + return input, nil |
| 120 | + } |
| 121 | + decoded, err := decodeJSON(input) |
| 122 | + if err != nil { |
| 123 | + return nil, err |
| 124 | + } |
| 125 | + return encodeSortedJSON(decoded) |
| 126 | +} |
| 127 | + |
| 128 | +func formatJSON(input []byte, canonical bool, line bool, fractured bool, sortKeys bool) (string, error) { |
| 129 | + input, err := maybeSortKeys(input, sortKeys) |
| 130 | + if err != nil { |
| 131 | + return "", err |
| 132 | + } |
| 133 | + |
61 | 134 | if fractured { |
62 | 135 | return fracturedjson.Reformat(string(input)) |
63 | 136 | } |
@@ -116,6 +189,7 @@ func main() { |
116 | 189 | var canonical = pflag.Bool("canonical", false, "Output canonical JSON (same as jq . --sort-keys)") |
117 | 190 | var line = pflag.Bool("line", false, "Output JSON on a single line") |
118 | 191 | var fractured = pflag.Bool("fractured", false, "Use fractured JSON formatting") |
| 192 | + var sortKeys = pflag.Bool("sort-keys", false, "Sort object keys case-insensitively") |
119 | 193 | var trailingNewline = pflag.Bool("trailing-newline", false, "Emit a trailing newline") |
120 | 194 | var eol = pflag.String("eol", "lf", "End-of-line style: lf, cr, or crlf") |
121 | 195 |
|
@@ -158,7 +232,7 @@ func main() { |
158 | 232 | os.Exit(1) |
159 | 233 | } |
160 | 234 |
|
161 | | - formatted, err := formatJSON(input, canonicalMode, lineMode, fracturedMode) |
| 235 | + formatted, err := formatJSON(input, canonicalMode, lineMode, fracturedMode, *sortKeys) |
162 | 236 | if err != nil { |
163 | 237 | fmt.Fprintf(os.Stderr, "ERROR: unable to format JSON: %v\n", err) |
164 | 238 | os.Exit(1) |
|
0 commit comments