Squashed commit of the following:

commit aa59ef28ea56315eb421ba044ddaf0c4066bfff8 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Mon Nov 7 10:26:28 2022 +0100 Add trailing carrier at the end of generated extension files commit e985950aa1e39d81d4938e15f8724c0f7723b003 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Fri Nov 4 16:37:34 2022 +0100 Replace installation script by script that install completion file Setup a Makefile to install resgen commit d574384c151259610a4c2f837b14068bb7716e44 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Fri Nov 4 14:33:39 2022 +0100 Refactor Improve testability Add tests on SwiftUI generated code Add tests on command commit d9e76632c3037da0ed9e1dd37056685416579da9 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Thu Nov 3 15:43:47 2022 +0100 Fixing bad merge on FontOptions commit 76b5ebfcd1cde7a7d4c83f516a4fc937841e7715 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Thu Nov 3 15:37:28 2022 +0100 Squashed commit of the following: commit 085f1ffc33 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Thu Nov 3 15:00:27 2022 +0100 Refactor SwiftUI extension generation and generation SwiftUI extension for images commit 4f7d7e18b1 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Mon Oct 31 16:21:32 2022 +0100 Génération de composant SwiftUI: Color et Image commit 0797667b25 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Mon Oct 31 16:21:12 2022 +0100 Génération de composant SwiftUI: Color et Image commit 417a2630925841dd486ae1d684d28ab7dca240e0 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Wed Oct 19 17:13:03 2022 +0200 Update Info.plist UIAppFonts key when generating fonts (if plist path if defined)
2022-11-07 10:32:17 +01:00
parent 6203700b0c
commit 41733d2680
75 changed files with 1487 additions and 933 deletions
--- a/Tests/ResgenSwiftTests/Colors/ColorExtensionGeneratorTests.swift
+++ b/Tests/ResgenSwiftTests/Colors/ColorExtensionGeneratorTests.swift
@ -13,7 +13,7 @@ import ToolCore

 final class ColorExtensionGeneratorTests: XCTestCase {
    
-    func testGeneratedExtensionContent() {
+    func test_uiKit_GeneratedExtensionContent() {
        // Given
        let colors = [
            ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"),
@ -23,7 +23,8 @@ final class ColorExtensionGeneratorTests: XCTestCase {
        // When
        let extensionContent = ColorExtensionGenerator.getExtensionContent(colors: colors,
                                                                           staticVar: false,
-                                                                           extensionName: "GenColors")
+                                                                           extensionName: "GenColors",
+                                                                           isSwiftUI: false)
        
        // Expect
        let expect = """
@ -48,7 +49,7 @@ final class ColorExtensionGeneratorTests: XCTestCase {
        XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
    }
    
-    func testGeneratedExtensionContentForStaticVar() {
+    func test_uiKit_GeneratedExtensionContentForStaticVar() {
        // Given
        let colors = [
            ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"),
@ -58,7 +59,8 @@ final class ColorExtensionGeneratorTests: XCTestCase {
        // When
        let extensionContent = ColorExtensionGenerator.getExtensionContent(colors: colors,
                                                                           staticVar: true,
-                                                                           extensionName: "GenColor")
+                                                                           extensionName: "GenColor",
+                                                                           isSwiftUI: false)
        
        // Expect
        let expect = """
@ -82,4 +84,76 @@ final class ColorExtensionGeneratorTests: XCTestCase {
        
        XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
    }
+    
+    func test_swiftUI_GeneratedExtensionContent() {
+        // Given
+        let colors = [
+            ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"),
+            ParsedColor(name: "colorTwo", light: "#F0F0F0", dark: "#0F0F0F")
+        ]
+        
+        // When
+        let extensionContent = ColorExtensionGenerator.getExtensionContent(colors: colors,
+                                                                           staticVar: false,
+                                                                           extensionName: "GenColors",
+                                                                           isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        // Generated by ResgenSwift.Color \(ResgenSwiftVersion)
+
+        import SwiftUI
+
+        extension GenColors {
+        
+            /// Color colorOne is #FF00FF (light) or #00FF00 (dark)"
+            var colorOne: Color {
+                Color("colorOne")
+            }
+        
+            /// Color colorTwo is #F0F0F0 (light) or #0F0F0F (dark)"
+             var colorTwo: Color {
+                Color("colorTwo")
+            }
+        }
+        """
+        
+        XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
+    func test_swiftUI_GeneratedExtensionContentForStaticVar() {
+        // Given
+        let colors = [
+            ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"),
+            ParsedColor(name: "colorTwo", light: "#F0F0F0", dark: "#0F0F0F")
+        ]
+        
+        // When
+        let extensionContent = ColorExtensionGenerator.getExtensionContent(colors: colors,
+                                                                           staticVar: true,
+                                                                           extensionName: "GenColor",
+                                                                           isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        // Generated by ResgenSwift.Color \(ResgenSwiftVersion)
+
+        import SwiftUI
+
+        extension GenColor {
+        
+            /// Color colorOne is #FF00FF (light) or #00FF00 (dark)"
+            static var colorOne: Color {
+                Color("colorOne")
+            }
+        
+            /// Color colorTwo is #F0F0F0 (light) or #0F0F0F (dark)"
+            static var colorTwo: Color {
+                Color("colorTwo")
+            }
+        }
+        """
+        
+        XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
+    }
 }
--- a/Tests/ResgenSwiftTests/Colors/ParsedColorTests.swift
+++ b/Tests/ResgenSwiftTests/Colors/ParsedColorTests.swift
@ -12,12 +12,12 @@ import XCTest

 final class ParsedColorTests: XCTestCase {

-    func testGeneratedProperty() {
+    func test_uiKit_GeneratedProperty() {
        // Given
        let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")
        
        // When
-        let property = color.getColorProperty()
+        let property = color.getColorProperty(isStatic: false, isSwiftUI: false)
        
        // Expect
        let expect = """
@ -30,12 +30,12 @@ final class ParsedColorTests: XCTestCase {
        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
    }
    
-    func testGeneratedStaticProperty() {
+    func test_uiKit_GeneratedStaticProperty() {
        // Given
        let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")
        
        // When
-        let property = color.getColorStaticProperty()
+        let property = color.getColorProperty(isStatic: true, isSwiftUI: false)
        
        // Expect
        let expect = """
@ -48,6 +48,42 @@ final class ParsedColorTests: XCTestCase {
        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
    }
    
+    func test_swiftUI_GeneratedProperty() {
+        // Given
+        let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")
+        
+        // When
+        let property = color.getColorProperty(isStatic: false, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        /// Color red is #FF0000 (light) or #0000FF (dark)"
+        var red: Color {
+            Color("red")
+        }
+        """
+            
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
+    func test_swiftUI_GeneratedStaticProperty() {
+        // Given
+        let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")
+        
+        // When
+        let property = color.getColorProperty(isStatic: true, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+            /// Color red is #FF0000 (light) or #0000FF (dark)"
+            static var red: Color {
+                Color("red")
+            }
+        """
+        
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
    func testGeneratedColorAsset() {
        // Given
        let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")