GSOC-Week22 #2
GSOC-Week22 #2
Conversation
- add cases for testSAMJSONSchemaReader() unitTest to pass AWSLambdaDeploymentDescriptorGeneratorTest tests
- removed ArrayItem struct and updated JSONType to adapt to the removal of the struct - added DecodingError to catch error when decoding fails - handled smart decoding of type key inside the JSONType - added more test cases for the SimpleJSONSchemaReader as a refrence to be able to add them later for the JSONSchemaReader - added more keys for the ObjectSchema struct - removed keys from SAMJSONSchema to pass tests on minimal keys - handled one scencario of the anyOf key
| @@ -1,21 +1,69 @@ | |||
| import Foundation | |||
There was a problem hiding this comment.
Now that you don't use regular expressions anymore, I think this can be remove.
| import Foundation | ||
|
|
||
| //MARK: - JSONSchema .. | ||
|
|
||
| struct JSONSchema: Decodable { | ||
| let id: String? | ||
| let schema: String |
There was a problem hiding this comment.
now that you have a type to represent this, you can write
let schema : SchemaVersion
| init(from decoder: Decoder) throws { | ||
| let container = try decoder.container(keyedBy: CodingKeys.self) | ||
| self.id = try container.decodeIfPresent(String.self, forKey: .id) | ||
| self.schema = try container.decode(String.self, forKey: .schema) |
There was a problem hiding this comment.
try to decode as a SchemaVersion type instead of a string
This will require to add an init(from:) method on SchemaVersion
Hint : this init(from:) will use a singleValue Container
public init(from decoder: any Decoder) throws {
let container = try decoder.singleValueContainer()
...
| let container = try decoder.container(keyedBy: CodingKeys.self) | ||
| self.id = try container.decodeIfPresent(String.self, forKey: .id) | ||
| self.schema = try container.decode(String.self, forKey: .schema) | ||
| guard schema == SchemaVersion.draft4.rawValue else { |
There was a problem hiding this comment.
Once the change of type is done, you can further simplify this test
guard schema == .draft4 else {
...
|
|
||
|
|
||
|
|
||
|
|
There was a problem hiding this comment.
This deserves a few comments to explain the dance you're doing here, doesn't it ?
| let container = try decoder.singleValueContainer() | ||
| let jsonType = try container.decode(JSONType.self) | ||
| self = .type(jsonType) | ||
| do { |
| } | ||
|
|
||
| return jsonType | ||
| } | ||
|
|
There was a problem hiding this comment.
To be consistent with the above function, maybe we can add helper functions to also extract the all and any values.
Something like
public func any() -> [JSONType]? {
guard case .anyOf(let anyOf) = self else {
fatalError("not an anyOf")
}
return anyOf
}
public func all() -> [JSONUnionType]? {
guard case .allOf(let allOf) = self else {
fatalError("not an allOf")
}
return allOf
}
| } | ||
|
|
| } else { | ||
| self.subSchema = nil | ||
| } | ||
|
|
There was a problem hiding this comment.
too many empty lines here.
Maybe you can you swiftformat command to reformat the code (there is a configuration file .swiftformat in the project directory)
Modifications on JSONSchemaReader based on example provided