contextjson: Add comment support

Author: nekohasekai

common/json/comment.go

@@ -29,6 +29,7 @@ type CommentFilter struct {
 	pendingN int
 }
 
+// Deprecated: use new contextjson instead
 func NewCommentFilter(reader io.Reader) io.Reader {
 	return &CommentFilter{br: bufio.NewReader(reader)}
 }

common/json/context.go

@@ -1,5 +1,3 @@
-//go:build !without_contextjson
-
 package json
 
 import (

common/json/context_ext.go

@@ -1,5 +1,3 @@
-//go:build !without_contextjson
-
 package json
 
 import (
@@ -23,3 +21,27 @@ type ContextMarshaler interface {
 type ContextUnmarshaler interface {
 	UnmarshalJSONContext(ctx context.Context, content []byte) error
 }
+
+type (
+	CommentKind        = json.CommentKind
+	CommentPlacement   = json.CommentPlacement
+	CommentPathKind    = json.CommentPathKind
+	CommentPathSegment = json.CommentPathSegment
+	CommentPath        = json.CommentPath
+	CommentPosition    = json.CommentPosition
+	Comment            = json.Comment
+	CommentSet         = json.CommentSet
+	CommentMarshaler   = json.CommentMarshaler
+	CommentUnmarshaler = json.CommentUnmarshaler
+)
+
+const (
+	CommentKindLine          = json.CommentKindLine
+	CommentKindHash          = json.CommentKindHash
+	CommentKindBlock         = json.CommentKindBlock
+	CommentPlacementLeading  = json.CommentPlacementLeading
+	CommentPlacementTrailing = json.CommentPlacementTrailing
+	CommentPlacementInner    = json.CommentPlacementInner
+	CommentPathKey           = json.CommentPathKey
+	CommentPathIndex         = json.CommentPathIndex
+)

common/json/context_ext_std.go

@@ -5,6 +5,8 @@ Forked from Go 1.25.9 encoding/json.
 Local changes:
 
 - context-aware marshal and unmarshal interfaces
+- JSONC comments by default
+- comment-aware context marshal and unmarshal interfaces
 - concrete error path reporting
 - trailing comma support for arrays and objects
 - ObjectKeys helper for decoded JSON object fields