Unnest and pull bundle into a private let (#29)

kaandedeoglu · Apr 12, 2021 · ec1b7b0 · ec1b7b0
1 parent 873063e
commit ec1b7b0
Showing 1 changed file with 27 additions and 12 deletions.
diff --git a/Sources/Shark/SharkEnumBuilder.swift b/Sources/Shark/SharkEnumBuilder.swift
@@ -1,6 +1,6 @@
 enum SharkEnumBuilder {
     private static let bundleString = """
-        private static let bundle: Bundle = {
+        private let bundle: Bundle = {
             class Custom {}
             return Bundle(for: Custom.self)
         }()
@@ -16,25 +16,40 @@ enum SharkEnumBuilder {
 
         let declarationIndendationLevel = options.topLevelScope ? 0 : 1
         let resourcesEnumsString = [imagesString, colorsString, fontsString, localizationsString]
-            .compactMap { $0 }
+            .compactMap({ $0?.indented(withLevel: declarationIndendationLevel) })
             .joined(separator: "\n\n")
 
-        // bundleString + the I, C, F, L enums if present
-        let declarations = """
+//        // bundleString + the I, C, F, L enums if present
+//        let declarations = """
+//        \(bundleString)
+//
+//        \(resourcesEnumsString)
+//        """
+//            .indented(withLevel: declarationIndendationLevel)
+//
+//        if options.topLevelScope {
+//            return declarations
+//        } else {
+//            return """
+//        public enum \(options.topLevelEnumName) {
+//        \(declarations)
+//        }
+//        """
+//        }
+//
+        var result = """
         \(bundleString)
 
-        \(resourcesEnumsString)
+
         """
-            .indented(withLevel: declarationIndendationLevel)
 
         if options.topLevelScope {
-            return declarations
+            result.append(resourcesEnumsString)
         } else {
-            return """
-        public enum \(options.topLevelEnumName) {
-        \(declarations)
-        }
-        """
+            result.append("public enum \(options.topLevelEnumName) {\n")
+            result.append(resourcesEnumsString)
+            result.append("\n}")
         }
+        return result
     }
 }