Update JSONHelpers

Sources/XXClient/Helpers/ConvertJsonNumberToString.swift → Sources/XXClient/Helpers/JSONHelpers.swift

@@ -35,3 +35,21 @@ func convertJsonNumberToString(
   }
   return output
 }
+
+func convertJsonStringToNumber(
+  in input: Data,
+  at key: String
+) -> Data {
+  guard var string = String(data: input, encoding: .utf8) else {
+    return input
+  }
+  string = string.replacingOccurrences(
+    of: #""\#(key)"( *):( *)"([0-9]+)"( *)(,*)"#,
+    with: #""\#(key)"$1:$2$3$4$5"#,
+    options: [.regularExpression]
+  )
+  guard let output = string.data(using: .utf8) else {
+    return input
+  }
+  return output
+}

Tests/XXClientTests/Helpers/ConvertJsonNumberToStringTests.swift → Tests/XXClientTests/Helpers/JSONHelpersTests.swift

@@ -2,33 +2,33 @@ import CustomDump
 import XCTest
 @testable import XXClient
 
-final class ConvertJsonNumberToStringTests: XCTestCase {
-  func testConverting() {
-    assert(
+final class JSONHelpersTests: XCTestCase {
+  func testConvertingNumberToStringByKey() {
+    assertConvertingJsonNumberToString(
       input: #"{"number":1234567890,"text":"hello"}"#,
       key: "number",
       expected: #"{"number":"1234567890","text":"hello"}"#
     )
 
-    assert(
+    assertConvertingJsonNumberToString(
       input: #"{"text":"hello","number":1234567890}"#,
       key: "number",
       expected: #"{"text":"hello","number":"1234567890"}"#
     )
 
-    assert(
+    assertConvertingJsonNumberToString(
       input: #"{  "number"  :  1234567890  ,  "text"  :  "hello"  }"#,
       key: "number",
       expected: #"{  "number"  :  "1234567890"  ,  "text"  :  "hello"  }"#
     )
 
-    assert(
+    assertConvertingJsonNumberToString(
       input: #"{  "text"  :  "hello"  ,  "number"  :  1234567890  }"#,
       key: "number",
       expected: #"{  "text"  :  "hello"  ,  "number"  :  "1234567890"  }"#
     )
 
-    assert(
+    assertConvertingJsonNumberToString(
       input: """
       {
         "number": 1234567890,
@@ -44,7 +44,7 @@ final class ConvertJsonNumberToStringTests: XCTestCase {
       """
     )
 
-    assert(
+    assertConvertingJsonNumberToString(
       input: """
       {
         "text": "hello",
@@ -59,8 +59,10 @@ final class ConvertJsonNumberToStringTests: XCTestCase {
       }
       """
     )
+  }
 
-    assert(
+  func testConvertingNumberToStringByLength() {
+    assertConvertingJsonNumberToString(
       input: """
       {
         "text": "hello",
@@ -81,10 +83,74 @@ final class ConvertJsonNumberToStringTests: XCTestCase {
       }
       """
     )
+
+    assertConvertingJsonNumberToString(
+      input: #"{"text":"hello","number1":123456789,"number2":1234567890,"number3":123456789,"number4":1234567890}"#,
+      minNumberLength: 10,
+      expected: #"{"text":"hello","number1":123456789,"number2":"1234567890","number3":123456789,"number4":"1234567890"}"#
+    )
+  }
+
+  func testConvertingStringToNumber() {
+    assertConvertingJsonStringToNumber(
+      input: #"{"number":"1234567890","text":"hello"}"#,
+      key: "number",
+      expected: #"{"number":1234567890,"text":"hello"}"#
+    )
+
+    assertConvertingJsonStringToNumber(
+      input: #"{"text":"hello","number":"1234567890"}"#,
+      key: "number",
+      expected: #"{"text":"hello","number":1234567890}"#
+    )
+
+    assertConvertingJsonStringToNumber(
+      input: #"{  "number"  :  "1234567890"  ,  "text"  :  "hello"  }"#,
+      key: "number",
+      expected: #"{  "number"  :  1234567890  ,  "text"  :  "hello"  }"#
+    )
+
+    assertConvertingJsonStringToNumber(
+      input: #"{  "text"  :  "hello"  ,  "number"  :  "1234567890"  }"#,
+      key: "number",
+      expected: #"{  "text"  :  "hello"  ,  "number"  :  1234567890  }"#
+    )
+
+    assertConvertingJsonStringToNumber(
+      input: """
+      {
+        "number": "1234567890",
+        "text": "hello"
+      }
+      """,
+      key: "number",
+      expected: """
+      {
+        "number": 1234567890,
+        "text": "hello"
+      }
+      """
+    )
+
+    assertConvertingJsonStringToNumber(
+      input: """
+      {
+        "text": "hello",
+        "number": "1234567890"
+      }
+      """,
+      key: "number",
+      expected: """
+      {
+        "text": "hello",
+        "number": 1234567890
+      }
+      """
+    )
   }
 }
 
-private func assert(
+private func assertConvertingJsonNumberToString(
   input: String,
   key: String,
   expected: String,
@@ -105,7 +171,7 @@ private func assert(
   )
 }
 
-private func assert(
+private func assertConvertingJsonNumberToString(
   input: String,
   minNumberLength: Int,
   expected: String,
@@ -125,3 +191,24 @@ private func assert(
     line: line
   )
 }
+
+private func assertConvertingJsonStringToNumber(
+  input: String,
+  key: String,
+  expected: String,
+  file: StaticString = #file,
+  line: UInt = #line
+) {
+  XCTAssertNoDifference(
+    String(
+      data: convertJsonStringToNumber(
+        in: input.data(using: .utf8)!,
+        at: key
+      ),
+      encoding: .utf8
+    )!,
+    expected,
+    file: file,
+    line: line
+  )
+}