Update mainLet code

Author: tomlokhorst

Sources/rswift/App.swift

@@ -34,6 +34,9 @@ struct GlobalOptions: ParsableArguments {
     @Option(help: "Only run specified generators, options: \(generatorsString)", transform: parseGenerators)
     var generators: [ResourceType] = []
 
+    @Flag(help: "Don't generate main `R` let")
+    var omitMainLet = false
+
     @Option(name: .customLong("import", withSingleDash: false), help: "Add extra modules as import in the generated file")
     var imports: [String] = []
 
@@ -49,9 +52,6 @@ struct GlobalOptions: ParsableArguments {
     @Option(help: "Source of default bundle to use")
     var bundleSource: BundleSource = .finder
 
-    @Flag(help: "Don't generate main let")
-    var omitMainLet = false
-
     // MARK: Project specific - Environment variable overrides
 
     @Option(help: "Override environment variable \(EnvironmentKeys.targetName)")

Sources/rswift/RswiftCore.swift

@@ -298,30 +298,29 @@ public struct RswiftCore {
             .map { "import \($0)" }
             .joined(separator: "\n")
 
-        let mainLet: String?
-        switch (bundleSource, omitMainLet) {
-        case (.module, false):
+        let mainLet: String
+        switch bundleSource {
+        case .module:
             mainLet = "\(accessLevel == .publicLevel ? "public " : "")let R = _R(bundle: Bundle.module)"
-        case (.finder, false):
+        case .finder:
             mainLet = """
             private class BundleFinder {}
             \(accessLevel == .publicLevel ? "public " : "")let R = _R(bundle: Bundle(for: BundleFinder.self))
             """
-        default:
-            mainLet = nil
         }
 
-        let str = s.prettyPrint()
-        let body = [imports, mainLet, str].compactMap { $0 }.joined(separator: "\n\n")
-        let code = """
+        let body = s.prettyPrint()
+
+        let header = """
         //
         // This is a generated file, do not edit!
         // Generated by R.swift, see https://github.com/mac-cain13/R.swift
         //
-
-        \(body)
         """
 
+        let parts = [header, imports, omitMainLet ? nil : mainLet, body].compactMap { $0 }
+        let code = parts.joined(separator: "\n\n")
+
         try writeIfChanged(contents: code, toURL: outputURL)
     }
 }