Merge pull request #809 from jimmya/feature/allow-omiting-of-main-let

Allow main let to not be generated by providing omit-main-let flag

Author: tomlokhorst

Sources/rswift/App.swift

@@ -49,6 +49,9 @@ 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)")
@@ -103,6 +106,7 @@ extension App {
                 productModuleName: productModuleName,
                 infoPlistFile: infoPlistFile.map(URL.init(fileURLWithPath:)),
                 codeSignEntitlements: codeSignEntitlements.map(URL.init(fileURLWithPath:)),
+                omitMainLet: globals.omitMainLet,
                 rswiftIgnoreURL: rswiftIgnoreURL,
                 sourceTreeURLs: sourceTreeURLs
             )

Sources/rswift/RswiftCore.swift

@@ -35,6 +35,7 @@ public struct RswiftCore {
     let productModuleName: String?
     let infoPlistFile: URL?
     let codeSignEntitlements: URL?
+    let omitMainLet: Bool
 
     let sourceTreeURLs: SourceTreeURLs
 
@@ -49,6 +50,7 @@ public struct RswiftCore {
         productModuleName: String?,
         infoPlistFile: URL?,
         codeSignEntitlements: URL?,
+        omitMainLet: Bool,
         rswiftIgnoreURL: URL,
         sourceTreeURLs: SourceTreeURLs
     ) {
@@ -60,6 +62,7 @@ public struct RswiftCore {
         self.productModuleName = productModuleName
         self.infoPlistFile = infoPlistFile
         self.codeSignEntitlements = codeSignEntitlements
+        self.omitMainLet = omitMainLet
 
         self.rswiftIgnoreURL = rswiftIgnoreURL
 
@@ -295,29 +298,28 @@ public struct RswiftCore {
             .map { "import \($0)" }
             .joined(separator: "\n")
 
-        let mainLet: String
-        switch bundleSource {
-        case .module:
+        let mainLet: String?
+        switch (bundleSource, omitMainLet) {
+        case (.module, false):
             mainLet = "\(accessLevel == .publicLevel ? "public " : "")let R = _R(bundle: Bundle.module)"
-        case .finder:
+        case (.finder, false):
             mainLet = """
-                private class BundleFinder {}
-                \(accessLevel == .publicLevel ? "public " : "")let R = _R(bundle: Bundle(for: BundleFinder.self))
-                """
+            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 = """
         //
         // This is a generated file, do not edit!
         // Generated by R.swift, see https://github.com/mac-cain13/R.swift
         //
 
-        \(imports)
-
-        \(mainLet)
-
-        \(str)
+        \(body)
         """
 
         try writeIfChanged(contents: code, toURL: outputURL)