Merge pull request #51 from hhru/FIX-SINGLE-COMPONENT-SET

Исправлена генерация иконок если в COMPONENT_SET один вариант

Author: timbaev

Sources/FigmaGen/Models/Images/ImageComponentSetAsset.swift

@@ -7,8 +7,5 @@ struct ImageComponentSetAsset: Encodable, Hashable {
     let name: String
     let parentName: String?
     let assets: [ImageRenderedNode: ImageAsset]
-
-    var isSingleComponent: Bool {
-        assets.count == 1
-    }
+    let nodeType: ImageNodeType
 }

Sources/FigmaGen/Models/Images/ImageComponentSetNode.swift

@@ -7,18 +7,21 @@ struct ImageComponentSetNode: Encodable, Hashable {
     let name: String
     let parentName: String?
     let components: [ImageNode]
+    let type: ImageNodeType
 
     // MARK: - Initializers
 
     init(name: String, parentName: String?, components: [ImageNode]) {
         self.name = name
         self.parentName = parentName
         self.components = components
+        self.type = .componentSet
     }
 
     init(name: String, parentName: String?, component: ImageNode) {
         self.name = name
         self.parentName = parentName
         self.components = [component]
+        self.type = .component
     }
 }

Sources/FigmaGen/Models/Images/ImageComponentSetRenderedNode.swift

@@ -7,8 +7,5 @@ struct ImageComponentSetRenderedNode: Encodable, Hashable {
     let name: String
     let parentName: String?
     let components: [ImageRenderedNode]
-
-    var isSingleComponent: Bool {
-        components.count == 1
-    }
+    let type: ImageNodeType
 }

Sources/FigmaGen/Models/Images/ImageNodeType.swift

@@ -0,0 +1,9 @@
+import Foundation
+
+enum ImageNodeType: Encodable, Hashable {
+
+    // MARK: - Enumeration Cases
+
+    case component
+    case componentSet
+}

Sources/FigmaGen/Providers/Images/Assets/DefaultImageAssetsProvider.swift

@@ -24,7 +24,7 @@ final class DefaultImageAssetsProvider: ImageAssetsProvider, ImagesFolderPathRes
         setNode: ImageComponentSetRenderedNode,
         namingStyle: ImageNamingStyle
     ) -> String {
-        let name = setNode.isSingleComponent ? node.base.name : "\(setNode.name) \(node.base.name)"
+        let name = setNode.type == .component ? node.base.name : "\(setNode.name) \(node.base.name)"
 
         switch namingStyle {
         case .camelCase:
@@ -85,7 +85,8 @@ final class DefaultImageAssetsProvider: ImageAssetsProvider, ImagesFolderPathRes
             return ImageComponentSetAsset(
                 name: setNode.name,
                 parentName: setNode.parentName,
-                assets: assets
+                assets: assets,
+                nodeType: setNode.type
             )
         }
     }

Sources/FigmaGen/Providers/Images/ImagesFolderPathResolving.swift

@@ -50,7 +50,7 @@ extension ImagesFolderPathResolving {
             groupByFrame: groupByFrame,
             groupByComponentSet: groupByComponentSet,
             parentNodeName: setNode.parentName,
-            isSingleComponent: setNode.isSingleComponent,
+            isSingleComponent: setNode.type == .component,
             nodeName: setNode.name,
             folderPath: folderPath
         )
@@ -66,7 +66,7 @@ extension ImagesFolderPathResolving {
             groupByFrame: groupByFrame,
             groupByComponentSet: groupByComponentSet,
             parentNodeName: setAsset.parentName,
-            isSingleComponent: setAsset.isSingleComponent,
+            isSingleComponent: setAsset.nodeType == .component,
             nodeName: setAsset.name,
             folderPath: folderPath
         )

Sources/FigmaGen/Providers/Images/Render/DefaultImageRenderProvider.swift

@@ -51,7 +51,12 @@ final class DefaultImageRenderProvider: ImageRenderProvider {
             return ImageRenderedNode(base: imageNode, urls: nodeImageURLs)
         }
 
-        return ImageComponentSetRenderedNode(name: node.name, parentName: node.parentName, components: renderedNodes)
+        return ImageComponentSetRenderedNode(
+            name: node.name,
+            parentName: node.parentName,
+            components: renderedNodes,
+            type: node.type
+        )
     }
 
     private func renderImages(

Sources/FigmaGen/Providers/Images/Resources/DefaultImageResourcesProvider.swift

@@ -24,7 +24,7 @@ final class DefaultImageResourcesProvider: ImageResourcesProvider, ImagesFolderP
         setNode: ImageComponentSetRenderedNode,
         namingStyle: ImageNamingStyle
     ) -> String {
-        let fileName = setNode.isSingleComponent ? node.base.name : "\(setNode.name) \(node.base.name)"
+        let fileName = setNode.type == .component ? node.base.name : "\(setNode.name) \(node.base.name)"
 
         switch namingStyle {
         case .camelCase: