Fixed build on Xcode 26.4

commit_hash:003f63688a2a0d33a0e8f84680d3982ecace7ece
This commit is contained in:
booster
2026-04-01 15:31:46 +03:00
parent a6d1a13d70
commit e42c9e24fe
6 changed files with 13 additions and 11 deletions
@@ -89,8 +89,6 @@ class DivanGenerator(Generator):
if with_factory_methods:
def add_methods_declarations(ent: DivanEntity):
nonlocal result_declaration
def add_declaration(comment_block: Text, declaration: Text):
nonlocal result_declaration
if not declaration.lines:
@@ -933,8 +933,8 @@ class SwiftEntityEnumeration(EntityEnumeration):
result = Text(f'private static func resolveUnknownValue({params}) -> {return_type} {{')
if self.default_entity_declaration:
default_type = utils.capitalize_camel_case(self.default_entity_declaration)
result += f' let type = (context.templateData["type"] as? String ?? {default_type}.type)'
result += ' .flatMap { context.templateToType[$0] ?? $0 } '
result += f' let raw = context.templateData["type"] as? String ?? {default_type}.type'
result += ' let type = context.templateToType[raw] ?? raw'
else:
result += ' guard let type = (context.templateData["type"] as? String).flatMap({ context.templateToType[$0] ?? $0 }) else {'
result += ' return .failure(NonEmptyArray(.requiredFieldIsMissing(field: "type")))'
@@ -65,8 +65,8 @@ public enum EnumWithDefaultTypeTemplate: TemplateValue, Sendable {
}
private static func resolveUnknownValue(context: TemplatesContext, useOnlyLinks: Bool) -> DeserializationResult<EnumWithDefaultType> {
let type = (context.templateData["type"] as? String ?? WithDefault.type)
.flatMap { context.templateToType[$0] ?? $0 }
let raw = context.templateData["type"] as? String ?? WithDefault.type
let type = context.templateToType[raw] ?? raw
return {
var result: DeserializationResult<EnumWithDefaultType>?
@@ -212,9 +212,13 @@ public final class ExpressionResolver {
return nil
}
private func resolveStringBasedLink<String>(_ link: ExpressionLink<String>) -> String? {
resolveStringBasedLink(link, initializer: { $0 as? String })
}
private func resolveStringBasedLink<T>(
_ link: ExpressionLink<T>,
initializer: (String) -> T? = { $0 }
initializer: (String) -> T?
) -> T? {
var stringValue = ""
for item in link.items {
@@ -65,8 +65,8 @@ public enum DivPivotTemplate: TemplateValue, Sendable {
}
private static func resolveUnknownValue(context: TemplatesContext, useOnlyLinks: Bool) -> DeserializationResult<DivPivot> {
let type = (context.templateData["type"] as? String ?? DivPivotFixed.type)
.flatMap { context.templateToType[$0] ?? $0 }
let raw = context.templateData["type"] as? String ?? DivPivotFixed.type
let type = context.templateToType[raw] ?? raw
return {
var result: DeserializationResult<DivPivot>?
@@ -68,8 +68,8 @@ public enum EnumWithDefaultTypeTemplate: TemplateValue, Sendable {
}
private static func resolveUnknownValue(context: TemplatesContext, useOnlyLinks: Bool) -> DeserializationResult<EnumWithDefaultType> {
let type = (context.templateData["type"] as? String ?? WithDefault.type)
.flatMap { context.templateToType[$0] ?? $0 }
let raw = context.templateData["type"] as? String ?? WithDefault.type
let type = context.templateToType[raw] ?? raw
return {
var result: DeserializationResult<EnumWithDefaultType>?