Merge pull request #23 from lvsti/strip-default-values

Strip default values

Author: lvsti

Bridgecraft/GenerateCommand.swift

@@ -11,15 +11,17 @@ import SourceKittenFramework
 import XcodeEdit
 
 extension GenerateCommand {
-    static func execute(verbose: Bool,
-                        assumeNonnull: Bool,
+    static func execute(assumeNonnull: Bool,
+                        keepDefaults: Bool,
+                        verbose: Bool,
                         sdkOverride: [String],
                         destOverride: [String],
                         outputPath: [String],
                         origProjectPath: String,
                         targetName: String) {
-        let cmd = GenerateCommand(verbose: verbose,
-                                  assumeNonnull: assumeNonnull,
+        let cmd = GenerateCommand(assumeNonnull: assumeNonnull,
+                                  keepDefaults: keepDefaults,
+                                  verbose: verbose,
                                   sdkOverride: sdkOverride,
                                   destOverride: destOverride,
                                   outputPath: outputPath,
@@ -36,21 +38,24 @@ struct GenerateCommand {
     private let preprocessedURL: URL
     private let outputFileURL: URL?
 
-    private let verbose: Bool
     private let assumeNonnull: Bool
+    private let keepDefaults: Bool
+    private let verbose: Bool
     private let sdkOverride: String?
     private let destOverride: String?
     private let targetName: String
 
-    init(verbose: Bool,
-         assumeNonnull: Bool,
+    init(assumeNonnull: Bool,
+         keepDefaults: Bool,
+         verbose: Bool,
          sdkOverride: [String],
          destOverride: [String],
          outputPath: [String],
          origProjectPath: String,
          targetName: String) {
-        self.verbose = verbose
         self.assumeNonnull = assumeNonnull
+        self.keepDefaults = keepDefaults
+        self.verbose = verbose
         self.sdkOverride = sdkOverride.first
         self.destOverride = destOverride.first
         self.targetName = targetName
@@ -102,11 +107,14 @@ struct GenerateCommand {
             // generate interface with sourcekitten
             let interface = try generateSwiftInterface(withCompilerFlags: compilerFlags)
 
+            // strip default values
+            let cleanedInterface = keepDefaults ? interface : stripDefaultValues(from: interface)
+            
             // clean up
             cleanUp()
 
             // write results
-            try writeGeneratedInterfaceToFile(interface: interface)
+            try writeGeneratedInterfaceToFile(interface: cleanedInterface)
         }
         catch {
             // clean up
@@ -350,6 +358,10 @@ struct GenerateCommand {
         return srcText
     }
 
+    private func stripDefaultValues(from interface: String) -> String {
+        return interface.replacingOccurrences(of: " = nil", with: "")
+    }
+    
     private func writeGeneratedInterfaceToFile(interface: String) throws {
         let header =
             """

Bridgecraft/main.swift

@@ -12,8 +12,9 @@ import Foundation
 let version = "0.3.0"
 
 let generate = command(
-    Flag("verbose", description: "outputs all terminal commands and their results"),
     Flag("assume-nonnull", description: "assume that all headers have been audited for nullability"),
+    Flag("keep-defaults", description: "do not strip default values (typically in the form of '= nil') from the generated header"),
+    Flag("verbose", description: "outputs all terminal commands and their results"),
     Options<String>("sdk", default: [], count: 1, description: "override the SDK used for the build (see xcodebuild -sdk)"),
     Options<String>("destination", default: [], count: 1, description: "override the destination device used for the build (see xcodebuild -destination)"),
     Options<String>("output", default: [], flag: "o", count: 1, description: "write the generated interface into the given file instead of the standard output"),