diff --git a/Sources/ResgenSwift/Fonts/FontsToolError.swift b/Sources/ResgenSwift/Fonts/FontsToolError.swift index fc2a464..d553cd3 100644 --- a/Sources/ResgenSwift/Fonts/FontsToolError.swift +++ b/Sources/ResgenSwift/Fonts/FontsToolError.swift @@ -14,7 +14,7 @@ enum FontsToolError: Error { case fileNotExists(String) case writeExtension(String, String) - var localizedDescription: String { + var description: String { switch self { case .extensionNamesCollision(let extensionName): return "error: [\(Fonts.toolName)] Error on extension names, extension name and SwiftUI extension name should be different (\(extensionName) is used on both)" diff --git a/Sources/ResgenSwift/Generate/Generate.swift b/Sources/ResgenSwift/Generate/Generate.swift index 29931b6..8902545 100644 --- a/Sources/ResgenSwift/Generate/Generate.swift +++ b/Sources/ResgenSwift/Generate/Generate.swift @@ -45,14 +45,14 @@ struct Generate: ParsableCommand { ArchitectureGenerator.writeArchitecture(architecture) } -// // Execute commands -// configuration.runnableConfigurations -// .forEach { -// let begin = Date() -// $0.run(projectDirectory: options.projectDirectory, -// force: options.forceGeneration) -// print("Took: \(Date().timeIntervalSince(begin))s\n") -// } + // Execute commands + configuration.runnableConfigurations + .forEach { + let begin = Date() + $0.run(projectDirectory: options.projectDirectory, + force: options.forceGeneration) + print("Took: \(Date().timeIntervalSince(begin))s\n") + } print("[\(Self.toolName)] Resgen ended") } diff --git a/Sources/ResgenSwift/Generate/GenerateError.swift b/Sources/ResgenSwift/Generate/GenerateError.swift index 9f22c91..2ebc045 100644 --- a/Sources/ResgenSwift/Generate/GenerateError.swift +++ b/Sources/ResgenSwift/Generate/GenerateError.swift @@ -13,7 +13,7 @@ enum GenerateError: Error { case commandError([String], String) case writeFile(String, String) - var localizedDescription: String { + var description: String { switch self { case .fileNotExists(let filename): return "error: [\(Generate.toolName)] File \(filename) does not exists" diff --git a/Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift b/Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift index d962db3..9cf8c47 100644 --- a/Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift +++ b/Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift @@ -45,18 +45,18 @@ struct ConfigurationArchitecture: Codable { let path: String? let children: [ConfigurationArchitecture]? - func getProperty() -> String { - " static let \(property) = \(classname)()" + func getProperty(isStatic: Bool) -> String { + " \(isStatic ? "static " : "")let \(property) = \(classname)()" } - func getClass() -> String { + func getClass(generateStaticProperty: Bool = true) -> String { guard children?.isEmpty == false else { return "class \(classname) {}" } let classDefinition = [ "class \(classname) {", - children?.map { $0.getProperty() }.joined(separator: "\n"), + children?.map { $0.getProperty(isStatic: generateStaticProperty) }.joined(separator: "\n"), "}" ] .compactMap { $0 } @@ -70,7 +70,7 @@ struct ConfigurationArchitecture: Codable { func getSubclass() -> String? { guard let children else { return nil } return children.compactMap { arch in - arch.getClass() + arch.getClass(generateStaticProperty: false) } .joined(separator: "\n\n") } diff --git a/Sources/ResgenSwift/Images/ImagesError.swift b/Sources/ResgenSwift/Images/ImagesError.swift index 2a65787..8dcbc57 100644 --- a/Sources/ResgenSwift/Images/ImagesError.swift +++ b/Sources/ResgenSwift/Images/ImagesError.swift @@ -18,7 +18,7 @@ enum ImagesError: Error { case createAssetFolder(String) case unknown(String) - var localizedDescription: String { + var description: String { switch self { case .extensionNamesCollision(let extensionName): return "error: [\(Fonts.toolName)] Error on extension names, extension name and SwiftUI extension name should be different (\(extensionName) is used on both)" diff --git a/Sources/ResgenSwift/Strings/Stringium/StringiumError.swift b/Sources/ResgenSwift/Strings/Stringium/StringiumError.swift index 844005d..ba12a82 100644 --- a/Sources/ResgenSwift/Strings/Stringium/StringiumError.swift +++ b/Sources/ResgenSwift/Strings/Stringium/StringiumError.swift @@ -14,7 +14,7 @@ enum StringiumError: Error { case writeFile(String, String) case langNotDefined(String, String, Bool) - var localizedDescription: String { + var description: String { switch self { case .fileNotExists(let filename): return "error: [\(Stringium.toolName)] File \(filename) does not exists " diff --git a/Sources/ResgenSwift/Strings/Twine/TwineError.swift b/Sources/ResgenSwift/Strings/Twine/TwineError.swift index ddf0f0f..82ed17f 100644 --- a/Sources/ResgenSwift/Strings/Twine/TwineError.swift +++ b/Sources/ResgenSwift/Strings/Twine/TwineError.swift @@ -12,7 +12,7 @@ enum TwineError: Error { case langsListEmpty case defaultLangsNotInLangs - var localizedDescription: String { + var description: String { switch self { case .fileNotExists(let filename): return "error: [\(Twine.toolName)] File \(filename) does not exists "