GitHub/divkit
1
0
Fork 0
mirror of https://github.com/divkit/divkit.git synced 2026-05-07 20:02:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed string arrays parsing

Browse Source
This commit is contained in:
pkurchatov
2023-03-27 16:49:09 +03:00
parent b368925b57
commit c91c8a1d3c
9 changed files with 145 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ios/DivKit.xcodeproj/project.pbxproj
+4
View File
@@ -198,6 +198,7 @@
8CB960E828883B9A00D16E47 /* FunctionSignaturesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB960E728883B9A00D16E47 /* FunctionSignaturesTests.swift */; };
8CD1521028CF217B0061128B /* ExpressionResolverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1520F28CF217B0061128B /* ExpressionResolverTests.swift */; };
8CDC72E928AA522F008F1925 /* template_test_data in Resources */ = {isa = PBXBuildFile; fileRef = 8CDC72E828AA522F008F1925 /* template_test_data */; };
8CE6934F29D1A70E001FC8BA /* ArrayOfEnums.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CE6934E29D1A70E001FC8BA /* ArrayOfEnums.swift */; };
8CF1296128B0018E00351F65 /* UrlInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF1296028B0018E00351F65 /* UrlInputView.swift */; };
8CF1296328B0021F00351F65 /* UserPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF1296228B0021F00351F65 /* UserPreferences.swift */; };
8CF1296528B0036F00351F65 /* Themes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF1296428B0036F00351F65 /* Themes.swift */; };
@@ -440,6 +441,7 @@
8CB960E728883B9A00D16E47 /* FunctionSignaturesTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FunctionSignaturesTests.swift; sourceTree = "<group>"; };
8CD1520F28CF217B0061128B /* ExpressionResolverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpressionResolverTests.swift; sourceTree = "<group>"; };
8CDC72E828AA522F008F1925 /* template_test_data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = template_test_data; path = ../../../test_data/template_test_data; sourceTree = "<group>"; };
8CE6934E29D1A70E001FC8BA /* ArrayOfEnums.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayOfEnums.swift; sourceTree = "<group>"; };
8CF1296028B0018E00351F65 /* UrlInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UrlInputView.swift; sourceTree = "<group>"; };
8CF1296228B0021F00351F65 /* UserPreferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPreferences.swift; sourceTree = "<group>"; };
8CF1296428B0036F00351F65 /* Themes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Themes.swift; sourceTree = "<group>"; };
@@ -672,6 +674,7 @@
8CDC72E828AA522F008F1925 /* template_test_data */,
8C1CF661286B5A3A0016D0A1 /* generated_sources */,
8C1CF643286B58A70016D0A1 /* generator_config.json */,
8CE6934E29D1A70E001FC8BA /* ArrayOfEnums.swift */,
8C1CF64A286B58A70016D0A1 /* ArrayOfNestedItemsTests.swift */,
8C1CF645286B58A70016D0A1 /* ArrayTests.swift */,
8C1CF640286B58A70016D0A1 /* ArrayWithTransformTests.swift */,
@@ -1521,6 +1524,7 @@
8C1CF65B286B58A70016D0A1 /* StrictArrayTests.swift in Sources */,
8C1CF691286B5A3B0016D0A1 /* Entity.swift in Sources */,
8C1CF659286B58A70016D0A1 /* Expected.swift in Sources */,
8CE6934F29D1A70E001FC8BA /* ArrayOfEnums.swift in Sources */,
8C1CF69D286B5A3B0016D0A1 /* EntityTemplate.swift in Sources */,
8C1CF69E286B5A3B0016D0A1 /* EntityWithOptionalComplexProperty.swift in Sources */,
8C1CF699286B5A3B0016D0A1 /* EntityWithComplexPropertyWithDefaultValueTemplate.swift in Sources */,
client/ios/Serialization/ValueDeserialization.swift
+31
View File
@@ -59,6 +59,37 @@ public func deserialize<T: ValidSerializationValue, U>(
return result
}
@inlinable
public func deserialize<T: ValidSerializationValue>(
_ value: Any,
validator: AnyArrayValueValidator<T>? = nil
) -> DeserializationResult<[T]> {
deserialize(value, transform: { $0 } as ((T) -> T?), validator: validator)
}
@inlinable
public func deserialize<T: RawRepresentable>(
_ value: Any,
validator: AnyArrayValueValidator<T>? = nil
) -> DeserializationResult<[T]> where T.RawValue: ValidSerializationValue {
deserialize(value, transform: T.init, validator: validator)
}
@inlinable
public func deserialize<T: ValidSerializationValue, U>(
_ value: Any,
transform: (T) -> U?,
validator: AnyArrayValueValidator<U>? = nil
) -> DeserializationResult<[U]> {
let transformWithResult: (T) -> DeserializationResult<U> = {
guard let transformed = transform($0) else {
return .failure(NonEmptyArray(.invalidValue(result: nil, value: value)))
}
return .success(transformed)
}
return deserialize(value, transform: transformWithResult, validator: validator)
}
@inlinable
public func deserialize<T: ValidSerializationValue, U>(
_ value: Any,
client/ios/TemplatesSupportTests/ArrayOfEnums.swift
+55
View File
@@ -0,0 +1,55 @@
import XCTest
final class ArrayOfEnumsTests: XCTestCase {
func test_Empty() throws {
let entity = try readEntity("empty")
XCTAssertEqual(entity, nil)
}
func test_Simple() throws {
let entity = try readEntity("simple")
XCTAssertEqual(entity, entityWithTwoItems)
}
func test_SimpleTemplate() throws {
let entity = try readEntity("simple_template")
XCTAssertEqual(entity, entityWithTwoItems)
}
func test_InvalidItem() throws {
let entity = try readEntity("invalid_item")
XCTAssertEqual(entity, entityWithTwoItems)
}
func test_InvalidItemsType() throws {
let entity = try readEntity("invalid_items_type")
XCTAssertEqual(entity, nil)
}
func test_RecurringItems() throws {
let entity = try readEntity("recurring_items")
XCTAssertEqual(
entity,
EntityWithArrayOfEnums(
items: [ .first, .second, .first ]
)
)
}
}
private func readEntity(_ fileName: String) throws -> EntityWithArrayOfEnums? {
try readEntity(
EntityWithArrayOfEnumsTemplate.self,
fileName: "array_of_enums/\(fileName)"
)
}
private let entityWithTwoItems = EntityWithArrayOfEnums(
items: [ .first, .second ]
)
test_data/template_test_data/array_of_enums/empty.json
+6
View File
@@ -0,0 +1,6 @@
{
"entity": {
"type": "entity_with_array_of_enums",
"items": []
}
}
test_data/template_test_data/array_of_enums/invalid_item.json
+10
View File
@@ -0,0 +1,10 @@
{
"entity": {
"type": "entity_with_array_of_enums",
"items": [
"first",
"second",
"third"
]
}
}
test_data/template_test_data/array_of_enums/invalid_items_type.json
+6
View File
@@ -0,0 +1,6 @@
{
"entity": {
"type": "entity_with_array_of_enums",
"items": "first"
}
}
test_data/template_test_data/array_of_enums/recurring_items.json
+10
View File
@@ -0,0 +1,10 @@
{
"entity": {
"type": "entity_with_array_of_enums",
"items": [
"first",
"second",
"first"
]
}
}
test_data/template_test_data/array_of_enums/simple.json
+9
View File
@@ -0,0 +1,9 @@
{
"entity": {
"type": "entity_with_array_of_enums",
"items": [
"first",
"second"
]
}
}
test_data/template_test_data/array_of_enums/simple_template.json
+14
View File
@@ -0,0 +1,14 @@
{
"templates": {
"t_0": {
"type": "entity_with_array_of_enums",
"items": [
"first",
"second"
]
}
},
"entity": {
"type": "t_0"
}
}