Don't generate empty structs

wedkarz · Jun 7, 2017 · 017907a · 017907a
1 parent 5748879
commit 017907a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/Sources/RswiftCore/Generators/ColorStructGenerator.swift b/Sources/RswiftCore/Generators/ColorStructGenerator.swift
@@ -32,6 +32,7 @@ struct ColorStructGenerator: ExternalOnlyStructGenerator {
 
     let structs = assetSubfolders.folders
       .map { $0.generatedColorStruct(at: externalAccessLevel, prefix: qualifiedName) }
+      .filter { !$0.isEmpty }
 
     let colorLets = groupedColors
       .uniques
@@ -104,6 +105,7 @@ private extension NamespacedAssetSubfolder {
     let qualifiedName = prefix + structName
     let structs = assetSubfolders.folders
       .map { $0.generatedColorStruct(at: externalAccessLevel, prefix: qualifiedName) }
+      .filter { !$0.isEmpty }
 
     let colorLets = groupedFunctions
       .uniques
@@ -119,7 +121,7 @@ private extension NamespacedAssetSubfolder {
     }
 
     return Struct(
-      availables: ["tvOS 11.0, *", "iOS 11.0, *"],
+      availables: [],
       comments: ["This `\(qualifiedName)` struct is generated, and contains static references to \(colorLets.count) colors."],
       accessModifier: externalAccessLevel,
       type: Type(module: .host, name: structName),

diff --git a/Sources/RswiftCore/Generators/ImageStructGenerator.swift b/Sources/RswiftCore/Generators/ImageStructGenerator.swift
@@ -43,6 +43,7 @@ struct ImageStructGenerator: ExternalOnlyStructGenerator {
 
     let structs = assetSubfolders.folders
       .map { $0.generatedImageStruct(at: externalAccessLevel, prefix: qualifiedName) }
+      .filter { !$0.isEmpty }
 
     let imageLets = groupedFunctions
       .uniques
@@ -115,6 +116,7 @@ private extension NamespacedAssetSubfolder {
     let qualifiedName = prefix + structName
     let structs = assetSubfolders.folders
       .map { $0.generatedImageStruct(at: externalAccessLevel, prefix: qualifiedName) }
+      .filter { !$0.isEmpty }
 
     let imageLets = groupedFunctions
       .uniques

diff --git a/Sources/RswiftCore/RswiftCore.swift b/Sources/RswiftCore/RswiftCore.swift
@@ -43,7 +43,7 @@ public struct RswiftCore {
       do {
         let colorPaletteGenerator = ColorPaletteStructGenerator(palettes: resources.colors)
         let colorPaletteGeneratorStruct = colorPaletteGenerator.generatedStructs(at: callInformation.accessLevel, prefix: "")
-        if colorPaletteGeneratorStruct.externalStruct.structs.count > 0 {
+        if !colorPaletteGeneratorStruct.externalStruct.isEmpty {
           generators.append(colorPaletteGenerator)
         }
       }

diff --git a/Sources/RswiftCore/SwiftTypes/Struct.swift b/Sources/RswiftCore/SwiftTypes/Struct.swift
@@ -21,6 +21,13 @@ struct Struct: UsedTypesProvider, SwiftCodeConverible {
   var structs: [Struct]
   var classes: [Class]
 
+  var isEmpty: Bool {
+    return properties.isEmpty
+      && functions.isEmpty
+      && (structs.isEmpty || structs.all { $0.isEmpty })
+      && classes.isEmpty
+  }
+
   var usedTypes: [UsedType] {
     return [
         type.usedTypes,

diff --git a/Sources/RswiftCore/Util/UtilExtensions.swift b/Sources/RswiftCore/Util/UtilExtensions.swift
@@ -32,6 +32,10 @@ extension Sequence {
 
     return groupedBy
   }
+
+  func all(where predicate: (Self.Element) throws -> Bool) rethrows -> Bool {
+    return !(try contains(where: { !(try predicate($0)) }))
+  }
 }
 
 extension Sequence where Iterator.Element : Sequence {