Wire JSONEncodingOptions into the encoding api.

thomasvl · thomasvl · commit 0b5770a96cd0 · 2018-09-24T11:00:04.000-04:00
- Make it explicit in all the support methods.
- Default it at the public api points so it is only needed when
  wanting custom behaviors.
diff --git a/Sources/SwiftProtobuf/AnyMessageStorage.swift b/Sources/SwiftProtobuf/AnyMessageStorage.swift
@@ -20,12 +20,16 @@ private let i_2166136261 = Int(bitPattern: 2166136261)
 private let i_16777619 = Int(16777619)
 #endif
 
-fileprivate func serializeAnyJSON(for message: Message, typeURL: String) throws -> String {
-  var visitor = try JSONEncodingVisitor(message: message)
+fileprivate func serializeAnyJSON(
+  for message: Message,
+  typeURL: String,
+  options: JSONEncodingOptions
+) throws -> String {
+  var visitor = try JSONEncodingVisitor(message: message, options: options)
   visitor.startObject()
   visitor.encodeField(name: "@type", stringValue: typeURL)
   if let m = message as? _CustomJSONCodable {
-    let value = try m.encodedJSONString()
+    let value = try m.encodedJSONString(options: options)
     visitor.encodeField(name: "value", jsonText: value)
   } else {
     try message.traverse(visitor: &visitor)
@@ -381,7 +385,7 @@ extension AnyMessageStorage {
   //  * The protobuf field we were deserialized from.
   // The last case requires locating the type, deserializing
   // into an object, then reserializing back to JSON.
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     switch state {
     case .binary(let valueData):
       // Transcode by decoding the binary data to a message object
@@ -394,13 +398,13 @@ extension AnyMessageStorage {
         throw JSONEncodingError.anyTranscodeFailure
       }
       let m = try messageType.init(serializedData: valueData, partial: true)
-      return try serializeAnyJSON(for: m, typeURL: _typeURL)
+      return try serializeAnyJSON(for: m, typeURL: _typeURL, options: options)
 
     case .message(let msg):
       // We should have been initialized with a typeURL, but
       // ensure it wasn't cleared.
       let url = !_typeURL.isEmpty ? _typeURL : buildTypeURL(forMessage: msg, typePrefix: defaultAnyTypeURLPrefix)
-      return try serializeAnyJSON(for: msg, typeURL: url)
+      return try serializeAnyJSON(for: msg, typeURL: url, options: options)
 
     case .contentJSON(let contentJSON, _):
       var jsonEncoder = JSONEncoder()
@@ -409,6 +413,8 @@ extension AnyMessageStorage {
       jsonEncoder.putStringValue(value: _typeURL)
       if !contentJSON.isEmpty {
         jsonEncoder.append(staticText: ",")
+        // NOTE: This doesn't really take `options` into account since it is
+        // just reflecting out what was taken in originally.
         jsonEncoder.append(utf8Data: contentJSON)
       }
       jsonEncoder.endObject()
diff --git a/Sources/SwiftProtobuf/CustomJSONCodable.swift b/Sources/SwiftProtobuf/CustomJSONCodable.swift
@@ -14,7 +14,7 @@
 
 /// Allows WKTs to provide their custom JSON encodings.
 internal protocol _CustomJSONCodable {
-  func encodedJSONString() throws -> String
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String
   mutating func decodeJSON(from: inout JSONDecoder) throws
 
   /// Called when the JSON `null` literal is encountered in a position where
diff --git a/Sources/SwiftProtobuf/Google_Protobuf_Any+Extensions.swift b/Sources/SwiftProtobuf/Google_Protobuf_Any+Extensions.swift
@@ -131,8 +131,8 @@ extension Google_Protobuf_Any: _CustomJSONCodable {
     }
   }
 
-  internal func encodedJSONString() throws -> String {
-    return try _storage.encodedJSONString()
+  internal func encodedJSONString(options: JSONEncodingOptions) throws -> String {
+    return try _storage.encodedJSONString(options: options)
   }
 
   internal mutating func decodeJSON(from decoder: inout JSONDecoder) throws {
diff --git a/Sources/SwiftProtobuf/Google_Protobuf_Duration+Extensions.swift b/Sources/SwiftProtobuf/Google_Protobuf_Duration+Extensions.swift
@@ -133,7 +133,7 @@ extension Google_Protobuf_Duration: _CustomJSONCodable {
     let s = try decoder.scanner.nextQuotedString()
     (seconds, nanos) = try parseDuration(text: s)
   }
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     if let formatted = formatDuration(seconds: seconds, nanos: nanos) {
       return "\"\(formatted)\""
     } else {
diff --git a/Sources/SwiftProtobuf/Google_Protobuf_FieldMask+Extensions.swift b/Sources/SwiftProtobuf/Google_Protobuf_FieldMask+Extensions.swift
@@ -159,7 +159,7 @@ extension Google_Protobuf_FieldMask: _CustomJSONCodable {
     }
   }
 
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     // Note:  Proto requires alphanumeric field names, so there
     // cannot be a ',' or '"' character to mess up this formatting.
     var jsonPaths = [String]()
diff --git a/Sources/SwiftProtobuf/Google_Protobuf_ListValue+Extensions.swift b/Sources/SwiftProtobuf/Google_Protobuf_ListValue+Extensions.swift
@@ -26,13 +26,13 @@ extension Google_Protobuf_ListValue: ExpressibleByArrayLiteral {
 }
 
 extension Google_Protobuf_ListValue: _CustomJSONCodable {
-  internal func encodedJSONString() throws -> String {
+  internal func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     var jsonEncoder = JSONEncoder()
     jsonEncoder.append(text: "[")
     var separator: StaticString = ""
     for v in values {
       jsonEncoder.append(staticText: separator)
-      try v.serializeJSONValue(to: &jsonEncoder)
+      try v.serializeJSONValue(to: &jsonEncoder, options: options)
       separator = ","
     }
     jsonEncoder.append(text: "]")
diff --git a/Sources/SwiftProtobuf/Google_Protobuf_Struct+Extensions.swift b/Sources/SwiftProtobuf/Google_Protobuf_Struct+Extensions.swift
@@ -28,10 +28,10 @@ extension Google_Protobuf_Struct: ExpressibleByDictionaryLiteral {
 }
 
 extension Google_Protobuf_Struct: _CustomJSONCodable {
-  internal func encodedJSONString() throws -> String {
+  internal func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     var jsonEncoder = JSONEncoder()
     jsonEncoder.startObject()
-    var mapVisitor = JSONMapEncodingVisitor(encoder: jsonEncoder)
+    var mapVisitor = JSONMapEncodingVisitor(encoder: jsonEncoder, options: options)
     for (k,v) in fields {
       try mapVisitor.visitSingularStringField(value: k, fieldNumber: 1)
       try mapVisitor.visitSingularMessageField(value: v, fieldNumber: 2)
diff --git a/Sources/SwiftProtobuf/Google_Protobuf_Timestamp+Extensions.swift b/Sources/SwiftProtobuf/Google_Protobuf_Timestamp+Extensions.swift
@@ -225,7 +225,7 @@ extension Google_Protobuf_Timestamp: _CustomJSONCodable {
     (seconds, nanos) = try parseTimestamp(s: s)
   }
 
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     if let formatted = formatTimestamp(seconds: seconds, nanos: nanos) {
       return "\"\(formatted)\""
     } else {
diff --git a/Sources/SwiftProtobuf/Google_Protobuf_Value+Extensions.swift b/Sources/SwiftProtobuf/Google_Protobuf_Value+Extensions.swift
@@ -69,9 +69,9 @@ extension Google_Protobuf_Value: ExpressibleByNilLiteral {
 }
 
 extension Google_Protobuf_Value: _CustomJSONCodable {
-  internal func encodedJSONString() throws -> String {
+  internal func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     var jsonEncoder = JSONEncoder()
-    try serializeJSONValue(to: &jsonEncoder)
+    try serializeJSONValue(to: &jsonEncoder, options: options)
     return jsonEncoder.stringResult
   }
 
@@ -146,14 +146,17 @@ extension Google_Protobuf_Value {
   }
 
   /// Writes out the JSON representation of the value to the given encoder.
-  internal func serializeJSONValue(to encoder: inout JSONEncoder) throws {
+  internal func serializeJSONValue(
+    to encoder: inout JSONEncoder,
+    options: JSONEncodingOptions
+  ) throws {
     switch kind {
     case .nullValue?: encoder.putNullValue()
     case .numberValue(let v)?: encoder.putDoubleValue(value: v)
     case .stringValue(let v)?: encoder.putStringValue(value: v)
     case .boolValue(let v)?: encoder.putBoolValue(value: v)
-    case .structValue(let v)?: encoder.append(text: try v.jsonString())
-    case .listValue(let v)?: encoder.append(text: try v.jsonString())
+    case .structValue(let v)?: encoder.append(text: try v.jsonString(options: options))
+    case .listValue(let v)?: encoder.append(text: try v.jsonString(options: options))
     case nil: throw JSONEncodingError.missingValue
     }
   }
diff --git a/Sources/SwiftProtobuf/Google_Protobuf_Wrappers+Extensions.swift b/Sources/SwiftProtobuf/Google_Protobuf_Wrappers+Extensions.swift
@@ -47,7 +47,7 @@ extension Google_Protobuf_DoubleValue:
     self.init(floatLiteral)
   }
 
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     var encoder = JSONEncoder()
     encoder.putDoubleValue(value: value)
     return encoder.stringResult
@@ -75,7 +75,7 @@ extension Google_Protobuf_FloatValue:
     self.init(floatLiteral)
   }
 
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     var encoder = JSONEncoder()
     encoder.putFloatValue(value: value)
     return encoder.stringResult
@@ -103,7 +103,7 @@ extension Google_Protobuf_Int64Value:
     self.init(integerLiteral)
   }
 
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     var encoder = JSONEncoder()
     encoder.putInt64(value: value)
     return encoder.stringResult
@@ -131,7 +131,7 @@ extension Google_Protobuf_UInt64Value:
     self.init(integerLiteral)
   }
 
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     var encoder = JSONEncoder()
     encoder.putUInt64(value: value)
     return encoder.stringResult
@@ -159,7 +159,7 @@ extension Google_Protobuf_Int32Value:
     self.init(integerLiteral)
   }
 
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     return String(value)
   }
 
@@ -185,7 +185,7 @@ extension Google_Protobuf_UInt32Value:
     self.init(integerLiteral)
   }
 
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     return String(value)
   }
 
@@ -211,7 +211,7 @@ extension Google_Protobuf_BoolValue:
     self.init(booleanLiteral)
   }
 
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     return value ? "true" : "false"
   }
 
@@ -247,7 +247,7 @@ extension Google_Protobuf_StringValue:
     self.init(unicodeScalarLiteral)
   }
 
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     var encoder = JSONEncoder()
     encoder.putStringValue(value: value)
     return encoder.stringResult
@@ -269,7 +269,7 @@ extension Google_Protobuf_BytesValue: ProtobufWrapper, _CustomJSONCodable {
     self.value = value
   }
 
-  func encodedJSONString() throws -> String {
+  func encodedJSONString(options: JSONEncodingOptions) throws -> String {
     var encoder = JSONEncoder()
     encoder.putBytesValue(value: value)
     return encoder.stringResult
diff --git a/Sources/SwiftProtobuf/JSONEncodingVisitor.swift b/Sources/SwiftProtobuf/JSONEncodingVisitor.swift
@@ -19,6 +19,7 @@ internal struct JSONEncodingVisitor: Visitor {
 
   private var encoder = JSONEncoder()
   private var nameMap: _NameMap
+  private let options: JSONEncodingOptions
 
   /// The JSON text produced by the visitor, as raw UTF8 bytes.
   var dataResult: Data {
@@ -32,21 +33,23 @@ internal struct JSONEncodingVisitor: Visitor {
 
   /// Creates a new visitor for serializing a message of the given type to JSON
   /// format.
-  init(type: Message.Type) throws {
+  init(type: Message.Type, options: JSONEncodingOptions) throws {
     if let nameProviding = type as? _ProtoNameProviding.Type {
       self.nameMap = nameProviding._protobuf_nameMap
     } else {
       throw JSONEncodingError.missingFieldNames
     }
+    self.options = options
   }
 
   /// Creates a new visitor that serializes the given message to JSON format.
-  init(message: Message) throws {
+  init(message: Message, options: JSONEncodingOptions) throws {
     if let nameProviding = message as? _ProtoNameProviding {
       self.nameMap = type(of: nameProviding)._protobuf_nameMap
     } else {
       throw JSONEncodingError.missingFieldNames
     }
+    self.options = options
   }
 
   mutating func startArray() {
@@ -163,7 +166,7 @@ internal struct JSONEncodingVisitor: Visitor {
 
   mutating func visitSingularMessageField<M: Message>(value: M, fieldNumber: Int) throws {
     try startField(for: fieldNumber)
-    let json = try value.jsonUTF8Data()
+    let json = try value.jsonUTF8Data(options: options)
     encoder.append(utf8Data: json)
   }
 
@@ -270,9 +273,10 @@ internal struct JSONEncodingVisitor: Visitor {
   }
 
   mutating func visitRepeatedMessageField<M: Message>(value: [M], fieldNumber: Int) throws {
+    let localOptions = options
     try _visitRepeated(value: value, fieldNumber: fieldNumber) {
       (encoder: inout JSONEncoder, v: M) throws in
-      let json = try v.jsonUTF8Data()
+      let json = try v.jsonUTF8Data(options: localOptions)
       encoder.append(utf8Data: json)
     }
   }
@@ -289,7 +293,7 @@ internal struct JSONEncodingVisitor: Visitor {
   mutating func visitMapField<KeyType, ValueType: MapValueType>(fieldType: _ProtobufMap<KeyType, ValueType>.Type, value: _ProtobufMap<KeyType, ValueType>.BaseType, fieldNumber: Int) throws {
     try startField(for: fieldNumber)
     encoder.append(text: "{")
-    var mapVisitor = JSONMapEncodingVisitor(encoder: encoder)
+    var mapVisitor = JSONMapEncodingVisitor(encoder: encoder, options: options)
     for (k,v) in value {
         try KeyType.visitSingular(value: k, fieldNumber: 1, with: &mapVisitor)
         try ValueType.visitSingular(value: v, fieldNumber: 2, with: &mapVisitor)
@@ -301,7 +305,7 @@ internal struct JSONEncodingVisitor: Visitor {
   mutating func visitMapField<KeyType, ValueType>(fieldType: _ProtobufEnumMap<KeyType, ValueType>.Type, value: _ProtobufEnumMap<KeyType, ValueType>.BaseType, fieldNumber: Int) throws  where ValueType.RawValue == Int {
     try startField(for: fieldNumber)
     encoder.append(text: "{")
-    var mapVisitor = JSONMapEncodingVisitor(encoder: encoder)
+    var mapVisitor = JSONMapEncodingVisitor(encoder: encoder, options: options)
     for (k, v) in value {
       try KeyType.visitSingular(value: k, fieldNumber: 1, with: &mapVisitor)
       try mapVisitor.visitSingularEnumField(value: v, fieldNumber: 2)
@@ -313,7 +317,7 @@ internal struct JSONEncodingVisitor: Visitor {
   mutating func visitMapField<KeyType, ValueType>(fieldType: _ProtobufMessageMap<KeyType, ValueType>.Type, value: _ProtobufMessageMap<KeyType, ValueType>.BaseType, fieldNumber: Int) throws {
     try startField(for: fieldNumber)
     encoder.append(text: "{")
-    var mapVisitor = JSONMapEncodingVisitor(encoder: encoder)
+    var mapVisitor = JSONMapEncodingVisitor(encoder: encoder, options: options)
     for (k,v) in value {
         try KeyType.visitSingular(value: k, fieldNumber: 1, with: &mapVisitor)
         try mapVisitor.visitSingularMessageField(value: v, fieldNumber: 2)
diff --git a/Sources/SwiftProtobuf/JSONMapEncodingVisitor.swift b/Sources/SwiftProtobuf/JSONMapEncodingVisitor.swift
@@ -23,9 +23,11 @@ import Foundation
 internal struct JSONMapEncodingVisitor: SelectiveVisitor {
   private var separator: StaticString?
   internal var encoder: JSONEncoder
+  private let options: JSONEncodingOptions
 
-  init(encoder: JSONEncoder) {
+  init(encoder: JSONEncoder, options: JSONEncodingOptions) {
       self.encoder = encoder
+      self.options = options
   }
 
   private mutating func startKey() {
@@ -127,7 +129,7 @@ internal struct JSONMapEncodingVisitor: SelectiveVisitor {
       // Messages can only be map values, never keys
       assert(fieldNumber == 2)
       startValue()
-      let json = try value.jsonString()
+      let json = try value.jsonString(options: options)
       encoder.append(text: json)
   }
 
diff --git a/Sources/SwiftProtobuf/Message+JSONAdditions.swift b/Sources/SwiftProtobuf/Message+JSONAdditions.swift
@@ -22,9 +22,13 @@ public extension Message {
   /// serializing to JSON.
   ///
   /// - Returns: A string containing the JSON serialization of the message.
+  /// - Parameters:
+  ///   - options: The JSONEncodingOptions to use.
   /// - Throws: `JSONEncodingError` if encoding fails.
-  func jsonString() throws -> String {
-    let data = try jsonUTF8Data()
+  func jsonString(
+    options: JSONEncodingOptions = JSONEncodingOptions()
+  ) throws -> String {
+    let data = try jsonUTF8Data(options: options)
     return String(data: data, encoding: String.Encoding.utf8)!
   }
 
@@ -34,14 +38,18 @@ public extension Message {
   /// serializing to JSON.
   ///
   /// - Returns: A Data containing the JSON serialization of the message.
+  /// - Parameters:
+  ///   - options: The JSONEncodingOptions to use.
   /// - Throws: `JSONEncodingError` if encoding fails.
-  func jsonUTF8Data() throws -> Data {
+  func jsonUTF8Data(
+    options: JSONEncodingOptions = JSONEncodingOptions()
+  ) throws -> Data {
     if let m = self as? _CustomJSONCodable {
-      let string = try m.encodedJSONString()
+      let string = try m.encodedJSONString(options: options)
       let data = string.data(using: String.Encoding.utf8)! // Cannot fail!
       return data
     }
-    var visitor = try JSONEncodingVisitor(message: self)
+    var visitor = try JSONEncodingVisitor(message: self, options: options)
     visitor.startObject()
     try traverse(visitor: &visitor)
     visitor.endObject()
diff --git a/Sources/SwiftProtobuf/Message+JSONArrayAdditions.swift b/Sources/SwiftProtobuf/Message+JSONArrayAdditions.swift

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,8 @@ extension Google_Protobuf_Any: _CustomJSONCodable {`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`		`- internal func encodedJSONString() throws -> String {`
`135`		`- return try _storage.encodedJSONString()`
	`134`	`+ internal func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
	`135`	`+ return try _storage.encodedJSONString(options: options)`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`internal mutating func decodeJSON(from decoder: inout JSONDecoder) throws {`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ extension Google_Protobuf_Duration: _CustomJSONCodable {`
`133`	`133`	`let s = try decoder.scanner.nextQuotedString()`
`134`	`134`	`(seconds, nanos) = try parseDuration(text: s)`
`135`	`135`	`}`
`136`		`- func encodedJSONString() throws -> String {`
	`136`	`+ func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`137`	`137`	`if let formatted = formatDuration(seconds: seconds, nanos: nanos) {`
`138`	`138`	`return "\"\(formatted)\""`
`139`	`139`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ extension Google_Protobuf_FieldMask: _CustomJSONCodable {`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`162`		`- func encodedJSONString() throws -> String {`
	`162`	`+ func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`163`	`163`	`// Note: Proto requires alphanumeric field names, so there`
`164`	`164`	`// cannot be a ',' or '"' character to mess up this formatting.`
`165`	`165`	`var jsonPaths = [String]()`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ extension Google_Protobuf_Timestamp: _CustomJSONCodable {`
`225`	`225`	`(seconds, nanos) = try parseTimestamp(s: s)`
`226`	`226`	`}`
`227`	`227`
`228`		`- func encodedJSONString() throws -> String {`
	`228`	`+ func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`229`	`229`	`if let formatted = formatTimestamp(seconds: seconds, nanos: nanos) {`
`230`	`230`	`return "\"\(formatted)\""`
`231`	`231`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,9 @@ extension Google_Protobuf_Value: ExpressibleByNilLiteral {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`extension Google_Protobuf_Value: _CustomJSONCodable {`
`72`		`- internal func encodedJSONString() throws -> String {`
	`72`	`+ internal func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`73`	`73`	`var jsonEncoder = JSONEncoder()`
`74`		`- try serializeJSONValue(to: &jsonEncoder)`
	`74`	`+ try serializeJSONValue(to: &jsonEncoder, options: options)`
`75`	`75`	`return jsonEncoder.stringResult`
`76`	`76`	`}`
`77`	`77`
`@@ -146,14 +146,17 @@ extension Google_Protobuf_Value {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`/// Writes out the JSON representation of the value to the given encoder.`
`149`		`- internal func serializeJSONValue(to encoder: inout JSONEncoder) throws {`
	`149`	`+ internal func serializeJSONValue(`
	`150`	`+ to encoder: inout JSONEncoder,`
	`151`	`+ options: JSONEncodingOptions`
	`152`	`+ ) throws {`
`150`	`153`	`switch kind {`
`151`	`154`	`case .nullValue?: encoder.putNullValue()`
`152`	`155`	`case .numberValue(let v)?: encoder.putDoubleValue(value: v)`
`153`	`156`	`case .stringValue(let v)?: encoder.putStringValue(value: v)`
`154`	`157`	`case .boolValue(let v)?: encoder.putBoolValue(value: v)`
`155`		`- case .structValue(let v)?: encoder.append(text: try v.jsonString())`
`156`		`- case .listValue(let v)?: encoder.append(text: try v.jsonString())`
	`158`	`+ case .structValue(let v)?: encoder.append(text: try v.jsonString(options: options))`
	`159`	`+ case .listValue(let v)?: encoder.append(text: try v.jsonString(options: options))`
`157`	`160`	`case nil: throw JSONEncodingError.missingValue`
`158`	`161`	`}`
`159`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ extension Google_Protobuf_DoubleValue:`
`47`	`47`	`self.init(floatLiteral)`
`48`	`48`	`}`
`49`	`49`
`50`		`- func encodedJSONString() throws -> String {`
	`50`	`+ func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`51`	`51`	`var encoder = JSONEncoder()`
`52`	`52`	`encoder.putDoubleValue(value: value)`
`53`	`53`	`return encoder.stringResult`
`@@ -75,7 +75,7 @@ extension Google_Protobuf_FloatValue:`
`75`	`75`	`self.init(floatLiteral)`
`76`	`76`	`}`
`77`	`77`
`78`		`- func encodedJSONString() throws -> String {`
	`78`	`+ func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`79`	`79`	`var encoder = JSONEncoder()`
`80`	`80`	`encoder.putFloatValue(value: value)`
`81`	`81`	`return encoder.stringResult`
`@@ -103,7 +103,7 @@ extension Google_Protobuf_Int64Value:`
`103`	`103`	`self.init(integerLiteral)`
`104`	`104`	`}`
`105`	`105`
`106`		`- func encodedJSONString() throws -> String {`
	`106`	`+ func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`107`	`107`	`var encoder = JSONEncoder()`
`108`	`108`	`encoder.putInt64(value: value)`
`109`	`109`	`return encoder.stringResult`
`@@ -131,7 +131,7 @@ extension Google_Protobuf_UInt64Value:`
`131`	`131`	`self.init(integerLiteral)`
`132`	`132`	`}`
`133`	`133`
`134`		`- func encodedJSONString() throws -> String {`
	`134`	`+ func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`135`	`135`	`var encoder = JSONEncoder()`
`136`	`136`	`encoder.putUInt64(value: value)`
`137`	`137`	`return encoder.stringResult`
`@@ -159,7 +159,7 @@ extension Google_Protobuf_Int32Value:`
`159`	`159`	`self.init(integerLiteral)`
`160`	`160`	`}`
`161`	`161`
`162`		`- func encodedJSONString() throws -> String {`
	`162`	`+ func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`163`	`163`	`return String(value)`
`164`	`164`	`}`
`165`	`165`
`@@ -185,7 +185,7 @@ extension Google_Protobuf_UInt32Value:`
`185`	`185`	`self.init(integerLiteral)`
`186`	`186`	`}`
`187`	`187`
`188`		`- func encodedJSONString() throws -> String {`
	`188`	`+ func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`189`	`189`	`return String(value)`
`190`	`190`	`}`
`191`	`191`
`@@ -211,7 +211,7 @@ extension Google_Protobuf_BoolValue:`
`211`	`211`	`self.init(booleanLiteral)`
`212`	`212`	`}`
`213`	`213`
`214`		`- func encodedJSONString() throws -> String {`
	`214`	`+ func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`215`	`215`	`return value ? "true" : "false"`
`216`	`216`	`}`
`217`	`217`
`@@ -247,7 +247,7 @@ extension Google_Protobuf_StringValue:`
`247`	`247`	`self.init(unicodeScalarLiteral)`
`248`	`248`	`}`
`249`	`249`
`250`		`- func encodedJSONString() throws -> String {`
	`250`	`+ func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`251`	`251`	`var encoder = JSONEncoder()`
`252`	`252`	`encoder.putStringValue(value: value)`
`253`	`253`	`return encoder.stringResult`
`@@ -269,7 +269,7 @@ extension Google_Protobuf_BytesValue: ProtobufWrapper, _CustomJSONCodable {`
`269`	`269`	`self.value = value`
`270`	`270`	`}`
`271`	`271`
`272`		`- func encodedJSONString() throws -> String {`
	`272`	`+ func encodedJSONString(options: JSONEncodingOptions) throws -> String {`
`273`	`273`	`var encoder = JSONEncoder()`
`274`	`274`	`encoder.putBytesValue(value: value)`
`275`	`275`	`return encoder.stringResult`