diff --git a/base/graphql-swift/test/inputs/graphql/github1.graphql/default/quicktype.swift b/head/graphql-swift/test/inputs/graphql/github1.graphql/default/quicktype.swift
index c0388ba..097ce29 100644
--- a/base/graphql-swift/test/inputs/graphql/github1.graphql/default/quicktype.swift
+++ b/head/graphql-swift/test/inputs/graphql/github1.graphql/default/quicktype.swift
@@ -191,7 +191,7 @@ extension Error {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -214,7 +214,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/graphql-swift/test/inputs/graphql/github2.graphql/default/quicktype.swift b/head/graphql-swift/test/inputs/graphql/github2.graphql/default/quicktype.swift
index cf910d5..31e61d1 100644
--- a/base/graphql-swift/test/inputs/graphql/github2.graphql/default/quicktype.swift
+++ b/head/graphql-swift/test/inputs/graphql/github2.graphql/default/quicktype.swift
@@ -283,7 +283,7 @@ extension Error {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -306,7 +306,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/graphql-swift/test/inputs/graphql/github3.graphql/default/quicktype.swift b/head/graphql-swift/test/inputs/graphql/github3.graphql/default/quicktype.swift
index 8b600c2..5f4053b 100644
--- a/base/graphql-swift/test/inputs/graphql/github3.graphql/default/quicktype.swift
+++ b/head/graphql-swift/test/inputs/graphql/github3.graphql/default/quicktype.swift
@@ -329,7 +329,7 @@ extension Error {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -352,7 +352,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/graphql-swift/test/inputs/graphql/github4.graphql/default/quicktype.swift b/head/graphql-swift/test/inputs/graphql/github4.graphql/default/quicktype.swift
index 0210393..77668e4 100644
--- a/base/graphql-swift/test/inputs/graphql/github4.graphql/default/quicktype.swift
+++ b/head/graphql-swift/test/inputs/graphql/github4.graphql/default/quicktype.swift
@@ -333,7 +333,7 @@ extension Error {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -356,7 +356,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/graphql-swift/test/inputs/graphql/github5.graphql/default/quicktype.swift b/head/graphql-swift/test/inputs/graphql/github5.graphql/default/quicktype.swift
index cdcc8ea..a99b35e 100644
--- a/base/graphql-swift/test/inputs/graphql/github5.graphql/default/quicktype.swift
+++ b/head/graphql-swift/test/inputs/graphql/github5.graphql/default/quicktype.swift
@@ -191,7 +191,7 @@ extension Error {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -214,7 +214,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/graphql-swift/test/inputs/graphql/github6.graphql/default/quicktype.swift b/head/graphql-swift/test/inputs/graphql/github6.graphql/default/quicktype.swift
index 45885b9..ed5df6b 100644
--- a/base/graphql-swift/test/inputs/graphql/github6.graphql/default/quicktype.swift
+++ b/head/graphql-swift/test/inputs/graphql/github6.graphql/default/quicktype.swift
@@ -191,7 +191,7 @@ extension Error {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -214,7 +214,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/graphql-swift/test/inputs/graphql/github7.graphql/default/quicktype.swift b/head/graphql-swift/test/inputs/graphql/github7.graphql/default/quicktype.swift
index 22861b6..3bb8fbf 100644
--- a/base/graphql-swift/test/inputs/graphql/github7.graphql/default/quicktype.swift
+++ b/head/graphql-swift/test/inputs/graphql/github7.graphql/default/quicktype.swift
@@ -387,7 +387,7 @@ extension Error {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -410,7 +410,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/graphql-swift/test/inputs/graphql/github8.graphql/default/quicktype.swift b/head/graphql-swift/test/inputs/graphql/github8.graphql/default/quicktype.swift
index f104fd1..72a7285 100644
--- a/base/graphql-swift/test/inputs/graphql/github8.graphql/default/quicktype.swift
+++ b/head/graphql-swift/test/inputs/graphql/github8.graphql/default/quicktype.swift
@@ -252,7 +252,7 @@ extension Error {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -275,7 +275,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/graphql-swift/test/inputs/graphql/github9.graphql/default/quicktype.swift b/head/graphql-swift/test/inputs/graphql/github9.graphql/default/quicktype.swift
index e28b3d9..86640de 100644
--- a/base/graphql-swift/test/inputs/graphql/github9.graphql/default/quicktype.swift
+++ b/head/graphql-swift/test/inputs/graphql/github9.graphql/default/quicktype.swift
@@ -296,7 +296,7 @@ extension Error {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -319,7 +319,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/accessors.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/accessors.schema/default/quicktype.swift
index df42965..cce1b63 100644
--- a/base/schema-swift/test/inputs/schema/accessors.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/accessors.schema/default/quicktype.swift
@@ -97,7 +97,7 @@ enum Union: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -120,7 +120,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/any.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/any.schema/default/quicktype.swift
index 2962f11..8e9a314 100644
--- a/base/schema-swift/test/inputs/schema/any.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/any.schema/default/quicktype.swift
@@ -55,7 +55,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -78,7 +78,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/bool-string.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/bool-string.schema/default/quicktype.swift
index fcbf075..4e5ea6a 100644
--- a/base/schema-swift/test/inputs/schema/bool-string.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/bool-string.schema/default/quicktype.swift
@@ -103,7 +103,7 @@ enum UnionWithBool: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -126,7 +126,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/boolean-subschema.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/boolean-subschema.schema/default/quicktype.swift
index 32a5e60..e44e3d1 100644
--- a/base/schema-swift/test/inputs/schema/boolean-subschema.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/boolean-subschema.schema/default/quicktype.swift
@@ -63,7 +63,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -86,7 +86,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/camelCase.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/camelCase.schema/default/quicktype.swift
index daed7ce..529aecb 100644
--- a/base/schema-swift/test/inputs/schema/camelCase.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/camelCase.schema/default/quicktype.swift
@@ -55,7 +55,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -78,7 +78,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/quicktype.swift
index d104550..de0535f 100644
--- a/base/schema-swift/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/quicktype.swift
@@ -63,7 +63,7 @@ enum Kind: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -86,7 +86,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/comment-injection-enum.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/comment-injection-enum.schema/default/quicktype.swift
index 549bd4d..18ac1e9 100644
--- a/base/schema-swift/test/inputs/schema/comment-injection-enum.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/comment-injection-enum.schema/default/quicktype.swift
@@ -69,7 +69,7 @@ enum Kind: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -92,7 +92,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/comment-injection-nested-comment.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/comment-injection-nested-comment.schema/default/quicktype.swift
index 55323d5..2ddab41 100644
--- a/base/schema-swift/test/inputs/schema/comment-injection-nested-comment.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/comment-injection-nested-comment.schema/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/comment-injection.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/comment-injection.schema/default/quicktype.swift
index 69439dd..cd69f94 100644
--- a/base/schema-swift/test/inputs/schema/comment-injection.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/comment-injection.schema/default/quicktype.swift
@@ -90,7 +90,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -113,7 +113,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/constructor.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/constructor.schema/default/quicktype.swift
index def985e..cdc9149 100644
--- a/base/schema-swift/test/inputs/schema/constructor.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/constructor.schema/default/quicktype.swift
@@ -116,7 +116,7 @@ extension Constructor {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -139,7 +139,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/cut-enum.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/cut-enum.schema/default/quicktype.swift
index 42f7cb1..7460648 100644
--- a/base/schema-swift/test/inputs/schema/cut-enum.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/cut-enum.schema/default/quicktype.swift
@@ -51,7 +51,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -74,7 +74,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/date-time-or-string.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/date-time-or-string.schema/default/quicktype.swift
index c03b905..bb37a87 100644
--- a/base/schema-swift/test/inputs/schema/date-time-or-string.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/date-time-or-string.schema/default/quicktype.swift
@@ -87,7 +87,7 @@ enum BarEnum: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -110,7 +110,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/description-with-double-quotes.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/description-with-double-quotes.schema/default/quicktype.swift
index fb5d5f2..895a671 100644
--- a/base/schema-swift/test/inputs/schema/description-with-double-quotes.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/description-with-double-quotes.schema/default/quicktype.swift
@@ -52,7 +52,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -75,7 +75,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/description.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/description.schema/default/quicktype.swift
index c330026..f4f2e13 100644
--- a/base/schema-swift/test/inputs/schema/description.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/description.schema/default/quicktype.swift
@@ -180,7 +180,7 @@ enum Union: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -203,7 +203,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/direct-union.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/direct-union.schema/default/quicktype.swift
index 8b0d63a..c05a9e0 100644
--- a/base/schema-swift/test/inputs/schema/direct-union.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/direct-union.schema/default/quicktype.swift
@@ -162,7 +162,7 @@ enum Anything: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -185,7 +185,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/empty-object.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/empty-object.schema/default/quicktype.swift
index 15ca53b..8a4be85 100644
--- a/base/schema-swift/test/inputs/schema/empty-object.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/empty-object.schema/default/quicktype.swift
@@ -33,7 +33,7 @@ extension Dictionary where Key == String, Value == JSONAny {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -56,7 +56,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/enum-with-null.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/enum-with-null.schema/default/quicktype.swift
index ec8ff67..9d3677c 100644
--- a/base/schema-swift/test/inputs/schema/enum-with-null.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/enum-with-null.schema/default/quicktype.swift
@@ -56,7 +56,7 @@ enum Enum: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -79,7 +79,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/enum-with-values.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/enum-with-values.schema/default/quicktype.swift
index 8a2f074..eb3c58a 100644
--- a/base/schema-swift/test/inputs/schema/enum-with-values.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/enum-with-values.schema/default/quicktype.swift
@@ -61,7 +61,7 @@ enum Weekdays: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -84,7 +84,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/id-no-address.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/id-no-address.schema/default/quicktype.swift
index 3fd3762..1aa89d7 100644
--- a/base/schema-swift/test/inputs/schema/id-no-address.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/id-no-address.schema/default/quicktype.swift
@@ -51,7 +51,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -74,7 +74,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/id-root.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/id-root.schema/default/quicktype.swift
index 21e6268..597d135 100644
--- a/base/schema-swift/test/inputs/schema/id-root.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/id-root.schema/default/quicktype.swift
@@ -51,7 +51,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -74,7 +74,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/ie-suffix-singularization.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/ie-suffix-singularization.schema/default/quicktype.swift
index 3d084bc..7a9de85 100644
--- a/base/schema-swift/test/inputs/schema/ie-suffix-singularization.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/ie-suffix-singularization.schema/default/quicktype.swift
@@ -99,7 +99,7 @@ extension Cookie {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/implicit-all-of.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/implicit-all-of.schema/default/quicktype.swift
index 61c7ed7..9532338 100644
--- a/base/schema-swift/test/inputs/schema/implicit-all-of.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/implicit-all-of.schema/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/implicit-one-of.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/implicit-one-of.schema/default/quicktype.swift
index 0f1bf8c..e12d39d 100644
--- a/base/schema-swift/test/inputs/schema/implicit-one-of.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/implicit-one-of.schema/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/integer-float-union.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/integer-float-union.schema/default/quicktype.swift
index d4c860b..dff293b 100644
--- a/base/schema-swift/test/inputs/schema/integer-float-union.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/integer-float-union.schema/default/quicktype.swift
@@ -79,7 +79,7 @@ enum Number: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -102,7 +102,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/integer-string.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/integer-string.schema/default/quicktype.swift
index 8764b8e..da2a743 100644
--- a/base/schema-swift/test/inputs/schema/integer-string.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/integer-string.schema/default/quicktype.swift
@@ -103,7 +103,7 @@ enum UnionWithInt: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -126,7 +126,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/integer-type.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/integer-type.schema/default/quicktype.swift
index 9fe576c..1cfc89f 100644
--- a/base/schema-swift/test/inputs/schema/integer-type.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/integer-type.schema/default/quicktype.swift
@@ -83,7 +83,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -106,7 +106,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/intersection-nested.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/intersection-nested.schema/default/quicktype.swift
index c7737cb..56a731c 100644
--- a/base/schema-swift/test/inputs/schema/intersection-nested.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/intersection-nested.schema/default/quicktype.swift
@@ -51,7 +51,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -74,7 +74,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/issue2680-top-level-array.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/issue2680-top-level-array.schema/default/quicktype.swift
index 555de64..4768fb0 100644
--- a/base/schema-swift/test/inputs/schema/issue2680-top-level-array.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/issue2680-top-level-array.schema/default/quicktype.swift
@@ -33,7 +33,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -56,7 +56,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/keyword-enum.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/keyword-enum.schema/default/quicktype.swift
index 6c5e60c..2a6a51a 100644
--- a/base/schema-swift/test/inputs/schema/keyword-enum.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/keyword-enum.schema/default/quicktype.swift
@@ -331,7 +331,7 @@ enum Enum: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -354,7 +354,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/keyword-unions.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/keyword-unions.schema/default/quicktype.swift
index bf0f8e0..5923774 100644
--- a/base/schema-swift/test/inputs/schema/keyword-unions.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/keyword-unions.schema/default/quicktype.swift
@@ -19095,7 +19095,7 @@ extension Yield {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -19118,7 +19118,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/light.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/light.schema/default/quicktype.swift
index c90e02d..5d30fa0 100644
--- a/base/schema-swift/test/inputs/schema/light.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/light.schema/default/quicktype.swift
@@ -103,7 +103,7 @@ extension LightParams {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -126,7 +126,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/list.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/list.schema/default/quicktype.swift
index c9432ab..38d0ee0 100644
--- a/base/schema-swift/test/inputs/schema/list.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/list.schema/default/quicktype.swift
@@ -57,7 +57,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -80,7 +80,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/min-max-items.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/min-max-items.schema/default/quicktype.swift
index 9ef78a9..11a9fe3 100644
--- a/base/schema-swift/test/inputs/schema/min-max-items.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/min-max-items.schema/default/quicktype.swift
@@ -95,7 +95,7 @@ enum UnionItem: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -118,7 +118,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/minmax-integer.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/minmax-integer.schema/default/quicktype.swift
index baecce4..483f400 100644
--- a/base/schema-swift/test/inputs/schema/minmax-integer.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/minmax-integer.schema/default/quicktype.swift
@@ -79,7 +79,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -102,7 +102,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/minmax.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/minmax.schema/default/quicktype.swift
index d08b96c..dcec7ec 100644
--- a/base/schema-swift/test/inputs/schema/minmax.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/minmax.schema/default/quicktype.swift
@@ -79,7 +79,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -102,7 +102,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/minmaxlength.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/minmaxlength.schema/default/quicktype.swift
index b146fbe..5f2f416 100644
--- a/base/schema-swift/test/inputs/schema/minmaxlength.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/minmaxlength.schema/default/quicktype.swift
@@ -107,7 +107,7 @@ enum InUnion: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -130,7 +130,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/mutually-recursive.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/mutually-recursive.schema/default/quicktype.swift
index e59bb26..2c1571b 100644
--- a/base/schema-swift/test/inputs/schema/mutually-recursive.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/mutually-recursive.schema/default/quicktype.swift
@@ -128,7 +128,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -151,7 +151,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/nested-intersection-union.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/nested-intersection-union.schema/default/quicktype.swift
index 6ddf61e..ab02ebb 100644
--- a/base/schema-swift/test/inputs/schema/nested-intersection-union.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/nested-intersection-union.schema/default/quicktype.swift
@@ -107,7 +107,7 @@ extension Item {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -130,7 +130,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/non-standard-ref.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/non-standard-ref.schema/default/quicktype.swift
index f12fd26..c8a57d2 100644
--- a/base/schema-swift/test/inputs/schema/non-standard-ref.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/non-standard-ref.schema/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/object-type-required.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/object-type-required.schema/default/quicktype.swift
index c72ca72..27c4364 100644
--- a/base/schema-swift/test/inputs/schema/object-type-required.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/object-type-required.schema/default/quicktype.swift
@@ -55,7 +55,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -78,7 +78,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/optional-any.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/optional-any.schema/default/quicktype.swift
index e2b0c18..ad739e8 100644
--- a/base/schema-swift/test/inputs/schema/optional-any.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/optional-any.schema/default/quicktype.swift
@@ -55,7 +55,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -78,7 +78,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/optional-const-ref.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/optional-const-ref.schema/default/quicktype.swift
index 3bc5b3a..d99a0fe 100644
--- a/base/schema-swift/test/inputs/schema/optional-const-ref.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/optional-const-ref.schema/default/quicktype.swift
@@ -123,7 +123,7 @@ extension Coordinate {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -146,7 +146,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/optional-constraints.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/optional-constraints.schema/default/quicktype.swift
index a881924..0fb55af 100644
--- a/base/schema-swift/test/inputs/schema/optional-constraints.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/optional-constraints.schema/default/quicktype.swift
@@ -67,7 +67,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -90,7 +90,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/optional-date-time.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/optional-date-time.schema/default/quicktype.swift
index 7eba3f2..e99bcab 100644
--- a/base/schema-swift/test/inputs/schema/optional-date-time.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/optional-date-time.schema/default/quicktype.swift
@@ -71,7 +71,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -94,7 +94,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/pattern.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/pattern.schema/default/quicktype.swift
index 20c7463..59cf8ae 100644
--- a/base/schema-swift/test/inputs/schema/pattern.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/pattern.schema/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/postman-collection.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/postman-collection.schema/default/quicktype.swift
index fae61f1..3c6e5d2 100644
--- a/base/schema-swift/test/inputs/schema/postman-collection.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/postman-collection.schema/default/quicktype.swift
@@ -104,7 +104,7 @@ extension Response {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -127,7 +127,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/prefix-items.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/prefix-items.schema/default/quicktype.swift
index b2e2814..ff3eee8 100644
--- a/base/schema-swift/test/inputs/schema/prefix-items.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/prefix-items.schema/default/quicktype.swift
@@ -83,7 +83,7 @@ enum Open: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -106,7 +106,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/recursive-union-flattening.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/recursive-union-flattening.schema/default/quicktype.swift
index 3e0c38e..973809e 100644
--- a/base/schema-swift/test/inputs/schema/recursive-union-flattening.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/recursive-union-flattening.schema/default/quicktype.swift
@@ -347,7 +347,7 @@ enum X: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -370,7 +370,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/ref-id-files.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/ref-id-files.schema/default/quicktype.swift
index 42f7cb1..7460648 100644
--- a/base/schema-swift/test/inputs/schema/ref-id-files.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/ref-id-files.schema/default/quicktype.swift
@@ -51,7 +51,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -74,7 +74,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/ref-remote.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/ref-remote.schema/default/quicktype.swift
index c9432ab..38d0ee0 100644
--- a/base/schema-swift/test/inputs/schema/ref-remote.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/ref-remote.schema/default/quicktype.swift
@@ -57,7 +57,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -80,7 +80,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/renaming-bug.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/renaming-bug.schema/default/quicktype.swift
index 46d99dc..618c241 100644
--- a/base/schema-swift/test/inputs/schema/renaming-bug.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/renaming-bug.schema/default/quicktype.swift
@@ -716,7 +716,7 @@ enum Name: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -739,7 +739,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/required-draft3.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/required-draft3.schema/default/quicktype.swift
index f8370f5..e90b3bc 100644
--- a/base/schema-swift/test/inputs/schema/required-draft3.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/required-draft3.schema/default/quicktype.swift
@@ -51,7 +51,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -74,7 +74,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/required-non-properties.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/required-non-properties.schema/default/quicktype.swift
index 40bfd5d..d0a6e4e 100644
--- a/base/schema-swift/test/inputs/schema/required-non-properties.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/required-non-properties.schema/default/quicktype.swift
@@ -55,7 +55,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -78,7 +78,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/rust-cycle-breaker-union.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/rust-cycle-breaker-union.schema/default/quicktype.swift
index 94813e3..2c39092 100644
--- a/base/schema-swift/test/inputs/schema/rust-cycle-breaker-union.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/rust-cycle-breaker-union.schema/default/quicktype.swift
@@ -138,7 +138,7 @@ indirect enum Next: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -161,7 +161,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/schema-constraints.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/schema-constraints.schema/default/quicktype.swift
index 0beef74..30169ab 100644
--- a/base/schema-swift/test/inputs/schema/schema-constraints.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/schema-constraints.schema/default/quicktype.swift
@@ -55,7 +55,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -78,7 +78,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/simple-ref.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/simple-ref.schema/default/quicktype.swift
index c9432ab..38d0ee0 100644
--- a/base/schema-swift/test/inputs/schema/simple-ref.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/simple-ref.schema/default/quicktype.swift
@@ -57,7 +57,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -80,7 +80,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/strict-optional.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/strict-optional.schema/default/quicktype.swift
index 7e1dfff..a6d97fb 100644
--- a/base/schema-swift/test/inputs/schema/strict-optional.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/strict-optional.schema/default/quicktype.swift
@@ -51,7 +51,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -74,7 +74,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/top-level-array.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/top-level-array.schema/default/quicktype.swift
index 1dbd889..cac9457 100644
--- a/base/schema-swift/test/inputs/schema/top-level-array.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/top-level-array.schema/default/quicktype.swift
@@ -82,7 +82,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -105,7 +105,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/top-level-primitive-array.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/top-level-primitive-array.schema/default/quicktype.swift
index 5104745..9ca39bb 100644
--- a/base/schema-swift/test/inputs/schema/top-level-primitive-array.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/top-level-primitive-array.schema/default/quicktype.swift
@@ -33,7 +33,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -56,7 +56,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/tuple.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/tuple.schema/default/quicktype.swift
index d9e2496..abb5adb 100644
--- a/base/schema-swift/test/inputs/schema/tuple.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/tuple.schema/default/quicktype.swift
@@ -79,7 +79,7 @@ enum Tuple: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -102,7 +102,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/union-int-double.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/union-int-double.schema/default/quicktype.swift
index 2c8b30d..e940015 100644
--- a/base/schema-swift/test/inputs/schema/union-int-double.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/union-int-double.schema/default/quicktype.swift
@@ -86,7 +86,7 @@ enum Value: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -109,7 +109,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/union-list.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/union-list.schema/default/quicktype.swift
index 109f849..2012f7d 100644
--- a/base/schema-swift/test/inputs/schema/union-list.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/union-list.schema/default/quicktype.swift
@@ -123,7 +123,7 @@ indirect enum UnionList: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -146,7 +146,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/union.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/union.schema/default/quicktype.swift
index eca1d55..d54fb77 100644
--- a/base/schema-swift/test/inputs/schema/union.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/union.schema/default/quicktype.swift
@@ -86,7 +86,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -109,7 +109,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/schema-swift/test/inputs/schema/uuid.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/uuid.schema/default/quicktype.swift
index 3f502d2..6fe9988 100644
--- a/base/schema-swift/test/inputs/schema/uuid.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/uuid.schema/default/quicktype.swift
@@ -71,7 +71,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -94,7 +94,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/00c36.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/00c36.json/default/quicktype.swift
index 4e19706..508d02b 100644
--- a/base/swift/test/inputs/json/misc/00c36.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/00c36.json/default/quicktype.swift
@@ -236,7 +236,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -259,7 +259,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/00ec5.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/00ec5.json/default/quicktype.swift
index 6327e01..36a6e9d 100644
--- a/base/swift/test/inputs/json/misc/00ec5.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/00ec5.json/default/quicktype.swift
@@ -619,7 +619,7 @@ extension Schema {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -642,7 +642,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/010b1.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/010b1.json/default/quicktype.swift
index c19251c..692fbe6 100644
--- a/base/swift/test/inputs/json/misc/010b1.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/010b1.json/default/quicktype.swift
@@ -102,7 +102,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -125,7 +125,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/016af.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/016af.json/default/quicktype.swift
index 14bb39e..5c524b5 100644
--- a/base/swift/test/inputs/json/misc/016af.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/016af.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension TotalPopulation {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/033b1.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/033b1.json/default/quicktype.swift
index 618a9a5..4ce903b 100644
--- a/base/swift/test/inputs/json/misc/033b1.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/033b1.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/050b0.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/050b0.json/default/quicktype.swift
index 52e3ab6..2cf8356 100644
--- a/base/swift/test/inputs/json/misc/050b0.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/050b0.json/default/quicktype.swift
@@ -333,7 +333,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -356,7 +356,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/06bee.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/06bee.json/default/quicktype.swift
index d80fddc..cbbaed5 100644
--- a/base/swift/test/inputs/json/misc/06bee.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/06bee.json/default/quicktype.swift
@@ -278,7 +278,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -301,7 +301,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/07540.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/07540.json/default/quicktype.swift
index fb05f03..d503ae0 100644
--- a/base/swift/test/inputs/json/misc/07540.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/07540.json/default/quicktype.swift
@@ -88,7 +88,7 @@ extension Cookies {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -111,7 +111,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/0779f.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/0779f.json/default/quicktype.swift
index 5a350e2..cf02751 100644
--- a/base/swift/test/inputs/json/misc/0779f.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/0779f.json/default/quicktype.swift
@@ -267,7 +267,7 @@ extension Meta {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -290,7 +290,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/07c75.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/07c75.json/default/quicktype.swift
index afd8829..62465dc 100644
--- a/base/swift/test/inputs/json/misc/07c75.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/07c75.json/default/quicktype.swift
@@ -254,7 +254,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -277,7 +277,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/09f54.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/09f54.json/default/quicktype.swift
index ead1db9..b3d38b4 100644
--- a/base/swift/test/inputs/json/misc/09f54.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/09f54.json/default/quicktype.swift
@@ -159,7 +159,7 @@ extension Description {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -182,7 +182,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/0a358.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/0a358.json/default/quicktype.swift
index 63fde1e..686942e 100644
--- a/base/swift/test/inputs/json/misc/0a358.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/0a358.json/default/quicktype.swift
@@ -176,7 +176,7 @@ extension Result {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -199,7 +199,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/0a91a.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/0a91a.json/default/quicktype.swift
index 1988112..5d0215f 100644
--- a/base/swift/test/inputs/json/misc/0a91a.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/0a91a.json/default/quicktype.swift
@@ -1238,7 +1238,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -1261,7 +1261,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/0b91a.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/0b91a.json/default/quicktype.swift
index 9202234..a032d89 100644
--- a/base/swift/test/inputs/json/misc/0b91a.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/0b91a.json/default/quicktype.swift
@@ -351,7 +351,7 @@ extension Component {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -374,7 +374,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/0cffa.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/0cffa.json/default/quicktype.swift
index 5780b15..19b9f43 100644
--- a/base/swift/test/inputs/json/misc/0cffa.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/0cffa.json/default/quicktype.swift
@@ -727,7 +727,7 @@ extension Pagination {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -750,7 +750,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/0e0c2.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/0e0c2.json/default/quicktype.swift
index 275e948..1d807ab 100644
--- a/base/swift/test/inputs/json/misc/0e0c2.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/0e0c2.json/default/quicktype.swift
@@ -522,7 +522,7 @@ extension VoteScore {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -545,7 +545,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/0fecf.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/0fecf.json/default/quicktype.swift
index dd20068..3f11431 100644
--- a/base/swift/test/inputs/json/misc/0fecf.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/0fecf.json/default/quicktype.swift
@@ -51,7 +51,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -74,7 +74,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/10be4.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/10be4.json/default/quicktype.swift
index ce66ed1..7669564 100644
--- a/base/swift/test/inputs/json/misc/10be4.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/10be4.json/default/quicktype.swift
@@ -344,7 +344,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -367,7 +367,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/112b5.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/112b5.json/default/quicktype.swift
index aafd537..744776f 100644
--- a/base/swift/test/inputs/json/misc/112b5.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/112b5.json/default/quicktype.swift
@@ -156,7 +156,7 @@ extension Headers {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -179,7 +179,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/127a1.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/127a1.json/default/quicktype.swift
index aa83fa8..8d2e057 100644
--- a/base/swift/test/inputs/json/misc/127a1.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/127a1.json/default/quicktype.swift
@@ -726,7 +726,7 @@ extension Pagination {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -749,7 +749,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/13d8d.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/13d8d.json/default/quicktype.swift
index 688259e..ff0a2c9 100644
--- a/base/swift/test/inputs/json/misc/13d8d.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/13d8d.json/default/quicktype.swift
@@ -258,7 +258,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -281,7 +281,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/14d38.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/14d38.json/default/quicktype.swift
index 89e1a3c..542a978 100644
--- a/base/swift/test/inputs/json/misc/14d38.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/14d38.json/default/quicktype.swift
@@ -107,7 +107,7 @@ extension Headers {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -130,7 +130,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/167d6.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/167d6.json/default/quicktype.swift
index 618a9a5..4ce903b 100644
--- a/base/swift/test/inputs/json/misc/167d6.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/167d6.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/16bc5.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/16bc5.json/default/quicktype.swift
index 52c8a63..3ac74ae 100644
--- a/base/swift/test/inputs/json/misc/16bc5.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/16bc5.json/default/quicktype.swift
@@ -807,7 +807,7 @@ extension Wind {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -830,7 +830,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/176f1.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/176f1.json/default/quicktype.swift
index a314ef9..1984356 100644
--- a/base/swift/test/inputs/json/misc/176f1.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/176f1.json/default/quicktype.swift
@@ -263,7 +263,7 @@ extension Footnote {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -286,7 +286,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/1a7f5.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/1a7f5.json/default/quicktype.swift
index c19251c..692fbe6 100644
--- a/base/swift/test/inputs/json/misc/1a7f5.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/1a7f5.json/default/quicktype.swift
@@ -102,7 +102,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -125,7 +125,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/1b28c.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/1b28c.json/default/quicktype.swift
index 14bb39e..5c524b5 100644
--- a/base/swift/test/inputs/json/misc/1b28c.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/1b28c.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension TotalPopulation {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/1b409.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/1b409.json/default/quicktype.swift
index 5fb58cf..b7f5354 100644
--- a/base/swift/test/inputs/json/misc/1b409.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/1b409.json/default/quicktype.swift
@@ -441,7 +441,7 @@ enum Title: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -464,7 +464,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/2465e.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/2465e.json/default/quicktype.swift
index 0930d76..e1c5a70 100644
--- a/base/swift/test/inputs/json/misc/2465e.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/2465e.json/default/quicktype.swift
@@ -679,7 +679,7 @@ extension Schema {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -702,7 +702,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/24f52.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/24f52.json/default/quicktype.swift
index 5a350e2..cf02751 100644
--- a/base/swift/test/inputs/json/misc/24f52.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/24f52.json/default/quicktype.swift
@@ -267,7 +267,7 @@ extension Meta {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -290,7 +290,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/262f0.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/262f0.json/default/quicktype.swift
index 96b5582..15783d1 100644
--- a/base/swift/test/inputs/json/misc/262f0.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/262f0.json/default/quicktype.swift
@@ -813,7 +813,7 @@ extension Wind {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -836,7 +836,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/26b49.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/26b49.json/default/quicktype.swift
index e94c0ba..7a12325 100644
--- a/base/swift/test/inputs/json/misc/26b49.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/26b49.json/default/quicktype.swift
@@ -726,7 +726,7 @@ extension Pagination {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -749,7 +749,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/26c9c.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/26c9c.json/default/quicktype.swift
index 1f09efc..dc321d5 100644
--- a/base/swift/test/inputs/json/misc/26c9c.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/26c9c.json/default/quicktype.swift
@@ -1470,7 +1470,7 @@ extension Expression {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -1493,7 +1493,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/27332.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/27332.json/default/quicktype.swift
index db1e635..451f965 100644
--- a/base/swift/test/inputs/json/misc/27332.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/27332.json/default/quicktype.swift
@@ -872,7 +872,7 @@ enum Kind: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -895,7 +895,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/29f47.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/29f47.json/default/quicktype.swift
index f38eec5..51b94c2 100644
--- a/base/swift/test/inputs/json/misc/29f47.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/29f47.json/default/quicktype.swift
@@ -806,7 +806,7 @@ enum Kind: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -829,7 +829,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/2d4e2.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/2d4e2.json/default/quicktype.swift
index 9a357b6..aa94ea4 100644
--- a/base/swift/test/inputs/json/misc/2d4e2.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/2d4e2.json/default/quicktype.swift
@@ -467,7 +467,7 @@ enum Title: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -490,7 +490,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/2df80.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/2df80.json/default/quicktype.swift
index c7307e3..3a9cc7b 100644
--- a/base/swift/test/inputs/json/misc/2df80.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/2df80.json/default/quicktype.swift
@@ -296,7 +296,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -319,7 +319,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/31189.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/31189.json/default/quicktype.swift
index 2294eec..6eccc82 100644
--- a/base/swift/test/inputs/json/misc/31189.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/31189.json/default/quicktype.swift
@@ -227,7 +227,7 @@ extension Rates {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -250,7 +250,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/32431.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/32431.json/default/quicktype.swift
index 7187692..4542b52 100644
--- a/base/swift/test/inputs/json/misc/32431.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/32431.json/default/quicktype.swift
@@ -398,7 +398,7 @@ extension Metadata {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -421,7 +421,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/32d5c.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/32d5c.json/default/quicktype.swift
index 1270cb0..36f9ead 100644
--- a/base/swift/test/inputs/json/misc/32d5c.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/32d5c.json/default/quicktype.swift
@@ -106,7 +106,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -129,7 +129,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/337ed.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/337ed.json/default/quicktype.swift
index 47da65c..5191f65 100644
--- a/base/swift/test/inputs/json/misc/337ed.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/337ed.json/default/quicktype.swift
@@ -368,7 +368,7 @@ enum ResultType: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -391,7 +391,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/33d2e.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/33d2e.json/default/quicktype.swift
index f3bdfe5..793f5af 100644
--- a/base/swift/test/inputs/json/misc/33d2e.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/33d2e.json/default/quicktype.swift
@@ -302,7 +302,7 @@ enum Category: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -325,7 +325,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/34702.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/34702.json/default/quicktype.swift
index 19f4485..67fd449 100644
--- a/base/swift/test/inputs/json/misc/34702.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/34702.json/default/quicktype.swift
@@ -414,7 +414,7 @@ enum FeatureType: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -437,7 +437,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/3536b.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/3536b.json/default/quicktype.swift
index 9cbc98b..e81ba6c 100644
--- a/base/swift/test/inputs/json/misc/3536b.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/3536b.json/default/quicktype.swift
@@ -266,7 +266,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -289,7 +289,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/3659d.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/3659d.json/default/quicktype.swift
index 14bb39e..5c524b5 100644
--- a/base/swift/test/inputs/json/misc/3659d.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/3659d.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension TotalPopulation {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/36d5d.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/36d5d.json/default/quicktype.swift
index 5a350e2..cf02751 100644
--- a/base/swift/test/inputs/json/misc/36d5d.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/36d5d.json/default/quicktype.swift
@@ -267,7 +267,7 @@ extension Meta {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -290,7 +290,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/3a6b3.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/3a6b3.json/default/quicktype.swift
index 5a350e2..cf02751 100644
--- a/base/swift/test/inputs/json/misc/3a6b3.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/3a6b3.json/default/quicktype.swift
@@ -267,7 +267,7 @@ extension Meta {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -290,7 +290,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/3e9a3.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/3e9a3.json/default/quicktype.swift
index a314ef9..1984356 100644
--- a/base/swift/test/inputs/json/misc/3e9a3.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/3e9a3.json/default/quicktype.swift
@@ -263,7 +263,7 @@ extension Footnote {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -286,7 +286,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/3f1ce.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/3f1ce.json/default/quicktype.swift
index 75561a1..6027f1d 100644
--- a/base/swift/test/inputs/json/misc/3f1ce.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/3f1ce.json/default/quicktype.swift
@@ -811,7 +811,7 @@ extension Wind {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -834,7 +834,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/421d4.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/421d4.json/default/quicktype.swift
index d4c64c0..db01d76 100644
--- a/base/swift/test/inputs/json/misc/421d4.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/421d4.json/default/quicktype.swift
@@ -867,7 +867,7 @@ extension Owner {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -890,7 +890,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/437e7.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/437e7.json/default/quicktype.swift
index 592f479..43c56d2 100644
--- a/base/swift/test/inputs/json/misc/437e7.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/437e7.json/default/quicktype.swift
@@ -714,7 +714,7 @@ extension Pagination {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -737,7 +737,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/43970.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/43970.json/default/quicktype.swift
index a8ab3f2..03c61b2 100644
--- a/base/swift/test/inputs/json/misc/43970.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/43970.json/default/quicktype.swift
@@ -86,7 +86,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -109,7 +109,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/43eaf.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/43eaf.json/default/quicktype.swift
index 618a9a5..4ce903b 100644
--- a/base/swift/test/inputs/json/misc/43eaf.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/43eaf.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/458db.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/458db.json/default/quicktype.swift
index af11f50..88073da 100644
--- a/base/swift/test/inputs/json/misc/458db.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/458db.json/default/quicktype.swift
@@ -351,7 +351,7 @@ enum Name: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -374,7 +374,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/4961a.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/4961a.json/default/quicktype.swift
index 14bb39e..5c524b5 100644
--- a/base/swift/test/inputs/json/misc/4961a.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/4961a.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension TotalPopulation {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/4a0d7.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/4a0d7.json/default/quicktype.swift
index 14bb39e..5c524b5 100644
--- a/base/swift/test/inputs/json/misc/4a0d7.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/4a0d7.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension TotalPopulation {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/4a455.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/4a455.json/default/quicktype.swift
index a6343ae..09684dc 100644
--- a/base/swift/test/inputs/json/misc/4a455.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/4a455.json/default/quicktype.swift
@@ -339,7 +339,7 @@ enum FeatureType: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -362,7 +362,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/4c547.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/4c547.json/default/quicktype.swift
index 52c8a63..3ac74ae 100644
--- a/base/swift/test/inputs/json/misc/4c547.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/4c547.json/default/quicktype.swift
@@ -807,7 +807,7 @@ extension Wind {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -830,7 +830,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/4d6fb.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/4d6fb.json/default/quicktype.swift
index 798806f..d3f6fc1 100644
--- a/base/swift/test/inputs/json/misc/4d6fb.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/4d6fb.json/default/quicktype.swift
@@ -869,7 +869,7 @@ enum Kind: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -892,7 +892,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/4e336.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/4e336.json/default/quicktype.swift
index 14bb39e..5c524b5 100644
--- a/base/swift/test/inputs/json/misc/4e336.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/4e336.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension TotalPopulation {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/54147.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/54147.json/default/quicktype.swift
index cd821bb..fdef731 100644
--- a/base/swift/test/inputs/json/misc/54147.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/54147.json/default/quicktype.swift
@@ -168,7 +168,7 @@ extension Headers {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -191,7 +191,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/54d32.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/54d32.json/default/quicktype.swift
index 67cc18c..99bc103 100644
--- a/base/swift/test/inputs/json/misc/54d32.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/54d32.json/default/quicktype.swift
@@ -181,7 +181,7 @@ enum Status: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -204,7 +204,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/570ec.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/570ec.json/default/quicktype.swift
index 5c6003a..79fd382 100644
--- a/base/swift/test/inputs/json/misc/570ec.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/570ec.json/default/quicktype.swift
@@ -308,7 +308,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -331,7 +331,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/5dd0d.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/5dd0d.json/default/quicktype.swift
index 5a350e2..cf02751 100644
--- a/base/swift/test/inputs/json/misc/5dd0d.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/5dd0d.json/default/quicktype.swift
@@ -267,7 +267,7 @@ extension Meta {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -290,7 +290,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/5eae5.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/5eae5.json/default/quicktype.swift
index 82f4455..6d22e60 100644
--- a/base/swift/test/inputs/json/misc/5eae5.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/5eae5.json/default/quicktype.swift
@@ -90,7 +90,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -113,7 +113,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/5eb20.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/5eb20.json/default/quicktype.swift
index 5a350e2..cf02751 100644
--- a/base/swift/test/inputs/json/misc/5eb20.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/5eb20.json/default/quicktype.swift
@@ -267,7 +267,7 @@ extension Meta {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -290,7 +290,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/5f3a1.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/5f3a1.json/default/quicktype.swift
index 618a9a5..4ce903b 100644
--- a/base/swift/test/inputs/json/misc/5f3a1.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/5f3a1.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/5f7fe.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/5f7fe.json/default/quicktype.swift
index d45643d..c354c34 100644
--- a/base/swift/test/inputs/json/misc/5f7fe.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/5f7fe.json/default/quicktype.swift
@@ -1460,7 +1460,7 @@ extension Expression {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -1483,7 +1483,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/617e8.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/617e8.json/default/quicktype.swift
index 713dede..3b60a9e 100644
--- a/base/swift/test/inputs/json/misc/617e8.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/617e8.json/default/quicktype.swift
@@ -1456,7 +1456,7 @@ extension Expression {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -1479,7 +1479,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/61b66.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/61b66.json/default/quicktype.swift
index 5a350e2..cf02751 100644
--- a/base/swift/test/inputs/json/misc/61b66.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/61b66.json/default/quicktype.swift
@@ -267,7 +267,7 @@ extension Meta {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -290,7 +290,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/6260a.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/6260a.json/default/quicktype.swift
index 618a9a5..4ce903b 100644
--- a/base/swift/test/inputs/json/misc/6260a.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/6260a.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/65dec.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/65dec.json/default/quicktype.swift
index 50c6420..9d243a9 100644
--- a/base/swift/test/inputs/json/misc/65dec.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/65dec.json/default/quicktype.swift
@@ -381,7 +381,7 @@ enum TypeElement: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -404,7 +404,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/66121.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/66121.json/default/quicktype.swift
index 0b3d6a4..228b155 100644
--- a/base/swift/test/inputs/json/misc/66121.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/66121.json/default/quicktype.swift
@@ -278,7 +278,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -301,7 +301,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/6617c.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/6617c.json/default/quicktype.swift
index c4b8a75..75cb635 100644
--- a/base/swift/test/inputs/json/misc/6617c.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/6617c.json/default/quicktype.swift
@@ -107,7 +107,7 @@ extension IssPosition {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -130,7 +130,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/67c03.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/67c03.json/default/quicktype.swift
index a1b1d75..ec5a9b2 100644
--- a/base/swift/test/inputs/json/misc/67c03.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/67c03.json/default/quicktype.swift
@@ -107,7 +107,7 @@ extension Person {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -130,7 +130,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/68c30.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/68c30.json/default/quicktype.swift
index 7c6754c..f491ade 100644
--- a/base/swift/test/inputs/json/misc/68c30.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/68c30.json/default/quicktype.swift
@@ -259,7 +259,7 @@ extension Out {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -282,7 +282,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/6c155.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/6c155.json/default/quicktype.swift
index 5a69a7d..5c20b7e 100644
--- a/base/swift/test/inputs/json/misc/6c155.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/6c155.json/default/quicktype.swift
@@ -431,7 +431,7 @@ extension Location {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -454,7 +454,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/6de06.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/6de06.json/default/quicktype.swift
index f12a2b9..d4e17ba 100644
--- a/base/swift/test/inputs/json/misc/6de06.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/6de06.json/default/quicktype.swift
@@ -921,7 +921,7 @@ enum Kind: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -944,7 +944,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/6dec6.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/6dec6.json/default/quicktype.swift
index 0d8a1d9..c307591 100644
--- a/base/swift/test/inputs/json/misc/6dec6.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/6dec6.json/default/quicktype.swift
@@ -813,7 +813,7 @@ extension Wind {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -836,7 +836,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/6eb00.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/6eb00.json/default/quicktype.swift
index defba82..e3e30c3 100644
--- a/base/swift/test/inputs/json/misc/6eb00.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/6eb00.json/default/quicktype.swift
@@ -86,7 +86,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -109,7 +109,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/70c77.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/70c77.json/default/quicktype.swift
index 618a9a5..4ce903b 100644
--- a/base/swift/test/inputs/json/misc/70c77.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/70c77.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/734ad.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/734ad.json/default/quicktype.swift
index 188bb8a..a421006 100644
--- a/base/swift/test/inputs/json/misc/734ad.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/734ad.json/default/quicktype.swift
@@ -389,7 +389,7 @@ enum Status: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -412,7 +412,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/75912.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/75912.json/default/quicktype.swift
index 618a9a5..4ce903b 100644
--- a/base/swift/test/inputs/json/misc/75912.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/75912.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/7681c.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/7681c.json/default/quicktype.swift
index ef9fd5b..38ad753 100644
--- a/base/swift/test/inputs/json/misc/7681c.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/7681c.json/default/quicktype.swift
@@ -728,7 +728,7 @@ extension Pagination {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -751,7 +751,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/76ae1.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/76ae1.json/default/quicktype.swift
index 5915fdf..e23195e 100644
--- a/base/swift/test/inputs/json/misc/76ae1.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/76ae1.json/default/quicktype.swift
@@ -1435,7 +1435,7 @@ enum SchemaType: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -1458,7 +1458,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/77392.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/77392.json/default/quicktype.swift
index dbcb71b..fc8f915 100644
--- a/base/swift/test/inputs/json/misc/77392.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/77392.json/default/quicktype.swift
@@ -132,7 +132,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -155,7 +155,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/7d397.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/7d397.json/default/quicktype.swift
index 3737994..3c658cb 100644
--- a/base/swift/test/inputs/json/misc/7d397.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/7d397.json/default/quicktype.swift
@@ -671,7 +671,7 @@ extension Items {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -694,7 +694,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/7d722.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/7d722.json/default/quicktype.swift
index 5a350e2..cf02751 100644
--- a/base/swift/test/inputs/json/misc/7d722.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/7d722.json/default/quicktype.swift
@@ -267,7 +267,7 @@ extension Meta {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -290,7 +290,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/7df41.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/7df41.json/default/quicktype.swift
index 0e53dd0..8cf93a5 100644
--- a/base/swift/test/inputs/json/misc/7df41.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/7df41.json/default/quicktype.swift
@@ -119,7 +119,7 @@ extension PC {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -142,7 +142,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/7dfa6.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/7dfa6.json/default/quicktype.swift
index 14bb39e..5c524b5 100644
--- a/base/swift/test/inputs/json/misc/7dfa6.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/7dfa6.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension TotalPopulation {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/7eb30.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/7eb30.json/default/quicktype.swift
index 45bda19..18110c0 100644
--- a/base/swift/test/inputs/json/misc/7eb30.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/7eb30.json/default/quicktype.swift
@@ -237,7 +237,7 @@ enum Tel: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -260,7 +260,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/7f568.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/7f568.json/default/quicktype.swift
index b46d47c..35450fb 100644
--- a/base/swift/test/inputs/json/misc/7f568.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/7f568.json/default/quicktype.swift
@@ -206,7 +206,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -229,7 +229,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/7fbfb.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/7fbfb.json/default/quicktype.swift
index ea8fbf9..048f70d 100644
--- a/base/swift/test/inputs/json/misc/7fbfb.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/7fbfb.json/default/quicktype.swift
@@ -236,7 +236,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -259,7 +259,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/80aff.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/80aff.json/default/quicktype.swift
index 2ac0b4a..d7745cd 100644
--- a/base/swift/test/inputs/json/misc/80aff.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/80aff.json/default/quicktype.swift
@@ -180,7 +180,7 @@ extension Result {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -203,7 +203,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/82509.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/82509.json/default/quicktype.swift
index 181233f..4ff5969 100644
--- a/base/swift/test/inputs/json/misc/82509.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/82509.json/default/quicktype.swift
@@ -51,7 +51,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -74,7 +74,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/8592b.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/8592b.json/default/quicktype.swift
index 1605909..36831ed 100644
--- a/base/swift/test/inputs/json/misc/8592b.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/8592b.json/default/quicktype.swift
@@ -677,7 +677,7 @@ enum Kind: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -700,7 +700,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/88130.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/88130.json/default/quicktype.swift
index 52c8a63..3ac74ae 100644
--- a/base/swift/test/inputs/json/misc/88130.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/88130.json/default/quicktype.swift
@@ -807,7 +807,7 @@ extension Wind {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -830,7 +830,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/8a62c.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/8a62c.json/default/quicktype.swift
index 14bb39e..5c524b5 100644
--- a/base/swift/test/inputs/json/misc/8a62c.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/8a62c.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension TotalPopulation {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/908db.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/908db.json/default/quicktype.swift
index ec76b28..4cd4bda 100644
--- a/base/swift/test/inputs/json/misc/908db.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/908db.json/default/quicktype.swift
@@ -143,7 +143,7 @@ extension StateState {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -166,7 +166,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/9617f.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/9617f.json/default/quicktype.swift
index 618a9a5..4ce903b 100644
--- a/base/swift/test/inputs/json/misc/9617f.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/9617f.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/96f7c.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/96f7c.json/default/quicktype.swift
index aecb6e4..9ab89f2 100644
--- a/base/swift/test/inputs/json/misc/96f7c.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/96f7c.json/default/quicktype.swift
@@ -71,7 +71,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -94,7 +94,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/9847b.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/9847b.json/default/quicktype.swift
index 4ebfadf..541299b 100644
--- a/base/swift/test/inputs/json/misc/9847b.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/9847b.json/default/quicktype.swift
@@ -82,7 +82,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -105,7 +105,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/9929c.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/9929c.json/default/quicktype.swift
index 52c8a63..3ac74ae 100644
--- a/base/swift/test/inputs/json/misc/9929c.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/9929c.json/default/quicktype.swift
@@ -807,7 +807,7 @@ extension Wind {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -830,7 +830,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/996bd.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/996bd.json/default/quicktype.swift
index ba7289c..9a4ca47 100644
--- a/base/swift/test/inputs/json/misc/996bd.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/996bd.json/default/quicktype.swift
@@ -277,7 +277,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -300,7 +300,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/9a503.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/9a503.json/default/quicktype.swift
index 7487a29..4a2a888 100644
--- a/base/swift/test/inputs/json/misc/9a503.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/9a503.json/default/quicktype.swift
@@ -260,7 +260,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -283,7 +283,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/9ac3b.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/9ac3b.json/default/quicktype.swift
index 084da44..949fe34 100644
--- a/base/swift/test/inputs/json/misc/9ac3b.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/9ac3b.json/default/quicktype.swift
@@ -206,7 +206,7 @@ enum Title: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -229,7 +229,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/9eed5.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/9eed5.json/default/quicktype.swift
index cc8fd31..6b98fca 100644
--- a/base/swift/test/inputs/json/misc/9eed5.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/9eed5.json/default/quicktype.swift
@@ -259,7 +259,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -282,7 +282,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/a0496.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/a0496.json/default/quicktype.swift
index 9759a00..739dd5f 100644
--- a/base/swift/test/inputs/json/misc/a0496.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/a0496.json/default/quicktype.swift
@@ -187,7 +187,7 @@ extension Errors {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -210,7 +210,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/a1eca.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/a1eca.json/default/quicktype.swift
index 52c8a63..3ac74ae 100644
--- a/base/swift/test/inputs/json/misc/a1eca.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/a1eca.json/default/quicktype.swift
@@ -807,7 +807,7 @@ extension Wind {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -830,7 +830,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/a3d8c.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/a3d8c.json/default/quicktype.swift
index 3c0b830..01bb8b1 100644
--- a/base/swift/test/inputs/json/misc/a3d8c.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/a3d8c.json/default/quicktype.swift
@@ -861,7 +861,7 @@ extension Owner {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -884,7 +884,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/a45b0.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/a45b0.json/default/quicktype.swift
index c19251c..692fbe6 100644
--- a/base/swift/test/inputs/json/misc/a45b0.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/a45b0.json/default/quicktype.swift
@@ -102,7 +102,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -125,7 +125,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/a71df.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/a71df.json/default/quicktype.swift
index 5a350e2..cf02751 100644
--- a/base/swift/test/inputs/json/misc/a71df.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/a71df.json/default/quicktype.swift
@@ -267,7 +267,7 @@ extension Meta {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -290,7 +290,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/a9691.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/a9691.json/default/quicktype.swift
index 618a9a5..4ce903b 100644
--- a/base/swift/test/inputs/json/misc/a9691.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/a9691.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/ab0d1.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/ab0d1.json/default/quicktype.swift
index c19251c..692fbe6 100644
--- a/base/swift/test/inputs/json/misc/ab0d1.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/ab0d1.json/default/quicktype.swift
@@ -102,7 +102,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -125,7 +125,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/abb4b.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/abb4b.json/default/quicktype.swift
index 14bb39e..5c524b5 100644
--- a/base/swift/test/inputs/json/misc/abb4b.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/abb4b.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension TotalPopulation {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/ac944.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/ac944.json/default/quicktype.swift
index 618a9a5..4ce903b 100644
--- a/base/swift/test/inputs/json/misc/ac944.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/ac944.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/ad8be.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/ad8be.json/default/quicktype.swift
index ce66ed1..7669564 100644
--- a/base/swift/test/inputs/json/misc/ad8be.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/ad8be.json/default/quicktype.swift
@@ -344,7 +344,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -367,7 +367,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/ae7f0.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/ae7f0.json/default/quicktype.swift
index 6fcb575..7051580 100644
--- a/base/swift/test/inputs/json/misc/ae7f0.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/ae7f0.json/default/quicktype.swift
@@ -500,7 +500,7 @@ enum Kind: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -523,7 +523,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/ae9ca.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/ae9ca.json/default/quicktype.swift
index f0e3e39..dcfe614 100644
--- a/base/swift/test/inputs/json/misc/ae9ca.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/ae9ca.json/default/quicktype.swift
@@ -264,7 +264,7 @@ enum FeatureType: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -287,7 +287,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/af2d1.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/af2d1.json/default/quicktype.swift
index 6446e08..3c27e9b 100644
--- a/base/swift/test/inputs/json/misc/af2d1.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/af2d1.json/default/quicktype.swift
@@ -507,7 +507,7 @@ enum FeatureType: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -530,7 +530,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/b4865.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/b4865.json/default/quicktype.swift
index 044b17f..e3289dc 100644
--- a/base/swift/test/inputs/json/misc/b4865.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/b4865.json/default/quicktype.swift
@@ -183,7 +183,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -206,7 +206,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/b6f2c.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/b6f2c.json/default/quicktype.swift
index 14bb39e..5c524b5 100644
--- a/base/swift/test/inputs/json/misc/b6f2c.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/b6f2c.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension TotalPopulation {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/b6fe5.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/b6fe5.json/default/quicktype.swift
index 46aae8b..7347360 100644
--- a/base/swift/test/inputs/json/misc/b6fe5.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/b6fe5.json/default/quicktype.swift
@@ -63,7 +63,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -86,7 +86,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/b9f64.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/b9f64.json/default/quicktype.swift
index 3576924..e435f91 100644
--- a/base/swift/test/inputs/json/misc/b9f64.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/b9f64.json/default/quicktype.swift
@@ -51,7 +51,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -74,7 +74,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/bb1ec.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/bb1ec.json/default/quicktype.swift
index 14bb39e..5c524b5 100644
--- a/base/swift/test/inputs/json/misc/bb1ec.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/bb1ec.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension TotalPopulation {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/be234.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/be234.json/default/quicktype.swift
index 3470f7a..ee07966 100644
--- a/base/swift/test/inputs/json/misc/be234.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/be234.json/default/quicktype.swift
@@ -933,7 +933,7 @@ enum Kind: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -956,7 +956,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/c0356.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/c0356.json/default/quicktype.swift
index 6298d0c..0992cba 100644
--- a/base/swift/test/inputs/json/misc/c0356.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/c0356.json/default/quicktype.swift
@@ -155,7 +155,7 @@ extension Description {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -178,7 +178,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/c0a3a.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/c0a3a.json/default/quicktype.swift
index 5a350e2..cf02751 100644
--- a/base/swift/test/inputs/json/misc/c0a3a.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/c0a3a.json/default/quicktype.swift
@@ -267,7 +267,7 @@ extension Meta {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -290,7 +290,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/c3303.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/c3303.json/default/quicktype.swift
index cb8ff24..5ebb588 100644
--- a/base/swift/test/inputs/json/misc/c3303.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/c3303.json/default/quicktype.swift
@@ -722,7 +722,7 @@ extension Pagination {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -745,7 +745,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/c6cfd.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/c6cfd.json/default/quicktype.swift
index cb74df4..d2f0374 100644
--- a/base/swift/test/inputs/json/misc/c6cfd.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/c6cfd.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension Country {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/c8c7e.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/c8c7e.json/default/quicktype.swift
index 77ae469..82b569b 100644
--- a/base/swift/test/inputs/json/misc/c8c7e.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/c8c7e.json/default/quicktype.swift
@@ -236,7 +236,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -259,7 +259,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/cb0cc.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/cb0cc.json/default/quicktype.swift
index 9d18c2a..c6bec3c 100644
--- a/base/swift/test/inputs/json/misc/cb0cc.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/cb0cc.json/default/quicktype.swift
@@ -176,7 +176,7 @@ extension Laureate {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -199,7 +199,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/cb81e.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/cb81e.json/default/quicktype.swift
index 418be36..84f180a 100644
--- a/base/swift/test/inputs/json/misc/cb81e.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/cb81e.json/default/quicktype.swift
@@ -111,7 +111,7 @@ extension Description {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -134,7 +134,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/ccd18.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/ccd18.json/default/quicktype.swift
index 5a350e2..cf02751 100644
--- a/base/swift/test/inputs/json/misc/ccd18.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/ccd18.json/default/quicktype.swift
@@ -267,7 +267,7 @@ extension Meta {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -290,7 +290,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/cd238.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/cd238.json/default/quicktype.swift
index 5a350e2..cf02751 100644
--- a/base/swift/test/inputs/json/misc/cd238.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/cd238.json/default/quicktype.swift
@@ -267,7 +267,7 @@ extension Meta {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -290,7 +290,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/cd463.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/cd463.json/default/quicktype.swift
index 618a9a5..4ce903b 100644
--- a/base/swift/test/inputs/json/misc/cd463.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/cd463.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/cda6c.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/cda6c.json/default/quicktype.swift
index 225ef2f..430a586 100644
--- a/base/swift/test/inputs/json/misc/cda6c.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/cda6c.json/default/quicktype.swift
@@ -236,7 +236,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -259,7 +259,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/cf0d8.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/cf0d8.json/default/quicktype.swift
index 52c8a63..3ac74ae 100644
--- a/base/swift/test/inputs/json/misc/cf0d8.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/cf0d8.json/default/quicktype.swift
@@ -807,7 +807,7 @@ extension Wind {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -830,7 +830,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/cfbce.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/cfbce.json/default/quicktype.swift
index 618a9a5..4ce903b 100644
--- a/base/swift/test/inputs/json/misc/cfbce.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/cfbce.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/d0908.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/d0908.json/default/quicktype.swift
index 14bb39e..5c524b5 100644
--- a/base/swift/test/inputs/json/misc/d0908.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/d0908.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension TotalPopulation {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/d23d5.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/d23d5.json/default/quicktype.swift
index 36dd7cd..a0fe7b0 100644
--- a/base/swift/test/inputs/json/misc/d23d5.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/d23d5.json/default/quicktype.swift
@@ -176,7 +176,7 @@ extension Result {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -199,7 +199,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/dbfb3.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/dbfb3.json/default/quicktype.swift
index eb0d961..f978b38 100644
--- a/base/swift/test/inputs/json/misc/dbfb3.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/dbfb3.json/default/quicktype.swift
@@ -812,7 +812,7 @@ extension Wind {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -835,7 +835,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/dc44f.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/dc44f.json/default/quicktype.swift
index 4ff61f0..971cc17 100644
--- a/base/swift/test/inputs/json/misc/dc44f.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/dc44f.json/default/quicktype.swift
@@ -420,7 +420,7 @@ enum TypeElement: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -443,7 +443,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/dd1ce.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/dd1ce.json/default/quicktype.swift
index 4ff61f0..971cc17 100644
--- a/base/swift/test/inputs/json/misc/dd1ce.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/dd1ce.json/default/quicktype.swift
@@ -420,7 +420,7 @@ enum TypeElement: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -443,7 +443,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/dec3a.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/dec3a.json/default/quicktype.swift
index 59605e6..9a19e14 100644
--- a/base/swift/test/inputs/json/misc/dec3a.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/dec3a.json/default/quicktype.swift
@@ -463,7 +463,7 @@ extension Location {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -486,7 +486,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/df957.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/df957.json/default/quicktype.swift
index 52c8a63..3ac74ae 100644
--- a/base/swift/test/inputs/json/misc/df957.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/df957.json/default/quicktype.swift
@@ -807,7 +807,7 @@ extension Wind {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -830,7 +830,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/e0ac7.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/e0ac7.json/default/quicktype.swift
index 81d1273..01393b3 100644
--- a/base/swift/test/inputs/json/misc/e0ac7.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/e0ac7.json/default/quicktype.swift
@@ -721,7 +721,7 @@ extension Pagination {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -744,7 +744,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/e2915.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/e2915.json/default/quicktype.swift
index 3cccf40..53dbbc5 100644
--- a/base/swift/test/inputs/json/misc/e2915.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/e2915.json/default/quicktype.swift
@@ -811,7 +811,7 @@ extension Wind {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -834,7 +834,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/e2a58.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/e2a58.json/default/quicktype.swift
index f747914..83fb906 100644
--- a/base/swift/test/inputs/json/misc/e2a58.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/e2a58.json/default/quicktype.swift
@@ -82,7 +82,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -105,7 +105,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/e324e.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/e324e.json/default/quicktype.swift
index 64f3ef0..105b004 100644
--- a/base/swift/test/inputs/json/misc/e324e.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/e324e.json/default/quicktype.swift
@@ -667,7 +667,7 @@ extension Items {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -690,7 +690,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/e53b5.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/e53b5.json/default/quicktype.swift
index de9b8d0..9b7f3d0 100644
--- a/base/swift/test/inputs/json/misc/e53b5.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/e53b5.json/default/quicktype.swift
@@ -236,7 +236,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -259,7 +259,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/e64a0.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/e64a0.json/default/quicktype.swift
index aafd537..744776f 100644
--- a/base/swift/test/inputs/json/misc/e64a0.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/e64a0.json/default/quicktype.swift
@@ -156,7 +156,7 @@ extension Headers {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -179,7 +179,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/e8a0b.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/e8a0b.json/default/quicktype.swift
index c19251c..692fbe6 100644
--- a/base/swift/test/inputs/json/misc/e8a0b.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/e8a0b.json/default/quicktype.swift
@@ -102,7 +102,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -125,7 +125,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/e8b04.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/e8b04.json/default/quicktype.swift
index ba8ccd6..8683d58 100644
--- a/base/swift/test/inputs/json/misc/e8b04.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/e8b04.json/default/quicktype.swift
@@ -1699,7 +1699,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -1722,7 +1722,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/ed095.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/ed095.json/default/quicktype.swift
index 631762b..572d5b5 100644
--- a/base/swift/test/inputs/json/misc/ed095.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/ed095.json/default/quicktype.swift
@@ -33,7 +33,7 @@ extension Dictionary where Key == String, Value == String {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -56,7 +56,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/f22f5.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/f22f5.json/default/quicktype.swift
index f71a17b..488042f 100644
--- a/base/swift/test/inputs/json/misc/f22f5.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/f22f5.json/default/quicktype.swift
@@ -496,7 +496,7 @@ enum Kind: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -519,7 +519,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/f3139.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/f3139.json/default/quicktype.swift
index 4ebfadf..541299b 100644
--- a/base/swift/test/inputs/json/misc/f3139.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/f3139.json/default/quicktype.swift
@@ -82,7 +82,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -105,7 +105,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/f3edf.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/f3edf.json/default/quicktype.swift
index c19251c..692fbe6 100644
--- a/base/swift/test/inputs/json/misc/f3edf.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/f3edf.json/default/quicktype.swift
@@ -102,7 +102,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -125,7 +125,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/f466a.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/f466a.json/default/quicktype.swift
index c19251c..692fbe6 100644
--- a/base/swift/test/inputs/json/misc/f466a.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/f466a.json/default/quicktype.swift
@@ -102,7 +102,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -125,7 +125,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/f6a65.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/f6a65.json/default/quicktype.swift
index 43170ed..6707019 100644
--- a/base/swift/test/inputs/json/misc/f6a65.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/f6a65.json/default/quicktype.swift
@@ -729,7 +729,7 @@ extension Pagination {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -752,7 +752,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/f74d5.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/f74d5.json/default/quicktype.swift
index 9a9db82..27d11d2 100644
--- a/base/swift/test/inputs/json/misc/f74d5.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/f74d5.json/default/quicktype.swift
@@ -854,7 +854,7 @@ extension Owner {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -877,7 +877,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/f82d9.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/f82d9.json/default/quicktype.swift
index c3cc65a..2fb493b 100644
--- a/base/swift/test/inputs/json/misc/f82d9.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/f82d9.json/default/quicktype.swift
@@ -747,7 +747,7 @@ extension Items {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -770,7 +770,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/f974d.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/f974d.json/default/quicktype.swift
index 62e16f3..b3cb5de 100644
--- a/base/swift/test/inputs/json/misc/f974d.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/f974d.json/default/quicktype.swift
@@ -67,7 +67,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -90,7 +90,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/faff5.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/faff5.json/default/quicktype.swift
index dd9a1ad..a7c40c0 100644
--- a/base/swift/test/inputs/json/misc/faff5.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/faff5.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension Response {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/fcca3.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/fcca3.json/default/quicktype.swift
index ffb9aa3..d677be5 100644
--- a/base/swift/test/inputs/json/misc/fcca3.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/fcca3.json/default/quicktype.swift
@@ -1672,7 +1672,7 @@ extension Expression {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -1695,7 +1695,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/misc/fd329.json/default/quicktype.swift b/head/swift/test/inputs/json/misc/fd329.json/default/quicktype.swift
index ead1db9..b3d38b4 100644
--- a/base/swift/test/inputs/json/misc/fd329.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/misc/fd329.json/default/quicktype.swift
@@ -159,7 +159,7 @@ extension Description {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -182,7 +182,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/bug2037.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/bug2037.json/default/quicktype.swift
index 263587a..8dcdf11 100644
--- a/base/swift/test/inputs/json/priority/bug2037.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/bug2037.json/default/quicktype.swift
@@ -176,7 +176,7 @@ extension Reward {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -199,7 +199,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/bug2521.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/bug2521.json/default/quicktype.swift
index c82a69c..0c70287 100644
--- a/base/swift/test/inputs/json/priority/bug2521.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/bug2521.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension Option {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/bug2590.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/bug2590.json/default/quicktype.swift
index 9b1e865..780fe67 100644
--- a/base/swift/test/inputs/json/priority/bug2590.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/bug2590.json/default/quicktype.swift
@@ -103,7 +103,7 @@ extension Invoice {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -126,7 +126,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/bug2663.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/bug2663.json/default/quicktype.swift
index 8a2b5f9..3b58a90 100644
--- a/base/swift/test/inputs/json/priority/bug2663.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/bug2663.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/bug2793.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/bug2793.json/default/quicktype.swift
index dc854eb..9e70767 100644
--- a/base/swift/test/inputs/json/priority/bug2793.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/bug2793.json/default/quicktype.swift
@@ -140,7 +140,7 @@ extension Labels {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -163,7 +163,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/bug427.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/bug427.json/default/quicktype.swift
index 8be36d8..7b13bad 100644
--- a/base/swift/test/inputs/json/priority/bug427.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/bug427.json/default/quicktype.swift
@@ -4006,7 +4006,7 @@ enum TentacledKindString: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -4029,7 +4029,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/bug790.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/bug790.json/default/quicktype.swift
index 7a65394..7769052 100644
--- a/base/swift/test/inputs/json/priority/bug790.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/bug790.json/default/quicktype.swift
@@ -79,7 +79,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -102,7 +102,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/bug855-short.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/bug855-short.json/default/quicktype.swift
index 8813b79..c46bbf5 100644
--- a/base/swift/test/inputs/json/priority/bug855-short.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/bug855-short.json/default/quicktype.swift
@@ -94,7 +94,7 @@ extension Dictionary where Key == String, Value == TopLevelValue {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -117,7 +117,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/bug863.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/bug863.json/default/quicktype.swift
index 73bb533..0e0de84 100644
--- a/base/swift/test/inputs/json/priority/bug863.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/bug863.json/default/quicktype.swift
@@ -391,7 +391,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -414,7 +414,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/coin-pairs.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/coin-pairs.json/default/quicktype.swift
index 5328092..2a46bb4 100644
--- a/base/swift/test/inputs/json/priority/coin-pairs.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/coin-pairs.json/default/quicktype.swift
@@ -127,7 +127,7 @@ extension Pair {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -150,7 +150,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations1.json/access-level-internal--a653a863c206/quicktype.swift b/head/swift/test/inputs/json/priority/combinations1.json/access-level-internal--a653a863c206/quicktype.swift
index 78b6a14..eb93305 100644
--- a/base/swift/test/inputs/json/priority/combinations1.json/access-level-internal--a653a863c206/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations1.json/access-level-internal--a653a863c206/quicktype.swift
@@ -2776,7 +2776,7 @@ enum Jacutinga: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -2799,7 +2799,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations1.json/access-level-public--bc6fc37ec004/quicktype.swift b/head/swift/test/inputs/json/priority/combinations1.json/access-level-public--bc6fc37ec004/quicktype.swift
index a099d65..c0ad45b 100644
--- a/base/swift/test/inputs/json/priority/combinations1.json/access-level-public--bc6fc37ec004/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations1.json/access-level-public--bc6fc37ec004/quicktype.swift
@@ -3106,7 +3106,7 @@ public enum Jacutinga: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -3129,7 +3129,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations1.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/combinations1.json/default/quicktype.swift
index 78b6a14..eb93305 100644
--- a/base/swift/test/inputs/json/priority/combinations1.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations1.json/default/quicktype.swift
@@ -2776,7 +2776,7 @@ enum Jacutinga: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -2799,7 +2799,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations1.json/density-dense--3bfb4c22cfd0/quicktype.swift b/head/swift/test/inputs/json/priority/combinations1.json/density-dense--3bfb4c22cfd0/quicktype.swift
index 63e45fa..feed8bf 100644
--- a/base/swift/test/inputs/json/priority/combinations1.json/density-dense--3bfb4c22cfd0/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations1.json/density-dense--3bfb4c22cfd0/quicktype.swift
@@ -2390,7 +2390,7 @@ enum Jacutinga: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -2413,7 +2413,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations1.json/protocol-equatable--bd9068f466c1/quicktype.swift b/head/swift/test/inputs/json/priority/combinations1.json/protocol-equatable--bd9068f466c1/quicktype.swift
index 1149d1f..205f0b8 100644
--- a/base/swift/test/inputs/json/priority/combinations1.json/protocol-equatable--bd9068f466c1/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations1.json/protocol-equatable--bd9068f466c1/quicktype.swift
@@ -2860,7 +2860,7 @@ enum Jacutinga: Codable, Equatable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -2883,7 +2883,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations1.json/struct-or-class-class--238d6c8a12d4/quicktype.swift b/head/swift/test/inputs/json/priority/combinations1.json/struct-or-class-class--238d6c8a12d4/quicktype.swift
index 3aec2b6..29ad52f 100644
--- a/base/swift/test/inputs/json/priority/combinations1.json/struct-or-class-class--238d6c8a12d4/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations1.json/struct-or-class-class--238d6c8a12d4/quicktype.swift
@@ -3120,7 +3120,7 @@ enum Jacutinga: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -3143,7 +3143,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations1.json/support-linux-false--4bd8c552e09a/quicktype.swift b/head/swift/test/inputs/json/priority/combinations1.json/support-linux-false--4bd8c552e09a/quicktype.swift
index 0f7ba3b..55d7a04 100644
--- a/base/swift/test/inputs/json/priority/combinations1.json/support-linux-false--4bd8c552e09a/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations1.json/support-linux-false--4bd8c552e09a/quicktype.swift
@@ -2776,7 +2776,7 @@ enum Jacutinga: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     if #available(iOS 10.0, OSX 10.12, tvOS 10.0, watchOS 3.0, *) {
         decoder.dateDecodingStrategy = .iso8601
@@ -2784,7 +2784,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     if #available(iOS 10.0, OSX 10.12, tvOS 10.0, watchOS 3.0, *) {
         encoder.dateEncodingStrategy = .iso8601
diff --git a/base/swift/test/inputs/json/priority/combinations2.json/access-level-internal--a653a863c206/quicktype.swift b/head/swift/test/inputs/json/priority/combinations2.json/access-level-internal--a653a863c206/quicktype.swift
index 342cfc0..dce76d2 100644
--- a/base/swift/test/inputs/json/priority/combinations2.json/access-level-internal--a653a863c206/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations2.json/access-level-internal--a653a863c206/quicktype.swift
@@ -2540,7 +2540,7 @@ enum Shakespearolater: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -2563,7 +2563,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations2.json/access-level-public--bc6fc37ec004/quicktype.swift b/head/swift/test/inputs/json/priority/combinations2.json/access-level-public--bc6fc37ec004/quicktype.swift
index efefefd..8ad53d3 100644
--- a/base/swift/test/inputs/json/priority/combinations2.json/access-level-public--bc6fc37ec004/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations2.json/access-level-public--bc6fc37ec004/quicktype.swift
@@ -2818,7 +2818,7 @@ public enum Shakespearolater: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -2841,7 +2841,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations2.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/combinations2.json/default/quicktype.swift
index 342cfc0..dce76d2 100644
--- a/base/swift/test/inputs/json/priority/combinations2.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations2.json/default/quicktype.swift
@@ -2540,7 +2540,7 @@ enum Shakespearolater: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -2563,7 +2563,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations2.json/density-dense--3bfb4c22cfd0/quicktype.swift b/head/swift/test/inputs/json/priority/combinations2.json/density-dense--3bfb4c22cfd0/quicktype.swift
index 1c7d930..4c29138 100644
--- a/base/swift/test/inputs/json/priority/combinations2.json/density-dense--3bfb4c22cfd0/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations2.json/density-dense--3bfb4c22cfd0/quicktype.swift
@@ -2242,7 +2242,7 @@ enum Shakespearolater: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -2265,7 +2265,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations2.json/protocol-equatable--bd9068f466c1/quicktype.swift b/head/swift/test/inputs/json/priority/combinations2.json/protocol-equatable--bd9068f466c1/quicktype.swift
index 2358f25..6c8940f 100644
--- a/base/swift/test/inputs/json/priority/combinations2.json/protocol-equatable--bd9068f466c1/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations2.json/protocol-equatable--bd9068f466c1/quicktype.swift
@@ -2606,7 +2606,7 @@ enum Shakespearolater: Codable, Equatable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -2629,7 +2629,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations2.json/struct-or-class-class--238d6c8a12d4/quicktype.swift b/head/swift/test/inputs/json/priority/combinations2.json/struct-or-class-class--238d6c8a12d4/quicktype.swift
index 55d9e04..1bddf92 100644
--- a/base/swift/test/inputs/json/priority/combinations2.json/struct-or-class-class--238d6c8a12d4/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations2.json/struct-or-class-class--238d6c8a12d4/quicktype.swift
@@ -2829,7 +2829,7 @@ enum Shakespearolater: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -2852,7 +2852,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations2.json/support-linux-false--4bd8c552e09a/quicktype.swift b/head/swift/test/inputs/json/priority/combinations2.json/support-linux-false--4bd8c552e09a/quicktype.swift
index 1524b2f..f250192 100644
--- a/base/swift/test/inputs/json/priority/combinations2.json/support-linux-false--4bd8c552e09a/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations2.json/support-linux-false--4bd8c552e09a/quicktype.swift
@@ -2540,7 +2540,7 @@ enum Shakespearolater: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     if #available(iOS 10.0, OSX 10.12, tvOS 10.0, watchOS 3.0, *) {
         decoder.dateDecodingStrategy = .iso8601
@@ -2548,7 +2548,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     if #available(iOS 10.0, OSX 10.12, tvOS 10.0, watchOS 3.0, *) {
         encoder.dateEncodingStrategy = .iso8601
diff --git a/base/swift/test/inputs/json/priority/combinations3.json/access-level-internal--a653a863c206/quicktype.swift b/head/swift/test/inputs/json/priority/combinations3.json/access-level-internal--a653a863c206/quicktype.swift
index 369d48b..6b61f59 100644
--- a/base/swift/test/inputs/json/priority/combinations3.json/access-level-internal--a653a863c206/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations3.json/access-level-internal--a653a863c206/quicktype.swift
@@ -3075,7 +3075,7 @@ enum Protext: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -3098,7 +3098,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations3.json/access-level-public--bc6fc37ec004/quicktype.swift b/head/swift/test/inputs/json/priority/combinations3.json/access-level-public--bc6fc37ec004/quicktype.swift
index 5a51421..3880cf1 100644
--- a/base/swift/test/inputs/json/priority/combinations3.json/access-level-public--bc6fc37ec004/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations3.json/access-level-public--bc6fc37ec004/quicktype.swift
@@ -3457,7 +3457,7 @@ public enum Protext: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -3480,7 +3480,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations3.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/combinations3.json/default/quicktype.swift
index 369d48b..6b61f59 100644
--- a/base/swift/test/inputs/json/priority/combinations3.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations3.json/default/quicktype.swift
@@ -3075,7 +3075,7 @@ enum Protext: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -3098,7 +3098,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations3.json/density-dense--3bfb4c22cfd0/quicktype.swift b/head/swift/test/inputs/json/priority/combinations3.json/density-dense--3bfb4c22cfd0/quicktype.swift
index 5623f87..80cab13 100644
--- a/base/swift/test/inputs/json/priority/combinations3.json/density-dense--3bfb4c22cfd0/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations3.json/density-dense--3bfb4c22cfd0/quicktype.swift
@@ -2622,7 +2622,7 @@ enum Protext: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -2645,7 +2645,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations3.json/protocol-equatable--bd9068f466c1/quicktype.swift b/head/swift/test/inputs/json/priority/combinations3.json/protocol-equatable--bd9068f466c1/quicktype.swift
index 97081df..3e46769 100644
--- a/base/swift/test/inputs/json/priority/combinations3.json/protocol-equatable--bd9068f466c1/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations3.json/protocol-equatable--bd9068f466c1/quicktype.swift
@@ -3165,7 +3165,7 @@ enum Protext: Codable, Equatable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -3188,7 +3188,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations3.json/struct-or-class-class--238d6c8a12d4/quicktype.swift b/head/swift/test/inputs/json/priority/combinations3.json/struct-or-class-class--238d6c8a12d4/quicktype.swift
index 179d334..faddab8 100644
--- a/base/swift/test/inputs/json/priority/combinations3.json/struct-or-class-class--238d6c8a12d4/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations3.json/struct-or-class-class--238d6c8a12d4/quicktype.swift
@@ -3472,7 +3472,7 @@ enum Protext: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -3495,7 +3495,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations3.json/support-linux-false--4bd8c552e09a/quicktype.swift b/head/swift/test/inputs/json/priority/combinations3.json/support-linux-false--4bd8c552e09a/quicktype.swift
index 5b1350b..5bb284e 100644
--- a/base/swift/test/inputs/json/priority/combinations3.json/support-linux-false--4bd8c552e09a/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations3.json/support-linux-false--4bd8c552e09a/quicktype.swift
@@ -3075,7 +3075,7 @@ enum Protext: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     if #available(iOS 10.0, OSX 10.12, tvOS 10.0, watchOS 3.0, *) {
         decoder.dateDecodingStrategy = .iso8601
@@ -3083,7 +3083,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     if #available(iOS 10.0, OSX 10.12, tvOS 10.0, watchOS 3.0, *) {
         encoder.dateEncodingStrategy = .iso8601
diff --git a/base/swift/test/inputs/json/priority/combinations4.json/access-level-internal--a653a863c206/quicktype.swift b/head/swift/test/inputs/json/priority/combinations4.json/access-level-internal--a653a863c206/quicktype.swift
index f73a4d8..55f56e8 100644
--- a/base/swift/test/inputs/json/priority/combinations4.json/access-level-internal--a653a863c206/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations4.json/access-level-internal--a653a863c206/quicktype.swift
@@ -3579,7 +3579,7 @@ extension WrothyClass {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -3602,7 +3602,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations4.json/access-level-public--bc6fc37ec004/quicktype.swift b/head/swift/test/inputs/json/priority/combinations4.json/access-level-public--bc6fc37ec004/quicktype.swift
index 2d5e7e4..2101a2e 100644
--- a/base/swift/test/inputs/json/priority/combinations4.json/access-level-public--bc6fc37ec004/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations4.json/access-level-public--bc6fc37ec004/quicktype.swift
@@ -4017,7 +4017,7 @@ public extension WrothyClass {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -4040,7 +4040,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations4.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/combinations4.json/default/quicktype.swift
index f73a4d8..55f56e8 100644
--- a/base/swift/test/inputs/json/priority/combinations4.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations4.json/default/quicktype.swift
@@ -3579,7 +3579,7 @@ extension WrothyClass {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -3602,7 +3602,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations4.json/density-dense--3bfb4c22cfd0/quicktype.swift b/head/swift/test/inputs/json/priority/combinations4.json/density-dense--3bfb4c22cfd0/quicktype.swift
index 885ad3e..7aa3a87 100644
--- a/base/swift/test/inputs/json/priority/combinations4.json/density-dense--3bfb4c22cfd0/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations4.json/density-dense--3bfb4c22cfd0/quicktype.swift
@@ -3049,7 +3049,7 @@ extension WrothyClass {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -3072,7 +3072,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations4.json/protocol-equatable--bd9068f466c1/quicktype.swift b/head/swift/test/inputs/json/priority/combinations4.json/protocol-equatable--bd9068f466c1/quicktype.swift
index adf82bf..d7bf05d 100644
--- a/base/swift/test/inputs/json/priority/combinations4.json/protocol-equatable--bd9068f466c1/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations4.json/protocol-equatable--bd9068f466c1/quicktype.swift
@@ -3681,7 +3681,7 @@ extension WrothyClass {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -3704,7 +3704,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations4.json/struct-or-class-class--238d6c8a12d4/quicktype.swift b/head/swift/test/inputs/json/priority/combinations4.json/struct-or-class-class--238d6c8a12d4/quicktype.swift
index e5db143..f68bf2d 100644
--- a/base/swift/test/inputs/json/priority/combinations4.json/struct-or-class-class--238d6c8a12d4/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations4.json/struct-or-class-class--238d6c8a12d4/quicktype.swift
@@ -4034,7 +4034,7 @@ extension WrothyClass {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -4057,7 +4057,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/combinations4.json/support-linux-false--4bd8c552e09a/quicktype.swift b/head/swift/test/inputs/json/priority/combinations4.json/support-linux-false--4bd8c552e09a/quicktype.swift
index 967e80f..6d878e5 100644
--- a/base/swift/test/inputs/json/priority/combinations4.json/support-linux-false--4bd8c552e09a/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combinations4.json/support-linux-false--4bd8c552e09a/quicktype.swift
@@ -3579,7 +3579,7 @@ extension WrothyClass {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     if #available(iOS 10.0, OSX 10.12, tvOS 10.0, watchOS 3.0, *) {
         decoder.dateDecodingStrategy = .iso8601
@@ -3587,7 +3587,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     if #available(iOS 10.0, OSX 10.12, tvOS 10.0, watchOS 3.0, *) {
         encoder.dateEncodingStrategy = .iso8601
diff --git a/base/swift/test/inputs/json/priority/combined-enum.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/combined-enum.json/default/quicktype.swift
index 28d68a5..976d950 100644
--- a/base/swift/test/inputs/json/priority/combined-enum.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/combined-enum.json/default/quicktype.swift
@@ -105,7 +105,7 @@ enum X: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -128,7 +128,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/direct-recursive.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/direct-recursive.json/default/quicktype.swift
index 840d49c..e5d38c0 100644
--- a/base/swift/test/inputs/json/priority/direct-recursive.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/direct-recursive.json/default/quicktype.swift
@@ -76,7 +76,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -99,7 +99,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/empty-enum.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/empty-enum.json/default/quicktype.swift
index 94df8a7..9bd705d 100644
--- a/base/swift/test/inputs/json/priority/empty-enum.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/empty-enum.json/default/quicktype.swift
@@ -95,7 +95,7 @@ extension Foo {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -118,7 +118,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/identifiers.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/identifiers.json/default/quicktype.swift
index 569aaef..f5d926b 100644
--- a/base/swift/test/inputs/json/priority/identifiers.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/identifiers.json/default/quicktype.swift
@@ -340,7 +340,7 @@ extension EmptyClass {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -363,7 +363,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/issue2680-object-array.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/issue2680-object-array.json/default/quicktype.swift
index c1cd355..f09b01f 100644
--- a/base/swift/test/inputs/json/priority/issue2680-object-array.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/issue2680-object-array.json/default/quicktype.swift
@@ -78,7 +78,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -101,7 +101,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/issue2680-scalar-array.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/issue2680-scalar-array.json/default/quicktype.swift
index 555de64..4768fb0 100644
--- a/base/swift/test/inputs/json/priority/issue2680-scalar-array.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/issue2680-scalar-array.json/default/quicktype.swift
@@ -33,7 +33,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -56,7 +56,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/keywords.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/keywords.json/default/quicktype.swift
index 6fbe6da..6c7b82c 100644
--- a/base/swift/test/inputs/json/priority/keywords.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/keywords.json/default/quicktype.swift
@@ -13683,7 +13683,7 @@ extension Yield {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -13706,7 +13706,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/quicktype.swift
index 61722bc..46e98e6 100644
--- a/base/swift/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/quicktype.swift
@@ -83,7 +83,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -106,7 +106,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/list.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/list.json/default/quicktype.swift
index f1c4f79..f884a35 100644
--- a/base/swift/test/inputs/json/priority/list.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/list.json/default/quicktype.swift
@@ -61,7 +61,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -84,7 +84,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/name-style.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/name-style.json/default/quicktype.swift
index db00c2c..c79a309 100644
--- a/base/swift/test/inputs/json/priority/name-style.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/name-style.json/default/quicktype.swift
@@ -75,7 +75,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -98,7 +98,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/nbl-stats.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/nbl-stats.json/default/quicktype.swift
index 70ca04e..6e6cb2f 100644
--- a/base/swift/test/inputs/json/priority/nbl-stats.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/nbl-stats.json/default/quicktype.swift
@@ -1555,7 +1555,7 @@ extension Totallds {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -1578,7 +1578,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/nested-objects.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/nested-objects.json/default/quicktype.swift
index 7da09ab..73ecc38 100644
--- a/base/swift/test/inputs/json/priority/nested-objects.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/nested-objects.json/default/quicktype.swift
@@ -55,7 +55,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -78,7 +78,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/number-map.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/number-map.json/default/quicktype.swift
index 3e6b743..fe30c66 100644
--- a/base/swift/test/inputs/json/priority/number-map.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/number-map.json/default/quicktype.swift
@@ -51,7 +51,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -74,7 +74,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/omit-empty.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/omit-empty.json/default/quicktype.swift
index 3698781..7b64fd9 100644
--- a/base/swift/test/inputs/json/priority/omit-empty.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/omit-empty.json/default/quicktype.swift
@@ -99,7 +99,7 @@ extension Result {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -122,7 +122,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/optional-union.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/optional-union.json/default/quicktype.swift
index 86d51be..734c737 100644
--- a/base/swift/test/inputs/json/priority/optional-union.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/optional-union.json/default/quicktype.swift
@@ -106,7 +106,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -129,7 +129,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/php-mixed-union.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/php-mixed-union.json/default/quicktype.swift
index b316c50..42eaa93 100644
--- a/base/swift/test/inputs/json/priority/php-mixed-union.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/php-mixed-union.json/default/quicktype.swift
@@ -144,7 +144,7 @@ extension MixedClass {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -167,7 +167,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/php-validation.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/php-validation.json/default/quicktype.swift
index 6b97490..4c05e26 100644
--- a/base/swift/test/inputs/json/priority/php-validation.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/php-validation.json/default/quicktype.swift
@@ -67,7 +67,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -90,7 +90,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/recursive.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/recursive.json/default/quicktype.swift
index 5e27451..b08cc63 100644
--- a/base/swift/test/inputs/json/priority/recursive.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/recursive.json/default/quicktype.swift
@@ -975,7 +975,7 @@ extension FormatsClass {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -998,7 +998,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/simple-identifiers.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/simple-identifiers.json/default/quicktype.swift
index 6bbe16b..1523cf2 100644
--- a/base/swift/test/inputs/json/priority/simple-identifiers.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/simple-identifiers.json/default/quicktype.swift
@@ -83,7 +83,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -106,7 +106,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/union-constructor-clash.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/union-constructor-clash.json/default/quicktype.swift
index 63cd9da..380980c 100644
--- a/base/swift/test/inputs/json/priority/union-constructor-clash.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/union-constructor-clash.json/default/quicktype.swift
@@ -127,7 +127,7 @@ enum Union: Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -150,7 +150,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/unions.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/unions.json/default/quicktype.swift
index 89a73aa..e0a90f8 100644
--- a/base/swift/test/inputs/json/priority/unions.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/unions.json/default/quicktype.swift
@@ -173,7 +173,7 @@ extension ZClass {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -196,7 +196,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/url.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/url.json/default/quicktype.swift
index b256791..3be3188 100644
--- a/base/swift/test/inputs/json/priority/url.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/url.json/default/quicktype.swift
@@ -55,7 +55,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -78,7 +78,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/priority/uuids.json/default/quicktype.swift b/head/swift/test/inputs/json/priority/uuids.json/default/quicktype.swift
index 0525c6d..2e8c5bc 100644
--- a/base/swift/test/inputs/json/priority/uuids.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/priority/uuids.json/default/quicktype.swift
@@ -71,7 +71,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -94,7 +94,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/samples/bitcoin-block.json/default/quicktype.swift b/head/swift/test/inputs/json/samples/bitcoin-block.json/default/quicktype.swift
index 62e16f3..b3cb5de 100644
--- a/base/swift/test/inputs/json/samples/bitcoin-block.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/samples/bitcoin-block.json/default/quicktype.swift
@@ -67,7 +67,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -90,7 +90,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/samples/getting-started.json/default/quicktype.swift b/head/swift/test/inputs/json/samples/getting-started.json/default/quicktype.swift
index 443e3ee..6ecb4c9 100644
--- a/base/swift/test/inputs/json/samples/getting-started.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/samples/getting-started.json/default/quicktype.swift
@@ -55,7 +55,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -78,7 +78,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/samples/github-events.json/default/quicktype.swift b/head/swift/test/inputs/json/samples/github-events.json/default/quicktype.swift
index 8350465..a19dfd4 100644
--- a/base/swift/test/inputs/json/samples/github-events.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/samples/github-events.json/default/quicktype.swift
@@ -1659,7 +1659,7 @@ extension Array where Element == TopLevel.Element {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -1682,7 +1682,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/samples/kitchen-sink.json/default/quicktype.swift b/head/swift/test/inputs/json/samples/kitchen-sink.json/default/quicktype.swift
index f8f8e0d..5765852 100644
--- a/base/swift/test/inputs/json/samples/kitchen-sink.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/samples/kitchen-sink.json/default/quicktype.swift
@@ -310,7 +310,7 @@ extension PurplePerson {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -333,7 +333,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/samples/pokedex.json/default/quicktype.swift b/head/swift/test/inputs/json/samples/pokedex.json/default/quicktype.swift
index d0c2b24..084cef7 100644
--- a/base/swift/test/inputs/json/samples/pokedex.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/samples/pokedex.json/default/quicktype.swift
@@ -236,7 +236,7 @@ enum TypeElement: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -259,7 +259,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/samples/reddit.json/default/quicktype.swift b/head/swift/test/inputs/json/samples/reddit.json/default/quicktype.swift
index 15dd40e..db02817 100644
--- a/base/swift/test/inputs/json/samples/reddit.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/samples/reddit.json/default/quicktype.swift
@@ -788,7 +788,7 @@ enum Kind: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -811,7 +811,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/samples/simple-object.json/default/quicktype.swift b/head/swift/test/inputs/json/samples/simple-object.json/default/quicktype.swift
index 1399153..5662996 100644
--- a/base/swift/test/inputs/json/samples/simple-object.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/samples/simple-object.json/default/quicktype.swift
@@ -59,7 +59,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -82,7 +82,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/samples/simple-object.json/final-classes-true__struct-or-class-class--d3c62ec7414d/quicktype.swift b/head/swift/test/inputs/json/samples/simple-object.json/final-classes-true__struct-or-class-class--d3c62ec7414d/quicktype.swift
index 28290a2..6f3b03d 100644
--- a/base/swift/test/inputs/json/samples/simple-object.json/final-classes-true__struct-or-class-class--d3c62ec7414d/quicktype.swift
+++ b/head/swift/test/inputs/json/samples/simple-object.json/final-classes-true__struct-or-class-class--d3c62ec7414d/quicktype.swift
@@ -66,7 +66,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -89,7 +89,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/samples/simple-object.json/protocol-hashable--739b516c7897/quicktype.swift b/head/swift/test/inputs/json/samples/simple-object.json/protocol-hashable--739b516c7897/quicktype.swift
index c37e495..7214ead 100644
--- a/base/swift/test/inputs/json/samples/simple-object.json/protocol-hashable--739b516c7897/quicktype.swift
+++ b/head/swift/test/inputs/json/samples/simple-object.json/protocol-hashable--739b516c7897/quicktype.swift
@@ -65,7 +65,7 @@ extension TopLevel {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -88,7 +88,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/samples/spotify-album.json/default/quicktype.swift b/head/swift/test/inputs/json/samples/spotify-album.json/default/quicktype.swift
index d271862..cdf501c 100644
--- a/base/swift/test/inputs/json/samples/spotify-album.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/samples/spotify-album.json/default/quicktype.swift
@@ -527,7 +527,7 @@ extension Item {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -550,7 +550,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/samples/us-avg-temperatures.json/default/quicktype.swift b/head/swift/test/inputs/json/samples/us-avg-temperatures.json/default/quicktype.swift
index ead1db9..b3d38b4 100644
--- a/base/swift/test/inputs/json/samples/us-avg-temperatures.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/samples/us-avg-temperatures.json/default/quicktype.swift
@@ -159,7 +159,7 @@ extension Description {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -182,7 +182,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift/test/inputs/json/samples/us-senators.json/default/quicktype.swift b/head/swift/test/inputs/json/samples/us-senators.json/default/quicktype.swift
index 5347beb..69a2500 100644
--- a/base/swift/test/inputs/json/samples/us-senators.json/default/quicktype.swift
+++ b/head/swift/test/inputs/json/samples/us-senators.json/default/quicktype.swift
@@ -459,7 +459,7 @@ enum Title: String, Codable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -482,7 +482,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift-sendable-objective-c/test/inputs/json/samples/pokedex.json/default/quicktype.swift b/head/swift-sendable-objective-c/test/inputs/json/samples/pokedex.json/default/quicktype.swift
index 14a9a73..e60cbbe 100644
--- a/base/swift-sendable-objective-c/test/inputs/json/samples/pokedex.json/default/quicktype.swift
+++ b/head/swift-sendable-objective-c/test/inputs/json/samples/pokedex.json/default/quicktype.swift
@@ -268,7 +268,7 @@ enum TypeElement: String, Codable, Sendable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -291,7 +291,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
diff --git a/base/swift-sendable-objective-c/test/inputs/json/samples/pokedex.json/struct-or-class-struct--aa0cc2601d8a/quicktype.swift b/head/swift-sendable-objective-c/test/inputs/json/samples/pokedex.json/struct-or-class-struct--aa0cc2601d8a/quicktype.swift
index 40c1f09..49e7894 100644
--- a/base/swift-sendable-objective-c/test/inputs/json/samples/pokedex.json/struct-or-class-struct--aa0cc2601d8a/quicktype.swift
+++ b/head/swift-sendable-objective-c/test/inputs/json/samples/pokedex.json/struct-or-class-struct--aa0cc2601d8a/quicktype.swift
@@ -236,7 +236,7 @@ enum TypeElement: String, Codable, Sendable {
 
 // MARK: - Helper functions for creating encoders and decoders
 
-func newJSONDecoder() -> JSONDecoder {
+fileprivate func newJSONDecoder() -> JSONDecoder {
     let decoder = JSONDecoder()
     decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
         let container = try decoder.singleValueContainer()
@@ -259,7 +259,7 @@ func newJSONDecoder() -> JSONDecoder {
     return decoder
 }
 
-func newJSONEncoder() -> JSONEncoder {
+fileprivate func newJSONEncoder() -> JSONEncoder {
     let encoder = JSONEncoder()
     let formatter = DateFormatter()
     formatter.calendar = Calendar(identifier: .iso8601)
